From 410c8aa5f58f9063c457716c0ca37e99112c0d1d Mon Sep 17 00:00:00 2001 From: Mario Liebisch Date: Thu, 9 Aug 2018 13:03:14 +0200 Subject: [PATCH] Windows: Fixed swapped colors for custom cursors Previously the red and blue color channels were swapped, since Windows expects a different channel order for DIBs. This fixes issue #1464. --- src/SFML/Window/Win32/CursorImpl.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/SFML/Window/Win32/CursorImpl.cpp b/src/SFML/Window/Win32/CursorImpl.cpp index 28f42744a..2bbaab5f2 100755 --- a/src/SFML/Window/Win32/CursorImpl.cpp +++ b/src/SFML/Window/Win32/CursorImpl.cpp @@ -89,7 +89,15 @@ bool CursorImpl::loadFromPixels(const Uint8* pixels, Vector2u size, Vector2u hot } // Fill our bitmap with the cursor color data - std::memcpy(bitmapData, pixels, size.x * size.y * 4); + // We'll have to swap the red and blue channels here + Uint8* bitmapOffset = bitmapData; + for (std::size_t remaining = size.x * size.y; remaining; --remaining, pixels += 4) + { + *bitmapOffset++ = pixels[2]; // Blue + *bitmapOffset++ = pixels[1]; // Green + *bitmapOffset++ = pixels[0]; // Red + *bitmapOffset++ = pixels[3]; // Alpha + } // Create a dummy mask bitmap (it won't be used) HBITMAP mask = CreateBitmap(size.x, size.y, 1, 1, NULL);