m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Save_PNG_Sub(): fix PNG saving

Browse Source 
see http://pulkomandy.tk/projects/GrafX2/ticket/96
This commit is contained in:
Thomas Bernard 2019-01-20 23:54:30 +01:00
parent 8ebe6a8867
commit 119618ae14
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/fileformats.c
View File

@ -6798,6 +6798,7 @@ void Save_PNG_Sub(T_IO_Context * context, FILE * file, char * * buffer, unsigned
byte cycle_data[16*6]; // Storage for color-cycling data, referenced by crng_chunk byte cycle_data[16*6]; // Storage for color-cycling data, referenced by crng_chunk
struct PNG_memory_buffer memory_buffer; struct PNG_memory_buffer memory_buffer;
memset(&memory_buffer, 0, sizeof(memory_buffer));
/* initialisation */ /* initialisation */
if ((png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL)) if ((png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL))
&& (info_ptr = png_create_info_struct(png_ptr))) && (info_ptr = png_create_info_struct(png_ptr)))
@ -6806,14 +6807,10 @@ void Save_PNG_Sub(T_IO_Context * context, FILE * file, char * * buffer, unsigned
{ {
if (file != NULL) if (file != NULL)
png_init_io(png_ptr, file); png_init_io(png_ptr, file);
else else // to write to memory, use png_set_write_fn() instead of calling png_init_io()
{
// to write to memory, use png_set_write_fn() instead of calling png_init_io()
memset(&memory_buffer, 0, sizeof(memory_buffer));
png_set_write_fn(png_ptr, &memory_buffer, PNG_memory_write, PNG_memory_flush); png_set_write_fn(png_ptr, &memory_buffer, PNG_memory_write, PNG_memory_flush);
}
/* en-tete */ /* read PNG header */
if (!setjmp(png_jmpbuf(png_ptr))) if (!setjmp(png_jmpbuf(png_ptr)))
{ {
png_set_IHDR(png_ptr, info_ptr, context->Width, context->Height, png_set_IHDR(png_ptr, info_ptr, context->Width, context->Height,
@ -6822,8 +6819,7 @@ void Save_PNG_Sub(T_IO_Context * context, FILE * file, char * * buffer, unsigned
png_set_PLTE(png_ptr, info_ptr, (png_colorp)context->Palette, 256); png_set_PLTE(png_ptr, info_ptr, (png_colorp)context->Palette, 256);
{ {
// Commentaires texte PNG // text chunks in PNG (optional)
// Cette partie est optionnelle
png_text text_ptr[2] = { png_text text_ptr[2] = {
#ifdef PNG_iTXt_SUPPORTED #ifdef PNG_iTXt_SUPPORTED
{-1, "Software", "Grafx2", 6, 0, NULL, NULL}, {-1, "Software", "Grafx2", 6, 0, NULL, NULL},
@ -6960,11 +6956,14 @@ void Save_PNG_Sub(T_IO_Context * context, FILE * file, char * * buffer, unsigned
if (Row_pointers) if (Row_pointers)
free(Row_pointers); free(Row_pointers);
if (memory_buffer.buffer) if (File_error == 0 && buffer != NULL)
{ {
*buffer = memory_buffer.buffer; *buffer = memory_buffer.buffer;
*buffer_size = memory_buffer.offset; if (buffer_size != NULL)
*buffer_size = memory_buffer.offset;
} }
else
free(memory_buffer.buffer);
} }