walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

[trunk] remove warnings raised by flags -Wall -Wextra -pedantic

This commit is contained in:
Mickael Savinaud 2012-11-13 17:35:15 +00:00
parent 0e3c467a5b
commit e3c2305ff4
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lib/openjp2/event.c
View File

@ -114,6 +114,7 @@ opj_bool opj_event_msg(opj_event_mgr_t* p_event_mgr, int event_type, const char
va_start(arg, fmt);
/* check the length of the format string */
str_length = (strlen(fmt) > MSG_SIZE) ? MSG_SIZE : strlen(fmt);
(void)str_length;
/* parse the format string and put the result in 'message' */
vsprintf(message, fmt, arg); /* UniPG */
/* deinitialize the optional parameter list */

12
src/lib/openjp2/pi.c
View File

@ -322,8 +322,8 @@ opj_bool opj_pi_next_rpcl(opj_pi_iterator_t * pi) {
res = &comp->resolutions[resno];
dx = comp->dx * (1 << (res->pdx + comp->numresolutions - 1 - resno));
dy = comp->dy * (1 << (res->pdy + comp->numresolutions - 1 - resno));
pi->dx = !pi->dx ? dx : opj_int_min(pi->dx, dx);
pi->dy = !pi->dy ? dy : opj_int_min(pi->dy, dy);
pi->dx = !pi->dx ? dx : opj_uint_min(pi->dx, dx);
pi->dy = !pi->dy ? dy : opj_uint_min(pi->dy, dy);
}
}
}
@ -406,8 +406,8 @@ opj_bool opj_pi_next_pcrl(opj_pi_iterator_t * pi) {
res = &comp->resolutions[resno];
dx = comp->dx * (1 << (res->pdx + comp->numresolutions - 1 - resno));
dy = comp->dy * (1 << (res->pdy + comp->numresolutions - 1 - resno));
pi->dx = !pi->dx ? dx : opj_int_min(pi->dx, dx);
pi->dy = !pi->dy ? dy : opj_int_min(pi->dy, dy);
pi->dx = !pi->dx ? dx : opj_uint_min(pi->dx, dx);
pi->dy = !pi->dy ? dy : opj_uint_min(pi->dy, dy);
}
}
}
@ -489,8 +489,8 @@ opj_bool opj_pi_next_cprl(opj_pi_iterator_t * pi) {
res = &comp->resolutions[resno];
dx = comp->dx * (1 << (res->pdx + comp->numresolutions - 1 - resno));
dy = comp->dy * (1 << (res->pdy + comp->numresolutions - 1 - resno));
pi->dx = !pi->dx ? dx : opj_int_min(pi->dx, dx);
pi->dy = !pi->dy ? dy : opj_int_min(pi->dy, dy);
pi->dx = !pi->dx ? dx : opj_uint_min(pi->dx, dx);
pi->dy = !pi->dy ? dy : opj_uint_min(pi->dy, dy);
}
if (!pi->tp_on){
pi->poc.ty0 = pi->ty0;