From: regrain Date: Wed, 2 Jul 2003 15:15:43 +0000 (+0000) Subject: * src/jpeg/libijg8/jconfig.* : JPR bug fix : now compile on both X-Git-Tag: Version0.3~14 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=a291236421a150031dbadcb146776cb39b5f3d21;p=gdcm.git * 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 -- BeNours --- diff --git a/ChangeLog b/ChangeLog index 5c0a2a28..3b4b930a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-07-02 Benoit Regrain + * 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 * setup.py is again effective on un*x (takes into account the addon of the jpeg library) diff --git a/src/gdcmJpeg.cxx b/src/gdcmJpeg.cxx index d82ce565..280adce3 100644 --- a/src/gdcmJpeg.cxx +++ b/src/gdcmJpeg.cxx @@ -1,5 +1,5 @@ -#include #include +#include "gdcmFile.h" #define DEBUG 0 diff --git a/src/jpeg/libijg/jconfig.h b/src/jpeg/libijg/jconfig.h index 9594ec56..a0d3a360 100644 --- a/src/jpeg/libijg/jconfig.h +++ b/src/jpeg/libijg/jconfig.h @@ -1,45 +1,6 @@ -/* 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 diff --git a/src/jpeg/libijg/jconfig.linux b/src/jpeg/libijg/jconfig.linux new file mode 100644 index 00000000..9594ec56 --- /dev/null +++ b/src/jpeg/libijg/jconfig.linux @@ -0,0 +1,45 @@ +/* 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 */ diff --git a/src/jpeg/libijg/jconfig.vc b/src/jpeg/libijg/jconfig.vc new file mode 100644 index 00000000..7e291c75 --- /dev/null +++ b/src/jpeg/libijg/jconfig.vc @@ -0,0 +1,45 @@ +/* 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 */ diff --git a/src/jpeg/libijg8/jconfig.h b/src/jpeg/libijg8/jconfig.h index 9594ec56..a0d3a360 100644 --- a/src/jpeg/libijg8/jconfig.h +++ b/src/jpeg/libijg8/jconfig.h @@ -1,45 +1,6 @@ -/* 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 diff --git a/src/jpeg/libijg8/jconfig.linux b/src/jpeg/libijg8/jconfig.linux new file mode 100644 index 00000000..9594ec56 --- /dev/null +++ b/src/jpeg/libijg8/jconfig.linux @@ -0,0 +1,45 @@ +/* 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 */ diff --git a/src/jpeg/libijg8/jconfig.vc b/src/jpeg/libijg8/jconfig.vc new file mode 100644 index 00000000..7e291c75 --- /dev/null +++ b/src/jpeg/libijg8/jconfig.vc @@ -0,0 +1,45 @@ +/* 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 */ diff --git a/src/win32/gdcmdll.dsp b/src/win32/gdcmdll.dsp index 4c38ef9f..b33fa499 100644 --- a/src/win32/gdcmdll.dsp +++ b/src/win32/gdcmdll.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMDLL_EXPORTS" /YX /FD /c -# 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 +# 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 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40c /d "NDEBUG" @@ -58,7 +58,7 @@ LINK32=link.exe # Begin Special Build Tool SOURCE="$(InputPath)" PostBuild_Desc=Copy for test -PostBuild_Cmds=copy ..\..\lib\gdcmdll.dll ..\..\gdcmPython\ copy ..\..\lib\gdcmdll.dll ..\..\test\ copy Release\gdcmdll.lib ..\..\lib\ +PostBuild_Cmds=copy ..\..\lib\gdcmdll.dll ..\..\gdcmPython\ copy ..\..\lib\gdcmdll.dll ..\..\test\ copy Release\gdcmdll.lib ..\..\lib\ # End Special Build Tool !ELSEIF "$(CFG)" == "gdcmdll - Win32 Debug" @@ -75,7 +75,7 @@ PostBuild_Cmds=copy ..\..\lib\gdcmdll.dll ..\..\gdcmPython\ copy # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # 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 -# 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 +# 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 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40c /d "_DEBUG" @@ -90,7 +90,7 @@ LINK32=link.exe # Begin Special Build Tool SOURCE="$(InputPath)" PostBuild_Desc=Copy for test -PostBuild_Cmds=copy ..\..\lib\gdcmdll.dll ..\..\gdcmPython\ copy ..\..\lib\gdcmdll.dll ..\..\test\ copy Debug\gdcmdll.lib ..\..\lib\ +PostBuild_Cmds=copy ..\..\lib\gdcmdll.dll ..\..\gdcmPython\ copy ..\..\lib\gdcmdll.dll ..\..\test\ copy Debug\gdcmdll.lib ..\..\lib\ # End Special Build Tool !ENDIF @@ -144,12 +144,204 @@ SOURCE=..\gdcmJpeg.cxx # End Source File # Begin Source File +SOURCE=..\gdcmJpegIdo.cxx +# End Source File +# Begin Source File + +SOURCE=..\gdcmTS.cxx +# End Source File +# Begin Source File + SOURCE=..\gdcmUtil.cxx # End Source File # Begin Source File SOURCE=..\gdcmVR.cxx # End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jcapimin.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jcapistd.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jccoefct.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jccolor.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jcdctmgr.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jchuff.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jcinit.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jcmainct.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jcmarker.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jcmaster.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jcomapi.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jcparam.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jcphuff.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jcprepct.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jcsample.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jctrans.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jdapimin.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jdapistd.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jdatadst.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jdatasrc.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jdcoefct.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jdcolor.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jddctmgr.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jdhuff.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jdinput.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jdmainct.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jdmarker.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jdmaster.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jdmerge.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jdphuff.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jdpostct.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jdsample.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jdtrans.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jerror.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jfdctflt.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jfdctfst.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jfdctint.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jidctflt.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jidctfst.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jidctint.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jidctred.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jmemmgr.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jmemnobs.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jquant1.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jquant2.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\libijg8\jutils.c +# End Source File # End Group # Begin Group "Header Files" @@ -159,5 +351,9 @@ SOURCE=..\gdcmVR.cxx # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" # End Group +# Begin Source File + +SOURCE=..\jp +# End Source File # End Target # End Project