summaryrefslogtreecommitdiff
path: root/src/lib/openjp2/t1.c
diff options
context:
space:
mode:
authorMickael Savinaud <savmickael@users.noreply.github.com>2012-10-26 10:04:55 +0000
committerMickael Savinaud <savmickael@users.noreply.github.com>2012-10-26 10:04:55 +0000
commitcdea5c8eefde8a7837a9245ac3f9a3dc8b18aa27 (patch)
tree223729a0124961faf779c85ace9be28dad5ee38b /src/lib/openjp2/t1.c
parentbcc386e3bbedee9ccf1b6a231f55fdcf8f584e89 (diff)
[trunk] remove some warnings from -Wall -Wextra -pedantic
Diffstat (limited to 'src/lib/openjp2/t1.c')
-rw-r--r--src/lib/openjp2/t1.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/lib/openjp2/t1.c b/src/lib/openjp2/t1.c
index bd1105b6..8b33dc4a 100644
--- a/src/lib/openjp2/t1.c
+++ b/src/lib/openjp2/t1.c
@@ -169,20 +169,20 @@ static void opj_t1_dec_refpass_step(opj_t1_t *t1,
OPJ_BYTE type,
OPJ_UINT32 vsc);
-static void INLINE opj_t1_dec_refpass_step_raw(
+static INLINE void opj_t1_dec_refpass_step_raw(
opj_t1_t *t1,
opj_flag_t *flagsp,
int *datap,
int poshalf,
int neghalf,
int vsc);
-static void INLINE opj_t1_dec_refpass_step_mqc(
+static INLINE void opj_t1_dec_refpass_step_mqc(
opj_t1_t *t1,
opj_flag_t *flagsp,
int *datap,
int poshalf,
int neghalf);
-static void INLINE opj_t1_dec_refpass_step_mqc_vsc(
+static INLINE void opj_t1_dec_refpass_step_mqc_vsc(
opj_t1_t *t1,
opj_flag_t *flagsp,
int *datap,
@@ -401,8 +401,8 @@ static INLINE void opj_t1_dec_sigpass_step_raw(
int vsc)
{
int v, flag;
-
opj_raw_t *raw = t1->raw; /* RAW component */
+ OPJ_ARG_NOT_USED(orient);
flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
if ((flag & T1_SIG_OTH) && !(flag & (T1_SIG | T1_VISIT))) {
@@ -1130,6 +1130,7 @@ static OPJ_FLOAT64 opj_t1_getwmsedec(
const OPJ_FLOAT64 * mct_norms)
{
OPJ_FLOAT64 w1 = 1, w2, wmsedec;
+ OPJ_ARG_NOT_USED(numcomps);
if (mct_norms) {
w1 = mct_norms[compno];
@@ -1337,11 +1338,11 @@ opj_bool opj_t1_decode_cblks( opj_t1_t* t1,
tiledp += tile_w;
}
}
- //opj_free(cblk->data);
- //opj_free(cblk->segs);
+ /*opj_free(cblk->data);
+ opj_free(cblk->segs);*/
/*cblk->segs = 00;*/
} /* cblkno */
- //opj_free(precinct->cblks.dec);
+ /*opj_free(precinct->cblks.dec);*/
} /* precno */
} /* bandno */
} /* resno */