COMP: applying another patch send to jasper group, to please bcc32 5.5.1

diff --git a/src/gdcmjasper/src/libjasper/base/jas_icc.c b/src/gdcmjasper/src/libjasper/base/jas_icc.c
index 9d0ecf05d1054e90b62c7cbaef64eadd47429b1c..0ef2d8971596841298a760258f4397d086607dd3 100644 (file)
--- a/src/gdcmjasper/src/libjasper/base/jas_icc.c
+++ b/src/gdcmjasper/src/libjasper/base/jas_icc.c
@@ -328,6 +328,7 @@ jas_iccprof_t *jas_iccprof_load(jas_stream_t *in)
 #if 0
       jas_eprintf("warning: skipping unknown tag type\n");
 #endif
+      (void)attrvalinfo; /*'attrvalinfo' is assigned a value that is never used in function jas_iccprof_load*/
       prevattrval = 0;
       continue;
     }
@@ -1074,6 +1075,7 @@ static int jas_icctxtdesc_copy(jas_iccattrval_t *attrval,
   attrval = 0;
   othattrval = 0;
   txtdesc = 0;
+  (void)txtdesc;
 
   /* Not yet implemented. */
   abort();
@@ -1260,6 +1262,7 @@ static int jas_icclut8_copy(jas_iccattrval_t *attrval,
   attrval = 0;
   othattrval = 0;
   lut8 = 0;
+  (void)lut8;
   abort();
   return -1;
 }

diff --git a/src/gdcmjasper/src/libjasper/base/jas_image.c b/src/gdcmjasper/src/libjasper/base/jas_image.c
index aea9bee75a7534451bd8a6082c3b24ed78b96282..a1bec6253da7f28822fac60162a3287d1e6d1cf3 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.2 2005/06/04 01:54:02 malaterre Exp $
+ * $Id: jas_image.c,v 1.3 2005/06/09 22:09:39 malaterre Exp $
  */
 
 /******************************************************************************\
@@ -1339,6 +1339,8 @@ jas_image_dump(image, stderr);
   numoutclrchans = jas_clrspc_numchans(jas_cmprof_clrspc(outprof));
   numoutauxchans = 0;
   numoutchans = numoutclrchans + numoutauxchans;
+  (void)numoutchans;/*  'numoutchans' is assigned a value that is never used in function jas_image_chclrspc*/
+  (void)numinauxchans; /* 'numinauxchans' is assigned a value that is never used in function jas_image_chclrspc*/
   prec = 8;
 
   if (!(outimage = jas_image_create0()))

diff --git a/src/gdcmjasper/src/libjasper/jp2/jp2_dec.c b/src/gdcmjasper/src/libjasper/jp2/jp2_dec.c
index c2086d61565eee209c79a5e1da67f92479ff897b..590e28e8d2d3679f9d030967f05f8cb7fcbdac0f 100644 (file)
--- a/src/gdcmjasper/src/libjasper/jp2/jp2_dec.c
+++ b/src/gdcmjasper/src/libjasper/jp2/jp2_dec.c
@@ -64,7 +64,7 @@
 /*
  * JP2 Library
  *
- * $Id: jp2_dec.c,v 1.1 2005/05/22 18:33:03 malaterre Exp $
+ * $Id: jp2_dec.c,v 1.2 2005/06/09 22:09:40 malaterre Exp $
  */
 
 /******************************************************************************\
@@ -372,6 +372,8 @@ jas_image_t *jp2_decode(jas_stream_t *in, char *optstr)
         } else {
         jas_image_setcmpttype(dec->image, newcmptno, jp2_getct(jas_image_clrspc(dec->image), 0, channo + 1));
         }
+#else
+        (void)cdefd;
 #endif
       }
     }

diff --git a/src/gdcmjasper/src/libjasper/jpc/jpc_dec.c b/src/gdcmjasper/src/libjasper/jpc/jpc_dec.c
index 06bbceed0d8a87a7b4cdc9ac8ddcbec1aea7dabc..d9ff48c9b207127a25a116a2fec7365d905a07c0 100644 (file)
--- a/src/gdcmjasper/src/libjasper/jpc/jpc_dec.c
+++ b/src/gdcmjasper/src/libjasper/jpc/jpc_dec.c
@@ -62,7 +62,7 @@
  */
 
 /*
- * $Id: jpc_dec.c,v 1.1 2005/05/22 18:33:04 malaterre Exp $
+ * $Id: jpc_dec.c,v 1.2 2005/06/09 22:09:41 malaterre Exp $
  */
 
 /******************************************************************************\
@@ -424,6 +424,7 @@ static int jpc_dec_process_crg(jpc_dec_t *dec, jpc_ms_t *ms)
     cmpt->vsubstep = crg->comps[cmptno].voff;
     */
   }
+  (void)crg; /* 'crg' is assigned a value that is never used in function jpc_dec_process_crg*/
   return 0;
 }
 
@@ -905,6 +906,7 @@ if (!(tile->pi = jpc_dec_pi_create(dec, tile)))
   }
   jpc_pi_init(tile->pi);
 
+  (void)brcbgyend; /* 'brcbgyend' is assigned a value that is never used in function jpc_dec_tileinit*/
   return 0;
 }
 

diff --git a/src/gdcmjasper/src/libjasper/jpc/jpc_enc.c b/src/gdcmjasper/src/libjasper/jpc/jpc_enc.c
index 839c56454c5cebf586adeb510c1107238cfed596..06deb15cb61a988c839000e35c1587a8fc627151 100644 (file)
--- a/src/gdcmjasper/src/libjasper/jpc/jpc_enc.c
+++ b/src/gdcmjasper/src/libjasper/jpc/jpc_enc.c
@@ -62,7 +62,7 @@
  */
 
 /*
- * $Id: jpc_enc.c,v 1.3 2005/06/08 17:39:37 malaterre Exp $
+ * $Id: jpc_enc.c,v 1.4 2005/06/09 22:09:41 malaterre Exp $
  */
 
 /******************************************************************************\
@@ -768,6 +768,7 @@ error:
   if (cp) {
     jpc_enc_cp_destroy(cp);
   }
+  (void)ret; /* ret' is assigned a value that is never used in function cp_create */
   return 0;
 }
 
@@ -800,6 +801,7 @@ int ratestrtosize(char *s, uint_fast32_t rawsize, uint_fast32_t *size)
       *size = f * rawsize;
     }
   }
+  (void)cp; /* 'cp' is assigned a value that is never used in function ratestrtosize */
   return 0;
 }
 
@@ -1096,14 +1098,13 @@ startoff = jas_stream_getrwcount(enc->out);
     enc->mainbodysize = UINT_FAST32_MAX;
   }
 
+  (void)mctsynweight; /* 'mctsynweight' is assigned a value that is never used in function jpc_enc_encodemainhdr */
   return 0;
 }
 
 static int jpc_enc_encodemainbody(jpc_enc_t *enc)
 {
   int tileno;
-  int tilex;
-  int tiley;
   int i;
   jpc_sot_t *sot;
   jpc_enc_tcmpt_t *comp;
@@ -1117,7 +1118,6 @@ static int jpc_enc_encodemainbody(jpc_enc_t *enc)
   int adjust;
   int j;
   int absbandno;
-  long numbytes;
   long tilehdrlen;
   long tilelen;
   jpc_enc_tile_t *tile;
@@ -1139,12 +1139,7 @@ int numgbits;
 
   cp = enc->cp;
 
-  /* Avoid compile warnings. */
-  numbytes = 0;
-
   for (tileno = 0; tileno < JAS_CAST(int, cp->numtiles); ++tileno) {
-    tilex = tileno % cp->numhtiles;
-    tiley = tileno / cp->numhtiles;
 
     if (!(enc->curtile = jpc_enc_tile_create(enc->cp, enc->image, tileno))) {
       abort();

diff --git a/src/gdcmjasper/src/libjasper/jpc/jpc_t1enc.c b/src/gdcmjasper/src/libjasper/jpc/jpc_t1enc.c
index 57f327c1924b10141597bd3138e4aaa4a6a5db82..fbd9c084538b90dc432960210a0ba1002a993934 100644 (file)
--- a/src/gdcmjasper/src/libjasper/jpc/jpc_t1enc.c
+++ b/src/gdcmjasper/src/libjasper/jpc/jpc_t1enc.c
@@ -64,7 +64,7 @@
 /*
  * Tier 1 Encoder
  *
- * $Id: jpc_t1enc.c,v 1.3 2005/06/08 17:39:37 malaterre Exp $
+ * $Id: jpc_t1enc.c,v 1.4 2005/06/09 22:09:41 malaterre Exp $
  */
 
 /******************************************************************************\
@@ -202,7 +202,6 @@ int jpc_enc_enccblk(jpc_enc_t *enc, jas_stream_t *out, jpc_enc_tcmpt_t *tcmpt, j
   int t;
   jpc_bitstream_t *bout;
   jpc_enc_pass_t *termpass;
-  jpc_enc_rlvl_t *rlvl;
   int vcausal;
   int segsym;
   int termmode;
@@ -212,7 +211,6 @@ int jpc_enc_enccblk(jpc_enc_t *enc, jas_stream_t *out, jpc_enc_tcmpt_t *tcmpt, j
   (void)out;
 
   bout = 0;
-  rlvl = band->rlvl;
 
   cblk->stream = jas_stream_memopen(0, 0);
   assert(cblk->stream);
@@ -401,6 +399,7 @@ dump_passes(cblk->passes, cblk->numpasses, cblk);
     jpc_bitstream_close(bout);
   }
 
+  (void)ret; /* 'ret' is assigned a value that is never used in function jpc_enc_enccblk*/
   return 0;
 }