[libcvd-members] libcvd/pnm_src png.cc pnm_grok.cxx

[Edward Rosten]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Edward Rosten <edrosten>        07/10/09 16:55:32

Modified files:
        pnm_src        : png.cc pnm_grok.cxx 

Log message:
        Fix endianess in 16 bit image writing.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/pnm_src/png.cc?cvsroot=libcvd&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/libcvd/pnm_src/pnm_grok.cxx?cvsroot=libcvd&r1=1.9&r2=1.10

Patches:
Index: png.cc
===================================================================
RCS file: /cvsroot/libcvd/libcvd/pnm_src/png.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- png.cc      29 Sep 2006 21:40:27 -0000      1.3
+++ png.cc      9 Oct 2007 16:55:31 -0000       1.4
@@ -222,13 +222,15 @@
        //Set up the image type
        png_set_IHDR(png_ptr, info_ptr, w, h, depth, c_type, 
PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
        
+       //Write the header 
+       png_write_info(png_ptr, info_ptr);
+       
+       //Write the transformations
        #ifdef CVD_ARCH_LITTLE_ENDIAN
                if (depth > 8)
                        png_set_swap(png_ptr);
        #endif
 
-       //Write the header 
-       png_write_info(png_ptr, info_ptr);
 }
 
 void png_out::pack()

Index: pnm_grok.cxx
===================================================================
RCS file: /cvsroot/libcvd/libcvd/pnm_src/pnm_grok.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- pnm_grok.cxx        7 Dec 2005 14:45:20 -0000       1.9
+++ pnm_grok.cxx        9 Oct 2007 16:55:32 -0000       1.10
@@ -67,7 +67,7 @@
 //#ifdef FAST_SHORT_IO
 #define LONG_PNM_FAST_LOAD
 
-#ifdef ARCH_LITTLE_ENDIAN
+#ifdef CVD_ARCH_LITTLE_ENDIAN
 #define SWAP_BYTES
 #else
 #define LONG_PNM_FAST_SAVE