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

imagetobmp() rescales all non-8-bit component sizes to 8 bits. printf() calls are also removed as they could interfere with streaming output

This commit is contained in:
Alex Dolski 2018-02-02 16:16:19 -06:00
parent 07d526e4cb
commit 93dd6bd305
1 changed files with 38 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/bin/jp2/convertbmp.c
View File

@ -40,7 +40,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <ctype.h> #include <math.h>
#include "openjpeg.h" #include "openjpeg.h"
#include "convert.h" #include "convert.h"
@ -862,12 +862,8 @@ int imagetobmp(opj_image_t * image, const char *outfile)
int i, pad; int i, pad;
FILE *fdest = NULL; FILE *fdest = NULL;
int adjustR, adjustG, adjustB; int adjustR, adjustG, adjustB;
float lumaPctR = -1, lumaPctG = -1, lumaPctB = -1;
if (image->comps[0].prec < 8) {
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 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
@ -933,26 +929,17 @@ int imagetobmp(opj_image_t * image, const char *outfile)
fprintf(fdest, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff, ((0) >> 16) & 0xff, fprintf(fdest, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff, ((0) >> 16) & 0xff,
((0) >> 24) & 0xff); ((0) >> 24) & 0xff);
if (image->comps[0].prec > 8) { adjustR = (int)image->comps[0].prec - 8;
adjustR = (int)image->comps[0].prec - 8; if (adjustR < 0) {
printf("BMP CONVERSION: Truncating component 0 from %d bits to 8 bits\n", lumaPctR = 1 + (float) pow(2, image->comps[0].prec) / (float) 255;
image->comps[0].prec);
} else {
adjustR = 0;
} }
if (image->comps[1].prec > 8) { adjustG = (int)image->comps[1].prec - 8;
adjustG = (int)image->comps[1].prec - 8; if (adjustG < 0) {
printf("BMP CONVERSION: Truncating component 1 from %d bits to 8 bits\n", lumaPctG = 1 + (float) pow(2, image->comps[1].prec) / (float) 255;
image->comps[1].prec);
} else {
adjustG = 0;
} }
if (image->comps[2].prec > 8) { adjustB = (int)image->comps[2].prec - 8;
adjustB = (int)image->comps[2].prec - 8; if (adjustB < 0) {
printf("BMP CONVERSION: Truncating component 2 from %d bits to 8 bits\n", lumaPctB = 1 + (float) pow(2, image->comps[2].prec) / (float) 255;
image->comps[2].prec);
} else {
adjustB = 0;
} }
for (i = 0; i < w * h; i++) { for (i = 0; i < w * h; i++) {
@ -961,8 +948,13 @@ 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].data[w * h - ((i) / (w) + 1) * w + (i) % (w)];
r += (image->comps[0].sgnd ? 1 << (image->comps[0].prec - 1) : 0); r += (image->comps[0].sgnd ? 1 << (image->comps[0].prec - 1) : 0);
if (lumaPctR > 0) {
r = (int) lroundf((float) r * lumaPctR);
}
if (adjustR > 0) { if (adjustR > 0) {
r = ((r >> adjustR) + ((r >> (adjustR - 1)) % 2)); r = ((r >> adjustR) + ((r >> (adjustR - 1)) % 2));
} else if (adjustR < 0) {
r = ((r << abs(adjustR)) + ((r << (abs(adjustR) - 1)) % 2));
} }
if (r > 255) { if (r > 255) {
r = 255; r = 255;
@ -973,8 +965,13 @@ 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].data[w * h - ((i) / (w) + 1) * w + (i) % (w)];
g += (image->comps[1].sgnd ? 1 << (image->comps[1].prec - 1) : 0); g += (image->comps[1].sgnd ? 1 << (image->comps[1].prec - 1) : 0);
if (lumaPctG > 0) {
g = (int) lroundf((float) g * lumaPctG);
}
if (adjustG > 0) { if (adjustG > 0) {
g = ((g >> adjustG) + ((g >> (adjustG - 1)) % 2)); g = ((g >> adjustG) + ((g >> (adjustG - 1)) % 2));
} else if (adjustG < 0) {
g = ((g << abs(adjustR)) + ((g << (abs(adjustG) - 1)) % 2));
} }
if (g > 255) { if (g > 255) {
g = 255; g = 255;
@ -985,8 +982,13 @@ 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].data[w * h - ((i) / (w) + 1) * w + (i) % (w)];
b += (image->comps[2].sgnd ? 1 << (image->comps[2].prec - 1) : 0); b += (image->comps[2].sgnd ? 1 << (image->comps[2].prec - 1) : 0);
if (lumaPctB > 0) {
b = (int) lroundf((float) b * lumaPctB);
}
if (adjustB > 0) { if (adjustB > 0) {
b = ((b >> adjustB) + ((b >> (adjustB - 1)) % 2)); b = ((b >> adjustB) + ((b >> (adjustB - 1)) % 2));
} else if (adjustB < 0) {
b = ((b << abs(adjustB)) + ((b << (abs(adjustB) - 1)) % 2));
} }
if (b > 255) { if (b > 255) {
b = 255; b = 255;
@ -1065,12 +1067,13 @@ int imagetobmp(opj_image_t * image, const char *outfile)
fprintf(fdest, "%c%c%c%c", (256) & 0xff, ((256) >> 8) & 0xff, fprintf(fdest, "%c%c%c%c", (256) & 0xff, ((256) >> 8) & 0xff,
((256) >> 16) & 0xff, ((256) >> 24) & 0xff); ((256) >> 16) & 0xff, ((256) >> 24) & 0xff);
if (image->comps[0].prec > 8) { adjustR = (int)image->comps[0].prec - 8;
adjustR = (int)image->comps[0].prec - 8; if (adjustR < 0) {
printf("BMP CONVERSION: Truncating component 0 from %d bits to 8 bits\n", // TODO: without this, 2-bit input images come out too dark
image->comps[0].prec); if (adjustR == -6) {
} else { adjustR--;
adjustR = 0; }
lumaPctR = 1 + (float) pow(2, image->comps[0].prec) / (float) 255;
} }
for (i = 0; i < 256; i++) { for (i = 0; i < 256; i++) {
@ -1082,8 +1085,13 @@ 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].data[w * h - ((i) / (w) + 1) * w + (i) % (w)];
r += (image->comps[0].sgnd ? 1 << (image->comps[0].prec - 1) : 0); r += (image->comps[0].sgnd ? 1 << (image->comps[0].prec - 1) : 0);
if (lumaPctR > 0) {
r = (int) lroundf((float) r * lumaPctR);
}
if (adjustR > 0) { if (adjustR > 0) {
r = ((r >> adjustR) + ((r >> (adjustR - 1)) % 2)); r = ((r >> adjustR) + ((r >> (adjustR - 1)) % 2));
} else if (adjustR < 0) {
r = ((r << abs(adjustR)) + ((r << (abs(adjustR) - 1)) % 2));
} }
if (r > 255) { if (r > 255) {
r = 255; r = 255;