Attachment 600433 Details for Bug 843330 – proposed patch

[patch] proposed patch

libgdiplus-libpng15.patch (text/plain), 6.15 KB, created by Tom Lane on 2012-07-26 04:06:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tom Lane

Created: 2012-07-26 04:06:00 UTC

Size: 6.15 KB

patch

obsolete

>diff -Naur libgdiplus-2.10.orig/src/pngcodec.c libgdiplus-2.10/src/pngcodec.c
>--- libgdiplus-2.10.orig/src/pngcodec.c	2011-01-13 17:28:19.000000000 -0500
>+++ libgdiplus-2.10/src/pngcodec.c	2012-07-25 23:57:19.565085973 -0400
>@@ -112,25 +112,23 @@
> gdip_load_png_properties (png_structp png_ptr, png_infop info_ptr, png_infop end_ptr, BitmapData *bitmap_data)
> {
> #if defined(PNG_INCH_CONVERSIONS) && defined(PNG_FLOATING_POINT_SUPPORTED)
>-	bitmap_data->image_flags |= ImageFlagsHasRealDPI;
> 	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;
>-	}
>+	bitmap_data->dpi_horz = png_get_x_pixels_per_meter(png_ptr, info_ptr) * 0.0254;
>+	bitmap_data->dpi_vert = png_get_y_pixels_per_meter(png_ptr, info_ptr) * 0.0254;
> #endif
> 	/* default to screen resolution (if nothing was provided or available) */
> 	if (bitmap_data->dpi_horz == 0 || bitmap_data->dpi_vert == 0) {
> 		 bitmap_data->dpi_horz = bitmap_data->dpi_vert = gdip_get_display_dpi ();
> 	}
>+	else
>+		bitmap_data->image_flags |= ImageFlagsHasRealDPI;
> 
> #if defined(PNG_iCCP_SUPPORTED)
> 	{
> 		png_charp	name;
>-		png_charp	profile;
>+		png_bytep	profile;
> 		png_uint_32	proflen;
> 		int		compression_type;
> 
>@@ -243,6 +241,8 @@
> 	int		bit_depth;
> 	int		channels;
> 	BYTE		color_type;
>+	png_colorp	png_palette;
>+	int		num_palette;
> 
> 	png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
> 
>@@ -285,13 +285,13 @@
> 		int		source_stride;
> 		int		dest_stride;
> 		png_bytep	*row_pointers;
>-		BYTE		*rawptr;
> 		int		num_colours;
> 		int		palette_entries;
> 		ColorPalette	*palette;
>+		png_bytep	trans_alpha;
>+		int		num_trans;
> 		ImageFlags	colourspace_flag;
> 		int		i;
>-		int		j;
> 
> 		width = png_get_image_width (png_ptr, info_ptr);
> 		height = png_get_image_height (png_ptr, info_ptr);
>@@ -311,18 +311,18 @@
> 		/* Copy palette. */
> 		num_colours = 1 << bit_depth;
> 
>-		if (png_get_color_type (png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY) {
>+		if (color_type == PNG_COLOR_TYPE_GRAY) {
> 			/* A gray-scale image; generate a palette fading from black to white. */
> 			colourspace_flag = ImageFlagsColorSpaceGRAY;
> 			palette = gdip_create_greyscale_palette (num_colours);
> 			palette->Flags = PaletteFlagsGrayScale;
>-		} else {
>+		} else if (png_get_PLTE(png_ptr, info_ptr, &png_palette, &num_palette)) {
> 			/* Copy the palette data into the GDI+ structure. */
> 			colourspace_flag = ImageFlagsColorSpaceRGB;
> 
> 			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 +331,33 @@
> 
> 			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 */
> 			}
>+		} else {
>+			/* Shouldn't get here considering color type must be PALETTE. */
>+			goto error;
> 		}
> 
> 		/* Make sure transparency is respected. */
>-		if (info_ptr->num_trans > 0) {
>+		if (png_get_tRNS(png_ptr, info_ptr, &trans_alpha, &num_trans, NULL) &&
>+		    trans_alpha != NULL && num_trans > 0) {
> 			palette->Flags |= PaletteFlagsHasAlpha;
> 			colourspace_flag |= ImageFlagsHasAlpha;
> 
>-			if (info_ptr->num_trans > info_ptr->num_palette) {
>-				info_ptr->num_trans = info_ptr->num_palette;
>+			if (num_trans > palette->Count) {
>+				num_trans = palette->Count;
> 			}
> 
>-			for (i=0; i < info_ptr->num_trans; i++) {
>+			for (i=0; i < num_trans; i++) {
>+				int b, g, r, a;
>+
>+				get_pixel_bgra(palette->Entries[i], b, g, r, a);
>+				a = trans_alpha[i];
> 				set_pixel_bgra(&palette->Entries[i], 0,
>-						info_ptr->palette[i].blue,
>-						info_ptr->palette[i].green,
>-						info_ptr->palette[i].red,
>-#if PNG_LIBPNG_VER > 10399
>-						info_ptr->trans_alpha [i]); /* alpha */
>-#else
>-						info_ptr->trans[i]); /* alpha */
>-#endif
>+						b, g, r, a);
> 			}
> 		}
> 
>@@ -482,40 +483,42 @@
> 			}
> 
> 			case 1:
>+				if (!png_get_PLTE(png_ptr, info_ptr, &png_palette, &num_palette))
>+					goto error;
> 				for (i = 0; i < height; i++) {
> 					png_bytep rowp = row_pointers[i];
> 					if (bit_depth == 2) {
> 						// 4 pixels for each byte
> 						for (j = 0; j < (width >> bit_depth); j++) {
>-							png_byte palette = 0;
>+							png_byte p = 0;
> 							png_byte pix = *rowp++;
> 
>-							palette = (pix >> 6) & 0x03;
>+							p = (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[p].blue,
>+								png_palette[p].green,
>+								png_palette[p].red,
> 								0xFF); /* alpha */
> 
>-							palette = (pix >> 4) & 0x03;
>+							p = (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[p].blue,
>+								png_palette[p].green,
>+								png_palette[p].red,
> 								0xFF); /* alpha */
> 
>-							palette = (pix >> 2) & 0x03;
>+							p = (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[p].blue,
>+								png_palette[p].green,
>+								png_palette[p].red,
> 								0xFF); /* alpha */
> 
>-							palette = pix & 0x03;
>+							p = pix & 0x03;
> 							set_pixel_bgra (rawptr, 12,
>-								info_ptr->palette[palette].blue,
>-								info_ptr->palette[palette].green,
>-								info_ptr->palette[palette].red,
>+								png_palette[p].blue,
>+								png_palette[p].green,
>+								png_palette[p].red,
> 								0xFF); /* alpha */
> 							rawptr += 16;
> 						}

Actions: View | Diff

Attachments on bug 843330: 600433