[mono/libgdiplus] [4 commits] 4b15e34e: Removed usage of the opaque png info_ptr struct.

   Branch: refs/heads/master
     Home: https://github.com/mono/libgdiplus
  Compare: https://github.com/mono/libgdiplus/compare/f3f18b95b5f0...506df13e6e1c

   Commit: 4b15e34ee859916e5d7eeb7ca4d80e3d3d93ddb5
   Author: Mike Buland <[email protected]> 
Committer: Andrés G. Aragoneses <[email protected]> (knocte)
     Date: 2013-07-09 21:38:41 GMT
      URL: https://github.com/mono/libgdiplus/commit/4b15e34ee859916e5d7eeb7ca4d80e3d3d93ddb5

Removed usage of the opaque png info_ptr struct.

The info_ptr structure should not be used, this has been in the png
documentation since at least July 2000.

Hopefully this mantains the same functionality, but in a way that will
compile with the newest versions of libpng.

Changed paths:
  M src/pngcodec.c

Modified: src/pngcodec.c
===================================================================
@@ -116,10 +116,16 @@
 	bitmap_data->dpi_horz = png_get_x_pixels_per_inch(png_ptr, info_ptr);
 	bitmap_data->dpi_vert = png_get_y_pixels_per_inch(png_ptr, info_ptr);
 #elif defined(PNG_pHYs_SUPPORTED)
-	if ((info_ptr->valid & PNG_INFO_pHYs) && (info_ptr->phys_unit_type == PNG_RESOLUTION_METER)) {
-		bitmap_data->image_flags |= ImageFlagsHasRealDPI;
-		bitmap_data->dpi_horz = info_ptr->x_pixels_per_unit * 0.0254;
-		bitmap_data->dpi_vert = info_ptr->y_pixels_per_unit * 0.0254;
+	{
+		int		unit_type;
+		png_uint_32	res_x;
+		png_uint_32	res_y;
+		png_get_pHYs( png_ptr, info_ptr, &res_x, &res_y, &unit_type );
+		if (unit_type == PNG_RESOLUTION_METER) {
+			bitmap_data->image_flags |= ImageFlagsHasRealDPI;
+			bitmap_data->dpi_horz = res_x * 0.0254;
+			bitmap_data->dpi_vert = res_y * 0.0254;
+		}
 	}
 #endif
 	/* default to screen resolution (if nothing was provided or available) */
@@ -130,11 +136,11 @@
 #if defined(PNG_iCCP_SUPPORTED)
 	{
 		png_charp	name;
-		png_charp	profile;
+		png_bytepp	profile;
 		png_uint_32	proflen;
 		int		compression_type;
 
-		if (png_get_iCCP(png_ptr, info_ptr, &name, &compression_type, &profile, &proflen)) {
+		if (png_get_iCCP(png_ptr, info_ptr, &name, &compression_type, profile, &proflen)) {
 			gdip_bitmapdata_property_add_ASCII(bitmap_data, PropertyTagICCProfileDescriptor, (BYTE*)name);
 			gdip_bitmapdata_property_add_byte(bitmap_data, PropertyTagICCProfile, (BYTE)compression_type);
 		}
@@ -243,6 +249,8 @@
 	int		bit_depth;
 	int		channels;
 	BYTE		color_type;
+	int 	num_palette;
+	png_colorp	png_palette;
 
 	png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
 
@@ -320,9 +328,10 @@
 			/* Copy the palette data into the GDI+ structure. */
 			colourspace_flag = ImageFlagsColorSpaceRGB;
 
+			png_get_PLTE( png_ptr, info_ptr, &png_palette, &num_palette );
 			palette_entries = num_colours;
-			if (palette_entries > info_ptr->num_palette) {
-				palette_entries = info_ptr->num_palette;
+			if (palette_entries > num_palette) {
+				palette_entries = num_palette;
 			}
 
 			palette = GdipAlloc (sizeof(ColorPalette) + (num_colours - 1) * sizeof(ARGB));
@@ -331,32 +340,39 @@
 
 			for (i=0; i < palette_entries; i++) {
 				set_pixel_bgra (&palette->Entries[i], 0,
-						info_ptr->palette[i].blue,
-						info_ptr->palette[i].green,
-						info_ptr->palette[i].red,
+						png_palette[i].blue,
+						png_palette[i].green,
+						png_palette[i].red,
 						0xFF); /* alpha */
 			}
 		}
 
-		/* Make sure transparency is respected. */
-		if (info_ptr->num_trans > 0) {
-			palette->Flags |= PaletteFlagsHasAlpha;
-			colourspace_flag |= ImageFlagsHasAlpha;
+		{
+			png_bytep trans_alpha;
+			int num_trans;
+			png_color_16p trans_color;
 
-			if (info_ptr->num_trans > info_ptr->num_palette) {
-				info_ptr->num_trans = info_ptr->num_palette;
-			}
+			/* Make sure transparency is respected. */
+			png_get_tRNS( png_ptr, info_ptr, &trans_alpha, &num_trans, &trans_color );
+			if (num_trans > 0) {
+				palette->Flags |= PaletteFlagsHasAlpha;
+				colourspace_flag |= ImageFlagsHasAlpha;
+
+				if (num_trans > num_palette) {
+					num_trans = num_palette;
+				}
 
-			for (i=0; i < info_ptr->num_trans; i++) {
-				set_pixel_bgra(&palette->Entries[i], 0,
-						info_ptr->palette[i].blue,
-						info_ptr->palette[i].green,
-						info_ptr->palette[i].red,
+				for (i=0; i < num_trans; i++) {
+					set_pixel_bgra(&palette->Entries[i], 0,
+							png_palette[i].blue,
+							png_palette[i].green,
+							png_palette[i].red,
 #if PNG_LIBPNG_VER > 10399
-						info_ptr->trans_alpha [i]); /* alpha */
+							trans_alpha [i]); /* alpha */
 #else
-						info_ptr->trans[i]); /* alpha */
+							trans[i]); /* alpha */
 #endif
+				}
 			}
 		}
 
@@ -486,30 +502,30 @@
 
 							palette = (pix >> 6) & 0x03;
 							set_pixel_bgra (rawptr, 0,
-								info_ptr->palette[palette].blue,
-								info_ptr->palette[palette].green,
-								info_ptr->palette[palette].red,
+								png_palette[palette].blue,
+								png_palette[palette].green,
+								png_palette[palette].red,
 								0xFF); /* alpha */
 
 							palette = (pix >> 4) & 0x03;
 							set_pixel_bgra (rawptr, 4,
-								info_ptr->palette[palette].blue,
-								info_ptr->palette[palette].green,
-								info_ptr->palette[palette].red,
+								png_palette[palette].blue,
+								png_palette[palette].green,
+								png_palette[palette].red,
 								0xFF); /* alpha */
 
 							palette = (pix >> 2) & 0x03;
 							set_pixel_bgra (rawptr, 8,
-								info_ptr->palette[palette].blue,
-								info_ptr->palette[palette].green,
-								info_ptr->palette[palette].red,
+								png_palette[palette].blue,
+								png_palette[palette].green,
+								png_palette[palette].red,
 								0xFF); /* alpha */
 
 							palette = pix & 0x03;
 							set_pixel_bgra (rawptr, 12,
-								info_ptr->palette[palette].blue,
-								info_ptr->palette[palette].green,
-								info_ptr->palette[palette].red,
+								png_palette[palette].blue,
+								png_palette[palette].green,
+								png_palette[palette].red,
 								0xFF); /* alpha */
 							rawptr += 16;
 						}

   Commit: 87c953a4adf21fb8e1264144b4ac309819ab16e7
   Author: Andrés G. Aragoneses <[email protected]> (knocte)
     Date: 2013-07-09 21:44:30 GMT
      URL: https://github.com/mono/libgdiplus/commit/87c953a4adf21fb8e1264144b4ac309819ab16e7

Fix previous commit so that it doesn't break the build with libpng v12.0

Changed paths:
  M src/pngcodec.c

Modified: src/pngcodec.c
===================================================================
@@ -370,7 +370,7 @@
 #if PNG_LIBPNG_VER > 10399
 							trans_alpha [i]); /* alpha */
 #else
-							trans[i]); /* alpha */
+							info_ptr->trans[i]); /* alpha */
 #endif
 				}
 			}

   Commit: 2766e9574a7437b5b52c9e778abe83420729dba0
   Author: Andrés G. Aragoneses <[email protected]> (knocte)
     Date: 2013-07-09 21:48:07 GMT
      URL: https://github.com/mono/libgdiplus/commit/2766e9574a7437b5b52c9e778abe83420729dba0

Use png_bytep instead of png_bytepp for the iCCP profile

As suggested by Andrew Ruder in https://github.com/mono/libgdiplus/pull/3
to avoid storing the profile pointer in an undefined memory location.

Changed paths:
  M src/pngcodec.c

Modified: src/pngcodec.c
===================================================================
@@ -136,11 +136,11 @@
 #if defined(PNG_iCCP_SUPPORTED)
 	{
 		png_charp	name;
-		png_bytepp	profile;
+		png_bytep	profile;
 		png_uint_32	proflen;
 		int		compression_type;
 
-		if (png_get_iCCP(png_ptr, info_ptr, &name, &compression_type, profile, &proflen)) {
+		if (png_get_iCCP(png_ptr, info_ptr, &name, &compression_type, &profile, &proflen)) {
 			gdip_bitmapdata_property_add_ASCII(bitmap_data, PropertyTagICCProfileDescriptor, (BYTE*)name);
 			gdip_bitmapdata_property_add_byte(bitmap_data, PropertyTagICCProfile, (BYTE)compression_type);
 		}

   Commit: 506df13e6e1c9915c248305e47f0b67549732566
   Author: Sebastien Pouliot <[email protected]> (spouliot)
     Date: 2013-10-08 21:28:49 GMT
      URL: https://github.com/mono/libgdiplus/commit/506df13e6e1c9915c248305e47f0b67549732566

Merge pull request #8 from knocte/fix_build_with_libpng15

Fix build with libpng15

Changed paths:
  M src/pngcodec.c

Modified: src/pngcodec.c
===================================================================
@@ -116,10 +116,16 @@
 	bitmap_data->dpi_horz = png_get_x_pixels_per_inch(png_ptr, info_ptr);
 	bitmap_data->dpi_vert = png_get_y_pixels_per_inch(png_ptr, info_ptr);
 #elif defined(PNG_pHYs_SUPPORTED)
-	if ((info_ptr->valid & PNG_INFO_pHYs) && (info_ptr->phys_unit_type == PNG_RESOLUTION_METER)) {
-		bitmap_data->image_flags |= ImageFlagsHasRealDPI;
-		bitmap_data->dpi_horz = info_ptr->x_pixels_per_unit * 0.0254;
-		bitmap_data->dpi_vert = info_ptr->y_pixels_per_unit * 0.0254;
+	{
+		int		unit_type;
+		png_uint_32	res_x;
+		png_uint_32	res_y;
+		png_get_pHYs( png_ptr, info_ptr, &res_x, &res_y, &unit_type );
+		if (unit_type == PNG_RESOLUTION_METER) {
+			bitmap_data->image_flags |= ImageFlagsHasRealDPI;
+			bitmap_data->dpi_horz = res_x * 0.0254;
+			bitmap_data->dpi_vert = res_y * 0.0254;
+		}
 	}
 #endif
 	/* default to screen resolution (if nothing was provided or available) */
@@ -130,7 +136,7 @@
 #if defined(PNG_iCCP_SUPPORTED)
 	{
 		png_charp	name;
-		png_charp	profile;
+		png_bytep	profile;
 		png_uint_32	proflen;
 		int		compression_type;
 
@@ -243,6 +249,8 @@
 	int		bit_depth;
 	int		channels;
 	BYTE		color_type;
+	int 	num_palette;
+	png_colorp	png_palette;
 
 	png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
 
@@ -320,9 +328,10 @@
 			/* Copy the palette data into the GDI+ structure. */
 			colourspace_flag = ImageFlagsColorSpaceRGB;
 
+			png_get_PLTE( png_ptr, info_ptr, &png_palette, &num_palette );
 			palette_entries = num_colours;
-			if (palette_entries > info_ptr->num_palette) {
-				palette_entries = info_ptr->num_palette;
+			if (palette_entries > num_palette) {
+				palette_entries = num_palette;
 			}
 
 			palette = GdipAlloc (sizeof(ColorPalette) + (num_colours - 1) * sizeof(ARGB));
@@ -331,32 +340,39 @@
 
 			for (i=0; i < palette_entries; i++) {
 				set_pixel_bgra (&palette->Entries[i], 0,
-						info_ptr->palette[i].blue,
-						info_ptr->palette[i].green,
-						info_ptr->palette[i].red,
+						png_palette[i].blue,
+						png_palette[i].green,
+						png_palette[i].red,
 						0xFF); /* alpha */
 			}
 		}
 
-		/* Make sure transparency is respected. */
-		if (info_ptr->num_trans > 0) {
-			palette->Flags |= PaletteFlagsHasAlpha;
-			colourspace_flag |= ImageFlagsHasAlpha;
+		{
+			png_bytep trans_alpha;
+			int num_trans;
+			png_color_16p trans_color;
 
-			if (info_ptr->num_trans > info_ptr->num_palette) {
-				info_ptr->num_trans = info_ptr->num_palette;
-			}
+			/* Make sure transparency is respected. */
+			png_get_tRNS( png_ptr, info_ptr, &trans_alpha, &num_trans, &trans_color );
+			if (num_trans > 0) {
+				palette->Flags |= PaletteFlagsHasAlpha;
+				colourspace_flag |= ImageFlagsHasAlpha;
+
+				if (num_trans > num_palette) {
+					num_trans = num_palette;
+				}
 
-			for (i=0; i < info_ptr->num_trans; i++) {
-				set_pixel_bgra(&palette->Entries[i], 0,
-						info_ptr->palette[i].blue,
-						info_ptr->palette[i].green,
-						info_ptr->palette[i].red,
+				for (i=0; i < num_trans; i++) {
+					set_pixel_bgra(&palette->Entries[i], 0,
+							png_palette[i].blue,
+							png_palette[i].green,
+							png_palette[i].red,
 #if PNG_LIBPNG_VER > 10399
-						info_ptr->trans_alpha [i]); /* alpha */
+							trans_alpha [i]); /* alpha */
 #else
-						info_ptr->trans[i]); /* alpha */
+							info_ptr->trans[i]); /* alpha */
 #endif
+				}
 			}
 		}
 
@@ -486,30 +502,30 @@
 
 							palette = (pix >> 6) & 0x03;
 							set_pixel_bgra (rawptr, 0,
-								info_ptr->palette[palette].blue,
-								info_ptr->palette[palette].green,
-								info_ptr->palette[palette].red,
+								png_palette[palette].blue,
+								png_palette[palette].green,
+								png_palette[palette].red,
 								0xFF); /* alpha */
 
 							palette = (pix >> 4) & 0x03;
 							set_pixel_bgra (rawptr, 4,
-								info_ptr->palette[palette].blue,
-								info_ptr->palette[palette].green,
-								info_ptr->palette[palette].red,
+								png_palette[palette].blue,
+								png_palette[palette].green,
+								png_palette[palette].red,
 								0xFF); /* alpha */
 
 							palette = (pix >> 2) & 0x03;
 							set_pixel_bgra (rawptr, 8,
-								info_ptr->palette[palette].blue,
-								info_ptr->palette[palette].green,
-								info_ptr->palette[palette].red,
+								png_palette[palette].blue,
+								png_palette[palette].green,
+								png_palette[palette].red,
 								0xFF); /* alpha */
 
 							palette = pix & 0x03;
 							set_pixel_bgra (rawptr, 12,
-								info_ptr->palette[palette].blue,
-								info_ptr->palette[palette].green,
-								info_ptr->palette[palette].red,
+								png_palette[palette].blue,
+								png_palette[palette].green,
+								png_palette[palette].red,
 								0xFF); /* alpha */
 							rawptr += 16;
 						}
_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches