summaryrefslogtreecommitdiff
path: root/codec
diff options
context:
space:
mode:
authorAntonin Descampe <antonin@gmail.com>2009-09-10 12:29:51 +0000
committerAntonin Descampe <antonin@gmail.com>2009-09-10 12:29:51 +0000
commitbfd3fe8a4aafb263fedc56345f3e048e52e56326 (patch)
treea1a481c28b27a9ba06188d0d2f8f3d2c6c0dc676 /codec
parent9dbbc6ca1392d32dffd1a75d23b7447e88c4faf2 (diff)
fixed minor bugs which were triggering warnings at compilation (different signedness, wrong pointer type, etc)
Diffstat (limited to 'codec')
-rw-r--r--codec/convert.c2
-rw-r--r--codec/index.c2
2 files changed, 2 insertions, 2 deletions
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] ",