diff options
Diffstat (limited to 'graphics/py-matplotlib/patches/patch-ab')
-rw-r--r-- | graphics/py-matplotlib/patches/patch-ab | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/graphics/py-matplotlib/patches/patch-ab b/graphics/py-matplotlib/patches/patch-ab deleted file mode 100644 index cc9efa2aa64..00000000000 --- a/graphics/py-matplotlib/patches/patch-ab +++ /dev/null @@ -1,69 +0,0 @@ -$NetBSD: patch-ab,v 1.5 2011/02/17 10:33:37 markd Exp $ - -Fix build with png 1.5 -https://sourceforge.net/tracker/?func=detail&aid=3184016&group_id=80706&atid=560722 - ---- src/_png.cpp.orig 2010-10-12 16:14:42.000000000 +0000 -+++ src/_png.cpp -@@ -350,10 +350,10 @@ _png_module::read_png(const Py::Tuple& a - 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) -@@ -361,7 +361,7 @@ _png_module::read_png(const Py::Tuple& a - - // 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& a - } - - // 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& a - 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,7 @@ _png_module::read_png(const Py::Tuple& a - 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( |