From 85f9e6976cc788f8f016639234238e5251350a07 Mon Sep 17 00:00:00 2001 From: fredkiefer Date: Sat, 29 Jan 2011 14:44:01 +0000 Subject: [PATCH] PNG patch by Thomase Klausner. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@31970 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 6 ++++++ Source/NSBitmapImageRep+PNG.m | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index fa10be002..6629bf82c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-01-29 Fred Kiefer + + * Source/NSBitmapImageRep+PNG.m (_initBitmapFromPNG:): Use + function to check whether gamma is valid. + Patch by Thomas Klausner. + 2011-01-27 Wolfgang Lux * Source/NSApplication.m (-terminate:): Send message to the diff --git a/Source/NSBitmapImageRep+PNG.m b/Source/NSBitmapImageRep+PNG.m index 5c99b8711..905ab02ea 100644 --- a/Source/NSBitmapImageRep+PNG.m +++ b/Source/NSBitmapImageRep+PNG.m @@ -231,7 +231,7 @@ static void reader_func(png_structp png_struct, png_bytep data, initWithBytesNoCopy: buf length: bytes_per_row * height]; - if (PNG_INFO_gAMA & png_info->valid) + if (png_get_valid(png_struct, png_info, PNG_INFO_gAMA)) { double file_gamma = 2.2; if (PNG_FLOATING_POINT)