[libcvd-members] libcvd/pnm_src png.cc

[Edward Rosten]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Edward Rosten <edrosten>        11/08/10 15:53:53

Modified files:
        pnm_src        : png.cc 

Log message:
        Remove direct use of png_struct and png_info_struct, so that it compiles
        with libpng >= 1.5.0 (tested with 1.5.4).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/pnm_src/png.cc?cvsroot=libcvd&r1=1.17&r2=1.18

Patches:
Index: png.cc
===================================================================
RCS file: /cvsroot/libcvd/libcvd/pnm_src/png.cc,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- png.cc      10 Aug 2011 15:48:36 -0000      1.17
+++ png.cc      10 Aug 2011 15:53:53 -0000      1.18
@@ -18,7 +18,7 @@
 // 
 static void error_fn(png_structp png_ptr, png_const_charp error_msg)
 {
-       *(string*)(png_ptr->error_ptr) = error_msg;
+       *(string*)png_get_error_ptr(png_ptr) = error_msg;
 }
 
 static void warn_fn(png_structp, png_const_charp )
@@ -67,8 +67,8 @@
                std::istream& i;
                std::string type;
                unsigned long row;
-               png_struct_def* png_ptr;
-               png_info_struct* info_ptr, *end_info;
+               png_structp png_ptr;
+               png_infop info_ptr, end_info;
 
                std::string error_string;
                ImageRef my_size;
@@ -342,8 +342,8 @@
        std::string type;
        std::string error_string;
 
-       png_struct_def* png_ptr;
-       png_info_struct* info_ptr, *end_info;
+       png_structp png_ptr;
+       png_infop info_ptr, end_info;
 
 };