Conversions from int to unsigned int to ensure correct execution of int_min at line...
authorFrancois-Olivier Devaux <fodevaux@users.noreply.github.com>
Thu, 2 Jun 2005 15:14:33 +0000 (15:14 +0000)
committerFrancois-Olivier Devaux <fodevaux@users.noreply.github.com>
Thu, 2 Jun 2005 15:14:33 +0000 (15:14 +0000)
libopenjpeg/j2k.c

index f45d6f4257cd20fee1e5d85a79a96c2937496456..fff1c2f82c12a55fa6a9543f90bc43638f736358 100644 (file)
@@ -623,9 +623,9 @@ void j2k_read_poc()
     poc = &tcp->pocs[i];
     poc->resno0 = cio_read(1); /* RSpoc_i */
     poc->compno0 = cio_read(j2k_img->numcomps <= 256 ? 1 : 2); /* CSpoc_i */
-    poc->layno1 = int_min(cio_read(2), tcp->numlayers);        /* LYEpoc_i */
-    poc->resno1 = int_min(cio_read(1), tccp->numresolutions);  /* REpoc_i */
-    poc->compno1 = int_min(cio_read(j2k_img->numcomps <= 256 ? 1 : 2), j2k_img->numcomps);     /* CEpoc_i */
+    poc->layno1 = int_min(cio_read(2), (unsigned int) tcp->numlayers); /* LYEpoc_i */
+    poc->resno1 = int_min(cio_read(1), (unsigned int) tccp->numresolutions);   /* REpoc_i */
+    poc->compno1 = int_min(cio_read(j2k_img->numcomps <= 256 ? 1 : 2), (unsigned int) j2k_img->numcomps);      /* CEpoc_i */
     poc->prg = cio_read(1);    /* Ppoc_i */
   }