projects
/
openjpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0c19626
)
Use standard integer types for compatibility with libtiff 4.3.0 (#1377)
author
Jamaika1
<lukaszcz18@wp.pl>
Sun, 12 Sep 2021 10:32:38 +0000
(12:32 +0200)
committer
GitHub
<noreply@github.com>
Sun, 12 Sep 2021 10:32:38 +0000
(12:32 +0200)
src/bin/jp2/converttif.c
patch
|
blob
|
history
diff --git
a/src/bin/jp2/converttif.c
b/src/bin/jp2/converttif.c
index 9d1037acb63dd67c5600d2f8a47d1fd560f24ec7..efd5a4e79c2c5b16a95d2896a9170e7a923bbd75 100644
(file)
--- a/
src/bin/jp2/converttif.c
+++ b/
src/bin/jp2/converttif.c
@@
-568,8
+568,8
@@
int imagetotif(opj_image_t * image, const char *outfile)
{
TIFF *tif;
tdata_t buf;
{
TIFF *tif;
tdata_t buf;
- uint32 width, height;
- uint16 bps, tiPhoto;
+ uint32
_t
width, height;
+ uint16
_t
bps, tiPhoto;
int adjust, sgnd;
int64_t strip_size, rowStride, TIFF_MAX;
OPJ_UINT32 i, numcomps;
int adjust, sgnd;
int64_t strip_size, rowStride, TIFF_MAX;
OPJ_UINT32 i, numcomps;
@@
-578,7
+578,7
@@
int imagetotif(opj_image_t * image, const char *outfile)
convert_32s_PXCX cvtPxToCx = NULL;
convert_32sXXx_C1R cvt32sToTif = NULL;
convert_32s_PXCX cvtPxToCx = NULL;
convert_32sXXx_C1R cvt32sToTif = NULL;
- bps = (uint16)image->comps[0].prec;
+ bps = (uint16
_t
)image->comps[0].prec;
planes[0] = image->comps[0].data;
numcomps = image->numcomps;
planes[0] = image->comps[0].data;
numcomps = image->numcomps;
@@
-694,12
+694,12
@@
int imagetotif(opj_image_t * image, const char *outfile)
}
sgnd = (int)image->comps[0].sgnd;
adjust = sgnd ? (int)(1 << (image->comps[0].prec - 1)) : 0;
}
sgnd = (int)image->comps[0].sgnd;
adjust = sgnd ? (int)(1 << (image->comps[0].prec - 1)) : 0;
- width = (uint32)image->comps[0].w;
- height = (uint32)image->comps[0].h;
+ width = (uint32
_t
)image->comps[0].w;
+ height = (uint32
_t
)image->comps[0].h;
TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, width);
TIFFSetField(tif, TIFFTAG_IMAGELENGTH, height);
TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, width);
TIFFSetField(tif, TIFFTAG_IMAGELENGTH, height);
- TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, (uint16)numcomps);
+ TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, (uint16
_t
)numcomps);
TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, bps);
TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, bps);
TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
@@
-1259,8
+1259,8
@@
opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters)
OPJ_COLOR_SPACE color_space = OPJ_CLRSPC_UNKNOWN;
opj_image_cmptparm_t cmptparm[4]; /* RGBA */
opj_image_t *image = NULL;
OPJ_COLOR_SPACE color_space = OPJ_CLRSPC_UNKNOWN;
opj_image_cmptparm_t cmptparm[4]; /* RGBA */
opj_image_t *image = NULL;
- uint16 tiBps, tiPhoto, tiSf, tiSpp, tiPC;
- uint32 tiWidth, tiHeight;
+ uint16
_t
tiBps, tiPhoto, tiSf, tiSpp, tiPC;
+ uint32
_t
tiWidth, tiHeight;
OPJ_BOOL is_cinema = OPJ_IS_CINEMA(parameters->rsiz);
convert_XXx32s_C1R cvtTifTo32s = NULL;
convert_32s_CXPX cvtCxToPx = NULL;
OPJ_BOOL is_cinema = OPJ_IS_CINEMA(parameters->rsiz);
convert_XXx32s_C1R cvtTifTo32s = NULL;
convert_32s_CXPX cvtCxToPx = NULL;