// Created: 2003/07/19
// RCS-ID: $Id$
// Copyright: (c) 2003 David Elliott
-// Licence: wxWindows licence
+// Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h"
#import <AppKit/NSBitmapImageRep.h>
#import <AppKit/NSGraphics.h>
#import <AppKit/NSImage.h>
+#import <AppKit/NSColor.h>
// ========================================================================
// wxBitmapRefData
[nsimage addRepresentation: M_BITMAPDATA->m_cocoaNSBitmapImageRep];
if(useMask && GetMask())
{
+ // Show before/after to prove that the bitmap itself is not changed
+ // even though we just composited onto the NSImage
+ wxLogTrace(wxTRACE_COCOA,wxT("Before: bpp=%d"),[M_BITMAPDATA->m_cocoaNSBitmapImageRep bitsPerPixel]);
NSImage *maskImage = [[NSImage alloc]
initWithSize:NSMakeSize(GetWidth(), GetHeight())];
[maskImage addRepresentation: GetMask()->GetNSBitmapImageRep()];
[nsimage lockFocus];
[maskImage compositeToPoint:NSZeroPoint operation:NSCompositeDestinationIn];
[nsimage unlockFocus];
+ [maskImage release];
+ wxLogTrace(wxTRACE_COCOA,wxT("After: bpp=%d"),[M_BITMAPDATA->m_cocoaNSBitmapImageRep bitsPerPixel]);
}
return nsimage;
}
hasAlpha: NO
isPlanar: NO
colorSpaceName: NSCalibratedRGBColorSpace
- bytesPerRow: 0
+ bytesPerRow: 0 // NOTE: Contrary to Apple documentation Mac OS
+ // 10.4 will add padding bytes when 0 is used here
bitsPerPixel: 0];
- wxLogDebug("M_BITMAPDATA=%p NSBitmapImageRep bitmapData=%p", M_BITMAPDATA, [M_BITMAPDATA->m_cocoaNSBitmapImageRep bitmapData]);
+ wxLogTrace(wxTRACE_COCOA,wxT("M_BITMAPDATA=%p NSBitmapImageRep bitmapData=%p"), M_BITMAPDATA, [M_BITMAPDATA->m_cocoaNSBitmapImageRep bitmapData]);
M_BITMAPDATA->m_ok = true;
M_BITMAPDATA->m_numColors = 0;
M_BITMAPDATA->m_quality = 0;
return false;
}
-bool wxBitmap::CopyFromIcon(const wxIcon& icno)
+bool wxBitmap::CopyFromIcon(const wxIcon& icon)
{
- return false;
+ UnRef();
+ if(!icon.GetNSImage());
+ [icon.GetNSImage() lockFocus];
+ NSRect imageRect;
+ imageRect.origin.x = imageRect.origin.y = 0.0;
+ imageRect.size = [icon.GetNSImage() size];
+ NSBitmapImageRep *newBitmapRep = [[NSBitmapImageRep alloc] initWithFocusedViewRect:imageRect];
+ [icon.GetNSImage() unlockFocus];
+ if(!newBitmapRep)
+ return false;
+ m_refData = new wxBitmapRefData;
+ M_BITMAPDATA->m_cocoaNSBitmapImageRep = newBitmapRep;
+ M_BITMAPDATA->m_width = [newBitmapRep pixelsWide];
+ M_BITMAPDATA->m_height = [newBitmapRep pixelsHigh];
+ M_BITMAPDATA->m_depth = [newBitmapRep bitsPerSample]*[newBitmapRep samplesPerPixel];
+ M_BITMAPDATA->m_ok = true;
+ M_BITMAPDATA->m_numColors = 0;
+ M_BITMAPDATA->m_quality = 0;
+ M_BITMAPDATA->m_bitmapMask = NULL;
+ return true;
}
wxBitmap wxBitmap::GetSubBitmap(wxRect const&) const
wxImage wxBitmap::ConvertToImage() const
{
- if(!M_BITMAPDATA->m_ok)
- return wxImage(5,5)/*wxNullImage*/;
- return wxImage(M_BITMAPDATA->m_width,M_BITMAPDATA->m_height);
+ wxAutoNSAutoreleasePool pool;
+ if(!Ok())
+ return /*wxImage(5,5)*/wxNullImage;
+ NSImage *nsimage = GetNSImage(false /* don't use mask */);
+ wxImage newImage(M_BITMAPDATA->m_width,M_BITMAPDATA->m_height);
+ [nsimage lockFocus];
+ for(int i=0; i < M_BITMAPDATA->m_width; i++)
+ {
+ // Don't let the pool get too big as you'll notice we're creating
+ // two autoreleased NSColor objects with every iteration.
+ wxAutoNSAutoreleasePool loopPool;
+ for(int j=0; j < M_BITMAPDATA->m_height; j++)
+ {
+ NSColor *pixelColor = NSReadPixel(NSMakePoint(i,M_BITMAPDATA->m_height - j - 1));
+ NSColor *color = [pixelColor colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
+ newImage.SetRGB(i,j,int([color redComponent]*255.0), int([color greenComponent]*255.0), int([color blueComponent]*255.0));
+ }
+ }
+ [nsimage unlockFocus];
+ return newImage;
}
bool wxBitmap::CreateFromXpm(const char **xpm)
hasAlpha: NO
isPlanar: NO
colorSpaceName: NSCalibratedRGBColorSpace
- bytesPerRow: 0
+ bytesPerRow: image.GetWidth()*3
bitsPerPixel: 0];
+ // TODO: Specify bytesPerRow:0 and then use [bitmapImage bytesPerRow]
+ // so that the rows are aligned suitably for altivec by the OS (Tiger)
const int numBytes = image.GetWidth()*image.GetHeight()*3;
memcpy([bitmapImage bitmapData], image.GetData(), numBytes);
// TODO: Alpha and convert to desired depth
{ // TODO
}
+void wxBitmap::UseAlpha()
+{ // TODO
+}
+
// ========================================================================
// wxMask
// ========================================================================
return FALSE;
}
-template <class PixelData>
+template <typename PixelData>
static bool wxMask_CreateFromBitmapData(PixelData srcData, const wxColour& colour, unsigned char *dstData)
{
- wxCHECK_MSG(dstData,false,"Couldn't access mask data");
- class PixelData::Iterator p(srcData);
+ wxCHECK_MSG(dstData,false,wxT("Couldn't access mask data"));
+ typename PixelData::Iterator p(srcData);
const int nRows = srcData.GetHeight();
const int nCols = srcData.GetWidth();
// Total number of bytes per destination column
const int width_aligned = nCols/8*8;
for(int y=0; y<nRows; ++y)
{
- class PixelData::Iterator rowStart(p);
+ typename PixelData::Iterator rowStart(p);
unsigned char *dstRow = dstData + y*dstRowLength;
for(int x=0; x<width_aligned; x+=8)
{
}
// Handle the remaining 0-7 pixels in the row
unsigned char *dstByte = dstRow + width_aligned/8;
- *dstByte = 0;
+ if(nCols%8>0)
+ *dstByte = 0;
for(int j=0; j<(nCols%8); ++j, ++p)
{
*dstByte +=
// We need the source NSBitmapImageRep to detemine its pixel format
NSBitmapImageRep *srcBitmapRep = const_cast<wxBitmap&>(bitmap).GetNSBitmapImageRep();
- wxCHECK_MSG(srcBitmapRep,false,"Can't create mask for an uninitialized bitmap");
+ wxCHECK_MSG(srcBitmapRep,false,wxT("Can't create mask for an uninitialized bitmap"));
// Get a pointer to the destination data
unsigned char *dstPlanes[5] = {NULL,NULL,NULL,NULL,NULL};
{
wxPixelData<wxBitmap,wxNativePixelFormat> pixelData(const_cast<wxBitmap&>(bitmap));
wxCHECK_MSG(wxMask_CreateFromBitmapData(pixelData, colour, dstData),
- false, "Unable to access raw data");
+ false, wxT("Unable to access raw data"));
}
// 32-bpp RGBx (x=throw away, no alpha)
else if([srcBitmapRep bitsPerPixel]==32 && [srcBitmapRep bitsPerSample]==8 && [srcBitmapRep samplesPerPixel]==3 && [srcBitmapRep hasAlpha]==NO)
typedef wxPixelFormat<unsigned char,32,0,1,2> PixelFormat;
wxPixelData<wxBitmap,PixelFormat> pixelData(const_cast<wxBitmap&>(bitmap));
wxCHECK_MSG(wxMask_CreateFromBitmapData(pixelData, colour, dstData),
- false, "Unable to access raw data");
+ false, wxT("Unable to access raw data"));
}
// 32-bpp RGBA
else if([srcBitmapRep bitsPerPixel]==32 && [srcBitmapRep bitsPerSample]==8 && [srcBitmapRep samplesPerPixel]==4 && [srcBitmapRep hasAlpha]==YES)
{
wxPixelData<wxBitmap,wxAlphaPixelFormat> pixelData(const_cast<wxBitmap&>(bitmap));
wxCHECK_MSG(wxMask_CreateFromBitmapData(pixelData, colour, dstData),
- false, "Unable to access raw data");
+ false, wxT("Unable to access raw data"));
}
else
- { wxCHECK_MSG(false,false,"Unimplemented pixel format"); }
+ { wxCHECK_MSG(false,false,wxT("Unimplemented pixel format")); }
// maskRep was autoreleased in case we had to exit quickly
m_cocoaNSBitmapImageRep = [maskRep retain];
projects / wxWidgets.git / blobdiff