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

Merge pull request #980 from szukw000/changes-for-ppc64-converttif 

Changes in converttif.c for PPC64
This commit is contained in:
Even Rouault 2017-08-11 15:13:35 +02:00 committed by GitHub
parent a35b489134 9f750884f9
commit 0b4c3ce75d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/bin/jp2/converttif.c
View File

@ -568,7 +568,8 @@ int imagetotif(opj_image_t * image, const char *outfile)
{ {
TIFF *tif; TIFF *tif;
tdata_t buf; tdata_t buf;
uint32 width, height, bps, tiPhoto; uint32 width, height;
uint16 bps, tiPhoto;
int adjust, sgnd; int adjust, sgnd;
int64_t strip_size, rowStride, TIFF_MAX; int64_t strip_size, rowStride, TIFF_MAX;
OPJ_UINT32 i, numcomps; OPJ_UINT32 i, numcomps;
@ -577,7 +578,7 @@ int imagetotif(opj_image_t * image, const char *outfile)
convert_32s_PXCX cvtPxToCx = NULL; convert_32s_PXCX cvtPxToCx = NULL;
convert_32sXXx_C1R cvt32sToTif = NULL; convert_32sXXx_C1R cvt32sToTif = NULL;
bps = (uint32)image->comps[0].prec; bps = (uint16)image->comps[0].prec;
planes[0] = image->comps[0].data; planes[0] = image->comps[0].data;
numcomps = image->numcomps; numcomps = image->numcomps;
@ -692,7 +693,7 @@ int imagetotif(opj_image_t * image, const char *outfile)
TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, width); TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, width);
TIFFSetField(tif, TIFFTAG_IMAGELENGTH, height); TIFFSetField(tif, TIFFTAG_IMAGELENGTH, height);
TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, (uint32)numcomps); TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, (uint16)numcomps);
TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, bps); TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, bps);
TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT); TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG); TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
@ -1254,7 +1255,8 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters)
opj_image_cmptparm_t cmptparm[4]; /* RGBA */ opj_image_cmptparm_t cmptparm[4]; /* RGBA */
opj_image_t *image = NULL; opj_image_t *image = NULL;
int has_alpha = 0; int has_alpha = 0;
uint32 tiBps, tiPhoto, tiSf, tiSpp, tiPC, tiWidth, tiHeight; uint16 tiBps, tiPhoto, tiSf, tiSpp, tiPC;
uint32 tiWidth, tiHeight;
OPJ_BOOL is_cinema = OPJ_IS_CINEMA(parameters->rsiz); OPJ_BOOL is_cinema = OPJ_IS_CINEMA(parameters->rsiz);
convert_XXx32s_C1R cvtTifTo32s = NULL; convert_XXx32s_C1R cvtTifTo32s = NULL;
convert_32s_CXPX cvtCxToPx = NULL; convert_32s_CXPX cvtCxToPx = NULL;