removed unused parameters warnings with the solution proposed by myself and Bob Friesenhahn
This commit is contained in:
parent
df44837b07
commit
676f8f189f
3
CHANGES
3
CHANGES
|
@ -5,6 +5,9 @@ What's New for OpenJPEG
|
||||||
! : changed
|
! : changed
|
||||||
+ : added
|
+ : added
|
||||||
|
|
||||||
|
August 10, 2011
|
||||||
|
! [mickael] removed unused parameters warnings with the solution proposed by myself and Bob Friesenhahn.
|
||||||
|
|
||||||
August 9, 2011
|
August 9, 2011
|
||||||
- [antonin] removed xcode project files (cmake and autotools are now the only supported build methods)
|
- [antonin] removed xcode project files (cmake and autotools are now the only supported build methods)
|
||||||
|
|
||||||
|
|
|
@ -200,8 +200,10 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,i
|
||||||
option_t long_option[]={
|
option_t long_option[]={
|
||||||
{"ImgDir",REQ_ARG, NULL ,'y'},
|
{"ImgDir",REQ_ARG, NULL ,'y'},
|
||||||
};
|
};
|
||||||
|
|
||||||
const char optlist[] = "i:o:h";
|
const char optlist[] = "i:o:h";
|
||||||
|
|
||||||
|
OPJ_ARG_NOT_USED(indexfilename);
|
||||||
|
|
||||||
totlen=sizeof(long_option);
|
totlen=sizeof(long_option);
|
||||||
img_fol->set_out_format = 0;
|
img_fol->set_out_format = 0;
|
||||||
do {
|
do {
|
||||||
|
|
|
@ -297,6 +297,9 @@ static int j2k_get_num_tp(opj_cp_t *cp,int pino,int tileno){
|
||||||
/** mem allocation for TLM marker*/
|
/** mem allocation for TLM marker*/
|
||||||
int j2k_calculate_tp(opj_cp_t *cp,int img_numcomp,opj_image_t *image,opj_j2k_t *j2k ){
|
int j2k_calculate_tp(opj_cp_t *cp,int img_numcomp,opj_image_t *image,opj_j2k_t *j2k ){
|
||||||
int pino,tileno,totnum_tp=0;
|
int pino,tileno,totnum_tp=0;
|
||||||
|
|
||||||
|
OPJ_ARG_NOT_USED(img_numcomp);
|
||||||
|
|
||||||
j2k->cur_totnum_tp = (int *) opj_malloc(cp->tw * cp->th * sizeof(int));
|
j2k->cur_totnum_tp = (int *) opj_malloc(cp->tw * cp->th * sizeof(int));
|
||||||
for (tileno = 0; tileno < cp->tw * cp->th; tileno++) {
|
for (tileno = 0; tileno < cp->tw * cp->th; tileno++) {
|
||||||
int cur_totnum_tp = 0;
|
int cur_totnum_tp = 0;
|
||||||
|
@ -1848,8 +1851,9 @@ opj_image_t* j2k_decode_jpt_stream(opj_j2k_t *j2k, opj_cio_t *cio, opj_codestre
|
||||||
opj_jpt_msg_header_t header;
|
opj_jpt_msg_header_t header;
|
||||||
int position;
|
int position;
|
||||||
|
|
||||||
opj_common_ptr cinfo = j2k->cinfo;
|
OPJ_ARG_NOT_USED(cstr_info);
|
||||||
|
|
||||||
|
opj_common_ptr cinfo = j2k->cinfo;
|
||||||
j2k->cio = cio;
|
j2k->cio = cio;
|
||||||
|
|
||||||
/* create an empty image */
|
/* create an empty image */
|
||||||
|
|
|
@ -398,6 +398,9 @@ static opj_bool jp2_read_pclr(opj_jp2_t *jp2, opj_cio_t *cio,
|
||||||
unsigned short i, j;
|
unsigned short i, j;
|
||||||
unsigned char uc;
|
unsigned char uc;
|
||||||
|
|
||||||
|
OPJ_ARG_NOT_USED(box);
|
||||||
|
OPJ_ARG_NOT_USED(jp2);
|
||||||
|
|
||||||
/* Part 1, I.5.3.4: 'There shall be at most one Palette box inside
|
/* Part 1, I.5.3.4: 'There shall be at most one Palette box inside
|
||||||
* a JP2 Header box' :
|
* a JP2 Header box' :
|
||||||
*/
|
*/
|
||||||
|
@ -446,6 +449,9 @@ static opj_bool jp2_read_cmap(opj_jp2_t *jp2, opj_cio_t *cio,
|
||||||
opj_jp2_cmap_comp_t *cmap;
|
opj_jp2_cmap_comp_t *cmap;
|
||||||
unsigned short i, nr_channels;
|
unsigned short i, nr_channels;
|
||||||
|
|
||||||
|
OPJ_ARG_NOT_USED(box);
|
||||||
|
OPJ_ARG_NOT_USED(jp2);
|
||||||
|
|
||||||
/* Need nr_channels: */
|
/* Need nr_channels: */
|
||||||
if(color->jp2_pclr == NULL) return OPJ_FALSE;
|
if(color->jp2_pclr == NULL) return OPJ_FALSE;
|
||||||
|
|
||||||
|
@ -511,6 +517,9 @@ static opj_bool jp2_read_cdef(opj_jp2_t *jp2, opj_cio_t *cio,
|
||||||
opj_jp2_cdef_info_t *info;
|
opj_jp2_cdef_info_t *info;
|
||||||
unsigned short i, n;
|
unsigned short i, n;
|
||||||
|
|
||||||
|
OPJ_ARG_NOT_USED(box);
|
||||||
|
OPJ_ARG_NOT_USED(jp2);
|
||||||
|
|
||||||
/* Part 1, I.5.3.6: 'The shall be at most one Channel Definition box
|
/* Part 1, I.5.3.6: 'The shall be at most one Channel Definition box
|
||||||
* inside a JP2 Header box.'
|
* inside a JP2 Header box.'
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -36,6 +36,10 @@
|
||||||
#ifndef OPJ_STATIC
|
#ifndef OPJ_STATIC
|
||||||
BOOL APIENTRY
|
BOOL APIENTRY
|
||||||
DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {
|
DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {
|
||||||
|
|
||||||
|
OPJ_ARG_NOT_USED(lpReserved);
|
||||||
|
OPJ_ARG_NOT_USED(hModule);
|
||||||
|
|
||||||
switch (ul_reason_for_call) {
|
switch (ul_reason_for_call) {
|
||||||
case DLL_PROCESS_ATTACH :
|
case DLL_PROCESS_ATTACH :
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -104,6 +104,9 @@ static INLINE long lrintf(float f){
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Avoid compile-time warning because parameter is not used
|
||||||
|
#define OPJ_ARG_NOT_USED(x) (void)(x)
|
||||||
|
|
||||||
#include "j2k_lib.h"
|
#include "j2k_lib.h"
|
||||||
#include "opj_malloc.h"
|
#include "opj_malloc.h"
|
||||||
#include "event.h"
|
#include "event.h"
|
||||||
|
|
|
@ -382,9 +382,10 @@ static INLINE void t1_dec_sigpass_step_raw(
|
||||||
int vsc)
|
int vsc)
|
||||||
{
|
{
|
||||||
int v, flag;
|
int v, flag;
|
||||||
|
|
||||||
opj_raw_t *raw = t1->raw; /* RAW component */
|
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);
|
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))) {
|
if ((flag & T1_SIG_OTH) && !(flag & (T1_SIG | T1_VISIT))) {
|
||||||
if (raw_decode(raw)) {
|
if (raw_decode(raw)) {
|
||||||
|
@ -823,9 +824,10 @@ static void t1_dec_clnpass_step_partial(
|
||||||
int oneplushalf)
|
int oneplushalf)
|
||||||
{
|
{
|
||||||
int v, flag;
|
int v, flag;
|
||||||
|
|
||||||
opj_mqc_t *mqc = t1->mqc; /* MQC component */
|
opj_mqc_t *mqc = t1->mqc; /* MQC component */
|
||||||
|
|
||||||
|
OPJ_ARG_NOT_USED(orient);
|
||||||
|
|
||||||
flag = *flagsp;
|
flag = *flagsp;
|
||||||
mqc_setcurctx(mqc, t1_getctxno_sc(flag));
|
mqc_setcurctx(mqc, t1_getctxno_sc(flag));
|
||||||
v = mqc_decode(mqc) ^ t1_getspb(flag);
|
v = mqc_decode(mqc) ^ t1_getspb(flag);
|
||||||
|
|
|
@ -676,6 +676,8 @@ void tcd_malloc_decode_tile(opj_tcd_t *tcd, opj_image_t * image, opj_cp_t * cp,
|
||||||
opj_tcp_t *tcp;
|
opj_tcp_t *tcp;
|
||||||
opj_tcd_tile_t *tile;
|
opj_tcd_tile_t *tile;
|
||||||
|
|
||||||
|
OPJ_ARG_NOT_USED(cstr_info);
|
||||||
|
|
||||||
tcd->cp = cp;
|
tcd->cp = cp;
|
||||||
|
|
||||||
tcp = &(cp->tcps[cp->tileno[tileno]]);
|
tcp = &(cp->tcps[cp->tileno[tileno]]);
|
||||||
|
|
Loading…
Reference in New Issue