minor changes in cmake flags

[openjpeg.git] / libopenjpeg / j2k.c

diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c
index 8e7b1ce081f2ca101cc7daa3a077b280d8c3bfd6..33ff8545025368bfe8c27d3fac20401e23bfc254 100644 (file)
--- a/libopenjpeg/j2k.c
+++ b/libopenjpeg/j2k.c
@@ -245,7 +245,7 @@ j2k_prog_order_t j2k_prog_order_list[] = {
        {PCRL, "PCRL"},
        {RLCP, "RLCP"},
        {RPCL, "RPCL"},
-       {-1, ""}
+       {(OPJ_PROG_ORDER)-1, ""}
 };
 
 char *j2k_convert_progression_order(OPJ_PROG_ORDER prg_order){
@@ -268,6 +268,7 @@ void j2k_dump_image(FILE *fd, opj_image_t * img) {
                fprintf(fd, "  comp %d {\n", compno);
                fprintf(fd, "    dx=%d, dy=%d\n", comp->dx, comp->dy);
                fprintf(fd, "    prec=%d\n", comp->prec);
+               //fprintf(fd, "    bpp=%d\n", comp->bpp);
                fprintf(fd, "    sgnd=%d\n", comp->sgnd);
                fprintf(fd, "  }\n");
        }
@@ -467,6 +468,13 @@ static void j2k_read_siz(opj_j2k_t *j2k) {
        cp->tx0 = cio_read(cio, 4);             /* XT0siz */
        cp->ty0 = cio_read(cio, 4);             /* YT0siz */
        
+       if ((image->x0<0)||(image->x1<0)||(image->y0<0)||(image->y1<0)) {
+               opj_event_msg(j2k->cinfo, EVT_ERROR,
+                                                                       "%s: invalid image size (x0:%d, x1:%d, y0:%d, y1:%d)\n",
+                                                                       image->x0,image->x1,image->y0,image->y1);
+               return;
+       }
+       
        image->numcomps = cio_read(cio, 2);     /* Csiz */
 
 #ifdef USE_JPWL
@@ -1431,7 +1439,11 @@ static void j2k_write_sod(opj_j2k_t *j2k, void *tile_coder) {
        
        tcp = &cp->tcps[j2k->curtileno];
        for (layno = 0; layno < tcp->numlayers; layno++) {
-               tcp->rates[layno] -= tcp->rates[layno] ? (j2k->sod_start / (cp->th * cp->tw)) : 0;
+               if (tcp->rates[layno]>(j2k->sod_start / (cp->th * cp->tw))) {
+                       tcp->rates[layno]-=(j2k->sod_start / (cp->th * cp->tw));
+               } else if (tcp->rates[layno]) {
+                       tcp->rates[layno]=1;
+               }
        }
        if(j2k->cur_tp_num == 0){
                tcd->tcd_image->tiles->packno = 0;