]> granicus.if.org Git - openjpeg/commitdiff
[trunk] Fix a set of warnings about C90 issues
authorMathieu Malaterre <mathieu.malaterre@gmail.com>
Mon, 1 Oct 2012 10:01:09 +0000 (10:01 +0000)
committerMathieu Malaterre <mathieu.malaterre@gmail.com>
Mon, 1 Oct 2012 10:01:09 +0000 (10:01 +0000)
17 files changed:
src/bin/jp3d/opj_jp3d_compress.c
src/bin/mj2/opj_mj2_compress.c
src/bin/mj2/opj_mj2_wrap.c
src/lib/openjp2/bio.c
src/lib/openjp2/openjpeg.h
src/lib/openjp2/t2.c
src/lib/openjp3d/bio.h
src/lib/openjp3d/event.c
src/lib/openjp3d/jp3d.c
src/lib/openjp3d/jp3d.h
src/lib/openjp3d/opj_includes.h
src/lib/openjp3d/pi.c
src/lib/openjp3d/t1.h
src/lib/openjp3d/t1_3d.h
src/lib/openjp3d/tcd.c
src/lib/openjp3d/tcd.h
src/lib/openjpwl/jpwl_lib.c

index 8a593b374937c4905f2b1c3e0d1a60e60485bee2..30996d2dfd0a1d1d7517c6a8a5f0b9de794e34b3 100755 (executable)
@@ -709,10 +709,10 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
 \r
        if(parameters->numresolution[2] != 1) {\r
                parameters->transform_format = TRF_3D_DWT;\r
-               //fprintf(stdout, "[Warning] Resolution level in axial dim > 1 : 3D-DWT will be performed... \n");\r
+               /*fprintf(stdout, "[Warning] Resolution level in axial dim > 1 : 3D-DWT will be performed... \n");*/\r
        } else if (parameters->numresolution[2] == 1) {\r
                parameters->transform_format = TRF_2D_DWT;\r
-               //fprintf(stdout, "[Warning] Resolution level in axial dim == 1 : 2D-DWT will be performed... \n");\r
+               /*fprintf(stdout, "[Warning] Resolution level in axial dim == 1 : 2D-DWT will be performed... \n");*/\r
        }\r
        \r
        if ((parameters->cod_format == J2K_CFMT) && (parameters->transform_format != TRF_2D_DWT || parameters->encoding_format != ENCOD_2EB)) {\r
@@ -860,7 +860,7 @@ int main(int argc, char **argv) {
                cio = opj_cio_open((opj_common_ptr)cinfo, NULL, 0);\r
 \r
                /* encode the volume */\r
-               //fprintf(stdout, "[INFO] Encode the volume\n");\r
+               /*fprintf(stdout, "[INFO] Encode the volume\n");*/\r
                bSuccess = opj_encode(cinfo, cio, volume, parameters.index);\r
                if (!bSuccess) {\r
                        opj_cio_close(cio);\r
index d05204bf137230669b405a4e472bcbbdf057e520..6754ba0329d31834561bcd9d125cdad65c0b982e 100644 (file)
@@ -257,10 +257,10 @@ int main(int argc, char **argv)
        memset(&mj2_parameters, 0, sizeof(mj2_cparameters_t));
   /* default value */
   /* ------------- */
-       mj2_parameters.w = 352;                 // CIF default value
-       mj2_parameters.h = 288;                 // CIF default value
-       mj2_parameters.CbCr_subsampling_dx = 2; // CIF default value
-       mj2_parameters.CbCr_subsampling_dy = 2; // CIF default value
+       mj2_parameters.w = 352;                 /* CIF default value*/
+       mj2_parameters.h = 288;                 /* CIF default value*/
+       mj2_parameters.CbCr_subsampling_dx = 2; /* CIF default value*/
+       mj2_parameters.CbCr_subsampling_dy = 2; /* CIF default value*/
        mj2_parameters.frame_rate = 25;
        mj2_parameters.prec = 8; /* DEFAULT */
        mj2_parameters.enumcs = ENUMCS_SYCC; /* FIXME: ENUMCS_YUV420 */
@@ -700,7 +700,7 @@ int main(int argc, char **argv)
                return 1;
        }
 
-  // One sample per chunk
+  /* One sample per chunk*/
        movie->tk[0].chunk = (mj2_chunk_t*) 
         malloc(movie->tk[0].num_samples * sizeof(mj2_chunk_t));     
        movie->tk[0].sample = (mj2_sample_t*) 
@@ -711,8 +711,8 @@ int main(int argc, char **argv)
     return 1;
        }    
   
-// Writing JP, FTYP and MDAT boxes 
-// Assuming that the JP and FTYP boxes won't be longer than 300 bytes:
+/* Writing JP, FTYP and MDAT boxes */
+/* Assuming that the JP and FTYP boxes won't be longer than 300 bytes:*/
        buf = (unsigned char*) 
         malloc (300 * sizeof(unsigned char));
 
@@ -773,7 +773,7 @@ int main(int argc, char **argv)
        cio = opj_cio_open((opj_common_ptr)movie->cinfo, buf, buflen);
                                                                
        cio_skip(cio, 4);
-       cio_write(cio, JP2_JP2C, 4);    // JP2C
+       cio_write(cio, JP2_JP2C, 4);    /* JP2C*/
 
 /* encode the image */
 #if 0 /* MM: FIXME */
@@ -793,7 +793,7 @@ int main(int argc, char **argv)
 
        tk->sample[sampleno].sample_size = len+8;                               
        tk->sample[sampleno].offset = offset;
-       tk->chunk[sampleno].offset = offset;    // There is one sample per chunk 
+       tk->chunk[sampleno].offset = offset;    /* There is one sample per chunk */
        fwrite(buf, 1, len+8, mj2file);                         
        offset += len+8;                                
 
@@ -812,14 +812,14 @@ int main(int argc, char **argv)
        
        buf = (unsigned char*) malloc(4*sizeof(unsigned char));
 
-// Init a cio to write box length variable in a little endian way 
+/* Init a cio to write box length variable in a little endian way */
        cio = opj_cio_open(NULL, buf, 4);
        cio_write(cio, offset - mdat_initpos, 4);
        fwrite(buf, 4, 1, mj2file);
        fseek(mj2file,0,SEEK_END);
        free(buf);
 
-// Writing MOOV box 
+/* Writing MOOV box */
        buf = (unsigned char*) 
         malloc ((TEMP_BUF+numframes*20) * sizeof(unsigned char));
        cio = opj_cio_open(movie->cinfo, buf, (TEMP_BUF+numframes*20));
@@ -830,7 +830,7 @@ int main(int argc, char **argv)
        fprintf(stdout,"Total encoding time: %.2f s for %d frames (%.1f fps)\n",
         total_time, numframes, (float)numframes/total_time);
 
-  // Ending program 
+  /* Ending program */
   
        fclose(mj2file);
 /* free remaining compression structures */
index 5d37cd7b1c878511d7e4c7d8330cc637a9de718f..e73660aeb0224eb45570f66b6f77c0891f14a79d 100644 (file)
@@ -110,9 +110,9 @@ static int test_image(const char *fname, mj2_cparameters_t *cp)
        && (image->comps[2].dx == 2)
        && (image->comps[0].dy == 1)
        && (image->comps[1].dy == 2)
-       && (image->comps[2].dy == 2))// horizontal and vertical
+       && (image->comps[2].dy == 2))/* horizontal and vertical*/
   {
-//   Y420
+/*   Y420*/
        cp->enumcs = ENUMCS_SYCC;
        cp->CbCr_subsampling_dx = 2;
        cp->CbCr_subsampling_dy = 2;
@@ -123,9 +123,9 @@ static int test_image(const char *fname, mj2_cparameters_t *cp)
        && (image->comps[2].dx == 2)
        && (image->comps[0].dy == 1)
        && (image->comps[1].dy == 1)
-       && (image->comps[2].dy == 1))// horizontal only
+       && (image->comps[2].dy == 1))/* horizontal only*/
   {
-//   Y422
+/*   Y422*/
        cp->enumcs = ENUMCS_SYCC;
        cp->CbCr_subsampling_dx = 2;
        cp->CbCr_subsampling_dy = 1;
@@ -138,14 +138,14 @@ static int test_image(const char *fname, mj2_cparameters_t *cp)
        && (image->comps[1].dy == 1)
        && (image->comps[2].dy == 1))
   {
-//   Y444 or RGB
+/*   Y444 or RGB */
 
        if(image->color_space ==  CLRSPC_SRGB)
  {
        cp->enumcs = ENUMCS_SRGB;
 
-//    cp->CbCr_subsampling_dx = 0;
-//    cp->CbCr_subsampling_dy = 0;
+/*    cp->CbCr_subsampling_dx = 0; */
+/*    cp->CbCr_subsampling_dy = 0; */
  }
        else
  {
@@ -163,8 +163,8 @@ static int test_image(const char *fname, mj2_cparameters_t *cp)
        else
    {
        cp->enumcs = ENUMCS_GRAY;
-//  cp->CbCr_subsampling_dx = 0;
-//  cp->CbCr_subsampling_dy = 0;
+/*  cp->CbCr_subsampling_dx = 0; */
+/*  cp->CbCr_subsampling_dy = 0; */
    }
        if(image->icc_profile_buf)
    {
@@ -295,7 +295,7 @@ static void setparams(opj_mj2_t *movie, opj_image_t *image) {
   
   movie->tk[0].sample_rate = 25;
   
-  movie->tk[0].jp2_struct.numcomps = image->numcomps;  // NC  
+  movie->tk[0].jp2_struct.numcomps = image->numcomps;  /* NC */
        
        /* Init Standard jp2 structure */
        
@@ -336,7 +336,7 @@ static void setparams(opj_mj2_t *movie, opj_image_t *image) {
     movie->tk[0].jp2_struct.meth = 2;
        
     if (image->numcomps == 1)
-     movie->tk[0].jp2_struct.enumcs = 17;  // Grayscale
+     movie->tk[0].jp2_struct.enumcs = 17;  /* Grayscale */
   
     else   
        if ((image->comps[0].dx == 1) 
@@ -345,7 +345,7 @@ static void setparams(opj_mj2_t *movie, opj_image_t *image) {
     && (image->comps[0].dy == 1) 
        && (image->comps[1].dy == 1) 
        && (image->comps[2].dy == 1)) 
-     movie->tk[0].jp2_struct.enumcs = 16;    // RGB
+     movie->tk[0].jp2_struct.enumcs = 16;    /* RGB */
   
     else   
        if ((image->comps[0].dx == 1) 
@@ -354,10 +354,10 @@ static void setparams(opj_mj2_t *movie, opj_image_t *image) {
     && (image->comps[0].dy == 1) 
        && (image->comps[1].dy == 2) 
        && (image->comps[2].dy == 2)) 
-     movie->tk[0].jp2_struct.enumcs = 18;  // YUV
+     movie->tk[0].jp2_struct.enumcs = 18;  /* YUV */
   
   else
-    movie->tk[0].jp2_struct.enumcs = 0;        // Unkown profile */
+    movie->tk[0].jp2_struct.enumcs = 0;        /* Unkown profile */
 }
 
 int main(int argc, char *argv[]) {
@@ -430,56 +430,58 @@ int main(int argc, char *argv[]) {
   fwrite(buf,cio_tell(cio),1,mj2file);
   free(buf);
        
-  // Insert each j2k codestream in a JP2C box  
+  /* Insert each j2k codestream in a JP2C box */
   snum=0;
   offset = 0;  
   while(1)
   {
+    mj2_sample_t * new_sample;
+    mj2_chunk_t * new_chunk;
     sample = &movie->tk[0].sample[snum];
     sprintf(j2kfilename,"%s_%05d.j2k",argv[1],snum);
     j2kfile = fopen(j2kfilename, "rb");
     if (!j2kfile) {
-      if (snum==0) {  // Could not open a single codestream
+      if (snum==0) {  /* Could not open a single codestream */
                                fprintf(stderr, "failed to open %s for reading\n",j2kfilename);
                                return 1;
       }
-      else {         // Tried to open a inexistant codestream
+      else {         /* Tried to open a inexistant codestream */
                                fprintf(stdout,"%d frames are being added to the MJ2 file\n",snum);
                                break;
       }
     }
 
-    // Calculating offset for samples and chunks
+    /* Calculating offset for samples and chunks */
     offset += cio_tell(cio);     
     sample->offset = offset;
-    movie->tk[0].chunk[snum].offset = offset;  // There will be one sample per chunk
+    movie->tk[0].chunk[snum].offset = offset;  /* There will be one sample per chunk */
     
-    // Calculating sample size
+    /* Calculating sample size */
     fseek(j2kfile,0,SEEK_END); 
-    sample->sample_size = ftell(j2kfile) + 8; // Sample size is codestream + JP2C box header
+    sample->sample_size = ftell(j2kfile) + 8; /* Sample size is codestream + JP2C box header */
     fseek(j2kfile,0,SEEK_SET);
     
-    // Reading siz marker of j2k image for the first codestream
+    /* Reading siz marker of j2k image for the first codestream */
     if (snum==0)             
       read_siz_marker(j2kfile, &img);
     
-    // Writing JP2C box header                     
+    /* Writing JP2C box header */
     frame_codestream = (unsigned char*) malloc (sample->sample_size+8); 
                cio = opj_cio_open(movie->cinfo, frame_codestream, sample->sample_size);    
-    cio_write(cio,sample->sample_size, 4);  // Sample size
-    cio_write(cio,JP2_JP2C, 4);        // JP2C
+    cio_write(cio,sample->sample_size, 4);  /* Sample size */
+    cio_write(cio,JP2_JP2C, 4);        /* JP2C */
     
-    // Writing codestream from J2K file to MJ2 file
+    /* Writing codestream from J2K file to MJ2 file */
     fread(frame_codestream+8,sample->sample_size-8,1,j2kfile);
     fwrite(frame_codestream,sample->sample_size,1,mj2file);
     cio_skip(cio, sample->sample_size-8);
     
-    // Ending loop
+    /* Ending loop */
     fclose(j2kfile);
     snum++;
-    mj2_sample_t * new_sample = (mj2_sample_t*)
+    new_sample = (mj2_sample_t*)
                realloc(movie->tk[0].sample, (snum+1) * sizeof(mj2_sample_t));
-    mj2_chunk_t * new_chunk = (mj2_chunk_t*)
+    new_chunk = (mj2_chunk_t*)
                realloc(movie->tk[0].chunk, (snum+1) * sizeof(mj2_chunk_t));
     if (new_sample && new_chunk) {
         movie->tk[0].sample = new_sample;
@@ -491,7 +493,7 @@ int main(int argc, char *argv[]) {
     free(frame_codestream);
   }
   
-  // Writing the MDAT box length in header
+  /* Writing the MDAT box length in header */
   offset += cio_tell(cio);
   buf = (unsigned char*) malloc (4 * sizeof(unsigned char));
        cio = opj_cio_open(movie->cinfo, buf, 4);
@@ -501,18 +503,18 @@ int main(int argc, char *argv[]) {
   fseek(mj2file,0,SEEK_END);
   free(buf);
        
-  // Setting movie parameters
+  /* Setting movie parameters */
   movie->tk[0].num_samples=snum;
   movie->tk[0].num_chunks=snum;
   setparams(movie, &img);
        
-  // Writing MOOV box 
+  /* Writing MOOV box */
        buf = (unsigned char*) malloc ((TEMP_BUF+snum*20) * sizeof(unsigned char));
        cio = opj_cio_open(movie->cinfo, buf, (TEMP_BUF+snum*20));
        mj2_write_moov(movie, cio);
   fwrite(buf,cio_tell(cio),1,mj2file);
        
-  // Ending program
+  /* Ending program */
   free(img.comps);
   opj_cio_close(cio);
 
index 0bf601bb25c7c1fac30ea8415a989d6caad78b6d..d9e4adfa5fb39eb073a769aaaefaf3915b933944 100644 (file)
@@ -94,7 +94,7 @@ opj_bool opj_bio_bytein(opj_bio_t *bio) {
 
 void opj_bio_putbit(opj_bio_t *bio, OPJ_UINT32 b) {
        if (bio->ct == 0) {
-               opj_bio_byteout(bio); // TODO_MSD: check this line
+               opj_bio_byteout(bio); /* TODO_MSD: check this line */
        }
        bio->ct--;
        bio->buf |= b << bio->ct;
@@ -102,7 +102,7 @@ void opj_bio_putbit(opj_bio_t *bio, OPJ_UINT32 b) {
 
 OPJ_UINT32 opj_bio_getbit(opj_bio_t *bio) {
        if (bio->ct == 0) {
-               opj_bio_bytein(bio); // TODO_MSD: check this line
+               opj_bio_bytein(bio); /* TODO_MSD: check this line */
        }
        bio->ct--;
        return (bio->buf >> bio->ct) & 1;
index de1576ff6755420c797e998e147f6f68dd185777..402b2c912bfa944d9f5925c94e30bb48a497bc4c 100644 (file)
@@ -711,7 +711,7 @@ typedef struct opj_packet_info {
 /**
  * Marker structure
  * */
-typedef struct opj_marker_info_t {
+typedef struct opj_marker_info {
        /** marker type */
        unsigned short int type;
        /** position in codestream */
index 372b10ead3070b27664918f38d3c07c1a0e0e31b..9506bbce01c83ba2438a204fa8aaf6fcb0e9c5f5 100644 (file)
@@ -143,7 +143,7 @@ static opj_bool opj_t2_init_seg(    opj_tcd_cblk_dec_v2_t* cblk,
 /* ----------------------------------------------------------------------- */
 
 /* #define RESTART 0x04 */
-// TODO MSD->LHE
+/* TODO MSD->LHE */
 static void t2_putcommacode(opj_bio_t *bio, int n) {
         while (--n >= 0) {
                 bio_write(bio, 1, 1);
@@ -232,7 +232,7 @@ opj_bool opj_t2_encode_packets( opj_t2_v2_t* p_t2,
                         for (poc = 0; poc < pocno ; ++poc) {
                                 OPJ_UINT32 l_tp_num = compno;
 
-                                // TODO MSD : check why this function cannot fail (cf. v1)
+                                /* TODO MSD : check why this function cannot fail (cf. v1) */
                                 pi_create_encode_v2(l_pi, l_cp,p_tile_no,poc,l_tp_num,p_tp_pos,p_t2_mode);
 
                                 while (pi_next(l_current_pi)) {
index 36bb942b1626951f5d2425f6e4c33f7e20980940..47010d46bb17c246fa07639963f8f6a560b6096e 100755 (executable)
@@ -121,7 +121,7 @@ Read a bit
 @return Returns the read bit\r
 */\r
 /* MOD antonin */\r
-//int bio_getbit(opj_bio_t *bio);\r
+/*int bio_getbit(opj_bio_t *bio);*/\r
 /* DOM */\r
 /* ----------------------------------------------------------------------- */\r
 /*@}*/\r
index e27df654304ac1093eb6ca0452aa9205639d5667..b7d2bcc73015d654c5a80ea27087c7669de56a5d 100755 (executable)
@@ -26,9 +26,9 @@
 \r
 #include "opj_includes.h"\r
 \r
-// ==========================================================\r
+/* ==========================================================\r
 //   Utility functions\r
-// ==========================================================\r
+// ==========================================================*/\r
 \r
 #ifndef _WIN32\r
 static char*\r
index ec2a759de8794259d870cd2dd3935aa72df7d42f..5ab5d94bf1ff7c37b6bea85150d15169f3c6d1d3 100755 (executable)
@@ -471,7 +471,7 @@ static void j3d_read_zsi(opj_j3d_t *j3d) {
                volume->comps[i].dz = cio_read(cio, 1); /* ZRsiz_i */\r
        }\r
        \r
-       //Initialization of volume\r
+       /*Initialization of volume*/\r
        cp->tw = int_ceildiv(volume->x1 - cp->tx0, cp->tdx);\r
        cp->th = int_ceildiv(volume->y1 - cp->ty0, cp->tdy);\r
        cp->tl = int_ceildiv(volume->z1 - cp->tz0, cp->tdz);\r
@@ -538,7 +538,7 @@ static void j3d_read_dco(opj_j3d_t *j3d){
        opj_cp_t *cp = j3d->cp;\r
        \r
        len = cio_read(cio, 2);                 /* Lsiz */\r
-       dcotype = cio_read(cio, 1); //offset 8bit unsigned / 16bit signed integers\r
+       dcotype = cio_read(cio, 1); /*offset 8bit unsigned / 16bit signed integers*/\r
        if (dcotype == 0) {\r
                for (i = 0; i < volume->numcomps; i++) {\r
                        volume->comps[i].dcoffset = cio_read(cio, 1);\r
@@ -660,7 +660,7 @@ static void j3d_write_siz(opj_j3d_t *j3d) {
        cio_write(cio, J3D_MS_SIZ, 2);  /* SIZ */\r
        lenp = cio_tell(cio);\r
        cio_skip(cio, 2);\r
-       //cio_write(cio, 0, 2);                 /* Rsiz (capabilities of 15444-1 only) */\r
+       /*cio_write(cio, 0, 2);*/                       /* Rsiz (capabilities of 15444-1 only) */\r
        Rsiz = J3D_RSIZ_DCO | J3D_RSIZ_ATK; /** | J3D_RSIZ_MCT | J3D_RSIZ_NONLT (not implemented yet)*/\r
        cio_write(cio, Rsiz, 2); /* capabilities of WDv5.2*/\r
        cio_write(cio, volume->x1, 4);  /* Xsiz */\r
@@ -725,7 +725,7 @@ static void j3d_read_siz(opj_j3d_t *j3d) {
                for (i = 0; i < volume->numcomps; i++) \r
                        volume->comps[i].dz = 1;\r
 \r
-               //Initialization of volume\r
+               /*Initialization of volume*/\r
                cp->tw = int_ceildiv(volume->x1 - cp->tx0, cp->tdx);\r
                cp->th = int_ceildiv(volume->y1 - cp->ty0, cp->tdy);\r
                cp->tl = int_ceildiv(volume->z1 - cp->tz0, cp->tdz);\r
@@ -767,10 +767,10 @@ static void j3d_write_com(opj_j3d_t *j3d) {
        cio_write(cio, J3D_MS_COM, 2);\r
        lenp = cio_tell(cio);\r
        cio_skip(cio, 2);\r
-       //cio_write(cio, 0, 2);\r
+       /*cio_write(cio, 0, 2);*/\r
        cio_write(cio, j3d->cp->transform_format,1);\r
        cio_write(cio, j3d->cp->encoding_format,1);\r
-       //opj_event_msg(j3d->cinfo, EVT_INFO, "TRF %D ENCOD %d\n",j3d->cp->transform_format,j3d->cp->encoding_format);\r
+       /*opj_event_msg(j3d->cinfo, EVT_INFO, "TRF %D ENCOD %d\n",j3d->cp->transform_format,j3d->cp->encoding_format);*/\r
        if (j3d->cp->comment != NULL) {\r
                char *comment = j3d->cp->comment;\r
                for (i = 0; i < strlen(comment); i++) {\r
@@ -791,9 +791,9 @@ static void j3d_read_com(opj_j3d_t *j3d) {
        \r
        j3d->cp->transform_format = (OPJ_TRANSFORM) cio_read(cio, 1);\r
        j3d->cp->encoding_format = (OPJ_ENTROPY_CODING) cio_read(cio, 1);\r
-       //opj_event_msg(j3d->cinfo, EVT_INFO, "TRF %D ENCOD %d\n",j3d->cp->transform_format,j3d->cp->encoding_format);\r
+       /*opj_event_msg(j3d->cinfo, EVT_INFO, "TRF %D ENCOD %d\n",j3d->cp->transform_format,j3d->cp->encoding_format);*/\r
 \r
-       cio_skip(cio, len - 4);  //posible comments\r
+       cio_skip(cio, len - 4);  /*posible comments*/\r
 }\r
 \r
 static void j3d_write_cox(opj_j3d_t *j3d, int compno) {\r
@@ -871,7 +871,7 @@ static void j3d_read_cox(opj_j3d_t *j3d, int compno) {
                tccp->dwtid[1] = tccp->dwtid[0];        /* SPcox (L) */\r
                tccp->dwtid[2] = tccp->dwtid[0];        /* SPcox (M) */\r
        }\r
-       tccp->reversible = (tccp->dwtid[0]>=1 && tccp->dwtid[1]>=1 && tccp->dwtid[2]>=1); //TODO: only valid for irreversible 9x7 WTs\r
+       tccp->reversible = (tccp->dwtid[0]>=1 && tccp->dwtid[1]>=1 && tccp->dwtid[2]>=1); /*TODO: only valid for irreversible 9x7 WTs*/\r
        if (tccp->csty & J3D_CP_CSTY_PRT) {\r
                for (i = 0; i < tccp->numresolution[0]; i++) {\r
                        int tmp = cio_read(cio, 2);     /* SPcox (N_i) */\r
@@ -1494,7 +1494,7 @@ static void j3d_read_eoc(opj_j3d_t *j3d) {
        j3d_dump_cp(stdout, tcd->volume, tcd->cp);*/\r
        for (i = 0; i < j3d->cp->tileno_size; i++) {\r
                tileno = j3d->cp->tileno[i];\r
-               //opj_event_msg(j3d->cinfo, EVT_INFO, "tcd_decode_tile \n");\r
+               /*opj_event_msg(j3d->cinfo, EVT_INFO, "tcd_decode_tile \n");*/\r
                tcd_decode_tile(tcd, j3d->tile_data[tileno], j3d->tile_len[tileno], tileno);\r
                opj_free(j3d->tile_data[tileno]);\r
                j3d->tile_data[tileno] = NULL;\r
@@ -1696,7 +1696,7 @@ opj_volume_t* j3d_decode(opj_j3d_t *j3d, opj_cio_t *cio) {
                        return 0;\r
                }\r
                e = j3d_dec_mstab_lookup(id);\r
-               //opj_event_msg(cinfo, EVT_INFO, "MARKER %x PREVSTATE %d E->STATE %d\n",e->id,j3d->state,e->states);\r
+               /*opj_event_msg(cinfo, EVT_INFO, "MARKER %x PREVSTATE %d E->STATE %d\n",e->id,j3d->state,e->states);*/\r
                if (!(j3d->state & e->states)) {\r
                        opj_volume_destroy(volume);\r
                        opj_event_msg(cinfo, EVT_ERROR, "%.8x: unexpected marker %x\n", cio_tell(cio) - 2, id);\r
@@ -1705,7 +1705,7 @@ opj_volume_t* j3d_decode(opj_j3d_t *j3d, opj_cio_t *cio) {
                if (e->handler) {\r
                        (*e->handler)(j3d);\r
                }\r
-               //opj_event_msg(cinfo, EVT_INFO, "POSTSTATE %d\n",j3d->state);\r
+               /*opj_event_msg(cinfo, EVT_INFO, "POSTSTATE %d\n",j3d->state);*/\r
                if (j3d->state == J3D_STATE_MT) {\r
                        break;\r
                }\r
@@ -1898,7 +1898,7 @@ void j3d_setup_encoder(opj_j3d_t *j3d, opj_cparameters_t *parameters, opj_volume
                        tccp->cblk[1] = int_floorlog2(parameters->cblock_init[1]); \r
                        tccp->cblk[2] = int_floorlog2(parameters->cblock_init[2]); \r
                                                assert (tccp->cblk[0]+tccp->cblk[1]+tccp->cblk[1] <= T1_MAXWHD);\r
-                       tccp->cblksty = parameters->mode; //Codeblock style --> Table A.19 (default 0)\r
+                       tccp->cblksty = parameters->mode; /*Codeblock style --> Table A.19 (default 0)*/\r
 \r
                        /*ATK / transform */\r
                        tccp->reversible = parameters->irreversible ? 0 : 1; /* 0 => DWT 9-7 || 1 => DWT 5-3  */\r
@@ -1946,7 +1946,7 @@ void j3d_setup_encoder(opj_j3d_t *j3d, opj_cparameters_t *parameters, opj_volume
                                        }\r
                                }\r
                        }\r
-                       //Calcular stepsize for each subband (if NOQNT -->stepsize = 1.0)\r
+                       /*Calcular stepsize for each subband (if NOQNT -->stepsize = 1.0)*/\r
                        dwt_calc_explicit_stepsizes(tccp, volume->comps[i].prec);\r
                }\r
        }\r
@@ -2051,8 +2051,8 @@ static int j3d_create_index(opj_j3d_t *j3d, opj_cio_t *cio, opj_volume_info_t *v
                        */\r
                        for (resno = 0; resno < volume_info->decomposition[0] + 1; resno++) {\r
                                /* I suppose components have same XRsiz, YRsiz */\r
-                               //int x0 = volume_info->tile_Ox + tileno - (int)floor( (float)tileno/(float)volume_info->tw ) * volume_info->tw * volume_info->tile_x;\r
-                               //int y0 = volume_info->tile_Ox + (int)floor( (float)tileno/(float)volume_info->tw ) * volume_info->tile_y;\r
+                               /*int x0 = volume_info->tile_Ox + tileno - (int)floor( (float)tileno/(float)volume_info->tw ) * volume_info->tw * volume_info->tile_x;*/\r
+                               /*int y0 = volume_info->tile_Ox + (int)floor( (float)tileno/(float)volume_info->tw ) * volume_info->tile_y;*/\r
                                int x0 = volume_info->tile_Ox + (int)floor( (float)tileno/(float)volume_info->tw ) * volume_info->tile_x;\r
                                int y0 = volume_info->tile_Oy + (int)floor( (float)tileno/(float)volume_info->th ) * volume_info->tile_y;\r
                                int z0 = volume_info->tile_Ox + (int)floor( (float)tileno/(float)volume_info->tl ) * volume_info->tile_z;\r
@@ -2300,7 +2300,7 @@ bool j3d_encode(opj_j3d_t *j3d, opj_cio_t *cio, opj_volume_t *volume, char *inde
                if (cp->tcps[tileno].numpocs) {\r
                        j3d_write_poc(j3d);\r
                }\r
-               j3d_write_sod(j3d, tcd); //--> tcd_encode_tile\r
+               j3d_write_sod(j3d, tcd); /*--> tcd_encode_tile*/\r
 \r
                /* INDEX >> */\r
                if(volume_info && volume_info->index_on) {\r
index 024572248979ddeb66201d44675b25ca7c986374..e9ecf131df3a721aacfc2c86f5ce2a352cc463c3 100755 (executable)
@@ -81,7 +81,7 @@ The functions in J3D.C have for goal to read/write the several parts of the code
 #define J3D_MS_EPH 0xff92      /**< EPH marker value */\r
 #define J3D_MS_CRG 0xff63      /**< CRG marker value */\r
 #define J3D_MS_COM 0xff64      /**< COM marker value */\r
-//15444-2\r
+/*15444-2*/\r
 #define J3D_MS_DCO 0xff70      /**< DCO marker value */\r
 #define J3D_MS_VMS 0xff71   /**< VMS marker value */\r
 #define J3D_MS_DFS 0xff72      /**< DFS marker value */\r
index 40fecfc372646354b05705473227b879243dd6d4..a24283f38531e4262c8ae7a79ca43f047a7873b1 100755 (executable)
@@ -75,7 +75,4 @@
 #include "int.h"
 #include "fix.h"
 
-//#include "pred.h"
-//#include "golomb.h"
-
 #endif /* OPJ_INCLUDES_H */
index f9b8a9637467f87d4149396d0a0a61cd3a950d21..960c1d845fed17ac56a28cbbdef4189af2476aa0 100755 (executable)
@@ -99,7 +99,7 @@ static bool pi_next_lrcp(opj_pi_iterator_t * pi) {
                                        continue;\r
                                }\r
                                res = &comp->resolutions[pi->resno];\r
-                               //for (pi->precno = 0; pi->precno < (res->prctno[0] * res->prctno[1]); pi->precno++) {\r
+                               /*for (pi->precno = 0; pi->precno < (res->prctno[0] * res->prctno[1]); pi->precno++) {*/\r
                                for (pi->precno = 0; pi->precno < (res->prctno[0] * res->prctno[1] * res->prctno[2]); pi->precno++) {\r
                                        index = pi->layno * pi->step_l \r
                                                + pi->resno * pi->step_r \r
@@ -140,7 +140,7 @@ static bool pi_next_rlcp(opj_pi_iterator_t * pi) {
                                        continue;\r
                                }\r
                                res = &comp->resolutions[pi->resno];\r
-                               //for (pi->precno = 0; pi->precno < (res->prctno[0] * res->prctno[1]); pi->precno++) {\r
+                               /*for (pi->precno = 0; pi->precno < (res->prctno[0] * res->prctno[1]); pi->precno++) {*/\r
                                for (pi->precno = 0; pi->precno < (res->prctno[0] * res->prctno[1] * res->prctno[2]); pi->precno++) {\r
                                        index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno * pi->step_c + pi->precno * pi->step_p;\r
                                        if (!pi->include[index]) {\r
index 7b4a18f55a2f364146b2f94eace816dae7af2f9e..1863484c41c22cc9ddb79f018dd37d5b0e6eef24 100755 (executable)
@@ -117,9 +117,9 @@ typedef struct opj_t1 {
        int lut_nmsedec_ref[1 << T1_NMSEDEC_BITS];\r
        int lut_nmsedec_ref0[1 << T1_NMSEDEC_BITS];\r
        /** Codeblock data */\r
-       int data[T1_CBLKD][T1_CBLKH][T1_CBLKW];//int ***data;\r
+       int data[T1_CBLKD][T1_CBLKH][T1_CBLKW];/*int ***data;*/\r
        /** Context information for each voxel in codeblock */\r
-       int flags[T1_CBLKD + 2][T1_CBLKH + 2][T1_CBLKH + 2];//int ***flags;\r
+       int flags[T1_CBLKD + 2][T1_CBLKH + 2][T1_CBLKH + 2];/*int ***flags;*/\r
 } opj_t1_t;\r
 \r
 /** @name Exported functions */\r
index dd73763df077e5ce89eec24ea7ecdb15b443ab16..6410bd5af60de449eb51e2a0a88b245490bcb847 100755 (executable)
@@ -79,9 +79,9 @@ The functions in T1_3D.C are used by some function in TCD.C.
 #define T1_3D_SGN_B            0x8000\r
 #define T1_3D_SGN              (T1_3D_SGN_N|T1_3D_SGN_E|T1_3D_SGN_S|T1_3D_SGN_W|T1_3D_SGN_F|T1_3D_SGN_B)\r
 \r
-#define T1_3D_SIG              0x0001  //Significance state\r
-#define T1_3D_REFINE   0x0002  //Delayed significance\r
-#define T1_3D_VISIT            0x0004  //First-pass membership\r
+#define T1_3D_SIG              0x0001  /*Significance state*/\r
+#define T1_3D_REFINE   0x0002  /*Delayed significance*/\r
+#define T1_3D_VISIT            0x0004  /*First-pass membership*/\r
 \r
 #define T1_3D_NUMCTXS_AGG      1\r
 #define T1_3D_NUMCTXS_ZC       16\r
@@ -90,11 +90,11 @@ The functions in T1_3D.C are used by some function in TCD.C.
 #define T1_3D_NUMCTXS_UNI      1\r
 \r
 #define T1_3D_CTXNO_AGG 0\r
-#define T1_3D_CTXNO_ZC (T1_3D_CTXNO_AGG+T1_3D_NUMCTXS_AGG) //1\r
-#define T1_3D_CTXNO_MAG (T1_3D_CTXNO_ZC+T1_3D_NUMCTXS_ZC)      //17\r
-#define T1_3D_CTXNO_SC (T1_3D_CTXNO_MAG+T1_3D_NUMCTXS_MAG)     //20\r
-#define T1_3D_CTXNO_UNI (T1_3D_CTXNO_SC+T1_3D_NUMCTXS_SC)      //26\r
-#define T1_3D_NUMCTXS  (T1_3D_CTXNO_UNI+T1_3D_NUMCTXS_UNI) //27\r
+#define T1_3D_CTXNO_ZC (T1_3D_CTXNO_AGG+T1_3D_NUMCTXS_AGG) /*1*/\r
+#define T1_3D_CTXNO_MAG (T1_3D_CTXNO_ZC+T1_3D_NUMCTXS_ZC)      /*17*/\r
+#define T1_3D_CTXNO_SC (T1_3D_CTXNO_MAG+T1_3D_NUMCTXS_MAG)     /*20*/\r
+#define T1_3D_CTXNO_UNI (T1_3D_CTXNO_SC+T1_3D_NUMCTXS_SC)      /*26*/\r
+#define T1_3D_NUMCTXS  (T1_3D_CTXNO_UNI+T1_3D_NUMCTXS_UNI) /*27*/\r
 \r
 \r
 /* ----------------------------------------------------------------------- */\r
index e5147e2915261492daf81909499f442a98f69638..88b1bcf61a2f5b2ddbe2a2729ccd5deaee81ed86 100755 (executable)
@@ -156,7 +156,7 @@ void tcd_destroy(opj_tcd_t *tcd) {
 \r
 /* ----------------------------------------------------------------------- */\r
 void tcd_malloc_encode(opj_tcd_t *tcd, opj_volume_t * volume, opj_cp_t * cp, int curtileno) {\r
-       int compno, resno, bandno, precno, cblkno, i, j;//, k;\r
+       int compno, resno, bandno, precno, cblkno, i, j;/*, k;*/\r
 \r
        opj_tcd_tile_t          *tile = NULL;           /* pointer to tcd->tile */\r
        opj_tcd_tilecomp_t      *tilec = NULL;          /* pointer to tcd->tilec */\r
@@ -239,7 +239,7 @@ void tcd_malloc_encode(opj_tcd_t *tcd, opj_volume_t * volume, opj_cp_t * cp, int
                res_max = 0;\r
                for (i = 0;i < 3; i++){\r
                        tilec->numresolution[i] = tccp->numresolution[i];\r
-                       //Greater of 3 resolutions contains all information\r
+                       /*Greater of 3 resolutions contains all information*/\r
                        res_max = (tilec->numresolution[i] > res_max) ? tilec->numresolution[i] : res_max;\r
                }\r
                \r
@@ -272,7 +272,7 @@ void tcd_malloc_encode(opj_tcd_t *tcd, opj_volume_t * volume, opj_cp_t * cp, int
                        res->x1 = int_ceildivpow2(tilec->x1, levelnox);\r
                        res->y1 = int_ceildivpow2(tilec->y1, levelnoy);\r
                        res->z1 = int_ceildivpow2(tilec->z1, levelnoz);\r
-                       //if (res->z1 < 0)fprintf(stdout,"Res: %d       %d/%d --> %d\n",resno,tilec->z1, levelnoz, int_ceildivpow2(tilec->z1, levelnoz));\r
+                       /*if (res->z1 < 0)fprintf(stdout,"Res: %d       %d/%d --> %d\n",resno,tilec->z1, levelnoz, int_ceildivpow2(tilec->z1, levelnoz));*/\r
 \r
                        res->numbands = (resno == 0) ? 1 : (resno <= diff) ? 3 : 7; /* --> 3D */\r
 \r
@@ -323,9 +323,9 @@ void tcd_malloc_encode(opj_tcd_t *tcd, opj_volume_t * volume, opj_cp_t * cp, int
                                cbglengthexpn = pdz - 1;\r
                        }\r
                        \r
-                       cblkwidthexpn = int_min(tccp->cblk[0], cbgwidthexpn); //6\r
-                       cblkheightexpn = int_min(tccp->cblk[1], cbgheightexpn); //6\r
-                       cblklengthexpn = int_min(tccp->cblk[2], cbglengthexpn); //6\r
+                       cblkwidthexpn = int_min(tccp->cblk[0], cbgwidthexpn); /*6*/\r
+                       cblkheightexpn = int_min(tccp->cblk[1], cbgheightexpn); /*6*/\r
+                       cblklengthexpn = int_min(tccp->cblk[2], cbglengthexpn); /*6*/\r
                        \r
                        res->bands = (opj_tcd_band_t *) opj_malloc(res->numbands * sizeof(opj_tcd_band_t));\r
                        for (bandno = 0; bandno < res->numbands; bandno++) {\r
@@ -414,7 +414,7 @@ void tcd_malloc_encode(opj_tcd_t *tcd, opj_volume_t * volume, opj_cp_t * cp, int
                                        prc->cblks = (opj_tcd_cblk_t *) opj_malloc((prc->cblkno[0] * prc->cblkno[1] * prc->cblkno[2]) * sizeof(opj_tcd_cblk_t));\r
                                        prc->incltree = tgt_create(prc->cblkno[0], prc->cblkno[1], prc->cblkno[2]);\r
                                        prc->imsbtree = tgt_create(prc->cblkno[0], prc->cblkno[1], prc->cblkno[2]);\r
-                                       //tgt_tree_dump(stdout,prc->incltree);\r
+                                       /*tgt_tree_dump(stdout,prc->incltree);*/\r
                                        for (cblkno = 0; cblkno < (prc->cblkno[0] * prc->cblkno[1] * prc->cblkno[2]); cblkno++) {\r
                                                int cblkxstart = tlcblkxstart + (cblkno % prc->cblkno[0]) * (1 << cblkwidthexpn);\r
                                                int cblkystart = tlcblkystart + ((cblkno % (prc->cblkno[0] * prc->cblkno[1])) / prc->cblkno[0]) * (1 << cblkheightexpn);\r
@@ -439,7 +439,7 @@ void tcd_malloc_encode(opj_tcd_t *tcd, opj_volume_t * volume, opj_cp_t * cp, int
                        }\r
                }\r
        }\r
-       //tcd_dump(stdout, tcd, tcd->tcd_volume);\r
+       /*tcd_dump(stdout, tcd, tcd->tcd_volume);*/\r
 \r
 }\r
 void tcd_init_encode(opj_tcd_t *tcd, opj_volume_t * volume, opj_cp_t * cp, int curtileno) {\r
@@ -518,7 +518,7 @@ void tcd_init_encode(opj_tcd_t *tcd, opj_volume_t * volume, opj_cp_t * cp, int c
                res_max = 0;\r
                for (i = 0;i < 3; i++){\r
                        tilec->numresolution[i] = tccp->numresolution[i];\r
-                       //Greater of 3 resolutions contains all information\r
+                       /*Greater of 3 resolutions contains all information*/\r
                        res_max = (tilec->numresolution[i] > res_max) ? tilec->numresolution[i] : res_max;\r
                }\r
 \r
@@ -547,7 +547,8 @@ void tcd_init_encode(opj_tcd_t *tcd, opj_volume_t * volume, opj_cp_t * cp, int c
                        res->y1 = int_ceildivpow2(tilec->y1, levelnoy);\r
                        res->z1 = int_ceildivpow2(tilec->z1, levelnoz);\r
 \r
-                       // res->numbands = resno == 0 ? 1 : 3; /* --> 2D */\r
+                       /* res->numbands = resno == 0 ? 1 : 3; *//* --> 2D */\r
+\r
                        res->numbands = (resno == 0) ? 1 : (resno <= diff) ? 3 : 7; /* --> 3D */\r
 \r
                        /* p. 30, table A-13, ISO/IEC IS154444-1 : 2002 */                      \r
@@ -707,7 +708,7 @@ void tcd_init_encode(opj_tcd_t *tcd, opj_volume_t * volume, opj_cp_t * cp, int c
                        } /* bandno */\r
                } /* resno */\r
        } /* compno */\r
-       //tcd_dump(stdout, tcd, tcd->tcd_volume);\r
+       /*tcd_dump(stdout, tcd, tcd->tcd_volume);*/\r
 }\r
 \r
 \r
@@ -715,7 +716,7 @@ void tcd_free_encode(opj_tcd_t *tcd) {
        int tileno, compno, resno, bandno, precno;\r
 \r
        opj_tcd_tile_t *tile = NULL;            /* pointer to tcd->tile         */\r
-//     opj_tcd_slice_t *slice = NULL;          /* pointer to tcd->slice */\r
+/*     opj_tcd_slice_t *slice = NULL; */               /* pointer to tcd->slice */\r
        opj_tcd_tilecomp_t *tilec = NULL;       /* pointer to tcd->tilec        */\r
        opj_tcd_resolution_t *res = NULL;       /* pointer to tcd->res          */\r
        opj_tcd_band_t *band = NULL;            /* pointer to tcd->band         */\r
@@ -821,7 +822,7 @@ void tcd_malloc_decode(opj_tcd_t *tcd, opj_volume_t * volume, opj_cp_t * cp) {
                        res_max = 0;\r
                        for (i = 0;i < 3; i++){\r
                                tilec->numresolution[i] = tccp->numresolution[i];\r
-                               //Greater of 3 resolutions contains all information\r
+                               /*Greater of 3 resolutions contains all information*/\r
                                res_max = (tilec->numresolution[i] > res_max) ? tilec->numresolution[i] : res_max;\r
                        }\r
 \r
@@ -874,13 +875,13 @@ void tcd_malloc_decode(opj_tcd_t *tcd, opj_volume_t * volume, opj_cp_t * cp) {
                                \r
                                /* p. 67, B.17 & B.18, ISO/IEC IS15444-1 : 2002  */\r
                                if (resno == 0) {\r
-                                       tlcbgxstart = tlprcxstart;//0\r
+                                       tlcbgxstart = tlprcxstart;/*0*/\r
                                        tlcbgystart = tlprcystart;\r
                                        tlcbgzstart = tlprczstart;\r
-                                       brcbgxend = brprcxend;//1\r
+                                       brcbgxend = brprcxend;/*1*/\r
                                        brcbgyend = brprcyend;\r
                                        brcbgzend = brprczend;\r
-                                       cbgwidthexpn = pdx; //15\r
+                                       cbgwidthexpn = pdx; /*15*/\r
                                        cbgheightexpn = pdy;\r
                                        cbglengthexpn = pdz;\r
                                } else {\r
@@ -895,9 +896,9 @@ void tcd_malloc_decode(opj_tcd_t *tcd, opj_volume_t * volume, opj_cp_t * cp) {
                                        cbglengthexpn = pdz - 1;\r
                                }\r
                                \r
-                               cblkwidthexpn = int_min(tccp->cblk[0], cbgwidthexpn); //6\r
-                               cblkheightexpn = int_min(tccp->cblk[1], cbgheightexpn); //6\r
-                               cblklengthexpn = int_min(tccp->cblk[2], cbglengthexpn); //6\r
+                               cblkwidthexpn = int_min(tccp->cblk[0], cbgwidthexpn); /*6*/\r
+                               cblkheightexpn = int_min(tccp->cblk[1], cbgheightexpn); /*6*/\r
+                               cblklengthexpn = int_min(tccp->cblk[2], cbglengthexpn); /*6*/\r
 \r
                                res->bands = (opj_tcd_band_t *) opj_malloc(res->numbands * sizeof(opj_tcd_band_t));\r
                                for (bandno = 0; bandno < res->numbands; bandno++) {\r
@@ -1003,7 +1004,7 @@ void tcd_malloc_decode(opj_tcd_t *tcd, opj_volume_t * volume, opj_cp_t * cp) {
                } /* compno */\r
        } /* i = 0..cp->tileno_size */\r
 \r
-       //tcd_dump(stdout, tcd, tcd->tcd_volume);\r
+       /*tcd_dump(stdout, tcd, tcd->tcd_volume);*/\r
 \r
        /* \r
        Allocate place to store the decoded data = final volume\r
@@ -1234,7 +1235,7 @@ void tcd_makelayer(opj_tcd_t *tcd, int layno, double thresh, int final) {
                                                if (final)\r
                                                        cblk->numpassesinlayers = n;\r
 \r
-                                       //      fprintf(stdout,"MakeLayer : %d %f %d %d \n",layer->len, layer->disto, layer->numpasses, n);\r
+                                       /*      fprintf(stdout,"MakeLayer : %d %f %d %d \n",layer->len, layer->disto, layer->numpasses, n);*/\r
                                        }\r
                                }\r
                        }\r
@@ -1346,7 +1347,7 @@ bool tcd_rateallocate(opj_tcd_t *tcd, unsigned char *dest, int len, opj_volume_i
                                        lo = thresh;\r
                                } else {                /* disto_alloc -r, fixed_alloc -f */\r
                                        l = t2_encode_packets(t2, tcd->tcd_tileno, tcd_tile, layno + 1, dest, maxlen, volume_info);\r
-                                       //fprintf(stdout, "layno %d i %d len=%d max=%d \n",layno,i,l,maxlen);\r
+                                       /*fprintf(stdout, "layno %d i %d len=%d max=%d \n",layno,i,l,maxlen);*/\r
                                        if (l == -999) {\r
                                                lo = thresh; \r
                                                continue;\r
@@ -1433,7 +1434,7 @@ int tcd_encode_tile(opj_tcd_t *tcd, int tileno, unsigned char *dest, int len, op
                opj_tcd_tilecomp_t *tilec = &tile->comps[compno];\r
                \r
                int adjust;\r
-               int offset_x = int_ceildiv(volume->x0, volume->comps[compno].dx); //ceil(x0 / subsampling_dx)\r
+               int offset_x = int_ceildiv(volume->x0, volume->comps[compno].dx); /*ceil(x0 / subsampling_dx)*/\r
                int offset_y = int_ceildiv(volume->y0, volume->comps[compno].dy);\r
                int offset_z = int_ceildiv(volume->z0, volume->comps[compno].dz);\r
                \r
@@ -1447,18 +1448,18 @@ int tcd_encode_tile(opj_tcd_t *tcd, int tileno, unsigned char *dest, int len, op
                \r
                \r
                /* extract tile data from volume.comps[0].data to tile.comps[0].data */\r
-               //fprintf(stdout,"[INFO] Extract tile data\n");\r
+               /*fprintf(stdout,"[INFO] Extract tile data\n");*/\r
                if (tcd->cp->transform_format == TRF_3D_RLS || tcd->cp->transform_format == TRF_3D_LSE) {\r
                        adjust = 0;\r
                } else {\r
-            adjust = volume->comps[compno].sgnd ? 0 : 1 << (volume->comps[compno].prec - 1); //sign=='+' --> 2^(prec-1)\r
+            adjust = volume->comps[compno].sgnd ? 0 : 1 << (volume->comps[compno].prec - 1); /*sign=='+' --> 2^(prec-1)*/\r
                        if (volume->comps[compno].dcoffset != 0){\r
                                adjust += volume->comps[compno].dcoffset;\r
                                fprintf(stdout,"[INFO] DC Offset applied: DCO = %d -> adjust = %d\n",volume->comps[compno].dcoffset,adjust);\r
                        }\r
                }               \r
 \r
-               if (tcd_tcp->tccps[compno].reversible == 1) { //IF perfect reconstruction (DWT.5-3)\r
+               if (tcd_tcp->tccps[compno].reversible == 1) { /*IF perfect reconstruction (DWT.5-3)*/\r
                        for (z = tilec->z0; z < tilec->z1; z++) {\r
                                for (y = tilec->y0; y < tilec->y1; y++) {\r
                                        /* start of the src tile scanline */\r
@@ -1470,7 +1471,7 @@ int tcd_encode_tile(opj_tcd_t *tcd, int tileno, unsigned char *dest, int len, op
                                        }\r
                                }\r
                        }\r
-               } else if (tcd_tcp->tccps[compno].reversible == 0) { //IF not (DWT.9-7)\r
+               } else if (tcd_tcp->tccps[compno].reversible == 0) { /*IF not (DWT.9-7)*/\r
                        for (z = tilec->z0; z < tilec->z1; z++) {\r
                                for (y = tilec->y0; y < tilec->y1; y++) {\r
                                        /* start of the src tile scanline */\r
@@ -1694,7 +1695,7 @@ bool tcd_decode_tile(opj_tcd_t *tcd, unsigned char *src, int len, int tileno) {
                if (tcd->cp->transform_format == TRF_3D_RLS || tcd->cp->transform_format == TRF_3D_LSE) {\r
                        adjust = 0;\r
                } else {\r
-            adjust = tcd->volume->comps[compno].sgnd ? 0 : 1 << (tcd->volume->comps[compno].prec - 1); //sign=='+' --> 2^(prec-1)\r
+            adjust = tcd->volume->comps[compno].sgnd ? 0 : 1 << (tcd->volume->comps[compno].prec - 1); /*sign=='+' --> 2^(prec-1)*/\r
                        if (tcd->volume->comps[compno].dcoffset != 0){\r
                                adjust += tcd->volume->comps[compno].dcoffset;\r
                                fprintf(stdout,"[INFO] DC Offset applied: DCO = %d -> adjust = %d\n",tcd->volume->comps[compno].dcoffset,adjust);\r
index 52504d10f255662ec71a321a48009f31c5fe58d1..06c814e74a9aee71ee9061226eae8dae1fef7f61 100755 (executable)
@@ -115,7 +115,7 @@ typedef struct opj_tcd_cblk {
   opj_tcd_pass_t passes[100];  
 /* Data */
   unsigned char data[524288];          
-  //unsigned char *data;
+  /*unsigned char *data;*/
 } opj_tcd_cblk_t;
 
 /**
index b75cfdb1f15237c08088ed9691a44f831bd5ce84..92890841ce72aef444491ce9544c284b8c53e033 100644 (file)
@@ -1610,6 +1610,7 @@ opj_bool jpwl_esd_write(opj_j2k_t *j2k, jpwl_esd_ms_t *esd, unsigned char *buf)
        /* update markers struct */
        j2k_add_marker(j2k->cstr_info, J2K_MS_ESD, -1, esd->Lesd + 2);
 
+       return OPJ_TRUE;
 }
 
 unsigned short int jpwl_double_to_pfp(double V, int bytes) {