X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fgdcmopenjpeg%2Flibopenjpeg%2Fj2k.c;h=09868ca63351a65c582f9928a0de478f1b8cb051;hb=3f8964856e65c2447beab900b04a63d003192bf9;hp=53a48797888cbbc1a1a3f4eb981c84136ed00faf;hpb=7452f3039ff4dd2574fcbf3343b530a2f20f9623;p=gdcm.git diff --git a/src/gdcmopenjpeg/libopenjpeg/j2k.c b/src/gdcmopenjpeg/libopenjpeg/j2k.c index 53a48797..09868ca6 100644 --- a/src/gdcmopenjpeg/libopenjpeg/j2k.c +++ b/src/gdcmopenjpeg/libopenjpeg/j2k.c @@ -348,7 +348,7 @@ void j2k_read_cox(int compno) J2K_STATE_TPH ? &j2k_cp->tcps[j2k_curtileno] : &j2k_default_tcp; tccp = &tcp->tccps[compno]; tccp->numresolutions = cio_read(1) + 1; /* SPcox (D) */ - //Check the reduce value + /*Check the reduce value*/ j2k_cp->reduce=int_min((tccp->numresolutions)-1,j2k_cp->reduce); tccp->cblkw = cio_read(1) + 2; /* SPcox (E) */ tccp->cblkh = cio_read(1) + 2; /* SPcox (F) */ @@ -588,7 +588,7 @@ void j2k_write_poc() len = 2 + (5 + 2 * (j2k_img->numcomps <= 256 ? 1 : 2)) * numpchgs; cio_write(len, 2); /* Lpoc */ for (i = 0; i < numpchgs; i++) { - // MODIF + /* MODIF*/ j2k_poc_t *poc; poc = &tcp->pocs[i]; cio_write(poc->resno0, 1); /* RSpoc_i */ @@ -725,7 +725,7 @@ void j2k_read_ppm() (unsigned char *) calloc(N_ppm, sizeof(unsigned char)); j2k_cp->ppm_data_first = j2k_cp->ppm_data; - j2k_cp->ppm_len = N_ppm; //Add antonin : ppmbug1 + j2k_cp->ppm_len = N_ppm; /*Add antonin : ppmbug1*/ } else { /* NON-first PPM marker */ j2k_cp->ppm_data = @@ -735,7 +735,7 @@ void j2k_read_ppm() sizeof(unsigned char)); j2k_cp->ppm_data_first = j2k_cp->ppm_data; - j2k_cp->ppm_len = N_ppm + j2k_cp->ppm_store; //Add antonin : ppmbug1 + j2k_cp->ppm_len = N_ppm + j2k_cp->ppm_store; /*Add antonin : ppmbug1*/ } @@ -767,7 +767,7 @@ void j2k_read_ppt() tcp->ppt_data_first = tcp->ppt_data; tcp->ppt_store = 0; - tcp->ppt_len = len - 3; //Add antonin : ppmbug1 + tcp->ppt_len = len - 3; /*Add antonin : ppmbug1*/ } else { /* NON-first PPT marker */ tcp->ppt_data = (unsigned char *) realloc(tcp->ppt_data, @@ -775,7 +775,7 @@ void j2k_read_ppt() tcp->ppt_store) * sizeof(unsigned char)); tcp->ppt_data_first = tcp->ppt_data; - tcp->ppt_len = len - 3 + tcp->ppt_store; //Add antonin : ppmbug1 + tcp->ppt_len = len - 3 + tcp->ppt_store; /*Add antonin : ppmbug1*/ } @@ -880,7 +880,7 @@ void j2k_write_sod() tcp = &j2k_cp->tcps[j2k_curtileno]; for (layno = 0; layno < tcp->numlayers; layno++) { - tcp->rates[layno] -= tcp->rates[layno] ? (j2k_sod_start / (j2k_cp->th * j2k_cp->tw)) : 0; //Mod antonin losslessbug + tcp->rates[layno] -= tcp->rates[layno] ? (j2k_sod_start / (j2k_cp->th * j2k_cp->tw)) : 0; /*Mod antonin losslessbug*/ } info_IM.num = 0; @@ -988,7 +988,7 @@ j2k_encode(j2k_image_t * img, j2k_cp_t * cp, char *output, int len, char *index) { int tileno, compno, layno, resno, precno, pack_nb, x, y; - char *dest = NULL; + unsigned char *dest = NULL; FILE *INDEX = NULL; FILE *f = NULL; @@ -1002,7 +1002,7 @@ j2k_encode(j2k_image_t * img, j2k_cp_t * cp, char *output, fprintf(stderr, "failed to open %s for writing\n", output); return 1; } - dest = (char *) malloc(len); + dest = (unsigned char *) malloc(len); cio_init(dest, len); } @@ -1062,7 +1062,7 @@ j2k_encode(j2k_image_t * img, j2k_cp_t * cp, char *output, if (cp->intermed_file == 1) { /* new dest for each tile */ free(dest); - dest = (char *) malloc(len); + dest = (unsigned char *) malloc(len); cio_init(dest, len); } j2k_curtileno = tileno; @@ -1124,7 +1124,7 @@ j2k_encode(j2k_image_t * img, j2k_cp_t * cp, char *output, if (cp->intermed_file == 1) { free(dest); - dest = (char *) malloc(len); + dest = (unsigned char *) malloc(len); cio_init(dest, len); } @@ -1173,7 +1173,7 @@ j2k_encode(j2k_image_t * img, j2k_cp_t * cp, char *output, for (resno = info_IM.Decomposition; resno >= 0; resno--) { - fprintf(INDEX, "[%d,%d] ", (1 << info_IM.tile[0].pdx[resno]), (1 << info_IM.tile[0].pdx[resno])); //based on tile 0 + fprintf(INDEX, "[%d,%d] ", (1 << info_IM.tile[0].pdx[resno]), (1 << info_IM.tile[0].pdx[resno])); /*based on tile 0*/ } @@ -1208,7 +1208,7 @@ j2k_encode(j2k_image_t * img, j2k_cp_t * cp, char *output, "pkno tileno layerno resno compno precno start_pos end_pos deltaSE \n"); */ if (info_IM.Prog == 0) { /* LRCP */ - //fprintf(INDEX, "pack_nb tileno layno resno compno precno start_pos end_pos disto"); + /*fprintf(INDEX, "pack_nb tileno layno resno compno precno start_pos end_pos disto");*/ for (layno = 0; layno < info_IM.Layer; layno++) { for (resno = 0; resno < info_IM.Decomposition + 1; resno++) { for (compno = 0; compno < info_IM.Comp; compno++) { @@ -1229,7 +1229,7 @@ j2k_encode(j2k_image_t * img, j2k_cp_t * cp, char *output, } } } else if (info_IM.Prog == 1) { /* RLCP */ - //fprintf(INDEX, "pack_nb tileno resno layno compno precno start_pos end_pos disto"); + /*fprintf(INDEX, "pack_nb tileno resno layno compno precno start_pos end_pos disto");*/ for (resno = 0; resno < info_IM.Decomposition + 1; resno++) { for (layno = 0; layno < info_IM.Layer; layno++) { for (compno = 0; compno < info_IM.Comp; compno++) { @@ -1247,7 +1247,7 @@ j2k_encode(j2k_image_t * img, j2k_cp_t * cp, char *output, } } } else if (info_IM.Prog == 2) { /* RPCL */ - //fprintf(INDEX, "\npack_nb tileno resno precno compno layno start_pos end_pos disto\n"); + /*fprintf(INDEX, "\npack_nb tileno resno precno compno layno start_pos end_pos disto\n"); */ for (resno = 0; resno < info_IM.Decomposition + 1; resno++) { /* I suppose components have same XRsiz, YRsiz */ int x0 = info_IM.Tile_Ox + tileno - (int)floor( tileno/info_IM.tw ) * info_IM.tw * info_IM.Tile_x; @@ -1284,13 +1284,13 @@ j2k_encode(j2k_image_t * img, j2k_cp_t * cp, char *output, } } } else if (info_IM.Prog == 3) { /* PCRL */ - // I suppose components have same XRsiz, YRsiz + /* I suppose components have same XRsiz, YRsiz*/ int x0 = info_IM.Tile_Ox + tileno - (int)floor( tileno/info_IM.tw ) * info_IM.tw * info_IM.Tile_x; int y0 = info_IM.Tile_Ox + (int)floor( tileno/info_IM.tw ) * info_IM.Tile_y; int x1 = x0 + info_IM.Tile_x; int y1 = y0 + info_IM.Tile_y; - //fprintf(INDEX, "\npack_nb tileno precno compno resno layno start_pos end_pos disto\n"); + /*fprintf(INDEX, "\npack_nb tileno precno compno resno layno start_pos end_pos disto\n"); */ for (y=y0; y