From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 28 Apr 2012 22:24:40 +0000 (+0000)
Subject: Handle kCGImageAlphaNoneSkipFirst correctly in wxOSX wxBitmap code.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4fbb421ba9ba22ae7aa2a73b48009d18a06fdd94

Handle kCGImageAlphaNoneSkipFirst correctly in wxOSX wxBitmap code.

The code tested twice for kCGImageAlphaNoneSkipLast which was clearly wrong.
The original intention was probably to check for both it and
kCGImageAlphaNoneSkipFirst, so fix it to this now.

Closes #14019.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/osx/core/bitmap.cpp b/src/osx/core/bitmap.cpp
index 20449c04a6..441a859737 100644
--- a/src/osx/core/bitmap.cpp
+++ b/src/osx/core/bitmap.cpp
@@ -306,7 +306,7 @@ bool wxBitmapRefData::Create(CGImageRef image)
             memset( data , 0 , size ) ;
             m_memBuf.UngetWriteBuf( size ) ;
             CGImageAlphaInfo alpha = CGImageGetAlphaInfo(image);
-            if ( alpha == kCGImageAlphaNone || alpha == kCGImageAlphaNoneSkipLast || alpha == kCGImageAlphaNoneSkipLast )
+            if ( alpha == kCGImageAlphaNone || alpha == kCGImageAlphaNoneSkipFirst || alpha == kCGImageAlphaNoneSkipLast )
             {
                 m_hBitmap = CGBitmapContextCreate((char*) data, m_width, m_height, 8, m_bytesPerRow, wxMacGetGenericRGBColorSpace(), kCGImageAlphaNoneSkipFirst );
             }