diff options
| author | Jamaika1 <lukaszcz18@wp.pl> | 2021-09-12 12:32:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-12 12:32:38 +0200 |
| commit | 8fc4bf8ecbccea2d2ec3faef143ca5a57eba677d (patch) | |
| tree | aff5dc67cfeab04585c32ad5da03c0e6a514f340 | |
| parent | 0c1962669858b1d67a6b8851ae0e8c4123a1c282 (diff) | |
Use standard integer types for compatibility with libtiff 4.3.0 (#1377)
| -rw-r--r-- | src/bin/jp2/converttif.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/bin/jp2/converttif.c b/src/bin/jp2/converttif.c index 9d1037ac..efd5a4e7 100644 --- 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; - 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; @@ -578,7 +578,7 @@ int imagetotif(opj_image_t * image, const char *outfile) 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; @@ -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; - 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_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); @@ -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; - 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; |