Skip to content

Set image pixels individually on 32-bit Windows #9492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hugovk merged 1 commit into from
Mar 26, 2026
+16 −4
Merged

Set image pixels individually on 32-bit Windows #9492

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions src/libImaging/Paste.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,16 +352,16 @@ ImagingPaste(

static inline void
fill(
Imaging imOut, const void *ink_, int dx, int dy, int xsize, int ysize, int pixelsize
Imaging imOut, const UINT8 *ink, int dx, int dy, int xsize, int ysize, int pixelsize
) {
/* fill opaque region */

int x, y;
int x, y, i;
UINT8 ink8 = 0;
INT32 ink32 = 0L;

memcpy(&ink32, ink_, pixelsize);
memcpy(&ink8, ink_, sizeof(ink8));
memcpy(&ink32, ink, pixelsize);
memcpy(&ink8, ink, sizeof(ink8));

if (imOut->image8 || ink32 == 0L) {
dx *= pixelsize;
Expand All @@ -371,12 +371,24 @@ fill(
}

} else {
#if defined _WIN32 && !defined _WIN64
dx *= pixelsize;
for (y = 0; y < ysize; y++) {
UINT8 *out = (UINT8 *)imOut->image[y + dy] + dx;
for (x = 0; x < xsize; x++) {
for (i = 0; i < pixelsize; i++) {
*out++ = ink[i];
}
}
}
#else
for (y = 0; y < ysize; y++) {
INT32 *out = imOut->image32[y + dy] + dx;
for (x = 0; x < xsize; x++) {
out[x] = ink32;
}
}
#endif
}
}

Expand Down
Loading