From b612fcb881f9fcea53fd83b9496e4a62fd2add13 Mon Sep 17 00:00:00 2001 From: Pere Pujal i Carabantes Date: Mon, 20 Jun 2022 23:08:02 +0200 Subject: [PATCH] Something weird happened in load_info_about_label_surface() in some merge, fixing the merge. --- src/tuxpaint.c | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/src/tuxpaint.c b/src/tuxpaint.c index f40b1b38b..86a5a2e98 100644 --- a/src/tuxpaint.c +++ b/src/tuxpaint.c @@ -25095,30 +25095,9 @@ static void load_info_about_label_surface(FILE * lfi) fprintf(stderr, "Unexpected! Saved text length is >= 1024 (%u!)\n", new_node->save_texttool_len); free(new_node); #ifdef WIN32 - /* Using fancy "%[]" operator to scan until the end of a line */ - tmp_fscanf_return = fscanf(lfi, "%[^\n]\n", tmpstr); - mbstowcs(wtmpstr, tmpstr, 1024); - for (l = 0; l < new_node->save_texttool_len; l++) - new_node->save_texttool_str[l] = wtmpstr[l]; - new_node->save_texttool_str[l] = L'\0'; - free(tmpstr); - free(wtmpstr); -#elif defined(__ANDROID__) - wchar_t tmp_char; - for (l = 0; l < new_node->save_texttool_len; l++) - { - fscanf(lfi, "%d ", &tmp_char); - new_node->save_texttool_str[l] = tmp_char; - } - fscanf(lfi, "\n"); -#else - /* Using fancy "%[]" operator to scan until the end of a line */ - tmp_fscanf_return = fscanf(lfi, "%l[^\n]\n", new_node->save_texttool_str); -#endif - -#ifdef DEBUG - printf("Read: \"%ls\"\n", new_node->save_texttool_str); fflush(stdout); + free(wtmpstr); #endif + free(tmpstr); fclose(lfi); return; } @@ -25131,6 +25110,14 @@ static void load_info_about_label_surface(FILE * lfi) for (l = 0; l < new_node->save_texttool_len; l++) new_node->save_texttool_str[l] = wtmpstr[l]; new_node->save_texttool_str[l] = L'\0'; +#elif defined(__ANDROID__) + wchar_t tmp_char; + for (l = 0; l < new_node->save_texttool_len; l++) + { + fscanf(lfi, "%d ", &tmp_char); + new_node->save_texttool_str[l] = tmp_char; + } + fscanf(lfi, "\n"); #else /* Using fancy "%[]" operator to scan until the end of a line */ tmp_fscanf_return = fscanf(lfi, "%l[^\n]\n", new_node->save_texttool_str);