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

Merge pull request #535 from mayeut/converttif 

Update TIFF conversion to support more bit depth.
This commit is contained in:
Matthieu Darbois 2015-07-18 00:33:02 +02:00
parent 0b1f8eb6f7 8048bbc7a2
commit b59085db0c
7 changed files with 1155 additions and 764 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/jp2/CMakeLists.txt
View File

@ -9,6 +9,10 @@ set(common_SRCS
${OPENJPEG_SOURCE_DIR}/src/bin/common/opj_getopt.c
)
if(OPJ_HAVE_LIBTIFF)
list(APPEND common_SRCS converttif.c)
endif()
# Headers file are located here:
include_directories(
${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h

764
src/bin/jp2/convert.c
View File

@ -149,6 +149,7 @@ void scale_component(opj_image_comp_t* component, OPJ_UINT32 precision)
l_data[i] >>= shift;
}
}
component->bpp = precision;
component->prec = precision;
}
@ -1582,769 +1583,6 @@ if(v > 65535) v = 65535; else if(v < 0) v = 0;
return 0;
}/* imagetopnm() */
#ifdef OPJ_HAVE_LIBTIFF
/* -->> -->> -->> -->>
TIFF IMAGE FORMAT
<<-- <<-- <<-- <<-- */
int imagetotif(opj_image_t * image, const char *outfile)
{
int width, height, imgsize;
int bps,index,adjust, sgnd;
int ushift, dshift, has_alpha, force16;
TIFF *tif;
tdata_t buf;
tstrip_t strip;
tsize_t strip_size;
ushift = dshift = force16 = has_alpha = 0;
bps = (int)image->comps[0].prec;
if(bps > 8 && bps < 16)
{
ushift = 16 - bps; dshift = bps - ushift;
bps = 16; force16 = 1;
}
if(bps != 8 && bps != 16)
{
fprintf(stderr,"imagetotif: Bits=%d, Only 8 and 16 bits implemented\n",
bps);
fprintf(stderr,"\tAborting\n");
return 1;
}
tif = TIFFOpen(outfile, "wb");
if (!tif)
{
fprintf(stderr, "imagetotif:failed to open %s for writing\n", outfile);
return 1;
}
sgnd = (int)image->comps[0].sgnd;
adjust = sgnd ? 1 << (image->comps[0].prec - 1) : 0;
if(image->numcomps >= 3
&& image->comps[0].dx == image->comps[1].dx
&& image->comps[1].dx == image->comps[2].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)
{
has_alpha = (image->numcomps == 4);
width = (int)image->comps[0].w;
height = (int)image->comps[0].h;
imgsize = width * height ;
TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, width);
TIFFSetField(tif, TIFFTAG_IMAGELENGTH, height);
TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, 3 + has_alpha);
TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, bps);
TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_RGB);
TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP, 1);
strip_size = TIFFStripSize(tif);
buf = _TIFFmalloc(strip_size);
index=0;
for(strip = 0; strip < TIFFNumberOfStrips(tif); strip++)
{
unsigned char *dat8;
tsize_t i, ssize, last_i = 0;
int step, restx;
ssize = TIFFStripSize(tif);
dat8 = (unsigned char*)buf;
if(bps == 8)
{
step = 3 + has_alpha;
restx = step - 1;
for(i=0; i < ssize - restx; i += step)
{
int r, g, b, a = 0;
if(index < imgsize)
{
r = image->comps[0].data[index];
g = image->comps[1].data[index];
b = image->comps[2].data[index];
if(has_alpha) a = image->comps[3].data[index];
if(sgnd)
{
r += adjust;
g += adjust;
b += adjust;
if(has_alpha) a += adjust;
}
if(r > 255) r = 255; else if(r < 0) r = 0;
dat8[i+0] = (unsigned char)r ;
if(g > 255) g = 255; else if(g < 0) g = 0;
dat8[i+1] = (unsigned char)g ;
if(b > 255) b = 255; else if(b < 0) b = 0;
dat8[i+2] = (unsigned char)b ;
if(has_alpha)
{
if(a > 255) a = 255; else if(a < 0) a = 0;
dat8[i+3] = (unsigned char)a;
}
index++;
last_i = i + step;
}
else
break;
}/*for(i = 0;)*/
if(last_i < ssize)
{
for(i = last_i; i < ssize; i += step)
{
int r, g, b, a = 0;
if(index < imgsize)
{
r = image->comps[0].data[index];
g = image->comps[1].data[index];
b = image->comps[2].data[index];
if(has_alpha) a = image->comps[3].data[index];
if(sgnd)
{
r += adjust;
g += adjust;
b += adjust;
if(has_alpha) a += adjust;
}
if(r > 255) r = 255; else if(r < 0) r = 0;
if(g > 255) g = 255; else if(g < 0) g = 0;
if(b > 255) b = 255; else if(b < 0) b = 0;
dat8[i+0] = (unsigned char)r ;
if(i+1 < ssize) dat8[i+1] = (unsigned char)g ; else break;
if(i+2 < ssize) dat8[i+2] = (unsigned char)b ; else break;
if(has_alpha)
{
if(a > 255) a = 255; else if(a < 0) a = 0;
if(i+3 < ssize) dat8[i+3] = (unsigned char)a ; else break;
}
index++;
}
else
break;
}/*for(i)*/
}/*if(last_i < ssize)*/
} /*if(bps == 8)*/
else
if(bps == 16)
{
step = 6 + has_alpha + has_alpha;
restx = step - 1;
for(i = 0; i < ssize - restx ; i += step)
{
int r, g, b, a = 0;
if(index < imgsize)
{
r = image->comps[0].data[index];
g = image->comps[1].data[index];
b = image->comps[2].data[index];
if(has_alpha) a = image->comps[3].data[index];
if(sgnd)
{
r += adjust;
g += adjust;
b += adjust;
if(has_alpha) a += adjust;
}
if(force16)
{
r = (r<<ushift) + (r>>dshift);
g = (g<<ushift) + (g>>dshift);
b = (b<<ushift) + (b>>dshift);
if(has_alpha) a = (a<<ushift) + (a>>dshift);
}
if(r > 65535) r = 65535; else if(r < 0) r = 0;
if(g > 65535) g = 65535; else if(g < 0) g = 0;
if(b > 65535) b = 65535; else if(b < 0) b = 0;
dat8[i+0] = (unsigned char)r;/*LSB*/
dat8[i+1] = (unsigned char)(r >> 8);/*MSB*/
dat8[i+2] = (unsigned char)g;
dat8[i+3] = (unsigned char)(g >> 8);
dat8[i+4] = (unsigned char)b;
dat8[i+5] = (unsigned char)(b >> 8);
if(has_alpha)
{
if(a > 65535) a = 65535; else if(a < 0) a = 0;
dat8[i+6] = (unsigned char)a;
dat8[i+7] = (unsigned char)(a >> 8);
}
index++;
last_i = i + step;
}
else
break;
}/*for(i = 0;)*/
if(last_i < ssize)
{
for(i = last_i ; i < ssize ; i += step)
{
int r, g, b, a = 0;
if(index < imgsize)
{
r = image->comps[0].data[index];
g = image->comps[1].data[index];
b = image->comps[2].data[index];
if(has_alpha) a = image->comps[3].data[index];
if(sgnd)
{
r += adjust;
g += adjust;
b += adjust;
if(has_alpha) a += adjust;
}
if(force16)
{
r = (r<<ushift) + (r>>dshift);
g = (g<<ushift) + (g>>dshift);
b = (b<<ushift) + (b>>dshift);
if(has_alpha) a = (a<<ushift) + (a>>dshift);
}
if(r > 65535) r = 65535; else if(r < 0) r = 0;
if(g > 65535) g = 65535; else if(g < 0) g = 0;
if(b > 65535) b = 65535; else if(b < 0) b = 0;
dat8[i+0] = (unsigned char) r;/*LSB*/
if(i+1 < ssize) dat8[i+1] = (unsigned char)(r >> 8);else break;/*MSB*/
if(i+2 < ssize) dat8[i+2] = (unsigned char) g; else break;
if(i+3 < ssize) dat8[i+3] = (unsigned char)(g >> 8);else break;
if(i+4 < ssize) dat8[i+4] = (unsigned char) b; else break;
if(i+5 < ssize) dat8[i+5] = (unsigned char)(b >> 8);else break;
if(has_alpha)
{
if(a > 65535) a = 65535; else if(a < 0) a = 0;
if(i+6 < ssize) dat8[i+6] = (unsigned char)a; else break;
if(i+7 < ssize) dat8[i+7] = (unsigned char)(a >> 8); else break;
}
index++;
}
else
break;
}/*for(i)*/
}/*if(last_i < ssize)*/
}/*if(bps == 16)*/
(void)TIFFWriteEncodedStrip(tif, strip, (void*)buf, strip_size);
}/*for(strip = 0; )*/
_TIFFfree((void*)buf);
TIFFClose(tif);
return 0;
}/*RGB(A)*/
if(image->numcomps == 1 /* GRAY */
|| ( image->numcomps == 2 /* GRAY_ALPHA */
&& image->comps[0].dx == image->comps[1].dx
&& image->comps[0].dy == image->comps[1].dy
&& image->comps[0].prec == image->comps[1].prec))
{
int step;
has_alpha = (image->numcomps == 2);
width = (int)image->comps[0].w;
height = (int)image->comps[0].h;
imgsize = width * height;
/* Set tags */
TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, width);
TIFFSetField(tif, TIFFTAG_IMAGELENGTH, height);
TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, 1 + has_alpha);
TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, bps);
TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISBLACK);
TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP, 1);
/* Get a buffer for the data */
strip_size = TIFFStripSize(tif);
buf = _TIFFmalloc(strip_size);
index = 0;
for(strip = 0; strip < TIFFNumberOfStrips(tif); strip++)
{
unsigned char *dat8;
tsize_t i, ssize = TIFFStripSize(tif);
dat8 = (unsigned char*)buf;
if(bps == 8)
{
step = 1 + has_alpha;
for(i=0; i < ssize; i += step)
{
if(index < imgsize)
{
int r, a = 0;
r = image->comps[0].data[index];
if(has_alpha) a = image->comps[1].data[index];
if(sgnd)
{
r += adjust;
if(has_alpha) a += adjust;
}
if(r > 255) r = 255; else if(r < 0) r = 0;
dat8[i+0] = (unsigned char)r;
if(has_alpha)
{
if(a > 255) a = 255; else if(a < 0) a = 0;
dat8[i+1] = (unsigned char)a;
}
index++;
}
else
break;
}/*for(i )*/
}/*if(bps == 8*/
else
if(bps == 16)
{
step = 2 + has_alpha + has_alpha;
for(i=0; i < ssize; i += step)
{
if(index < imgsize)
{
int r, a = 0;
r = image->comps[0].data[index];
if(has_alpha) a = image->comps[1].data[index];
if(sgnd)
{
r += adjust;
if(has_alpha) a += adjust;
}
if(force16)
{
r = (r<<ushift) + (r>>dshift);
if(has_alpha) a = (a<<ushift) + (a>>dshift);
}
if(r > 65535) r = 65535; else if(r < 0) r = 0;
dat8[i+0] = (unsigned char)r;/*LSB*/
dat8[i+1] = (unsigned char)(r >> 8);/*MSB*/
if(has_alpha)
{
if(a > 65535) a = 65535; else if(a < 0) a = 0;
dat8[i+2] = (unsigned char)a;
dat8[i+3] = (unsigned char)(a >> 8);
}
index++;
}/*if(index < imgsize)*/
else
break;
}/*for(i )*/
}
(void)TIFFWriteEncodedStrip(tif, strip, (void*)buf, strip_size);
}/*for(strip*/
_TIFFfree(buf);
TIFFClose(tif);
return 0;
}
TIFFClose(tif);
fprintf(stderr,"imagetotif: Bad color format.\n"
"\tOnly RGB(A) and GRAY(A) has been implemented\n");
fprintf(stderr,"\tFOUND: numcomps(%d)\n\tAborting\n",
image->numcomps);
return 1;
}/* imagetotif() */
/*
* libtiff/tif_getimage.c : 1,2,4,8,16 bitspersample accepted
* CINEMA : 12 bit precision
*/
opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters)
{
int subsampling_dx = parameters->subsampling_dx;
int subsampling_dy = parameters->subsampling_dy;
TIFF *tif;
tdata_t buf;
tstrip_t strip;
tsize_t strip_size;
int j, numcomps, w, h,index;
OPJ_COLOR_SPACE color_space;
opj_image_cmptparm_t cmptparm[4]; /* RGBA */
opj_image_t *image = NULL;
int imgsize = 0;
int has_alpha = 0;
unsigned short tiBps, tiPhoto, tiSf, tiSpp, tiPC;
unsigned int tiWidth, tiHeight;
OPJ_BOOL is_cinema = OPJ_IS_CINEMA(parameters->rsiz);
tif = TIFFOpen(filename, "r");
if(!tif)
{
fprintf(stderr, "tiftoimage:Failed to open %s for reading\n", filename);
return 0;
}
tiBps = tiPhoto = tiSf = tiSpp = tiPC = 0;
tiWidth = tiHeight = 0;
TIFFGetField(tif, TIFFTAG_IMAGEWIDTH, &tiWidth);
TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &tiHeight);
TIFFGetField(tif, TIFFTAG_BITSPERSAMPLE, &tiBps);
TIFFGetField(tif, TIFFTAG_SAMPLEFORMAT, &tiSf);
TIFFGetField(tif, TIFFTAG_SAMPLESPERPIXEL, &tiSpp);
TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &tiPhoto);
TIFFGetField(tif, TIFFTAG_PLANARCONFIG, &tiPC);
w= (int)tiWidth;
h= (int)tiHeight;
if(tiBps != 8 && tiBps != 16 && tiBps != 12) tiBps = 0;
if(tiPhoto != 1 && tiPhoto != 2) tiPhoto = 0;
if( !tiBps || !tiPhoto)
{
if( !tiBps)
fprintf(stderr,"tiftoimage: Bits=%d, Only 8 and 16 bits"
" implemented\n",tiBps);
else
if( !tiPhoto)
fprintf(stderr,"tiftoimage: Bad color format %d.\n\tOnly RGB(A)"
" and GRAY(A) has been implemented\n",(int) tiPhoto);
fprintf(stderr,"\tAborting\n");
TIFFClose(tif);
return NULL;
}
{/* From: tiff-4.0.x/libtiff/tif_getimage.c : */
uint16* sampleinfo;
uint16 extrasamples;
TIFFGetFieldDefaulted(tif, TIFFTAG_EXTRASAMPLES,
&extrasamples, &sampleinfo);
if(extrasamples >= 1)
{
switch(sampleinfo[0])
{
case EXTRASAMPLE_UNSPECIFIED:
/* Workaround for some images without correct info about alpha channel
*/
if(tiSpp > 3)
has_alpha = 1;
break;
case EXTRASAMPLE_ASSOCALPHA: /* data pre-multiplied */
case EXTRASAMPLE_UNASSALPHA: /* data not pre-multiplied */
has_alpha = 1;
break;
}
}
else /* extrasamples == 0 */
if(tiSpp == 4 || tiSpp == 2) has_alpha = 1;
}
/* initialize image components
*/
memset(&cmptparm[0], 0, 4 * sizeof(opj_image_cmptparm_t));
if ((tiPhoto == PHOTOMETRIC_RGB) && (is_cinema)) {
fprintf(stdout,"WARNING:\n"
"Input image bitdepth is %d bits\n"
"TIF conversion has automatically rescaled to 12-bits\n"
"to comply with cinema profiles.\n",
tiBps);
}
if(tiPhoto == PHOTOMETRIC_RGB) /* RGB(A) */
{
numcomps = 3 + has_alpha;
color_space = OPJ_CLRSPC_SRGB;
/*#define USETILEMODE*/
for(j = 0; j < numcomps; j++)
{
if(is_cinema)
{
cmptparm[j].prec = 12;
cmptparm[j].bpp = 12;
}
else
{
cmptparm[j].prec = tiBps;
cmptparm[j].bpp = tiBps;
}
cmptparm[j].dx = (OPJ_UINT32)subsampling_dx;
cmptparm[j].dy = (OPJ_UINT32)subsampling_dy;
cmptparm[j].w = (OPJ_UINT32)w;
cmptparm[j].h = (OPJ_UINT32)h;
#ifdef USETILEMODE
cmptparm[j].x0 = 0;
cmptparm[j].y0 = 0;
#endif
}
#ifdef USETILEMODE
image = opj_image_tile_create(numcomps,&cmptparm[0],color_space);
#else
image = opj_image_create((OPJ_UINT32)numcomps, &cmptparm[0], color_space);
#endif
if(!image)
{
TIFFClose(tif);
return NULL;
}
/* set image offset and reference grid
*/
image->x0 = (OPJ_UINT32)parameters->image_offset_x0;
image->y0 = (OPJ_UINT32)parameters->image_offset_y0;
image->x1 = !image->x0 ? (OPJ_UINT32)(w - 1) * (OPJ_UINT32)subsampling_dx + 1 :
image->x0 + (OPJ_UINT32)(w - 1) * (OPJ_UINT32)subsampling_dx + 1;
image->y1 = !image->y0 ? (OPJ_UINT32)(h - 1) * (OPJ_UINT32)subsampling_dy + 1 :
image->y0 + (OPJ_UINT32)(h - 1) * (OPJ_UINT32)subsampling_dy + 1;
buf = _TIFFmalloc(TIFFStripSize(tif));
strip_size=TIFFStripSize(tif);
index = 0;
imgsize = (int)(image->comps[0].w * image->comps[0].h);
/* Read the Image components
*/
for(strip = 0; strip < TIFFNumberOfStrips(tif); strip++)
{
unsigned char *dat8;
int step;
tsize_t i, ssize;
ssize = TIFFReadEncodedStrip(tif, strip, buf, strip_size);
dat8 = (unsigned char*)buf;
if(tiBps == 16)
{
step = 6 + has_alpha + has_alpha;
for(i = 0; i < ssize; i += step)
{
if(index < imgsize)
{
image->comps[0].data[index] = ( dat8[i+1] << 8 ) | dat8[i+0]; /* R */
image->comps[1].data[index] = ( dat8[i+3] << 8 ) | dat8[i+2]; /* G */
image->comps[2].data[index] = ( dat8[i+5] << 8 ) | dat8[i+4]; /* B */
if(has_alpha)
image->comps[3].data[index] = ( dat8[i+7] << 8 ) | dat8[i+6];
if(is_cinema)
{
/* Rounding 16 to 12 bits
*/
image->comps[0].data[index] =
(image->comps[0].data[index] + 0x08) >> 4 ;
image->comps[1].data[index] =
(image->comps[1].data[index] + 0x08) >> 4 ;
image->comps[2].data[index] =
(image->comps[2].data[index] + 0x08) >> 4 ;
if(has_alpha)
image->comps[3].data[index] =
(image->comps[3].data[index] + 0x08) >> 4 ;
}
index++;
}
else
break;
}/*for(i = 0)*/
}/*if(tiBps == 16)*/
else
if(tiBps == 8)
{
step = 3 + has_alpha;
for(i = 0; i < ssize; i += step)
{
if(index < imgsize)
{
#ifndef USETILEMODE
image->comps[0].data[index] = dat8[i+0];/* R */
image->comps[1].data[index] = dat8[i+1];/* G */
image->comps[2].data[index] = dat8[i+2];/* B */
if(has_alpha)
image->comps[3].data[index] = dat8[i+3];
#endif
if(is_cinema)
{
/* Rounding 8 to 12 bits
*/
#ifndef USETILEMODE
image->comps[0].data[index] = image->comps[0].data[index] << 4 ;
image->comps[1].data[index] = image->comps[1].data[index] << 4 ;
image->comps[2].data[index] = image->comps[2].data[index] << 4 ;
if(has_alpha)
image->comps[3].data[index] = image->comps[3].data[index] << 4 ;
#endif
}
index++;
}/*if(index*/
else
break;
}/*for(i )*/
}/*if( tiBps == 8)*/
else
if(tiBps == 12)/* CINEMA file */
{
step = 9;
for(i = 0; i < ssize; i += step)
{
if((index < imgsize)&&(index+1 < imgsize))
{
image->comps[0].data[index] = ( dat8[i+0]<<4 ) |(dat8[i+1]>>4);
image->comps[1].data[index] = ((dat8[i+1]& 0x0f)<< 8) | dat8[i+2];
image->comps[2].data[index] = ( dat8[i+3]<<4) |(dat8[i+4]>>4);
image->comps[0].data[index+1] = ((dat8[i+4]& 0x0f)<< 8) | dat8[i+5];
image->comps[1].data[index+1] = ( dat8[i+6] <<4) |(dat8[i+7]>>4);
image->comps[2].data[index+1] = ((dat8[i+7]& 0x0f)<< 8) | dat8[i+8];
index += 2;
}
else
break;
}/*for(i )*/
}
}/*for(strip = 0; )*/
_TIFFfree(buf);
TIFFClose(tif);
return image;
}/*RGB(A)*/
if(tiPhoto == PHOTOMETRIC_MINISBLACK) /* GRAY(A) */
{
numcomps = 1 + has_alpha;
color_space = OPJ_CLRSPC_GRAY;
for(j = 0; j < numcomps; ++j)
{
cmptparm[j].prec = tiBps;
cmptparm[j].bpp = tiBps;
cmptparm[j].dx = (OPJ_UINT32)subsampling_dx;
cmptparm[j].dy = (OPJ_UINT32)subsampling_dy;
cmptparm[j].w = (OPJ_UINT32)w;
cmptparm[j].h = (OPJ_UINT32)h;
}
#ifdef USETILEMODE
image = opj_image_tile_create(numcomps,&cmptparm[0],color_space);
#else
image = opj_image_create((OPJ_UINT32)numcomps, &cmptparm[0], color_space);
#endif
if(!image)
{
TIFFClose(tif);
return NULL;
}
/* set image offset and reference grid
*/
image->x0 = (OPJ_UINT32)parameters->image_offset_x0;
image->y0 = (OPJ_UINT32)parameters->image_offset_y0;
image->x1 = !image->x0 ? (OPJ_UINT32)(w - 1) * (OPJ_UINT32)subsampling_dx + 1 :
image->x0 + (OPJ_UINT32)(w - 1) * (OPJ_UINT32)subsampling_dx + 1;
image->y1 = !image->y0 ? (OPJ_UINT32)(h - 1) * (OPJ_UINT32)subsampling_dy + 1 :
image->y0 + (OPJ_UINT32)(h - 1) * (OPJ_UINT32)subsampling_dy + 1;
buf = _TIFFmalloc(TIFFStripSize(tif));
strip_size = TIFFStripSize(tif);
index = 0;
imgsize = (int)(image->comps[0].w * image->comps[0].h);
/* Read the Image components
*/
for(strip = 0; strip < TIFFNumberOfStrips(tif); strip++)
{
unsigned char *dat8;
tsize_t i, ssize;
int step;
ssize = TIFFReadEncodedStrip(tif, strip, buf, strip_size);
dat8 = (unsigned char*)buf;
if(tiBps == 16)
{
step = 2 + has_alpha + has_alpha;
for(i = 0; i < ssize; i += step)
{
if(index < imgsize)
{
image->comps[0].data[index] = ( dat8[i+1] << 8 ) | dat8[i+0];
if(has_alpha)
image->comps[1].data[index] = ( dat8[i+3] << 8 ) | dat8[i+2];
index++;
}
else
break;
}/*for(i )*/
}
else
if(tiBps == 8)
{
step = 1 + has_alpha;
for(i = 0; i < ssize; i += step)
{
if(index < imgsize)
{
image->comps[0].data[index] = dat8[i+0];
if(has_alpha)
image->comps[1].data[index] = dat8[i+1];
index++;
}
else
break;
}/*for(i )*/
}
}/*for(strip = 0;*/
_TIFFfree(buf);
TIFFClose(tif);
}/*GRAY(A)*/
return image;
}/* tiftoimage() */
#endif /* OPJ_HAVE_LIBTIFF */
/* -->> -->> -->> -->>
RAW IMAGE FORMAT

1042
src/bin/jp2/converttif.c Normal file
View File

File diff suppressed because it is too large Load Diff

1
tests/CMakeLists.txt
View File

@ -13,6 +13,7 @@ include_directories(
# First thing define the common source:
set(compare_images_SRCS compare_images.c
${OPENJPEG_SOURCE_DIR}/src/bin/jp2/convert.c
${OPENJPEG_SOURCE_DIR}/src/bin/jp2/converttif.c
${OPENJPEG_SOURCE_DIR}/src/bin/common/opj_getopt.c
)

2
tests/nonregression/checkmd5refs.cmake
View File

@ -32,7 +32,7 @@
get_filename_component(OUTFILENAME_NAME ${OUTFILENAME} NAME)
string(FIND ${OUTFILENAME_NAME} "." SHORTEST_EXT_POS REVERSE)
string(SUBSTRING ${OUTFILENAME_NAME} 0 ${SHORTEST_EXT_POS} OUTFILENAME_NAME_WE)
file(GLOB globfiles "Temporary/${OUTFILENAME_NAME_WE}*.pgx" "Temporary/${OUTFILENAME_NAME_WE}*.png")
file(GLOB globfiles "Temporary/${OUTFILENAME_NAME_WE}*.pgx" "Temporary/${OUTFILENAME_NAME_WE}*.png" "Temporary/${OUTFILENAME_NAME_WE}*.tif")
if(NOT globfiles)
message(SEND_ERROR "Could not find output PGX files: ${OUTFILENAME_NAME_WE}")
endif()

36
tests/nonregression/md5refs.txt
View File

@ -182,3 +182,39 @@ dacaf60e4c430916a8c2a9ebec32e71c issue458.jp2_3.pgx
d33fb5dbddb9b9b4438eb51fa27445a3 issue495.jp2_0.pgx
27db8c35e12a5d5eb94d403d2aae2909 issue495.jp2_1.pgx
97da625d2f2d0b75bf891d8083ce8bfb issue495.jp2_2.pgx
86729c5f2b74b2dfd42cb0d8e47aef79 a1_mono_tif-1.tif
fa9b7b896536b25a7a1d8eeeacb59141 a1_mono_tif-10.tif
b0ee13aa90ca4421e09a3b7b41f410c0 a1_mono_tif-12.tif
4699894fedd3758727d8288cd7adb56c a1_mono_tif-14.tif
4ad682c58e63d3223914c10a6656c8ae a1_mono_tif-16.tif
22c2fa09a4d7b9fade6a3cddc6c6a4dc a1_mono_tif-2.tif
996c5e67a663218be90e86bff8ecad89 a1_mono_tif-4.tif
7f451a5ac89915c5cdc023fd8c813a3c a1_mono_tif-6.tif
c3ebfcf478b1c4fc786748813f2b5d53 a1_mono_tif-8.tif
31650ec40241737634179fff6ad306f8 basn4a08_tif-1.tif
abf884080bcfbf58c044a9d86bfa5e5d basn4a08_tif-10.tif
916d97c098d9792993cc91fee4a83f77 basn4a08_tif-12.tif
57643174986481d336db6ddf04b970df basn4a08_tif-14.tif
fb5cf848d63c61dc485c87c9246ee9c7 basn4a08_tif-16.tif
5d7b01d98c82ad563bb28c2d83484a2a basn4a08_tif-2.tif
2401cebbb1d5494fcbe0d899484c342d basn4a08_tif-4.tif
6dbeb5b708bbde76e204c0887da61f6b basn4a08_tif-6.tif
dc40cc1da6de28e7e973c8ba796ca189 basn4a08_tif-8.tif
59e32c45591fd3bb44fe99381a116ba1 basn6a08_tif-1.tif
630e6fb6deba0b3efd93b610561d607a basn6a08_tif-10.tif
765555e75e59de27f7b2177d04f36bc1 basn6a08_tif-12.tif
62384c112d5fe40aefd0a9b0b9a4bcc6 basn6a08_tif-14.tif
d725d41557658a28ab31dff74e2467fa basn6a08_tif-16.tif
96d91df6b10e866ea26ebbf0b8ddc7da basn6a08_tif-2.tif
a324032339808d5fe85d6e354f14c183 basn6a08_tif-4.tif
d60864a6a5c8a49a202d98ae6f5165c7 basn6a08_tif-6.tif
c3e93f61125f82a9832d0b9440468034 basn6a08_tif-8.tif
cfe04d15cf9d615fc36357dcb3b3956b p0_14_tif-1.tif
9ad87e7fddc77ac85e2e92509bee2365 p0_14_tif-10.tif
38e67f9d573e61166761d5eee0104448 p0_14_tif-12.tif
77486f0468694b94290d0b55361498a0 p0_14_tif-14.tif
51be675689949dd08b6ee1427af3eb4a p0_14_tif-16.tif
3e34e94bd8f7380c8d159676fee9ea57 p0_14_tif-2.tif
b6f71c941e3a5b8d2547792ccec58d54 p0_14_tif-4.tif
81fcdd90917efb95aed94c6522d1c188 p0_14_tif-6.tif
6808377b760b4ef3559ba8b14ed9b91a p0_14_tif-8.tif

70
tests/nonregression/test_suite.ctest.in
View File

@ -74,6 +74,34 @@ opj_compress -i @INPUT_NR_PATH@/issue203-33x33-bgrx16.bmp -o @TEMP_PATH@/issue20
opj_compress -i @INPUT_NR_PATH@/issue203-127x64-bgr16.bmp -o @TEMP_PATH@/issue203-127x64-bgr16.bmp.jp2
opj_compress -i @INPUT_NR_PATH@/issue203-127x64-bgrx.bmp -o @TEMP_PATH@/issue203-127x64-bgrx.bmp.jp2
# issue 322 limited tif support
opj_compress -i @INPUT_NR_PATH@/flower-minisblack-01.tif -o @TEMP_PATH@/flower-minisblack-01.tif.jp2
opj_compress -i @INPUT_NR_PATH@/flower-minisblack-02.tif -o @TEMP_PATH@/flower-minisblack-02.tif.jp2
opj_compress -i @INPUT_NR_PATH@/flower-minisblack-04.tif -o @TEMP_PATH@/flower-minisblack-04.tif.jp2
opj_compress -i @INPUT_NR_PATH@/flower-minisblack-06.tif -o @TEMP_PATH@/flower-minisblack-06.tif.jp2
opj_compress -i @INPUT_NR_PATH@/flower-minisblack-08.tif -o @TEMP_PATH@/flower-minisblack-08.tif.jp2
opj_compress -i @INPUT_NR_PATH@/flower-minisblack-10.tif -o @TEMP_PATH@/flower-minisblack-10.tif.jp2
opj_compress -i @INPUT_NR_PATH@/flower-minisblack-12.tif -o @TEMP_PATH@/flower-minisblack-12.tif.jp2
opj_compress -i @INPUT_NR_PATH@/flower-minisblack-14.tif -o @TEMP_PATH@/flower-minisblack-14.tif.jp2
opj_compress -i @INPUT_NR_PATH@/flower-minisblack-16.tif -o @TEMP_PATH@/flower-minisblack-16.tif.jp2
opj_compress -i @INPUT_NR_PATH@/flower-rgb-contig-02.tif -o @TEMP_PATH@/flower-rgb-contig-02.tif.jp2
opj_compress -i @INPUT_NR_PATH@/flower-rgb-contig-04.tif -o @TEMP_PATH@/flower-rgb-contig-04.tif.jp2
opj_compress -i @INPUT_NR_PATH@/flower-rgb-contig-08.tif -o @TEMP_PATH@/flower-rgb-contig-08.tif.jp2
opj_compress -i @INPUT_NR_PATH@/flower-rgb-contig-10.tif -o @TEMP_PATH@/flower-rgb-contig-10.tif.jp2
opj_compress -i @INPUT_NR_PATH@/flower-rgb-contig-12.tif -o @TEMP_PATH@/flower-rgb-contig-12.tif.jp2
opj_compress -i @INPUT_NR_PATH@/flower-rgb-contig-14.tif -o @TEMP_PATH@/flower-rgb-contig-14.tif.jp2
opj_compress -i @INPUT_NR_PATH@/flower-rgb-contig-16.tif -o @TEMP_PATH@/flower-rgb-contig-16.tif.jp2
opj_compress -i @INPUT_NR_PATH@/flower-rgb-planar-02.tif -o @TEMP_PATH@/flower-rgb-planar-02.tif.jp2
opj_compress -i @INPUT_NR_PATH@/flower-rgb-planar-04.tif -o @TEMP_PATH@/flower-rgb-planar-04.tif.jp2
opj_compress -i @INPUT_NR_PATH@/flower-rgb-planar-08.tif -o @TEMP_PATH@/flower-rgb-planar-08.tif.jp2
opj_compress -i @INPUT_NR_PATH@/flower-rgb-planar-10.tif -o @TEMP_PATH@/flower-rgb-planar-10.tif.jp2
opj_compress -i @INPUT_NR_PATH@/flower-rgb-planar-12.tif -o @TEMP_PATH@/flower-rgb-planar-12.tif.jp2
opj_compress -i @INPUT_NR_PATH@/flower-rgb-planar-14.tif -o @TEMP_PATH@/flower-rgb-planar-14.tif.jp2
opj_compress -i @INPUT_NR_PATH@/flower-rgb-planar-16.tif -o @TEMP_PATH@/flower-rgb-planar-16.tif.jp2
opj_compress -i @INPUT_NR_PATH@/basn6a08.tif -o @TEMP_PATH@/basn6a08.tif.jp2
opj_compress -i @INPUT_NR_PATH@/basn4a08.tif -o @TEMP_PATH@/basn4a08.tif.jp2
# DECODER TEST SUITE
opj_decompress -i @INPUT_NR_PATH@/Bretagne2.j2k -o @TEMP_PATH@/Bretagne2.j2k.pgx
opj_decompress -i @INPUT_NR_PATH@/_00042.j2k -o @TEMP_PATH@/_00042.j2k.pgx
@ -341,3 +369,45 @@ opj_decompress -i @INPUT_CONF_PATH@/p0_04.j2k -o @TEMP_PATH@/p0_04_6_5.j2k.png -
#opj_decompress -i @INPUT_CONF_PATH@/p1_01.j2k -o @TEMP_PATH@/p1_01_3.j2k.png -d 10,150,190,210
#opj_decompress -i @INPUT_CONF_PATH@/p1_01.j2k -o @TEMP_PATH@/p1_01_4.j2k.png -d 100,80,200,150
#opj_decompress -i @INPUT_CONF_PATH@/p1_01.j2k -o @TEMP_PATH@/p1_01_5.j2k.png -d 150,20,200,50
# issue 322 limited tif support
# GRAYSCALE
opj_decompress -i @INPUT_CONF_PATH@/a1_mono.j2c -o @TEMP_PATH@/a1_mono_tif-1.tif -p 1S
opj_decompress -i @INPUT_CONF_PATH@/a1_mono.j2c -o @TEMP_PATH@/a1_mono_tif-2.tif -p 2S
opj_decompress -i @INPUT_CONF_PATH@/a1_mono.j2c -o @TEMP_PATH@/a1_mono_tif-4.tif -p 4S
opj_decompress -i @INPUT_CONF_PATH@/a1_mono.j2c -o @TEMP_PATH@/a1_mono_tif-6.tif -p 6S
opj_decompress -i @INPUT_CONF_PATH@/a1_mono.j2c -o @TEMP_PATH@/a1_mono_tif-8.tif -p 8S
opj_decompress -i @INPUT_CONF_PATH@/a1_mono.j2c -o @TEMP_PATH@/a1_mono_tif-10.tif -p 10S
opj_decompress -i @INPUT_CONF_PATH@/a1_mono.j2c -o @TEMP_PATH@/a1_mono_tif-12.tif -p 12S
opj_decompress -i @INPUT_CONF_PATH@/a1_mono.j2c -o @TEMP_PATH@/a1_mono_tif-14.tif -p 14S
opj_decompress -i @INPUT_CONF_PATH@/a1_mono.j2c -o @TEMP_PATH@/a1_mono_tif-16.tif -p 16S
# GRAYSCALE ALPHA
opj_decompress -i @INPUT_NR_PATH@/basn4a08.jp2 -o @TEMP_PATH@/basn4a08_tif-1.tif -p 1S
opj_decompress -i @INPUT_NR_PATH@/basn4a08.jp2 -o @TEMP_PATH@/basn4a08_tif-2.tif -p 2S
opj_decompress -i @INPUT_NR_PATH@/basn4a08.jp2 -o @TEMP_PATH@/basn4a08_tif-4.tif -p 4S
opj_decompress -i @INPUT_NR_PATH@/basn4a08.jp2 -o @TEMP_PATH@/basn4a08_tif-6.tif -p 6S
opj_decompress -i @INPUT_NR_PATH@/basn4a08.jp2 -o @TEMP_PATH@/basn4a08_tif-8.tif -p 8S
opj_decompress -i @INPUT_NR_PATH@/basn4a08.jp2 -o @TEMP_PATH@/basn4a08_tif-10.tif -p 10S
opj_decompress -i @INPUT_NR_PATH@/basn4a08.jp2 -o @TEMP_PATH@/basn4a08_tif-12.tif -p 12S
opj_decompress -i @INPUT_NR_PATH@/basn4a08.jp2 -o @TEMP_PATH@/basn4a08_tif-14.tif -p 14S
opj_decompress -i @INPUT_NR_PATH@/basn4a08.jp2 -o @TEMP_PATH@/basn4a08_tif-16.tif -p 16S
# RGB
opj_decompress -i @INPUT_CONF_PATH@/p0_14.j2k -o @TEMP_PATH@/p0_14_tif-1.tif -p 1S
opj_decompress -i @INPUT_CONF_PATH@/p0_14.j2k -o @TEMP_PATH@/p0_14_tif-2.tif -p 2S
opj_decompress -i @INPUT_CONF_PATH@/p0_14.j2k -o @TEMP_PATH@/p0_14_tif-4.tif -p 4S
opj_decompress -i @INPUT_CONF_PATH@/p0_14.j2k -o @TEMP_PATH@/p0_14_tif-6.tif -p 6S
opj_decompress -i @INPUT_CONF_PATH@/p0_14.j2k -o @TEMP_PATH@/p0_14_tif-8.tif -p 8S
opj_decompress -i @INPUT_CONF_PATH@/p0_14.j2k -o @TEMP_PATH@/p0_14_tif-10.tif -p 10S
opj_decompress -i @INPUT_CONF_PATH@/p0_14.j2k -o @TEMP_PATH@/p0_14_tif-12.tif -p 12S
opj_decompress -i @INPUT_CONF_PATH@/p0_14.j2k -o @TEMP_PATH@/p0_14_tif-14.tif -p 14S
opj_decompress -i @INPUT_CONF_PATH@/p0_14.j2k -o @TEMP_PATH@/p0_14_tif-16.tif -p 16S
# RGBA
opj_decompress -i @INPUT_NR_PATH@/basn6a08.jp2 -o @TEMP_PATH@/basn6a08_tif-1.tif -p 1S
opj_decompress -i @INPUT_NR_PATH@/basn6a08.jp2 -o @TEMP_PATH@/basn6a08_tif-2.tif -p 2S
opj_decompress -i @INPUT_NR_PATH@/basn6a08.jp2 -o @TEMP_PATH@/basn6a08_tif-4.tif -p 4S
opj_decompress -i @INPUT_NR_PATH@/basn6a08.jp2 -o @TEMP_PATH@/basn6a08_tif-6.tif -p 6S
opj_decompress -i @INPUT_NR_PATH@/basn6a08.jp2 -o @TEMP_PATH@/basn6a08_tif-8.tif -p 8S
opj_decompress -i @INPUT_NR_PATH@/basn6a08.jp2 -o @TEMP_PATH@/basn6a08_tif-10.tif -p 10S
opj_decompress -i @INPUT_NR_PATH@/basn6a08.jp2 -o @TEMP_PATH@/basn6a08_tif-12.tif -p 12S
opj_decompress -i @INPUT_NR_PATH@/basn6a08.jp2 -o @TEMP_PATH@/basn6a08_tif-14.tif -p 14S
opj_decompress -i @INPUT_NR_PATH@/basn6a08.jp2 -o @TEMP_PATH@/basn6a08_tif-16.tif -p 16S