Convert back to UNIX line endings (again)

[wxWidgets.git] / src / cocoa / bitmap.mm

diff --git a/src/cocoa/bitmap.mm b/src/cocoa/bitmap.mm
index 2b13a11ef6d1588c6b3e5fea01f59cb7d8f39cc8..2d335f5548953a5b414ed9ae8101b42fd254191d 100644 (file)
--- a/src/cocoa/bitmap.mm
+++ b/src/cocoa/bitmap.mm
@@ -6,7 +6,7 @@
 // Created:     2003/07/19
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
@@ -157,12 +157,17 @@ WX_NSImage wxBitmap::GetNSImage(bool useMask) const
     [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;
 }
@@ -507,11 +512,11 @@ bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex)
     return FALSE;
 }
 
-template <class PixelData>
+template <typename PixelData>
 static bool wxMask_CreateFromBitmapData(PixelData srcData, const wxColour& colour, unsigned char *dstData)
 {
     wxCHECK_MSG(dstData,false,wxT("Couldn't access mask data"));
-    class PixelData::Iterator p(srcData);
+    typename PixelData::Iterator p(srcData);
     const int nRows = srcData.GetHeight();
     const int nCols = srcData.GetWidth();
     // Total number of bytes per destination column
@@ -520,7 +525,7 @@ static bool wxMask_CreateFromBitmapData(PixelData srcData, const wxColour& colou
     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)
         {
@@ -538,7 +543,8 @@ static bool wxMask_CreateFromBitmapData(PixelData srcData, const wxColour& colou
         }
         // 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 +=