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

Corrected "#ifdef WIN32" for tmpstr/wtmpstr

Browse source
This commit is contained in:
dolphin6k 2022-04-13 21:26:28 +09:00
parent 6a5eddac15
commit 98fb5c2aee
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/tuxpaint.c
View file

@ -24321,7 +24321,9 @@ static void load_info_about_label_surface(FILE * lfi)
int tmp_fscanf_return; int tmp_fscanf_return;
char *tmp_fgets_return; char *tmp_fgets_return;
Uint8 a; Uint8 a;
#ifdef WIN32
wchar_t *wtmpstr; wchar_t *wtmpstr;
#endif
char *tmpstr; char *tmpstr;
/* Clear label surface */ /* Clear label surface */
@ -24377,7 +24379,9 @@ static void load_info_about_label_surface(FILE * lfi)
else else
new_to_old_ratio = (float)new_height / old_height; new_to_old_ratio = (float)new_height / old_height;
#ifdef WIN32
wtmpstr = malloc(1024); wtmpstr = malloc(1024);
#endif
tmpstr = malloc(1024); tmpstr = malloc(1024);
/* Read the labels' text: */ /* Read the labels' text: */
@ -24396,10 +24400,10 @@ static void load_info_about_label_surface(FILE * lfi)
{ {
fprintf(stderr, "Unexpected! Saved text length is >= 1024 (%u!)\n", new_node->save_texttool_len); fprintf(stderr, "Unexpected! Saved text length is >= 1024 (%u!)\n", new_node->save_texttool_len);
free(new_node); free(new_node);
free(wtmpstr);
#ifdef WIN32 #ifdef WIN32
free(tmpstr); free(wtmpstr);
#endif #endif
free(tmpstr);
fclose(lfi); fclose(lfi);
return; return;
} }
@ -24465,9 +24469,9 @@ static void load_info_about_label_surface(FILE * lfi)
{ {
fprintf(stderr, "Unexpected! Save dimensions are (%u x %u!)\n", new_node->save_width, new_node->save_height); fprintf(stderr, "Unexpected! Save dimensions are (%u x %u!)\n", new_node->save_width, new_node->save_height);
free(new_node); free(new_node);
free(wtmpstr);
#ifdef WIN32
free(tmpstr); free(tmpstr);
#ifdef WIN32
free(wtmpstr);
#endif #endif
fclose(lfi); fclose(lfi);
return; return;
@ -24556,9 +24560,9 @@ static void load_info_about_label_surface(FILE * lfi)
first_label_node_in_redo_stack = NULL; first_label_node_in_redo_stack = NULL;
fclose(lfi); fclose(lfi);
free(wtmpstr);
#ifdef WIN32
free(tmpstr); free(tmpstr);
#ifdef WIN32
free(wtmpstr);
#endif #endif