From: malaterre <malaterre>
Date: Wed, 29 Oct 2003 18:24:40 +0000 (+0000)
Subject: *FIX: only one function is being exported for now ! You should use GLOBAL(return... 
X-Git-Tag: Version0.3.1~69
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=1c730c1bfe5b15f0e82e1994971f72cfd82d42da;p=gdcm.git

*FIX: only one function is being exported for now ! You should use GLOBAL(return type) see ljpg/jpeg.h for more info
---

diff --git a/src/jpeg/ljpg/decomp.c b/src/jpeg/ljpg/decomp.c
index d5cf9f48..e06b4cf0 100644
--- a/src/jpeg/ljpg/decomp.c
+++ b/src/jpeg/ljpg/decomp.c
@@ -7,7 +7,7 @@
  * from the Cornell lossless JPEG code
  */
 /*
- * $Id: decomp.c,v 1.1 2003/10/21 12:08:53 jpr Exp $
+ * $Id: decomp.c,v 1.2 2003/10/29 18:24:40 malaterre Exp $
  */
 #include <stdio.h>
 #include <stdlib.h>
@@ -54,7 +54,7 @@ int ReadJpegData (Uchar *buffer, int numBytes)
 }
 
 
-short JPEGLosslessDecodeImage (StreamIN inFile, unsigned short *image16, int depth, int length)
+GLOBAL(short) JPEGLosslessDecodeImage (StreamIN inFile, unsigned short *image16, int depth, int length)
 { 
     /* Initialization */
     JpegInFile = inFile;
diff --git a/src/jpeg/ljpg/jpeg.h b/src/jpeg/ljpg/jpeg.h
index f2ff7db3..fe80d5da 100644
--- a/src/jpeg/ljpg/jpeg.h
+++ b/src/jpeg/ljpg/jpeg.h
@@ -4,11 +4,18 @@
  * Basic jpeg data structure definitions.
  */
 /*
- * $Id: jpeg.h,v 1.1 2003/10/21 12:08:54 jpr Exp $
+ * $Id: jpeg.h,v 1.2 2003/10/29 18:24:40 malaterre Exp $
  */
 #ifndef _JPEG
 #define _JPEG
 
+/* a function referenced thru EXTERNs: */
+#ifdef WIN32
+  #define GLOBAL(type)		__declspec( dllexport ) type
+#else
+  #define GLOBAL(type)		type
+#endif
+
 typedef unsigned char   Uchar;
 typedef unsigned short  Ushort;
 typedef unsigned int    Uint;
diff --git a/src/jpeg/ljpg/jpegless.h b/src/jpeg/ljpg/jpegless.h
index 6a198c5e..bcef276a 100644
--- a/src/jpeg/ljpg/jpegless.h
+++ b/src/jpeg/ljpg/jpegless.h
@@ -18,7 +18,7 @@
  * parts are stolen from the IJG code
  */
 /*
- * $Id: jpegless.h,v 1.1 2003/10/21 12:08:54 jpr Exp $
+ * $Id: jpegless.h,v 1.2 2003/10/29 18:24:40 malaterre Exp $
  */
 #include "jpeg.h"
 
@@ -46,7 +46,7 @@ int  verbose;         /* the verbose flag                            */
 /*
  * read a JPEG lossless (8 or 16 bit) image in a file and decode it
  */
-short JPEGLosslessDecodeImage (StreamIN inFile, unsigned short * image16, int depth, int length);
+GLOBAL(short) JPEGLosslessDecodeImage (StreamIN inFile, unsigned short * image16, int depth, int length);
 
 
 #if defined(__cplusplus)