From b2f6013960b2c14c9106df5c3dd37253c415cc37 Mon Sep 17 00:00:00 2001 From: malaterre Date: Sat, 11 Jun 2005 14:23:07 +0000 Subject: [PATCH] COMP: EXTERN was conflicting with the one in ijg, rename the one in jasper. --- src/gdcmjasper/src/libjasper/base/jas_image.c | 16 ++++++++-------- src/gdcmjasper/src/libjasper/base/jas_init.c | 2 +- src/gdcmjasper/src/libjasper/base/jas_stream.c | 6 +++--- .../src/libjasper/include/jasper/jas_config.h.in | 14 +++++++------- .../src/libjasper/include/jasper/jas_image.h | 16 ++++++++-------- .../src/libjasper/include/jasper/jas_init.h | 2 +- .../src/libjasper/include/jasper/jas_stream.h | 6 +++--- 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/gdcmjasper/src/libjasper/base/jas_image.c b/src/gdcmjasper/src/libjasper/base/jas_image.c index a1bec625..9cf6a96e 100644 --- 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.3 2005/06/09 22:09:39 malaterre Exp $ + * $Id: jas_image.c,v 1.4 2005/06/11 14:23:07 malaterre Exp $ */ /******************************************************************************\ @@ -279,7 +279,7 @@ static jas_image_cmpt_t *jas_image_cmpt_copy(jas_image_cmpt_t *cmpt) return newcmpt; } -GLOBAL(void) jas_image_destroy(jas_image_t *image) +JASGLOBAL(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. \******************************************************************************/ -GLOBAL(jas_image_t) *jas_image_decode(jas_stream_t *in, int fmt, char *optstr) +JASGLOBAL(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. \******************************************************************************/ -GLOBAL(void) jas_image_clearfmts() +JASGLOBAL(void) jas_image_clearfmts() { int i; jas_image_fmtinfo_t *fmtinfo; @@ -568,7 +568,7 @@ int jas_image_strtofmt(char *name) return fmtinfo->id; } -GLOBAL(char) *jas_image_fmttostr(int fmt) +JASGLOBAL(char) *jas_image_fmttostr(int fmt) { jas_image_fmtinfo_t *fmtinfo; if (!(fmtinfo = jas_image_lookupfmtbyid(fmt))) { @@ -577,7 +577,7 @@ GLOBAL(char) *jas_image_fmttostr(int fmt) return fmtinfo->name; } -GLOBAL(int) jas_image_getfmt(jas_stream_t *in) +JASGLOBAL(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. \******************************************************************************/ -GLOBAL(uint_fast32_t) jas_image_rawsize(jas_image_t *image) +JASGLOBAL(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; } -GLOBAL(int) jas_image_readcmptsample(jas_image_t *image, int cmptno, int x, int y) +JASGLOBAL(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 225b25f1..1ae31976 100644 --- 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. */ -GLOBAL(int) jas_init() +JASGLOBAL(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 02a57b28..b28459cb 100644 --- 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.2 2005/06/04 01:54:02 malaterre Exp $ + * $Id: jas_stream.c,v 1.3 2005/06/11 14:23:07 malaterre Exp $ */ /******************************************************************************\ @@ -168,7 +168,7 @@ static jas_stream_t *jas_stream_create() return stream; } -GLOBAL(jas_stream_t) *jas_stream_memopen(char *buf, int bufsize) +JASGLOBAL(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); } -GLOBAL(int) jas_stream_close(jas_stream_t *stream) +JASGLOBAL(int) jas_stream_close(jas_stream_t *stream) { /* Flush buffer if necessary. */ jas_stream_flush(stream); diff --git a/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in b/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in index 64aece3f..62f2fe58 100644 --- a/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in +++ b/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in @@ -221,22 +221,22 @@ typedef __int64 longlong; #cmakedefine JASPERSTATIC #cmakedefine JASPERDLL -/* a function referenced thru EXTERNs: */ +/* a function referenced thru JASEXTERNs: */ #if defined( _WIN32 ) && defined (JASPERDLL) -#define GLOBAL(type) __declspec(dllexport) type +#define JASGLOBAL(type) __declspec(dllexport) type #else -#define GLOBAL(type) type +#define JASGLOBAL(type) type #endif -/* a reference to a GLOBAL function: */ +/* a reference to a JASGLOBAL function: */ #if defined(_WIN32) && !defined(JASPERSTATIC) #ifdef JASPERDLL -#define EXTERN(type) __declspec(dllexport) type +#define JASEXTERN(type) __declspec(dllexport) type #else -#define EXTERN(type) __declspec(dllimport) type +#define JASEXTERN(type) __declspec(dllimport) type #endif #else -#define EXTERN(type) extern type +#define JASEXTERN(type) extern type #endif diff --git a/src/gdcmjasper/src/libjasper/include/jasper/jas_image.h b/src/gdcmjasper/src/libjasper/include/jasper/jas_image.h index 74669d29..f17ed9f2 100644 --- 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.2 2005/05/30 02:56:28 malaterre Exp $ + * $Id: jas_image.h,v 1.3 2005/06/11 14:23:09 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. */ -EXTERN(void) jas_image_destroy(jas_image_t *image); +JASEXTERN(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 @@ EXTERN(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. */ -EXTERN(uint_fast32_t) jas_image_rawsize(jas_image_t *image); +JASEXTERN(uint_fast32_t) jas_image_rawsize(jas_image_t *image); /* Create an image from a stream in some specified format. */ -EXTERN(jas_image_t) *jas_image_decode(jas_stream_t *in, int fmt, char *optstr); +JASEXTERN(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); -EXTERN(int) jas_image_readcmptsample(jas_image_t *image, int cmptno, int x, int y); +JASEXTERN(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. */ -EXTERN(void) jas_image_clearfmts(void); +JASEXTERN(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. */ -EXTERN(char) *jas_image_fmttostr(int fmt); +JASEXTERN(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. */ -EXTERN(int) jas_image_getfmt(jas_stream_t *in); +JASEXTERN(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_init.h b/src/gdcmjasper/src/libjasper/include/jasper/jas_init.h index b3b2a7cf..a420a608 100644 --- a/src/gdcmjasper/src/libjasper/include/jasper/jas_init.h +++ b/src/gdcmjasper/src/libjasper/include/jasper/jas_init.h @@ -72,7 +72,7 @@ extern "C" { * Functions. \******************************************************************************/ -EXTERN(int) jas_init(void); +JASEXTERN(int) jas_init(void); void jas_cleanup(void); diff --git a/src/gdcmjasper/src/libjasper/include/jasper/jas_stream.h b/src/gdcmjasper/src/libjasper/include/jasper/jas_stream.h index a42ba706..1b734ba5 100644 --- 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.2 2005/05/30 02:56:28 malaterre Exp $ + * $Id: jas_stream.h,v 1.3 2005/06/11 14:23:09 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. */ -EXTERN(jas_stream_t) *jas_stream_memopen(char *buf, int bufsize); +JASEXTERN(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. */ -EXTERN(int) jas_stream_close(jas_stream_t *stream); +JASEXTERN(int) jas_stream_close(jas_stream_t *stream); /******************************************************************************\ * Macros/functions for getting/setting the stream state. -- 2.45.2