[Boost-commit] svn:boost r64082 - sandbox/gil/boost/gil/extension/io2

Subject: [Boost-commit] svn:boost r64082 - sandbox/gil/boost/gil/extension/io2
From: dsaritz_at_[hidden]
Date: 2010-07-17 05:29:50

Author: psiha
Date: 2010-07-17 05:29:49 EDT (Sat, 17 Jul 2010)
New Revision: 64082
URL: http://svn.boost.org/trac/boost/changeset/64082

Log:
Minor quick-fixes to fix compilation errors with the latest libpng version.
Text files modified: 
   sandbox/gil/boost/gil/extension/io2/png_io_private.hpp |    12 ++++++------                            
   1 files changed, 6 insertions(+), 6 deletions(-)

Modified: sandbox/gil/boost/gil/extension/io2/png_io_private.hpp
==============================================================================
--- sandbox/gil/boost/gil/extension/io2/png_io_private.hpp	(original)
+++ sandbox/gil/boost/gil/extension/io2/png_io_private.hpp	2010-07-17 05:29:49 EDT (Sat, 17 Jul 2010)
@@ -152,12 +152,12 @@
         // allocate/initialize the image information data
         _info_ptr = png_create_info_struct(_png_ptr);
         if (_info_ptr == NULL) {
-            png_destroy_read_struct(&_png_ptr,png_infopp_NULL,png_infopp_NULL);
+            png_destroy_read_struct(&_png_ptr,0/*png_infopp_NULL*/,0/*png_infopp_NULL*/);
             io_error("png_get_file_size: fail to call png_create_info_struct()");
         }
         if (setjmp(png_jmpbuf(_png_ptr))) {
             //free all of the memory associated with the png_ptr and info_ptr
-            png_destroy_read_struct(&_png_ptr, &_info_ptr, png_infopp_NULL);
+            png_destroy_read_struct(&_png_ptr, &_info_ptr, 0/*png_infopp_NULL*/);
             io_error("png_get_file_size: fail to call setjmp()");
         }
         png_init_io(_png_ptr, get());
@@ -171,7 +171,7 @@
     png_reader(const char* filename) : file_mgr(filename, "rb") { init(); }
 
     ~png_reader() {
-        png_destroy_read_struct(&_png_ptr,&_info_ptr,png_infopp_NULL);
+        png_destroy_read_struct(&_png_ptr,&_info_ptr,0/*png_infopp_NULL*/);
     }
     point2<std::ptrdiff_t> get_dimensions() {
         return point2<std::ptrdiff_t>(png_get_image_width(_png_ptr,_info_ptr),
@@ -183,7 +183,7 @@
         int bit_depth, color_type, interlace_type;
         png_get_IHDR(_png_ptr, _info_ptr,
                      &width, &height,&bit_depth,&color_type,&interlace_type,
-                     int_p_NULL, int_p_NULL);
+                     0/*int_p_NULL*/, 0/*int_p_NULL*/);
         io_error_if(((png_uint_32)view.width()!=width || (png_uint_32)view.height()!= height),
                     "png_read_view: input view size does not match PNG file size");
         
@@ -225,7 +225,7 @@
         int bit_depth, color_type, interlace_type;
         png_get_IHDR(_png_ptr, _info_ptr,
                      &width, &height,&bit_depth,&color_type,&interlace_type,
-                     int_p_NULL, int_p_NULL);
+                     0/*int_p_NULL*/, 0/*int_p_NULL*/);
         io_error_if(((png_uint_32)view.width()!=width || (png_uint_32)view.height()!= height),
                     "png_reader_color_convert::apply(): input view size does not match PNG file size");
         switch (color_type) {
@@ -314,7 +314,7 @@
         io_error_if(!_png_ptr,"png_write_initialize: fail to call png_create_write_struct()");
         _info_ptr = png_create_info_struct(_png_ptr);
         if (!_info_ptr) {
-            png_destroy_write_struct(&_png_ptr,png_infopp_NULL);
+            png_destroy_write_struct(&_png_ptr,0/*png_infopp_NULL*/);
             io_error("png_write_initialize: fail to call png_create_info_struct()");
         }
         if (setjmp(png_jmpbuf(_png_ptr))) {