[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,"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,"After: bpp=%d",[M_BITMAPDATA->m_cocoaNSBitmapImageRep bitsPerPixel]);
}
return nsimage;
}
bytesPerRow: 0
bitsPerPixel: 0];
- wxLogDebug(wxT("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;
wxImage wxBitmap::ConvertToImage() const
{
- if(!M_BITMAPDATA->m_ok)
- return wxImage(5,5)/*wxNullImage*/;
+ if(!Ok())
+ return /*wxImage(5,5)*/wxNullImage;
return wxImage(M_BITMAPDATA->m_width,M_BITMAPDATA->m_height);
}
}
// 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 +=