Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OSX renaming round 2

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2008-07-30 14:52:41 +00:00
parent 9729777e2a
commit 292e5e1f17
15 changed files with 109 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/osx/carbon/bitmap.cpp
View File

@@ -131,7 +131,7 @@ public:
};
#define wxMAC_USE_PREMULTIPLIED_ALPHA 1
#define wxOSX_USE_PREMULTIPLIED_ALPHA 1
static const int kBestByteAlignement = 16;
static const int kMaskBytesPerPixel = 1;
@@ -478,7 +478,7 @@ IconRef wxBitmapRefData::GetIconRef()
a = 0xFF ;
else
{
#if wxMAC_USE_PREMULTIPLIED_ALPHA
#if wxOSX_USE_PREMULTIPLIED_ALPHA
// this must be non-premultiplied data
if ( a != 0xFF && a!= 0 )
{
@@ -676,7 +676,7 @@ CGImageRef wxBitmapRefData::CreateCGImage() const
{
if ( m_hasAlpha )
{
#if wxMAC_USE_PREMULTIPLIED_ALPHA
#if wxOSX_USE_PREMULTIPLIED_ALPHA
alphaInfo = kCGImageAlphaPremultipliedFirst ;
#else
alphaInfo = kCGImageAlphaFirst ;
@@ -858,7 +858,7 @@ bool wxBitmap::CopyFromIcon(const wxIcon& icon)
unsigned char a = *sourcemask++;
*destination++ = a;
source++ ;
#if wxMAC_USE_PREMULTIPLIED_ALPHA
#if wxOSX_USE_PREMULTIPLIED_ALPHA
*destination++ = ( (*source++) * a + 127 ) / 255;
*destination++ = ( (*source++) * a + 127 ) / 255;
*destination++ = ( (*source++) * a + 127 ) / 255;
@@ -1190,7 +1190,7 @@ wxBitmap::wxBitmap(const wxImage& image, int depth)
const unsigned char a = *alpha++;
*destination++ = a ;
#if wxMAC_USE_PREMULTIPLIED_ALPHA
#if wxOSX_USE_PREMULTIPLIED_ALPHA
*destination++ = ((*data++) * a + 127) / 255 ;
*destination++ = ((*data++) * a + 127) / 255 ;
*destination++ = ((*data++) * a + 127) / 255 ;
@@ -1300,7 +1300,7 @@ wxImage wxBitmap::ConvertToImage() const
else if ( hasAlpha )
{
*alpha++ = a ;
#if wxMAC_USE_PREMULTIPLIED_ALPHA
#if wxOSX_USE_PREMULTIPLIED_ALPHA
// this must be non-premultiplied data
if ( a != 0xFF && a!= 0 )
{