[1.5] Remove another set of simple warnings
This commit is contained in:
Mathieu Malaterre
parent
773bd89130
commit
6fc2b56847
|
|
@ -126,14 +126,18 @@ static int tga_readheader(FILE *fp, unsigned int *bits_per_pixel,
|
|||
}
|
||||
id_len = (unsigned char)tga[0];
|
||||
cmap_type = (unsigned char)tga[1];
|
||||
(void)cmap_type;
|
||||
image_type = (unsigned char)tga[2];
|
||||
cmap_index = get_ushort(*(unsigned short*)(&tga[3]));
|
||||
(void)cmap_index;
|
||||
cmap_len = get_ushort(*(unsigned short*)(&tga[5]));
|
||||
cmap_entry_size = (unsigned char)tga[7];
|
||||
|
||||
|
||||
x_origin = get_ushort(*(unsigned short*)(&tga[8]));
|
||||
(void)x_origin;
|
||||
y_origin = get_ushort(*(unsigned short*)(&tga[10]));
|
||||
(void)y_origin;
|
||||
image_w = get_ushort(*(unsigned short*)(&tga[12]));
|
||||
image_h = get_ushort(*(unsigned short*)(&tga[14]));
|
||||
pixel_depth = (unsigned char)tga[16];
|
||||
|
|
|
|||
|
|
@ -293,12 +293,14 @@ void color_apply_icc_profile(opj_image_t *image)
|
|||
if(in_prof == NULL) return;
|
||||
|
||||
in_space = cmsGetPCS(in_prof);
|
||||
(void)in_space;
|
||||
out_space = cmsGetColorSpace(in_prof);
|
||||
intent = cmsGetHeaderRenderingIntent(in_prof);
|
||||
|
||||
|
||||
max_w = image->comps[0].w; max_h = image->comps[0].h;
|
||||
prec = image->comps[0].prec;
|
||||
(void)prec;
|
||||
oldspace = image->color_space;
|
||||
|
||||
if(out_space == cmsSigRgbData) /* enumCS 16 */
|
||||
|
|
|
|||
|
|
@ -466,6 +466,8 @@ static void j2k_read_siz(opj_j2k_t *j2k) {
|
|||
/* update components number in the jpwl_exp_comps filed */
|
||||
cp->exp_comps = image->numcomps;
|
||||
}
|
||||
#else
|
||||
(void)len;
|
||||
#endif /* USE_JPWL */
|
||||
|
||||
/* prevent division by zero */
|
||||
|
|
@ -476,7 +478,7 @@ static void j2k_read_siz(opj_j2k_t *j2k) {
|
|||
|
||||
image->comps = (opj_image_comp_t*) opj_calloc(image->numcomps, sizeof(opj_image_comp_t));
|
||||
for (i = 0; i < image->numcomps; i++) {
|
||||
int tmp, w, h;
|
||||
int tmp;
|
||||
tmp = cio_read(cio, 1); /* Ssiz_i */
|
||||
image->comps[i].prec = (tmp & 0x7f) + 1;
|
||||
image->comps[i].sgnd = tmp >> 7;
|
||||
|
|
@ -518,10 +520,6 @@ static void j2k_read_siz(opj_j2k_t *j2k) {
|
|||
return;
|
||||
}
|
||||
|
||||
/* TODO: unused ? */
|
||||
w = int_ceildiv(image->x1 - image->x0, image->comps[i].dx);
|
||||
h = int_ceildiv(image->y1 - image->y0, image->comps[i].dy);
|
||||
|
||||
image->comps[i].resno_decoded = 0; /* number of resolution decoded */
|
||||
image->comps[i].factor = cp->reduce; /* reducing factor per component */
|
||||
}
|
||||
|
|
@ -781,6 +779,7 @@ static void j2k_read_cod(opj_j2k_t *j2k) {
|
|||
opj_image_t *image = j2k->image;
|
||||
|
||||
len = cio_read(cio, 2); /* Lcod */
|
||||
(void)len;
|
||||
tcp->csty = cio_read(cio, 1); /* Scod */
|
||||
tcp->prg = (OPJ_PROG_ORDER)cio_read(cio, 1); /* SGcod (A) */
|
||||
tcp->numlayers = cio_read(cio, 2); /* SGcod (B) */
|
||||
|
|
@ -834,6 +833,7 @@ static void j2k_read_coc(opj_j2k_t *j2k) {
|
|||
opj_cio_t *cio = j2k->cio;
|
||||
|
||||
len = cio_read(cio, 2); /* Lcoc */
|
||||
(void)len;
|
||||
compno = cio_read(cio, image->numcomps <= 256 ? 1 : 2); /* Ccoc */
|
||||
if (compno >= image->numcomps) {
|
||||
opj_event_msg(j2k->cinfo, EVT_ERROR,
|
||||
|
|
@ -1099,9 +1099,12 @@ static void j2k_read_crg(opj_j2k_t *j2k) {
|
|||
int numcomps = j2k->image->numcomps;
|
||||
|
||||
len = cio_read(cio, 2); /* Lcrg */
|
||||
(void)len;
|
||||
for (i = 0; i < numcomps; i++) {
|
||||
Xcrg_i = cio_read(cio, 2); /* Xcrg_i */
|
||||
(void)Xcrg_i;
|
||||
Ycrg_i = cio_read(cio, 2); /* Ycrg_i */
|
||||
(void)Ycrg_i;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1113,13 +1116,16 @@ static void j2k_read_tlm(opj_j2k_t *j2k) {
|
|||
|
||||
len = cio_read(cio, 2); /* Ltlm */
|
||||
Ztlm = cio_read(cio, 1); /* Ztlm */
|
||||
(void)Ztlm;
|
||||
Stlm = cio_read(cio, 1); /* Stlm */
|
||||
ST = ((Stlm >> 4) & 0x01) + ((Stlm >> 4) & 0x02);
|
||||
SP = (Stlm >> 6) & 0x01;
|
||||
tile_tlm = (len - 4) / ((SP + 1) * 2 + ST);
|
||||
for (i = 0; i < tile_tlm; i++) {
|
||||
Ttlm_i = cio_read(cio, ST); /* Ttlm_i */
|
||||
(void)Ttlm_i;
|
||||
Ptlm_i = cio_read(cio, SP ? 4 : 2); /* Ptlm_i */
|
||||
(void)Ptlm_i;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1130,6 +1136,7 @@ static void j2k_read_plm(opj_j2k_t *j2k) {
|
|||
|
||||
len = cio_read(cio, 2); /* Lplm */
|
||||
Zplm = cio_read(cio, 1); /* Zplm */
|
||||
(void)Zplm;
|
||||
len -= 3;
|
||||
while (len > 0) {
|
||||
Nplm = cio_read(cio, 4); /* Nplm */
|
||||
|
|
@ -1155,6 +1162,7 @@ static void j2k_read_plt(opj_j2k_t *j2k) {
|
|||
|
||||
len = cio_read(cio, 2); /* Lplt */
|
||||
Zplt = cio_read(cio, 1); /* Zplt */
|
||||
(void)Zplt;
|
||||
for (i = len - 3; i > 0; i--) {
|
||||
add = cio_read(cio, 1);
|
||||
packet_len = (packet_len << 7) + add; /* Iplt_i */
|
||||
|
|
@ -1302,6 +1310,7 @@ static void j2k_read_sot(opj_j2k_t *j2k) {
|
|||
opj_cio_t *cio = j2k->cio;
|
||||
|
||||
len = cio_read(cio, 2);
|
||||
(void)len;
|
||||
tileno = cio_read(cio, 2);
|
||||
|
||||
#ifdef USE_JPWL
|
||||
|
|
@ -1579,8 +1588,10 @@ static void j2k_read_rgn(opj_j2k_t *j2k) {
|
|||
int numcomps = j2k->image->numcomps;
|
||||
|
||||
len = cio_read(cio, 2); /* Lrgn */
|
||||
(void)len;
|
||||
compno = cio_read(cio, numcomps <= 256 ? 1 : 2); /* Crgn */
|
||||
roisty = cio_read(cio, 1); /* Srgn */
|
||||
(void)roisty;
|
||||
|
||||
#ifdef USE_JPWL
|
||||
if (j2k->cp->correct) {
|
||||
|
|
|
|||
|
|
@ -522,10 +522,8 @@ static opj_bool jp2_read_cmap(opj_jp2_t *jp2, opj_cio_t *cio,
|
|||
static void jp2_apply_cdef(opj_image_t *image, opj_jp2_color_t *color)
|
||||
{
|
||||
opj_jp2_cdef_info_t *info;
|
||||
int color_space;
|
||||
unsigned short i, n, cn, typ, asoc, acn;
|
||||
|
||||
color_space = image->color_space;
|
||||
info = color->jp2_cdef->info;
|
||||
n = color->jp2_cdef->n;
|
||||
|
||||
|
|
@ -535,6 +533,7 @@ static void jp2_apply_cdef(opj_image_t *image, opj_jp2_color_t *color)
|
|||
if((asoc = info[i].asoc) == 0) continue;
|
||||
|
||||
cn = info[i].cn; typ = info[i].typ; acn = asoc - 1;
|
||||
(void)typ;
|
||||
|
||||
if(cn != acn)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -215,7 +215,7 @@ int main(){
|
|||
}
|
||||
printf("%i\n};\n\n", lut_ctxno_zc[1023]);
|
||||
|
||||
// lut_ctxno_sc
|
||||
/* lut_ctxno_sc */
|
||||
printf("static char lut_ctxno_sc[256] = {\n ");
|
||||
for (i = 0; i < 255; ++i) {
|
||||
printf("0x%x, ", t1_init_ctxno_sc(i << 4));
|
||||
|
|
@ -224,7 +224,7 @@ int main(){
|
|||
}
|
||||
printf("0x%x\n};\n\n", t1_init_ctxno_sc(255 << 4));
|
||||
|
||||
// lut_spb
|
||||
/* lut_spb */
|
||||
printf("static char lut_spb[256] = {\n ");
|
||||
for (i = 0; i < 255; ++i) {
|
||||
printf("%i, ", t1_init_spb(i << 4));
|
||||
|
|
|
|||
|
|
@ -250,7 +250,9 @@ void tcd_malloc_encode(opj_tcd_t *tcd, opj_image_t * image, opj_cp_t * cp, int c
|
|||
cbgwidthexpn = pdx - 1;
|
||||
cbgheightexpn = pdy - 1;
|
||||
}
|
||||
|
||||
(void)brcbgyend;
|
||||
(void)brcbgxend;
|
||||
|
||||
cblkwidthexpn = int_min(tccp->cblkw, cbgwidthexpn);
|
||||
cblkheightexpn = int_min(tccp->cblkh, cbgheightexpn);
|
||||
|
||||
|
|
@ -512,6 +514,8 @@ void tcd_init_encode(opj_tcd_t *tcd, opj_image_t * image, opj_cp_t * cp, int cur
|
|||
cbgwidthexpn = pdx - 1;
|
||||
cbgheightexpn = pdy - 1;
|
||||
}
|
||||
(void)brcbgyend;
|
||||
(void)brcbgxend;
|
||||
|
||||
cblkwidthexpn = int_min(tccp->cblkw, cbgwidthexpn);
|
||||
cblkheightexpn = int_min(tccp->cblkh, cbgheightexpn);
|
||||
|
|
@ -760,6 +764,8 @@ void tcd_malloc_decode_tile(opj_tcd_t *tcd, opj_image_t * image, opj_cp_t * cp,
|
|||
cbgwidthexpn = pdx - 1;
|
||||
cbgheightexpn = pdy - 1;
|
||||
}
|
||||
(void)brcbgyend;
|
||||
(void)brcbgxend;
|
||||
|
||||
cblkwidthexpn = int_min(tccp->cblkw, cbgwidthexpn);
|
||||
cblkheightexpn = int_min(tccp->cblkh, cbgheightexpn);
|
||||
|
|
|
|||
Loading…
Reference in New Issue