[trunk] merge r1323 from branch 1.5 over to trunk

[openjpeg.git] / libopenjpeg / tcd.c

diff --git a/libopenjpeg/tcd.c b/libopenjpeg/tcd.c
index e3a7dd3222251a03456af2e9848eb73b8f4e2762..8bd190acd2f074205e114dac332111069615df3d 100644 (file)
--- a/libopenjpeg/tcd.c
+++ b/libopenjpeg/tcd.c
@@ -33,7 +33,7 @@
 #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;
+       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", 
@@ -352,6 +352,7 @@ void tcd_malloc_encode(opj_tcd_t *tcd, opj_image_t * image, opj_cp_t * cp, int c
                                        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++) {
@@ -718,7 +719,7 @@ void tcd_malloc_decode(opj_tcd_t *tcd, opj_image_t * image, opj_cp_t * cp) {
                        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->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);
                }
@@ -1413,7 +1414,7 @@ opj_bool tcd_decode_tile(opj_tcd_t *tcd, unsigned char *src, int len, int tileno
                                }
                                else {
                                        cstr_info->tile[tileno].pdx[resno] = 15;
-                                       cstr_info->tile[tileno].pdx[resno] = 15;
+                                       cstr_info->tile[tileno].pdy[resno] = 15;
                                }
                        }
                }
@@ -1714,7 +1715,7 @@ opj_bool FUNCTION (       opj_tcd_v2_t *p_tcd,                                                                            \
                }                                                                                                                                               \
                                                                                                                                                                \
                if (l_tilec->data == 00) {                                                                                              \
-            l_tilec->data = (OPJ_INT32 *) opj_aligned_malloc(l_data_size);             \
+            l_tilec->data = (OPJ_INT32 *) opj_malloc(l_data_size);             \
                        if (! l_tilec->data ) {                                                                                         \
                                return OPJ_FALSE;                                                                                               \
                        }                                                                                                                                       \
@@ -2301,7 +2302,7 @@ void tcd_free_tile(opj_tcd_v2_t *p_tcd)
                }
 
                if (l_tile_comp->data) {
-                       opj_aligned_free(l_tile_comp->data);
+                       opj_free(l_tile_comp->data);
                        l_tile_comp->data = 00;
                }
                ++l_tile_comp;