ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

windowscodecs: Avoid types deprecated in libtiff 4.3. 

dlls/windowscodecs/libtiff.c:256:5: warning: ‘uint16’ is deprecated [-Wdeprecated-declarations]

Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Esme Povirk <esme@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit 5e3758a70f)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
This commit is contained in:
Andrew Eikum 2021-05-19 16:04:57 -05:00 committed by Michael Stefaniuc
parent f2dad112ac
commit fbe42005a5
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dlls/windowscodecs/libtiff.c
View File

@ -29,6 +29,7 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#ifdef HAVE_TIFFIO_H #ifdef HAVE_TIFFIO_H
#include <stdint.h>
#include <tiffio.h> #include <tiffio.h>
#endif #endif
@ -253,9 +254,9 @@ static inline struct tiff_decoder *impl_from_decoder(struct decoder* iface)
static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info)
{ {
uint16 photometric, bps, samples, planar; uint16_t photometric, bps, samples, planar;
uint16 extra_sample_count, extra_sample, *extra_samples; uint16_t extra_sample_count, extra_sample, *extra_samples;
uint16 *red, *green, *blue; uint16_t *red, *green, *blue;
UINT resolution_unit; UINT resolution_unit;
float xres=0.0, yres=0.0; float xres=0.0, yres=0.0;
int ret, i; int ret, i;
@ -1282,32 +1283,32 @@ static HRESULT CDECL tiff_encoder_create_frame(struct encoder* iface, const stru
This->format = &formats[i]; This->format = &formats[i];
pTIFFSetField(This->tiff, TIFFTAG_PHOTOMETRIC, (uint16)This->format->photometric); pTIFFSetField(This->tiff, TIFFTAG_PHOTOMETRIC, (uint16_t)This->format->photometric);
pTIFFSetField(This->tiff, TIFFTAG_PLANARCONFIG, (uint16)1); pTIFFSetField(This->tiff, TIFFTAG_PLANARCONFIG, (uint16_t)1);
pTIFFSetField(This->tiff, TIFFTAG_BITSPERSAMPLE, (uint16)This->format->bps); pTIFFSetField(This->tiff, TIFFTAG_BITSPERSAMPLE, (uint16_t)This->format->bps);
pTIFFSetField(This->tiff, TIFFTAG_SAMPLESPERPIXEL, (uint16)This->format->samples); pTIFFSetField(This->tiff, TIFFTAG_SAMPLESPERPIXEL, (uint16_t)This->format->samples);
if (This->format->extra_sample) if (This->format->extra_sample)
{ {
uint16 extra_samples; uint16_t extra_samples;
extra_samples = This->format->extra_sample_type; extra_samples = This->format->extra_sample_type;
pTIFFSetField(This->tiff, TIFFTAG_EXTRASAMPLES, (uint16)1, &extra_samples); pTIFFSetField(This->tiff, TIFFTAG_EXTRASAMPLES, (uint16_t)1, &extra_samples);
} }
pTIFFSetField(This->tiff, TIFFTAG_IMAGEWIDTH, (uint32)frame->width); pTIFFSetField(This->tiff, TIFFTAG_IMAGEWIDTH, (uint32_t)frame->width);
pTIFFSetField(This->tiff, TIFFTAG_IMAGELENGTH, (uint32)frame->height); pTIFFSetField(This->tiff, TIFFTAG_IMAGELENGTH, (uint32_t)frame->height);
if (frame->dpix != 0.0 && frame->dpiy != 0.0) if (frame->dpix != 0.0 && frame->dpiy != 0.0)
{ {
pTIFFSetField(This->tiff, TIFFTAG_RESOLUTIONUNIT, (uint16)2); /* Inch */ pTIFFSetField(This->tiff, TIFFTAG_RESOLUTIONUNIT, (uint16_t)2); /* Inch */
pTIFFSetField(This->tiff, TIFFTAG_XRESOLUTION, (float)frame->dpix); pTIFFSetField(This->tiff, TIFFTAG_XRESOLUTION, (float)frame->dpix);
pTIFFSetField(This->tiff, TIFFTAG_YRESOLUTION, (float)frame->dpiy); pTIFFSetField(This->tiff, TIFFTAG_YRESOLUTION, (float)frame->dpiy);
} }
if (This->format->bpp <= 8 && frame->num_colors && This->format->indexed) if (This->format->bpp <= 8 && frame->num_colors && This->format->indexed)
{ {
uint16 red[256], green[256], blue[256]; uint16_t red[256], green[256], blue[256];
UINT i; UINT i;
for (i = 0; i < frame->num_colors; i++) for (i = 0; i < frame->num_colors; i++)