+2003-07-02 Benoit Regrain <Benoit.Regrain@creatis.insa-lyon.fr>
+ * src/jpeg/libijg8/jconfig.* : JPR bug fix : now compile on both
+ linux and WINDOWS !
+ * src/gdcmJpeg.cxx : JPR bug fix : erroneous include
+ * src/win32/gdcmdll.dsp : JPR fix for windows compilation
+
2003-07-02 Eric Boix <Eric.Boix@creatis.insa-lyon.fr>
* setup.py is again effective on un*x (takes into account the
addon of the jpeg library)
-#include <gdcmFile.h>
#include <stdio.h>
+#include "gdcmFile.h"
#define DEBUG 0
-/* jconfig.h. Generated automatically by configure. */
-/* jconfig.cfg --- source file edited by configure script */
-/* see jconfig.doc for explanations */
-
-#define HAVE_PROTOTYPES
-#define HAVE_UNSIGNED_CHAR
-#define HAVE_UNSIGNED_SHORT
-#undef void
-#undef const
-#undef CHAR_IS_UNSIGNED
-#define HAVE_STDDEF_H
-#define HAVE_STDLIB_H
-#undef NEED_BSD_STRINGS
-#undef NEED_SYS_TYPES_H
-#undef NEED_FAR_POINTERS
-#undef NEED_SHORT_EXTERNAL_NAMES
-/* Define this if you get warnings about undefined structures. */
-#undef INCOMPLETE_TYPES_BROKEN
-
-#ifdef JPEG_INTERNALS
-
-#undef RIGHT_SHIFT_IS_UNSIGNED
-#define INLINE __inline__
-/* These are for configuring the JPEG memory manager. */
-#undef DEFAULT_MAX_MEM
-#undef NO_MKTEMP
-
-#endif /* JPEG_INTERNALS */
-
-#ifdef JPEG_CJPEG_DJPEG
-
-#define BMP_SUPPORTED /* BMP image file format */
-#define GIF_SUPPORTED /* GIF image file format */
-#define PPM_SUPPORTED /* PBMPLUS PPM/PGM image file format */
-#undef RLE_SUPPORTED /* Utah RLE image file format */
-#define TARGA_SUPPORTED /* Targa image file format */
-
-#undef TWO_FILE_COMMANDLINE
-#undef NEED_SIGNAL_CATCHER
-#undef DONT_USE_B_MODE
-
-/* Define this if you want percent-done progress reports from cjpeg/djpeg. */
-#undef PROGRESS_REPORT
-
-#endif /* JPEG_CJPEG_DJPEG */
+#ifdef _MSC_VER
+ #include "jconfig.vc"
+#endif
+#ifdef __GNUC__
+ #include "jconfig.linux"
+#endif
\ No newline at end of file
--- /dev/null
+/* jconfig.h. Generated automatically by configure. */
+/* jconfig.cfg --- source file edited by configure script */
+/* see jconfig.doc for explanations */
+
+#define HAVE_PROTOTYPES
+#define HAVE_UNSIGNED_CHAR
+#define HAVE_UNSIGNED_SHORT
+#undef void
+#undef const
+#undef CHAR_IS_UNSIGNED
+#define HAVE_STDDEF_H
+#define HAVE_STDLIB_H
+#undef NEED_BSD_STRINGS
+#undef NEED_SYS_TYPES_H
+#undef NEED_FAR_POINTERS
+#undef NEED_SHORT_EXTERNAL_NAMES
+/* Define this if you get warnings about undefined structures. */
+#undef INCOMPLETE_TYPES_BROKEN
+
+#ifdef JPEG_INTERNALS
+
+#undef RIGHT_SHIFT_IS_UNSIGNED
+#define INLINE __inline__
+/* These are for configuring the JPEG memory manager. */
+#undef DEFAULT_MAX_MEM
+#undef NO_MKTEMP
+
+#endif /* JPEG_INTERNALS */
+
+#ifdef JPEG_CJPEG_DJPEG
+
+#define BMP_SUPPORTED /* BMP image file format */
+#define GIF_SUPPORTED /* GIF image file format */
+#define PPM_SUPPORTED /* PBMPLUS PPM/PGM image file format */
+#undef RLE_SUPPORTED /* Utah RLE image file format */
+#define TARGA_SUPPORTED /* Targa image file format */
+
+#undef TWO_FILE_COMMANDLINE
+#undef NEED_SIGNAL_CATCHER
+#undef DONT_USE_B_MODE
+
+/* Define this if you want percent-done progress reports from cjpeg/djpeg. */
+#undef PROGRESS_REPORT
+
+#endif /* JPEG_CJPEG_DJPEG */
--- /dev/null
+/* jconfig.vc --- jconfig.h for Microsoft Visual C++ on Windows 95 or NT. */
+/* see jconfig.doc for explanations */
+
+#define HAVE_PROTOTYPES
+#define HAVE_UNSIGNED_CHAR
+#define HAVE_UNSIGNED_SHORT
+/* #define void char */
+/* #define const */
+#undef CHAR_IS_UNSIGNED
+#define HAVE_STDDEF_H
+#define HAVE_STDLIB_H
+#undef NEED_BSD_STRINGS
+#undef NEED_SYS_TYPES_H
+#undef NEED_FAR_POINTERS /* we presume a 32-bit flat memory model */
+#undef NEED_SHORT_EXTERNAL_NAMES
+#undef INCOMPLETE_TYPES_BROKEN
+
+/* Define "boolean" as unsigned char, not int, per Windows custom */
+#ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */
+typedef unsigned char boolean;
+#endif
+#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */
+
+
+#ifdef JPEG_INTERNALS
+
+#undef RIGHT_SHIFT_IS_UNSIGNED
+
+#endif /* JPEG_INTERNALS */
+
+#ifdef JPEG_CJPEG_DJPEG
+
+#define BMP_SUPPORTED /* BMP image file format */
+#define GIF_SUPPORTED /* GIF image file format */
+#define PPM_SUPPORTED /* PBMPLUS PPM/PGM image file format */
+#undef RLE_SUPPORTED /* Utah RLE image file format */
+#define TARGA_SUPPORTED /* Targa image file format */
+
+#define TWO_FILE_COMMANDLINE /* optional */
+#define USE_SETMODE /* Microsoft has setmode() */
+#undef NEED_SIGNAL_CATCHER
+#undef DONT_USE_B_MODE
+#undef PROGRESS_REPORT /* optional */
+
+#endif /* JPEG_CJPEG_DJPEG */
-/* jconfig.h. Generated automatically by configure. */
-/* jconfig.cfg --- source file edited by configure script */
-/* see jconfig.doc for explanations */
-
-#define HAVE_PROTOTYPES
-#define HAVE_UNSIGNED_CHAR
-#define HAVE_UNSIGNED_SHORT
-#undef void
-#undef const
-#undef CHAR_IS_UNSIGNED
-#define HAVE_STDDEF_H
-#define HAVE_STDLIB_H
-#undef NEED_BSD_STRINGS
-#undef NEED_SYS_TYPES_H
-#undef NEED_FAR_POINTERS
-#undef NEED_SHORT_EXTERNAL_NAMES
-/* Define this if you get warnings about undefined structures. */
-#undef INCOMPLETE_TYPES_BROKEN
-
-#ifdef JPEG_INTERNALS
-
-#undef RIGHT_SHIFT_IS_UNSIGNED
-#define INLINE __inline__
-/* These are for configuring the JPEG memory manager. */
-#undef DEFAULT_MAX_MEM
-#undef NO_MKTEMP
-
-#endif /* JPEG_INTERNALS */
-
-#ifdef JPEG_CJPEG_DJPEG
-
-#define BMP_SUPPORTED /* BMP image file format */
-#define GIF_SUPPORTED /* GIF image file format */
-#define PPM_SUPPORTED /* PBMPLUS PPM/PGM image file format */
-#undef RLE_SUPPORTED /* Utah RLE image file format */
-#define TARGA_SUPPORTED /* Targa image file format */
-
-#undef TWO_FILE_COMMANDLINE
-#undef NEED_SIGNAL_CATCHER
-#undef DONT_USE_B_MODE
-
-/* Define this if you want percent-done progress reports from cjpeg/djpeg. */
-#undef PROGRESS_REPORT
-
-#endif /* JPEG_CJPEG_DJPEG */
+#ifdef _MSC_VER
+ #include "jconfig.vc"
+#endif
+#ifdef __GNUC__
+ #include "jconfig.linux"
+#endif
\ No newline at end of file
--- /dev/null
+/* jconfig.h. Generated automatically by configure. */
+/* jconfig.cfg --- source file edited by configure script */
+/* see jconfig.doc for explanations */
+
+#define HAVE_PROTOTYPES
+#define HAVE_UNSIGNED_CHAR
+#define HAVE_UNSIGNED_SHORT
+#undef void
+#undef const
+#undef CHAR_IS_UNSIGNED
+#define HAVE_STDDEF_H
+#define HAVE_STDLIB_H
+#undef NEED_BSD_STRINGS
+#undef NEED_SYS_TYPES_H
+#undef NEED_FAR_POINTERS
+#undef NEED_SHORT_EXTERNAL_NAMES
+/* Define this if you get warnings about undefined structures. */
+#undef INCOMPLETE_TYPES_BROKEN
+
+#ifdef JPEG_INTERNALS
+
+#undef RIGHT_SHIFT_IS_UNSIGNED
+#define INLINE __inline__
+/* These are for configuring the JPEG memory manager. */
+#undef DEFAULT_MAX_MEM
+#undef NO_MKTEMP
+
+#endif /* JPEG_INTERNALS */
+
+#ifdef JPEG_CJPEG_DJPEG
+
+#define BMP_SUPPORTED /* BMP image file format */
+#define GIF_SUPPORTED /* GIF image file format */
+#define PPM_SUPPORTED /* PBMPLUS PPM/PGM image file format */
+#undef RLE_SUPPORTED /* Utah RLE image file format */
+#define TARGA_SUPPORTED /* Targa image file format */
+
+#undef TWO_FILE_COMMANDLINE
+#undef NEED_SIGNAL_CATCHER
+#undef DONT_USE_B_MODE
+
+/* Define this if you want percent-done progress reports from cjpeg/djpeg. */
+#undef PROGRESS_REPORT
+
+#endif /* JPEG_CJPEG_DJPEG */
--- /dev/null
+/* jconfig.vc --- jconfig.h for Microsoft Visual C++ on Windows 95 or NT. */
+/* see jconfig.doc for explanations */
+
+#define HAVE_PROTOTYPES
+#define HAVE_UNSIGNED_CHAR
+#define HAVE_UNSIGNED_SHORT
+/* #define void char */
+/* #define const */
+#undef CHAR_IS_UNSIGNED
+#define HAVE_STDDEF_H
+#define HAVE_STDLIB_H
+#undef NEED_BSD_STRINGS
+#undef NEED_SYS_TYPES_H
+#undef NEED_FAR_POINTERS /* we presume a 32-bit flat memory model */
+#undef NEED_SHORT_EXTERNAL_NAMES
+#undef INCOMPLETE_TYPES_BROKEN
+
+/* Define "boolean" as unsigned char, not int, per Windows custom */
+#ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */
+typedef unsigned char boolean;
+#endif
+#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */
+
+
+#ifdef JPEG_INTERNALS
+
+#undef RIGHT_SHIFT_IS_UNSIGNED
+
+#endif /* JPEG_INTERNALS */
+
+#ifdef JPEG_CJPEG_DJPEG
+
+#define BMP_SUPPORTED /* BMP image file format */
+#define GIF_SUPPORTED /* GIF image file format */
+#define PPM_SUPPORTED /* PBMPLUS PPM/PGM image file format */
+#undef RLE_SUPPORTED /* Utah RLE image file format */
+#define TARGA_SUPPORTED /* Targa image file format */
+
+#define TWO_FILE_COMMANDLINE /* optional */
+#define USE_SETMODE /* Microsoft has setmode() */
+#undef NEED_SIGNAL_CATCHER
+#undef DONT_USE_B_MODE
+#undef PROGRESS_REPORT /* optional */
+
+#endif /* JPEG_CJPEG_DJPEG */
# PROP Ignore_Export_Lib 0\r
# PROP Target_Dir ""\r
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMDLL_EXPORTS" /YX /FD /c\r
-# ADD CPP /nologo /MD /w /W0 /GX /O2 /I "$(CREATIS)\glib-1.3\src\glib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMDLL_EXPORTS" /YX /FD /c\r
+# ADD CPP /nologo /MD /w /W0 /GX /O2 /I "$(CREATIS)\glib-1.3\src\glib" /I "..\jpeg\libijg8" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMDLL_EXPORTS" /YX /FD /c\r
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
# ADD BASE RSC /l 0x40c /d "NDEBUG"\r
# Begin Special Build Tool\r
SOURCE="$(InputPath)"\r
PostBuild_Desc=Copy for test\r
-PostBuild_Cmds=copy ..\..\lib\gdcmdll.dll ..\..\gdcmPython\ copy ..\..\lib\gdcmdll.dll ..\..\test\ copy Release\gdcmdll.lib ..\..\lib\ \r
+PostBuild_Cmds=copy ..\..\lib\gdcmdll.dll ..\..\gdcmPython\ copy ..\..\lib\gdcmdll.dll ..\..\test\ copy Release\gdcmdll.lib ..\..\lib\ \r
# End Special Build Tool\r
\r
!ELSEIF "$(CFG)" == "gdcmdll - Win32 Debug"\r
# PROP Ignore_Export_Lib 0\r
# PROP Target_Dir ""\r
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMDLL_EXPORTS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MDd /w /W0 /Gm /GX /ZI /Od /I "$(CREATIS)\glib-1.3\src\glib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMDLL_EXPORTS" /YX /FD /GZ /c\r
+# ADD CPP /nologo /MDd /w /W0 /Gm /GX /ZI /Od /I "$(CREATIS)\glib-1.3\src\glib" /I "..\jpeg\libijg8" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMDLL_EXPORTS" /YX /FD /GZ /c\r
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
# ADD BASE RSC /l 0x40c /d "_DEBUG"\r
# Begin Special Build Tool\r
SOURCE="$(InputPath)"\r
PostBuild_Desc=Copy for test\r
-PostBuild_Cmds=copy ..\..\lib\gdcmdll.dll ..\..\gdcmPython\ copy ..\..\lib\gdcmdll.dll ..\..\test\ copy Debug\gdcmdll.lib ..\..\lib\ \r
+PostBuild_Cmds=copy ..\..\lib\gdcmdll.dll ..\..\gdcmPython\ copy ..\..\lib\gdcmdll.dll ..\..\test\ copy Debug\gdcmdll.lib ..\..\lib\ \r
# End Special Build Tool\r
\r
!ENDIF \r
# End Source File\r
# Begin Source File\r
\r
+SOURCE=..\gdcmJpegIdo.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\gdcmTS.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
SOURCE=..\gdcmUtil.cxx\r
# End Source File\r
# Begin Source File\r
\r
SOURCE=..\gdcmVR.cxx\r
# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jcapimin.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jcapistd.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jccoefct.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jccolor.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jcdctmgr.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jchuff.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jcinit.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jcmainct.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jcmarker.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jcmaster.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jcomapi.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jcparam.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jcphuff.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jcprepct.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jcsample.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jctrans.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jdapimin.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jdapistd.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jdatadst.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jdatasrc.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jdcoefct.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jdcolor.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jddctmgr.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jdhuff.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jdinput.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jdmainct.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jdmarker.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jdmaster.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jdmerge.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jdphuff.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jdpostct.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jdsample.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jdtrans.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jerror.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jfdctflt.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jfdctfst.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jfdctint.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jidctflt.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jidctfst.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jidctint.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jidctred.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jmemmgr.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jmemnobs.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jquant1.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jquant2.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jutils.c\r
+# End Source File\r
# End Group\r
# Begin Group "Header Files"\r
\r
\r
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
# End Group\r
+# Begin Source File\r
+\r
+SOURCE=..\jp\r
+# End Source File\r
# End Target\r
# End Project\r