COMP: Getting closer to shared libs on win32

diff --git a/src/gdcmjasper/src/libjasper/include/jasper/jas_image.h b/src/gdcmjasper/src/libjasper/include/jasper/jas_image.h
index a0955341c796bd486df5dc36dfa1b7cfc187a9fb..74669d29578364519b099d049d967189aea4422d 100644 (file)
--- a/src/gdcmjasper/src/libjasper/include/jasper/jas_image.h
+++ b/src/gdcmjasper/src/libjasper/include/jasper/jas_image.h
@@ -64,7 +64,7 @@
 /*
  * Image Class
  *
- * $Id: jas_image.h,v 1.1 2005/05/22 18:33:01 malaterre Exp $
+ * $Id: jas_image.h,v 1.2 2005/05/30 02:56:28 malaterre Exp $
  */
 
 #ifndef JAS_IMAGE_H
@@ -308,7 +308,7 @@ jas_image_t *jas_image_create0(void);
 jas_image_t *jas_image_copy(jas_image_t *image);
 
 /* Deallocate any resources associated with an image. */
-void jas_image_destroy(jas_image_t *image);
+EXTERN(void) jas_image_destroy(jas_image_t *image);
 
 /* Get the width of the image in units of the image reference grid. */
 #define jas_image_width(image) \
@@ -401,10 +401,10 @@ void jas_image_destroy(jas_image_t *image);
 
 /* Get the raw size of an image (i.e., the nominal size of the image without
   any compression. */
-uint_fast32_t jas_image_rawsize(jas_image_t *image);
+EXTERN(uint_fast32_t) jas_image_rawsize(jas_image_t *image);
 
 /* Create an image from a stream in some specified format. */
-jas_image_t *jas_image_decode(jas_stream_t *in, int fmt, char *optstr);
+EXTERN(jas_image_t) *jas_image_decode(jas_stream_t *in, int fmt, char *optstr);
 
 /* Write an image to a stream in a specified format. */
 int jas_image_encode(jas_image_t *image, jas_stream_t *out, int fmt,
@@ -444,7 +444,7 @@ int jas_image_copycmpt(jas_image_t *dstimage, int dstcmptno,
 int jas_image_depalettize(jas_image_t *image, int cmptno, int numlutents,
   int_fast32_t *lutents, int dtype, int newcmptno);
 
-int jas_image_readcmptsample(jas_image_t *image, int cmptno, int x, int y);
+EXTERN(int) jas_image_readcmptsample(jas_image_t *image, int cmptno, int x, int y);
 void jas_image_writecmptsample(jas_image_t *image, int cmptno, int x, int y,
   int_fast32_t v);
 
@@ -455,7 +455,7 @@ int jas_image_getcmptbytype(jas_image_t *image, int ctype);
 \******************************************************************************/
 
 /* Clear the table of image formats. */
-void jas_image_clearfmts(void);
+EXTERN(void) jas_image_clearfmts(void);
 
 /* Add entry to table of image formats. */
 int jas_image_addfmt(int id, char *name, char *ext, char *desc,
@@ -465,7 +465,7 @@ int jas_image_addfmt(int id, char *name, char *ext, char *desc,
 int jas_image_strtofmt(char *s);
 
 /* Get the name of the image format with the specified ID. */
-char *jas_image_fmttostr(int fmt);
+EXTERN(char) *jas_image_fmttostr(int fmt);
 
 /* Lookup image format information by the format ID. */
 jas_image_fmtinfo_t *jas_image_lookupfmtbyid(int id);
@@ -477,7 +477,7 @@ jas_image_fmtinfo_t *jas_image_lookupfmtbyname(const char *name);
 int jas_image_fmtfromname(char *filename);
 
 /* Get the format of image data in a stream. */
-int jas_image_getfmt(jas_stream_t *in);
+EXTERN(int) jas_image_getfmt(jas_stream_t *in);
 
 
 #define  jas_image_cmprof(image)  ((image)->cmprof_)

diff --git a/src/gdcmjasper/src/libjasper/include/jasper/jas_stream.h b/src/gdcmjasper/src/libjasper/include/jasper/jas_stream.h
index cf84854fe985e8122879bc6efd9f3e096b3c4631..a42ba7067749770a7ddfca2311fc4608a27d4da0 100644 (file)
--- a/src/gdcmjasper/src/libjasper/include/jasper/jas_stream.h
+++ b/src/gdcmjasper/src/libjasper/include/jasper/jas_stream.h
@@ -64,7 +64,7 @@
 /*
  * I/O Stream Class
  *
- * $Id: jas_stream.h,v 1.1 2005/05/22 18:33:01 malaterre Exp $
+ * $Id: jas_stream.h,v 1.2 2005/05/30 02:56:28 malaterre Exp $
  */
 
 #ifndef JAS_STREAM_H
@@ -291,7 +291,7 @@ typedef struct {
 jas_stream_t *jas_stream_fopen(const char *filename, const char *mode);
 
 /* Open a memory buffer as a stream. */
-jas_stream_t *jas_stream_memopen(char *buf, int bufsize);
+EXTERN(jas_stream_t) *jas_stream_memopen(char *buf, int bufsize);
 
 /* Open a file descriptor as a stream. */
 jas_stream_t *jas_stream_fdopen(int fd, const char *mode);
@@ -303,7 +303,7 @@ jas_stream_t *jas_stream_reopen(const char *path, const char *mode, FILE *fp);
 jas_stream_t *jas_stream_tmpfile(void);
 
 /* Close a stream. */
-int jas_stream_close(jas_stream_t *stream);
+EXTERN(int) jas_stream_close(jas_stream_t *stream);
 
 /******************************************************************************\
 * Macros/functions for getting/setting the stream state.