[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 2e9e3234771e412041f3248674311ae92e7770f5..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", 
@@ -1414,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;
                                }
                        }
                }