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

A workaround to open_memstream. To test it, use the same flag as the fmemopen alternative as usually they come together.

Browse source
This commit is contained in:
Pere Pujal i Carabantes 2010-06-02 22:36:10 +00:00
parent e76aea9cef
commit aa22c46caa
1 changed files with 26 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/tuxpaint.c
View file

@ -12206,7 +12206,7 @@ static void do_png_embed_data(png_structp png_ptr)
unsigned char *chunk_data; unsigned char *chunk_data;
Bytef *compressed_data; Bytef *compressed_data;
char *ldata; char *ldata, *fname;
FILE *lfi; FILE *lfi;
int list_ctr = 0; int list_ctr = 0;
Uint32 pix; Uint32 pix;
@ -12216,7 +12216,6 @@ static void do_png_embed_data(png_structp png_ptr)
char *char_stream, *line; char *char_stream, *line;
size_t dat_size; size_t dat_size;
lfi = open_memstream(&ldata, &size_of_uncompressed_label_data);
/* Starter foreground */ /* Starter foreground */
if (img_starter) if (img_starter)
@ -12404,6 +12403,22 @@ static void do_png_embed_data(png_structp png_ptr)
free(sbk_pixs); free(sbk_pixs);
/* Label data */ /* Label data */
#ifndef fmemopen_alternative
lfi = open_memstream(&ldata, &size_of_uncompressed_label_data);
#else
#ifndef WIN32
fname = get_fname("tmpfile", DIR_SAVE);
#else
fname = get_temp_fname("tmpfile");
#endif
lfi = fopen(fname, "w+");
#endif
current_node = current_label_node; current_node = current_label_node;
while (current_node != NULL) while (current_node != NULL)
{ {
@ -12471,6 +12486,15 @@ static void do_png_embed_data(png_structp png_ptr)
current_node = current_node->next_to_up_label_node; current_node = current_node->next_to_up_label_node;
printf("cur %p, red %p\n", current_node, first_label_node_in_redo_stack); printf("cur %p, red %p\n", current_node, first_label_node_in_redo_stack);
} }
#ifndef fmemopen_alternative
size_of_uncompressed_label_data = ftell(lfi);
rewind(lfi);
ldata = malloc(size_of_uncompressed_label_data);
for (i = 0; i < size_of_uncompressed_label_data; i++)
fread(&ldata[i], 1, 1, lfi);
#endif
fclose(lfi); fclose(lfi);
compressedLen = compressBound(size_of_uncompressed_label_data); compressedLen = compressBound(size_of_uncompressed_label_data);