[patch] proposed patch

ncbi-tools++-2010.06.15-libpng15.patch (text/plain), 1.21 KB, created by Markos Chandras (RETIRED) on 2011-09-20 21:22:24 UTC

Index: ncbi_cxx--Jun_15_2010/src/util/image/image_io_png.cpp
===================================================================
--- ncbi_cxx--Jun_15_2010.orig/src/util/image/image_io_png.cpp
+++ ncbi_cxx--Jun_15_2010/src/util/image/image_io_png.cpp
@@ -34,6 +34,7 @@
 #include <util/image/image.hpp>
 #include <util/image/image_exception.hpp>
 #include <util/error_codes.hpp>
+#include <zlib.h>
 
 #define NCBI_USE_ERRCODE_X   Util_Image
 
@@ -177,11 +178,11 @@ static void s_PngReadValidate(png_struct
                               size_t& x, size_t& y, size_t& w, size_t& h)
 {
     // store and validate our image's parameters
-    width        = info_ptr->width;
-    height       = info_ptr->height;
-    depth        = info_ptr->channels;
-    png_byte color_type = info_ptr->color_type;
-    png_byte bit_depth  = info_ptr->bit_depth;
+    width        = png_get_image_width(png_ptr,info_ptr);
+    height       = png_get_image_height(png_ptr,info_ptr);
+    depth        = png_get_channels(png_ptr,info_ptr);
+    png_byte color_type = png_get_color_type(png_ptr,info_ptr);
+    png_byte bit_depth  = png_get_bit_depth(png_ptr,info_ptr);
 
     // we support only RGB and RGBA images
     if ( color_type != PNG_COLOR_TYPE_RGB  &&