generic-library/openjpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed the way the image structure is allocated when the decoding parameters include some resolutions to discard. This should have a significant impact for the decoding of huge images when some resolutions are discarder (-r parameter)

Browse Source 
Warning: The output image size is now reduced when discarding resolutions !
This commit is contained in:
Francois-Olivier Devaux
2007-10-12 15:04:34 +00:00
parent ab0473aa42
commit 1f11a4fe90
5 changed files with 123 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -5,6 +5,11 @@ What's New for OpenJPEG
! : changed
+ : added
October 12, 2007
* [FOD] Changed the way the image structure is allocated when the decoding parameters include some resolutions to discard.
This should have a significant impact for the decoding of huge images when some resolutions are discarder (-r parameter)
Warning: The output image size is now reduced when discarding resolutions !
October 10, 2007
* [FOD] Patch from Callum Lewick. Clean up of j2klib.h for the aligned malloc stuff.
It makes it work right with mingw, as _mm_malloc() isn't a macro, attempts to pave the way to using cmake to check for this stuff and combines a patch from Dana Fagerstrom at Sun that makes it use memalign() on Solaris

210
codec/convert.c
View File

@@ -310,15 +310,15 @@ int imagetotga(opj_image_t * image, const char *outfile) {
}
}
width = int_ceildiv(image->x1-image->x0, image->comps[0].dx);
height = int_ceildiv(image->y1-image->y0, image->comps[0].dy);
width = image->comps[0].w;
height = image->comps[0].h;
// Mono with alpha, or RGB with alpha.
write_alpha = (image->numcomps==2) || (image->numcomps==4);
// Write TGA header
bpp = write_alpha ? 32 : 24;
if (!tga_writeheader(fdest, bpp, width, height, true))
if (!tga_writeheader(fdest, bpp, width , height, true))
return 1;
alpha_channel = image->numcomps-1;
@@ -764,7 +764,7 @@ opj_image_t* bmptoimage(const char *filename, opj_cparameters_t *parameters) {
}
int imagetobmp(opj_image_t * image, const char *outfile) {
int w, wr, h, hr;
int w, h;
int i, pad;
FILE *fdest = NULL;
int adjustR, adjustG, adjustB;
@@ -786,42 +786,39 @@ int imagetobmp(opj_image_t * image, const char *outfile) {
return 1;
}
w = image->comps[0].w;
wr = int_ceildivpow2(image->comps[0].w, image->comps[0].factor);
w = image->comps[0].w;
h = image->comps[0].h;
hr = int_ceildivpow2(image->comps[0].h, image->comps[0].factor);
fprintf(fdest, "BM");
/* FILE HEADER */
/* ------------- */
fprintf(fdest, "%c%c%c%c",
(unsigned char) (hr * wr * 3 + 3 * hr * (wr % 2) + 54) & 0xff,
(unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2) + 54) >> 8) & 0xff,
(unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2) + 54) >> 16) & 0xff,
(unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2) + 54) >> 24) & 0xff);
(unsigned char) (h * w * 3 + 3 * h * (w % 2) + 54) & 0xff,
(unsigned char) ((h * w * 3 + 3 * h * (w % 2) + 54) >> 8) & 0xff,
(unsigned char) ((h * w * 3 + 3 * h * (w % 2) + 54) >> 16) & 0xff,
(unsigned char) ((h * w * 3 + 3 * h * (w % 2) + 54) >> 24) & 0xff);
fprintf(fdest, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff, ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
fprintf(fdest, "%c%c%c%c", (54) & 0xff, ((54) >> 8) & 0xff,((54) >> 16) & 0xff, ((54) >> 24) & 0xff);
/* INFO HEADER */
/* ------------- */
fprintf(fdest, "%c%c%c%c", (40) & 0xff, ((40) >> 8) & 0xff, ((40) >> 16) & 0xff, ((40) >> 24) & 0xff);
fprintf(fdest, "%c%c%c%c", (unsigned char) ((wr) & 0xff),
(unsigned char) ((wr) >> 8) & 0xff,
(unsigned char) ((wr) >> 16) & 0xff,
(unsigned char) ((wr) >> 24) & 0xff);
fprintf(fdest, "%c%c%c%c", (unsigned char) ((hr) & 0xff),
(unsigned char) ((hr) >> 8) & 0xff,
(unsigned char) ((hr) >> 16) & 0xff,
(unsigned char) ((hr) >> 24) & 0xff);
fprintf(fdest, "%c%c%c%c", (unsigned char) ((w) & 0xff),
(unsigned char) ((w) >> 8) & 0xff,
(unsigned char) ((w) >> 16) & 0xff,
(unsigned char) ((w) >> 24) & 0xff);
fprintf(fdest, "%c%c%c%c", (unsigned char) ((h) & 0xff),
(unsigned char) ((h) >> 8) & 0xff,
(unsigned char) ((h) >> 16) & 0xff,
(unsigned char) ((h) >> 24) & 0xff);
fprintf(fdest, "%c%c", (1) & 0xff, ((1) >> 8) & 0xff);
fprintf(fdest, "%c%c", (24) & 0xff, ((24) >> 8) & 0xff);
fprintf(fdest, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff, ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
fprintf(fdest, "%c%c%c%c", (unsigned char) (3 * hr * wr + 3 * hr * (wr % 2)) & 0xff,
(unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2)) >> 8) & 0xff,
(unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2)) >> 16) & 0xff,
(unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2)) >> 24) & 0xff);
fprintf(fdest, "%c%c%c%c", (unsigned char) (3 * h * w + 3 * h * (w % 2)) & 0xff,
(unsigned char) ((h * w * 3 + 3 * h * (w % 2)) >> 8) & 0xff,
(unsigned char) ((h * w * 3 + 3 * h * (w % 2)) >> 16) & 0xff,
(unsigned char) ((h * w * 3 + 3 * h * (w % 2)) >> 24) & 0xff);
fprintf(fdest, "%c%c%c%c", (7834) & 0xff, ((7834) >> 8) & 0xff, ((7834) >> 16) & 0xff, ((7834) >> 24) & 0xff);
fprintf(fdest, "%c%c%c%c", (7834) & 0xff, ((7834) >> 8) & 0xff, ((7834) >> 16) & 0xff, ((7834) >> 24) & 0xff);
fprintf(fdest, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff, ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
@@ -846,24 +843,24 @@ int imagetobmp(opj_image_t * image, const char *outfile) {
else
adjustB = 0;
for (i = 0; i < wr * hr; i++) {
for (i = 0; i < w * h; i++) {
unsigned char rc, gc, bc;
int r, g, b;
r = image->comps[0].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
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);
rc = (unsigned char) ((r >> adjustR)+((r >> (adjustR-1))%2));
g = image->comps[1].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
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);
gc = (unsigned char) ((g >> adjustG)+((g >> (adjustG-1))%2));
b = image->comps[2].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
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);
bc = (unsigned char) ((b >> adjustB)+((b >> (adjustB-1))%2));
fprintf(fdest, "%c%c%c", bc, gc, rc);
if ((i + 1) % wr == 0) {
for (pad = (3 * wr) % 4 ? 4 - (3 * wr) % 4 : 0; pad > 0; pad--) /* ADD */
if ((i + 1) % w == 0) {
for (pad = (3 * w) % 4 ? 4 - (3 * w) % 4 : 0; pad > 0; pad--) /* ADD */
fprintf(fdest, "%c", 0);
}
}
@@ -875,20 +872,17 @@ int imagetobmp(opj_image_t * image, const char *outfile) {
<<-- <<-- <<-- <<-- */
fdest = fopen(outfile, "wb");
w = image->comps[0].w;
wr = int_ceildivpow2(image->comps[0].w, image->comps[0].factor);
w = image->comps[0].w;
h = image->comps[0].h;
hr = int_ceildivpow2(image->comps[0].h, image->comps[0].factor);
fprintf(fdest, "BM");
/* FILE HEADER */
/* ------------- */
fprintf(fdest, "%c%c%c%c", (unsigned char) (hr * wr + 54 + 1024 + hr * (wr % 2)) & 0xff,
(unsigned char) ((hr * wr + 54 + 1024 + hr * (wr % 2)) >> 8) & 0xff,
(unsigned char) ((hr * wr + 54 + 1024 + hr * (wr % 2)) >> 16) & 0xff,
(unsigned char) ((hr * wr + 54 + 1024 + wr * (wr % 2)) >> 24) & 0xff);
fprintf(fdest, "%c%c%c%c", (unsigned char) (h * w + 54 + 1024 + h * (w % 2)) & 0xff,
(unsigned char) ((h * w + 54 + 1024 + h * (w % 2)) >> 8) & 0xff,
(unsigned char) ((h * w + 54 + 1024 + h * (w % 2)) >> 16) & 0xff,
(unsigned char) ((h * w + 54 + 1024 + w * (w % 2)) >> 24) & 0xff);
fprintf(fdest, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff, ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
fprintf(fdest, "%c%c%c%c", (54 + 1024) & 0xff, ((54 + 1024) >> 8) & 0xff,
((54 + 1024) >> 16) & 0xff,
@@ -897,21 +891,21 @@ int imagetobmp(opj_image_t * image, const char *outfile) {
/* INFO HEADER */
/* ------------- */
fprintf(fdest, "%c%c%c%c", (40) & 0xff, ((40) >> 8) & 0xff, ((40) >> 16) & 0xff, ((40) >> 24) & 0xff);
fprintf(fdest, "%c%c%c%c", (unsigned char) ((wr) & 0xff),
(unsigned char) ((wr) >> 8) & 0xff,
(unsigned char) ((wr) >> 16) & 0xff,
(unsigned char) ((wr) >> 24) & 0xff);
fprintf(fdest, "%c%c%c%c", (unsigned char) ((hr) & 0xff),
(unsigned char) ((hr) >> 8) & 0xff,
(unsigned char) ((hr) >> 16) & 0xff,
(unsigned char) ((hr) >> 24) & 0xff);
fprintf(fdest, "%c%c%c%c", (unsigned char) ((w) & 0xff),
(unsigned char) ((w) >> 8) & 0xff,
(unsigned char) ((w) >> 16) & 0xff,
(unsigned char) ((w) >> 24) & 0xff);
fprintf(fdest, "%c%c%c%c", (unsigned char) ((h) & 0xff),
(unsigned char) ((h) >> 8) & 0xff,
(unsigned char) ((h) >> 16) & 0xff,
(unsigned char) ((h) >> 24) & 0xff);
fprintf(fdest, "%c%c", (1) & 0xff, ((1) >> 8) & 0xff);
fprintf(fdest, "%c%c", (8) & 0xff, ((8) >> 8) & 0xff);
fprintf(fdest, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff, ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
fprintf(fdest, "%c%c%c%c", (unsigned char) (hr * wr + hr * (wr % 2)) & 0xff,
(unsigned char) ((hr * wr + hr * (wr % 2)) >> 8) & 0xff,
(unsigned char) ((hr * wr + hr * (wr % 2)) >> 16) & 0xff,
(unsigned char) ((hr * wr + hr * (wr % 2)) >> 24) & 0xff);
fprintf(fdest, "%c%c%c%c", (unsigned char) (h * w + h * (w % 2)) & 0xff,
(unsigned char) ((h * w + h * (w % 2)) >> 8) & 0xff,
(unsigned char) ((h * w + h * (w % 2)) >> 16) & 0xff,
(unsigned char) ((h * w + h * (w % 2)) >> 24) & 0xff);
fprintf(fdest, "%c%c%c%c", (7834) & 0xff, ((7834) >> 8) & 0xff, ((7834) >> 16) & 0xff, ((7834) >> 24) & 0xff);
fprintf(fdest, "%c%c%c%c", (7834) & 0xff, ((7834) >> 8) & 0xff, ((7834) >> 16) & 0xff, ((7834) >> 24) & 0xff);
fprintf(fdest, "%c%c%c%c", (256) & 0xff, ((256) >> 8) & 0xff, ((256) >> 16) & 0xff, ((256) >> 24) & 0xff);
@@ -926,18 +920,18 @@ int imagetobmp(opj_image_t * image, const char *outfile) {
fprintf(fdest, "%c%c%c%c", i, i, i, 0);
}
for (i = 0; i < wr * hr; i++) {
for (i = 0; i < w * h; i++) {
unsigned char rc;
int r;
r = image->comps[0].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
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);
rc = (unsigned char) ((r >> adjustR)+((r >> (adjustR-1))%2));
fprintf(fdest, "%c", rc);
if ((i + 1) % wr == 0) {
for (pad = wr % 4 ? 4 - wr % 4 : 0; pad > 0; pad--) /* ADD */
if ((i + 1) % w == 0) {
for (pad = w % 4 ? 4 - w % 4 : 0; pad > 0; pad--) /* ADD */
fprintf(fdest, "%c", 0);
}
}
@@ -1098,7 +1092,7 @@ opj_image_t* pgxtoimage(const char *filename, opj_cparameters_t *parameters) {
}
int imagetopgx(opj_image_t * image, const char *outfile) {
int w, wr, h, hr;
int w, h;
int i, j, compno;
FILE *fdest = NULL;
@@ -1135,12 +1129,9 @@ int imagetopgx(opj_image_t * image, const char *outfile) {
}
w = image->comps[compno].w;
wr = int_ceildivpow2(image->comps[compno].w, image->comps[compno].factor);
h = image->comps[compno].h;
hr = int_ceildivpow2(image->comps[compno].h, image->comps[compno].factor);
fprintf(fdest, "PG ML %c %d %d %d\n", comp->sgnd ? '-' : '+', comp->prec, wr, hr);
fprintf(fdest, "PG ML %c %d %d %d\n", comp->sgnd ? '-' : '+', comp->prec, w, h);
if (comp->prec <= 8) {
nbytes = 1;
} else if (comp->prec <= 16) {
@@ -1148,8 +1139,8 @@ int imagetopgx(opj_image_t * image, const char *outfile) {
} else {
nbytes = 4;
}
for (i = 0; i < wr * hr; i++) {
int v = image->comps[compno].data[i / wr * w + i % wr];
for (i = 0; i < w * h; i++) {
int v = image->comps[compno].data[i];
for (j = nbytes - 1; j >= 0; j--) {
char byte = (char) (v >> (j * 8));
fwrite(&byte, 1, 1, fdest);
@@ -1267,7 +1258,7 @@ opj_image_t* pnmtoimage(const char *filename, opj_cparameters_t *parameters) {
}
int imagetopnm(opj_image_t * image, const char *outfile) {
int w, wr, wrr, h, hr, hrr, max;
int w, wr, h, hr, max;
int i, compno;
int adjustR, adjustG, adjustB, adjustX;
FILE *fdest = NULL;
@@ -1297,18 +1288,16 @@ int imagetopnm(opj_image_t * image, const char *outfile) {
w = int_ceildiv(image->x1 - image->x0, image->comps[0].dx);
wr = image->comps[0].w;
wrr = int_ceildivpow2(image->comps[0].w, image->comps[0].factor);
h = int_ceildiv(image->y1 - image->y0, image->comps[0].dy);
hr = image->comps[0].h;
hrr = int_ceildivpow2(image->comps[0].h, image->comps[0].factor);
max = image->comps[0].prec > 8 ? 255 : (1 << image->comps[0].prec) - 1;
image->comps[0].x0 = int_ceildivpow2(image->comps[0].x0 - int_ceildiv(image->x0, image->comps[0].dx), image->comps[0].factor);
image->comps[0].y0 = int_ceildivpow2(image->comps[0].y0 - int_ceildiv(image->y0, image->comps[0].dy), image->comps[0].factor);
fprintf(fdest, "P6\n%d %d\n%d\n", wrr, hrr, max);
fprintf(fdest, "P6\n%d %d\n%d\n", wr, hr, max);
if (image->comps[0].prec > 8) {
adjustR = image->comps[0].prec - 8;
@@ -1330,18 +1319,18 @@ int imagetopnm(opj_image_t * image, const char *outfile) {
adjustB = 0;
for (i = 0; i < wrr * hrr; i++) {
for (i = 0; i < wr * hr; i++) {
int r, g, b;
unsigned char rc,gc,bc;
r = image->comps[0].data[i / wrr * wr + i % wrr];
r = image->comps[0].data[i];
r += (image->comps[0].sgnd ? 1 << (image->comps[0].prec - 1) : 0);
rc = (unsigned char) ((r >> adjustR)+((r >> (adjustR-1))%2));
g = image->comps[1].data[i / wrr * wr + i % wrr];
g = image->comps[1].data[i];
g += (image->comps[1].sgnd ? 1 << (image->comps[1].prec - 1) : 0);
gc = (unsigned char) ((g >> adjustG)+((g >> (adjustG-1))%2));
b = image->comps[2].data[i / wrr * wr + i % wrr];
b = image->comps[2].data[i];
b += (image->comps[2].sgnd ? 1 << (image->comps[2].prec - 1) : 0);
bc = (unsigned char) ((b >> adjustB)+((b >> (adjustB-1))%2));
@@ -1371,18 +1360,16 @@ int imagetopnm(opj_image_t * image, const char *outfile) {
w = int_ceildiv(image->x1 - image->x0, image->comps[compno].dx);
wr = image->comps[compno].w;
wrr = int_ceildivpow2(image->comps[compno].w, image->comps[compno].factor);
h = int_ceildiv(image->y1 - image->y0, image->comps[compno].dy);
hr = image->comps[compno].h;
hrr = int_ceildivpow2(image->comps[compno].h, image->comps[compno].factor);
max = image->comps[compno].prec > 8 ? 255 : (1 << image->comps[compno].prec) - 1;
image->comps[compno].x0 = int_ceildivpow2(image->comps[compno].x0 - int_ceildiv(image->x0, image->comps[compno].dx), image->comps[compno].factor);
image->comps[compno].y0 = int_ceildivpow2(image->comps[compno].y0 - int_ceildiv(image->y0, image->comps[compno].dy), image->comps[compno].factor);
fprintf(fdest, "P5\n%d %d\n%d\n", wrr, hrr, max);
fprintf(fdest, "P5\n%d %d\n%d\n", wr, hr, max);
if (image->comps[compno].prec > 8) {
adjustX = image->comps[0].prec - 8;
@@ -1391,10 +1378,10 @@ int imagetopnm(opj_image_t * image, const char *outfile) {
else
adjustX = 0;
for (i = 0; i < wrr * hrr; i++) {
for (i = 0; i < wr * hr; i++) {
int l;
unsigned char lc;
l = image->comps[compno].data[i / wrr * wr + i % wrr];
l = image->comps[compno].data[i];
l += (image->comps[compno].sgnd ? 1 << (image->comps[compno].prec - 1) : 0);
lc = (unsigned char) ((l >> adjustX)+((l >> (adjustX-1))%2));
fprintf(fdest, "%c", lc);
@@ -1423,7 +1410,7 @@ typedef struct tiff_infoheader{
}tiff_infoheader_t;
int imagetotif(opj_image_t * image, const char *outfile) {
int width, height, imgsize ;
int width, height, imgsize;
int bps,index,adjust = 0;
int last_i=0;
TIFF *tif;
@@ -1450,7 +1437,7 @@ int imagetotif(opj_image_t * image, const char *outfile) {
width = image->comps[0].w;
height = image->comps[0].h;
imgsize = image->comps[0].w * image->comps[0].h ;
imgsize = width * height ;
bps = image->comps[0].prec;
/* Set tags */
TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, width);
@@ -1463,10 +1450,9 @@ int imagetotif(opj_image_t * image, const char *outfile) {
TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP, 1);
/* Get a buffer for the data */
buf = _TIFFmalloc(TIFFStripSize(tif));
index=0;
strip_size=0;
strip_size=TIFFStripSize(tif);
buf = _TIFFmalloc(strip_size);
index=0;
adjust = image->comps[0].sgnd ? 1 << (image->comps[0].prec - 1) : 0;
for (strip = 0; strip < TIFFNumberOfStrips(tif); strip++) {
unsigned char *dat8;
@@ -1647,7 +1633,7 @@ int imagetotif(opj_image_t * image, const char *outfile) {
width = image->comps[0].w;
height = image->comps[0].h;
imgsize = image->comps[0].w * image->comps[0].h ;
imgsize = width * height;
bps = image->comps[0].prec;
/* Set tags */
@@ -1661,10 +1647,9 @@ int imagetotif(opj_image_t * image, const char *outfile) {
TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP, 1);
/* Get a buffer for the data */
buf = _TIFFmalloc(TIFFStripSize(tif));
index = 0;
strip_size = 0;
strip_size = TIFFStripSize(tif);
buf = _TIFFmalloc(strip_size);
index = 0;
for (strip = 0; strip < TIFFNumberOfStrips(tif); strip++) {
unsigned char *dat8;
int i;
@@ -2052,7 +2037,10 @@ opj_image_t* rawtoimage(const char *filename, opj_cparameters_t *parameters, raw
int imagetoraw(opj_image_t * image, const char *outfile)
{
FILE *rawFile = NULL;
int compno, pixelsToWrite, offset, cont;
int compno;
int w, h;
int line, row;
int *ptr;
if((image->numcomps * image->x1 * image->y1) == 0)
{
@@ -2073,8 +2061,8 @@ int imagetoraw(opj_image_t * image, const char *outfile)
fprintf(stdout,"Component %d characteristics: %dx%dx%d %s\n", compno, image->comps[compno].w,
image->comps[compno].h, image->comps[compno].prec, image->comps[compno].sgnd==1 ? "signed": "unsigned");
pixelsToWrite = image->comps[compno].w * image->comps[compno].h;
offset = 0;
w = image->comps[compno].w;
h = image->comps[compno].h;
if(image->comps[compno].prec <= 8)
{
@@ -2082,20 +2070,26 @@ int imagetoraw(opj_image_t * image, const char *outfile)
{
signed char curr;
int mask = (1 << image->comps[compno].prec) - 1;
for(cont = 0; cont < pixelsToWrite; cont++)
{
curr = (signed char) (image->comps[compno].data[cont] & mask);
fwrite(&curr, sizeof(signed char), 1, rawFile);
ptr = image->comps[compno].data;
for (line = 0; line < h; line++) {
for(row = 0; row < w; row++) {
curr = (signed char) (*ptr & mask);
fwrite(&curr, sizeof(signed char), 1, rawFile);
ptr++;
}
}
}
else if(image->comps[compno].sgnd == 0)
{
unsigned char curr;
int mask = (1 << image->comps[compno].prec) - 1;
for(cont = 0; cont < pixelsToWrite; cont++)
{
curr = (unsigned char) (image->comps[compno].data[cont] & mask);
fwrite(&curr, sizeof(unsigned char), 1, rawFile);
ptr = image->comps[compno].data;
for (line = 0; line < h; line++) {
for(row = 0; row < w; row++) {
curr = (unsigned char) (*ptr & mask);
fwrite(&curr, sizeof(unsigned char), 1, rawFile);
ptr++;
}
}
}
}
@@ -2105,31 +2099,37 @@ int imagetoraw(opj_image_t * image, const char *outfile)
{
signed short int curr;
int mask = (1 << image->comps[compno].prec) - 1;
for(cont = 0; cont < pixelsToWrite; cont++)
{
curr = (signed short int) (image->comps[compno].data[cont] & mask);
fwrite(&curr, sizeof(signed short int), 1, rawFile);
ptr = image->comps[compno].data;
for (line = 0; line < h; line++) {
for(row = 0; row < w; row++) {
curr = (signed short int) (*ptr & mask);
fwrite(&curr, sizeof(signed short int), 1, rawFile);
ptr++;
}
}
}
else if(image->comps[compno].sgnd == 0)
{
unsigned short int curr;
int mask = (1 << image->comps[compno].prec) - 1;
for(cont = 0; cont < pixelsToWrite; cont++)
{
curr = (unsigned short int) (image->comps[compno].data[cont] & mask);
fwrite(&curr, sizeof(unsigned short int), 1, rawFile);
ptr = image->comps[compno].data;
for (line = 0; line < h; line++) {
for(row = 0; row < w; row++) {
curr = (unsigned short int) (*ptr & mask);
fwrite(&curr, sizeof(unsigned short int), 1, rawFile);
ptr++;
}
}
}
}
else if (image->comps[compno].prec <= 32)
{
fprintf(stderr,"More than 16 bits per component no handled yet\n");
return 1;
}
else
{
fprintf(stderr,"\nError: invalid precision\n");
fprintf(stderr,"Error: invalid precision: %d\n", image->comps[compno].prec);
return 1;
}
}

7
libopenjpeg/j2k.c
View File

@@ -406,7 +406,7 @@ static int j2k_get_num_tp(opj_cp_t *cp,int pino,int tileno){
/** mem allocation for TLM marker*/
int j2k_calculate_tp(opj_cp_t *cp,int img_numcomp,opj_image_t *image,opj_j2k_t *j2k ){
int pino,tileno,maxres=0,totnum_tp=0;
int pino,tileno,totnum_tp=0;
j2k->cur_totnum_tp = (int *) opj_malloc(cp->tw * cp->th * sizeof(int));
for (tileno = 0; tileno < cp->tw * cp->th; tileno++) {
int cur_totnum_tp = 0;
@@ -579,7 +579,7 @@ static void j2k_read_siz(opj_j2k_t *j2k) {
h = int_ceildiv(image->y1 - image->y0, image->comps[i].dy);
image->comps[i].resno_decoded = 0; /* number of resolution decoded */
image->comps[i].factor = 0; /* reducing factor per component */
image->comps[i].factor = cp->reduce; /* reducing factor per component */
}
cp->tw = int_ceildiv(image->x1 - cp->tx0, cp->tdx);
@@ -658,7 +658,7 @@ static void j2k_read_siz(opj_j2k_t *j2k) {
j2k->default_tcp->tccps = (opj_tccp_t *) opj_malloc(sizeof(opj_tccp_t) * image->numcomps);
for (i = 0; i < cp->tw * cp->th; i++) {
cp->tcps[i].tccps = (opj_tccp_t *) opj_malloc(sizeof(opj_tccp_t) * image->numcomps);
}
}
j2k->tile_data = (unsigned char **) opj_malloc(cp->tw * cp->th * sizeof(unsigned char *));
j2k->tile_len = (int *) opj_malloc(cp->tw * cp->th * sizeof(int));
j2k->state = J2K_STATE_MH;
@@ -1069,7 +1069,6 @@ static void j2k_read_poc(opj_j2k_t *j2k) {
opj_cp_t *cp = j2k->cp;
opj_tcp_t *tcp = j2k->state == J2K_STATE_TPH ? &cp->tcps[j2k->curtileno] : j2k->default_tcp;
opj_tccp_t *tccp = &tcp->tccps[0];
opj_cio_t *cio = j2k->cio;
old_poc = tcp->POC ? tcp->numpocs + 1 : 0;

1
libopenjpeg/t2.c
View File

@@ -586,7 +586,6 @@ int t2_encode_packets(opj_t2_t* t2,int tileno, opj_tcd_tile_t *tile, int maxlaye
unsigned char *c = dest;
int e = 0;
int compno;
int comp_len = 0;
opj_pi_iterator_t *pi = NULL;
int poc;
opj_image_t *image = t2->image;

18
libopenjpeg/tcd.c
View File

@@ -637,10 +637,10 @@ void tcd_malloc_decode(opj_tcd_t *tcd, opj_image_t * image, opj_cp_t * cp) {
x1 = j == 0 ? tilec->x1 : int_max(x1, (unsigned int) tilec->x1);
y1 = j == 0 ? tilec->y1 : int_max(y1, (unsigned int) tilec->y1);
}
w = x1 - x0;
h = y1 - y0;
w = int_ceildivpow2(x1 - x0, image->comps[i].factor);
h = int_ceildivpow2(y1 - y0, image->comps[i].factor);
image->comps[i].data = (int *) opj_malloc(w * h * sizeof(int));
image->comps[i].w = w;
image->comps[i].h = h;
@@ -651,7 +651,6 @@ void tcd_malloc_decode(opj_tcd_t *tcd, opj_image_t * image, opj_cp_t * cp) {
void tcd_malloc_decode_tile(opj_tcd_t *tcd, opj_image_t * image, opj_cp_t * cp, int tileno, opj_codestream_info_t *cstr_info) {
int compno, resno, bandno, precno, cblkno;
unsigned int x0 = 0, y0 = 0, x1 = 0, y1 = 0;
opj_tcp_t *tcp;
opj_tcd_tile_t *tile;
@@ -1363,6 +1362,11 @@ bool tcd_decode_tile(opj_tcd_t *tcd, unsigned char *src, int len, int tileno, op
if (tcd->cp->reduce != 0) {
tcd->image->comps[compno].resno_decoded =
tile->comps[compno].numresolutions - tcd->cp->reduce - 1;
if (tcd->image->comps[compno].resno_decoded < 1) {
opj_event_msg(tcd->cinfo, EVT_ERROR, "Error decoding tile. The number of resolutions to remove is higher than the number "
" of resolutions in the original codestream\nModify the cp_reduce parameter.\n");
return false;
}
}
if (tcd->tcp->tccps[compno].qmfbid == 1) {
@@ -1371,9 +1375,6 @@ bool tcd_decode_tile(opj_tcd_t *tcd, unsigned char *src, int len, int tileno, op
dwt_decode_real(tilec, tilec->numresolutions - 1 - tcd->image->comps[compno].resno_decoded);
}
if (tile->comps[compno].numresolutions > 0) {
tcd->image->comps[compno].factor = tile->comps[compno].numresolutions - (tcd->image->comps[compno].resno_decoded + 1);
}
}
dwt_time = opj_clock() - dwt_time;
opj_event_msg(tcd->cinfo, EVT_INFO, "- dwt took %f s\n", dwt_time);
@@ -1389,6 +1390,7 @@ bool tcd_decode_tile(opj_tcd_t *tcd, unsigned char *src, int len, int tileno, op
(tile->comps[0].x1 - tile->comps[0].x0) * (tile->comps[0].y1 - tile->comps[0].y0));
}
}
/*---------------TILE-------------------*/