X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a6d27d480bbdc4a58c90877d3c5bc32d62aabde9..0fa8508d0c6343d11178758f00fa68ae00721809:/src/cocoa/bitmap.mm?ds=sidebyside diff --git a/src/cocoa/bitmap.mm b/src/cocoa/bitmap.mm index b25fd04795..2d335f5548 100644 --- 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" @@ -512,11 +512,11 @@ bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex) return FALSE; } -template +template 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 @@ -525,7 +525,7 @@ static bool wxMask_CreateFromBitmapData(PixelData srcData, const wxColour& colou const int width_aligned = nCols/8*8; for(int y=0; y