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

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

diff --git a/src/gdcmjasper/src/libjasper/jpc/jpc_cs.c b/src/gdcmjasper/src/libjasper/jpc/jpc_cs.c
index 63daee25f995c7463c5725b8d1c2be22fbaaefd8..12b45793546f83d813d80dd121309726551c04b6 100644 (file)
--- a/src/gdcmjasper/src/libjasper/jpc/jpc_cs.c
+++ b/src/gdcmjasper/src/libjasper/jpc/jpc_cs.c
@@ -64,7 +64,7 @@
 /*
  * JPEG-2000 Code Stream Library
  *
- * $Id: jpc_cs.c,v 1.1 2005/05/22 18:33:04 malaterre Exp $
+ * $Id: jpc_cs.c,v 1.2 2005/06/11 02:05:14 malaterre Exp $
  */
 
 /******************************************************************************\
@@ -689,7 +689,7 @@ static int jpc_coc_putparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *ou
   jpc_coc_t *coc = &ms->parms.coc;
   assert(coc->compparms.numdlvls <= 32);
   if (cstate->numcomps <= 256) {
-    if (jpc_putuint8(out, coc->compno)) {
+    if (jpc_putuint8(out, (uint_fast8_t)coc->compno)) {
       return -1;
     }
   } else {
@@ -823,7 +823,7 @@ static int jpc_rgn_putparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *ou
 {
   jpc_rgn_t *rgn = &ms->parms.rgn;
   if (cstate->numcomps <= 256) {
-    if (jpc_putuint8(out, rgn->compno)) {
+    if (jpc_putuint8(out, (uint_fast8_t)rgn->compno)) {
       return -1;
     }
   } else {
@@ -920,7 +920,7 @@ static int jpc_qcc_putparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *ou
 {
   jpc_qcc_t *qcc = &ms->parms.qcc;
   if (cstate->numcomps <= 256) {
-    jpc_putuint8(out, qcc->compno);
+    jpc_putuint8(out, (uint_fast8_t)qcc->compno);
   } else {
     jpc_putuint16(out, qcc->compno);
   }
@@ -1281,12 +1281,12 @@ static int jpc_poc_putparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *ou
     if (jpc_putuint8(out, pchg->rlvlnostart) ||
       ((cstate->numcomps > 256) ?
       jpc_putuint16(out, pchg->compnostart) :
-      jpc_putuint8(out, pchg->compnostart)) ||
+      jpc_putuint8(out, (uint_fast8_t)pchg->compnostart)) ||
       jpc_putuint16(out, pchg->lyrnoend) ||
       jpc_putuint8(out, pchg->rlvlnoend) ||
       ((cstate->numcomps > 256) ?
       jpc_putuint16(out, pchg->compnoend) :
-      jpc_putuint8(out, pchg->compnoend)) ||
+      jpc_putuint8(out, (uint_fast8_t)pchg->compnoend)) ||
       jpc_putuint8(out, pchg->prgord)) {
       return -1;
     }