[libcvd-members] libcvd/cvd/internal/io jpeg.h

[Gerhard Reitmayr]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Gerhard Reitmayr <gerhard>      07/10/04 15:59:36

Modified files:
        cvd/internal/io: jpeg.h 

Log message:
        moved jpeglib include into local namespace to avoid conflicting typedef 
with X header

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/internal/io/jpeg.h?cvsroot=libcvd&r1=1.5&r2=1.6

Patches:
Index: jpeg.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd/internal/io/jpeg.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- jpeg.h      15 Aug 2007 02:29:36 -0000      1.5
+++ jpeg.h      4 Oct 2007 15:59:36 -0000       1.6
@@ -25,9 +25,6 @@
 #include <string>
 #include <vector>
 #include <memory>
-extern "C"{
-#include <jpeglib.h>
-};
 
 #include <cvd/image.h>
 #include <cvd/byte.h>
@@ -38,6 +35,9 @@
 {
 namespace JPEG
 {
+extern "C"{
+#include <jpeglib.h>
+};
 
        class jpeg_in
        {
@@ -165,4 +165,5 @@
 
 }
 }
+
 #endif