blender
/
blender
136
406
Fork 588
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Fix #118351: Pixel Shift with Win32 Clipboard DibV5 Image Transfer #118417

Merged
Harley Acheson merged 1 commits from Harley/blender:DibV5Error into blender-v4.1-release 2024-02-17 20:29:52 +01:00
Conversation 0 Commits 1 Files Changed 1 +2 -6
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
intern/ghost/intern/GHOST_SystemWin32.cc
View File

@ -2388,9 +2388,6 @@ static uint *getClipboardImageDibV5(int *r_width, int *r_height)
int offset = bitmapV5Header->bV5Size + bitmapV5Header->bV5ClrUsed * sizeof(RGBQUAD);
if (bitmapV5Header->bV5Compression == BI_BITFIELDS) {
offset += 12;
}
BYTE *buffer = (BYTE *)bitmapV5Header + offset;
int bitcount = bitmapV5Header->bV5BitCount;
int width = bitmapV5Header->bV5Width;
@ -2539,8 +2536,7 @@ static bool putClipboardImageDibV5(uint *rgba, int width, int height)
DWORD size_pixels = width * height * 4;
/* Pixel data is 12 bytes after the header. */
HGLOBAL hMem = GlobalAlloc(GHND, sizeof(BITMAPV5HEADER) + 12 + size_pixels);
HGLOBAL hMem = GlobalAlloc(GHND, sizeof(BITMAPV5HEADER) + size_pixels);
if (!hMem) {
return false;
}
@ -2566,7 +2562,7 @@ static bool putClipboardImageDibV5(uint *rgba, int width, int height)
hdr->bV5Intent = LCS_GM_IMAGES;
hdr->bV5ClrUsed = 0;
memcpy((char *)hdr + sizeof(BITMAPV5HEADER) + 12, rgba, size_pixels);
memcpy((char *)hdr + sizeof(BITMAPV5HEADER), rgba, size_pixels);
GlobalUnlock(hMem);