* src/jpeg/libijg12/.cvsignore, jconfig.* : ommited files while last

        commit of JPR (before his hollidays to facilitate our work).
      * setup.py : bug fix in code. Modifications made while the last commit
        of JPR. The code hasn't been tested before the commit... it's so
        useless to make that (for best programmer that is JPR) !!!
      -- BeNours

diff --git a/ChangeLog b/ChangeLog
index 488788b601ce9299433440e323a6613b7a2c36b0..0957af4208b82e8fe0bfae0efb5950449d2b40cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-07-24 Benoit Regrain <Benoit.Regrain@creatis.insa-lyon.fr>
+      * src/jpeg/libijg12/.cvsignore, jconfig.* : ommited files while last
+        commit of JPR (before his hollidays to facilitate our work).
+      * setup.py : bug fix in code. Modifications made while the last commit
+        of JPR. The code hasn't been tested before the commit... it's so
+        useless to make that (for best programmer that is JPR) !!!
+
 2003-07-08  Eric Boix <Eric.Boix@creatis.insa-lyon.fr>
       * tagged the current version as Version0_3 (i.e. version 0.3)
 

diff --git a/setup.py b/setup.py
index bb77e5a9517c41734a1907e92ece5ec57438b77b..fc035382e9096d30a3b69e46e11efb373a31d6dd 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -8,6 +8,7 @@ ThisModule='gdcmPython'
 gdcmPythonSrcDir=ThisModule
 gdcmSrcDir      ="src"
 gdcmJpeg8SrcDir  =os.path.join('src', 'jpeg', 'libijg8')
+gdcmJpeg12SrcDir  =os.path.join('src', 'jpeg', 'libijg12')
 gdcmvtkSrcDir   ="vtk"
 gdcmDictsDir    ="Dicts"
 gdcmTestDir     ="Test"
@@ -19,7 +20,7 @@ if(os.name=='posix'):
        libraries=["stdc++"]
        macros   =[('__STDC_LIMIT_MACROS', '1')]
 
-       VTKPATH="/usr"
+       VTKPATH="/usr/local"
        vtkWrapper="vtkWrapPython"
 else:
        targetDir=os.path.join('lib','site-packages')
@@ -78,7 +79,7 @@ vtkSources = []
 vtkSources.extend(glob.glob(os.path.join(gdcmvtkSrcDir,"vtk*.cxx")))
 vtkSources.extend(glob.glob(os.path.join(gdcmSrcDir,"*.cxx")))
 vtkSources.extend(Jpeg8Sources)
-vtkSources.extend(Jpeg12ources)
+vtkSources.extend(Jpeg12Sources)
 vtkLibraries=["vtkCommon","vtkCommonPython",
               "vtkIO","vtkIOPython",
               "vtkFiltering","vtkFilteringPython"]
@@ -96,7 +97,8 @@ setup(name=ThisModule,
       cmdclass={'build_ext':build_extWrap}, # redirects default build_ext
       ext_modules=[SwigExtension(name='_gdcm',
                                  sources=Sources,
-                                 include_dirs=[gdcmSrcDir,gdcmJpeg8SrcDir],[gdcmSrcDir,gdcmJpeg12SrcDir],
+                                 include_dirs=[gdcmSrcDir,gdcmJpeg8SrcDir,
+                                               gdcmSrcDir,gdcmJpeg12SrcDir],
                                  libraries=libraries,
                                  define_macros=macros,
                                  swig_cpp=1,

diff --git a/src/jpeg/libijg12/.cvsignore b/src/jpeg/libijg12/.cvsignore
new file mode 100644 (file)
index 0000000..4727c1b
--- /dev/null
+++ b/src/jpeg/libijg12/.cvsignore
@@ -0,0 +1,8 @@
+*.o
+*.so
+.deps
+.libs
+Makefile.in
+Makefile
+*.lo
+*.la

diff --git a/src/jpeg/libijg12/jconfig.h b/src/jpeg/libijg12/jconfig.h
new file mode 100644 (file)
index 0000000..fc0d3d8
--- /dev/null
+++ b/src/jpeg/libijg12/jconfig.h
@@ -0,0 +1,7 @@
+#ifdef _MSC_VER
+   #include "jconfig.vc"
+#endif
+#ifdef __GNUC__
+   #include "jconfig.linux"
+#endif
+

diff --git a/src/jpeg/libijg12/jconfig.linux b/src/jpeg/libijg12/jconfig.linux
new file mode 100644 (file)
index 0000000..9594ec5
--- /dev/null
+++ b/src/jpeg/libijg12/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/libijg12/jconfig.vc b/src/jpeg/libijg12/jconfig.vc
new file mode 100644 (file)
index 0000000..7e291c7
--- /dev/null
+++ b/src/jpeg/libijg12/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 */