2010-07-07 Sebastien Pouliot <sebastien@ximian.com>

* pngcodec.c: security fix in libpng 1.2 broke the define [Backport r160026] svn path=/branches/mono-2-6/libgdiplus/; revision=160027
mono · Jul 7, 2010 · 20598dd · 20598dd
1 parent 31a63b2
commit 20598dd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/ChangeLog b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-07  Sebastien Pouliot  <sebastien@ximian.com>
+
+	* pngcodec.c: security fix in libpng 1.2 broke the define
+	[Backport r160026]
+
 2010-05-17  Tom Hindle  <tom_hindle@sil.org>
 
 	* image.c: perform calculated transformation. Fix #606412

diff --git a/src/pngcodec.c b/src/pngcodec.c
@@ -352,7 +352,7 @@ gdip_load_png_image_from_file_or_stream (FILE *fp, GetBytesDelegate getBytesFunc
 						info_ptr->palette[i].blue,
 						info_ptr->palette[i].green,
 						info_ptr->palette[i].red,
-#if PNG_LIBPNG_VER > 10243
+#if PNG_LIBPNG_VER > 10399
 						info_ptr->trans_alpha [i]); /* alpha */
 #else
 						info_ptr->trans[i]); /* alpha */
@@ -422,7 +422,7 @@ gdip_load_png_image_from_file_or_stream (FILE *fp, GetBytesDelegate getBytesFunc
 		}
 
 		if ((color_type == PNG_COLOR_TYPE_GRAY) && (bit_depth < 8)) {
-#if PNG_LIBPNG_VER > 10243
+#if PNG_LIBPNG_VER > 10399
 			png_set_expand_gray_1_2_4_to_8 (png_ptr);
 #else
 			png_set_gray_1_2_4_to_8(png_ptr);