[libcvd-members] libcvd cvd_src/bayer.cxx pnm_src/fits.cc

[Gerhard Reitmayr]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Gerhard Reitmayr <gerhard>      10/04/15 11:24:29

Modified files:
        cvd_src        : bayer.cxx 
        pnm_src        : fits.cc 

Log message:
        htonX for Win32

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/bayer.cxx?cvsroot=libcvd&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/libcvd/pnm_src/fits.cc?cvsroot=libcvd&r1=1.6&r2=1.7

Patches:
Index: cvd_src/bayer.cxx
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/bayer.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- cvd_src/bayer.cxx   17 Mar 2010 12:49:24 -0000      1.8
+++ cvd_src/bayer.cxx   15 Apr 2010 11:24:29 -0000      1.9
@@ -20,7 +20,11 @@
 */
 #include <string.h>
 #include <cvd/colourspace.h>
+#ifdef WIN32
+#include <Winsock2.h>
+#else
 #include <netinet/in.h>
+#endif
 
 //Written by Ethan
 //Modified by Olaf :)
@@ -42,12 +46,21 @@
   static unsigned short get(const unsigned short & from) { return ntohs(from); 
}
 };
 
+#ifdef WIN32
+template <>
+struct read_net_byteorder<unsigned long>
+{
+  static unsigned short get(const unsigned short & from) { return ntohl(from); 
}
+};
+#else
 template <>
 struct read_net_byteorder<uint32_t>
 {
   static unsigned short get(const unsigned short & from) { return ntohl(from); 
}
 };
 
+#endif
+
 
 // RGRGRG
 // GBGBGB

Index: pnm_src/fits.cc
===================================================================
RCS file: /cvsroot/libcvd/libcvd/pnm_src/fits.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- pnm_src/fits.cc     4 Jun 2009 17:07:50 -0000       1.6
+++ pnm_src/fits.cc     15 Apr 2010 11:24:29 -0000      1.7
@@ -18,9 +18,9 @@
        Foundation, Inc., 
     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
+#include "cvd/config.h"
 #include "cvd/internal/io/fits.h"
 #include "cvd/image_io.h"
-#include "cvd/config.h"
 #include <algorithm>
 #include <vector>
 #include <deque>