diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2017-08-09 09:42:30 +0200 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2017-08-09 09:42:30 +0200 |
| commit | 5a560ebf5138ebc241e9962306ce74bfc50fc69c (patch) | |
| tree | 9c0c64db78a6b258466b4d667a268573229db7fd /src | |
| parent | 0c07950cb3f318df5b2051ae5d96bef553bb9966 (diff) | |
imagetobmp: avoid shift by -1 (relates to #811)
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/jp2/convertbmp.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/bin/jp2/convertbmp.c b/src/bin/jp2/convertbmp.c index a636ddc5..b49e7a08 100644 --- a/src/bin/jp2/convertbmp.c +++ b/src/bin/jp2/convertbmp.c @@ -929,7 +929,9 @@ int imagetobmp(opj_image_t * image, const char *outfile) 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) { @@ -939,7 +941,9 @@ int imagetobmp(opj_image_t * image, const char *outfile) 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) { @@ -949,7 +953,9 @@ int imagetobmp(opj_image_t * image, const char *outfile) 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) { @@ -1044,7 +1050,9 @@ int imagetobmp(opj_image_t * image, const char *outfile) 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) { |