Support libpng versions 1.2 through 1.5.x.

efiring · mdboom · commit 45c46672648e · 2011-06-20T10:53:22.000-04:00
Direct access to the info_ptr is no longer allowed; png_get_*
functions have been available at least since 1.2.x.

Conflicts:

	CHANGELOG
diff --git a/CHANGELOG b/CHANGELOG
@@ -19,6 +19,13 @@
            not responding to the c kwarg.  The symbols have no
            face area, so only the edgecolor is visible. - EF
 
+2011-02-27 Support libpng version 1.5.x; suggestion by Michael
+           Albert. Changed installation specification to a
+           minimum of libpng version 1.2.  - EF
+
+2011-02-20 clabel accepts a callable as an fmt kwarg; modified
+           patch by Daniel Hyams. - EF
+
 2011-02-07 Quick workaround for dviread bug #3175113 - JKS
 
 2011-01-04 Tag 1.0.1 for release at r8896
diff --git a/doc/users/installing.rst b/doc/users/installing.rst
@@ -138,7 +138,7 @@ libraries themselves.
     array support for python (`download
     <http://sourceforge.net/project/showfiles.php?group_id=1369&package_id=175103>`__)
 
-libpng 1.1 (or later)
+libpng 1.2 (or later)
     library for loading and saving :term:`PNG` files (`download
     <http://www.libpng.org/pub/png/libpng.html>`__). libpng requires
     zlib. If you are a windows user, you can ignore this since we
diff --git a/src/_png.cpp b/src/_png.cpp
@@ -350,18 +350,18 @@ _png_module::read_png(const Py::Tuple& args)
     png_set_sig_bytes(png_ptr, 8);
     png_read_info(png_ptr, info_ptr);
 
-    png_uint_32 width = info_ptr->width;
-    png_uint_32 height = info_ptr->height;
+    png_uint_32 width = png_get_image_width(png_ptr, info_ptr);
+    png_uint_32 height = png_get_image_height(png_ptr, info_ptr);
 
-    int bit_depth = info_ptr->bit_depth;
+    int bit_depth = png_get_bit_depth(png_ptr, info_ptr);
 
     // Unpack 1, 2, and 4-bit images
     if (bit_depth < 8)
         png_set_packing(png_ptr);
 
     // If sig bits are set, shift data
     png_color_8p sig_bit;
-    if ((info_ptr->color_type != PNG_COLOR_TYPE_PALETTE) &&
+    if ((png_get_color_type(png_ptr, info_ptr) != PNG_COLOR_TYPE_PALETTE) &&
         png_get_sBIT(png_ptr, info_ptr, &sig_bit))
     {
         png_set_shift(png_ptr, sig_bit);
@@ -374,13 +374,13 @@ _png_module::read_png(const Py::Tuple& args)
     }
 
     // Convert palletes to full RGB
-    if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+    if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE)
     {
         png_set_palette_to_rgb(png_ptr);
     }
 
     // If there's an alpha channel convert gray to RGB
-    if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+    if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA)
     {
         png_set_gray_to_rgb(png_ptr);
     }
@@ -408,11 +408,11 @@ _png_module::read_png(const Py::Tuple& args)
     npy_intp dimensions[3];
     dimensions[0] = height;  //numrows
     dimensions[1] = width;   //numcols
-    if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
+    if (png_get_color_type(png_ptr, info_ptr) & PNG_COLOR_MASK_ALPHA)
     {
         dimensions[2] = 4;     //RGBA images
     }
-    else if (info_ptr->color_type & PNG_COLOR_MASK_COLOR)
+    else if (png_get_color_type(png_ptr, info_ptr) & PNG_COLOR_MASK_COLOR)
     {
         dimensions[2] = 3;     //RGB images
     }
@@ -421,7 +421,8 @@ _png_module::read_png(const Py::Tuple& args)
         dimensions[2] = 1;     //Greyscale images
     }
     //For gray, return an x by y array, not an x by y by 1
-    int num_dims  = (info_ptr->color_type & PNG_COLOR_MASK_COLOR) ? 3 : 2;
+    int num_dims  = (png_get_color_type(png_ptr, info_ptr)
+                                & PNG_COLOR_MASK_COLOR) ? 3 : 2;
 
     double max_value = (1 << ((bit_depth < 8) ? 8 : bit_depth)) - 1;
     PyArrayObject *A = (PyArrayObject *) PyArray_SimpleNew(

Original file line number	Diff line number	Diff line change
`@@ -350,18 +350,18 @@ _png_module::read_png(const Py::Tuple& args)`
`350`	`350`	`png_set_sig_bytes(png_ptr, 8);`
`351`	`351`	`png_read_info(png_ptr, info_ptr);`
`352`	`352`
`353`		`- png_uint_32 width = info_ptr->width;`
`354`		`- png_uint_32 height = info_ptr->height;`
	`353`	`+ png_uint_32 width = png_get_image_width(png_ptr, info_ptr);`
	`354`	`+ png_uint_32 height = png_get_image_height(png_ptr, info_ptr);`
`355`	`355`
`356`		`- int bit_depth = info_ptr->bit_depth;`
	`356`	`+ int bit_depth = png_get_bit_depth(png_ptr, info_ptr);`
`357`	`357`
`358`	`358`	`// Unpack 1, 2, and 4-bit images`
`359`	`359`	`if (bit_depth < 8)`
`360`	`360`	`png_set_packing(png_ptr);`
`361`	`361`
`362`	`362`	`// If sig bits are set, shift data`
`363`	`363`	`png_color_8p sig_bit;`
`364`		`- if ((info_ptr->color_type != PNG_COLOR_TYPE_PALETTE) &&`
	`364`	`+ if ((png_get_color_type(png_ptr, info_ptr) != PNG_COLOR_TYPE_PALETTE) &&`
`365`	`365`	`png_get_sBIT(png_ptr, info_ptr, &sig_bit))`
`366`	`366`	`{`
`367`	`367`	`png_set_shift(png_ptr, sig_bit);`
`@@ -374,13 +374,13 @@ _png_module::read_png(const Py::Tuple& args)`
`374`	`374`	`}`
`375`	`375`
`376`	`376`	`// Convert palletes to full RGB`
`377`		`- if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)`
	`377`	`+ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE)`
`378`	`378`	`{`
`379`	`379`	`png_set_palette_to_rgb(png_ptr);`
`380`	`380`	`}`
`381`	`381`
`382`	`382`	`// If there's an alpha channel convert gray to RGB`
`383`		`- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)`
	`383`	`+ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA)`
`384`	`384`	`{`
`385`	`385`	`png_set_gray_to_rgb(png_ptr);`
`386`	`386`	`}`
`@@ -408,11 +408,11 @@ _png_module::read_png(const Py::Tuple& args)`
`408`	`408`	`npy_intp dimensions[3];`
`409`	`409`	`dimensions[0] = height; //numrows`
`410`	`410`	`dimensions[1] = width; //numcols`
`411`		`- if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)`
	`411`	`+ if (png_get_color_type(png_ptr, info_ptr) & PNG_COLOR_MASK_ALPHA)`
`412`	`412`	`{`
`413`	`413`	`dimensions[2] = 4; //RGBA images`
`414`	`414`	`}`
`415`		`- else if (info_ptr->color_type & PNG_COLOR_MASK_COLOR)`
	`415`	`+ else if (png_get_color_type(png_ptr, info_ptr) & PNG_COLOR_MASK_COLOR)`
`416`	`416`	`{`
`417`	`417`	`dimensions[2] = 3; //RGB images`
`418`	`418`	`}`
`@@ -421,7 +421,8 @@ _png_module::read_png(const Py::Tuple& args)`
`421`	`421`	`dimensions[2] = 1; //Greyscale images`
`422`	`422`	`}`
`423`	`423`	`//For gray, return an x by y array, not an x by y by 1`
`424`		`- int num_dims = (info_ptr->color_type & PNG_COLOR_MASK_COLOR) ? 3 : 2;`
	`424`	`+ int num_dims = (png_get_color_type(png_ptr, info_ptr)`
	`425`	`+ & PNG_COLOR_MASK_COLOR) ? 3 : 2;`
`425`	`426`
`426`	`427`	`double max_value = (1 << ((bit_depth < 8) ? 8 : bit_depth)) - 1;`
`427`	`428`	`PyArrayObject A = (PyArrayObject ) PyArray_SimpleNew(`