python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-11-04 09:57:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into type_hint

Browse Source
This commit is contained in:
Andrew Murray 2024-05-19 14:46:16 +10:00 committed by GitHub
commit de06d517e1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/_imagingcms.c
View File

@ -622,7 +622,7 @@ cms_profile_is_intent_supported(CmsProfileObject *self, PyObject *args) {
static PyObject * static PyObject *
cms_get_display_profile_win32(PyObject *self, PyObject *args) { cms_get_display_profile_win32(PyObject *self, PyObject *args) {
char filename[MAX_PATH]; char filename[MAX_PATH];
cmsUInt32Number filename_size; DWORD filename_size;
BOOL ok; BOOL ok;
HANDLE handle = 0; HANDLE handle = 0;

2
src/display.c
View File

@ -716,7 +716,7 @@ PyImaging_DrawWmf(PyObject *self, PyObject *args) {
HDC dc; HDC dc;
RECT rect; RECT rect;
PyObject *buffer = NULL; PyObject *buffer = NULL;
char *ptr; void *ptr;
char *data; char *data;
Py_ssize_t datasize; Py_ssize_t datasize;

2
src/libImaging/Dib.c
View File

@ -95,7 +95,7 @@ ImagingNewDIB(const char *mode, int xsize, int ysize) {
} }
dib->bitmap = dib->bitmap =
CreateDIBSection(dib->dc, dib->info, DIB_RGB_COLORS, &dib->bits, NULL, 0); CreateDIBSection(dib->dc, dib->info, DIB_RGB_COLORS, (void **)&dib->bits, NULL, 0);
if (!dib->bitmap) { if (!dib->bitmap) {
free(dib->info); free(dib->info);
free(dib); free(dib);

2
src/libImaging/TiffDecode.c
View File

@ -973,7 +973,7 @@ ImagingLibTiffEncode(Imaging im, ImagingCodecState state, UINT8 *buffer, int byt
} }
if (state->state == 1 && !clientstate->fp) { 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( TRACE(
("Buffer: %p: %c%c%c%c\n", ("Buffer: %p: %c%c%c%c\n",
buffer, buffer,