[trunk] Remove simple warnings about comments, missing case in switch statement
[openjpeg.git] / src / lib / openjp2 / tcd.c
index 3c780d46f48cf87abdb268c46ef80119ec84ef41..f44d3e9648c8712ca01a42dde974d69483ed292c 100644 (file)
@@ -6,6 +6,8 @@
  * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2006-2007, Parvatha Elangovan
+ * Copyright (c) 2008;2011-2012, Centre National d'Etudes Spatiales (CNES), France 
+ * Copyright (c) 2012, CS Systemes d'Information, France
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -98,7 +100,7 @@ void tcd_dump(FILE *fd, opj_tcd_t *tcd, opj_tcd_image_t * img) {
 /**
 * Allocates memory for a decoding code block.
 */
-static opj_bool opj_tcd_code_block_dec_allocate (opj_tcd_cblk_dec_t * p_code_block);
+static OPJ_BOOL opj_tcd_code_block_dec_allocate (opj_tcd_cblk_dec_t * p_code_block);
 
 /**
  * Deallocates the decoding data of the given precinct.
@@ -108,7 +110,7 @@ static void opj_tcd_code_block_dec_deallocate (opj_tcd_precinct_t * p_precinct);
 /**
  * Allocates memory for an encoding code block.
  */
-static opj_bool opj_tcd_code_block_enc_allocate (opj_tcd_cblk_enc_t * p_code_block);
+static OPJ_BOOL opj_tcd_code_block_enc_allocate (opj_tcd_cblk_enc_t * p_code_block);
 
 /**
  * Deallocates the encoding data of the given precinct.
@@ -123,36 +125,36 @@ Free the memory allocated for encoding
 static void opj_tcd_free_tile(opj_tcd_t *tcd);
 
 
-static opj_bool opj_tcd_t2_decode ( opj_tcd_t *p_tcd,
+static OPJ_BOOL opj_tcd_t2_decode ( opj_tcd_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_t1_decode (opj_tcd_t *p_tcd);
+static OPJ_BOOL opj_tcd_t1_decode (opj_tcd_t *p_tcd);
 
-static opj_bool opj_tcd_dwt_decode (opj_tcd_t *p_tcd);
+static OPJ_BOOL opj_tcd_dwt_decode (opj_tcd_t *p_tcd);
 
-static opj_bool opj_tcd_mct_decode (opj_tcd_t *p_tcd);
+static OPJ_BOOL opj_tcd_mct_decode (opj_tcd_t *p_tcd);
 
-static opj_bool opj_tcd_dc_level_shift_decode (opj_tcd_t *p_tcd);
+static OPJ_BOOL opj_tcd_dc_level_shift_decode (opj_tcd_t *p_tcd);
 
 
-static opj_bool opj_tcd_dc_level_shift_encode ( opj_tcd_t *p_tcd );
+static OPJ_BOOL opj_tcd_dc_level_shift_encode ( opj_tcd_t *p_tcd );
 
-static opj_bool opj_tcd_mct_encode ( opj_tcd_t *p_tcd );
+static OPJ_BOOL opj_tcd_mct_encode ( opj_tcd_t *p_tcd );
 
-static opj_bool opj_tcd_dwt_encode ( opj_tcd_t *p_tcd );
+static OPJ_BOOL opj_tcd_dwt_encode ( opj_tcd_t *p_tcd );
 
-static opj_bool opj_tcd_t1_encode ( opj_tcd_t *p_tcd );
+static OPJ_BOOL opj_tcd_t1_encode ( opj_tcd_t *p_tcd );
 
-static opj_bool opj_tcd_t2_encode (     opj_tcd_t *p_tcd,
+static OPJ_BOOL opj_tcd_t2_encode (     opj_tcd_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_t *p_tcd,
+static OPJ_BOOL opj_tcd_rate_allocate_encode(   opj_tcd_t *p_tcd,
                                                                                         OPJ_BYTE * p_dest_data,
                                                                                         OPJ_UINT32 p_max_dest_size,
                                                                                         opj_codestream_info_t *p_cstr_info );
@@ -162,7 +164,7 @@ static opj_bool opj_tcd_rate_allocate_encode(   opj_tcd_t *p_tcd,
 /**
 Create a new TCD handle
 */
-opj_tcd_t* opj_tcd_create(opj_bool p_is_decoder)
+opj_tcd_t* opj_tcd_create(OPJ_BOOL p_is_decoder)
 {
         opj_tcd_t *l_tcd = 00;
 
@@ -288,9 +290,9 @@ void opj_tcd_makelayer_fixed(opj_tcd_t *tcd, OPJ_UINT32 layno, OPJ_UINT32 final)
         OPJ_INT32 matrice[10][10][3];
         OPJ_UINT32 i, j, k;
 
-        opj_cp_v2_t *cp = tcd->cp;
+        opj_cp_t *cp = tcd->cp;
         opj_tcd_tile_t *tcd_tile = tcd->tcd_image->tiles;
-        opj_tcp_v2_t *tcd_tcp = tcd->tcp;
+        opj_tcp_t *tcd_tcp = tcd->tcp;
 
         for (compno = 0; compno < tcd_tile->numcomps; compno++) {
                 opj_tcd_tilecomp_t *tilec = &tcd_tile->comps[compno];
@@ -375,7 +377,7 @@ void opj_tcd_makelayer_fixed(opj_tcd_t *tcd, OPJ_UINT32 layno, OPJ_UINT32 final)
         }
 }
 
-opj_bool opj_tcd_rateallocate(  opj_tcd_t *tcd,
+OPJ_BOOL opj_tcd_rateallocate(  opj_tcd_t *tcd,
                                                                 OPJ_BYTE *dest,
                                                                 OPJ_UINT32 * p_data_written,
                                                                 OPJ_UINT32 len,
@@ -388,9 +390,9 @@ opj_bool opj_tcd_rateallocate(  opj_tcd_t *tcd,
         const OPJ_FLOAT64 K = 1;                /* 1.1; fixed_quality */
         OPJ_FLOAT64 maxSE = 0;
 
-        opj_cp_v2_t *cp = tcd->cp;
+        opj_cp_t *cp = tcd->cp;
         opj_tcd_tile_t *tcd_tile = tcd->tcd_image->tiles;
-        opj_tcp_v2_t *tcd_tcp = tcd->tcp;
+        opj_tcp_t *tcd_tcp = tcd->tcp;
 
         min = DBL_MAX;
         max = 0;
@@ -464,7 +466,7 @@ opj_bool opj_tcd_rateallocate(  opj_tcd_t *tcd,
         for (layno = 0; layno < tcd_tcp->numlayers; layno++) {
                 OPJ_FLOAT64 lo = min;
                 OPJ_FLOAT64 hi = max;
-                opj_bool success = OPJ_FALSE;
+                OPJ_BOOL success = OPJ_FALSE;
                 OPJ_UINT32 maxlen = tcd_tcp->rates[layno] ? opj_uint_min(((OPJ_UINT32) ceil(tcd_tcp->rates[layno])), len) : len;
                 OPJ_FLOAT64 goodthresh = 0;
                 OPJ_FLOAT64 stable_thresh = 0;
@@ -479,7 +481,7 @@ opj_bool opj_tcd_rateallocate(  opj_tcd_t *tcd,
                   -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_t2_t*t2 = opj_t2_create(tcd->image, cp);
                         OPJ_FLOAT64 thresh = 0;
 
                         if (t2 == 00) {
@@ -563,9 +565,9 @@ opj_bool opj_tcd_rateallocate(  opj_tcd_t *tcd,
         return OPJ_TRUE;
 }
 
-opj_bool opj_tcd_init( opj_tcd_t *p_tcd,
+OPJ_BOOL opj_tcd_init( opj_tcd_t *p_tcd,
                                            opj_image_t * p_image,
-                                           opj_cp_v2_t * p_cp )
+                                           opj_cp_t * p_cp )
 {
         OPJ_UINT32 l_tile_comp_size;
 
@@ -607,15 +609,15 @@ void opj_tcd_destroy(opj_tcd_t *tcd) {
 }
 
 /* ----------------------------------------------------------------------- */
-#define MACRO_TCD_ALLOCATE(FUNCTION,TYPE,FRACTION,ELEMENT,FUNCTION_ELEMENT)                                                                                                                                       \
-opj_bool FUNCTION (     opj_tcd_t *p_tcd,                        \
+#define OPJ_MACRO_TCD_ALLOCATE(FUNCTION,TYPE,FRACTION,ELEMENT,FUNCTION_ELEMENT)                                                                                                                                       \
+OPJ_BOOL FUNCTION (     opj_tcd_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_tcp_t * l_tcp = 00;                                  \
+        opj_cp_t * l_cp = 00;                                    \
         opj_tcd_tile_t * l_tile = 00;                            \
         opj_tccp_t *l_tccp = 00;                                    \
         opj_tcd_tilecomp_t *l_tilec = 00;                        \
@@ -661,6 +663,11 @@ opj_bool FUNCTION (     opj_tcd_t *p_tcd,                        \
         l_tile->y0 = opj_int_max(l_cp->ty0 + q * l_cp->tdy, l_image->y0);                                                                                                                                             \
         l_tile->x1 = opj_int_min(l_cp->tx0 + (p + 1) * l_cp->tdx, l_image->x1);                                                                                                                                       \
         l_tile->y1 = opj_int_min(l_cp->ty0 + (q + 1) * l_cp->tdy, l_image->y1);                                                                                                                                       \
+        /* testcase 1888.pdf.asan.35.988 */ \
+        if (l_tccp->numresolutions == 0) { \
+            fprintf(stderr, "tiles require at least one resolution\n"); \
+            return OPJ_FALSE; \
+        } \
         /*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; */                      \
@@ -749,7 +756,7 @@ opj_bool FUNCTION (     opj_tcd_t *p_tcd,                        \
                                                                                                                                                                                                                   \
                 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_INT32 tlcbgxstart, tlcbgystart /*, brcbgxend, brcbgyend*/;                                                                                                                                 \
                         OPJ_UINT32 cbgwidthexpn, cbgheightexpn;                                                                                                                                                   \
                         OPJ_UINT32 cblkwidthexpn, cblkheightexpn;                                                                                                                                                 \
                                                                                                                                                                                                                   \
@@ -779,8 +786,8 @@ opj_bool FUNCTION (     opj_tcd_t *p_tcd,                        \
                         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;                                                                                                                                                       \
+                                /*brcbgxend = l_br_prc_x_end;*/                                                                                                                                                       \
+                               /* brcbgyend = l_br_prc_y_end;*/                                                                                                                                                       \
                                 cbgwidthexpn = l_pdx;                                                                                                                                                             \
                                 cbgheightexpn = l_pdy;                                                                                                                                                            \
                                 l_res->numbands = 1;                                                                                                                                                              \
@@ -788,8 +795,8 @@ opj_bool FUNCTION (     opj_tcd_t *p_tcd,                        \
                         else {                                                                                                                                                                                    \
                                 tlcbgxstart = opj_int_ceildivpow2(l_tl_prc_x_start, 1);                                                                                                                               \
                                 tlcbgystart = opj_int_ceildivpow2(l_tl_prc_y_start, 1);                                                                                                                               \
-                                brcbgxend = opj_int_ceildivpow2(l_br_prc_x_end, 1);                                                                                                                                   \
-                                brcbgyend = opj_int_ceildivpow2(l_br_prc_y_end, 1);                                                                                                                                   \
+                                /*brcbgxend = opj_int_ceildivpow2(l_br_prc_x_end, 1);*/                                                                                                                            \
+                                /*brcbgyend = opj_int_ceildivpow2(l_br_prc_y_end, 1);*/                                                                                                                            \
                                 cbgwidthexpn = l_pdx - 1;                                                                                                                                                         \
                                 cbgheightexpn = l_pdy - 1;                                                                                                                                                        \
                                 l_res->numbands = 3;                                                                                                                                                              \
@@ -987,19 +994,19 @@ opj_bool FUNCTION (     opj_tcd_t *p_tcd,                        \
 }                                                                                                                                                                                                                 \
 
 
-MACRO_TCD_ALLOCATE(opj_tcd_init_encode_tile, opj_tcd_cblk_enc_t, 1.f, enc, opj_tcd_code_block_enc_allocate)
-MACRO_TCD_ALLOCATE(opj_tcd_init_decode_tile, opj_tcd_cblk_dec_t, 0.5f, dec, opj_tcd_code_block_dec_allocate)
+OPJ_MACRO_TCD_ALLOCATE(opj_tcd_init_encode_tile, opj_tcd_cblk_enc_t, 1.f, enc, opj_tcd_code_block_enc_allocate)
+OPJ_MACRO_TCD_ALLOCATE(opj_tcd_init_decode_tile, opj_tcd_cblk_dec_t, 0.5f, dec, opj_tcd_code_block_dec_allocate)
 
-#undef MACRO_TCD_ALLOCATE
+#undef OPJ_MACRO_TCD_ALLOCATE
 
 /**
  * Allocates memory for an encoding code block.
  */
-opj_bool opj_tcd_code_block_enc_allocate (opj_tcd_cblk_enc_t * p_code_block)
+OPJ_BOOL opj_tcd_code_block_enc_allocate (opj_tcd_cblk_enc_t * p_code_block)
 {
         if (! p_code_block->data) {
 
-                p_code_block->data = (OPJ_BYTE*) opj_malloc(8192+1);
+                p_code_block->data = (OPJ_BYTE*) opj_malloc(OPJ_J2K_DEFAULT_CBLK_DATA_SIZE); /*why +1 ?*/
                 if(! p_code_block->data) {
                         return OPJ_FALSE;
                 }
@@ -1028,27 +1035,28 @@ opj_bool opj_tcd_code_block_enc_allocate (opj_tcd_cblk_enc_t * p_code_block)
 /**
  * Allocates memory for a decoding code block.
  */
-opj_bool opj_tcd_code_block_dec_allocate (opj_tcd_cblk_dec_t * p_code_block)
+OPJ_BOOL opj_tcd_code_block_dec_allocate (opj_tcd_cblk_dec_t * p_code_block)
 {
         OPJ_UINT32 l_seg_size;
 
         if (! p_code_block->data) {
 
-                p_code_block->data = (OPJ_BYTE*) opj_malloc(8192);
+                p_code_block->data = (OPJ_BYTE*) opj_malloc(OPJ_J2K_DEFAULT_CBLK_DATA_SIZE);
                 if (! p_code_block->data) {
                         return OPJ_FALSE;
                 }
+                p_code_block->data_max_size = OPJ_J2K_DEFAULT_CBLK_DATA_SIZE;
                 /*fprintf(stderr, "Allocate 8192 elements of code_block->data\n");*/
 
-                l_seg_size = J2K_DEFAULT_NB_SEGS * sizeof(opj_tcd_seg_t);
+                l_seg_size = OPJ_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));*/
+                /*fprintf(stderr, "Allocate %d elements of code_block->data\n", OPJ_J2K_DEFAULT_NB_SEGS * sizeof(opj_tcd_seg_t));*/
 
-                p_code_block->m_current_max_segs = J2K_DEFAULT_NB_SEGS;
+                p_code_block->m_current_max_segs = OPJ_J2K_DEFAULT_NB_SEGS;
                 /*fprintf(stderr, "m_current_max_segs of code_block->data = %d\n", p_code_block->m_current_max_segs);*/
         }
         /* TODO */
@@ -1090,7 +1098,7 @@ OPJ_UINT32 opj_tcd_get_decoded_tile_size ( opj_tcd_t *p_tcd )
         return l_data_size;
 }
 
-opj_bool opj_tcd_encode_tile(   opj_tcd_t *p_tcd,
+OPJ_BOOL opj_tcd_encode_tile(   opj_tcd_t *p_tcd,
                                                         OPJ_UINT32 p_tile_no,
                                                         OPJ_BYTE *p_dest,
                                                         OPJ_UINT32 * p_data_written,
@@ -1174,7 +1182,7 @@ opj_bool opj_tcd_encode_tile(   opj_tcd_t *p_tcd,
         return OPJ_TRUE;
 }
 
-opj_bool opj_tcd_decode_tile(   opj_tcd_t *p_tcd,
+OPJ_BOOL opj_tcd_decode_tile(   opj_tcd_t *p_tcd,
                                 OPJ_BYTE *p_src,
                                 OPJ_UINT32 p_max_length,
                                 OPJ_UINT32 p_tile_no,
@@ -1190,7 +1198,7 @@ opj_bool opj_tcd_decode_tile(   opj_tcd_t *p_tcd,
         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_tcp_t *tcp = &p_tcd->cp->tcps[0];
                         opj_tccp_t *tccp = &tcp->tccps[compno];
                         opj_tcd_tilecomp_t *tilec_idx = &p_tcd->tcd_image->tiles->comps[compno];
                         for (resno = 0; resno < tilec_idx->numresolutions; resno++) {
@@ -1211,8 +1219,7 @@ opj_bool opj_tcd_decode_tile(   opj_tcd_t *p_tcd,
         /*--------------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))
+        if (! opj_tcd_t2_decode(p_tcd, p_src, &l_data_read, p_max_length, p_cstr_index))
         {
                 return OPJ_FALSE;
         }
@@ -1260,7 +1267,7 @@ opj_bool opj_tcd_decode_tile(   opj_tcd_t *p_tcd,
         return OPJ_TRUE;
 }
 
-opj_bool opj_tcd_update_tile_data ( opj_tcd_t *p_tcd,
+OPJ_BOOL opj_tcd_update_tile_data ( opj_tcd_t *p_tcd,
                                     OPJ_BYTE * p_dest,
                                     OPJ_UINT32 p_dest_length
                                     )
@@ -1455,14 +1462,14 @@ void opj_tcd_free_tile(opj_tcd_t *p_tcd)
 }
 
 
-opj_bool opj_tcd_t2_decode (opj_tcd_t *p_tcd,
+OPJ_BOOL opj_tcd_t2_decode (opj_tcd_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_t2_v2_t * l_t2;
+        opj_t2_t * l_t2;
 
         l_t2 = opj_t2_create(p_tcd->image, p_tcd->cp);
         if (l_t2 == 00) {
@@ -1487,7 +1494,7 @@ opj_bool opj_tcd_t2_decode (opj_tcd_t *p_tcd,
         return OPJ_TRUE;
 }
 
-opj_bool opj_tcd_t1_decode ( opj_tcd_t *p_tcd )
+OPJ_BOOL opj_tcd_t1_decode ( opj_tcd_t *p_tcd )
 {
         OPJ_UINT32 compno;
         opj_t1_t * l_t1;
@@ -1517,7 +1524,7 @@ opj_bool opj_tcd_t1_decode ( opj_tcd_t *p_tcd )
 }
 
 
-opj_bool opj_tcd_dwt_decode ( opj_tcd_t *p_tcd )
+OPJ_BOOL opj_tcd_dwt_decode ( opj_tcd_t *p_tcd )
 {
         OPJ_UINT32 compno;
         opj_tcd_tile_t * l_tile = p_tcd->tcd_image->tiles;
@@ -1557,10 +1564,10 @@ opj_bool opj_tcd_dwt_decode ( opj_tcd_t *p_tcd )
 
         return OPJ_TRUE;
 }
-opj_bool opj_tcd_mct_decode ( opj_tcd_t *p_tcd )
+OPJ_BOOL opj_tcd_mct_decode ( opj_tcd_t *p_tcd )
 {
         opj_tcd_tile_t * l_tile = p_tcd->tcd_image->tiles;
-        opj_tcp_v2_t * l_tcp = p_tcd->tcp;
+        opj_tcp_t * l_tcp = p_tcd->tcp;
         opj_tcd_tilecomp_t * l_tile_comp = l_tile->comps;
         OPJ_UINT32 l_samples,i;
 
@@ -1571,7 +1578,13 @@ opj_bool opj_tcd_mct_decode ( opj_tcd_t *p_tcd )
         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) {
+                /* testcase 1336.pdf.asan.47.376 */
+                if ((l_tile->comps[0].x1 - l_tile->comps[0].x0) * (l_tile->comps[0].y1 - l_tile->comps[0].y0) < (OPJ_INT32)l_samples ||
+                    (l_tile->comps[1].x1 - l_tile->comps[1].x0) * (l_tile->comps[1].y1 - l_tile->comps[1].y0) < (OPJ_INT32)l_samples ||
+                    (l_tile->comps[2].x1 - l_tile->comps[2].x0) * (l_tile->comps[2].y1 - l_tile->comps[2].y0) < (OPJ_INT32)l_samples) {
+                        fprintf(stderr, "Tiles don't all have the same dimension. Skip the MCT step.\n");
+                }
+                else if (l_tcp->mct == 2) {
                         OPJ_BYTE ** l_data;
 
                         if (! l_tcp->m_mct_decoding_matrix) {
@@ -1612,10 +1625,10 @@ opj_bool opj_tcd_mct_decode ( opj_tcd_t *p_tcd )
                                                         l_samples);
                         }
                         else {
-                                opj_mct_decode_real(        (float*)l_tile->comps[0].data,
-                                                                        (float*)l_tile->comps[1].data,
-                                                                        (float*)l_tile->comps[2].data,
-                                                                        l_samples);
+                            opj_mct_decode_real((OPJ_FLOAT32*)l_tile->comps[0].data,
+                                                (OPJ_FLOAT32*)l_tile->comps[1].data,
+                                                (OPJ_FLOAT32*)l_tile->comps[2].data,
+                                                l_samples);
                         }
                 }
         }
@@ -1628,14 +1641,13 @@ opj_bool opj_tcd_mct_decode ( opj_tcd_t *p_tcd )
 }
 
 
-opj_bool opj_tcd_dc_level_shift_decode ( opj_tcd_t *p_tcd )
+OPJ_BOOL opj_tcd_dc_level_shift_decode ( opj_tcd_t *p_tcd )
 {
         OPJ_UINT32 compno;
         opj_tcd_tilecomp_t * l_tile_comp = 00;
         opj_tccp_t * l_tccp = 00;
         opj_image_comp_t * l_img_comp = 00;
         opj_tcd_resolution_t* l_res = 00;
-        opj_tcp_v2_t * l_tcp = 00;
         opj_tcd_tile_t * l_tile;
         OPJ_UINT32 l_width,l_height,i,j;
         OPJ_INT32 * l_current_ptr;
@@ -1644,7 +1656,6 @@ opj_bool opj_tcd_dc_level_shift_decode ( opj_tcd_t *p_tcd )
 
         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;
 
@@ -1654,6 +1665,8 @@ opj_bool opj_tcd_dc_level_shift_decode ( opj_tcd_t *p_tcd )
                 l_height = (l_res->y1 - l_res->y0);
                 l_stride = (l_tile_comp->x1 - l_tile_comp->x0) - l_width;
 
+                assert(l_height == 0 || l_width + l_stride <= l_tile_comp->data_size / l_height); /*MUPDF*/
+
                 if (l_img_comp->sgnd) {
                         l_min = -(1 << (l_img_comp->prec - 1));
                         l_max = (1 << (l_img_comp->prec - 1)) - 1;
@@ -1746,7 +1759,7 @@ void opj_tcd_code_block_enc_deallocate (opj_tcd_precinct_t * p_precinct)
                 
                 for     (cblkno = 0; cblkno < l_nb_code_blocks; ++cblkno)  {
                         if (l_code_block->data) {
-                                opj_free(l_code_block->data-1);
+                                opj_free(l_code_block->data - 1);
                                 l_code_block->data = 00;
                         }
 
@@ -1797,20 +1810,18 @@ OPJ_UINT32 opj_tcd_get_encoded_tile_size ( opj_tcd_t *p_tcd )
         return l_data_size;
 }
                 
-opj_bool opj_tcd_dc_level_shift_encode ( opj_tcd_t *p_tcd )
+OPJ_BOOL opj_tcd_dc_level_shift_encode ( opj_tcd_t *p_tcd )
 {
         OPJ_UINT32 compno;
         opj_tcd_tilecomp_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_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;
 
@@ -1839,14 +1850,14 @@ opj_bool opj_tcd_dc_level_shift_encode ( opj_tcd_t *p_tcd )
         return OPJ_TRUE;
 }
 
-opj_bool opj_tcd_mct_encode ( opj_tcd_t *p_tcd )
+OPJ_BOOL opj_tcd_mct_encode ( opj_tcd_t *p_tcd )
 {
         opj_tcd_tile_t * l_tile = p_tcd->tcd_image->tiles;
         opj_tcd_tilecomp_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;
+        opj_tcp_t * l_tcp = p_tcd->tcp;
 
         if(!p_tcd->tcp->mct) {
                 return OPJ_TRUE;
@@ -1894,7 +1905,7 @@ opj_bool opj_tcd_mct_encode ( opj_tcd_t *p_tcd )
         return OPJ_TRUE;
 }
 
-opj_bool opj_tcd_dwt_encode ( opj_tcd_t *p_tcd )
+OPJ_BOOL opj_tcd_dwt_encode ( opj_tcd_t *p_tcd )
 {
         opj_tcd_tile_t * l_tile = p_tcd->tcd_image->tiles;
         opj_tcd_tilecomp_t * l_tile_comp = p_tcd->tcd_image->tiles->comps;
@@ -1920,11 +1931,11 @@ opj_bool opj_tcd_dwt_encode ( opj_tcd_t *p_tcd )
         return OPJ_TRUE;
 }
 
-opj_bool opj_tcd_t1_encode ( opj_tcd_t *p_tcd )
+OPJ_BOOL opj_tcd_t1_encode ( opj_tcd_t *p_tcd )
 {
         opj_t1_t * l_t1;
         const OPJ_FLOAT64 * l_mct_norms;
-        opj_tcp_v2_t * l_tcp = p_tcd->tcp;
+        opj_tcp_t * l_tcp = p_tcd->tcp;
 
         l_t1 = opj_t1_create();
         if (l_t1 == 00) {
@@ -1954,13 +1965,13 @@ opj_bool opj_tcd_t1_encode ( opj_tcd_t *p_tcd )
         return OPJ_TRUE;
 }
 
-opj_bool opj_tcd_t2_encode (opj_tcd_t *p_tcd,
+OPJ_BOOL opj_tcd_t2_encode (opj_tcd_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;
+        opj_t2_t * l_t2;
 
         l_t2 = opj_t2_create(p_tcd->image, p_tcd->cp);
         if (l_t2 == 00) {
@@ -1992,12 +2003,12 @@ opj_bool opj_tcd_t2_encode (opj_tcd_t *p_tcd,
 }
 
 
-opj_bool opj_tcd_rate_allocate_encode(  opj_tcd_t *p_tcd,
+OPJ_BOOL opj_tcd_rate_allocate_encode(  opj_tcd_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_cp_t * l_cp = p_tcd->cp;
         OPJ_UINT32 l_nb_written = 0;
 
         if (p_cstr_info)  {
@@ -2020,7 +2031,7 @@ opj_bool opj_tcd_rate_allocate_encode(  opj_tcd_t *p_tcd,
 }
 
 
-opj_bool opj_tcd_copy_tile_data (       opj_tcd_t *p_tcd,
+OPJ_BOOL opj_tcd_copy_tile_data (       opj_tcd_t *p_tcd,
                                                                     OPJ_BYTE * p_src,
                                                                     OPJ_UINT32 p_src_length )
 {