COMP: Hopefully I should get win32 shared lib working with that...not a nice patch...

diff --git a/src/gdcmjasper/src/libjasper/base/jas_image.c b/src/gdcmjasper/src/libjasper/base/jas_image.c
index 38743fdc85e5fc10972649bbe3b4eb9247f88cf2..aea9bee75a7534451bd8a6082c3b24ed78b96282 100644 (file)
--- a/src/gdcmjasper/src/libjasper/base/jas_image.c
+++ b/src/gdcmjasper/src/libjasper/base/jas_image.c
@@ -64,7 +64,7 @@
 /*
  * Image Library
  *
- * $Id: jas_image.c,v 1.1 2005/05/22 18:32:59 malaterre Exp $
+ * $Id: jas_image.c,v 1.2 2005/06/04 01:54:02 malaterre Exp $
  */
 
 /******************************************************************************\
@@ -279,7 +279,7 @@ static jas_image_cmpt_t *jas_image_cmpt_copy(jas_image_cmpt_t *cmpt)
   return newcmpt;
 }
 
-void jas_image_destroy(jas_image_t *image)
+GLOBAL(void) jas_image_destroy(jas_image_t *image)
 {
   int i;
 
@@ -348,7 +348,7 @@ static void jas_image_cmpt_destroy(jas_image_cmpt_t *cmpt)
 * Load and save operations.
 \******************************************************************************/
 
-jas_image_t *jas_image_decode(jas_stream_t *in, int fmt, char *optstr)
+GLOBAL(jas_image_t) *jas_image_decode(jas_stream_t *in, int fmt, char *optstr)
 {
   jas_image_fmtinfo_t *fmtinfo;
   jas_image_t *image;
@@ -510,7 +510,7 @@ int jas_image_writecmpt(jas_image_t *image, int cmptno, jas_image_coord_t x, jas
 * File format operations.
 \******************************************************************************/
 
-void jas_image_clearfmts()
+GLOBAL(void) jas_image_clearfmts()
 {
   int i;
   jas_image_fmtinfo_t *fmtinfo;
@@ -568,7 +568,7 @@ int jas_image_strtofmt(char *name)
   return fmtinfo->id;
 }
 
-char *jas_image_fmttostr(int fmt)
+GLOBAL(char) *jas_image_fmttostr(int fmt)
 {
   jas_image_fmtinfo_t *fmtinfo;
   if (!(fmtinfo = jas_image_lookupfmtbyid(fmt))) {
@@ -577,7 +577,7 @@ char *jas_image_fmttostr(int fmt)
   return fmtinfo->name;
 }
 
-int jas_image_getfmt(jas_stream_t *in)
+GLOBAL(int) jas_image_getfmt(jas_stream_t *in)
 {
   jas_image_fmtinfo_t *fmtinfo;
   int found;
@@ -623,7 +623,7 @@ int jas_image_fmtfromname(char *name)
 * Miscellaneous operations.
 \******************************************************************************/
 
-uint_fast32_t jas_image_rawsize(jas_image_t *image)
+GLOBAL(uint_fast32_t) jas_image_rawsize(jas_image_t *image)
 {
   uint_fast32_t rawsize;
   int cmptno;
@@ -884,7 +884,7 @@ int jas_image_depalettize(jas_image_t *image, int cmptno, int numlutents,
   return 0;
 }
 
-int jas_image_readcmptsample(jas_image_t *image, int cmptno, int x, int y)
+GLOBAL(int) jas_image_readcmptsample(jas_image_t *image, int cmptno, int x, int y)
 {
   jas_image_cmpt_t *cmpt;
   uint_fast32_t v;

diff --git a/src/gdcmjasper/src/libjasper/base/jas_init.c b/src/gdcmjasper/src/libjasper/base/jas_init.c
index 2489dc094427992068d19360bee9d1a1eb380ea2..225b25f184cd7d4b550fa9a5f303dec69ed106ff 100644 (file)
--- a/src/gdcmjasper/src/libjasper/base/jas_init.c
+++ b/src/gdcmjasper/src/libjasper/base/jas_init.c
@@ -72,7 +72,7 @@
 \******************************************************************************/
 
 /* Initialize the image format table. */
-int jas_init()
+GLOBAL(int) jas_init()
 {
   jas_image_fmtops_t fmtops;
   int fmtid;

diff --git a/src/gdcmjasper/src/libjasper/base/jas_stream.c b/src/gdcmjasper/src/libjasper/base/jas_stream.c
index 52ea8c3eb4599cb5569b7083b7b083593eb816fe..02a57b2831a19e43f5a777d77d12572e5ad0f580 100644 (file)
--- a/src/gdcmjasper/src/libjasper/base/jas_stream.c
+++ b/src/gdcmjasper/src/libjasper/base/jas_stream.c
@@ -64,7 +64,7 @@
 /*
  * I/O Stream Library
  *
- * $Id: jas_stream.c,v 1.1 2005/05/22 18:32:59 malaterre Exp $
+ * $Id: jas_stream.c,v 1.2 2005/06/04 01:54:02 malaterre Exp $
  */
 
 /******************************************************************************\
@@ -168,7 +168,7 @@ static jas_stream_t *jas_stream_create()
   return stream;
 }
 
-jas_stream_t *jas_stream_memopen(char *buf, int bufsize)
+GLOBAL(jas_stream_t) *jas_stream_memopen(char *buf, int bufsize)
 {
   jas_stream_t *stream;
   jas_stream_memobj_t *obj;
@@ -457,7 +457,7 @@ static void jas_stream_destroy(jas_stream_t *stream)
   jas_free(stream);
 }
 
-int jas_stream_close(jas_stream_t *stream)
+GLOBAL(int) jas_stream_close(jas_stream_t *stream)
 {
   /* Flush buffer if necessary. */
   jas_stream_flush(stream);