ENH: I am a moron. Fix compilation of gdcm in static mode, I had to add some new...

diff --git a/src/jpeg/libijg/gdcm_mangle_12bits.h b/src/jpeg/libijg/gdcm_mangle_12bits.h
index f990724710f8c36d55b628050c4f805a7422cef1..b65b040ae1997ec5d7a3da5d70efbe7636d420c3 100644 (file)
--- a/src/jpeg/libijg/gdcm_mangle_12bits.h
+++ b/src/jpeg/libijg/gdcm_mangle_12bits.h
@@ -85,6 +85,7 @@ nm libgdcmijpeg12.a | grep " T " | colrm 1 11 | sort
 #define jpeg_mem_available gdcm_jpeg12_jpeg_mem_available
 #define jpeg_mem_init gdcm_jpeg12_jpeg_mem_init
 #define jpeg_mem_term gdcm_jpeg12_jpeg_mem_term
+#define jpeg_natural_order gdcm_jpeg12_jpeg_natural_order
 #define jpeg_new_colormap gdcm_jpeg12_jpeg_new_colormap
 #define jpeg_open_backing_store gdcm_jpeg12_jpeg_open_backing_store
 #define jpeg_quality_scaling gdcm_jpeg12_jpeg_quality_scaling
@@ -104,6 +105,7 @@ nm libgdcmijpeg12.a | grep " T " | colrm 1 11 | sort
 #define jpeg_start_decompress gdcm_jpeg12_jpeg_start_decompress
 #define jpeg_start_output gdcm_jpeg12_jpeg_start_output
 #define jpeg_std_error gdcm_jpeg12_jpeg_std_error
+#define jpeg_std_message_table gdcm_jpeg12_jpeg_std_message_table
 #define jpeg_stdio_dest gdcm_jpeg12_jpeg_stdio_dest
 #define jpeg_stdio_src gdcm_jpeg12_jpeg_stdio_src
 #define jpeg_suppress_tables gdcm_jpeg12_jpeg_suppress_tables

diff --git a/src/jpeg/libijg/gdcm_mangle_8bits.h b/src/jpeg/libijg/gdcm_mangle_8bits.h
index a2b6560bf3a93dda0878a3f464a93da6d15a00b7..56b48f3505635dda30864b1036035e21a420630e 100644 (file)
--- a/src/jpeg/libijg/gdcm_mangle_8bits.h
+++ b/src/jpeg/libijg/gdcm_mangle_8bits.h
@@ -10,7 +10,7 @@ GDCM. This also allows us to generate two jpeg library (8bits and 12bits).
 
 The following command was used to obtain the symbol list:
 
-nm libgdcmijpeg8.a | grep " T " | colrm 1 11 | sort
+nm libgdcmijpeg8.a | grep " [R|T] " | colrm 1 11 | sort
 */
 
 #define jcopy_block_row gdcm_jpeg8_jcopy_block_row
@@ -83,6 +83,7 @@ nm libgdcmijpeg8.a | grep " T " | colrm 1 11 | sort
 #define jpeg_mem_available gdcm_jpeg8_jpeg_mem_available
 #define jpeg_mem_init gdcm_jpeg8_jpeg_mem_init
 #define jpeg_mem_term gdcm_jpeg8_jpeg_mem_term
+#define jpeg_natural_order gdcm_jpeg8_jpeg_natural_order
 #define jpeg_new_colormap gdcm_jpeg8_jpeg_new_colormap
 #define jpeg_open_backing_store gdcm_jpeg8_jpeg_open_backing_store
 #define jpeg_quality_scaling gdcm_jpeg8_jpeg_quality_scaling
@@ -102,6 +103,7 @@ nm libgdcmijpeg8.a | grep " T " | colrm 1 11 | sort
 #define jpeg_start_decompress gdcm_jpeg8_jpeg_start_decompress
 #define jpeg_start_output gdcm_jpeg8_jpeg_start_output
 #define jpeg_std_error gdcm_jpeg8_jpeg_std_error
+#define jpeg_std_message_table gdcm_jpeg8_jpeg_std_message_table
 #define jpeg_stdio_dest gdcm_jpeg8_jpeg_stdio_dest
 #define jpeg_stdio_src gdcm_jpeg8_jpeg_stdio_src
 #define jpeg_suppress_tables gdcm_jpeg8_jpeg_suppress_tables

diff --git a/src/jpeg/libijg/jmorecfg.h b/src/jpeg/libijg/jmorecfg.h
index 1f59794312d9edeb7c4044e32a9734c6efc7498d..515644dd6df2b75b800ffc86ba71c206ec69ca07 100644 (file)
--- a/src/jpeg/libijg/jmorecfg.h
+++ b/src/jpeg/libijg/jmorecfg.h
@@ -183,17 +183,26 @@ typedef unsigned int JDIMENSION;
 #define METHODDEF(type)    static type
 /* a function used only in its module: */
 #define LOCAL(type)    static type
+
 /* a function referenced thru EXTERNs: */
-#ifdef WIN32
-  #define GLOBAL(type)    __declspec( dllexport ) type
+#if defined( _WIN32 ) && defined (JPEGDLL)
+#define GLOBAL(type)            __declspec(dllexport) type
 #else
-  #define GLOBAL(type)    type
+#define GLOBAL(type)            type
 #endif
+
 /* a reference to a GLOBAL function: */
-#ifdef WIN32
-  #define EXTERN(type)    extern __declspec( dllexport ) type
+#if defined(_WIN32) && !defined(JPEGSTATIC)
+#ifdef JPEGDLL
+/* Win32, building a dll */
+#define EXTERN(type)            __declspec(dllexport) type
+#else
+/* Win32, not building a dll but using the dll */
+#define EXTERN(type)            __declspec(dllimport) type
+#endif
 #else
-  #define EXTERN(type)    extern type
+/* not a Win32 system or building a static Win32 lib */
+#define EXTERN(type)            extern type
 #endif
 
 
@@ -367,4 +376,20 @@ typedef int boolean;
 #endif
 #endif
 
+#if defined ( _MSC_VER )
+#pragma warning ( disable : 4100 )
+#pragma warning ( disable : 4115 )
+#pragma warning ( disable : 4127 )
+#pragma warning ( disable : 4244 )
+#pragma warning ( disable : 4251 )
+#pragma warning ( disable : 4267 )
+#pragma warning ( disable : 4305 )
+#pragma warning ( disable : 4309 )
+#pragma warning ( disable : 4706 )
+#pragma warning ( disable : 4786 )
+#pragma warning ( disable : 4057 )
+#pragma warning ( disable : 4189 )
+#pragma warning ( disable : 4505 )
+#endif
+
 #endif /* JPEG_INTERNAL_OPTIONS */