From 18e7fcc37f8d3585f015755c81769852526aedcc Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Mon, 29 Oct 2012 10:08:35 +0000 Subject: [PATCH] [trunk] remove warnings related to the use of -Wall -Wextra -pedantic --- src/lib/openjp2/j2k.c | 6 +----- src/lib/openjp2/pi.c | 4 ++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c index 03c4d9ef..50fa25e3 100644 --- a/src/lib/openjp2/j2k.c +++ b/src/lib/openjp2/j2k.c @@ -1863,7 +1863,7 @@ static opj_bool opj_j2k_read_siz(opj_j2k_t *p_j2k, opj_event_mgr_t * p_manager ) { - OPJ_UINT32 l_size, i; + OPJ_UINT32 i; OPJ_UINT32 l_nb_comp; OPJ_UINT32 l_nb_comp_remain; OPJ_UINT32 l_remaining_size; @@ -1896,8 +1896,6 @@ static opj_bool opj_j2k_read_siz(opj_j2k_t *p_j2k, return OPJ_FALSE; } - l_size = p_header_size + 2; /* Lsiz */ - opj_read_bytes(p_header_data,&l_tmp ,2); /* Rsiz (capabilities) */ p_header_data+=2; l_cp->rsiz = (OPJ_RSIZ_CAPABILITIES) l_tmp; @@ -2578,7 +2576,6 @@ opj_bool opj_j2k_write_qcd( opj_j2k_t *p_j2k, opj_event_mgr_t * p_manager ) { - opj_cp_t *l_cp = 00; OPJ_UINT32 l_qcd_size,l_remaining_size; OPJ_BYTE * l_current_data = 00; @@ -2587,7 +2584,6 @@ opj_bool opj_j2k_write_qcd( opj_j2k_t *p_j2k, assert(p_manager != 00); assert(p_stream != 00); - l_cp = &(p_j2k->m_cp); l_qcd_size = 4 + opj_j2k_get_SQcd_SQcc_size(p_j2k,p_j2k->m_current_tile_number,0); l_remaining_size = l_qcd_size; diff --git a/src/lib/openjp2/pi.c b/src/lib/openjp2/pi.c index 699afa69..ea8a2285 100644 --- a/src/lib/openjp2/pi.c +++ b/src/lib/openjp2/pi.c @@ -862,6 +862,8 @@ void opj_pi_update_encode_poc_and_final ( opj_cp_t *p_cp, /* number of pocs*/ OPJ_UINT32 l_poc_bound; + OPJ_ARG_NOT_USED(p_max_res); + /* preconditions in debug*/ assert(p_cp != 00); assert(p_tileno < p_cp->tw * p_cp->th); @@ -986,6 +988,8 @@ void opj_pi_update_decode_poc (opj_pi_iterator_t * p_pi, opj_pi_iterator_t * l_current_pi = 00; opj_poc_t* l_current_poc = 0; + OPJ_ARG_NOT_USED(p_max_res); + /* preconditions in debug*/ assert(p_pi != 00); assert(p_tcp != 00);