From 42dae52291de5adb0d281a2df3f3390d11a257ed Mon Sep 17 00:00:00 2001 From: William Kendrick Date: Mon, 8 Aug 2011 17:59:12 +0000 Subject: [PATCH] No longer directly accessing PNG structure members directly, now using png_set_IHDR(). (Patch from SF.net Bug #3386433) --- docs/CHANGES.txt | 13 +++++++++---- src/tuxpaint.c | 7 +------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index 6a812122c..c5e4bf2e2 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -262,11 +262,16 @@ $Id$ Albert Cahalan , Bill Kendrick - * Packaging all the metadata in the PNG file. Before a draw based on a starter - would have need 3 files: the draw, the starter and the .dat file, whith - the addition of the Labels tool this increased to 5 files. Now all this stuff - is packed in customs chunks inside the PNG file. + * Packaging all the metadata in the PNG file. Before a draw based + on a starter would have need 3 files: the draw, the starter and the + .dat file, whith the addition of the Labels tool this increased to + 5 files. Now all this stuff is packed in customs chunks inside the + PNG file. + Pere Pujal i Carabantes + * No longer directly accessing PNG structure members directly, now using + png_set_IHDR(). + Thomas Klausner, SF.net Bug #3386433 * New Starters: ------------- diff --git a/src/tuxpaint.c b/src/tuxpaint.c index 32caddb92..813525d3c 100644 --- a/src/tuxpaint.c +++ b/src/tuxpaint.c @@ -13425,12 +13425,7 @@ static int do_png_save(FILE * fi, const char *const fname, SDL_Surface * surf, i { png_init_io(png_ptr, fi); - info_ptr->width = surf->w; - info_ptr->height = surf->h; - info_ptr->bit_depth = 8; - info_ptr->color_type = PNG_COLOR_TYPE_RGB; - info_ptr->interlace_type = 1; - info_ptr->valid = 0; /* will be updated by various png_set_FOO() functions */ + png_set_IHDR(png_ptr, info_ptr, surf->w, surf->h, 8, PNG_COLOR_TYPE_RGB, 1, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr, PNG_sRGB_INTENT_PERCEPTUAL);