From bfd3fe8a4aafb263fedc56345f3e048e52e56326 Mon Sep 17 00:00:00 2001 From: Antonin Descampe Date: Thu, 10 Sep 2009 12:29:51 +0000 Subject: [PATCH] fixed minor bugs which were triggering warnings at compilation (different signedness, wrong pointer type, etc) --- ChangeLog | 3 +++ codec/convert.c | 2 +- codec/index.c | 2 +- libopenjpeg/t1_generate_luts.c | 8 ++++---- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index ea792bfe..c2ee8678 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ What's New for OpenJPEG ! : changed + : added +September 10, 2009 +* [antonin] fixed minor bugs which were triggering warnings at compilation (different signedness, wrong pointer type, etc) + September 8, 2009 * [antonin] openjpeg.c : fixed initialization of parameters->cp_disto_alloc/fixed_quality/fixed_alloc/tcp_numlayers because they were preventing to use the -q and -f options. diff --git a/codec/convert.c b/codec/convert.c index 3f3384df..465b0e0b 100644 --- a/codec/convert.c +++ b/codec/convert.c @@ -99,7 +99,7 @@ typedef struct tga_header } tga_header; #pragma pack(pop) // Return to normal structure packing alignment. -int tga_readheader(FILE *fp, int *bits_per_pixel, int *width, int *height, int *flip_image) +int tga_readheader(FILE *fp, uint32 *bits_per_pixel, uint32 *width, uint32 *height, int *flip_image) { int palette_size; tga_header tga ; diff --git a/codec/index.c b/codec/index.c index 2e0283dd..873b3403 100644 --- a/codec/index.c +++ b/codec/index.c @@ -79,7 +79,7 @@ int write_index_file(opj_codestream_info_t *cstr_info, char *index) { fprintf(stream, "%d %d\n", cstr_info->tw, cstr_info->th); fprintf(stream, "%d\n", cstr_info->numcomps); fprintf(stream, "%d\n", cstr_info->numlayers); - fprintf(stream, "%d\n", cstr_info->numdecompos); + fprintf(stream, "%d\n", cstr_info->numdecompos[0]); /* based on component 0 */ for (resno = cstr_info->numdecompos[0]; resno >= 0; resno--) { fprintf(stream, "[%d,%d] ", diff --git a/libopenjpeg/t1_generate_luts.c b/libopenjpeg/t1_generate_luts.c index 1925b951..39880414 100644 --- a/libopenjpeg/t1_generate_luts.c +++ b/libopenjpeg/t1_generate_luts.c @@ -260,16 +260,16 @@ int main(){ } printf("static short lut_nmsedec_sig[1 << T1_NMSEDEC_BITS] = {\n "); - dump_array16(&lut_nmsedec_sig, 1 << T1_NMSEDEC_BITS); + dump_array16(lut_nmsedec_sig, 1 << T1_NMSEDEC_BITS); printf("static short lut_nmsedec_sig0[1 << T1_NMSEDEC_BITS] = {\n "); - dump_array16(&lut_nmsedec_sig0, 1 << T1_NMSEDEC_BITS); + dump_array16(lut_nmsedec_sig0, 1 << T1_NMSEDEC_BITS); printf("static short lut_nmsedec_ref[1 << T1_NMSEDEC_BITS] = {\n "); - dump_array16(&lut_nmsedec_ref, 1 << T1_NMSEDEC_BITS); + dump_array16(lut_nmsedec_ref, 1 << T1_NMSEDEC_BITS); printf("static short lut_nmsedec_ref0[1 << T1_NMSEDEC_BITS] = {\n "); - dump_array16(&lut_nmsedec_ref0, 1 << T1_NMSEDEC_BITS); + dump_array16(lut_nmsedec_ref0, 1 << T1_NMSEDEC_BITS); return 0; }