header->biBitCount = (OPJ_UINT16)getc(IN);
header->biBitCount |= (OPJ_UINT16)((OPJ_UINT32)getc(IN) << 8);
+ if (header->biBitCount == 0) {
+ fprintf(stderr, "Error, invalid biBitCount %d\n", 0);
+ return OPJ_FALSE;
+ }
if (header->biSize >= 40U) {
header->biCompression = (OPJ_UINT32)getc(IN);
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
&& 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
r = image->comps[0].data[w * h - ((i) / (w) + 1) * w + (i) % (w)];
r += (image->comps[0].sgnd ? 1 << (image->comps[0].prec - 1) : 0);
- r = ((r >> adjustR) + ((r >> (adjustR - 1)) % 2));
+ if (adjustR > 0) {
+ r = ((r >> adjustR) + ((r >> (adjustR - 1)) % 2));
+ }
if (r > 255) {
r = 255;
} else if (r < 0) {
g = image->comps[1].data[w * h - ((i) / (w) + 1) * w + (i) % (w)];
g += (image->comps[1].sgnd ? 1 << (image->comps[1].prec - 1) : 0);
- g = ((g >> adjustG) + ((g >> (adjustG - 1)) % 2));
+ if (adjustG > 0) {
+ g = ((g >> adjustG) + ((g >> (adjustG - 1)) % 2));
+ }
if (g > 255) {
g = 255;
} else if (g < 0) {
b = image->comps[2].data[w * h - ((i) / (w) + 1) * w + (i) % (w)];
b += (image->comps[2].sgnd ? 1 << (image->comps[2].prec - 1) : 0);
- b = ((b >> adjustB) + ((b >> (adjustB - 1)) % 2));
+ if (adjustB > 0) {
+ b = ((b >> adjustB) + ((b >> (adjustB - 1)) % 2));
+ }
if (b > 255) {
b = 255;
} else if (b < 0) {
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;
r = image->comps[0].data[w * h - ((i) / (w) + 1) * w + (i) % (w)];
r += (image->comps[0].sgnd ? 1 << (image->comps[0].prec - 1) : 0);
- r = ((r >> adjustR) + ((r >> (adjustR - 1)) % 2));
+ if (adjustR > 0) {
+ r = ((r >> adjustR) + ((r >> (adjustR - 1)) % 2));
+ }
if (r > 255) {
r = 255;
} else if (r < 0) {