dlls/windowscodecs/libtiff.c:256:5: warning: ‘uint16’ is deprecated [-Wdeprecated-declarations]
Signed-off-by: Andrew Eikum aeikum@codeweavers.com --- dlls/windowscodecs/libtiff.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/dlls/windowscodecs/libtiff.c b/dlls/windowscodecs/libtiff.c index 25d8c1c6081..8f9bac115e5 100644 --- a/dlls/windowscodecs/libtiff.c +++ b/dlls/windowscodecs/libtiff.c @@ -253,9 +253,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) { - uint16 photometric, bps, samples, planar; - uint16 extra_sample_count, extra_sample, *extra_samples; - uint16 *red, *green, *blue; + uint16_t photometric, bps, samples, planar; + uint16_t extra_sample_count, extra_sample, *extra_samples; + uint16_t *red, *green, *blue; UINT resolution_unit; float xres=0.0, yres=0.0; int ret, i; @@ -1282,32 +1282,32 @@ static HRESULT CDECL tiff_encoder_create_frame(struct encoder* iface, const stru
This->format = &formats[i];
- pTIFFSetField(This->tiff, TIFFTAG_PHOTOMETRIC, (uint16)This->format->photometric); - pTIFFSetField(This->tiff, TIFFTAG_PLANARCONFIG, (uint16)1); - pTIFFSetField(This->tiff, TIFFTAG_BITSPERSAMPLE, (uint16)This->format->bps); - pTIFFSetField(This->tiff, TIFFTAG_SAMPLESPERPIXEL, (uint16)This->format->samples); + pTIFFSetField(This->tiff, TIFFTAG_PHOTOMETRIC, (uint16_t)This->format->photometric); + pTIFFSetField(This->tiff, TIFFTAG_PLANARCONFIG, (uint16_t)1); + pTIFFSetField(This->tiff, TIFFTAG_BITSPERSAMPLE, (uint16_t)This->format->bps); + pTIFFSetField(This->tiff, TIFFTAG_SAMPLESPERPIXEL, (uint16_t)This->format->samples);
if (This->format->extra_sample) { - uint16 extra_samples; + uint16_t extra_samples; 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_IMAGELENGTH, (uint32)frame->height); + pTIFFSetField(This->tiff, TIFFTAG_IMAGEWIDTH, (uint32_t)frame->width); + pTIFFSetField(This->tiff, TIFFTAG_IMAGELENGTH, (uint32_t)frame->height);
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_YRESOLUTION, (float)frame->dpiy); }
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;
for (i = 0; i < frame->num_colors; i++)
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=90881
Your paranoid android.
=== debiant2 (build log) ===
../wine/dlls/windowscodecs/libtiff.c:256:5: error: unknown type name ‘uint16_t’; did you mean ‘u_int16_t’? ../wine/dlls/windowscodecs/libtiff.c:257:5: error: unknown type name ‘uint16_t’; did you mean ‘u_int16_t’? ../wine/dlls/windowscodecs/libtiff.c:258:5: error: unknown type name ‘uint16_t’; did you mean ‘u_int16_t’? ../wine/dlls/windowscodecs/libtiff.c:1285:53: error: ‘uint16_t’ undeclared (first use in this function); did you mean ‘u_int16_t’? ../wine/dlls/windowscodecs/libtiff.c:1285:62: error: expected ‘)’ before ‘This’ ../wine/dlls/windowscodecs/libtiff.c:1286:63: error: expected ‘)’ before numeric constant ../wine/dlls/windowscodecs/libtiff.c:1287:64: error: expected ‘)’ before ‘This’ ../wine/dlls/windowscodecs/libtiff.c:1288:66: error: expected ‘)’ before ‘This’ ../wine/dlls/windowscodecs/libtiff.c:1292:17: error: expected ‘;’ before ‘extra_samples’ ../wine/dlls/windowscodecs/libtiff.c:1293:9: error: ‘extra_samples’ undeclared (first use in this function) ../wine/dlls/windowscodecs/libtiff.c:1295:67: error: expected ‘)’ before numeric constant ../wine/dlls/windowscodecs/libtiff.c:1298:52: error: ‘uint32_t’ undeclared (first use in this function); did you mean ‘u_int32_t’? ../wine/dlls/windowscodecs/libtiff.c:1298:61: error: expected ‘)’ before ‘frame’ ../wine/dlls/windowscodecs/libtiff.c:1299:62: error: expected ‘)’ before ‘frame’ ../wine/dlls/windowscodecs/libtiff.c:1303:69: error: expected ‘)’ before numeric constant ../wine/dlls/windowscodecs/libtiff.c:1310:17: error: expected ‘;’ before ‘red’ ../wine/dlls/windowscodecs/libtiff.c:1315:13: error: ‘red’ undeclared (first use in this function); did you mean ‘read’? ../wine/dlls/windowscodecs/libtiff.c:1316:13: error: ‘green’ undeclared (first use in this function) ../wine/dlls/windowscodecs/libtiff.c:1317:13: error: ‘blue’ undeclared (first use in this function) Task: The win32 Wine build failed
=== debiant2 (build log) ===
../wine/dlls/windowscodecs/libtiff.c:256:5: error: unknown type name ‘uint16_t’; did you mean ‘u_int16_t’? ../wine/dlls/windowscodecs/libtiff.c:257:5: error: unknown type name ‘uint16_t’; did you mean ‘u_int16_t’? ../wine/dlls/windowscodecs/libtiff.c:258:5: error: unknown type name ‘uint16_t’; did you mean ‘u_int16_t’? ../wine/dlls/windowscodecs/libtiff.c:1285:53: error: ‘uint16_t’ undeclared (first use in this function); did you mean ‘u_int16_t’? ../wine/dlls/windowscodecs/libtiff.c:1285:62: error: expected ‘)’ before ‘This’ ../wine/dlls/windowscodecs/libtiff.c:1286:63: error: expected ‘)’ before numeric constant ../wine/dlls/windowscodecs/libtiff.c:1287:64: error: expected ‘)’ before ‘This’ ../wine/dlls/windowscodecs/libtiff.c:1288:66: error: expected ‘)’ before ‘This’ ../wine/dlls/windowscodecs/libtiff.c:1292:17: error: expected ‘;’ before ‘extra_samples’ ../wine/dlls/windowscodecs/libtiff.c:1293:9: error: ‘extra_samples’ undeclared (first use in this function) ../wine/dlls/windowscodecs/libtiff.c:1295:67: error: expected ‘)’ before numeric constant ../wine/dlls/windowscodecs/libtiff.c:1298:52: error: ‘uint32_t’ undeclared (first use in this function); did you mean ‘u_int32_t’? ../wine/dlls/windowscodecs/libtiff.c:1298:61: error: expected ‘)’ before ‘frame’ ../wine/dlls/windowscodecs/libtiff.c:1299:62: error: expected ‘)’ before ‘frame’ ../wine/dlls/windowscodecs/libtiff.c:1303:69: error: expected ‘)’ before numeric constant ../wine/dlls/windowscodecs/libtiff.c:1310:17: error: expected ‘;’ before ‘red’ ../wine/dlls/windowscodecs/libtiff.c:1315:13: error: ‘red’ undeclared (first use in this function); did you mean ‘read’? ../wine/dlls/windowscodecs/libtiff.c:1316:13: error: ‘green’ undeclared (first use in this function) ../wine/dlls/windowscodecs/libtiff.c:1317:13: error: ‘blue’ undeclared (first use in this function) Task: The wow64 Wine build failed
-
Andrew Eikum -
Marvin