summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorMickael Savinaud <savmickael@users.noreply.github.com>2012-11-13 15:26:13 +0000
committerMickael Savinaud <savmickael@users.noreply.github.com>2012-11-13 15:26:13 +0000
commit94880d8f36cad8db271c4f48fc5ac229ab4b9d00 (patch)
tree01720497100611a7f43df49be1d830d473f8eba1 /src/lib
parent7307bb6e9ae36f5ca750e1c29ba5423af5df636e (diff)
[trunk] remove warnings raised by flags -Wall -Wextra -pedantic
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/openjp2/t2.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/openjp2/t2.c b/src/lib/openjp2/t2.c
index c783af3d..d1a3ff44 100644
--- a/src/lib/openjp2/t2.c
+++ b/src/lib/openjp2/t2.c
@@ -329,8 +329,8 @@ opj_bool opj_t2_decode_packets( opj_t2_t *p_t2,
opj_pi_iterator_t *l_current_pi = 00;
#ifdef TODO_MSD
OPJ_UINT32 curtp = 0;
-#endif
OPJ_UINT32 tp_start_packno;
+#endif
opj_packet_info_t *l_pack_info = 00;
opj_image_comp_t* l_img_comp = 00;
@@ -348,7 +348,7 @@ opj_bool opj_t2_decode_packets( opj_t2_t *p_t2,
return OPJ_FALSE;
}
- tp_start_packno = 0;
+
l_current_pi = l_pi;
for (pino = 0; pino <= l_tcp->numpocs; ++pino) {
@@ -407,6 +407,7 @@ opj_bool opj_t2_decode_packets( opj_t2_t *p_t2,
if(p_cstr_info) {
opj_tile_info_v2_t *info_TL = &p_cstr_info->tile[p_tile_no];
opj_packet_info_t *info_PK = &info_TL->packet[p_cstr_info->packno];
+ tp_start_packno = 0;
if (!p_cstr_info->packno) {
info_PK->start_pos = info_TL->end_header + 1;
} else if (info_TL->packet[p_cstr_info->packno-1].end_pos >= (OPJ_INT32)p_cstr_info->tile[p_tile_no].tp[curtp].tp_end_pos){ /* New tile part */