X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fgdcmjasper%2Fsrc%2Flibjasper%2Fbase%2Fjas_image.c;h=922bd0b431de8279c78b52bc145eae8742fadd5f;hb=b823b9aedd899f5bd07315943ea3cedc4637ee8a;hp=a1bec6253da7f28822fac60162a3287d1e6d1cf3;hpb=305055c85fb1fa3146cdffce56a4f7c3073b1b96;p=gdcm.git

diff --git a/src/gdcmjasper/src/libjasper/base/jas_image.c b/src/gdcmjasper/src/libjasper/base/jas_image.c
index a1bec625..922bd0b4 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.5 2005/07/01 13:17:00 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;
 
@@ -302,7 +302,8 @@ static jas_image_cmpt_t *jas_image_cmpt_create(uint_fast32_t tlx, uint_fast32_t
   jas_image_cmpt_t *cmpt;
   long size;
 
-  if (!(cmpt = jas_malloc(sizeof(jas_image_cmpt_t)))) {
+  /*if (!(cmpt = jas_malloc(sizeof(jas_image_cmpt_t)))) {*/
+  if (!(cmpt = jas_image_cmpt_create0())) {
     return 0;
   }
 
@@ -348,7 +349,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 +511,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 +569,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 +578,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 +624,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 +885,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;