From f661752b53cfc905806d43c8ae929034a742f2c0 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 16 May 2024 22:25:28 +1000 Subject: [PATCH] Fix type errors --- src/_imagingcms.c | 2 +- src/display.c | 2 +- src/libImaging/ImDib.h | 2 +- src/libImaging/TiffDecode.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/_imagingcms.c b/src/_imagingcms.c index 63d78f84daa..4b0e21d7a4e 100644 --- a/src/_imagingcms.c +++ b/src/_imagingcms.c @@ -622,7 +622,7 @@ cms_profile_is_intent_supported(CmsProfileObject *self, PyObject *args) { static PyObject * cms_get_display_profile_win32(PyObject *self, PyObject *args) { char filename[MAX_PATH]; - cmsUInt32Number filename_size; + DWORD filename_size; BOOL ok; HANDLE handle = 0; diff --git a/src/display.c b/src/display.c index 6b66ddafb87..abf94f1e1a7 100644 --- a/src/display.c +++ b/src/display.c @@ -716,7 +716,7 @@ PyImaging_DrawWmf(PyObject *self, PyObject *args) { HDC dc; RECT rect; PyObject *buffer = NULL; - char *ptr; + void *ptr; char *data; Py_ssize_t datasize; diff --git a/src/libImaging/ImDib.h b/src/libImaging/ImDib.h index 91ff3f322ff..ee06d562f85 100644 --- a/src/libImaging/ImDib.h +++ b/src/libImaging/ImDib.h @@ -24,7 +24,7 @@ struct ImagingDIBInstance { HBITMAP bitmap; HGDIOBJ old_bitmap; BITMAPINFO *info; - UINT8 *bits; + void *bits; HPALETTE palette; /* Used by cut and paste */ char mode[4]; diff --git a/src/libImaging/TiffDecode.c b/src/libImaging/TiffDecode.c index e3b81590ec2..4874dd26ab5 100644 --- a/src/libImaging/TiffDecode.c +++ b/src/libImaging/TiffDecode.c @@ -973,7 +973,7 @@ ImagingLibTiffEncode(Imaging im, ImagingCodecState state, UINT8 *buffer, int byt } if (state->state == 1 && !clientstate->fp) { - int read = (int)_tiffReadProc(clientstate, (tdata_t)buffer, (tsize_t)bytes); + int read = (int)_tiffReadProc((thandle_t)clientstate, (tdata_t)buffer, (tsize_t)bytes); TRACE( ("Buffer: %p: %c%c%c%c\n", buffer,