projects
/
openjpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changes for converttif.c to fix tsize_t
[openjpeg.git]
/
src
/
bin
/
jp2
/
convertbmp.c
diff --git
a/src/bin/jp2/convertbmp.c
b/src/bin/jp2/convertbmp.c
index 5152ca6f4d3b48bd9af242b0186b383d9145ea68..a636ddc53efb2bee5cdf529b081209433d084993 100644
(file)
--- a/
src/bin/jp2/convertbmp.c
+++ b/
src/bin/jp2/convertbmp.c
@@
-832,7
+832,8
@@
int imagetobmp(opj_image_t * image, const char *outfile)
int adjustR, adjustG, adjustB;
if (image->comps[0].prec < 8) {
int adjustR, adjustG, adjustB;
if (image->comps[0].prec < 8) {
- fprintf(stderr, "Unsupported number of components: %d\n", image->comps[0].prec);
+ fprintf(stderr, "imagetobmp: Unsupported precision: %d\n",
+ image->comps[0].prec);
return 1;
}
if (image->numcomps >= 3 && image->comps[0].dx == image->comps[1].dx
return 1;
}
if (image->numcomps >= 3 && image->comps[0].dx == image->comps[1].dx
@@
-840,7
+841,9
@@
int imagetobmp(opj_image_t * image, const char *outfile)
&& image->comps[0].dy == image->comps[1].dy
&& image->comps[1].dy == image->comps[2].dy
&& image->comps[0].prec == image->comps[1].prec
&& image->comps[0].dy == image->comps[1].dy
&& image->comps[1].dy == image->comps[2].dy
&& image->comps[0].prec == image->comps[1].prec
- && image->comps[1].prec == image->comps[2].prec) {
+ && image->comps[1].prec == image->comps[2].prec
+ && image->comps[0].sgnd == image->comps[1].sgnd
+ && image->comps[1].sgnd == image->comps[2].sgnd) {
/* -->> -->> -->> -->>
24 bits color
/* -->> -->> -->> -->>
24 bits color
@@
-974,6
+977,10
@@
int imagetobmp(opj_image_t * image, const char *outfile)
fprintf(stderr, "ERROR -> failed to open %s for writing\n", outfile);
return 1;
}
fprintf(stderr, "ERROR -> failed to open %s for writing\n", outfile);
return 1;
}
+ if (image->numcomps > 1) {
+ fprintf(stderr, "imagetobmp: only first component of %d is used.\n",
+ image->numcomps);
+ }
w = (int)image->comps[0].w;
h = (int)image->comps[0].h;
w = (int)image->comps[0].w;
h = (int)image->comps[0].h;