diff --git a/src/tuxpaint.c b/src/tuxpaint.c index ebc47d7d2..b63b20b3e 100644 --- a/src/tuxpaint.c +++ b/src/tuxpaint.c @@ -336,33 +336,6 @@ typedef struct safer_dirent #define mkdir(path,access) _mkdir(path) -/** - * FIXME - */ -static void mtw(wchar_t * wtok, char *tok) -{ - /* workaround using iconv to get a functionallity somewhat approximate as mbstowcs() */ - Uint16 *ui16; - - ui16 = malloc(255); - char *wrptr = (char *)ui16; - size_t n, in, out; - iconv_t trans; - wchar_t *wch; - - n = 255; - in = 250; - out = 250; - wch = malloc(255); - - trans = iconv_open("WCHAR_T", "UTF-8"); - iconv(trans, (const char **)&tok, &in, &wrptr, &out); - *((wchar_t *) wrptr) = L'\0'; - swprintf(wtok, L"%ls", ui16); - free(ui16); - iconv_close(trans); -} - #endif /* WIN32 */ #if defined(__MACOS__) @@ -22518,27 +22491,12 @@ static void load_info_about_label_surface(FILE * lfi) new_node = malloc(sizeof(struct label_node)); tmp_fscanf_return = fscanf(lfi, "%u\n", &new_node->save_texttool_len); -#ifdef WIN32 - char *tmpstr; - wchar_t *wtmpstr; - - tmpstr = malloc(1024); - wtmpstr = malloc(1024); - fgets(tmpstr, 1024, lfi); - mtw(wtmpstr, tmpstr); - for (l = 0; l < new_node->save_texttool_len; l++) - { - new_node->save_texttool_str[l] = wtmpstr[l]; - } - -#else for (l = 0; l < new_node->save_texttool_len; l++) { tmp_fscanf_return = fscanf(lfi, "%lc", &tmp_char); new_node->save_texttool_str[l] = tmp_char; } tmp_fscanf_return = fscanf(lfi, "\n"); -#endif tmp_fscanf_return = fscanf(lfi, "%u\n", &l); new_node->save_color.r = (Uint8) l; tmp_fscanf_return = fscanf(lfi, "%u\n", &l);