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

[1.5] j2k_to_image does not support writing image with precision less than 8bits. Simply give up for now. Thanks to winfried for report. Also add static keyword for undeclared function in convert.h

This commit is contained in:
Mathieu Malaterre 2012-03-01 15:52:30 +00:00
parent 58cfcaff9f
commit b3b2ee0925
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
applications/codec/convert.c
View File

@ -104,7 +104,7 @@ static unsigned short get_ushort(unsigned short val) {
#define TGA_HEADER_SIZE 18 #define TGA_HEADER_SIZE 18
int tga_readheader(FILE *fp, unsigned int *bits_per_pixel, static int tga_readheader(FILE *fp, unsigned int *bits_per_pixel,
unsigned int *width, unsigned int *height, int *flip_image) unsigned int *width, unsigned int *height, int *flip_image)
{ {
int palette_size; int palette_size;
@ -179,7 +179,7 @@ int tga_readheader(FILE *fp, unsigned int *bits_per_pixel,
return 1; return 1;
} }
int tga_writeheader(FILE *fp, int bits_per_pixel, int width, int height, static int tga_writeheader(FILE *fp, int bits_per_pixel, int width, int height,
opj_bool flip_image) opj_bool flip_image)
{ {
unsigned short image_w, image_h, us0; unsigned short image_w, image_h, us0;
@ -993,6 +993,10 @@ int imagetobmp(opj_image_t * image, const char *outfile) {
FILE *fdest = NULL; FILE *fdest = NULL;
int adjustR, adjustG, adjustB; int adjustR, adjustG, adjustB;
if (image->comps[0].prec < 8) {
fprintf(stderr, "Unsupported number of components: %d\n", image->comps[0].prec);
return 1;
}
if (image->numcomps == 3 && image->comps[0].dx == image->comps[1].dx if (image->numcomps == 3 && image->comps[0].dx == image->comps[1].dx
&& image->comps[1].dx == image->comps[2].dx && image->comps[1].dx == image->comps[2].dx
&& image->comps[0].dy == image->comps[1].dy && image->comps[0].dy == image->comps[1].dy
@ -1181,7 +1185,7 @@ PGX IMAGE FORMAT
<<-- <<-- <<-- <<-- */ <<-- <<-- <<-- <<-- */
unsigned char readuchar(FILE * f) static unsigned char readuchar(FILE * f)
{ {
unsigned char c1; unsigned char c1;
if ( !fread(&c1, 1, 1, f) ) if ( !fread(&c1, 1, 1, f) )
@ -1192,7 +1196,7 @@ unsigned char readuchar(FILE * f)
return c1; return c1;
} }
unsigned short readushort(FILE * f, int bigendian) static unsigned short readushort(FILE * f, int bigendian)
{ {
unsigned char c1, c2; unsigned char c1, c2;
if ( !fread(&c1, 1, 1, f) ) if ( !fread(&c1, 1, 1, f) )
@ -1211,7 +1215,7 @@ unsigned short readushort(FILE * f, int bigendian)
return (c2 << 8) + c1; return (c2 << 8) + c1;
} }
unsigned int readuint(FILE * f, int bigendian) static unsigned int readuint(FILE * f, int bigendian)
{ {
unsigned char c1, c2, c3, c4; unsigned char c1, c2, c3, c4;
if ( !fread(&c1, 1, 1, f) ) if ( !fread(&c1, 1, 1, f) )