diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-10-26 09:39:52 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-10-26 09:39:52 +0000 |
| commit | bcc386e3bbedee9ccf1b6a231f55fdcf8f584e89 (patch) | |
| tree | 1767c47b5417e32ba8f98fdcddc040f8c82cb648 /src/lib/openjp2/jp2.c | |
| parent | a2bd3bb75b111115c317740d40402baa4f56c2a3 (diff) | |
[trunk]remove some warnings raised by Wall
Diffstat (limited to 'src/lib/openjp2/jp2.c')
| -rw-r--r-- | src/lib/openjp2/jp2.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/openjp2/jp2.c b/src/lib/openjp2/jp2.c index 25e4cca6..0b23ec67 100644 --- a/src/lib/openjp2/jp2.c +++ b/src/lib/openjp2/jp2.c @@ -900,10 +900,8 @@ opj_bool opj_jp2_read_cmap( opj_jp2_t * jp2, void opj_jp2_apply_cdef(opj_image_t *image, opj_jp2_color_t *color) { opj_jp2_cdef_info_t *info; - OPJ_INT32 color_space; - OPJ_UINT16 i, n, cn, typ, asoc, acn; + OPJ_UINT16 i, n, cn, asoc, acn; - color_space = image->color_space; info = color->jp2_cdef->info; n = color->jp2_cdef->n; @@ -912,7 +910,8 @@ void opj_jp2_apply_cdef(opj_image_t *image, opj_jp2_color_t *color) /* WATCH: acn = asoc - 1 ! */ if((asoc = info[i].asoc) == 0) continue; - cn = info[i].cn; typ = info[i].typ; acn = asoc - 1; + cn = info[i].cn; + acn = asoc - 1; if(cn != acn) { |