COMP: VS6 was not happy to cast an int into ushort

[gdcm.git] / src / gdcmjasper / src / libjasper / jpc / jpc_t1enc.c

diff --git a/src/gdcmjasper/src/libjasper/jpc/jpc_t1enc.c b/src/gdcmjasper/src/libjasper/jpc/jpc_t1enc.c
index f762e77d4946d8b84f8d5a5de1247c51b0b97753..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.1 2005/05/22 18:33:05 malaterre Exp $
+ * $Id: jpc_t1enc.c,v 1.4 2005/06/09 22:09:41 malaterre Exp $
  */
 
 /******************************************************************************\
@@ -121,7 +121,7 @@ int jpc_enc_enccblks(jpc_enc_t *enc)
   int bmx;
   int v;
   jpc_enc_tile_t *tile;
-  uint_fast32_t prcno;
+  int_fast32_t prcno;
   jpc_enc_prc_t *prc;
 
   tile = enc->curtile;
@@ -202,14 +202,15 @@ 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;
   int c;
+  /* Unused vars:*/
+  (void)enc;
+  (void)out;
 
   bout = 0;
-  rlvl = band->rlvl;
 
   cblk->stream = jas_stream_memopen(0, 0);
   assert(cblk->stream);
@@ -398,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;
 }
 
@@ -647,7 +649,9 @@ static int jpc_encrefpass(jpc_mqenc_t *mqenc, int bitpos, int vcausalflag, jas_m
   jpc_fix_t *dvscanstart;
   jpc_fix_t *dp;
   jpc_fix_t *fp;
-int k;
+  int k;
+  /* Unused:*/
+  (void)vcausalflag;
 
   *nmsedec = 0;
   width = jas_matrix_numcols(data);
@@ -740,6 +744,8 @@ static int jpc_encrawrefpass(jpc_bitstream_t *out, int bitpos, int vcausalflag,
   jpc_fix_t *dvscanstart;
   jpc_fix_t *dp;
   jpc_fix_t *fp;
+  /* Unused*/
+  (void)vcausalflag;
 
   *nmsedec = 0;
   width = jas_matrix_numcols(data);