[trunk]remove t2_init_seg
[openjpeg.git] / libopenjpeg / tcd.c
index ea09a17f94702d5028e9704dbac7273798bf8a8c..d7725141e01f2c4171fe0fd5c4414e9d29766b3a 100644 (file)
 
 #include "opj_includes.h"
 
+/* ----------------------------------------------------------------------- */
+
+
 void tcd_dump(FILE *fd, opj_tcd_t *tcd, opj_tcd_image_t * img) {
-       int tileno, compno, resno, bandno, precno;/*, cblkno;*/
-
-       fprintf(fd, "image {\n");
-       fprintf(fd, "  tw=%d, th=%d x0=%d x1=%d y0=%d y1=%d\n", 
-               img->tw, img->th, tcd->image->x0, tcd->image->x1, tcd->image->y0, tcd->image->y1);
-
-       for (tileno = 0; tileno < img->th * img->tw; tileno++) {
-               opj_tcd_tile_t *tile = &tcd->tcd_image->tiles[tileno];
-               fprintf(fd, "  tile {\n");
-               fprintf(fd, "    x0=%d, y0=%d, x1=%d, y1=%d, numcomps=%d\n",
-                       tile->x0, tile->y0, tile->x1, tile->y1, tile->numcomps);
-               for (compno = 0; compno < tile->numcomps; compno++) {
-                       opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
-                       fprintf(fd, "    tilec {\n");
-                       fprintf(fd,
-                               "      x0=%d, y0=%d, x1=%d, y1=%d, numresolutions=%d\n",
-                               tilec->x0, tilec->y0, tilec->x1, tilec->y1, tilec->numresolutions);
-                       for (resno = 0; resno < tilec->numresolutions; resno++) {
-                               opj_tcd_resolution_t *res = &tilec->resolutions[resno];
-                               fprintf(fd, "\n   res {\n");
-                               fprintf(fd,
-                                       "          x0=%d, y0=%d, x1=%d, y1=%d, pw=%d, ph=%d, numbands=%d\n",
-                                       res->x0, res->y0, res->x1, res->y1, res->pw, res->ph, res->numbands);
-                               for (bandno = 0; bandno < res->numbands; bandno++) {
-                                       opj_tcd_band_t *band = &res->bands[bandno];
-                                       fprintf(fd, "        band {\n");
-                                       fprintf(fd,
-                                               "          x0=%d, y0=%d, x1=%d, y1=%d, stepsize=%f, numbps=%d\n",
-                                               band->x0, band->y0, band->x1, band->y1, band->stepsize, band->numbps);
-                                       for (precno = 0; precno < res->pw * res->ph; precno++) {
-                                               opj_tcd_precinct_t *prec = &band->precincts[precno];
-                                               fprintf(fd, "          prec {\n");
-                                               fprintf(fd,
-                                                       "            x0=%d, y0=%d, x1=%d, y1=%d, cw=%d, ch=%d\n",
-                                                       prec->x0, prec->y0, prec->x1, prec->y1, prec->cw, prec->ch);
-                                               /*
-                                               for (cblkno = 0; cblkno < prec->cw * prec->ch; cblkno++) {
-                                                       opj_tcd_cblk_t *cblk = &prec->cblks[cblkno];
-                                                       fprintf(fd, "            cblk {\n");
-                                                       fprintf(fd,
-                                                               "              x0=%d, y0=%d, x1=%d, y1=%d\n",
-                                                               cblk->x0, cblk->y0, cblk->x1, cblk->y1);
-                                                       fprintf(fd, "            }\n");
-                                               }
-                                               */
-                                               fprintf(fd, "          }\n");
-                                       }
-                                       fprintf(fd, "        }\n");
-                               }
-                               fprintf(fd, "      }\n");
-                       }
-                       fprintf(fd, "    }\n");
-               }
-               fprintf(fd, "  }\n");
-       }
-       fprintf(fd, "}\n");
+        int tileno, compno, resno, bandno, precno;/*, cblkno;*/
+
+        fprintf(fd, "image {\n");
+        fprintf(fd, "  tw=%d, th=%d x0=%d x1=%d y0=%d y1=%d\n", 
+                img->tw, img->th, tcd->image->x0, tcd->image->x1, tcd->image->y0, tcd->image->y1);
+
+        for (tileno = 0; tileno < img->th * img->tw; tileno++) {
+                opj_tcd_tile_t *tile = &tcd->tcd_image->tiles[tileno];
+                fprintf(fd, "  tile {\n");
+                fprintf(fd, "    x0=%d, y0=%d, x1=%d, y1=%d, numcomps=%d\n",
+                        tile->x0, tile->y0, tile->x1, tile->y1, tile->numcomps);
+                for (compno = 0; compno < tile->numcomps; compno++) {
+                        opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
+                        fprintf(fd, "    tilec {\n");
+                        fprintf(fd,
+                                "      x0=%d, y0=%d, x1=%d, y1=%d, numresolutions=%d\n",
+                                tilec->x0, tilec->y0, tilec->x1, tilec->y1, tilec->numresolutions);
+                        for (resno = 0; resno < tilec->numresolutions; resno++) {
+                                opj_tcd_resolution_t *res = &tilec->resolutions[resno];
+                                fprintf(fd, "\n   res {\n");
+                                fprintf(fd,
+                                        "          x0=%d, y0=%d, x1=%d, y1=%d, pw=%d, ph=%d, numbands=%d\n",
+                                        res->x0, res->y0, res->x1, res->y1, res->pw, res->ph, res->numbands);
+                                for (bandno = 0; bandno < res->numbands; bandno++) {
+                                        opj_tcd_band_t *band = &res->bands[bandno];
+                                        fprintf(fd, "        band {\n");
+                                        fprintf(fd,
+                                                "          x0=%d, y0=%d, x1=%d, y1=%d, stepsize=%f, numbps=%d\n",
+                                                band->x0, band->y0, band->x1, band->y1, band->stepsize, band->numbps);
+                                        for (precno = 0; precno < res->pw * res->ph; precno++) {
+                                                opj_tcd_precinct_t *prec = &band->precincts[precno];
+                                                fprintf(fd, "          prec {\n");
+                                                fprintf(fd,
+                                                        "            x0=%d, y0=%d, x1=%d, y1=%d, cw=%d, ch=%d\n",
+                                                        prec->x0, prec->y0, prec->x1, prec->y1, prec->cw, prec->ch);
+                                                /*
+                                                for (cblkno = 0; cblkno < prec->cw * prec->ch; cblkno++) {
+                                                        opj_tcd_cblk_t *cblk = &prec->cblks[cblkno];
+                                                        fprintf(fd, "            cblk {\n");
+                                                        fprintf(fd,
+                                                                "              x0=%d, y0=%d, x1=%d, y1=%d\n",
+                                                                cblk->x0, cblk->y0, cblk->x1, cblk->y1);
+                                                        fprintf(fd, "            }\n");
+                                                }
+                                                */
+                                                fprintf(fd, "          }\n");
+                                        }
+                                        fprintf(fd, "        }\n");
+                                }
+                                fprintf(fd, "      }\n");
+                        }
+                        fprintf(fd, "    }\n");
+                }
+                fprintf(fd, "  }\n");
+        }
+        fprintf(fd, "}\n");
 }
 /**
 * Allocates memory for a decoding code block.
 */
-static opj_bool tcd_code_block_dec_allocate (opj_tcd_cblk_dec_v2_t * p_code_block);
+static opj_bool opj_tcd_code_block_dec_allocate (opj_tcd_cblk_dec_v2_t * p_code_block);
+
+/**
+ * Deallocates the decoding data of the given precinct.
+ */
+static void opj_tcd_code_block_dec_deallocate (opj_tcd_precinct_v2_t * p_precinct);
+
+/**
+ * Allocates memory for an encoding code block.
+ */
+static opj_bool opj_tcd_code_block_enc_allocate (opj_tcd_cblk_enc_v2_t * p_code_block);
+
+/**
+ * Deallocates the encoding data of the given precinct.
+ */
+static void opj_tcd_code_block_enc_deallocate (opj_tcd_precinct_v2_t * p_precinct);
+
 
 /**
 Free the memory allocated for encoding
 @param tcd TCD handle
 */
-static void tcd_free_tile(opj_tcd_v2_t *tcd);
+static void opj_tcd_free_tile(opj_tcd_v2_t *tcd);
 
 
-opj_bool tcd_t2_decode (
-                                       opj_tcd_v2_t *p_tcd,
-                                       OPJ_BYTE * p_src_data,
-                                       OPJ_UINT32 * p_data_read,
-                                       OPJ_UINT32 p_max_src_size,
-                                       opj_codestream_index_t *p_cstr_index
-                                       );
+static opj_bool opj_tcd_t2_decode ( opj_tcd_v2_t *p_tcd,
+                                    OPJ_BYTE * p_src_data,
+                                    OPJ_UINT32 * p_data_read,
+                                    OPJ_UINT32 p_max_src_size,
+                                    opj_codestream_index_t *p_cstr_index );
 
-opj_bool tcd_t1_decode (
-                                         opj_tcd_v2_t *p_tcd
-                                        );
+static opj_bool opj_tcd_t1_decode (opj_tcd_v2_t *p_tcd);
 
-opj_bool tcd_dwt_decode (
-                                         opj_tcd_v2_t *p_tcd
-                                        );
+static opj_bool opj_tcd_dwt_decode (opj_tcd_v2_t *p_tcd);
 
-opj_bool tcd_mct_decode (
-                                         opj_tcd_v2_t *p_tcd
-                                        );
+static opj_bool opj_tcd_mct_decode (opj_tcd_v2_t *p_tcd);
 
-opj_bool tcd_dc_level_shift_decode (
-                                                opj_tcd_v2_t *p_tcd
-                                                );
+static opj_bool opj_tcd_dc_level_shift_decode (opj_tcd_v2_t *p_tcd);
 
-void tcd_code_block_dec_deallocate (opj_tcd_precinct_v2_t * p_precinct);
-/* ----------------------------------------------------------------------- */
 
-/**
-Create a new TCD handle
-*/
-opj_tcd_t* tcd_create(opj_common_ptr cinfo) {
-       /* create the tcd structure */
-       opj_tcd_t *tcd = (opj_tcd_t*)opj_malloc(sizeof(opj_tcd_t));
-       if(!tcd) return NULL;
-       tcd->cinfo = cinfo;
-       tcd->tcd_image = (opj_tcd_image_t*)opj_malloc(sizeof(opj_tcd_image_t));
-       if(!tcd->tcd_image) {
-               opj_free(tcd);
-               return NULL;
-       }
-
-       return tcd;
-}
+static opj_bool opj_tcd_dc_level_shift_encode ( opj_tcd_v2_t *p_tcd );
+
+static opj_bool opj_tcd_mct_encode ( opj_tcd_v2_t *p_tcd );
+
+static opj_bool opj_tcd_dwt_encode ( opj_tcd_v2_t *p_tcd );
+
+static opj_bool opj_tcd_t1_encode ( opj_tcd_v2_t *p_tcd );
+
+static opj_bool opj_tcd_t2_encode (     opj_tcd_v2_t *p_tcd,
+                                                                    OPJ_BYTE * p_dest_data,
+                                                                    OPJ_UINT32 * p_data_written,
+                                                                    OPJ_UINT32 p_max_dest_size,
+                                                                    opj_codestream_info_t *p_cstr_info );
+
+static opj_bool opj_tcd_rate_allocate_encode(   opj_tcd_v2_t *p_tcd,
+                                                                                        OPJ_BYTE * p_dest_data,
+                                                                                        OPJ_UINT32 p_max_dest_size,
+                                                                                        opj_codestream_info_t *p_cstr_info );
+
+/* ----------------------------------------------------------------------- */
 
 /**
 Create a new TCD handle
 */
-opj_tcd_v2_t* tcd_create_v2(opj_bool p_is_decoder)
+opj_tcd_v2_t* opj_tcd_create(opj_bool p_is_decoder)
 {
-       opj_tcd_v2_t *l_tcd = 00;
+        opj_tcd_v2_t *l_tcd = 00;
 
-       /* create the tcd structure */
-       l_tcd = (opj_tcd_v2_t*) opj_malloc(sizeof(opj_tcd_v2_t));
-       if (!l_tcd) {
-               return 00;
-       }
-       memset(l_tcd,0,sizeof(opj_tcd_v2_t));
+        /* create the tcd structure */
+        l_tcd = (opj_tcd_v2_t*) opj_malloc(sizeof(opj_tcd_v2_t));
+        if (!l_tcd) {
+                return 00;
+        }
+        memset(l_tcd,0,sizeof(opj_tcd_v2_t));
 
-       l_tcd->m_is_decoder = p_is_decoder ? 1 : 0;
+        l_tcd->m_is_decoder = p_is_decoder ? 1 : 0;
 
-       l_tcd->tcd_image = (opj_tcd_image_v2_t*)opj_malloc(sizeof(opj_tcd_image_v2_t));
-       if (!l_tcd->tcd_image) {
-               opj_free(l_tcd);
-               return 00;
-       }
-       memset(l_tcd->tcd_image,0,sizeof(opj_tcd_image_v2_t));
+        l_tcd->tcd_image = (opj_tcd_image_v2_t*)opj_malloc(sizeof(opj_tcd_image_v2_t));
+        if (!l_tcd->tcd_image) {
+                opj_free(l_tcd);
+                return 00;
+        }
+        memset(l_tcd->tcd_image,0,sizeof(opj_tcd_image_v2_t));
 
-       return l_tcd;
+        return l_tcd;
 }
 
-/**
-Destroy a previously created TCD handle
-*/
-void tcd_destroy(opj_tcd_t *tcd) {
-       if(tcd) {
-               opj_free(tcd->tcd_image);
-               opj_free(tcd);
-       }
-}
 
 /* ----------------------------------------------------------------------- */
 
-void tcd_malloc_encode(opj_tcd_t *tcd, opj_image_t * image, opj_cp_t * cp, int curtileno) {
-       int tileno, compno, resno, bandno, precno, cblkno;
-
-       tcd->image = image;
-       tcd->cp = cp;
-       tcd->tcd_image->tw = cp->tw;
-       tcd->tcd_image->th = cp->th;
-       tcd->tcd_image->tiles = (opj_tcd_tile_t *) opj_malloc(sizeof(opj_tcd_tile_t));
-       
-       for (tileno = 0; tileno < 1; tileno++) {
-               opj_tcp_t *tcp = &cp->tcps[curtileno];
-               int j;
-
-               /* cfr p59 ISO/IEC FDIS15444-1 : 2000 (18 august 2000) */
-               int p = curtileno % cp->tw;     /* si numerotation matricielle .. */
-               int q = curtileno / cp->tw;     /* .. coordonnees de la tile (q,p) q pour ligne et p pour colonne */
-
-               /* opj_tcd_tile_t *tile=&tcd->tcd_image->tiles[tileno]; */
-               opj_tcd_tile_t *tile = tcd->tcd_image->tiles;
-
-               /* 4 borders of the tile rescale on the image if necessary */
-               tile->x0 = int_max(cp->tx0 + p * cp->tdx, image->x0);
-               tile->y0 = int_max(cp->ty0 + q * cp->tdy, image->y0);
-               tile->x1 = int_min(cp->tx0 + (p + 1) * cp->tdx, image->x1);
-               tile->y1 = int_min(cp->ty0 + (q + 1) * cp->tdy, image->y1);
-               tile->numcomps = image->numcomps;
-               /* tile->PPT=image->PPT;  */
-
-               /* Modification of the RATE >> */
-               for (j = 0; j < tcp->numlayers; j++) {
-                       tcp->rates[j] = tcp->rates[j] ? 
-                               cp->tp_on ? 
-                                       (((float) (tile->numcomps 
-                                       * (tile->x1 - tile->x0) 
-                                       * (tile->y1 - tile->y0)
-                                       * image->comps[0].prec))
-                                       /(tcp->rates[j] * 8 * image->comps[0].dx * image->comps[0].dy)) - (((tcd->cur_totnum_tp - 1) * 14 )/ tcp->numlayers)
-                                       :
-                               ((float) (tile->numcomps 
-                                       * (tile->x1 - tile->x0) 
-                                       * (tile->y1 - tile->y0) 
-                                       * image->comps[0].prec))/ 
-                                       (tcp->rates[j] * 8 * image->comps[0].dx * image->comps[0].dy)
-                                       : 0;
-
-                       if (tcp->rates[j]) {
-                               if (j && tcp->rates[j] < tcp->rates[j - 1] + 10) {
-                                       tcp->rates[j] = tcp->rates[j - 1] + 20;
-                               } else {
-                                       if (!j && tcp->rates[j] < 30)
-                                               tcp->rates[j] = 30;
-                               }
-                               
-                               if(j == (tcp->numlayers-1)){
-                                       tcp->rates[j] = tcp->rates[j]- 2;
-                               }
-                       }
-               }
-               /* << Modification of the RATE */
-               
-               tile->comps = (opj_tcd_tilecomp_t *) opj_malloc(image->numcomps * sizeof(opj_tcd_tilecomp_t));
-               for (compno = 0; compno < tile->numcomps; compno++) {
-                       opj_tccp_t *tccp = &tcp->tccps[compno];
-
-                       opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
-
-                       /* border of each tile component (global) */
-                       tilec->x0 = int_ceildiv(tile->x0, image->comps[compno].dx);
-                       tilec->y0 = int_ceildiv(tile->y0, image->comps[compno].dy);
-                       tilec->x1 = int_ceildiv(tile->x1, image->comps[compno].dx);
-                       tilec->y1 = int_ceildiv(tile->y1, image->comps[compno].dy);
-                       
-                       tilec->data = (int *) opj_aligned_malloc((tilec->x1 - tilec->x0) * (tilec->y1 - tilec->y0) * sizeof(int));
-                       tilec->numresolutions = tccp->numresolutions;
-
-                       tilec->resolutions = (opj_tcd_resolution_t *) opj_malloc(tilec->numresolutions * sizeof(opj_tcd_resolution_t));
-                       
-                       for (resno = 0; resno < tilec->numresolutions; resno++) {
-                               int pdx, pdy;
-                               int levelno = tilec->numresolutions - 1 - resno;
-                               int tlprcxstart, tlprcystart, brprcxend, brprcyend;
-                               int tlcbgxstart, tlcbgystart, brcbgxend, brcbgyend;
-                               int cbgwidthexpn, cbgheightexpn;
-                               int cblkwidthexpn, cblkheightexpn;
-
-                               opj_tcd_resolution_t *res = &tilec->resolutions[resno];
-                               
-                               /* border for each resolution level (global) */
-                               res->x0 = int_ceildivpow2(tilec->x0, levelno);
-                               res->y0 = int_ceildivpow2(tilec->y0, levelno);
-                               res->x1 = int_ceildivpow2(tilec->x1, levelno);
-                               res->y1 = int_ceildivpow2(tilec->y1, levelno);
-                               
-                               res->numbands = resno == 0 ? 1 : 3;
-                               /* p. 35, table A-23, ISO/IEC FDIS154444-1 : 2000 (18 august 2000) */
-                               if (tccp->csty & J2K_CCP_CSTY_PRT) {
-                                       pdx = tccp->prcw[resno];
-                                       pdy = tccp->prch[resno];
-                               } else {
-                                       pdx = 15;
-                                       pdy = 15;
-                               }
-                               /* p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000)  */
-                               tlprcxstart = int_floordivpow2(res->x0, pdx) << pdx;
-                               tlprcystart = int_floordivpow2(res->y0, pdy) << pdy;
-                               
-                               brprcxend = int_ceildivpow2(res->x1, pdx) << pdx;
-                               brprcyend = int_ceildivpow2(res->y1, pdy) << pdy;
-                               
-                               res->pw = (brprcxend - tlprcxstart) >> pdx;
-                               res->ph = (brprcyend - tlprcystart) >> pdy;
-                               
-                               if (resno == 0) {
-                                       tlcbgxstart = tlprcxstart;
-                                       tlcbgystart = tlprcystart;
-                                       brcbgxend = brprcxend;
-                                       brcbgyend = brprcyend;
-                                       cbgwidthexpn = pdx;
-                                       cbgheightexpn = pdy;
-                               } else {
-                                       tlcbgxstart = int_ceildivpow2(tlprcxstart, 1);
-                                       tlcbgystart = int_ceildivpow2(tlprcystart, 1);
-                                       brcbgxend = int_ceildivpow2(brprcxend, 1);
-                                       brcbgyend = int_ceildivpow2(brprcyend, 1);
-                                       cbgwidthexpn = pdx - 1;
-                                       cbgheightexpn = pdy - 1;
-                               }
-                               
-                               cblkwidthexpn = int_min(tccp->cblkw, cbgwidthexpn);
-                               cblkheightexpn = int_min(tccp->cblkh, cbgheightexpn);
-                               
-                               for (bandno = 0; bandno < res->numbands; bandno++) {
-                                       int x0b, y0b, i;
-                                       int gain, numbps;
-                                       opj_stepsize_t *ss = NULL;
-
-                                       opj_tcd_band_t *band = &res->bands[bandno];
-
-                                       band->bandno = resno == 0 ? 0 : bandno + 1;
-                                       x0b = (band->bandno == 1) || (band->bandno == 3) ? 1 : 0;
-                                       y0b = (band->bandno == 2) || (band->bandno == 3) ? 1 : 0;
-                                       
-                                       if (band->bandno == 0) {
-                                               /* band border (global) */
-                                               band->x0 = int_ceildivpow2(tilec->x0, levelno);
-                                               band->y0 = int_ceildivpow2(tilec->y0, levelno);
-                                               band->x1 = int_ceildivpow2(tilec->x1, levelno);
-                                               band->y1 = int_ceildivpow2(tilec->y1, levelno);
-                                       } else {
-                                               /* band border (global) */
-                                               band->x0 = int_ceildivpow2(tilec->x0 - (1 << levelno) * x0b, levelno + 1);
-                                               band->y0 = int_ceildivpow2(tilec->y0 - (1 << levelno) * y0b, levelno + 1);
-                                               band->x1 = int_ceildivpow2(tilec->x1 - (1 << levelno) * x0b, levelno + 1);
-                                               band->y1 = int_ceildivpow2(tilec->y1 - (1 << levelno) * y0b, levelno + 1);
-                                       }
-                                       
-                                       ss = &tccp->stepsizes[resno == 0 ? 0 : 3 * (resno - 1) + bandno + 1];
-                                       gain = tccp->qmfbid == 0 ? dwt_getgain_real(band->bandno) : dwt_getgain(band->bandno);                                  
-                                       numbps = image->comps[compno].prec + gain;
-                                       
-                                       band->stepsize = (float)((1.0 + ss->mant / 2048.0) * pow(2.0, numbps - ss->expn));
-                                       band->numbps = ss->expn + tccp->numgbits - 1;   /* WHY -1 ? */
-                                       
-                                       band->precincts = (opj_tcd_precinct_t *) opj_malloc(3 * res->pw * res->ph * sizeof(opj_tcd_precinct_t));
-                                       
-                                       for (i = 0; i < res->pw * res->ph * 3; i++) {
-                                               band->precincts[i].imsbtree = NULL;
-                                               band->precincts[i].incltree = NULL;
-                                               band->precincts[i].cblks.enc = NULL;
-                                       }
-                                       
-                                       for (precno = 0; precno < res->pw * res->ph; precno++) {
-                                               int tlcblkxstart, tlcblkystart, brcblkxend, brcblkyend;
-
-                                               int cbgxstart = tlcbgxstart + (precno % res->pw) * (1 << cbgwidthexpn);
-                                               int cbgystart = tlcbgystart + (precno / res->pw) * (1 << cbgheightexpn);
-                                               int cbgxend = cbgxstart + (1 << cbgwidthexpn);
-                                               int cbgyend = cbgystart + (1 << cbgheightexpn);
-
-                                               opj_tcd_precinct_t *prc = &band->precincts[precno];
-
-                                               /* precinct size (global) */
-                                               prc->x0 = int_max(cbgxstart, band->x0);
-                                               prc->y0 = int_max(cbgystart, band->y0);
-                                               prc->x1 = int_min(cbgxend, band->x1);
-                                               prc->y1 = int_min(cbgyend, band->y1);
-
-                                               tlcblkxstart = int_floordivpow2(prc->x0, cblkwidthexpn) << cblkwidthexpn;
-                                               tlcblkystart = int_floordivpow2(prc->y0, cblkheightexpn) << cblkheightexpn;
-                                               brcblkxend = int_ceildivpow2(prc->x1, cblkwidthexpn) << cblkwidthexpn;
-                                               brcblkyend = int_ceildivpow2(prc->y1, cblkheightexpn) << cblkheightexpn;
-                                               prc->cw = (brcblkxend - tlcblkxstart) >> cblkwidthexpn;
-                                               prc->ch = (brcblkyend - tlcblkystart) >> cblkheightexpn;
-
-                                               prc->cblks.enc = (opj_tcd_cblk_enc_t*) opj_calloc((prc->cw * prc->ch), sizeof(opj_tcd_cblk_enc_t));
-                                               prc->incltree = tgt_create(prc->cw, prc->ch);
-                                               prc->imsbtree = tgt_create(prc->cw, prc->ch);
-                                               
-                                               for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
-                                                       int cblkxstart = tlcblkxstart + (cblkno % prc->cw) * (1 << cblkwidthexpn);
-                                                       int cblkystart = tlcblkystart + (cblkno / prc->cw) * (1 << cblkheightexpn);
-                                                       int cblkxend = cblkxstart + (1 << cblkwidthexpn);
-                                                       int cblkyend = cblkystart + (1 << cblkheightexpn);
-                                                       
-                                                       opj_tcd_cblk_enc_t* cblk = &prc->cblks.enc[cblkno];
-
-                                                       /* code-block size (global) */
-                                                       cblk->x0 = int_max(cblkxstart, prc->x0);
-                                                       cblk->y0 = int_max(cblkystart, prc->y0);
-                                                       cblk->x1 = int_min(cblkxend, prc->x1);
-                                                       cblk->y1 = int_min(cblkyend, prc->y1);
-                                                       cblk->data = (unsigned char*) opj_calloc(8192+2, sizeof(unsigned char));
-                                                       /* FIXME: mqc_init_enc and mqc_byteout underrun the buffer if we don't do this. Why? */
-                                                       cblk->data += 2;
-                                                       cblk->layers = (opj_tcd_layer_t*) opj_calloc(100, sizeof(opj_tcd_layer_t));
-                                                       cblk->passes = (opj_tcd_pass_t*) opj_calloc(100, sizeof(opj_tcd_pass_t));
-                                               }
-                                       }
-                               }
-                       }
-               }
-       }
-       
-       /* tcd_dump(stdout, tcd, &tcd->tcd_image); */
-}
+void opj_tcd_rateallocate_fixed(opj_tcd_v2_t *tcd) {
+        OPJ_UINT32 layno;
 
-void tcd_free_encode(opj_tcd_t *tcd) {
-       int tileno, compno, resno, bandno, precno, cblkno;
-
-       for (tileno = 0; tileno < 1; tileno++) {
-               opj_tcd_tile_t *tile = tcd->tcd_image->tiles;
-
-               for (compno = 0; compno < tile->numcomps; compno++) {
-                       opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
-
-                       for (resno = 0; resno < tilec->numresolutions; resno++) {
-                               opj_tcd_resolution_t *res = &tilec->resolutions[resno];
-
-                               for (bandno = 0; bandno < res->numbands; bandno++) {
-                                       opj_tcd_band_t *band = &res->bands[bandno];
-
-                                       for (precno = 0; precno < res->pw * res->ph; precno++) {
-                                               opj_tcd_precinct_t *prc = &band->precincts[precno];
-
-                                               if (prc->incltree != NULL) {
-                                                       tgt_destroy(prc->incltree);
-                                                       prc->incltree = NULL;
-                                               }
-                                               if (prc->imsbtree != NULL) {
-                                                       tgt_destroy(prc->imsbtree);     
-                                                       prc->imsbtree = NULL;
-                                               }
-                                               for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
-                                                       opj_free(prc->cblks.enc[cblkno].data - 2);
-                                                       opj_free(prc->cblks.enc[cblkno].layers);
-                                                       opj_free(prc->cblks.enc[cblkno].passes);
-                                               }
-                                               opj_free(prc->cblks.enc);
-                                       } /* for (precno */
-                                       opj_free(band->precincts);
-                                       band->precincts = NULL;
-                               } /* for (bandno */
-                       } /* for (resno */
-                       opj_free(tilec->resolutions);
-                       tilec->resolutions = NULL;
-               } /* for (compno */
-               opj_free(tile->comps);
-               tile->comps = NULL;
-       } /* for (tileno */
-       opj_free(tcd->tcd_image->tiles);
-       tcd->tcd_image->tiles = NULL;
+        for (layno = 0; layno < tcd->tcp->numlayers; layno++) {
+                opj_tcd_makelayer_fixed(tcd, layno, 1);
+        }
 }
 
-void tcd_init_encode(opj_tcd_t *tcd, opj_image_t * image, opj_cp_t * cp, int curtileno) {
-       int tileno, compno, resno, bandno, precno, cblkno;
-
-       for (tileno = 0; tileno < 1; tileno++) {
-               opj_tcp_t *tcp = &cp->tcps[curtileno];
-               int j;
-               /* cfr p59 ISO/IEC FDIS15444-1 : 2000 (18 august 2000) */
-               int p = curtileno % cp->tw;
-               int q = curtileno / cp->tw;
-
-               opj_tcd_tile_t *tile = tcd->tcd_image->tiles;
-               
-               /* 4 borders of the tile rescale on the image if necessary */
-               tile->x0 = int_max(cp->tx0 + p * cp->tdx, image->x0);
-               tile->y0 = int_max(cp->ty0 + q * cp->tdy, image->y0);
-               tile->x1 = int_min(cp->tx0 + (p + 1) * cp->tdx, image->x1);
-               tile->y1 = int_min(cp->ty0 + (q + 1) * cp->tdy, image->y1);
-               
-               tile->numcomps = image->numcomps;
-               /* tile->PPT=image->PPT; */
-
-               /* Modification of the RATE >> */
-               for (j = 0; j < tcp->numlayers; j++) {
-                       tcp->rates[j] = tcp->rates[j] ? 
-                               cp->tp_on ? 
-                                       (((float) (tile->numcomps 
-                                       * (tile->x1 - tile->x0) 
-                                       * (tile->y1 - tile->y0)
-                                       * image->comps[0].prec))
-                                       /(tcp->rates[j] * 8 * image->comps[0].dx * image->comps[0].dy)) - (((tcd->cur_totnum_tp - 1) * 14 )/ tcp->numlayers)
-                                       :
-                               ((float) (tile->numcomps 
-                                       * (tile->x1 - tile->x0) 
-                                       * (tile->y1 - tile->y0) 
-                                       * image->comps[0].prec))/ 
-                                       (tcp->rates[j] * 8 * image->comps[0].dx * image->comps[0].dy)
-                                       : 0;
-
-                       if (tcp->rates[j]) {
-                               if (j && tcp->rates[j] < tcp->rates[j - 1] + 10) {
-                                       tcp->rates[j] = tcp->rates[j - 1] + 20;
-                               } else {
-                                       if (!j && tcp->rates[j] < 30)
-                                               tcp->rates[j] = 30;
-                               }
-                       }
-               }
-               /* << Modification of the RATE */
-
-               /* tile->comps=(opj_tcd_tilecomp_t*)opj_realloc(tile->comps,image->numcomps*sizeof(opj_tcd_tilecomp_t)); */
-               for (compno = 0; compno < tile->numcomps; compno++) {
-                       opj_tccp_t *tccp = &tcp->tccps[compno];
-                       
-                       opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
-
-                       /* border of each tile component (global) */
-                       tilec->x0 = int_ceildiv(tile->x0, image->comps[compno].dx);
-                       tilec->y0 = int_ceildiv(tile->y0, image->comps[compno].dy);
-                       tilec->x1 = int_ceildiv(tile->x1, image->comps[compno].dx);
-                       tilec->y1 = int_ceildiv(tile->y1, image->comps[compno].dy);
-                       
-                       tilec->data = (int *) opj_aligned_malloc((tilec->x1 - tilec->x0) * (tilec->y1 - tilec->y0) * sizeof(int));
-                       tilec->numresolutions = tccp->numresolutions;
-                       /* tilec->resolutions=(opj_tcd_resolution_t*)opj_realloc(tilec->resolutions,tilec->numresolutions*sizeof(opj_tcd_resolution_t)); */
-                       for (resno = 0; resno < tilec->numresolutions; resno++) {
-                               int pdx, pdy;
-
-                               int levelno = tilec->numresolutions - 1 - resno;
-                               int tlprcxstart, tlprcystart, brprcxend, brprcyend;
-                               int tlcbgxstart, tlcbgystart, brcbgxend, brcbgyend;
-                               int cbgwidthexpn, cbgheightexpn;
-                               int cblkwidthexpn, cblkheightexpn;
-                               
-                               opj_tcd_resolution_t *res = &tilec->resolutions[resno];
-
-                               /* border for each resolution level (global) */
-                               res->x0 = int_ceildivpow2(tilec->x0, levelno);
-                               res->y0 = int_ceildivpow2(tilec->y0, levelno);
-                               res->x1 = int_ceildivpow2(tilec->x1, levelno);
-                               res->y1 = int_ceildivpow2(tilec->y1, levelno);  
-                               res->numbands = resno == 0 ? 1 : 3;
-
-                               /* p. 35, table A-23, ISO/IEC FDIS154444-1 : 2000 (18 august 2000) */
-                               if (tccp->csty & J2K_CCP_CSTY_PRT) {
-                                       pdx = tccp->prcw[resno];
-                                       pdy = tccp->prch[resno];
-                               } else {
-                                       pdx = 15;
-                                       pdy = 15;
-                               }
-                               /* p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000)  */
-                               tlprcxstart = int_floordivpow2(res->x0, pdx) << pdx;
-                               tlprcystart = int_floordivpow2(res->y0, pdy) << pdy;
-                               brprcxend = int_ceildivpow2(res->x1, pdx) << pdx;
-                               brprcyend = int_ceildivpow2(res->y1, pdy) << pdy;
-                               
-                               res->pw = (brprcxend - tlprcxstart) >> pdx;
-                               res->ph = (brprcyend - tlprcystart) >> pdy;
-                               
-                               if (resno == 0) {
-                                       tlcbgxstart = tlprcxstart;
-                                       tlcbgystart = tlprcystart;
-                                       brcbgxend = brprcxend;
-                                       brcbgyend = brprcyend;
-                                       cbgwidthexpn = pdx;
-                                       cbgheightexpn = pdy;
-                               } else {
-                                       tlcbgxstart = int_ceildivpow2(tlprcxstart, 1);
-                                       tlcbgystart = int_ceildivpow2(tlprcystart, 1);
-                                       brcbgxend = int_ceildivpow2(brprcxend, 1);
-                                       brcbgyend = int_ceildivpow2(brprcyend, 1);
-                                       cbgwidthexpn = pdx - 1;
-                                       cbgheightexpn = pdy - 1;
-                               }
-                               
-                               cblkwidthexpn = int_min(tccp->cblkw, cbgwidthexpn);
-                               cblkheightexpn = int_min(tccp->cblkh, cbgheightexpn);
-                               
-                               for (bandno = 0; bandno < res->numbands; bandno++) {
-                                       int x0b, y0b;
-                                       int gain, numbps;
-                                       opj_stepsize_t *ss = NULL;
-
-                                       opj_tcd_band_t *band = &res->bands[bandno];
-
-                                       band->bandno = resno == 0 ? 0 : bandno + 1;
-                                       x0b = (band->bandno == 1) || (band->bandno == 3) ? 1 : 0;
-                                       y0b = (band->bandno == 2) || (band->bandno == 3) ? 1 : 0;
-                                       
-                                       if (band->bandno == 0) {
-                                               /* band border */
-                                               band->x0 = int_ceildivpow2(tilec->x0, levelno);
-                                               band->y0 = int_ceildivpow2(tilec->y0, levelno);
-                                               band->x1 = int_ceildivpow2(tilec->x1, levelno);
-                                               band->y1 = int_ceildivpow2(tilec->y1, levelno);
-                                       } else {
-                                               band->x0 = int_ceildivpow2(tilec->x0 - (1 << levelno) * x0b, levelno + 1);
-                                               band->y0 = int_ceildivpow2(tilec->y0 - (1 << levelno) * y0b, levelno + 1);
-                                               band->x1 = int_ceildivpow2(tilec->x1 - (1 << levelno) * x0b, levelno + 1);
-                                               band->y1 = int_ceildivpow2(tilec->y1 - (1 << levelno) * y0b, levelno + 1);
-                                       }
-                                       
-                                       ss = &tccp->stepsizes[resno == 0 ? 0 : 3 * (resno - 1) + bandno + 1];
-                                       gain = tccp->qmfbid == 0 ? dwt_getgain_real(band->bandno) : dwt_getgain(band->bandno);
-                                       numbps = image->comps[compno].prec + gain;
-                                       band->stepsize = (float)((1.0 + ss->mant / 2048.0) * pow(2.0, numbps - ss->expn));
-                                       band->numbps = ss->expn + tccp->numgbits - 1;   /* WHY -1 ? */
-                                       
-                                       for (precno = 0; precno < res->pw * res->ph; precno++) {
-                                               int tlcblkxstart, tlcblkystart, brcblkxend, brcblkyend;
-
-                                               int cbgxstart = tlcbgxstart + (precno % res->pw) * (1 << cbgwidthexpn);
-                                               int cbgystart = tlcbgystart + (precno / res->pw) * (1 << cbgheightexpn);
-                                               int cbgxend = cbgxstart + (1 << cbgwidthexpn);
-                                               int cbgyend = cbgystart + (1 << cbgheightexpn);
-                                               
-                                               opj_tcd_precinct_t *prc = &band->precincts[precno];
-
-                                               /* precinct size (global) */
-                                               prc->x0 = int_max(cbgxstart, band->x0);
-                                               prc->y0 = int_max(cbgystart, band->y0);
-                                               prc->x1 = int_min(cbgxend, band->x1);
-                                               prc->y1 = int_min(cbgyend, band->y1);
-
-                                               tlcblkxstart = int_floordivpow2(prc->x0, cblkwidthexpn) << cblkwidthexpn;
-                                               tlcblkystart = int_floordivpow2(prc->y0, cblkheightexpn) << cblkheightexpn;
-                                               brcblkxend = int_ceildivpow2(prc->x1, cblkwidthexpn) << cblkwidthexpn;
-                                               brcblkyend = int_ceildivpow2(prc->y1, cblkheightexpn) << cblkheightexpn;
-                                               prc->cw = (brcblkxend - tlcblkxstart) >> cblkwidthexpn;
-                                               prc->ch = (brcblkyend - tlcblkystart) >> cblkheightexpn;
-
-                                               opj_free(prc->cblks.enc);
-                                               prc->cblks.enc = (opj_tcd_cblk_enc_t*) opj_calloc(prc->cw * prc->ch, sizeof(opj_tcd_cblk_enc_t));
-
-                                               if (prc->incltree != NULL) {
-                                                       tgt_destroy(prc->incltree);
-                                               }
-                                               if (prc->imsbtree != NULL) {
-                                                       tgt_destroy(prc->imsbtree);
-                                               }
-                                               
-                                               prc->incltree = tgt_create(prc->cw, prc->ch);
-                                               prc->imsbtree = tgt_create(prc->cw, prc->ch);
-
-                                               for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
-                                                       int cblkxstart = tlcblkxstart + (cblkno % prc->cw) * (1 << cblkwidthexpn);
-                                                       int cblkystart = tlcblkystart + (cblkno / prc->cw) * (1 << cblkheightexpn);
-                                                       int cblkxend = cblkxstart + (1 << cblkwidthexpn);
-                                                       int cblkyend = cblkystart + (1 << cblkheightexpn);
-
-                                                       opj_tcd_cblk_enc_t* cblk = &prc->cblks.enc[cblkno];
-
-                                                       /* code-block size (global) */
-                                                       cblk->x0 = int_max(cblkxstart, prc->x0);
-                                                       cblk->y0 = int_max(cblkystart, prc->y0);
-                                                       cblk->x1 = int_min(cblkxend, prc->x1);
-                                                       cblk->y1 = int_min(cblkyend, prc->y1);
-                                                       cblk->data = (unsigned char*) opj_calloc(8192+2, sizeof(unsigned char));
-                                                       /* FIXME: mqc_init_enc and mqc_byteout underrun the buffer if we don't do this. Why? */
-                                                       cblk->data += 2;
-                                                       cblk->layers = (opj_tcd_layer_t*) opj_calloc(100, sizeof(opj_tcd_layer_t));
-                                                       cblk->passes = (opj_tcd_pass_t*) opj_calloc(100, sizeof(opj_tcd_pass_t));
-                                               }
-                                       } /* precno */
-                               } /* bandno */
-                       } /* resno */
-               } /* compno */
-       } /* tileno */
-
-       /* tcd_dump(stdout, tcd, &tcd->tcd_image); */
-}
 
-void tcd_malloc_decode(opj_tcd_t *tcd, opj_image_t * image, opj_cp_t * cp) {
-       int i, j, tileno, p, q;
-       unsigned int x0 = 0, y0 = 0, x1 = 0, y1 = 0, w, h;
-
-       tcd->image = image;
-       tcd->tcd_image->tw = cp->tw;
-       tcd->tcd_image->th = cp->th;
-       tcd->tcd_image->tiles = (opj_tcd_tile_t *) opj_malloc(cp->tw * cp->th * sizeof(opj_tcd_tile_t));
-
-       /* 
-       Allocate place to store the decoded data = final image
-       Place limited by the tile really present in the codestream 
-       */
-
-       for (j = 0; j < cp->tileno_size; j++) {
-               opj_tcd_tile_t *tile;
-               
-               tileno = cp->tileno[j];         
-               tile = &(tcd->tcd_image->tiles[cp->tileno[tileno]]);            
-               tile->numcomps = image->numcomps;
-               tile->comps = (opj_tcd_tilecomp_t*) opj_calloc(image->numcomps, sizeof(opj_tcd_tilecomp_t));
-       }
-
-       for (i = 0; i < image->numcomps; i++) {
-               for (j = 0; j < cp->tileno_size; j++) {
-                       opj_tcd_tile_t *tile;
-                       opj_tcd_tilecomp_t *tilec;
-                       
-                       /* cfr p59 ISO/IEC FDIS15444-1 : 2000 (18 august 2000) */
-                       
-                       tileno = cp->tileno[j];
-                       
-                       tile = &(tcd->tcd_image->tiles[cp->tileno[tileno]]);
-                       tilec = &tile->comps[i];
-                       
-                       p = tileno % cp->tw;    /* si numerotation matricielle .. */
-                       q = tileno / cp->tw;    /* .. coordonnees de la tile (q,p) q pour ligne et p pour colonne */
-                       
-                       /* 4 borders of the tile rescale on the image if necessary */
-                       tile->x0 = int_max(cp->tx0 + p * cp->tdx, image->x0);
-                       tile->y0 = int_max(cp->ty0 + q * cp->tdy, image->y0);
-                       tile->x1 = int_min(cp->tx0 + (p + 1) * cp->tdx, image->x1);
-                       tile->y1 = int_min(cp->ty0 + (q + 1) * cp->tdy, image->y1);
-
-                       tilec->x0 = int_ceildiv(tile->x0, image->comps[i].dx);
-                       tilec->y0 = int_ceildiv(tile->y0, image->comps[i].dy);
-                       tilec->x1 = int_ceildiv(tile->x1, image->comps[i].dx);
-                       tilec->y1 = int_ceildiv(tile->y1, image->comps[i].dy);
-
-                       x0 = j == 0 ? tilec->x0 : int_min(x0, (unsigned int) tilec->x0);
-                       y0 = j == 0 ? tilec->y0 : int_min(y0,   (unsigned int) tilec->y0);
-                       x1 = j == 0 ? tilec->x1 : int_max(x1,   (unsigned int) tilec->x1);
-                       y1 = j == 0 ? tilec->y1 : int_max(y1,   (unsigned int) tilec->y1);
-               }
-
-               w = int_ceildivpow2(x1 - x0, image->comps[i].factor);
-               h = int_ceildivpow2(y1 - y0, image->comps[i].factor);
-
-               image->comps[i].w = w;
-               image->comps[i].h = h;
-               image->comps[i].x0 = x0;
-               image->comps[i].y0 = y0;
-       }
+void opj_tcd_makelayer( opj_tcd_v2_t *tcd,
+                                                OPJ_UINT32 layno,
+                                                OPJ_FLOAT64 thresh,
+                                                OPJ_UINT32 final)
+{
+        OPJ_UINT32 compno, resno, bandno, precno, cblkno;
+        OPJ_UINT32 passno;
+
+        opj_tcd_tile_v2_t *tcd_tile = tcd->tcd_image->tiles;
+
+        tcd_tile->distolayer[layno] = 0;        /* fixed_quality */
+
+        for (compno = 0; compno < tcd_tile->numcomps; compno++) {
+                opj_tcd_tilecomp_v2_t *tilec = &tcd_tile->comps[compno];
+
+                for (resno = 0; resno < tilec->numresolutions; resno++) {
+                        opj_tcd_resolution_v2_t *res = &tilec->resolutions[resno];
+
+                        for (bandno = 0; bandno < res->numbands; bandno++) {
+                                opj_tcd_band_v2_t *band = &res->bands[bandno];
+
+                                for (precno = 0; precno < res->pw * res->ph; precno++) {
+                                        opj_tcd_precinct_v2_t *prc = &band->precincts[precno];
+
+                                        for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
+                                                opj_tcd_cblk_enc_v2_t *cblk = &prc->cblks.enc[cblkno];
+                                                opj_tcd_layer_t *layer = &cblk->layers[layno];
+                                                OPJ_UINT32 n;
+
+                                                if (layno == 0) {
+                                                        cblk->numpassesinlayers = 0;
+                                                }
+
+                                                n = cblk->numpassesinlayers;
+
+                                                for (passno = cblk->numpassesinlayers; passno < cblk->totalpasses; passno++) {
+                                                        OPJ_INT32 dr;
+                                                        OPJ_FLOAT64 dd;
+                                                        opj_tcd_pass_v2_t *pass = &cblk->passes[passno];
+
+                                                        if (n == 0) {
+                                                                dr = pass->rate;
+                                                                dd = pass->distortiondec;
+                                                        } else {
+                                                                dr = pass->rate - cblk->passes[n - 1].rate;
+                                                                dd = pass->distortiondec - cblk->passes[n - 1].distortiondec;
+                                                        }
+
+                                                        if (!dr) {
+                                                                if (dd != 0)
+                                                                        n = passno + 1;
+                                                                continue;
+                                                        }
+                                                        if (dd / dr >= thresh)
+                                                                n = passno + 1;
+                                                }
+
+                                                layer->numpasses = n - cblk->numpassesinlayers;
+
+                                                if (!layer->numpasses) {
+                                                        layer->disto = 0;
+                                                        continue;
+                                                }
+
+                                                if (cblk->numpassesinlayers == 0) {
+                                                        layer->len = cblk->passes[n - 1].rate;
+                                                        layer->data = cblk->data;
+                                                        layer->disto = cblk->passes[n - 1].distortiondec;
+                                                } else {
+                                                        layer->len = cblk->passes[n - 1].rate - cblk->passes[cblk->numpassesinlayers - 1].rate;
+                                                        layer->data = cblk->data + cblk->passes[cblk->numpassesinlayers - 1].rate;
+                                                        layer->disto = cblk->passes[n - 1].distortiondec - cblk->passes[cblk->numpassesinlayers - 1].distortiondec;
+                                                }
+
+                                                tcd_tile->distolayer[layno] += layer->disto;    /* fixed_quality */
+
+                                                if (final)
+                                                        cblk->numpassesinlayers = n;
+                                        }
+                                }
+                        }
+                }
+        }
 }
 
-void tcd_malloc_decode_tile(opj_tcd_t *tcd, opj_image_t * image, opj_cp_t * cp, int tileno, opj_codestream_info_t *cstr_info) {
-       int compno, resno, bandno, precno, cblkno;
-       opj_tcp_t *tcp;
-       opj_tcd_tile_t *tile;
-
-       OPJ_ARG_NOT_USED(cstr_info);
-
-       tcd->cp = cp;
-       
-       tcp = &(cp->tcps[cp->tileno[tileno]]);
-       tile = &(tcd->tcd_image->tiles[cp->tileno[tileno]]);
-       
-       tileno = cp->tileno[tileno];
-       
-       for (compno = 0; compno < tile->numcomps; compno++) {
-               opj_tccp_t *tccp = &tcp->tccps[compno];
-               opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
-               
-               /* border of each tile component (global) */
-               tilec->x0 = int_ceildiv(tile->x0, image->comps[compno].dx);
-               tilec->y0 = int_ceildiv(tile->y0, image->comps[compno].dy);
-               tilec->x1 = int_ceildiv(tile->x1, image->comps[compno].dx);
-               tilec->y1 = int_ceildiv(tile->y1, image->comps[compno].dy);
-
-               tilec->numresolutions = tccp->numresolutions;
-               tilec->resolutions = (opj_tcd_resolution_t *) opj_malloc(tilec->numresolutions * sizeof(opj_tcd_resolution_t));
-               
-               for (resno = 0; resno < tilec->numresolutions; resno++) {
-                       int pdx, pdy;
-                       int levelno = tilec->numresolutions - 1 - resno;
-                       int tlprcxstart, tlprcystart, brprcxend, brprcyend;
-                       int tlcbgxstart, tlcbgystart, brcbgxend, brcbgyend;
-                       int cbgwidthexpn, cbgheightexpn;
-                       int cblkwidthexpn, cblkheightexpn;
-                       
-                       opj_tcd_resolution_t *res = &tilec->resolutions[resno];
-                       
-                       /* border for each resolution level (global) */
-                       res->x0 = int_ceildivpow2(tilec->x0, levelno);
-                       res->y0 = int_ceildivpow2(tilec->y0, levelno);
-                       res->x1 = int_ceildivpow2(tilec->x1, levelno);
-                       res->y1 = int_ceildivpow2(tilec->y1, levelno);
-                       res->numbands = resno == 0 ? 1 : 3;
-                       
-                       /* p. 35, table A-23, ISO/IEC FDIS154444-1 : 2000 (18 august 2000) */
-                       if (tccp->csty & J2K_CCP_CSTY_PRT) {
-                               pdx = tccp->prcw[resno];
-                               pdy = tccp->prch[resno];
-                       } else {
-                               pdx = 15;
-                               pdy = 15;
-                       }                       
-                       
-                       /* p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000)  */
-                       tlprcxstart = int_floordivpow2(res->x0, pdx) << pdx;
-                       tlprcystart = int_floordivpow2(res->y0, pdy) << pdy;
-                       brprcxend = int_ceildivpow2(res->x1, pdx) << pdx;
-                       brprcyend = int_ceildivpow2(res->y1, pdy) << pdy;
-                       
-                       res->pw = (res->x0 == res->x1) ? 0 : ((brprcxend - tlprcxstart) >> pdx);
-                       res->ph = (res->y0 == res->y1) ? 0 : ((brprcyend - tlprcystart) >> pdy);
-                       
-                       if (resno == 0) {
-                               tlcbgxstart = tlprcxstart;
-                               tlcbgystart = tlprcystart;
-                               brcbgxend = brprcxend;
-                               brcbgyend = brprcyend;
-                               cbgwidthexpn = pdx;
-                               cbgheightexpn = pdy;
-                       } else {
-                               tlcbgxstart = int_ceildivpow2(tlprcxstart, 1);
-                               tlcbgystart = int_ceildivpow2(tlprcystart, 1);
-                               brcbgxend = int_ceildivpow2(brprcxend, 1);
-                               brcbgyend = int_ceildivpow2(brprcyend, 1);
-                               cbgwidthexpn = pdx - 1;
-                               cbgheightexpn = pdy - 1;
-                       }
-                       
-                       cblkwidthexpn = int_min(tccp->cblkw, cbgwidthexpn);
-                       cblkheightexpn = int_min(tccp->cblkh, cbgheightexpn);
-                       
-                       for (bandno = 0; bandno < res->numbands; bandno++) {
-                               int x0b, y0b;
-                               int gain, numbps;
-                               opj_stepsize_t *ss = NULL;
-                               
-                               opj_tcd_band_t *band = &res->bands[bandno];
-                               band->bandno = resno == 0 ? 0 : bandno + 1;
-                               x0b = (band->bandno == 1) || (band->bandno == 3) ? 1 : 0;
-                               y0b = (band->bandno == 2) || (band->bandno == 3) ? 1 : 0;
-                               
-                               if (band->bandno == 0) {
-                                       /* band border (global) */
-                                       band->x0 = int_ceildivpow2(tilec->x0, levelno);
-                                       band->y0 = int_ceildivpow2(tilec->y0, levelno);
-                                       band->x1 = int_ceildivpow2(tilec->x1, levelno);
-                                       band->y1 = int_ceildivpow2(tilec->y1, levelno);
-                               } else {
-                                       /* band border (global) */
-                                       band->x0 = int_ceildivpow2(tilec->x0 - (1 << levelno) * x0b, levelno + 1);
-                                       band->y0 = int_ceildivpow2(tilec->y0 - (1 << levelno) * y0b, levelno + 1);
-                                       band->x1 = int_ceildivpow2(tilec->x1 - (1 << levelno) * x0b, levelno + 1);
-                                       band->y1 = int_ceildivpow2(tilec->y1 - (1 << levelno) * y0b, levelno + 1);
-                               }
-                               
-                               ss = &tccp->stepsizes[resno == 0 ? 0 : 3 * (resno - 1) + bandno + 1];
-                               gain = tccp->qmfbid == 0 ? dwt_getgain_real(band->bandno) : dwt_getgain(band->bandno);
-                               numbps = image->comps[compno].prec + gain;
-                               band->stepsize = (float)(((1.0 + ss->mant / 2048.0) * pow(2.0, numbps - ss->expn)) * 0.5);
-                               band->numbps = ss->expn + tccp->numgbits - 1;   /* WHY -1 ? */
-                               
-                               band->precincts = (opj_tcd_precinct_t *) opj_malloc(res->pw * res->ph * sizeof(opj_tcd_precinct_t));
-                               
-                               for (precno = 0; precno < res->pw * res->ph; precno++) {
-                                       int tlcblkxstart, tlcblkystart, brcblkxend, brcblkyend;
-                                       int cbgxstart = tlcbgxstart + (precno % res->pw) * (1 << cbgwidthexpn);
-                                       int cbgystart = tlcbgystart + (precno / res->pw) * (1 << cbgheightexpn);
-                                       int cbgxend = cbgxstart + (1 << cbgwidthexpn);
-                                       int cbgyend = cbgystart + (1 << cbgheightexpn);
-                                       
-                                       opj_tcd_precinct_t *prc = &band->precincts[precno];
-                                       /* precinct size (global) */
-                                       prc->x0 = int_max(cbgxstart, band->x0);
-                                       prc->y0 = int_max(cbgystart, band->y0);
-                                       prc->x1 = int_min(cbgxend, band->x1);
-                                       prc->y1 = int_min(cbgyend, band->y1);
-                                       
-                                       tlcblkxstart = int_floordivpow2(prc->x0, cblkwidthexpn) << cblkwidthexpn;
-                                       tlcblkystart = int_floordivpow2(prc->y0, cblkheightexpn) << cblkheightexpn;
-                                       brcblkxend = int_ceildivpow2(prc->x1, cblkwidthexpn) << cblkwidthexpn;
-                                       brcblkyend = int_ceildivpow2(prc->y1, cblkheightexpn) << cblkheightexpn;
-                                       prc->cw = (brcblkxend - tlcblkxstart) >> cblkwidthexpn;
-                                       prc->ch = (brcblkyend - tlcblkystart) >> cblkheightexpn;
-
-                                       prc->cblks.dec = (opj_tcd_cblk_dec_t*) opj_malloc(prc->cw * prc->ch * sizeof(opj_tcd_cblk_dec_t));
-
-                                       prc->incltree = tgt_create(prc->cw, prc->ch);
-                                       prc->imsbtree = tgt_create(prc->cw, prc->ch);
-                                       
-                                       for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
-                                               int cblkxstart = tlcblkxstart + (cblkno % prc->cw) * (1 << cblkwidthexpn);
-                                               int cblkystart = tlcblkystart + (cblkno / prc->cw) * (1 << cblkheightexpn);
-                                               int cblkxend = cblkxstart + (1 << cblkwidthexpn);
-                                               int cblkyend = cblkystart + (1 << cblkheightexpn);                                      
-
-                                               opj_tcd_cblk_dec_t* cblk = &prc->cblks.dec[cblkno];
-                                               cblk->data = NULL;
-                                               cblk->segs = NULL;
-                                               /* code-block size (global) */
-                                               cblk->x0 = int_max(cblkxstart, prc->x0);
-                                               cblk->y0 = int_max(cblkystart, prc->y0);
-                                               cblk->x1 = int_min(cblkxend, prc->x1);
-                                               cblk->y1 = int_min(cblkyend, prc->y1);
-                                               cblk->numsegs = 0;
-                                       }
-                               } /* precno */
-                       } /* bandno */
-               } /* resno */
-       } /* compno */
-       /* tcd_dump(stdout, tcd, &tcd->tcd_image); */
+void opj_tcd_makelayer_fixed(opj_tcd_v2_t *tcd, OPJ_UINT32 layno, OPJ_UINT32 final) {
+        OPJ_UINT32 compno, resno, bandno, precno, cblkno;
+        OPJ_INT32 value;                        /*, matrice[tcd_tcp->numlayers][tcd_tile->comps[0].numresolutions][3]; */
+        OPJ_INT32 matrice[10][10][3];
+        OPJ_UINT32 i, j, k;
+
+        opj_cp_v2_t *cp = tcd->cp;
+        opj_tcd_tile_v2_t *tcd_tile = tcd->tcd_image->tiles;
+        opj_tcp_v2_t *tcd_tcp = tcd->tcp;
+
+        for (compno = 0; compno < tcd_tile->numcomps; compno++) {
+                opj_tcd_tilecomp_v2_t *tilec = &tcd_tile->comps[compno];
+
+                for (i = 0; i < tcd_tcp->numlayers; i++) {
+                        for (j = 0; j < tilec->numresolutions; j++) {
+                                for (k = 0; k < 3; k++) {
+                                        matrice[i][j][k] =
+                                                (OPJ_INT32) (cp->m_specific_param.m_enc.m_matrice[i * tilec->numresolutions * 3 + j * 3 + k]
+                                                * (OPJ_FLOAT32) (tcd->image->comps[compno].prec / 16.0));
+                                }
+                        }
+                }
+
+                for (resno = 0; resno < tilec->numresolutions; resno++) {
+                        opj_tcd_resolution_v2_t *res = &tilec->resolutions[resno];
+
+                        for (bandno = 0; bandno < res->numbands; bandno++) {
+                                opj_tcd_band_v2_t *band = &res->bands[bandno];
+
+                                for (precno = 0; precno < res->pw * res->ph; precno++) {
+                                        opj_tcd_precinct_v2_t *prc = &band->precincts[precno];
+
+                                        for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
+                                                opj_tcd_cblk_enc_v2_t *cblk = &prc->cblks.enc[cblkno];
+                                                opj_tcd_layer_t *layer = &cblk->layers[layno];
+                                                OPJ_UINT32 n;
+                                                OPJ_INT32 imsb = tcd->image->comps[compno].prec - cblk->numbps; /* number of bit-plan equal to zero */
+
+                                                /* Correction of the matrix of coefficient to include the IMSB information */
+                                                if (layno == 0) {
+                                                        value = matrice[layno][resno][bandno];
+                                                        if (imsb >= value) {
+                                                                value = 0;
+                                                        } else {
+                                                                value -= imsb;
+                                                        }
+                                                } else {
+                                                        value = matrice[layno][resno][bandno] - matrice[layno - 1][resno][bandno];
+                                                        if (imsb >= matrice[layno - 1][resno][bandno]) {
+                                                                value -= (imsb - matrice[layno - 1][resno][bandno]);
+                                                                if (value < 0) {
+                                                                        value = 0;
+                                                                }
+                                                        }
+                                                }
+
+                                                if (layno == 0) {
+                                                        cblk->numpassesinlayers = 0;
+                                                }
+
+                                                n = cblk->numpassesinlayers;
+                                                if (cblk->numpassesinlayers == 0) {
+                                                        if (value != 0) {
+                                                                n = 3 * value - 2 + cblk->numpassesinlayers;
+                                                        } else {
+                                                                n = cblk->numpassesinlayers;
+                                                        }
+                                                } else {
+                                                        n = 3 * value + cblk->numpassesinlayers;
+                                                }
+
+                                                layer->numpasses = n - cblk->numpassesinlayers;
+
+                                                if (!layer->numpasses)
+                                                        continue;
+
+                                                if (cblk->numpassesinlayers == 0) {
+                                                        layer->len = cblk->passes[n - 1].rate;
+                                                        layer->data = cblk->data;
+                                                } else {
+                                                        layer->len = cblk->passes[n - 1].rate - cblk->passes[cblk->numpassesinlayers - 1].rate;
+                                                        layer->data = cblk->data + cblk->passes[cblk->numpassesinlayers - 1].rate;
+                                                }
+
+                                                if (final)
+                                                        cblk->numpassesinlayers = n;
+                                        }
+                                }
+                        }
+                }
+        }
 }
 
-void tcd_makelayer_fixed(opj_tcd_t *tcd, int layno, int final) {
-       int compno, resno, bandno, precno, cblkno;
-       int value;                      /*, matrice[tcd_tcp->numlayers][tcd_tile->comps[0].numresolutions][3]; */
-       int matrice[10][10][3];
-       int i, j, k;
-
-       opj_cp_t *cp = tcd->cp;
-       opj_tcd_tile_t *tcd_tile = tcd->tcd_tile;
-       opj_tcp_t *tcd_tcp = tcd->tcp;
-
-       /*matrice=(int*)opj_malloc(tcd_tcp->numlayers*tcd_tile->comps[0].numresolutions*3*sizeof(int)); */
-       
-       for (compno = 0; compno < tcd_tile->numcomps; compno++) {
-               opj_tcd_tilecomp_t *tilec = &tcd_tile->comps[compno];
-               for (i = 0; i < tcd_tcp->numlayers; i++) {
-                       for (j = 0; j < tilec->numresolutions; j++) {
-                               for (k = 0; k < 3; k++) {
-                                       matrice[i][j][k] =
-                                               (int) (cp->matrice[i * tilec->numresolutions * 3 + j * 3 + k] 
-                                               * (float) (tcd->image->comps[compno].prec / 16.0));
-                               }
-                       }
-               }
-        
-               for (resno = 0; resno < tilec->numresolutions; resno++) {
-                       opj_tcd_resolution_t *res = &tilec->resolutions[resno];
-                       for (bandno = 0; bandno < res->numbands; bandno++) {
-                               opj_tcd_band_t *band = &res->bands[bandno];
-                               for (precno = 0; precno < res->pw * res->ph; precno++) {
-                                       opj_tcd_precinct_t *prc = &band->precincts[precno];
-                                       for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
-                                               opj_tcd_cblk_enc_t *cblk = &prc->cblks.enc[cblkno];
-                                               opj_tcd_layer_t *layer = &cblk->layers[layno];
-                                               int n;
-                                               int imsb = tcd->image->comps[compno].prec - cblk->numbps;       /* number of bit-plan equal to zero */
-                                               /* Correction of the matrix of coefficient to include the IMSB information */
-                                               if (layno == 0) {
-                                                       value = matrice[layno][resno][bandno];
-                                                       if (imsb >= value) {
-                                                               value = 0;
-                                                       } else {
-                                                               value -= imsb;
-                                                       }
-                                               } else {
-                                                       value = matrice[layno][resno][bandno] - matrice[layno - 1][resno][bandno];
-                                                       if (imsb >= matrice[layno - 1][resno][bandno]) {
-                                                               value -= (imsb - matrice[layno - 1][resno][bandno]);
-                                                               if (value < 0) {
-                                                                       value = 0;
-                                                               }
-                                                       }
-                                               }
-                                               
-                                               if (layno == 0) {
-                                                       cblk->numpassesinlayers = 0;
-                                               }
-                                               
-                                               n = cblk->numpassesinlayers;
-                                               if (cblk->numpassesinlayers == 0) {
-                                                       if (value != 0) {
-                                                               n = 3 * value - 2 + cblk->numpassesinlayers;
-                                                       } else {
-                                                               n = cblk->numpassesinlayers;
-                                                       }
-                                               } else {
-                                                       n = 3 * value + cblk->numpassesinlayers;
-                                               }
-                                               
-                                               layer->numpasses = n - cblk->numpassesinlayers;
-                                               
-                                               if (!layer->numpasses)
-                                                       continue;
-                                               
-                                               if (cblk->numpassesinlayers == 0) {
-                                                       layer->len = cblk->passes[n - 1].rate;
-                                                       layer->data = cblk->data;
-                                               } else {
-                                                       layer->len = cblk->passes[n - 1].rate - cblk->passes[cblk->numpassesinlayers - 1].rate;
-                                                       layer->data = cblk->data + cblk->passes[cblk->numpassesinlayers - 1].rate;
-                                               }
-                                               if (final)
-                                                       cblk->numpassesinlayers = n;
-                                       }
-                               }
-                       }
-               }
-       }
+opj_bool opj_tcd_rateallocate(  opj_tcd_v2_t *tcd,
+                                                                OPJ_BYTE *dest,
+                                                                OPJ_UINT32 * p_data_written,
+                                                                OPJ_UINT32 len,
+                                                                opj_codestream_info_t *cstr_info)
+{
+        OPJ_UINT32 compno, resno, bandno, precno, cblkno, layno;
+        OPJ_UINT32 passno;
+        OPJ_FLOAT64 min, max;
+        OPJ_FLOAT64 cumdisto[100];      /* fixed_quality */
+        const OPJ_FLOAT64 K = 1;                /* 1.1; fixed_quality */
+        OPJ_FLOAT64 maxSE = 0;
+
+        opj_cp_v2_t *cp = tcd->cp;
+        opj_tcd_tile_v2_t *tcd_tile = tcd->tcd_image->tiles;
+        opj_tcp_v2_t *tcd_tcp = tcd->tcp;
+
+        min = DBL_MAX;
+        max = 0;
+
+        tcd_tile->numpix = 0;           /* fixed_quality */
+
+        for (compno = 0; compno < tcd_tile->numcomps; compno++) {
+                opj_tcd_tilecomp_v2_t *tilec = &tcd_tile->comps[compno];
+                tilec->numpix = 0;
+
+                for (resno = 0; resno < tilec->numresolutions; resno++) {
+                        opj_tcd_resolution_v2_t *res = &tilec->resolutions[resno];
+
+                        for (bandno = 0; bandno < res->numbands; bandno++) {
+                                opj_tcd_band_v2_t *band = &res->bands[bandno];
+
+                                for (precno = 0; precno < res->pw * res->ph; precno++) {
+                                        opj_tcd_precinct_v2_t *prc = &band->precincts[precno];
+
+                                        for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
+                                                opj_tcd_cblk_enc_v2_t *cblk = &prc->cblks.enc[cblkno];
+
+                                                for (passno = 0; passno < cblk->totalpasses; passno++) {
+                                                        opj_tcd_pass_v2_t *pass = &cblk->passes[passno];
+                                                        OPJ_INT32 dr;
+                                                        OPJ_FLOAT64 dd, rdslope;
+
+                                                        if (passno == 0) {
+                                                                dr = pass->rate;
+                                                                dd = pass->distortiondec;
+                                                        } else {
+                                                                dr = pass->rate - cblk->passes[passno - 1].rate;
+                                                                dd = pass->distortiondec - cblk->passes[passno - 1].distortiondec;
+                                                        }
+
+                                                        if (dr == 0) {
+                                                                continue;
+                                                        }
+
+                                                        rdslope = dd / dr;
+                                                        if (rdslope < min) {
+                                                                min = rdslope;
+                                                        }
+
+                                                        if (rdslope > max) {
+                                                                max = rdslope;
+                                                        }
+                                                } /* passno */
+
+                                                /* fixed_quality */
+                                                tcd_tile->numpix += ((cblk->x1 - cblk->x0) * (cblk->y1 - cblk->y0));
+                                                tilec->numpix += ((cblk->x1 - cblk->x0) * (cblk->y1 - cblk->y0));
+                                        } /* cbklno */
+                                } /* precno */
+                        } /* bandno */
+                } /* resno */
+
+                maxSE += (((OPJ_FLOAT64)(1 << tcd->image->comps[compno].prec) - 1.0)
+                        * ((OPJ_FLOAT64)(1 << tcd->image->comps[compno].prec) -1.0))
+                        * ((OPJ_FLOAT64)(tilec->numpix));
+        } /* compno */
+
+        /* index file */
+        if(cstr_info) {
+                opj_tile_info_t *tile_info = &cstr_info->tile[tcd->tcd_tileno];
+                tile_info->numpix = tcd_tile->numpix;
+                tile_info->distotile = tcd_tile->distotile;
+                tile_info->thresh = (OPJ_FLOAT64 *) opj_malloc(tcd_tcp->numlayers * sizeof(OPJ_FLOAT64));
+        }
+
+        for (layno = 0; layno < tcd_tcp->numlayers; layno++) {
+                OPJ_FLOAT64 lo = min;
+                OPJ_FLOAT64 hi = max;
+                opj_bool success = OPJ_FALSE;
+                OPJ_UINT32 maxlen = tcd_tcp->rates[layno] ? uint_min(((OPJ_UINT32) ceil(tcd_tcp->rates[layno])), len) : len;
+                OPJ_FLOAT64 goodthresh = 0;
+                OPJ_FLOAT64 stable_thresh = 0;
+                OPJ_UINT32 i;
+                OPJ_FLOAT64 distotarget;                /* fixed_quality */
+
+                /* fixed_quality */
+                distotarget = tcd_tile->distotile - ((K * maxSE) / pow((OPJ_FLOAT32)10, tcd_tcp->distoratio[layno] / 10));
+
+                /* Don't try to find an optimal threshold but rather take everything not included yet, if
+                  -r xx,yy,zz,0   (disto_alloc == 1 and rates == 0)
+                  -q xx,yy,zz,0   (fixed_quality == 1 and distoratio == 0)
+                  ==> possible to have some lossy layers and the last layer for sure lossless */
+                if ( ((cp->m_specific_param.m_enc.m_disto_alloc==1) && (tcd_tcp->rates[layno]>0)) || ((cp->m_specific_param.m_enc.m_fixed_quality==1) && (tcd_tcp->distoratio[layno]>0))) {
+                        opj_t2_v2_t*t2 = opj_t2_create(tcd->image, cp);
+                        OPJ_FLOAT64 thresh = 0;
+
+                        if (t2 == 00) {
+                                return OPJ_FALSE;
+                        }
+
+                        for     (i = 0; i < 128; ++i) {
+                                OPJ_FLOAT64 distoachieved = 0;  /* fixed_quality */
+
+                                thresh = (lo + hi) / 2;
+
+                                opj_tcd_makelayer(tcd, layno, thresh, 0);
+
+                                if (cp->m_specific_param.m_enc.m_fixed_quality) {       /* fixed_quality */
+                                        if(cp->m_specific_param.m_enc.m_cinema){
+                                                if (! opj_t2_encode_packets(t2,tcd->tcd_tileno, tcd_tile, layno + 1, dest, p_data_written, maxlen, cstr_info,tcd->cur_tp_num,tcd->tp_pos,tcd->cur_pino,THRESH_CALC)) {
+
+                                                        lo = thresh;
+                                                        continue;
+                                                }
+                                                else {
+                                                        distoachieved = layno == 0 ?
+                                                                        tcd_tile->distolayer[0] : cumdisto[layno - 1] + tcd_tile->distolayer[layno];
+
+                                                        if (distoachieved < distotarget) {
+                                                                hi=thresh;
+                                                                stable_thresh = thresh;
+                                                                continue;
+                                                        }else{
+                                                                lo=thresh;
+                                                        }
+                                                }
+                                        }else{
+                                                distoachieved = (layno == 0) ?
+                                                                tcd_tile->distolayer[0] : (cumdisto[layno - 1] + tcd_tile->distolayer[layno]);
+
+                                                if (distoachieved < distotarget) {
+                                                        hi = thresh;
+                                                        stable_thresh = thresh;
+                                                        continue;
+                                                }
+                                                lo = thresh;
+                                        }
+                                } else {
+                                        if (! opj_t2_encode_packets(t2, tcd->tcd_tileno, tcd_tile, layno + 1, dest,p_data_written, maxlen, cstr_info,tcd->cur_tp_num,tcd->tp_pos,tcd->cur_pino,THRESH_CALC))
+                                        {
+                                                /* TODO: what to do with l ??? seek / tell ??? */
+                                                /* opj_event_msg(tcd->cinfo, EVT_INFO, "rate alloc: len=%d, max=%d\n", l, maxlen); */
+                                                lo = thresh;
+                                                continue;
+                                        }
+
+                                        hi = thresh;
+                                        stable_thresh = thresh;
+                                }
+                        }
+
+                        success = OPJ_TRUE;
+                        goodthresh = stable_thresh == 0? thresh : stable_thresh;
+
+                        opj_t2_destroy(t2);
+                } else {
+                        success = OPJ_TRUE;
+                        goodthresh = min;
+                }
+
+                if (!success) {
+                        return OPJ_FALSE;
+                }
+
+                if(cstr_info) { /* Threshold for Marcela Index */
+                        cstr_info->tile[tcd->tcd_tileno].thresh[layno] = goodthresh;
+                }
+
+                opj_tcd_makelayer(tcd, layno, goodthresh, 1);
+
+                /* fixed_quality */
+                cumdisto[layno] = (layno == 0) ? tcd_tile->distolayer[0] : (cumdisto[layno - 1] + tcd_tile->distolayer[layno]);
+        }
+
+        return OPJ_TRUE;
 }
 
-void tcd_rateallocate_fixed(opj_tcd_t *tcd) {
-       int layno;
-       for (layno = 0; layno < tcd->tcp->numlayers; layno++) {
-               tcd_makelayer_fixed(tcd, layno, 1);
-       }
-}
+opj_bool opj_tcd_init( opj_tcd_v2_t *p_tcd,
+                                           opj_image_t * p_image,
+                                           opj_cp_v2_t * p_cp )
+{
+        OPJ_UINT32 l_tile_comp_size;
 
-void tcd_makelayer(opj_tcd_t *tcd, int layno, double thresh, int final) {
-       int compno, resno, bandno, precno, cblkno, passno;
-       
-       opj_tcd_tile_t *tcd_tile = tcd->tcd_tile;
-
-       tcd_tile->distolayer[layno] = 0;        /* fixed_quality */
-       
-       for (compno = 0; compno < tcd_tile->numcomps; compno++) {
-               opj_tcd_tilecomp_t *tilec = &tcd_tile->comps[compno];
-               for (resno = 0; resno < tilec->numresolutions; resno++) {
-                       opj_tcd_resolution_t *res = &tilec->resolutions[resno];
-                       for (bandno = 0; bandno < res->numbands; bandno++) {
-                               opj_tcd_band_t *band = &res->bands[bandno];
-                               for (precno = 0; precno < res->pw * res->ph; precno++) {
-                                       opj_tcd_precinct_t *prc = &band->precincts[precno];
-                                       for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
-                                               opj_tcd_cblk_enc_t *cblk = &prc->cblks.enc[cblkno];
-                                               opj_tcd_layer_t *layer = &cblk->layers[layno];
-                                               
-                                               int n;
-                                               if (layno == 0) {
-                                                       cblk->numpassesinlayers = 0;
-                                               }
-                                               n = cblk->numpassesinlayers;
-                                               for (passno = cblk->numpassesinlayers; passno < cblk->totalpasses; passno++) {
-                                                       int dr;
-                                                       double dd;
-                                                       opj_tcd_pass_t *pass = &cblk->passes[passno];
-                                                       if (n == 0) {
-                                                               dr = pass->rate;
-                                                               dd = pass->distortiondec;
-                                                       } else {
-                                                               dr = pass->rate - cblk->passes[n - 1].rate;
-                                                               dd = pass->distortiondec - cblk->passes[n - 1].distortiondec;
-                                                       }
-                                                       if (!dr) {
-                                                               if (dd != 0)
-                                                                       n = passno + 1;
-                                                               continue;
-                                                       }
-                                                       if (dd / dr >= thresh)
-                                                               n = passno + 1;
-                                               }
-                                               layer->numpasses = n - cblk->numpassesinlayers;
-                                               
-                                               if (!layer->numpasses) {
-                                                       layer->disto = 0;
-                                                       continue;
-                                               }
-                                               if (cblk->numpassesinlayers == 0) {
-                                                       layer->len = cblk->passes[n - 1].rate;
-                                                       layer->data = cblk->data;
-                                                       layer->disto = cblk->passes[n - 1].distortiondec;
-                                               } else {
-                                                       layer->len = cblk->passes[n - 1].rate - cblk->passes[cblk->numpassesinlayers - 1].rate;
-                                                       layer->data = cblk->data + cblk->passes[cblk->numpassesinlayers - 1].rate;
-                                                       layer->disto = cblk->passes[n - 1].distortiondec - cblk->passes[cblk->numpassesinlayers - 1].distortiondec;
-                                               }
-                                               
-                                               tcd_tile->distolayer[layno] += layer->disto;    /* fixed_quality */
-                                               
-                                               if (final)
-                                                       cblk->numpassesinlayers = n;
-                                       }
-                               }
-                       }
-               }
-       }
-}
+        p_tcd->image = p_image;
+        p_tcd->cp = p_cp;
 
-opj_bool tcd_rateallocate(opj_tcd_t *tcd, unsigned char *dest, int len, opj_codestream_info_t *cstr_info) {
-       int compno, resno, bandno, precno, cblkno, passno, layno;
-       double min, max;
-       double cumdisto[100];   /* fixed_quality */
-       const double K = 1;             /* 1.1; fixed_quality */
-       double maxSE = 0;
-
-       opj_cp_t *cp = tcd->cp;
-       opj_tcd_tile_t *tcd_tile = tcd->tcd_tile;
-       opj_tcp_t *tcd_tcp = tcd->tcp;
-
-       min = DBL_MAX;
-       max = 0;
-       
-       tcd_tile->numpix = 0;           /* fixed_quality */
-       
-       for (compno = 0; compno < tcd_tile->numcomps; compno++) {
-               opj_tcd_tilecomp_t *tilec = &tcd_tile->comps[compno];
-               tilec->numpix = 0;
-
-               for (resno = 0; resno < tilec->numresolutions; resno++) {
-                       opj_tcd_resolution_t *res = &tilec->resolutions[resno];
-
-                       for (bandno = 0; bandno < res->numbands; bandno++) {
-                               opj_tcd_band_t *band = &res->bands[bandno];
-
-                               for (precno = 0; precno < res->pw * res->ph; precno++) {
-                                       opj_tcd_precinct_t *prc = &band->precincts[precno];
-
-                                       for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
-                                               opj_tcd_cblk_enc_t *cblk = &prc->cblks.enc[cblkno];
-
-                                               for (passno = 0; passno < cblk->totalpasses; passno++) {
-                                                       opj_tcd_pass_t *pass = &cblk->passes[passno];
-                                                       int dr;
-                                                       double dd, rdslope;
-                                                       if (passno == 0) {
-                                                               dr = pass->rate;
-                                                               dd = pass->distortiondec;
-                                                       } else {
-                                                               dr = pass->rate - cblk->passes[passno - 1].rate;
-                                                               dd = pass->distortiondec - cblk->passes[passno - 1].distortiondec;
-                                                       }
-                                                       if (dr == 0) {
-                                                               continue;
-                                                       }
-                                                       rdslope = dd / dr;
-                                                       if (rdslope < min) {
-                                                               min = rdslope;
-                                                       }
-                                                       if (rdslope > max) {
-                                                               max = rdslope;
-                                                       }
-                                               } /* passno */
-                                               
-                                               /* fixed_quality */
-                                               tcd_tile->numpix += ((cblk->x1 - cblk->x0) * (cblk->y1 - cblk->y0));
-                                               tilec->numpix += ((cblk->x1 - cblk->x0) * (cblk->y1 - cblk->y0));
-                                       } /* cbklno */
-                               } /* precno */
-                       } /* bandno */
-               } /* resno */
-               
-               maxSE += (((double)(1 << tcd->image->comps[compno].prec) - 1.0) 
-                       * ((double)(1 << tcd->image->comps[compno].prec) -1.0)) 
-                       * ((double)(tilec->numpix));
-       } /* compno */
-       
-       /* index file */
-       if(cstr_info) {
-               opj_tile_info_t *tile_info = &cstr_info->tile[tcd->tcd_tileno];
-               tile_info->numpix = tcd_tile->numpix;
-               tile_info->distotile = tcd_tile->distotile;
-               tile_info->thresh = (double *) opj_malloc(tcd_tcp->numlayers * sizeof(double));
-       }
-       
-       for (layno = 0; layno < tcd_tcp->numlayers; layno++) {
-               double lo = min;
-               double hi = max;
-               int success = 0;
-               int maxlen = tcd_tcp->rates[layno] ? int_min(((int) ceil(tcd_tcp->rates[layno])), len) : len;
-               double goodthresh = 0;
-               double stable_thresh = 0;
-               int i;
-               double distotarget;             /* fixed_quality */
-               
-               /* fixed_quality */
-               distotarget = tcd_tile->distotile - ((K * maxSE) / pow((float)10, tcd_tcp->distoratio[layno] / 10));
-        
-               /* Don't try to find an optimal threshold but rather take everything not included yet, if
-                 -r xx,yy,zz,0   (disto_alloc == 1 and rates == 0)
-                 -q xx,yy,zz,0   (fixed_quality == 1 and distoratio == 0)
-                 ==> possible to have some lossy layers and the last layer for sure lossless */
-               if ( ((cp->disto_alloc==1) && (tcd_tcp->rates[layno]>0)) || ((cp->fixed_quality==1) && (tcd_tcp->distoratio[layno]>0))) {
-                       opj_t2_t *t2 = t2_create(tcd->cinfo, tcd->image, cp);
-                       double thresh = 0;
-
-                       for (i = 0; i < 128; i++) {
-                               int l = 0;
-                               double distoachieved = 0;       /* fixed_quality */
-                               thresh = (lo + hi) / 2;
-                               
-                               tcd_makelayer(tcd, layno, thresh, 0);
-                               
-                               if (cp->fixed_quality) {        /* fixed_quality */
-                                       if(cp->cinema){
-                                               l = t2_encode_packets(t2,tcd->tcd_tileno, tcd_tile, layno + 1, dest, maxlen, cstr_info,tcd->cur_tp_num,tcd->tp_pos,tcd->cur_pino,THRESH_CALC, tcd->cur_totnum_tp);
-                                               if (l == -999) {
-                                                       lo = thresh;
-                                                       continue;
-                                               }else{
-                       distoachieved = layno == 0 ? 
-                                                       tcd_tile->distolayer[0] : cumdisto[layno - 1] + tcd_tile->distolayer[layno];
-                                                       if (distoachieved < distotarget) {
-                                                               hi=thresh; 
-                                                               stable_thresh = thresh;
-                                                               continue;
-                                                       }else{
-                                                               lo=thresh;
-                                                       }
-                                               }
-                                       }else{
-                                               distoachieved = (layno == 0) ? 
-                                                       tcd_tile->distolayer[0] : (cumdisto[layno - 1] + tcd_tile->distolayer[layno]);
-                                               if (distoachieved < distotarget) {
-                                                       hi = thresh;
-                                                       stable_thresh = thresh;
-                                                       continue;
-                                               }
-                                               lo = thresh;
-                                       }
-                               } else {
-                                       l = t2_encode_packets(t2, tcd->tcd_tileno, tcd_tile, layno + 1, dest, maxlen, cstr_info,tcd->cur_tp_num,tcd->tp_pos,tcd->cur_pino,THRESH_CALC, tcd->cur_totnum_tp);
-                                       /* TODO: what to do with l ??? seek / tell ??? */
-                                       /* opj_event_msg(tcd->cinfo, EVT_INFO, "rate alloc: len=%d, max=%d\n", l, maxlen); */
-                                       if (l == -999) {
-                                               lo = thresh;
-                                               continue;
-                                       }
-                                       hi = thresh;
-                                       stable_thresh = thresh;
-                               }
-                       }
-                       success = 1;
-                       goodthresh = stable_thresh == 0? thresh : stable_thresh;
-                       t2_destroy(t2);
-               } else {
-                       success = 1;
-                       goodthresh = min;
-               }
-               
-               if (!success) {
-                       return OPJ_FALSE;
-               }
-               
-               if(cstr_info) { /* Threshold for Marcela Index */
-                       cstr_info->tile[tcd->tcd_tileno].thresh[layno] = goodthresh;
-               }
-               tcd_makelayer(tcd, layno, goodthresh, 1);
-        
-               /* fixed_quality */
-               cumdisto[layno] = (layno == 0) ? tcd_tile->distolayer[0] : (cumdisto[layno - 1] + tcd_tile->distolayer[layno]); 
-       }
-
-       return OPJ_TRUE;
-}
+        p_tcd->tcd_image->tiles = (opj_tcd_tile_v2_t *) opj_malloc(sizeof(opj_tcd_tile_v2_t));
+        if (! p_tcd->tcd_image->tiles) {
+                return OPJ_FALSE;
+        }
+        memset(p_tcd->tcd_image->tiles,0, sizeof(opj_tcd_tile_v2_t));
 
-int tcd_encode_tile(opj_tcd_t *tcd, int tileno, unsigned char *dest, int len, opj_codestream_info_t *cstr_info) {
-       int compno;
-       int l, i, numpacks = 0;
-       opj_tcd_tile_t *tile = NULL;
-       opj_tcp_t *tcd_tcp = NULL;
-       opj_cp_t *cp = NULL;
-
-       opj_tcp_t *tcp = &tcd->cp->tcps[0];
-       opj_tccp_t *tccp = &tcp->tccps[0];
-       opj_image_t *image = tcd->image;
-       
-       opj_t1_t *t1 = NULL;            /* T1 component */
-       opj_t2_t *t2 = NULL;            /* T2 component */
-
-       tcd->tcd_tileno = tileno;
-       tcd->tcd_tile = tcd->tcd_image->tiles;
-       tcd->tcp = &tcd->cp->tcps[tileno];
-
-       tile = tcd->tcd_tile;
-       tcd_tcp = tcd->tcp;
-       cp = tcd->cp;
-
-       if(tcd->cur_tp_num == 0){
-               tcd->encoding_time = opj_clock();       /* time needed to encode a tile */
-               /* INDEX >> "Precinct_nb_X et Precinct_nb_Y" */
-               if(cstr_info) {
-                       opj_tcd_tilecomp_t *tilec_idx = &tile->comps[0];        /* based on component 0 */
-                       for (i = 0; i < tilec_idx->numresolutions; i++) {
-                               opj_tcd_resolution_t *res_idx = &tilec_idx->resolutions[i];
-                               
-                               cstr_info->tile[tileno].pw[i] = res_idx->pw;
-                               cstr_info->tile[tileno].ph[i] = res_idx->ph;
-                               
-                               numpacks += res_idx->pw * res_idx->ph;
-                               
-                               cstr_info->tile[tileno].pdx[i] = tccp->prcw[i];
-                               cstr_info->tile[tileno].pdy[i] = tccp->prch[i];
-                       }
-                       cstr_info->tile[tileno].packet = (opj_packet_info_t*) opj_calloc(cstr_info->numcomps * cstr_info->numlayers * numpacks, sizeof(opj_packet_info_t));
-               }
-               /* << INDEX */
-               
-               /*---------------TILE-------------------*/
-               
-               for (compno = 0; compno < tile->numcomps; compno++) {
-                       int x, y;
-                       
-                       int adjust = image->comps[compno].sgnd ? 0 : 1 << (image->comps[compno].prec - 1);
-                       int offset_x = int_ceildiv(image->x0, image->comps[compno].dx);
-                       int offset_y = int_ceildiv(image->y0, image->comps[compno].dy);
-                       
-                       opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
-                       int tw = tilec->x1 - tilec->x0;
-                       int w = int_ceildiv(image->x1 - image->x0, image->comps[compno].dx);
-                       
-                       /* extract tile data */
-                       
-                       if (tcd_tcp->tccps[compno].qmfbid == 1) {
-                               for (y = tilec->y0; y < tilec->y1; y++) {
-                                       /* start of the src tile scanline */
-                                       int *data = &image->comps[compno].data[(tilec->x0 - offset_x) + (y - offset_y) * w];
-                                       /* start of the dst tile scanline */
-                                       int *tile_data = &tilec->data[(y - tilec->y0) * tw];
-                                       for (x = tilec->x0; x < tilec->x1; x++) {
-                                               *tile_data++ = *data++ - adjust;
-                                       }
-                               }
-                       } else if (tcd_tcp->tccps[compno].qmfbid == 0) {
-                               for (y = tilec->y0; y < tilec->y1; y++) {
-                                       /* start of the src tile scanline */
-                                       int *data = &image->comps[compno].data[(tilec->x0 - offset_x) + (y - offset_y) * w];
-                                       /* start of the dst tile scanline */
-                                       int *tile_data = &tilec->data[(y - tilec->y0) * tw];
-                                       for (x = tilec->x0; x < tilec->x1; x++) {
-                                               *tile_data++ = (*data++ - adjust) << 11;
-                                       }
-                                       
-                               }
-                       }
-               }
-               
-               /*----------------MCT-------------------*/
-               if (tcd_tcp->mct) {
-                       int samples = (tile->comps[0].x1 - tile->comps[0].x0) * (tile->comps[0].y1 - tile->comps[0].y0);
-                       if (tcd_tcp->tccps[0].qmfbid == 0) {
-                               mct_encode_real(tile->comps[0].data, tile->comps[1].data, tile->comps[2].data, samples);
-                       } else {
-                               mct_encode(tile->comps[0].data, tile->comps[1].data, tile->comps[2].data, samples);
-                       }
-               }
-               
-               /*----------------DWT---------------------*/
-               
-               for (compno = 0; compno < tile->numcomps; compno++) {
-                       opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
-                       if (tcd_tcp->tccps[compno].qmfbid == 1) {
-                               dwt_encode(tilec);
-                       } else if (tcd_tcp->tccps[compno].qmfbid == 0) {
-                               dwt_encode_real(tilec);
-                       }
-               }
-               
-               /*------------------TIER1-----------------*/
-               t1 = t1_create(tcd->cinfo);
-               t1_encode_cblks(t1, tile, tcd_tcp);
-               t1_destroy(t1);
-               
-               /*-----------RATE-ALLOCATE------------------*/
-               
-               /* INDEX */
-               if(cstr_info) {
-                       cstr_info->index_write = 0;
-               }
-               if (cp->disto_alloc || cp->fixed_quality) {     /* fixed_quality */
-                       /* Normal Rate/distortion allocation */
-                       tcd_rateallocate(tcd, dest, len, cstr_info);
-               } else {
-                       /* Fixed layer allocation */
-                       tcd_rateallocate_fixed(tcd);
-               }
-       }
-       /*--------------TIER2------------------*/
-
-       /* INDEX */
-       if(cstr_info) {
-               cstr_info->index_write = 1;
-       }
-
-       t2 = t2_create(tcd->cinfo, image, cp);
-       l = t2_encode_packets(t2,tileno, tile, tcd_tcp->numlayers, dest, len, cstr_info,tcd->tp_num,tcd->tp_pos,tcd->cur_pino,FINAL_PASS,tcd->cur_totnum_tp);
-       t2_destroy(t2);
-       
-       /*---------------CLEAN-------------------*/
-
-       
-       if(tcd->cur_tp_num == tcd->cur_totnum_tp - 1){
-               tcd->encoding_time = opj_clock() - tcd->encoding_time;
-               opj_event_msg(tcd->cinfo, EVT_INFO, "- tile encoded in %f s\n", tcd->encoding_time);
-
-               /* cleaning memory */
-               for (compno = 0; compno < tile->numcomps; compno++) {
-                       opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
-                       opj_aligned_free(tilec->data);
-               }
-       }
-
-       return l;
-}
+        l_tile_comp_size = p_image->numcomps * sizeof(opj_tcd_tilecomp_v2_t);
+        p_tcd->tcd_image->tiles->comps = (opj_tcd_tilecomp_v2_t *) opj_malloc(l_tile_comp_size);
+        if (! p_tcd->tcd_image->tiles->comps ) {
+                return OPJ_FALSE;
+        }
+        memset( p_tcd->tcd_image->tiles->comps , 0 , l_tile_comp_size);
 
-opj_bool tcd_decode_tile(opj_tcd_t *tcd, unsigned char *src, int len, int tileno, opj_codestream_info_t *cstr_info) {
-       int l;
-       int compno;
-       int eof = 0;
-       double tile_time, t1_time, dwt_time;
-       opj_tcd_tile_t *tile = NULL;
-
-       opj_t1_t *t1 = NULL;            /* T1 component */
-       opj_t2_t *t2 = NULL;            /* T2 component */
-       
-       tcd->tcd_tileno = tileno;
-       tcd->tcd_tile = &(tcd->tcd_image->tiles[tileno]);
-       tcd->tcp = &(tcd->cp->tcps[tileno]);
-       tile = tcd->tcd_tile;
-       
-       tile_time = opj_clock();        /* time needed to decode a tile */
-       opj_event_msg(tcd->cinfo, EVT_INFO, "tile %d of %d\n", tileno + 1, tcd->cp->tw * tcd->cp->th);
-
-       /* INDEX >>  */
-       if(cstr_info) {
-               int resno, compno, numprec = 0;
-               for (compno = 0; compno < cstr_info->numcomps; compno++) {
-                       opj_tcp_t *tcp = &tcd->cp->tcps[0];
-                       opj_tccp_t *tccp = &tcp->tccps[compno];
-                       opj_tcd_tilecomp_t *tilec_idx = &tile->comps[compno];   
-                       for (resno = 0; resno < tilec_idx->numresolutions; resno++) {
-                               opj_tcd_resolution_t *res_idx = &tilec_idx->resolutions[resno];
-                               cstr_info->tile[tileno].pw[resno] = res_idx->pw;
-                               cstr_info->tile[tileno].ph[resno] = res_idx->ph;
-                               numprec += res_idx->pw * res_idx->ph;
-                               if (tccp->csty & J2K_CP_CSTY_PRT) {
-                                       cstr_info->tile[tileno].pdx[resno] = tccp->prcw[resno];
-                                       cstr_info->tile[tileno].pdy[resno] = tccp->prch[resno];
-                               }
-                               else {
-                                       cstr_info->tile[tileno].pdx[resno] = 15;
-                                       cstr_info->tile[tileno].pdy[resno] = 15;
-                               }
-                       }
-               }
-               cstr_info->tile[tileno].packet = (opj_packet_info_t *) opj_malloc(cstr_info->numlayers * numprec * sizeof(opj_packet_info_t));
-               cstr_info->packno = 0;
-       }
-       /* << INDEX */
-       
-       /*--------------TIER2------------------*/
-       
-       t2 = t2_create(tcd->cinfo, tcd->image, tcd->cp);
-       l = t2_decode_packets(t2, src, len, tileno, tile, cstr_info);
-       t2_destroy(t2);
-
-       if (l == -999) {
-               eof = 1;
-               opj_event_msg(tcd->cinfo, EVT_ERROR, "tcd_decode: incomplete bistream\n");
-       }
-       
-       /*------------------TIER1-----------------*/
-       
-       t1_time = opj_clock();  /* time needed to decode a tile */
-       t1 = t1_create(tcd->cinfo);
-       for (compno = 0; compno < tile->numcomps; ++compno) {
-               opj_tcd_tilecomp_t* tilec = &tile->comps[compno];
-               /* The +3 is headroom required by the vectorized DWT */
-               tilec->data = (int*) opj_aligned_malloc((((tilec->x1 - tilec->x0) * (tilec->y1 - tilec->y0))+3) * sizeof(int));
-               t1_decode_cblks(t1, tilec, &tcd->tcp->tccps[compno]);
-       }
-       t1_destroy(t1);
-       t1_time = opj_clock() - t1_time;
-       opj_event_msg(tcd->cinfo, EVT_INFO, "- tiers-1 took %f s\n", t1_time);
-       
-       /*----------------DWT---------------------*/
-
-       dwt_time = opj_clock(); /* time needed to decode a tile */
-       for (compno = 0; compno < tile->numcomps; compno++) {
-               opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
-               int numres2decode;
-
-               if (tcd->cp->reduce != 0) {
-                       tcd->image->comps[compno].resno_decoded =
-                               tile->comps[compno].numresolutions - tcd->cp->reduce - 1;
-                       if (tcd->image->comps[compno].resno_decoded < 0) {                              
-                               opj_event_msg(tcd->cinfo, EVT_ERROR, "Error decoding tile. The number of resolutions to remove [%d+1] is higher than the number "
-                                       " of resolutions in the original codestream [%d]\nModify the cp_reduce parameter.\n", tcd->cp->reduce, tile->comps[compno].numresolutions);
-                               return OPJ_FALSE;
-                       }
-               }
-
-               numres2decode = tcd->image->comps[compno].resno_decoded + 1;
-               if(numres2decode > 0){
-                       if (tcd->tcp->tccps[compno].qmfbid == 1) {
-                               dwt_decode(tilec, numres2decode);
-                       } else {
-                               dwt_decode_real(tilec, numres2decode);
-                       }
-               }
-       }
-       dwt_time = opj_clock() - dwt_time;
-       opj_event_msg(tcd->cinfo, EVT_INFO, "- dwt took %f s\n", dwt_time);
-
-       /*----------------MCT-------------------*/
-
-       if (tcd->tcp->mct) {
-               int n = (tile->comps[0].x1 - tile->comps[0].x0) * (tile->comps[0].y1 - tile->comps[0].y0);
-
-               if (tile->numcomps >= 3 ){
-                       if (tcd->tcp->tccps[0].qmfbid == 1) {
-                               mct_decode(
-                                               tile->comps[0].data,
-                                               tile->comps[1].data,
-                                               tile->comps[2].data,
-                                               n);
-                       } else {
-                               mct_decode_real(
-                                               (float*)tile->comps[0].data,
-                                               (float*)tile->comps[1].data,
-                                               (float*)tile->comps[2].data,
-                                               n);
-                       }
-               } else{
-                       opj_event_msg(tcd->cinfo, EVT_WARNING,"Number of components (%d) is inconsistent with a MCT. Skip the MCT step.\n",tile->numcomps);
-               }
-       }
-
-       /*---------------TILE-------------------*/
-
-       for (compno = 0; compno < tile->numcomps; ++compno) {
-               opj_tcd_tilecomp_t* tilec = &tile->comps[compno];
-               opj_image_comp_t* imagec = &tcd->image->comps[compno];
-               opj_tcd_resolution_t* res = &tilec->resolutions[imagec->resno_decoded];
-               int adjust = imagec->sgnd ? 0 : 1 << (imagec->prec - 1);
-               int min = imagec->sgnd ? -(1 << (imagec->prec - 1)) : 0;
-               int max = imagec->sgnd ?  (1 << (imagec->prec - 1)) - 1 : (1 << imagec->prec) - 1;
-
-               int tw = tilec->x1 - tilec->x0;
-               int w = imagec->w;
-
-               int offset_x = int_ceildivpow2(imagec->x0, imagec->factor);
-               int offset_y = int_ceildivpow2(imagec->y0, imagec->factor);
-
-               int i, j;
-               if(!imagec->data){
-                       imagec->data = (int*) opj_malloc(imagec->w * imagec->h * sizeof(int));
-               }
-               if(tcd->tcp->tccps[compno].qmfbid == 1) {
-                       for(j = res->y0; j < res->y1; ++j) {
-                               for(i = res->x0; i < res->x1; ++i) {
-                                       int v = tilec->data[i - res->x0 + (j - res->y0) * tw];
-                                       v += adjust;
-                                       imagec->data[(i - offset_x) + (j - offset_y) * w] = int_clamp(v, min, max);
-                               }
-                       }
-               }else{
-                       for(j = res->y0; j < res->y1; ++j) {
-                               for(i = res->x0; i < res->x1; ++i) {
-                                       float tmp = ((float*)tilec->data)[i - res->x0 + (j - res->y0) * tw];
-                                       int v = lrintf(tmp);
-                                       v += adjust;
-                                       imagec->data[(i - offset_x) + (j - offset_y) * w] = int_clamp(v, min, max);
-                               }
-                       }
-               }
-               opj_aligned_free(tilec->data);
-       }
-
-       tile_time = opj_clock() - tile_time;    /* time needed to decode a tile */
-       opj_event_msg(tcd->cinfo, EVT_INFO, "- tile decoded in %f s\n", tile_time);
-
-       if (eof) {
-               return OPJ_FALSE;
-       }
-       
-       return OPJ_TRUE;
-}
+        p_tcd->tcd_image->tiles->numcomps = p_image->numcomps;
+        p_tcd->tp_pos = p_cp->m_specific_param.m_enc.m_tp_pos;
 
-void tcd_free_decode(opj_tcd_t *tcd) {
-       opj_tcd_image_t *tcd_image = tcd->tcd_image;    
-       opj_free(tcd_image->tiles);
+        return OPJ_TRUE;
 }
 
-void tcd_free_decode_tile(opj_tcd_t *tcd, int tileno) {
-       int compno,resno,bandno,precno;
-
-       opj_tcd_image_t *tcd_image = tcd->tcd_image;
-
-       opj_tcd_tile_t *tile = &tcd_image->tiles[tileno];
-       for (compno = 0; compno < tile->numcomps; compno++) {
-               opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
-               for (resno = 0; resno < tilec->numresolutions; resno++) {
-                       opj_tcd_resolution_t *res = &tilec->resolutions[resno];
-                       for (bandno = 0; bandno < res->numbands; bandno++) {
-                               opj_tcd_band_t *band = &res->bands[bandno];
-                               for (precno = 0; precno < res->ph * res->pw; precno++) {
-                                       opj_tcd_precinct_t *prec = &band->precincts[precno];
-                                       if (prec->imsbtree != NULL) tgt_destroy(prec->imsbtree);
-                                       if (prec->incltree != NULL) tgt_destroy(prec->incltree);
-                               }
-                               opj_free(band->precincts);
-                       }
-               }
-               opj_free(tilec->resolutions);
-       }
-       opj_free(tile->comps);
+/**
+Destroy a previously created TCD handle
+*/
+void opj_tcd_destroy(opj_tcd_v2_t *tcd) {
+        if (tcd) {
+                opj_tcd_free_tile(tcd);
+
+                if (tcd->tcd_image) {
+                        opj_free(tcd->tcd_image);
+                        tcd->tcd_image = 00;
+                }
+                opj_free(tcd);
+        }
 }
 
+/* ----------------------------------------------------------------------- */
+#define MACRO_TCD_ALLOCATE(FUNCTION,TYPE,FRACTION,ELEMENT,FUNCTION_ELEMENT)                                                                                                                                       \
+opj_bool FUNCTION (     opj_tcd_v2_t *p_tcd,                        \
+                        OPJ_UINT32 p_tile_no                        \
+                        )                                           \
+{                                                                   \
+        OPJ_UINT32 (*l_gain_ptr)(OPJ_UINT32) = 00;                  \
+        OPJ_UINT32 compno, resno, bandno, precno, cblkno;           \
+        opj_tcp_v2_t * l_tcp = 00;                                  \
+        opj_cp_v2_t * l_cp = 00;                                    \
+        opj_tcd_tile_v2_t * l_tile = 00;                            \
+        opj_tccp_t *l_tccp = 00;                                    \
+        opj_tcd_tilecomp_v2_t *l_tilec = 00;                        \
+        opj_image_comp_t * l_image_comp = 00;                       \
+        opj_tcd_resolution_v2_t *l_res = 00;                        \
+        opj_tcd_band_v2_t *l_band = 00;                             \
+        opj_stepsize_t * l_step_size = 00;                          \
+        opj_tcd_precinct_v2_t *l_current_precinct = 00;             \
+        TYPE* l_code_block = 00;                                    \
+        opj_image_t *l_image = 00;                                  \
+        OPJ_UINT32 p,q;                                             \
+        OPJ_UINT32 l_level_no;                                      \
+        OPJ_UINT32 l_pdx, l_pdy;                                    \
+        OPJ_UINT32 l_gain;                                          \
+        OPJ_INT32 l_x0b, l_y0b;                                     \
+        /* extent of precincts , top left, bottom right**/          \
+        OPJ_INT32 l_tl_prc_x_start, l_tl_prc_y_start, l_br_prc_x_end, l_br_prc_y_end;                                                                                                                             \
+        /* number of precinct for a resolution */                   \
+        OPJ_UINT32 l_nb_precincts;                                  \
+        /* room needed to store l_nb_precinct precinct for a resolution */                                                                                                                                        \
+        OPJ_UINT32 l_nb_precinct_size;                              \
+        /* number of code blocks for a precinct*/                   \
+        OPJ_UINT32 l_nb_code_blocks;                                \
+        /* room needed to store l_nb_code_blocks code blocks for a precinct*/                                                                                                                                     \
+        OPJ_UINT32 l_nb_code_blocks_size;                           \
+        /* size of data for a tile */                               \
+        OPJ_UINT32 l_data_size;                                     \
+                                                                    \
+        l_cp = p_tcd->cp;                                           \
+        l_tcp = &(l_cp->tcps[p_tile_no]);                           \
+        l_tile = p_tcd->tcd_image->tiles;                           \
+        l_tccp = l_tcp->tccps;                                      \
+        l_tilec = l_tile->comps;                                    \
+        l_image = p_tcd->image;                                     \
+        l_image_comp = p_tcd->image->comps;                         \
+                                                                    \
+        p = p_tile_no % l_cp->tw;       /* tile coordinates */      \
+        q = p_tile_no / l_cp->tw;                                   \
+        /*fprintf(stderr, "Tile coordinate = %d,%d\n", p, q);*/     \
+                                                                    \
+        /* 4 borders of the tile rescale on the image if necessary */                                                                                                                                             \
+        l_tile->x0 = int_max(l_cp->tx0 + p * l_cp->tdx, l_image->x0);                                                                                                                                             \
+        l_tile->y0 = int_max(l_cp->ty0 + q * l_cp->tdy, l_image->y0);                                                                                                                                             \
+        l_tile->x1 = int_min(l_cp->tx0 + (p + 1) * l_cp->tdx, l_image->x1);                                                                                                                                       \
+        l_tile->y1 = int_min(l_cp->ty0 + (q + 1) * l_cp->tdy, l_image->y1);                                                                                                                                       \
+        /*fprintf(stderr, "Tile border = %d,%d,%d,%d\n", l_tile->x0, l_tile->y0,l_tile->x1,l_tile->y1);*/                                                                                                         \
+                                                                    \
+        /*tile->numcomps = image->numcomps; */                      \
+        for(compno = 0; compno < l_tile->numcomps; ++compno) {      \
+                /*fprintf(stderr, "compno = %d/%d\n", compno, l_tile->numcomps);*/                                                                                                                                \
+                                                                    \
+                /* border of each l_tile component (global) */      \
+                l_tilec->x0 = int_ceildiv(l_tile->x0, l_image_comp->dx);                                                                                                                                          \
+                l_tilec->y0 = int_ceildiv(l_tile->y0, l_image_comp->dy);                                                                                                                                          \
+                l_tilec->x1 = int_ceildiv(l_tile->x1, l_image_comp->dx);                                                                                                                                          \
+                l_tilec->y1 = int_ceildiv(l_tile->y1, l_image_comp->dy);                                                                                                                                          \
+                /*fprintf(stderr, "\tTile compo border = %d,%d,%d,%d\n", l_tilec->x0, l_tilec->y0,l_tilec->x1,l_tilec->y1);*/                                                                                     \
+                                                                    \
+                l_data_size = (l_tilec->x1 - l_tilec->x0)           \
+                * (l_tilec->y1 - l_tilec->y0) * sizeof(OPJ_UINT32 );\
+                l_tilec->numresolutions = l_tccp->numresolutions;   \
+                if (l_tccp->numresolutions < l_cp->m_specific_param.m_dec.m_reduce) {                                                                                                                             \
+                        l_tilec->minimum_num_resolutions = 1;       \
+                }                                                   \
+                else {                                              \
+                        l_tilec->minimum_num_resolutions = l_tccp->numresolutions                                                                                                                                 \
+                        - l_cp->m_specific_param.m_dec.m_reduce;    \
+                }                                                   \
+                                                                    \
+                if (l_tilec->data == 00) {                          \
+                        l_tilec->data = (OPJ_INT32 *) opj_malloc(l_data_size);                                                                                                                                    \
+                        if (! l_tilec->data ) {                     \
+                                return OPJ_FALSE;                   \
+                        }                                           \
+                        /*fprintf(stderr, "\tAllocate data of tilec (int): %d x OPJ_UINT32\n",l_data_size);*/                                                                                                     \
+                                                                    \
+                        l_tilec->data_size = l_data_size;           \
+                }                                                   \
+                else if (l_data_size > l_tilec->data_size) {        \
+                        OPJ_INT32 * new_data = (OPJ_INT32 *) opj_realloc(l_tilec->data, l_data_size);                                                                                                             \
+                        /* opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory to handle tile data\n");                                                                                                 */  \
+                        fprintf(stderr, "Not enough memory to handle tile data\n");                                                                                                                               \
+                        if (! new_data) {                           \
+                                opj_free(l_tilec->data);            \
+                                l_tilec->data = NULL;               \
+                                l_tilec->data_size = 0;             \
+                                return OPJ_FALSE;                   \
+                        }                                           \
+                        l_tilec->data = new_data;                   \
+                        /*fprintf(stderr, "\tReallocate data of tilec (int): from %d to %d x OPJ_UINT32\n", l_tilec->data_size, l_data_size);*/                                                                   \
+                        l_tilec->data_size = l_data_size;           \
+                }                                                   \
+                                                                    \
+                l_data_size = l_tilec->numresolutions * sizeof(opj_tcd_resolution_v2_t);                                                                                                                          \
+                                                                    \
+                if (l_tilec->resolutions == 00) {                   \
+                        l_tilec->resolutions = (opj_tcd_resolution_v2_t *) opj_malloc(l_data_size);                                                                                                               \
+                        if (! l_tilec->resolutions ) {              \
+                                return OPJ_FALSE;                   \
+                        }                                           \
+                        /*fprintf(stderr, "\tAllocate resolutions of tilec (opj_tcd_resolution_v2_t): %d\n",l_data_size);*/                                                                                       \
+                        l_tilec->resolutions_size = l_data_size;    \
+                        memset(l_tilec->resolutions,0,l_data_size); \
+                }                                                   \
+                else if (l_data_size > l_tilec->resolutions_size) { \
+                        opj_tcd_resolution_v2_t* new_resolutions = (opj_tcd_resolution_v2_t *) opj_realloc(l_tilec->resolutions, l_data_size);                                                                    \
+                        if (! new_resolutions) {                    \
+                                /* opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory to tile resolutions\n");                                                                                         */  \
+                                fprintf(stderr, "Not enough memory to tile resolutions\n");                                                                                                                       \
+                                opj_free(l_tilec->resolutions);     \
+                                l_tilec->resolutions = NULL;        \
+                                l_tilec->resolutions_size = 0;      \
+                                return OPJ_FALSE;                   \
+                        }                                           \
+                        l_tilec->resolutions = new_resolutions;     \
+                        /*fprintf(stderr, "\tReallocate data of tilec (int): from %d to %d x OPJ_UINT32\n", l_tilec->resolutions_size, l_data_size);*/                                                            \
+                        memset(((OPJ_BYTE*) l_tilec->resolutions)+l_tilec->resolutions_size,0,l_data_size - l_tilec->resolutions_size);                                                                           \
+                        l_tilec->resolutions_size = l_data_size;    \
+                }                                                   \
+                                                                    \
+                l_level_no = l_tilec->numresolutions - 1;           \
+                l_res = l_tilec->resolutions;                       \
+                l_step_size = l_tccp->stepsizes;                    \
+                if (l_tccp->qmfbid == 0) {                          \
+                        l_gain_ptr = &opj_dwt_getgain_real;         \
+                }                                                   \
+                else {                                              \
+                        l_gain_ptr  = &opj_dwt_getgain;             \
+                }                                                   \
+                /*fprintf(stderr, "\tlevel_no=%d\n",l_level_no);*/  \
+                                                                                                                                                                                                                  \
+                for(resno = 0; resno < l_tilec->numresolutions; ++resno) {                                                                                                                                        \
+                        /*fprintf(stderr, "\t\tresno = %d/%d\n", resno, l_tilec->numresolutions);*/                                                                                                               \
+                        OPJ_INT32 tlcbgxstart, tlcbgystart, brcbgxend, brcbgyend;                                                                                                                                 \
+                        OPJ_UINT32 cbgwidthexpn, cbgheightexpn;                                                                                                                                                   \
+                        OPJ_UINT32 cblkwidthexpn, cblkheightexpn;                                                                                                                                                 \
+                                                                                                                                                                                                                  \
+                        /* border for each resolution level (global) */                                                                                                                                           \
+                        l_res->x0 = int_ceildivpow2(l_tilec->x0, l_level_no);                                                                                                                                     \
+                        l_res->y0 = int_ceildivpow2(l_tilec->y0, l_level_no);                                                                                                                                     \
+                        l_res->x1 = int_ceildivpow2(l_tilec->x1, l_level_no);                                                                                                                                     \
+                        l_res->y1 = int_ceildivpow2(l_tilec->y1, l_level_no);                                                                                                                                     \
+                        /*fprintf(stderr, "\t\t\tres_x0= %d, res_y0 =%d, res_x1=%d, res_y1=%d\n", l_res->x0, l_res->y0, l_res->x1, l_res->y1);*/                                                                  \
+                        /* p. 35, table A-23, ISO/IEC FDIS154444-1 : 2000 (18 august 2000) */                                                                                                                     \
+                        l_pdx = l_tccp->prcw[resno];                                                                                                                                                              \
+                        l_pdy = l_tccp->prch[resno];                                                                                                                                                              \
+                        /*fprintf(stderr, "\t\t\tpdx=%d, pdy=%d\n", l_pdx, l_pdy);*/                                                                                                                              \
+                        /* p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000)  */                                                                                                                            \
+                        l_tl_prc_x_start = int_floordivpow2(l_res->x0, l_pdx) << l_pdx;                                                                                                                           \
+                        l_tl_prc_y_start = int_floordivpow2(l_res->y0, l_pdy) << l_pdy;                                                                                                                           \
+                        l_br_prc_x_end = int_ceildivpow2(l_res->x1, l_pdx) << l_pdx;                                                                                                                              \
+                        l_br_prc_y_end = int_ceildivpow2(l_res->y1, l_pdy) << l_pdy;                                                                                                                              \
+                        /*fprintf(stderr, "\t\t\tprc_x_start=%d, prc_y_start=%d, br_prc_x_end=%d, br_prc_y_end=%d \n", l_tl_prc_x_start, l_tl_prc_y_start, l_br_prc_x_end ,l_br_prc_y_end );*/                    \
+                                                                                                                                                                                                                  \
+                        l_res->pw = (l_res->x0 == l_res->x1) ? 0 : ((l_br_prc_x_end - l_tl_prc_x_start) >> l_pdx);                                                                                                \
+                        l_res->ph = (l_res->y0 == l_res->y1) ? 0 : ((l_br_prc_y_end - l_tl_prc_y_start) >> l_pdy);                                                                                                \
+                        /*fprintf(stderr, "\t\t\tres_pw=%d, res_ph=%d\n", l_res->pw, l_res->ph );*/                                                                                                               \
+                                                                                                                                                                                                                  \
+                        l_nb_precincts = l_res->pw * l_res->ph;                                                                                                                                                   \
+                        l_nb_precinct_size = l_nb_precincts * sizeof(opj_tcd_precinct_v2_t);                                                                                                                      \
+                        if (resno == 0) {                                                                                                                                                                         \
+                                tlcbgxstart = l_tl_prc_x_start;                                                                                                                                                   \
+                                tlcbgystart = l_tl_prc_y_start;                                                                                                                                                   \
+                                brcbgxend = l_br_prc_x_end;                                                                                                                                                       \
+                                brcbgyend = l_br_prc_y_end;                                                                                                                                                       \
+                                cbgwidthexpn = l_pdx;                                                                                                                                                             \
+                                cbgheightexpn = l_pdy;                                                                                                                                                            \
+                                l_res->numbands = 1;                                                                                                                                                              \
+                        }                                                                                                                                                                                         \
+                        else {                                                                                                                                                                                    \
+                                tlcbgxstart = int_ceildivpow2(l_tl_prc_x_start, 1);                                                                                                                               \
+                                tlcbgystart = int_ceildivpow2(l_tl_prc_y_start, 1);                                                                                                                               \
+                                brcbgxend = int_ceildivpow2(l_br_prc_x_end, 1);                                                                                                                                   \
+                                brcbgyend = int_ceildivpow2(l_br_prc_y_end, 1);                                                                                                                                   \
+                                cbgwidthexpn = l_pdx - 1;                                                                                                                                                         \
+                                cbgheightexpn = l_pdy - 1;                                                                                                                                                        \
+                                l_res->numbands = 3;                                                                                                                                                              \
+                        }                                                                                                                                                                                         \
+                                                                                                                                                                                                                  \
+                        cblkwidthexpn = uint_min(l_tccp->cblkw, cbgwidthexpn);                                                                                                                                    \
+                        cblkheightexpn = uint_min(l_tccp->cblkh, cbgheightexpn);                                                                                                                                  \
+                        l_band = l_res->bands;                                                                                                                                                                    \
+                                                                                                                                                                                                                  \
+                        for (bandno = 0; bandno < l_res->numbands; ++bandno) {                                                                                                                                    \
+                                OPJ_INT32 numbps;                                                                                                                                                                 \
+                                /*fprintf(stderr, "\t\t\tband_no=%d/%d\n", bandno, l_res->numbands );*/                                                                                                           \
+                                                                                                                                                                                                                  \
+                                if (resno == 0) {                                                                                                                                                                 \
+                                        l_band->bandno = 0 ;                                                                                                                                                      \
+                                        l_band->x0 = int_ceildivpow2(l_tilec->x0, l_level_no);                                                                                                                    \
+                                        l_band->y0 = int_ceildivpow2(l_tilec->y0, l_level_no);                                                                                                                    \
+                                        l_band->x1 = int_ceildivpow2(l_tilec->x1, l_level_no);                                                                                                                    \
+                                        l_band->y1 = int_ceildivpow2(l_tilec->y1, l_level_no);                                                                                                                    \
+                                }                                                                                                                                                                                 \
+                                else {                                                                                                                                                                            \
+                                        l_band->bandno = bandno + 1;                                                                                                                                              \
+                                        /* x0b = 1 if bandno = 1 or 3 */                                                                                                                                          \
+                                        l_x0b = l_band->bandno&1;                                                                                                                                                 \
+                                        /* y0b = 1 if bandno = 2 or 3 */                                                                                                                                          \
+                                        l_y0b = (l_band->bandno)>>1;                                                                                                                                              \
+                                        /* l_band border (global) */                                                                                                                                              \
+                                        l_band->x0 = int_ceildivpow2(l_tilec->x0 - (1 << l_level_no) * l_x0b, l_level_no + 1);                                                                                    \
+                                        l_band->y0 = int_ceildivpow2(l_tilec->y0 - (1 << l_level_no) * l_y0b, l_level_no + 1);                                                                                    \
+                                        l_band->x1 = int_ceildivpow2(l_tilec->x1 - (1 << l_level_no) * l_x0b, l_level_no + 1);                                                                                    \
+                                        l_band->y1 = int_ceildivpow2(l_tilec->y1 - (1 << l_level_no) * l_y0b, l_level_no + 1);                                                                                    \
+                                }                                                                                                                                                                                 \
+                                                                                                                                                                                                                  \
+                                /** avoid an if with storing function pointer */                                                                                                                                  \
+                                l_gain = (*l_gain_ptr) (l_band->bandno);                                                                                                                                          \
+                                numbps = l_image_comp->prec + l_gain;                                                                                                                                             \
+                                l_band->stepsize = (OPJ_FLOAT32)(((1.0 + l_step_size->mant / 2048.0) * pow(2.0, (OPJ_INT32) (numbps - l_step_size->expn)))) * FRACTION;                                           \
+                                l_band->numbps = l_step_size->expn + l_tccp->numgbits - 1;      /* WHY -1 ? */                                                                                                    \
+                                                                                                                                                                                                                  \
+                                if (! l_band->precincts) {                                                                                                                                                        \
+                                        l_band->precincts = (opj_tcd_precinct_v2_t *) opj_malloc( /*3 * */ l_nb_precinct_size);                                                                                   \
+                                        if (! l_band->precincts) {                                                                                                                                                \
+                                                return OPJ_FALSE;                                                                                                                                                 \
+                                        }                                                                                                                                                                         \
+                                        /*fprintf(stderr, "\t\t\t\tAllocate precincts of a band (opj_tcd_precinct_v2_t): %d\n",l_nb_precinct_size);     */                                                        \
+                                        memset(l_band->precincts,0,l_nb_precinct_size);                                                                                                                           \
+                                        l_band->precincts_data_size = l_nb_precinct_size;                                                                                                                         \
+                                }                                                                                                                                                                                 \
+                                else if (l_band->precincts_data_size < l_nb_precinct_size) {                                                                                                                      \
+                                                                                                                                                                                                                  \
+                                        opj_tcd_precinct_v2_t * new_precincts = (opj_tcd_precinct_v2_t *) opj_realloc(l_band->precincts,/*3 * */ l_nb_precinct_size);                                             \
+                                        if (! new_precincts) {                                                                                                                                                    \
+                                                /* opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory to handle band precints\n");                                                                    */   \
+                                                fprintf(stderr, "Not enough memory to handle band precints\n");                                                                                                   \
+                                                opj_free(l_band->precincts);                                                                                                                                      \
+                                                l_band->precincts = NULL;                                                                                                                                         \
+                                                l_band->precincts_data_size = 0;                                                                                                                                  \
+                                                return OPJ_FALSE;                                                                                                                                                 \
+                                        }                                                                                                                                                                         \
+                                        l_band->precincts = new_precincts;                                                                                                                                        \
+                                        /*fprintf(stderr, "\t\t\t\tReallocate precincts of a band (opj_tcd_precinct_v2_t): from %d to %d\n",l_band->precincts_data_size, l_nb_precinct_size);*/                   \
+                                        memset(((OPJ_BYTE *) l_band->precincts) + l_band->precincts_data_size,0,l_nb_precinct_size - l_band->precincts_data_size);                                                \
+                                        l_band->precincts_data_size = l_nb_precinct_size;                                                                                                                         \
+                                }                                                                                                                                                                                 \
+                                                                                                                                                                                                                  \
+                                l_current_precinct = l_band->precincts;                                                                                                                                           \
+                                for     (precno = 0; precno < l_nb_precincts; ++precno) {                                                                                                                         \
+                                        OPJ_INT32 tlcblkxstart, tlcblkystart, brcblkxend, brcblkyend;                                                                                                             \
+                                        OPJ_INT32 cbgxstart = tlcbgxstart + (precno % l_res->pw) * (1 << cbgwidthexpn);                                                                                           \
+                                        OPJ_INT32 cbgystart = tlcbgystart + (precno / l_res->pw) * (1 << cbgheightexpn);                                                                                          \
+                                        OPJ_INT32 cbgxend = cbgxstart + (1 << cbgwidthexpn);                                                                                                                      \
+                                        OPJ_INT32 cbgyend = cbgystart + (1 << cbgheightexpn);                                                                                                                     \
+                                        /*fprintf(stderr, "\t precno=%d; bandno=%d, resno=%d; compno=%d\n", precno, bandno , resno, compno);*/                                                                    \
+                                        /*fprintf(stderr, "\t tlcbgxstart(=%d) + (precno(=%d) percent res->pw(=%d)) * (1 << cbgwidthexpn(=%d)) \n",tlcbgxstart,precno,l_res->pw,cbgwidthexpn);*/                  \
+                                                                                                                                                                                                                  \
+                                        /* precinct size (global) */                                                                                                                                              \
+                                        /*fprintf(stderr, "\t cbgxstart=%d, l_band->x0 = %d \n",cbgxstart, l_band->x0);*/                                                                                         \
+                                                                                                                                                                                                                  \
+                                        l_current_precinct->x0 = int_max(cbgxstart, l_band->x0);                                                                                                                  \
+                                        l_current_precinct->y0 = int_max(cbgystart, l_band->y0);                                                                                                                  \
+                                        l_current_precinct->x1 = int_min(cbgxend, l_band->x1);                                                                                                                    \
+                                        l_current_precinct->y1 = int_min(cbgyend, l_band->y1);                                                                                                                    \
+                                        /*fprintf(stderr, "\t prc_x0=%d; prc_y0=%d, prc_x1=%d; prc_y1=%d\n",l_current_precinct->x0, l_current_precinct->y0 ,l_current_precinct->x1, l_current_precinct->y1);*/    \
+                                                                                                                                                                                                                  \
+                                        tlcblkxstart = int_floordivpow2(l_current_precinct->x0, cblkwidthexpn) << cblkwidthexpn;                                                                                  \
+                                        /*fprintf(stderr, "\t tlcblkxstart =%d\n",tlcblkxstart );*/                                                                                                               \
+                                        tlcblkystart = int_floordivpow2(l_current_precinct->y0, cblkheightexpn) << cblkheightexpn;                                                                                \
+                                        /*fprintf(stderr, "\t tlcblkystart =%d\n",tlcblkystart );*/                                                                                                               \
+                                        brcblkxend = int_ceildivpow2(l_current_precinct->x1, cblkwidthexpn) << cblkwidthexpn;                                                                                     \
+                                        /*fprintf(stderr, "\t brcblkxend =%d\n",brcblkxend );*/                                                                                                                   \
+                                        brcblkyend = int_ceildivpow2(l_current_precinct->y1, cblkheightexpn) << cblkheightexpn;                                                                                   \
+                                        /*fprintf(stderr, "\t brcblkyend =%d\n",brcblkyend );*/                                                                                                                   \
+                                        l_current_precinct->cw = (brcblkxend - tlcblkxstart) >> cblkwidthexpn;                                                                                                    \
+                                        l_current_precinct->ch = (brcblkyend - tlcblkystart) >> cblkheightexpn;                                                                                                   \
+                                                                                                                                                                                                                  \
+                                        l_nb_code_blocks = l_current_precinct->cw * l_current_precinct->ch;                                                                                                       \
+                                        /*fprintf(stderr, "\t\t\t\t precinct_cw = %d x recinct_ch = %d\n",l_current_precinct->cw, l_current_precinct->ch);      */                                                \
+                                        l_nb_code_blocks_size = l_nb_code_blocks * sizeof(TYPE);                                                                                                                  \
+                                                                                                                                                                                                                  \
+                                        if (! l_current_precinct->cblks.ELEMENT) {                                                                                                                                \
+                                                l_current_precinct->cblks.ELEMENT = (TYPE*) opj_malloc(l_nb_code_blocks_size);                                                                                    \
+                                                if (! l_current_precinct->cblks.ELEMENT ) {                                                                                                                       \
+                                                        return OPJ_FALSE;                                                                                                                                         \
+                                                }                                                                                                                                                                 \
+                                                /*fprintf(stderr, "\t\t\t\tAllocate cblks of a precinct (opj_tcd_cblk_dec_v2_t): %d\n",l_nb_code_blocks_size);*/                                                  \
+                                                                                                                                                                                                                  \
+                                                memset(l_current_precinct->cblks.ELEMENT,0,l_nb_code_blocks_size);                                                                                                \
+                                                                                                                                                                                                                  \
+                                                l_current_precinct->block_size = l_nb_code_blocks_size;                                                                                                           \
+                                        }                                                                                                                                                                         \
+                                        else if (l_nb_code_blocks_size > l_current_precinct->block_size) {                                                                                                        \
+                                                TYPE *new_ELEMENT = (TYPE*) opj_realloc(l_current_precinct->cblks.ELEMENT, l_nb_code_blocks_size);                                                                \
+                                                if (! new_ELEMENT) {                                                                                                                                              \
+                                                        opj_free(l_current_precinct->cblks.ELEMENT);                                                                                                              \
+                                                        l_current_precinct->cblks.ELEMENT = NULL;                                                                                                                 \
+                                                        l_current_precinct->block_size = 0;                                                                                                                       \
+                                                        /* opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory for current precinct codeblock element\n");                                              */  \
+                                                        fprintf(stderr, "Not enough memory for current precinct codeblock element\n");                                                                            \
+                                                        return OPJ_FALSE;                                                                                                                                         \
+                                                }                                                                                                                                                                 \
+                                                l_current_precinct->cblks.ELEMENT = new_ELEMENT;                                                                                                                  \
+                                                /*fprintf(stderr, "\t\t\t\tReallocate cblks of a precinct (opj_tcd_cblk_dec_v2_t): from %d to %d\n",l_current_precinct->block_size, l_nb_code_blocks_size);     */\
+                                                                                                                                                                                                                  \
+                                                memset(((OPJ_BYTE *) l_current_precinct->cblks.ELEMENT) + l_current_precinct->block_size                                                                          \
+                                                                ,0                                                                                                                                                \
+                                                                ,l_nb_code_blocks_size - l_current_precinct->block_size);                                                                                         \
+                                                                                                                                                                                                                  \
+                                                l_current_precinct->block_size = l_nb_code_blocks_size;                                                                                                           \
+                                        }                                                                                                                                                                         \
+                                                                                                                                                                                                                  \
+                                        if (! l_current_precinct->incltree) {                                                                                                                                     \
+                                                l_current_precinct->incltree = tgt_create_v2(l_current_precinct->cw,                                                                                              \
+                                                                l_current_precinct->ch);                                                                                                                          \
+                                        }                                                                                                                                                                         \
+                                        else{                                                                                                                                                                     \
+                                                l_current_precinct->incltree = tgt_init(l_current_precinct->incltree,                                                                                             \
+                                                                l_current_precinct->cw,                                                                                                                           \
+                                                                l_current_precinct->ch);                                                                                                                          \
+                                        }                                                                                                                                                                         \
+                                                                                                                                                                                                                  \
+                                        if (! l_current_precinct->incltree)     {                                                                                                                                 \
+                                                fprintf(stderr, "WARNING: No incltree created.\n");                                                                                                               \
+                                                /*return OPJ_FALSE;*/                                                                                                                                             \
+                                        }                                                                                                                                                                         \
+                                                                                                                                                                                                                  \
+                                        if (! l_current_precinct->imsbtree) {                                                                                                                                     \
+                                                l_current_precinct->imsbtree = tgt_create_v2(                                                                                                                     \
+                                                                l_current_precinct->cw,                                                                                                                           \
+                                                                l_current_precinct->ch);                                                                                                                          \
+                                        }                                                                                                                                                                         \
+                                        else {                                                                                                                                                                    \
+                                                l_current_precinct->imsbtree = tgt_init(                                                                                                                          \
+                                                                l_current_precinct->imsbtree,                                                                                                                     \
+                                                                l_current_precinct->cw,                                                                                                                           \
+                                                                l_current_precinct->ch);                                                                                                                          \
+                                        }                                                                                                                                                                         \
+                                                                                                                                                                                                                  \
+                                        if (! l_current_precinct->imsbtree) {                                                                                                                                     \
+                                                fprintf(stderr, "WARNING: No imsbtree created.\n");                                                                                                               \
+                                                /*return OPJ_FALSE;*/                                                                                                                                             \
+                                        }                                                                                                                                                                         \
+                                                                                                                                                                                                                  \
+                                        l_code_block = l_current_precinct->cblks.ELEMENT;                                                                                                                         \
+                                                                                                                                                                                                                  \
+                                        for (cblkno = 0; cblkno < l_nb_code_blocks; ++cblkno) {                                                                                                                   \
+                                                OPJ_INT32 cblkxstart = tlcblkxstart + (cblkno % l_current_precinct->cw) * (1 << cblkwidthexpn);                                                                   \
+                                                OPJ_INT32 cblkystart = tlcblkystart + (cblkno / l_current_precinct->cw) * (1 << cblkheightexpn);                                                                  \
+                                                OPJ_INT32 cblkxend = cblkxstart + (1 << cblkwidthexpn);                                                                                                           \
+                                                OPJ_INT32 cblkyend = cblkystart + (1 << cblkheightexpn);                                                                                                          \
+                                                                                                                                                                                                                  \
+                                                /* code-block size (global) */                                                                                                                                    \
+                                                l_code_block->x0 = int_max(cblkxstart, l_current_precinct->x0);                                                                                                   \
+                                                l_code_block->y0 = int_max(cblkystart, l_current_precinct->y0);                                                                                                   \
+                                                l_code_block->x1 = int_min(cblkxend, l_current_precinct->x1);                                                                                                     \
+                                                l_code_block->y1 = int_min(cblkyend, l_current_precinct->y1);                                                                                                     \
+                                                                                                                                                                                                                  \
+                                                if (! FUNCTION_ELEMENT(l_code_block)) {                                                                                                                           \
+                                                        return OPJ_FALSE;                                                                                                                                         \
+                                                }                                                                                                                                                                 \
+                                                ++l_code_block;                                                                                                                                                   \
+                                        }                                                                                                                                                                         \
+                                        ++l_current_precinct;                                                                                                                                                     \
+                                } /* precno */                                                                                                                                                                    \
+                                ++l_band;                                                                                                                                                                         \
+                                ++l_step_size;                                                                                                                                                                    \
+                        } /* bandno */                                                                                                                                                                            \
+                        ++l_res;                                                                                                                                                                                  \
+                        --l_level_no;                                                                                                                                                                             \
+                } /* resno */                                                                                                                                                                                     \
+                ++l_tccp;                                                                                                                                                                                         \
+                ++l_tilec;                                                                                                                                                                                        \
+                ++l_image_comp;                                                                                                                                                                                   \
+        } /* compno */                                                                                                                                                                                            \
+        return OPJ_TRUE;                                                                                                                                                                                          \
+}                                                                                                                                                                                                                 \
+
+
+MACRO_TCD_ALLOCATE(opj_tcd_init_encode_tile, opj_tcd_cblk_enc_v2_t, 1.f, enc, opj_tcd_code_block_enc_allocate)
+MACRO_TCD_ALLOCATE(opj_tcd_init_decode_tile, opj_tcd_cblk_dec_v2_t, 0.5f, dec, opj_tcd_code_block_dec_allocate)
+
+#undef MACRO_TCD_ALLOCATE
 
-opj_bool tcd_init_v2(  opj_tcd_v2_t *p_tcd,
-                                          opj_image_t * p_image,
-                                          opj_cp_v2_t * p_cp )
+/**
+ * Allocates memory for an encoding code block.
+ */
+opj_bool opj_tcd_code_block_enc_allocate (opj_tcd_cblk_enc_v2_t * p_code_block)
 {
-       OPJ_UINT32 l_tile_comp_size;
+        if (! p_code_block->data) {
 
-       p_tcd->image = p_image;
-       p_tcd->cp = p_cp;
+                p_code_block->data = (OPJ_BYTE*) opj_malloc(8192+1);
+                if(! p_code_block->data) {
+                        return OPJ_FALSE;
+                }
 
-       p_tcd->tcd_image->tiles = (opj_tcd_tile_v2_t *) opj_malloc(sizeof(opj_tcd_tile_v2_t));
-       if (! p_tcd->tcd_image->tiles) {
-               return OPJ_FALSE;
-       }
-       memset(p_tcd->tcd_image->tiles,0, sizeof(opj_tcd_tile_v2_t));
+                p_code_block->data[0] = 0;
+                p_code_block->data+=1;
 
-       l_tile_comp_size = p_image->numcomps * sizeof(opj_tcd_tilecomp_v2_t);
-       p_tcd->tcd_image->tiles->comps = (opj_tcd_tilecomp_v2_t *) opj_malloc(l_tile_comp_size);
-       if (! p_tcd->tcd_image->tiles->comps ) {
-               return OPJ_FALSE;
-       }
-       memset( p_tcd->tcd_image->tiles->comps , 0 , l_tile_comp_size);
+                /* no memset since data */
+                p_code_block->layers = (opj_tcd_layer_t*) opj_malloc(100 * sizeof(opj_tcd_layer_t));
+                if (! p_code_block->layers) {
+                        return OPJ_FALSE;
+                }
 
-       p_tcd->tcd_image->tiles->numcomps = p_image->numcomps;
-       p_tcd->tp_pos = p_cp->m_specific_param.m_enc.m_tp_pos;
+                p_code_block->passes = (opj_tcd_pass_v2_t*) opj_malloc(100 * sizeof(opj_tcd_pass_v2_t));
+                if (! p_code_block->passes) {
+                        return OPJ_FALSE;
+                }
+        }
 
-       return OPJ_TRUE;
-}
+        memset(p_code_block->layers,0,100 * sizeof(opj_tcd_layer_t));
+        memset(p_code_block->passes,0,100 * sizeof(opj_tcd_pass_v2_t));
 
-/**
-Destroy a previously created TCD handle
-*/
-void tcd_destroy_v2(opj_tcd_v2_t *tcd) {
-       if (tcd) {
-               tcd_free_tile(tcd);
-
-               if (tcd->tcd_image) {
-                       opj_free(tcd->tcd_image);
-                       tcd->tcd_image = 00;
-               }
-               opj_free(tcd);
-       }
+        return OPJ_TRUE;
 }
 
-/* ----------------------------------------------------------------------- */
 /**
- * Initialize the tile coder and may reuse some meory.
- * @param      p_tcd           TCD handle.
- * @param      p_image         raw image.
- * @param      p_cp            coding parameters.
- * @param      p_tile_no       current tile index to encode.
- *
- * @return true if the encoding values could be set (false otherwise).
-*/
-#define MACRO_TCD_ALLOCATE(FUNCTION,TYPE,FRACTION,ELEMENT,FUNCTION_ELEMENT)            \
-opj_bool FUNCTION (    opj_tcd_v2_t *p_tcd,                                                                            \
-                                       OPJ_UINT32 p_tile_no                                                                            \
-                       )                                                                                                                                       \
-{                                                                                                                                                              \
-       OPJ_UINT32 (*l_gain_ptr)(OPJ_UINT32) = 00;                                                                      \
-       OPJ_UINT32 compno, resno, bandno, precno, cblkno;                                                       \
-       opj_tcp_v2_t * l_tcp = 00;                                                                                                      \
-       opj_cp_v2_t * l_cp = 00;                                                                                                        \
-       opj_tcd_tile_v2_t * l_tile = 00;                                                                                        \
-       opj_tccp_t *l_tccp = 00;                                                                                                        \
-       opj_tcd_tilecomp_v2_t *l_tilec = 00;                                                                            \
-       opj_image_comp_t * l_image_comp = 00;                                                                           \
-       opj_tcd_resolution_v2_t *l_res = 00;                                                                            \
-       opj_tcd_band_v2_t *l_band = 00;                                                                                         \
-       opj_stepsize_t * l_step_size = 00;                                                                                      \
-       opj_tcd_precinct_v2_t *l_current_precinct = 00;                                                         \
-       TYPE* l_code_block = 00;                                                                                                        \
-       opj_image_t *l_image = 00;                                                                                                      \
-       OPJ_UINT32 p,q;                                                                                                                         \
-       OPJ_UINT32 l_level_no;                                                                                                          \
-       OPJ_UINT32 l_pdx, l_pdy;                                                                                                        \
-       OPJ_UINT32 l_gain;                                                                                                                      \
-       OPJ_INT32 l_x0b, l_y0b;                                                                                                         \
-       /* extent of precincts , top left, bottom right**/                                                      \
-       OPJ_INT32 l_tl_prc_x_start, l_tl_prc_y_start, l_br_prc_x_end, l_br_prc_y_end;   \
-       /* number of precinct for a resolution */                                                                       \
-       OPJ_UINT32 l_nb_precincts;                                                                                                      \
-       /* room needed to store l_nb_precinct precinct for a resolution */                      \
-       OPJ_UINT32 l_nb_precinct_size;                                                                                          \
-       /* number of code blocks for a precinct*/                                                                       \
-       OPJ_UINT32 l_nb_code_blocks;                                                                                            \
-       /* room needed to store l_nb_code_blocks code blocks for a precinct*/           \
-       OPJ_UINT32 l_nb_code_blocks_size;                                                                                       \
-       /* size of data for a tile */                                                                                           \
-       OPJ_UINT32 l_data_size;                                                                                                         \
-                                                                                                                                                               \
-       l_cp = p_tcd->cp;                                                                                                                       \
-       l_tcp = &(l_cp->tcps[p_tile_no]);                                                                                       \
-       l_tile = p_tcd->tcd_image->tiles;                                                                                       \
-       l_tccp = l_tcp->tccps;                                                                                                          \
-       l_tilec = l_tile->comps;                                                                                                        \
-       l_image = p_tcd->image;                                                                                                         \
-       l_image_comp = p_tcd->image->comps;                                                                                     \
-                                                                                                                                                               \
-       p = p_tile_no % l_cp->tw;       /* tile coordinates */                                                  \
-       q = p_tile_no / l_cp->tw;                                                                                                       \
-       /*fprintf(stderr, "Tile coordinate = %d,%d\n", p, q);*/                                         \
-                                                                                                                                                               \
-       /* 4 borders of the tile rescale on the image if necessary */                           \
-       l_tile->x0 = int_max(l_cp->tx0 + p * l_cp->tdx, l_image->x0);                           \
-       l_tile->y0 = int_max(l_cp->ty0 + q * l_cp->tdy, l_image->y0);                           \
-       l_tile->x1 = int_min(l_cp->tx0 + (p + 1) * l_cp->tdx, l_image->x1);                     \
-       l_tile->y1 = int_min(l_cp->ty0 + (q + 1) * l_cp->tdy, l_image->y1);                     \
-       /*fprintf(stderr, "Tile border = %d,%d,%d,%d\n", l_tile->x0, l_tile->y0,l_tile->x1,l_tile->y1);*/\
-                                                                                                                                                               \
-       /*tile->numcomps = image->numcomps; */                                                                          \
-       for(compno = 0; compno < l_tile->numcomps; ++compno) {                                          \
-               /*fprintf(stderr, "compno = %d/%d\n", compno, l_tile->numcomps);*/              \
-                                                                                                                                                               \
-               /* border of each l_tile component (global) */                                                  \
-               l_tilec->x0 = int_ceildiv(l_tile->x0, l_image_comp->dx);                                \
-               l_tilec->y0 = int_ceildiv(l_tile->y0, l_image_comp->dy);                                \
-               l_tilec->x1 = int_ceildiv(l_tile->x1, l_image_comp->dx);                                \
-               l_tilec->y1 = int_ceildiv(l_tile->y1, l_image_comp->dy);                                \
-               /*fprintf(stderr, "\tTile compo border = %d,%d,%d,%d\n", l_tilec->x0, l_tilec->y0,l_tilec->x1,l_tilec->y1);*/\
-                                                                                                                                                               \
-               l_data_size = (l_tilec->x1 - l_tilec->x0)                                                               \
-                                       * (l_tilec->y1 - l_tilec->y0) * sizeof(OPJ_UINT32 );            \
-               l_tilec->numresolutions = l_tccp->numresolutions;                                               \
-               if (l_tccp->numresolutions < l_cp->m_specific_param.m_dec.m_reduce) {   \
-                       l_tilec->minimum_num_resolutions = 1;                                                           \
-               }                                                                                                                                               \
-               else {                                                                                                                                  \
-                       l_tilec->minimum_num_resolutions = l_tccp->numresolutions                       \
-                               - l_cp->m_specific_param.m_dec.m_reduce;                                                \
-               }                                                                                                                                               \
-                                                                                                                                                               \
-               if (l_tilec->data == 00) {                                                                                              \
-            l_tilec->data = (OPJ_INT32 *) opj_malloc(l_data_size);             \
-                       if (! l_tilec->data ) {                                                                                         \
-                               return OPJ_FALSE;                                                                                               \
-                       }                                                                                                                                       \
-            /*fprintf(stderr, "\tAllocate data of tilec (int): %d x OPJ_UINT32\n",l_data_size);*/      \
-                                                                                                                                                               \
-                       l_tilec->data_size = l_data_size;                                                                       \
-               }                                                                                                                                               \
-               else if (l_data_size > l_tilec->data_size) {                                                    \
-                       l_tilec->data = (OPJ_INT32 *) opj_realloc(l_tilec->data, l_data_size);  \
-                       if (! l_tilec->data) {                                                                                          \
-                               return OPJ_FALSE;                                                                                               \
-                       }                                                                                                                                       \
-                       /*fprintf(stderr, "\tReallocate data of tilec (int): from %d to %d x OPJ_UINT32\n", l_tilec->data_size, l_data_size);*/         \
-                       l_tilec->data_size = l_data_size;                                                                       \
-               }                                                                                                                                               \
-                                                                                                                                                       \
-               l_data_size = l_tilec->numresolutions * sizeof(opj_tcd_resolution_v2_t);        \
-                                                                                                                                                               \
-               if (l_tilec->resolutions == 00) {                                                                               \
-            l_tilec->resolutions = (opj_tcd_resolution_v2_t *) opj_malloc(l_data_size);        \
-                       if (! l_tilec->resolutions ) {                                                                          \
-                               return OPJ_FALSE;                                                                                               \
-                       }                                                                                                                                       \
-                       /*fprintf(stderr, "\tAllocate resolutions of tilec (opj_tcd_resolution_v2_t): %d\n",l_data_size);*/             \
-                       l_tilec->resolutions_size = l_data_size;                                                        \
-                       memset(l_tilec->resolutions,0,l_data_size);                                                     \
-               }                                                                                                                                               \
-               else if (l_data_size > l_tilec->resolutions_size) {                                             \
-                       l_tilec->resolutions = (opj_tcd_resolution_v2_t *) opj_realloc(l_tilec->resolutions, l_data_size);      \
-                       if (! l_tilec->resolutions) {                                                                           \
-                               return OPJ_FALSE;                                                                                               \
-                       }                                                                                                                                       \
-                       /*fprintf(stderr, "\tReallocate data of tilec (int): from %d to %d x OPJ_UINT32\n", l_tilec->resolutions_size, l_data_size);*/  \
-                       memset(((OPJ_BYTE*) l_tilec->resolutions)+l_tilec->resolutions_size,0,l_data_size - l_tilec->resolutions_size); \
-                       l_tilec->resolutions_size = l_data_size;                                                        \
-               }                                                                                                                                               \
-                                                                                                                                                               \
-               l_level_no = l_tilec->numresolutions - 1;                                                               \
-               l_res = l_tilec->resolutions;                                                                                   \
-               l_step_size = l_tccp->stepsizes;                                                                                \
-               if (l_tccp->qmfbid == 0) {                                                                                              \
-                       l_gain_ptr = &dwt_getgain_real_v2;                                                                      \
-               }                                                                                                                                               \
-               else {                                                                                                                                  \
-                       l_gain_ptr  = &dwt_getgain_v2;                                                                          \
-               }                                                                                                                                               \
-               /*fprintf(stderr, "\tlevel_no=%d\n",l_level_no);*/                                              \
-                                                                                                                                                               \
-               for(resno = 0; resno < l_tilec->numresolutions; ++resno) {                              \
-                       /*fprintf(stderr, "\t\tresno = %d/%d\n", resno, l_tilec->numresolutions);*/     \
-                       OPJ_INT32 tlcbgxstart, tlcbgystart, brcbgxend, brcbgyend;                       \
-                       OPJ_UINT32 cbgwidthexpn, cbgheightexpn;                                                         \
-                       OPJ_UINT32 cblkwidthexpn, cblkheightexpn;                                                       \
-                                                                                                                                                               \
-                       /* border for each resolution level (global) */                                         \
-                       l_res->x0 = int_ceildivpow2(l_tilec->x0, l_level_no);                           \
-                       l_res->y0 = int_ceildivpow2(l_tilec->y0, l_level_no);                           \
-                       l_res->x1 = int_ceildivpow2(l_tilec->x1, l_level_no);                           \
-                       l_res->y1 = int_ceildivpow2(l_tilec->y1, l_level_no);                           \
-                       /*fprintf(stderr, "\t\t\tres_x0= %d, res_y0 =%d, res_x1=%d, res_y1=%d\n", l_res->x0, l_res->y0, l_res->x1, l_res->y1);*/        \
-                       /* p. 35, table A-23, ISO/IEC FDIS154444-1 : 2000 (18 august 2000) */   \
-                       l_pdx = l_tccp->prcw[resno];                                                                            \
-                       l_pdy = l_tccp->prch[resno];                                                                            \
-                       /*fprintf(stderr, "\t\t\tpdx=%d, pdy=%d\n", l_pdx, l_pdy);*/            \
-                       /* p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000)  */          \
-                       l_tl_prc_x_start = int_floordivpow2(l_res->x0, l_pdx) << l_pdx;         \
-                       l_tl_prc_y_start = int_floordivpow2(l_res->y0, l_pdy) << l_pdy;         \
-                       l_br_prc_x_end = int_ceildivpow2(l_res->x1, l_pdx) << l_pdx;            \
-                       l_br_prc_y_end = int_ceildivpow2(l_res->y1, l_pdy) << l_pdy;            \
-                       /*fprintf(stderr, "\t\t\tprc_x_start=%d, prc_y_start=%d, br_prc_x_end=%d, br_prc_y_end=%d \n", l_tl_prc_x_start, l_tl_prc_y_start, l_br_prc_x_end ,l_br_prc_y_end );*/  \
-                                                                                                                                                               \
-                       l_res->pw = (l_res->x0 == l_res->x1) ? 0 : ((l_br_prc_x_end - l_tl_prc_x_start) >> l_pdx);      \
-                       l_res->ph = (l_res->y0 == l_res->y1) ? 0 : ((l_br_prc_y_end - l_tl_prc_y_start) >> l_pdy);      \
-                       /*fprintf(stderr, "\t\t\tres_pw=%d, res_ph=%d\n", l_res->pw, l_res->ph );*/     \
-                                                                                                                                                               \
-                       l_nb_precincts = l_res->pw * l_res->ph;                                                         \
-                       l_nb_precinct_size = l_nb_precincts * sizeof(opj_tcd_precinct_v2_t);    \
-                       if (resno == 0) {                                                                                                       \
-                               tlcbgxstart = l_tl_prc_x_start;                                                                 \
-                               tlcbgystart = l_tl_prc_y_start;                                                                 \
-                               brcbgxend = l_br_prc_x_end;                                                                             \
-                               brcbgyend = l_br_prc_y_end;                                                                             \
-                               cbgwidthexpn = l_pdx;                                                                                   \
-                               cbgheightexpn = l_pdy;                                                                                  \
-                               l_res->numbands = 1;                                                                                    \
-                       }                                                                                                                                       \
-                       else {                                                                                                                          \
-                               tlcbgxstart = int_ceildivpow2(l_tl_prc_x_start, 1);                             \
-                               tlcbgystart = int_ceildivpow2(l_tl_prc_y_start, 1);                             \
-                               brcbgxend = int_ceildivpow2(l_br_prc_x_end, 1);                                 \
-                               brcbgyend = int_ceildivpow2(l_br_prc_y_end, 1);                                 \
-                               cbgwidthexpn = l_pdx - 1;                                                                               \
-                               cbgheightexpn = l_pdy - 1;                                                                              \
-                               l_res->numbands = 3;                                                                                    \
-                       }                                                                                                                                       \
-                                                                                                                                                               \
-                       cblkwidthexpn = uint_min(l_tccp->cblkw, cbgwidthexpn);                          \
-                       cblkheightexpn = uint_min(l_tccp->cblkh, cbgheightexpn);                        \
-                       l_band = l_res->bands;                                                                                          \
-                                                                                                                                                               \
-                       for (bandno = 0; bandno < l_res->numbands; ++bandno) {                          \
-                               OPJ_INT32 numbps;\
-                               /*fprintf(stderr, "\t\t\tband_no=%d/%d\n", bandno, l_res->numbands );*/ \
-                                                                                                                                                               \
-                               if (resno == 0) {                                                                                               \
-                                       l_band->bandno = 0 ;                                                                            \
-                                       l_band->x0 = int_ceildivpow2(l_tilec->x0, l_level_no);          \
-                                       l_band->y0 = int_ceildivpow2(l_tilec->y0, l_level_no);          \
-                                       l_band->x1 = int_ceildivpow2(l_tilec->x1, l_level_no);          \
-                                       l_band->y1 = int_ceildivpow2(l_tilec->y1, l_level_no);          \
-                               }                                                                                                                               \
-                               else {                                                                                                                  \
-                                       l_band->bandno = bandno + 1;                                                            \
-                                       /* x0b = 1 if bandno = 1 or 3 */                                                        \
-                                       l_x0b = l_band->bandno&1;                                                                       \
-                                       /* y0b = 1 if bandno = 2 or 3 */                                                        \
-                                       l_y0b = (l_band->bandno)>>1;                                                            \
-                                       /* l_band border (global) */                                                            \
-                                       l_band->x0 = int_ceildivpow2(l_tilec->x0 - (1 << l_level_no) * l_x0b, l_level_no + 1);  \
-                                       l_band->y0 = int_ceildivpow2(l_tilec->y0 - (1 << l_level_no) * l_y0b, l_level_no + 1);  \
-                                       l_band->x1 = int_ceildivpow2(l_tilec->x1 - (1 << l_level_no) * l_x0b, l_level_no + 1);  \
-                                       l_band->y1 = int_ceildivpow2(l_tilec->y1 - (1 << l_level_no) * l_y0b, l_level_no + 1);  \
-                               }                                                                                                                               \
-                                                                                                                                                               \
-                               /** avoid an if with storing function pointer */                                \
-                               l_gain = (*l_gain_ptr) (l_band->bandno);                                                \
-                               numbps = l_image_comp->prec + l_gain;                                                   \
-                               l_band->stepsize = (OPJ_FLOAT32)(((1.0 + l_step_size->mant / 2048.0) * pow(2.0, (OPJ_INT32) (numbps - l_step_size->expn)))) * FRACTION;\
-                               l_band->numbps = l_step_size->expn + l_tccp->numgbits - 1;      /* WHY -1 ? */\
-                                                                                                                                                               \
-                               if (! l_band->precincts) {                                                                              \
-                                       l_band->precincts = (opj_tcd_precinct_v2_t *) opj_malloc( /*3 * */ l_nb_precinct_size);\
-                                       if (! l_band->precincts) {                                                                      \
-                                               return OPJ_FALSE;                                                                               \
-                                       }                                                                                                                       \
-                                       /*fprintf(stderr, "\t\t\t\tAllocate precincts of a band (opj_tcd_precinct_v2_t): %d\n",l_nb_precinct_size);     */      \
-                                       memset(l_band->precincts,0,l_nb_precinct_size);                         \
-                                       l_band->precincts_data_size = l_nb_precinct_size;                       \
-                               }                                                                                                                               \
-                               else if (l_band->precincts_data_size < l_nb_precinct_size) {    \
-                                                                                                                                                               \
-                                       l_band->precincts = (opj_tcd_precinct_v2_t *) opj_realloc(l_band->precincts,/*3 * */ l_nb_precinct_size);\
-                                       if (! l_band->precincts) {                                                                      \
-                                               return OPJ_FALSE;                                                                               \
-                                       }                                                                                                                       \
-                                       /*fprintf(stderr, "\t\t\t\tReallocate precincts of a band (opj_tcd_precinct_v2_t): from %d to %d\n",l_band->precincts_data_size, l_nb_precinct_size);*/\
-                                       memset(((OPJ_BYTE *) l_band->precincts) + l_band->precincts_data_size,0,l_nb_precinct_size - l_band->precincts_data_size);\
-                                       l_band->precincts_data_size = l_nb_precinct_size;                       \
-                               }                                                                                                                               \
-                                                                                                                                                               \
-                               l_current_precinct = l_band->precincts;                                                 \
-                               for     (precno = 0; precno < l_nb_precincts; ++precno) {                       \
-                                       OPJ_INT32 tlcblkxstart, tlcblkystart, brcblkxend, brcblkyend;   \
-                                       OPJ_INT32 cbgxstart = tlcbgxstart + (precno % l_res->pw) * (1 << cbgwidthexpn); \
-                                       OPJ_INT32 cbgystart = tlcbgystart + (precno / l_res->pw) * (1 << cbgheightexpn);        \
-                                       OPJ_INT32 cbgxend = cbgxstart + (1 << cbgwidthexpn);            \
-                                       OPJ_INT32 cbgyend = cbgystart + (1 << cbgheightexpn);           \
-                                       /*fprintf(stderr, "\t precno=%d; bandno=%d, resno=%d; compno=%d\n", precno, bandno , resno, compno);*/\
-                                       /*fprintf(stderr, "\t tlcbgxstart(=%d) + (precno(=%d) percent res->pw(=%d)) * (1 << cbgwidthexpn(=%d)) \n",tlcbgxstart,precno,l_res->pw,cbgwidthexpn);*/\
-                                                                                                                                                               \
-                                       /* precinct size (global) */                                                            \
-                                       /*fprintf(stderr, "\t cbgxstart=%d, l_band->x0 = %d \n",cbgxstart, l_band->x0);*/ \
-                                                                                                                                                               \
-                                       l_current_precinct->x0 = int_max(cbgxstart, l_band->x0);        \
-                                       l_current_precinct->y0 = int_max(cbgystart, l_band->y0);        \
-                                       l_current_precinct->x1 = int_min(cbgxend, l_band->x1);          \
-                                       l_current_precinct->y1 = int_min(cbgyend, l_band->y1);          \
-                                       /*fprintf(stderr, "\t prc_x0=%d; prc_y0=%d, prc_x1=%d; prc_y1=%d\n",l_current_precinct->x0, l_current_precinct->y0 ,l_current_precinct->x1, l_current_precinct->y1);*/ \
-                                                                                                                                                               \
-                                       tlcblkxstart = int_floordivpow2(l_current_precinct->x0, cblkwidthexpn) << cblkwidthexpn;        \
-                                       /*fprintf(stderr, "\t tlcblkxstart =%d\n",tlcblkxstart );*/ \
-                                       tlcblkystart = int_floordivpow2(l_current_precinct->y0, cblkheightexpn) << cblkheightexpn;      \
-                                       /*fprintf(stderr, "\t tlcblkystart =%d\n",tlcblkystart );*/ \
-                                       brcblkxend = int_ceildivpow2(l_current_precinct->x1, cblkwidthexpn) << cblkwidthexpn;   \
-                                       /*fprintf(stderr, "\t brcblkxend =%d\n",brcblkxend );*/         \
-                                       brcblkyend = int_ceildivpow2(l_current_precinct->y1, cblkheightexpn) << cblkheightexpn; \
-                                       /*fprintf(stderr, "\t brcblkyend =%d\n",brcblkyend );*/         \
-                                       l_current_precinct->cw = (brcblkxend - tlcblkxstart) >> cblkwidthexpn;  \
-                                       l_current_precinct->ch = (brcblkyend - tlcblkystart) >> cblkheightexpn; \
-                                                                                                                                                               \
-                                       l_nb_code_blocks = l_current_precinct->cw * l_current_precinct->ch;     \
-                                       /*fprintf(stderr, "\t\t\t\t precinct_cw = %d x recinct_ch = %d\n",l_current_precinct->cw, l_current_precinct->ch);      */      \
-                                       l_nb_code_blocks_size = l_nb_code_blocks * sizeof(TYPE);        \
-                                                                                                                                                               \
-                                       if (! l_current_precinct->cblks.ELEMENT) {                                      \
-                                               l_current_precinct->cblks.ELEMENT = (TYPE*) opj_malloc(l_nb_code_blocks_size);\
-                                               if (! l_current_precinct->cblks.ELEMENT ) {                             \
-                                                       return OPJ_FALSE;                                                                       \
-                                               }                                                                                                               \
-                                               /*fprintf(stderr, "\t\t\t\tAllocate cblks of a precinct (opj_tcd_cblk_dec_v2_t): %d\n",l_nb_code_blocks_size);*/                \
-                                                                                                                                                               \
-                                               memset(l_current_precinct->cblks.ELEMENT,0,l_nb_code_blocks_size);\
-                                                                                                                                                               \
-                                               l_current_precinct->block_size = l_nb_code_blocks_size; \
-                                       }                                                                                                                       \
-                                       else if (l_nb_code_blocks_size > l_current_precinct->block_size) {      \
-                                               l_current_precinct->cblks.ELEMENT = (TYPE*)                                                                     \
-                                                       opj_realloc(l_current_precinct->cblks.ELEMENT, l_nb_code_blocks_size);  \
-                                               if (! l_current_precinct->cblks.ELEMENT ) {                             \
-                                                       return OPJ_FALSE;                                                                       \
-                                               }                                                                                                               \
-                                               /*fprintf(stderr, "\t\t\t\tReallocate cblks of a precinct (opj_tcd_cblk_dec_v2_t): from %d to %d\n",l_current_precinct->block_size, l_nb_code_blocks_size);     */      \
-                                                                                                                                                               \
-                                               memset(((OPJ_BYTE *) l_current_precinct->cblks.ELEMENT) + l_current_precinct->block_size        \
-                                                                               ,0                                                                                                                                                      \
-                                                                               ,l_nb_code_blocks_size - l_current_precinct->block_size);                                       \
-                                                                                                                                                               \
-                                               l_current_precinct->block_size = l_nb_code_blocks_size; \
-                                       }                                                                                                                       \
-                                                                                                                                                               \
-                                       if (! l_current_precinct->incltree) {                                           \
-                        l_current_precinct->incltree = tgt_create_v2(l_current_precinct->cw,   \
-                                                                                                                                 l_current_precinct->ch);      \
-                                       }                                                                                                                       \
-                                       else{                                                                                                           \
-                                               l_current_precinct->incltree = tgt_init(l_current_precinct->incltree,   \
-                                                                                                                               l_current_precinct->cw,                 \
-                                                                                                                               l_current_precinct->ch);                \
-                                       }                                                                                                                       \
-                                                                                                                                                               \
-                                       if (! l_current_precinct->incltree)     {                                               \
-                                               fprintf(stderr, "WARNING: No incltree created.\n");\
-                                               /*return OPJ_FALSE;*/                                                                           \
-                                       }                                                                                                                       \
-                                                                                                                                                               \
-                                       if (! l_current_precinct->imsbtree) {                                           \
-                        l_current_precinct->imsbtree = tgt_create_v2(                          \
-                                                                                                               l_current_precinct->cw, \
-                                                                                                               l_current_precinct->ch);\
-                                       }                                                                                                                       \
-                                       else {                                                                                                          \
-                                               l_current_precinct->imsbtree = tgt_init(                                                        \
-                                                                                                                       l_current_precinct->imsbtree,   \
-                                                                                                                       l_current_precinct->cw,                 \
-                                                                                                                       l_current_precinct->ch);                \
-                                       }                                                                                                                       \
-                                                                                                                                                               \
-                                       if (! l_current_precinct->imsbtree) {                                           \
-                                               fprintf(stderr, "WARNING: No imsbtree created.\n");\
-                                               /*return OPJ_FALSE;*/                                                                           \
-                                       }                                                                                                                       \
-                                                                                                                                                               \
-                                       l_code_block = l_current_precinct->cblks.ELEMENT;                       \
-                                                                                                                                                               \
-                                       for (cblkno = 0; cblkno < l_nb_code_blocks; ++cblkno) {         \
-                                               OPJ_INT32 cblkxstart = tlcblkxstart + (cblkno % l_current_precinct->cw) * (1 << cblkwidthexpn);         \
-                                               OPJ_INT32 cblkystart = tlcblkystart + (cblkno / l_current_precinct->cw) * (1 << cblkheightexpn);        \
-                                               OPJ_INT32 cblkxend = cblkxstart + (1 << cblkwidthexpn); \
-                                               OPJ_INT32 cblkyend = cblkystart + (1 << cblkheightexpn);\
-                                                                                                                                                               \
-                                               /* code-block size (global) */                                                  \
-                                               l_code_block->x0 = int_max(cblkxstart, l_current_precinct->x0); \
-                                               l_code_block->y0 = int_max(cblkystart, l_current_precinct->y0); \
-                                               l_code_block->x1 = int_min(cblkxend, l_current_precinct->x1);   \
-                                               l_code_block->y1 = int_min(cblkyend, l_current_precinct->y1);   \
-                                                                                                                                                               \
-                                               if (! FUNCTION_ELEMENT(l_code_block)) {                                 \
-                                                       return OPJ_FALSE;                                                                       \
-                                               }                                                                                                               \
-                                               ++l_code_block;                                                                                 \
-                                       }                                                                                                                       \
-                                       ++l_current_precinct;                                                                           \
-                               } /* precno */                                                                                                  \
-                               ++l_band;                                                                                                               \
-                               ++l_step_size;                                                                                                  \
-                       } /* bandno */                                                                                                          \
-                       ++l_res;                                                                                                                        \
-                       --l_level_no;                                                                                                           \
-               } /* resno */                                                                                                                   \
-               ++l_tccp;                                                                                                                               \
-               ++l_tilec;                                                                                                                              \
-               ++l_image_comp;                                                                                                                 \
-       } /* compno */                                                                                                                          \
-       return OPJ_TRUE;                                                                                                                        \
-}                                                                                                                                                              \
-
-
-/* V2 ENCODE MACRO_TCD_ALLOCATE(tcd_init_encode_tile,opj_tcd_cblk_enc_t,1.f,enc,tcd_code_block_enc_allocate) */
-MACRO_TCD_ALLOCATE(tcd_init_decode_tile, opj_tcd_cblk_dec_v2_t, 0.5f, dec, tcd_code_block_dec_allocate)
-
-#undef MACRO_TCD_ALLOCATE
-
+ * Allocates memory for a decoding code block.
+ */
+opj_bool opj_tcd_code_block_dec_allocate (opj_tcd_cblk_dec_v2_t * p_code_block)
+{
+        OPJ_UINT32 l_seg_size;
+
+        if (! p_code_block->data) {
+
+                p_code_block->data = (OPJ_BYTE*) opj_malloc(8192);
+                if (! p_code_block->data) {
+                        return OPJ_FALSE;
+                }
+                /*fprintf(stderr, "Allocate 8192 elements of code_block->data\n");*/
+
+                l_seg_size = J2K_DEFAULT_NB_SEGS * sizeof(opj_tcd_seg_t);
+                p_code_block->segs = (opj_tcd_seg_t *) opj_malloc(l_seg_size);
+                if (! p_code_block->segs) {
+                        return OPJ_FALSE;
+                }
+                memset(p_code_block->segs,0,l_seg_size);
+                /*fprintf(stderr, "Allocate %d elements of code_block->data\n", J2K_DEFAULT_NB_SEGS * sizeof(opj_tcd_seg_t));*/
+
+                p_code_block->m_current_max_segs = J2K_DEFAULT_NB_SEGS;
+                /*fprintf(stderr, "m_current_max_segs of code_block->data = %d\n", p_code_block->m_current_max_segs);*/
+        }
+        /* TODO */
+        /*p_code_block->numsegs = 0; */
+
+        return OPJ_TRUE;
+}
 
-OPJ_UINT32 tcd_get_decoded_tile_size ( opj_tcd_v2_t *p_tcd )
+OPJ_UINT32 opj_tcd_get_decoded_tile_size ( opj_tcd_v2_t *p_tcd )
 {
-       OPJ_UINT32 i;
-       OPJ_UINT32 l_data_size = 0;
-       opj_image_comp_t * l_img_comp = 00;
-       opj_tcd_tilecomp_v2_t * l_tile_comp = 00;
-       opj_tcd_resolution_v2_t * l_res = 00;
-       OPJ_UINT32 l_size_comp, l_remaining;
-
-       l_tile_comp = p_tcd->tcd_image->tiles->comps;
-       l_img_comp = p_tcd->image->comps;
-
-       for (i=0;i<p_tcd->image->numcomps;++i) {
-               l_size_comp = l_img_comp->prec >> 3; /*(/ 8)*/
-               l_remaining = l_img_comp->prec & 7;  /* (%8) */
-
-               if(l_remaining) {
-                       ++l_size_comp;
-               }
-
-               if (l_size_comp == 3) {
-                       l_size_comp = 4;
-               }
-
-               l_res = l_tile_comp->resolutions + l_tile_comp->minimum_num_resolutions - 1;
-               l_data_size += l_size_comp * (l_res->x1 - l_res->x0) * (l_res->y1 - l_res->y0);
-               ++l_img_comp;
-               ++l_tile_comp;
-       }
-
-       return l_data_size;
+        OPJ_UINT32 i;
+        OPJ_UINT32 l_data_size = 0;
+        opj_image_comp_t * l_img_comp = 00;
+        opj_tcd_tilecomp_v2_t * l_tile_comp = 00;
+        opj_tcd_resolution_v2_t * l_res = 00;
+        OPJ_UINT32 l_size_comp, l_remaining;
+
+        l_tile_comp = p_tcd->tcd_image->tiles->comps;
+        l_img_comp = p_tcd->image->comps;
+
+        for (i=0;i<p_tcd->image->numcomps;++i) {
+                l_size_comp = l_img_comp->prec >> 3; /*(/ 8)*/
+                l_remaining = l_img_comp->prec & 7;  /* (%8) */
+
+                if(l_remaining) {
+                        ++l_size_comp;
+                }
+
+                if (l_size_comp == 3) {
+                        l_size_comp = 4;
+                }
+
+                l_res = l_tile_comp->resolutions + l_tile_comp->minimum_num_resolutions - 1;
+                l_data_size += l_size_comp * (l_res->x1 - l_res->x0) * (l_res->y1 - l_res->y0);
+                ++l_img_comp;
+                ++l_tile_comp;
+        }
+
+        return l_data_size;
 }
 
+opj_bool opj_tcd_encode_tile(   opj_tcd_v2_t *p_tcd,
+                                                        OPJ_UINT32 p_tile_no,
+                                                        OPJ_BYTE *p_dest,
+                                                        OPJ_UINT32 * p_data_written,
+                                                        OPJ_UINT32 p_max_length,
+                                                        opj_codestream_info_t *p_cstr_info)
+{
+
+        if (p_tcd->cur_tp_num == 0) {
+
+                p_tcd->tcd_tileno = p_tile_no;
+                p_tcd->tcp = &p_tcd->cp->tcps[p_tile_no];
+
+                /* INDEX >> "Precinct_nb_X et Precinct_nb_Y" */
+                if(p_cstr_info)  {
+                        OPJ_UINT32 l_num_packs = 0;
+                        OPJ_UINT32 i;
+                        opj_tcd_tilecomp_v2_t *l_tilec_idx = &p_tcd->tcd_image->tiles->comps[0];        /* based on component 0 */
+                        opj_tccp_t *l_tccp = p_tcd->tcp->tccps; /* based on component 0 */
+
+                        for (i = 0; i < l_tilec_idx->numresolutions; i++) {
+                                opj_tcd_resolution_v2_t *l_res_idx = &l_tilec_idx->resolutions[i];
+
+                                p_cstr_info->tile[p_tile_no].pw[i] = l_res_idx->pw;
+                                p_cstr_info->tile[p_tile_no].ph[i] = l_res_idx->ph;
+
+                                l_num_packs += l_res_idx->pw * l_res_idx->ph;
+                                p_cstr_info->tile[p_tile_no].pdx[i] = l_tccp->prcw[i];
+                                p_cstr_info->tile[p_tile_no].pdy[i] = l_tccp->prch[i];
+                        }
+                        p_cstr_info->tile[p_tile_no].packet = (opj_packet_info_t*) opj_calloc(p_cstr_info->numcomps * p_cstr_info->numlayers * l_num_packs, sizeof(opj_packet_info_t));
+                }
+                /* << INDEX */
+
+                /* FIXME _ProfStart(PGROUP_DC_SHIFT); */
+                /*---------------TILE-------------------*/
+                if (! opj_tcd_dc_level_shift_encode(p_tcd)) {
+                        return OPJ_FALSE;
+                }
+                /* FIXME _ProfStop(PGROUP_DC_SHIFT); */
+
+                /* FIXME _ProfStart(PGROUP_MCT); */
+                if (! opj_tcd_mct_encode(p_tcd)) {
+                        return OPJ_FALSE;
+                }
+                /* FIXME _ProfStop(PGROUP_MCT); */
+
+                /* FIXME _ProfStart(PGROUP_DWT); */
+                if (! opj_tcd_dwt_encode(p_tcd)) {
+                        return OPJ_FALSE;
+                }
+                /* FIXME  _ProfStop(PGROUP_DWT); */
+
+                /* FIXME  _ProfStart(PGROUP_T1); */
+                if (! opj_tcd_t1_encode(p_tcd)) {
+                        return OPJ_FALSE;
+                }
+                /* FIXME _ProfStop(PGROUP_T1); */
+
+                /* FIXME _ProfStart(PGROUP_RATE); */
+                if (! opj_tcd_rate_allocate_encode(p_tcd,p_dest,p_max_length,p_cstr_info)) {
+                        return OPJ_FALSE;
+                }
+                /* FIXME _ProfStop(PGROUP_RATE); */
+
+        }
+        /*--------------TIER2------------------*/
+
+        /* INDEX */
+        if (p_cstr_info) {
+                p_cstr_info->index_write = 1;
+        }
+        /* FIXME _ProfStart(PGROUP_T2); */
+
+        if (! opj_tcd_t2_encode(p_tcd,p_dest,p_data_written,p_max_length,p_cstr_info)) {
+                return OPJ_FALSE;
+        }
+        /* FIXME _ProfStop(PGROUP_T2); */
+
+        /*---------------CLEAN-------------------*/
+
+        return OPJ_TRUE;
+}
 
-opj_bool tcd_decode_tile_v2(
-                                        opj_tcd_v2_t *p_tcd,
-                                        OPJ_BYTE *p_src,
-                                        OPJ_UINT32 p_max_length,
-                                        OPJ_UINT32 p_tile_no,
-                                        opj_codestream_index_t *p_cstr_index)
+opj_bool opj_tcd_decode_tile(   opj_tcd_v2_t *p_tcd,
+                                OPJ_BYTE *p_src,
+                                OPJ_UINT32 p_max_length,
+                                OPJ_UINT32 p_tile_no,
+                                opj_codestream_index_t *p_cstr_index
+                                )
 {
-       OPJ_UINT32 l_data_read;
-       p_tcd->tcd_tileno = p_tile_no;
-       p_tcd->tcp = &(p_tcd->cp->tcps[p_tile_no]);
+        OPJ_UINT32 l_data_read;
+        p_tcd->tcd_tileno = p_tile_no;
+        p_tcd->tcp = &(p_tcd->cp->tcps[p_tile_no]);
 
 #ifdef TODO_MSD /* FIXME */
-       /* INDEX >>  */
-       if(p_cstr_info) {
-               OPJ_UINT32 resno, compno, numprec = 0;
-               for (compno = 0; compno < (OPJ_UINT32) p_cstr_info->numcomps; compno++) {
-                       opj_tcp_v2_t *tcp = &p_tcd->cp->tcps[0];
-                       opj_tccp_t *tccp = &tcp->tccps[compno];
-                       opj_tcd_tilecomp_v2_t *tilec_idx = &p_tcd->tcd_image->tiles->comps[compno];
-                       for (resno = 0; resno < tilec_idx->numresolutions; resno++) {
-                               opj_tcd_resolution_v2_t *res_idx = &tilec_idx->resolutions[resno];
-                               p_cstr_info->tile[p_tile_no].pw[resno] = res_idx->pw;
-                               p_cstr_info->tile[p_tile_no].ph[resno] = res_idx->ph;
-                               numprec += res_idx->pw * res_idx->ph;
-                               p_cstr_info->tile[p_tile_no].pdx[resno] = tccp->prcw[resno];
-                               p_cstr_info->tile[p_tile_no].pdy[resno] = tccp->prch[resno];
-                       }
-               }
-               p_cstr_info->tile[p_tile_no].packet = (opj_packet_info_t *) opj_malloc(p_cstr_info->numlayers * numprec * sizeof(opj_packet_info_t));
-               p_cstr_info->packno = 0;
-       }
-       /* << INDEX */
+        /* INDEX >>  */
+        if(p_cstr_info) {
+                OPJ_UINT32 resno, compno, numprec = 0;
+                for (compno = 0; compno < (OPJ_UINT32) p_cstr_info->numcomps; compno++) {
+                        opj_tcp_v2_t *tcp = &p_tcd->cp->tcps[0];
+                        opj_tccp_t *tccp = &tcp->tccps[compno];
+                        opj_tcd_tilecomp_v2_t *tilec_idx = &p_tcd->tcd_image->tiles->comps[compno];
+                        for (resno = 0; resno < tilec_idx->numresolutions; resno++) {
+                                opj_tcd_resolution_v2_t *res_idx = &tilec_idx->resolutions[resno];
+                                p_cstr_info->tile[p_tile_no].pw[resno] = res_idx->pw;
+                                p_cstr_info->tile[p_tile_no].ph[resno] = res_idx->ph;
+                                numprec += res_idx->pw * res_idx->ph;
+                                p_cstr_info->tile[p_tile_no].pdx[resno] = tccp->prcw[resno];
+                                p_cstr_info->tile[p_tile_no].pdy[resno] = tccp->prch[resno];
+                        }
+                }
+                p_cstr_info->tile[p_tile_no].packet = (opj_packet_info_t *) opj_malloc(p_cstr_info->numlayers * numprec * sizeof(opj_packet_info_t));
+                p_cstr_info->packno = 0;
+        }
+        /* << INDEX */
 #endif
 
-       /*--------------TIER2------------------*/
-       /* FIXME _ProfStart(PGROUP_T2); */
-       l_data_read = 0;
-       if
-               (! tcd_t2_decode(p_tcd, p_src, &l_data_read, p_max_length, p_cstr_index))
-       {
-               return OPJ_FALSE;
-       }
-       /* FIXME _ProfStop(PGROUP_T2); */
-
-       /*------------------TIER1-----------------*/
-
-       /* FIXME _ProfStart(PGROUP_T1); */
-       if
-               (! tcd_t1_decode(p_tcd))
-       {
-               return OPJ_FALSE;
-       }
-       /* FIXME _ProfStop(PGROUP_T1); */
-
-       /*----------------DWT---------------------*/
-
-       /* FIXME _ProfStart(PGROUP_DWT); */
-       if
-               (! tcd_dwt_decode(p_tcd))
-       {
-               return OPJ_FALSE;
-       }
-       /* FIXME _ProfStop(PGROUP_DWT); */
-
-       /*----------------MCT-------------------*/
-       /* FIXME _ProfStart(PGROUP_MCT); */
-       if
-               (! tcd_mct_decode(p_tcd))
-       {
-               return OPJ_FALSE;
-       }
-       /* FIXME _ProfStop(PGROUP_MCT); */
-
-       /* FIXME _ProfStart(PGROUP_DC_SHIFT); */
-       if
-               (! tcd_dc_level_shift_decode(p_tcd))
-       {
-               return OPJ_FALSE;
-       }
-       /* FIXME _ProfStop(PGROUP_DC_SHIFT); */
-
-
-       /*---------------TILE-------------------*/
-       return OPJ_TRUE;
+        /*--------------TIER2------------------*/
+        /* FIXME _ProfStart(PGROUP_T2); */
+        l_data_read = 0;
+        if
+                (! opj_tcd_t2_decode(p_tcd, p_src, &l_data_read, p_max_length, p_cstr_index))
+        {
+                return OPJ_FALSE;
+        }
+        /* FIXME _ProfStop(PGROUP_T2); */
+
+        /*------------------TIER1-----------------*/
+
+        /* FIXME _ProfStart(PGROUP_T1); */
+        if
+                (! opj_tcd_t1_decode(p_tcd))
+        {
+                return OPJ_FALSE;
+        }
+        /* FIXME _ProfStop(PGROUP_T1); */
+
+        /*----------------DWT---------------------*/
+
+        /* FIXME _ProfStart(PGROUP_DWT); */
+        if
+                (! opj_tcd_dwt_decode(p_tcd))
+        {
+                return OPJ_FALSE;
+        }
+        /* FIXME _ProfStop(PGROUP_DWT); */
+
+        /*----------------MCT-------------------*/
+        /* FIXME _ProfStart(PGROUP_MCT); */
+        if
+                (! opj_tcd_mct_decode(p_tcd))
+        {
+                return OPJ_FALSE;
+        }
+        /* FIXME _ProfStop(PGROUP_MCT); */
+
+        /* FIXME _ProfStart(PGROUP_DC_SHIFT); */
+        if
+                (! opj_tcd_dc_level_shift_decode(p_tcd))
+        {
+                return OPJ_FALSE;
+        }
+        /* FIXME _ProfStop(PGROUP_DC_SHIFT); */
+
+
+        /*---------------TILE-------------------*/
+        return OPJ_TRUE;
 }
 
-opj_bool tcd_update_tile_data (
-                                                opj_tcd_v2_t *p_tcd,
-                                                OPJ_BYTE * p_dest,
-                                                OPJ_UINT32 p_dest_length
-                                                )
+opj_bool opj_tcd_update_tile_data ( opj_tcd_v2_t *p_tcd,
+                                    OPJ_BYTE * p_dest,
+                                    OPJ_UINT32 p_dest_length
+                                    )
 {
-       OPJ_UINT32 i,j,k,l_data_size = 0;
-       opj_image_comp_t * l_img_comp = 00;
-       opj_tcd_tilecomp_v2_t * l_tilec = 00;
-       opj_tcd_resolution_v2_t * l_res;
-       OPJ_UINT32 l_size_comp, l_remaining;
-       OPJ_UINT32 l_stride, l_width,l_height;
-
-       l_data_size = tcd_get_decoded_tile_size(p_tcd);
-       if (l_data_size > p_dest_length) {
-               return OPJ_FALSE;
-       }
-
-       l_tilec = p_tcd->tcd_image->tiles->comps;
-       l_img_comp = p_tcd->image->comps;
-
-       for (i=0;i<p_tcd->image->numcomps;++i) {
-               l_size_comp = l_img_comp->prec >> 3; /*(/ 8)*/
-               l_remaining = l_img_comp->prec & 7;  /* (%8) */
-               l_res = l_tilec->resolutions + l_img_comp->resno_decoded;
-               l_width = (l_res->x1 - l_res->x0);
-               l_height = (l_res->y1 - l_res->y0);
-               l_stride = (l_tilec->x1 - l_tilec->x0) - l_width;
-
-               if (l_remaining) {
-                       ++l_size_comp;
-               }
-
-               if (l_size_comp == 3) {
-                       l_size_comp = 4;
-               }
-
-               switch (l_size_comp)
-                       {
-                       case 1:
-                               {
-                                       OPJ_CHAR * l_dest_ptr = (OPJ_CHAR *) p_dest;
-                                       const OPJ_INT32 * l_src_ptr = l_tilec->data;
-
-                                       if (l_img_comp->sgnd) {
-                                               for (j=0;j<l_height;++j) {
-                                                       for (k=0;k<l_width;++k) {
-                                                               *(l_dest_ptr++) = (OPJ_CHAR) (*(l_src_ptr++));
-                                                       }
-                                                       l_src_ptr += l_stride;
-                                               }
-                                       }
-                                       else {
-                                               for (j=0;j<l_height;++j) {
-                                                       for     (k=0;k<l_width;++k) {
-                                                               *(l_dest_ptr++) = (OPJ_BYTE) ((*(l_src_ptr++))&0xff);
-                                                       }
-                                                       l_src_ptr += l_stride;
-                                               }
-                                       }
-
-                                       p_dest = (OPJ_BYTE *)l_dest_ptr;
-                               }
-                               break;
-                       case 2:
-                               {
-                                       const OPJ_INT32 * l_src_ptr = l_tilec->data;
-                                       OPJ_INT16 * l_dest_ptr = (OPJ_INT16 *) p_dest;
-
-                                       if (l_img_comp->sgnd) {
-                                               for (j=0;j<l_height;++j) {
-                                                       for (k=0;k<l_width;++k) {
-                                                               *(l_dest_ptr++) = (OPJ_INT16) (*(l_src_ptr++));
-                                                       }
-                                                       l_src_ptr += l_stride;
-                                               }
-                                       }
-                                       else {
-                                               for (j=0;j<l_height;++j) {
-                                                       for (k=0;k<l_width;++k) {
-                                                               *(l_dest_ptr++) = (OPJ_UINT16) ((*(l_src_ptr++))&0xffff);
-                                                       }
-                                                       l_src_ptr += l_stride;
-                                               }
-                                       }
-
-                                       p_dest = (OPJ_BYTE*) l_dest_ptr;
-                               }
-                               break;
-                       case 4:
-                               {
-                                       OPJ_INT32 * l_dest_ptr = (OPJ_INT32 *) p_dest;
-                                       OPJ_INT32 * l_src_ptr = l_tilec->data;
-
-                                       for (j=0;j<l_height;++j) {
-                                               for (k=0;k<l_width;++k) {
-                                                       *(l_dest_ptr++) = (*(l_src_ptr++));
-                                               }
-                                               l_src_ptr += l_stride;
-                                       }
-
-                                       p_dest = (OPJ_BYTE*) l_dest_ptr;
-                               }
-                               break;
-               }
-
-               ++l_img_comp;
-               ++l_tilec;
-       }
-
-       return OPJ_TRUE;
+        OPJ_UINT32 i,j,k,l_data_size = 0;
+        opj_image_comp_t * l_img_comp = 00;
+        opj_tcd_tilecomp_v2_t * l_tilec = 00;
+        opj_tcd_resolution_v2_t * l_res;
+        OPJ_UINT32 l_size_comp, l_remaining;
+        OPJ_UINT32 l_stride, l_width,l_height;
+
+        l_data_size = opj_tcd_get_decoded_tile_size(p_tcd);
+        if (l_data_size > p_dest_length) {
+                return OPJ_FALSE;
+        }
+
+        l_tilec = p_tcd->tcd_image->tiles->comps;
+        l_img_comp = p_tcd->image->comps;
+
+        for (i=0;i<p_tcd->image->numcomps;++i) {
+                l_size_comp = l_img_comp->prec >> 3; /*(/ 8)*/
+                l_remaining = l_img_comp->prec & 7;  /* (%8) */
+                l_res = l_tilec->resolutions + l_img_comp->resno_decoded;
+                l_width = (l_res->x1 - l_res->x0);
+                l_height = (l_res->y1 - l_res->y0);
+                l_stride = (l_tilec->x1 - l_tilec->x0) - l_width;
+
+                if (l_remaining) {
+                        ++l_size_comp;
+                }
+
+                if (l_size_comp == 3) {
+                        l_size_comp = 4;
+                }
+
+                switch (l_size_comp)
+                        {
+                        case 1:
+                                {
+                                        OPJ_CHAR * l_dest_ptr = (OPJ_CHAR *) p_dest;
+                                        const OPJ_INT32 * l_src_ptr = l_tilec->data;
+
+                                        if (l_img_comp->sgnd) {
+                                                for (j=0;j<l_height;++j) {
+                                                        for (k=0;k<l_width;++k) {
+                                                                *(l_dest_ptr++) = (OPJ_CHAR) (*(l_src_ptr++));
+                                                        }
+                                                        l_src_ptr += l_stride;
+                                                }
+                                        }
+                                        else {
+                                                for (j=0;j<l_height;++j) {
+                                                        for     (k=0;k<l_width;++k) {
+                                                                *(l_dest_ptr++) = (OPJ_BYTE) ((*(l_src_ptr++))&0xff);
+                                                        }
+                                                        l_src_ptr += l_stride;
+                                                }
+                                        }
+
+                                        p_dest = (OPJ_BYTE *)l_dest_ptr;
+                                }
+                                break;
+                        case 2:
+                                {
+                                        const OPJ_INT32 * l_src_ptr = l_tilec->data;
+                                        OPJ_INT16 * l_dest_ptr = (OPJ_INT16 *) p_dest;
+
+                                        if (l_img_comp->sgnd) {
+                                                for (j=0;j<l_height;++j) {
+                                                        for (k=0;k<l_width;++k) {
+                                                                *(l_dest_ptr++) = (OPJ_INT16) (*(l_src_ptr++));
+                                                        }
+                                                        l_src_ptr += l_stride;
+                                                }
+                                        }
+                                        else {
+                                                for (j=0;j<l_height;++j) {
+                                                        for (k=0;k<l_width;++k) {
+                                                                *(l_dest_ptr++) = (OPJ_UINT16) ((*(l_src_ptr++))&0xffff);
+                                                        }
+                                                        l_src_ptr += l_stride;
+                                                }
+                                        }
+
+                                        p_dest = (OPJ_BYTE*) l_dest_ptr;
+                                }
+                                break;
+                        case 4:
+                                {
+                                        OPJ_INT32 * l_dest_ptr = (OPJ_INT32 *) p_dest;
+                                        OPJ_INT32 * l_src_ptr = l_tilec->data;
+
+                                        for (j=0;j<l_height;++j) {
+                                                for (k=0;k<l_width;++k) {
+                                                        *(l_dest_ptr++) = (*(l_src_ptr++));
+                                                }
+                                                l_src_ptr += l_stride;
+                                        }
+
+                                        p_dest = (OPJ_BYTE*) l_dest_ptr;
+                                }
+                                break;
+                }
+
+                ++l_img_comp;
+                ++l_tilec;
+        }
+
+        return OPJ_TRUE;
 }
 
 
 
 
-void tcd_free_tile(opj_tcd_v2_t *p_tcd)
+void opj_tcd_free_tile(opj_tcd_v2_t *p_tcd)
 {
-       OPJ_UINT32 compno, resno, bandno, precno;
-       opj_tcd_tile_v2_t *l_tile = 00;
-       opj_tcd_tilecomp_v2_t *l_tile_comp = 00;
-       opj_tcd_resolution_v2_t *l_res = 00;
-       opj_tcd_band_v2_t *l_band = 00;
-       opj_tcd_precinct_v2_t *l_precinct = 00;
-       OPJ_UINT32 l_nb_resolutions, l_nb_precincts;
-       void (* l_tcd_code_block_deallocate) (opj_tcd_precinct_v2_t *) = 00;
-
-       if (! p_tcd) {
-               return;
-       }
-
-       if (! p_tcd->tcd_image) {
-               return;
-       }
-
-       if (p_tcd->m_is_decoder) {
-               l_tcd_code_block_deallocate = tcd_code_block_dec_deallocate;
-       }
-       else {
-               /* FIXME l_tcd_code_block_deallocate = tcd_code_block_enc_deallocate; */
-       }
-
-       l_tile = p_tcd->tcd_image->tiles;
-       if (! l_tile) {
-               return;
-       }
-
-       l_tile_comp = l_tile->comps;
-
-       for (compno = 0; compno < l_tile->numcomps; ++compno) {
-               l_res = l_tile_comp->resolutions;
-               if (l_res) {
-
-                       l_nb_resolutions = l_tile_comp->resolutions_size / sizeof(opj_tcd_resolution_v2_t);
-                       for (resno = 0; resno < l_nb_resolutions; ++resno) {
-                               l_band = l_res->bands;
-                               for     (bandno = 0; bandno < 3; ++bandno) {
-                                       l_precinct = l_band->precincts;
-                                       if (l_precinct) {
-
-                                               l_nb_precincts = l_band->precincts_data_size / sizeof(opj_tcd_precinct_v2_t);
-                                               for (precno = 0; precno < l_nb_precincts; ++precno) {
-                                                       tgt_destroy(l_precinct->incltree);
-                                                       l_precinct->incltree = 00;
-                                                       tgt_destroy(l_precinct->imsbtree);
-                                                       l_precinct->imsbtree = 00;
-                                                       (*l_tcd_code_block_deallocate) (l_precinct);
-                                                       ++l_precinct;
-                                               }
-
-                                               opj_free(l_band->precincts);
-                                               l_band->precincts = 00;
-                                       }
-                                       ++l_band;
-                               } /* for (resno */
-                               ++l_res;
-                       }
-
-                       opj_free(l_tile_comp->resolutions);
-                       l_tile_comp->resolutions = 00;
-               }
-
-               if (l_tile_comp->data) {
-                       opj_free(l_tile_comp->data);
-                       l_tile_comp->data = 00;
-               }
-               ++l_tile_comp;
-       }
-
-       opj_free(l_tile->comps);
-       l_tile->comps = 00;
-       opj_free(p_tcd->tcd_image->tiles);
-       p_tcd->tcd_image->tiles = 00;
+        OPJ_UINT32 compno, resno, bandno, precno;
+        opj_tcd_tile_v2_t *l_tile = 00;
+        opj_tcd_tilecomp_v2_t *l_tile_comp = 00;
+        opj_tcd_resolution_v2_t *l_res = 00;
+        opj_tcd_band_v2_t *l_band = 00;
+        opj_tcd_precinct_v2_t *l_precinct = 00;
+        OPJ_UINT32 l_nb_resolutions, l_nb_precincts;
+        void (* l_tcd_code_block_deallocate) (opj_tcd_precinct_v2_t *) = 00;
+
+        if (! p_tcd) {
+                return;
+        }
+
+        if (! p_tcd->tcd_image) {
+                return;
+        }
+
+        if (p_tcd->m_is_decoder) {
+                l_tcd_code_block_deallocate = opj_tcd_code_block_dec_deallocate;
+        }
+        else {
+                l_tcd_code_block_deallocate = opj_tcd_code_block_enc_deallocate;
+        }
+
+        l_tile = p_tcd->tcd_image->tiles;
+        if (! l_tile) {
+                return;
+        }
+
+        l_tile_comp = l_tile->comps;
+
+        for (compno = 0; compno < l_tile->numcomps; ++compno) {
+                l_res = l_tile_comp->resolutions;
+                if (l_res) {
+
+                        l_nb_resolutions = l_tile_comp->resolutions_size / sizeof(opj_tcd_resolution_v2_t);
+                        for (resno = 0; resno < l_nb_resolutions; ++resno) {
+                                l_band = l_res->bands;
+                                for     (bandno = 0; bandno < 3; ++bandno) {
+                                        l_precinct = l_band->precincts;
+                                        if (l_precinct) {
+
+                                                l_nb_precincts = l_band->precincts_data_size / sizeof(opj_tcd_precinct_v2_t);
+                                                for (precno = 0; precno < l_nb_precincts; ++precno) {
+                                                        tgt_destroy(l_precinct->incltree);
+                                                        l_precinct->incltree = 00;
+                                                        tgt_destroy(l_precinct->imsbtree);
+                                                        l_precinct->imsbtree = 00;
+                                                        (*l_tcd_code_block_deallocate) (l_precinct);
+                                                        ++l_precinct;
+                                                }
+
+                                                opj_free(l_band->precincts);
+                                                l_band->precincts = 00;
+                                        }
+                                        ++l_band;
+                                } /* for (resno */
+                                ++l_res;
+                        }
+
+                        opj_free(l_tile_comp->resolutions);
+                        l_tile_comp->resolutions = 00;
+                }
+
+                if (l_tile_comp->data) {
+                        opj_free(l_tile_comp->data);
+                        l_tile_comp->data = 00;
+                }
+                ++l_tile_comp;
+        }
+
+        opj_free(l_tile->comps);
+        l_tile->comps = 00;
+        opj_free(p_tcd->tcd_image->tiles);
+        p_tcd->tcd_image->tiles = 00;
 }
 
 
-/**
- * Allocates memory for a decoding code block.
- */
-opj_bool tcd_code_block_dec_allocate (opj_tcd_cblk_dec_v2_t * p_code_block)
+opj_bool opj_tcd_t2_decode (opj_tcd_v2_t *p_tcd,
+                            OPJ_BYTE * p_src_data,
+                            OPJ_UINT32 * p_data_read,
+                            OPJ_UINT32 p_max_src_size,
+                            opj_codestream_index_t *p_cstr_index
+                            )
 {
-       OPJ_UINT32 l_seg_size;
-
-       if (! p_code_block->data) {
-
-               p_code_block->data = (OPJ_BYTE*) opj_malloc(8192);
-               if (! p_code_block->data) {
-                       return OPJ_FALSE;
-               }
-               /*fprintf(stderr, "Allocate 8192 elements of code_block->data\n");*/
-
-               l_seg_size = J2K_DEFAULT_NB_SEGS * sizeof(opj_tcd_seg_t);
-               p_code_block->segs = (opj_tcd_seg_t *) opj_malloc(l_seg_size);
-               if (! p_code_block->segs) {
-                       return OPJ_FALSE;
-               }
-               memset(p_code_block->segs,0,l_seg_size);
-               /*fprintf(stderr, "Allocate %d elements of code_block->data\n", J2K_DEFAULT_NB_SEGS * sizeof(opj_tcd_seg_t));*/
-
-               p_code_block->m_current_max_segs = J2K_DEFAULT_NB_SEGS;
-               /*fprintf(stderr, "m_current_max_segs of code_block->data = %d\n", p_code_block->m_current_max_segs);*/
-       }
-       /* TODO */
-       /*p_code_block->numsegs = 0; */
-
-       return OPJ_TRUE;
+        opj_t2_v2_t * l_t2;
+
+        l_t2 = opj_t2_create(p_tcd->image, p_tcd->cp);
+        if (l_t2 == 00) {
+                return OPJ_FALSE;
+        }
+
+        if (! opj_t2_decode_packets(
+                                        l_t2,
+                                        p_tcd->tcd_tileno,
+                                        p_tcd->tcd_image->tiles,
+                                        p_src_data,
+                                        p_data_read,
+                                        p_max_src_size,
+                                        p_cstr_index)) {
+                opj_t2_destroy(l_t2);
+                return OPJ_FALSE;
+        }
+
+        opj_t2_destroy(l_t2);
+
+        /*---------------CLEAN-------------------*/
+        return OPJ_TRUE;
 }
 
-opj_bool tcd_t2_decode (
-                                       opj_tcd_v2_t *p_tcd,
-                                       OPJ_BYTE * p_src_data,
-                                       OPJ_UINT32 * p_data_read,
-                                       OPJ_UINT32 p_max_src_size,
-                                       opj_codestream_index_t *p_cstr_index
-                                       )
+opj_bool opj_tcd_t1_decode ( opj_tcd_v2_t *p_tcd )
 {
-       opj_t2_v2_t * l_t2;
-
-       l_t2 = t2_create_v2(p_tcd->image, p_tcd->cp);
-       if (l_t2 == 00) {
-               return OPJ_FALSE;
-       }
-
-       if (! t2_decode_packets_v2(
-                                       l_t2,
-                                       p_tcd->tcd_tileno,
-                                       p_tcd->tcd_image->tiles,
-                                       p_src_data,
-                                       p_data_read,
-                                       p_max_src_size,
-                                       p_cstr_index)) {
-               t2_destroy_v2(l_t2);
-               return OPJ_FALSE;
-       }
-
-       t2_destroy_v2(l_t2);
-
-       /*---------------CLEAN-------------------*/
-       return OPJ_TRUE;
+        OPJ_UINT32 compno;
+        opj_t1_t * l_t1;
+        opj_tcd_tile_v2_t * l_tile = p_tcd->tcd_image->tiles;
+        opj_tcd_tilecomp_v2_t* l_tile_comp = l_tile->comps;
+        opj_tccp_t * l_tccp = p_tcd->tcp->tccps;
+
+
+        l_t1 = opj_t1_create();
+        if (l_t1 == 00) {
+                return OPJ_FALSE;
+        }
+
+        for (compno = 0; compno < l_tile->numcomps; ++compno) {
+                /* The +3 is headroom required by the vectorized DWT */
+                if (OPJ_FALSE == opj_t1_decode_cblks(l_t1, l_tile_comp, l_tccp)) {
+                        opj_t1_destroy(l_t1);
+                        return OPJ_FALSE;
+                }
+                ++l_tile_comp;
+                ++l_tccp;
+        }
+
+        opj_t1_destroy(l_t1);
+
+        return OPJ_TRUE;
 }
 
-opj_bool tcd_t1_decode ( opj_tcd_v2_t *p_tcd )
-{
-       OPJ_UINT32 compno;
-       opj_t1_t * l_t1;
-       opj_tcd_tile_v2_t * l_tile = p_tcd->tcd_image->tiles;
-       opj_tcd_tilecomp_v2_t* l_tile_comp = l_tile->comps;
-       opj_tccp_t * l_tccp = p_tcd->tcp->tccps;
-
-
-       l_t1 = t1_create_v2();
-       if (l_t1 == 00) {
-               return OPJ_FALSE;
-       }
-
-       for (compno = 0; compno < l_tile->numcomps; ++compno) {
-               /* The +3 is headroom required by the vectorized DWT */
-               t1_decode_cblks_v2(l_t1, l_tile_comp, l_tccp);
-               ++l_tile_comp;
-               ++l_tccp;
-       }
 
-       t1_destroy_v2(l_t1);
-
-       return OPJ_TRUE;
-}
-
-
-opj_bool tcd_dwt_decode ( opj_tcd_v2_t *p_tcd )
+opj_bool opj_tcd_dwt_decode ( opj_tcd_v2_t *p_tcd )
 {
-       OPJ_UINT32 compno;
-       opj_tcd_tile_v2_t * l_tile = p_tcd->tcd_image->tiles;
-       opj_tcd_tilecomp_v2_t * l_tile_comp = l_tile->comps;
-       opj_tccp_t * l_tccp = p_tcd->tcp->tccps;
-       opj_image_comp_t * l_img_comp = p_tcd->image->comps;
-
-       for (compno = 0; compno < l_tile->numcomps; compno++) {
-               /*
-               if (tcd->cp->reduce != 0) {
-                       tcd->image->comps[compno].resno_decoded =
-                               tile->comps[compno].numresolutions - tcd->cp->reduce - 1;
-                       if (tcd->image->comps[compno].resno_decoded < 0)
-                       {
-                               return false;
-                       }
-               }
-               numres2decode = tcd->image->comps[compno].resno_decoded + 1;
-               if(numres2decode > 0){
-               */
-
-               if (l_tccp->qmfbid == 1) {
-                       if (! dwt_decode_v2(l_tile_comp, l_img_comp->resno_decoded+1)) {
-                               return OPJ_FALSE;
-                       }
-               }
-               else {
-                       if (! dwt_decode_real_v2(l_tile_comp, l_img_comp->resno_decoded+1)) {
-                               return OPJ_FALSE;
-                       }
-               }
-
-               ++l_tile_comp;
-               ++l_img_comp;
-               ++l_tccp;
-       }
-
-       return OPJ_TRUE;
+        OPJ_UINT32 compno;
+        opj_tcd_tile_v2_t * l_tile = p_tcd->tcd_image->tiles;
+        opj_tcd_tilecomp_v2_t * l_tile_comp = l_tile->comps;
+        opj_tccp_t * l_tccp = p_tcd->tcp->tccps;
+        opj_image_comp_t * l_img_comp = p_tcd->image->comps;
+
+        for (compno = 0; compno < l_tile->numcomps; compno++) {
+                /*
+                if (tcd->cp->reduce != 0) {
+                        tcd->image->comps[compno].resno_decoded =
+                                tile->comps[compno].numresolutions - tcd->cp->reduce - 1;
+                        if (tcd->image->comps[compno].resno_decoded < 0)
+                        {
+                                return false;
+                        }
+                }
+                numres2decode = tcd->image->comps[compno].resno_decoded + 1;
+                if(numres2decode > 0){
+                */
+
+                if (l_tccp->qmfbid == 1) {
+                        if (! opj_dwt_decode(l_tile_comp, l_img_comp->resno_decoded+1)) {
+                                return OPJ_FALSE;
+                        }
+                }
+                else {
+                        if (! dwt_decode_real_v2(l_tile_comp, l_img_comp->resno_decoded+1)) {
+                                return OPJ_FALSE;
+                        }
+                }
+
+                ++l_tile_comp;
+                ++l_img_comp;
+                ++l_tccp;
+        }
+
+        return OPJ_TRUE;
 }
-opj_bool tcd_mct_decode ( opj_tcd_v2_t *p_tcd )
+opj_bool opj_tcd_mct_decode ( opj_tcd_v2_t *p_tcd )
 {
-       opj_tcd_tile_v2_t * l_tile = p_tcd->tcd_image->tiles;
-       opj_tcp_v2_t * l_tcp = p_tcd->tcp;
-       opj_tcd_tilecomp_v2_t * l_tile_comp = l_tile->comps;
-       OPJ_UINT32 l_samples,i;
-
-       if (! l_tcp->mct) {
-               return OPJ_TRUE;
-       }
-
-       l_samples = (l_tile_comp->x1 - l_tile_comp->x0) * (l_tile_comp->y1 - l_tile_comp->y0);
-
-       if (l_tile->numcomps >= 3 ){
-               if (l_tcp->mct == 2) {
-                       OPJ_BYTE ** l_data;
-
-                       if (! l_tcp->m_mct_decoding_matrix) {
-                               return OPJ_TRUE;
-                       }
-
-                       l_data = (OPJ_BYTE **) opj_malloc(l_tile->numcomps*sizeof(OPJ_BYTE*));
-                       if (! l_data) {
-                               return OPJ_FALSE;
-                       }
-
-                       for (i=0;i<l_tile->numcomps;++i) {
-                               l_data[i] = (OPJ_BYTE*) l_tile_comp->data;
-                               ++l_tile_comp;
-                       }
-
-                       if (! mct_decode_custom(/* MCT data */
-                                                                       (OPJ_BYTE*) l_tcp->m_mct_decoding_matrix,
-                                                                       /* size of components */
-                                                                       l_samples,
-                                                                       /* components */
-                                                                       l_data,
-                                                                       /* nb of components (i.e. size of pData) */
-                                                                       l_tile->numcomps,
-                                                                       /* tells if the data is signed */
-                                                                       p_tcd->image->comps->sgnd)) {
-                               opj_free(l_data);
-                               return OPJ_FALSE;
-                       }
-
-                       opj_free(l_data);
-               }
-               else {
-                       if (l_tcp->tccps->qmfbid == 1) {
-                               mct_decode(     l_tile->comps[0].data,
-                                                       l_tile->comps[1].data,
-                                                       l_tile->comps[2].data,
-                                                       l_samples);
-                       }
-                       else {
-                               mct_decode_real(        (float*)l_tile->comps[0].data,
-                                                                       (float*)l_tile->comps[1].data,
-                                                                       (float*)l_tile->comps[2].data,
-                                                                       l_samples);
-                       }
-               }
-       }
-       else {
-               /* FIXME need to use opj_event_msg_v2 function */
-               fprintf(stderr,"Number of components (%d) is inconsistent with a MCT. Skip the MCT step.\n",l_tile->numcomps);
-       }
-
-       return OPJ_TRUE;
+        opj_tcd_tile_v2_t * l_tile = p_tcd->tcd_image->tiles;
+        opj_tcp_v2_t * l_tcp = p_tcd->tcp;
+        opj_tcd_tilecomp_v2_t * l_tile_comp = l_tile->comps;
+        OPJ_UINT32 l_samples,i;
+
+        if (! l_tcp->mct) {
+                return OPJ_TRUE;
+        }
+
+        l_samples = (l_tile_comp->x1 - l_tile_comp->x0) * (l_tile_comp->y1 - l_tile_comp->y0);
+
+        if (l_tile->numcomps >= 3 ){
+                if (l_tcp->mct == 2) {
+                        OPJ_BYTE ** l_data;
+
+                        if (! l_tcp->m_mct_decoding_matrix) {
+                                return OPJ_TRUE;
+                        }
+
+                        l_data = (OPJ_BYTE **) opj_malloc(l_tile->numcomps*sizeof(OPJ_BYTE*));
+                        if (! l_data) {
+                                return OPJ_FALSE;
+                        }
+
+                        for (i=0;i<l_tile->numcomps;++i) {
+                                l_data[i] = (OPJ_BYTE*) l_tile_comp->data;
+                                ++l_tile_comp;
+                        }
+
+                        if (! mct_decode_custom(/* MCT data */
+                                                                        (OPJ_BYTE*) l_tcp->m_mct_decoding_matrix,
+                                                                        /* size of components */
+                                                                        l_samples,
+                                                                        /* components */
+                                                                        l_data,
+                                                                        /* nb of components (i.e. size of pData) */
+                                                                        l_tile->numcomps,
+                                                                        /* tells if the data is signed */
+                                                                        p_tcd->image->comps->sgnd)) {
+                                opj_free(l_data);
+                                return OPJ_FALSE;
+                        }
+
+                        opj_free(l_data);
+                }
+                else {
+                        if (l_tcp->tccps->qmfbid == 1) {
+                                mct_decode(     l_tile->comps[0].data,
+                                                        l_tile->comps[1].data,
+                                                        l_tile->comps[2].data,
+                                                        l_samples);
+                        }
+                        else {
+                                mct_decode_real(        (float*)l_tile->comps[0].data,
+                                                                        (float*)l_tile->comps[1].data,
+                                                                        (float*)l_tile->comps[2].data,
+                                                                        l_samples);
+                        }
+                }
+        }
+        else {
+                /* FIXME need to use opj_event_msg_v2 function */
+                fprintf(stderr,"Number of components (%d) is inconsistent with a MCT. Skip the MCT step.\n",l_tile->numcomps);
+        }
+
+        return OPJ_TRUE;
 }
 
 
-opj_bool tcd_dc_level_shift_decode ( opj_tcd_v2_t *p_tcd )
+opj_bool opj_tcd_dc_level_shift_decode ( opj_tcd_v2_t *p_tcd )
 {
-       OPJ_UINT32 compno;
-       opj_tcd_tilecomp_v2_t * l_tile_comp = 00;
-       opj_tccp_t * l_tccp = 00;
-       opj_image_comp_t * l_img_comp = 00;
-       opj_tcd_resolution_v2_t* l_res = 00;
-       opj_tcp_v2_t * l_tcp = 00;
-       opj_tcd_tile_v2_t * l_tile;
-       OPJ_UINT32 l_width,l_height,i,j;
-       OPJ_INT32 * l_current_ptr;
-       OPJ_INT32 l_min, l_max;
-       OPJ_UINT32 l_stride;
-
-       l_tile = p_tcd->tcd_image->tiles;
-       l_tile_comp = l_tile->comps;
-       l_tcp = p_tcd->tcp;
-       l_tccp = p_tcd->tcp->tccps;
-       l_img_comp = p_tcd->image->comps;
-
-       for (compno = 0; compno < l_tile->numcomps; compno++) {
-               l_res = l_tile_comp->resolutions + l_img_comp->resno_decoded;
-               l_width = (l_res->x1 - l_res->x0);
-               l_height = (l_res->y1 - l_res->y0);
-               l_stride = (l_tile_comp->x1 - l_tile_comp->x0) - l_width;
-
-               if (l_img_comp->sgnd) {
-                       l_min = -(1 << (l_img_comp->prec - 1));
-                       l_max = (1 << (l_img_comp->prec - 1)) - 1;
-               }
-               else {
+        OPJ_UINT32 compno;
+        opj_tcd_tilecomp_v2_t * l_tile_comp = 00;
+        opj_tccp_t * l_tccp = 00;
+        opj_image_comp_t * l_img_comp = 00;
+        opj_tcd_resolution_v2_t* l_res = 00;
+        opj_tcp_v2_t * l_tcp = 00;
+        opj_tcd_tile_v2_t * l_tile;
+        OPJ_UINT32 l_width,l_height,i,j;
+        OPJ_INT32 * l_current_ptr;
+        OPJ_INT32 l_min, l_max;
+        OPJ_UINT32 l_stride;
+
+        l_tile = p_tcd->tcd_image->tiles;
+        l_tile_comp = l_tile->comps;
+        l_tcp = p_tcd->tcp;
+        l_tccp = p_tcd->tcp->tccps;
+        l_img_comp = p_tcd->image->comps;
+
+        for (compno = 0; compno < l_tile->numcomps; compno++) {
+                l_res = l_tile_comp->resolutions + l_img_comp->resno_decoded;
+                l_width = (l_res->x1 - l_res->x0);
+                l_height = (l_res->y1 - l_res->y0);
+                l_stride = (l_tile_comp->x1 - l_tile_comp->x0) - l_width;
+
+                if (l_img_comp->sgnd) {
+                        l_min = -(1 << (l_img_comp->prec - 1));
+                        l_max = (1 << (l_img_comp->prec - 1)) - 1;
+                }
+                else {
             l_min = 0;
-                       l_max = (1 << l_img_comp->prec) - 1;
-               }
-
-               l_current_ptr = l_tile_comp->data;
-
-               if (l_tccp->qmfbid == 1) {
-                       for (j=0;j<l_height;++j) {
-                               for (i = 0; i < l_width; ++i) {
-                                       *l_current_ptr = int_clamp(*l_current_ptr + l_tccp->m_dc_level_shift, l_min, l_max);
-                                       ++l_current_ptr;
-                               }
-                               l_current_ptr += l_stride;
-                       }
-               }
-               else {
-                       for (j=0;j<l_height;++j) {
-                               for (i = 0; i < l_width; ++i) {
-                                       OPJ_FLOAT32 l_value = *((OPJ_FLOAT32 *) l_current_ptr);
-                                       *l_current_ptr = int_clamp(lrintf(l_value) + l_tccp->m_dc_level_shift, l_min, l_max); ;
-                                       ++l_current_ptr;
-                               }
-                               l_current_ptr += l_stride;
-                       }
-               }
-
-               ++l_img_comp;
-               ++l_tccp;
-               ++l_tile_comp;
-       }
-
-       return OPJ_TRUE;
+                        l_max = (1 << l_img_comp->prec) - 1;
+                }
+
+                l_current_ptr = l_tile_comp->data;
+
+                if (l_tccp->qmfbid == 1) {
+                        for (j=0;j<l_height;++j) {
+                                for (i = 0; i < l_width; ++i) {
+                                        *l_current_ptr = int_clamp(*l_current_ptr + l_tccp->m_dc_level_shift, l_min, l_max);
+                                        ++l_current_ptr;
+                                }
+                                l_current_ptr += l_stride;
+                        }
+                }
+                else {
+                        for (j=0;j<l_height;++j) {
+                                for (i = 0; i < l_width; ++i) {
+                                        OPJ_FLOAT32 l_value = *((OPJ_FLOAT32 *) l_current_ptr);
+                                        *l_current_ptr = int_clamp(lrintf(l_value) + l_tccp->m_dc_level_shift, l_min, l_max); ;
+                                        ++l_current_ptr;
+                                }
+                                l_current_ptr += l_stride;
+                        }
+                }
+
+                ++l_img_comp;
+                ++l_tccp;
+                ++l_tile_comp;
+        }
+
+        return OPJ_TRUE;
 }
 
 
@@ -2588,39 +1696,414 @@ opj_bool tcd_dc_level_shift_decode ( opj_tcd_v2_t *p_tcd )
 /**
  * Deallocates the encoding data of the given precinct.
  */
-void tcd_code_block_dec_deallocate (opj_tcd_precinct_v2_t * p_precinct)
+void opj_tcd_code_block_dec_deallocate (opj_tcd_precinct_v2_t * p_precinct)
 {
-       OPJ_UINT32 cblkno , l_nb_code_blocks;
+        OPJ_UINT32 cblkno , l_nb_code_blocks;
+
+        opj_tcd_cblk_dec_v2_t * l_code_block = p_precinct->cblks.dec;
+        if (l_code_block) {
+                /*fprintf(stderr,"deallocate codeblock:{\n");*/
+                /*fprintf(stderr,"\t x0=%d, y0=%d, x1=%d, y1=%d\n",l_code_block->x0, l_code_block->y0, l_code_block->x1, l_code_block->y1);*/
+                /*fprintf(stderr,"\t numbps=%d, numlenbits=%d, len=%d, numnewpasses=%d, real_num_segs=%d, m_current_max_segs=%d\n ",
+                                l_code_block->numbps, l_code_block->numlenbits, l_code_block->len, l_code_block->numnewpasses, l_code_block->real_num_segs, l_code_block->m_current_max_segs );*/
+
 
-       opj_tcd_cblk_dec_v2_t * l_code_block = p_precinct->cblks.dec;
-       if (l_code_block) {
-               /*fprintf(stderr,"deallocate codeblock:{\n");*/
-               /*fprintf(stderr,"\t x0=%d, y0=%d, x1=%d, y1=%d\n",l_code_block->x0, l_code_block->y0, l_code_block->x1, l_code_block->y1);*/
-               /*fprintf(stderr,"\t numbps=%d, numlenbits=%d, len=%d, numnewpasses=%d, real_num_segs=%d, m_current_max_segs=%d\n ",
-                               l_code_block->numbps, l_code_block->numlenbits, l_code_block->len, l_code_block->numnewpasses, l_code_block->real_num_segs, l_code_block->m_current_max_segs );*/
+                l_nb_code_blocks = p_precinct->block_size / sizeof(opj_tcd_cblk_dec_v2_t);
+                /*fprintf(stderr,"nb_code_blocks =%d\t}\n", l_nb_code_blocks);*/
 
+                for (cblkno = 0; cblkno < l_nb_code_blocks; ++cblkno) {
 
-               l_nb_code_blocks = p_precinct->block_size / sizeof(opj_tcd_cblk_dec_v2_t);
-               /*fprintf(stderr,"nb_code_blocks =%d\t}\n", l_nb_code_blocks);*/
+                        if (l_code_block->data) {
+                                opj_free(l_code_block->data);
+                                l_code_block->data = 00;
+                        }
 
-               for (cblkno = 0; cblkno < l_nb_code_blocks; ++cblkno) {
+                        if (l_code_block->segs) {
+                                opj_free(l_code_block->segs );
+                                l_code_block->segs = 00;
+                        }
 
-                       if (l_code_block->data) {
-                               opj_free(l_code_block->data);
-                               l_code_block->data = 00;
-                       }
+                        ++l_code_block;
+                }
 
-                       if (l_code_block->segs) {
-                               opj_free(l_code_block->segs );
-                               l_code_block->segs = 00;
-                       }
+                opj_free(p_precinct->cblks.dec);
+                p_precinct->cblks.dec = 00;
+        }
+}
+
+/**
+ * Deallocates the encoding data of the given precinct.
+ */
+void opj_tcd_code_block_enc_deallocate (opj_tcd_precinct_v2_t * p_precinct)
+{       
+        OPJ_UINT32 cblkno , l_nb_code_blocks;
+
+        opj_tcd_cblk_enc_v2_t * l_code_block = p_precinct->cblks.enc;
+        if (l_code_block) {
+                l_nb_code_blocks = p_precinct->block_size / sizeof(opj_tcd_cblk_enc_t);
+                
+                for     (cblkno = 0; cblkno < l_nb_code_blocks; ++cblkno)  {
+                        if (l_code_block->data) {
+                                opj_free(l_code_block->data-1);
+                                l_code_block->data = 00;
+                        }
+
+                        if (l_code_block->layers) {
+                                opj_free(l_code_block->layers );
+                                l_code_block->layers = 00;
+                        }
+
+                        if (l_code_block->passes) {
+                                opj_free(l_code_block->passes );
+                                l_code_block->passes = 00;
+                        }
+                        ++l_code_block;
+                }
+
+                opj_free(p_precinct->cblks.enc);
+                
+                p_precinct->cblks.enc = 00;
+        }
+}
+
+OPJ_UINT32 opj_tcd_get_encoded_tile_size ( opj_tcd_v2_t *p_tcd )
+{
+        OPJ_UINT32 i,l_data_size = 0;
+        opj_image_comp_t * l_img_comp = 00;
+        opj_tcd_tilecomp_v2_t * l_tilec = 00;
+        OPJ_UINT32 l_size_comp, l_remaining;
+
+        l_tilec = p_tcd->tcd_image->tiles->comps;
+        l_img_comp = p_tcd->image->comps;
+        for (i=0;i<p_tcd->image->numcomps;++i) {
+                l_size_comp = l_img_comp->prec >> 3; /*(/ 8)*/
+                l_remaining = l_img_comp->prec & 7;  /* (%8) */
+
+                if (l_remaining) {
+                        ++l_size_comp;
+                }
+
+                if (l_size_comp == 3) {
+                        l_size_comp = 4;
+                }
+
+                l_data_size += l_size_comp * (l_tilec->x1 - l_tilec->x0) * (l_tilec->y1 - l_tilec->y0);
+                ++l_img_comp;
+                ++l_tilec;
+        }
+
+        return l_data_size;
+}
+                
+opj_bool opj_tcd_dc_level_shift_encode ( opj_tcd_v2_t *p_tcd )
+{
+        OPJ_UINT32 compno;
+        opj_tcd_tilecomp_v2_t * l_tile_comp = 00;
+        opj_tccp_t * l_tccp = 00;
+        opj_image_comp_t * l_img_comp = 00;
+        opj_tcp_v2_t * l_tcp = 00;
+        opj_tcd_tile_v2_t * l_tile;
+        OPJ_UINT32 l_nb_elem,i;
+        OPJ_INT32 * l_current_ptr;
+
+        l_tile = p_tcd->tcd_image->tiles;
+        l_tile_comp = l_tile->comps;
+        l_tcp = p_tcd->tcp;
+        l_tccp = p_tcd->tcp->tccps;
+        l_img_comp = p_tcd->image->comps;
+
+        for (compno = 0; compno < l_tile->numcomps; compno++) {
+                l_current_ptr = l_tile_comp->data;
+                l_nb_elem = (l_tile_comp->x1 - l_tile_comp->x0) * (l_tile_comp->y1 - l_tile_comp->y0);
+
+                if (l_tccp->qmfbid == 1) {
+                        for     (i = 0; i < l_nb_elem; ++i) {
+                                *l_current_ptr -= l_tccp->m_dc_level_shift ;
+                                ++l_current_ptr;
+                        }
+                }
+                else {
+                        for (i = 0; i < l_nb_elem; ++i) {
+                                *l_current_ptr = (*l_current_ptr - l_tccp->m_dc_level_shift) << 11 ;
+                                ++l_current_ptr;
+                        }
+                }
+
+                ++l_img_comp;
+                ++l_tccp;
+                ++l_tile_comp;
+        }
+
+        return OPJ_TRUE;
+}
+
+opj_bool opj_tcd_mct_encode ( opj_tcd_v2_t *p_tcd )
+{
+        opj_tcd_tile_v2_t * l_tile = p_tcd->tcd_image->tiles;
+        opj_tcd_tilecomp_v2_t * l_tile_comp = p_tcd->tcd_image->tiles->comps;
+        OPJ_UINT32 samples = (l_tile_comp->x1 - l_tile_comp->x0) * (l_tile_comp->y1 - l_tile_comp->y0);
+        OPJ_UINT32 i;
+        OPJ_BYTE ** l_data = 00;
+        opj_tcp_v2_t * l_tcp = p_tcd->tcp;
+
+        if(!p_tcd->tcp->mct) {
+                return OPJ_TRUE;
+        }
+
+        if (p_tcd->tcp->mct == 2) {
+                if (! p_tcd->tcp->m_mct_coding_matrix) {
+                        return OPJ_TRUE;
+                }
+
+        l_data = (OPJ_BYTE **) opj_malloc(l_tile->numcomps*sizeof(OPJ_BYTE*));
+                if (! l_data) {
+                        return OPJ_FALSE;
+                }
+
+                for (i=0;i<l_tile->numcomps;++i) {
+                        l_data[i] = (OPJ_BYTE*) l_tile_comp->data;
+                        ++l_tile_comp;
+                }
+
+                if (! mct_encode_custom(/* MCT data */
+                                        (OPJ_BYTE*) p_tcd->tcp->m_mct_coding_matrix,
+                                        /* size of components */
+                                        samples,
+                                        /* components */
+                                        l_data,
+                                        /* nb of components (i.e. size of pData) */
+                                        l_tile->numcomps,
+                                        /* tells if the data is signed */
+                                        p_tcd->image->comps->sgnd) )
+                {
+            opj_free(l_data);
+                        return OPJ_FALSE;
+                }
+
+                opj_free(l_data);
+        }
+        else if (l_tcp->tccps->qmfbid == 0) {
+                mct_encode_real(l_tile->comps[0].data, l_tile->comps[1].data, l_tile->comps[2].data, samples);
+        }
+        else {
+                mct_encode(l_tile->comps[0].data, l_tile->comps[1].data, l_tile->comps[2].data, samples);
+        }
+
+        return OPJ_TRUE;
+}
 
-                       ++l_code_block;
-               }
+opj_bool opj_tcd_dwt_encode ( opj_tcd_v2_t *p_tcd )
+{
+        opj_tcd_tile_v2_t * l_tile = p_tcd->tcd_image->tiles;
+        opj_tcd_tilecomp_v2_t * l_tile_comp = p_tcd->tcd_image->tiles->comps;
+        opj_tccp_t * l_tccp = p_tcd->tcp->tccps;
+        OPJ_UINT32 compno;
+
+        for (compno = 0; compno < l_tile->numcomps; ++compno) {
+                if (l_tccp->qmfbid == 1) {
+                        if (! opj_dwt_encode(l_tile_comp)) {
+                                return OPJ_FALSE;
+                        }
+                }
+                else if (l_tccp->qmfbid == 0) {
+                        if (! opj_dwt_encode_real(l_tile_comp)) {
+                                return OPJ_FALSE;
+                        }
+                }
+
+                ++l_tile_comp;
+                ++l_tccp;
+        }
+
+        return OPJ_TRUE;
+}
 
-               opj_free(p_precinct->cblks.dec);
-               p_precinct->cblks.dec = 00;
-       }
+opj_bool opj_tcd_t1_encode ( opj_tcd_v2_t *p_tcd )
+{
+        opj_t1_t * l_t1;
+        const OPJ_FLOAT64 * l_mct_norms;
+        opj_tcp_v2_t * l_tcp = p_tcd->tcp;
+
+        l_t1 = opj_t1_create();
+        if (l_t1 == 00) {
+                return OPJ_FALSE;
+        }
+
+        if (l_tcp->mct == 1) {
+                /* irreversible encoding */
+                if (l_tcp->tccps->qmfbid == 0) {
+                        l_mct_norms = get_mct_norms_real();
+                }
+                else {
+                        l_mct_norms = get_mct_norms();
+                }
+        }
+        else {
+                l_mct_norms = (const OPJ_FLOAT64 *) (l_tcp->mct_norms);
+        }
+
+        if (! opj_t1_encode_cblks(l_t1, p_tcd->tcd_image->tiles , l_tcp, l_mct_norms)) {
+        opj_t1_destroy(l_t1);
+                return OPJ_FALSE;
+        }
+
+        opj_t1_destroy(l_t1);
+
+        return OPJ_TRUE;
+}
+
+opj_bool opj_tcd_t2_encode (opj_tcd_v2_t *p_tcd,
+                                                OPJ_BYTE * p_dest_data,
+                                                OPJ_UINT32 * p_data_written,
+                                                OPJ_UINT32 p_max_dest_size,
+                                                opj_codestream_info_t *p_cstr_info )
+{
+        opj_t2_v2_t * l_t2;
+
+        l_t2 = opj_t2_create(p_tcd->image, p_tcd->cp);
+        if (l_t2 == 00) {
+                return OPJ_FALSE;
+        }
+
+        if (! opj_t2_encode_packets(
+                                        l_t2,
+                                        p_tcd->tcd_tileno,
+                                        p_tcd->tcd_image->tiles,
+                                        p_tcd->tcp->numlayers,
+                                        p_dest_data,
+                                        p_data_written,
+                                        p_max_dest_size,
+                                        p_cstr_info,
+                                        p_tcd->tp_num,
+                                        p_tcd->tp_pos,
+                                        p_tcd->cur_pino,
+                                        FINAL_PASS))
+        {
+                opj_t2_destroy(l_t2);
+                return OPJ_FALSE;
+        }
+
+        opj_t2_destroy(l_t2);
+
+        /*---------------CLEAN-------------------*/
+        return OPJ_TRUE;
 }
 
 
+opj_bool opj_tcd_rate_allocate_encode(  opj_tcd_v2_t *p_tcd,
+                                                                            OPJ_BYTE * p_dest_data,
+                                                                            OPJ_UINT32 p_max_dest_size,
+                                                                            opj_codestream_info_t *p_cstr_info )
+{
+        opj_cp_v2_t * l_cp = p_tcd->cp;
+        OPJ_UINT32 l_nb_written = 0;
+
+        if (p_cstr_info)  {
+                p_cstr_info->index_write = 0;
+        }
+
+        if (l_cp->m_specific_param.m_enc.m_disto_alloc|| l_cp->m_specific_param.m_enc.m_fixed_quality)  {
+                /* fixed_quality */
+                /* Normal Rate/distortion allocation */
+                if (! opj_tcd_rateallocate(p_tcd, p_dest_data,&l_nb_written, p_max_dest_size, p_cstr_info)) {
+                        return OPJ_FALSE;
+                }
+        }
+        else {
+                /* Fixed layer allocation */
+                opj_tcd_rateallocate_fixed(p_tcd);
+        }
+
+        return OPJ_TRUE;
+}
+
+
+opj_bool opj_tcd_copy_tile_data (       opj_tcd_v2_t *p_tcd,
+                                                                    OPJ_BYTE * p_src,
+                                                                    OPJ_UINT32 p_src_length )
+{
+        OPJ_UINT32 i,j,l_data_size = 0;
+        opj_image_comp_t * l_img_comp = 00;
+        opj_tcd_tilecomp_v2_t * l_tilec = 00;
+        OPJ_UINT32 l_size_comp, l_remaining;
+        OPJ_UINT32 l_nb_elem;
+
+        l_data_size = opj_tcd_get_encoded_tile_size(p_tcd);
+        if (l_data_size != p_src_length) {
+                return OPJ_FALSE;
+        }
+
+        l_tilec = p_tcd->tcd_image->tiles->comps;
+        l_img_comp = p_tcd->image->comps;
+        for (i=0;i<p_tcd->image->numcomps;++i) {
+                l_size_comp = l_img_comp->prec >> 3; /*(/ 8)*/
+                l_remaining = l_img_comp->prec & 7;  /* (%8) */
+                l_nb_elem = (l_tilec->x1 - l_tilec->x0) * (l_tilec->y1 - l_tilec->y0);
+
+                if (l_remaining) {
+                        ++l_size_comp;
+                }
+
+                if (l_size_comp == 3) {
+                        l_size_comp = 4;
+                }
+
+                switch (l_size_comp) {
+                        case 1:
+                                {
+                                        OPJ_CHAR * l_src_ptr = (OPJ_CHAR *) p_src;
+                                        OPJ_INT32 * l_dest_ptr = l_tilec->data;
+
+                                        if (l_img_comp->sgnd) {
+                                                for (j=0;j<l_nb_elem;++j) {
+                                                        *(l_dest_ptr++) = (OPJ_INT32) (*(l_src_ptr++));
+                                                }
+                                        }
+                                        else {
+                                                for (j=0;j<l_nb_elem;++j) {
+                                                        *(l_dest_ptr++) = (*(l_src_ptr++))&0xff;
+                                                }
+                                        }
+
+                                        p_src = (OPJ_BYTE*) l_src_ptr;
+                                }
+                                break;
+                        case 2:
+                                {
+                                        OPJ_INT32 * l_dest_ptr = l_tilec->data;
+                                        OPJ_INT16 * l_src_ptr = (OPJ_INT16 *) p_src;
+
+                                        if (l_img_comp->sgnd) {
+                                                for (j=0;j<l_nb_elem;++j) {
+                                                        *(l_dest_ptr++) = (OPJ_INT32) (*(l_src_ptr++));
+                                                }
+                                        }
+                                        else {
+                                                for (j=0;j<l_nb_elem;++j) {
+                                                        *(l_dest_ptr++) = (*(l_src_ptr++))&0xffff;
+                                                }
+                                        }
+
+                                        p_src = (OPJ_BYTE*) l_src_ptr;
+                                }
+                                break;
+                        case 4:
+                                {
+                                        OPJ_INT32 * l_src_ptr = (OPJ_INT32 *) p_src;
+                                        OPJ_INT32 * l_dest_ptr = l_tilec->data;
+
+                                        for (j=0;j<l_nb_elem;++j) {
+                                                *(l_dest_ptr++) = (OPJ_INT32) (*(l_src_ptr++));
+                                        }
+
+                                        p_src = (OPJ_BYTE*) l_src_ptr;
+                                }
+                                break;
+                }
+
+                ++l_img_comp;
+                ++l_tilec;
+        }
+
+        return OPJ_TRUE;
+}