notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Something weird happened in load_info_about_label_surface() in some merge, fixing the merge.

Browse source
This commit is contained in:
Pere Pujal i Carabantes 2022-06-20 23:08:02 +02:00
parent 934f500584
commit b612fcb881
1 changed files with 10 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/tuxpaint.c
View file

@ -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);