X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ff5ad79411a4d5a88a3f76441ca5713d31cd5614..3e2656801d825761f55ea9b0b766802c6cd32f1d:/src/common/image.cpp

diff --git a/src/common/image.cpp b/src/common/image.cpp
index 238b5195f8..469260fb47 100644
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -936,7 +936,7 @@ bool wxImage::SetMaskFromImage(const wxImage& mask,
     return true;
 }
     
-bool wxImage::ConvertAlphaToMask(unsigned threshold)
+bool wxImage::ConvertAlphaToMask(unsigned char threshold)
 {
     if (!HasAlpha())
         return true;
@@ -947,19 +947,19 @@ bool wxImage::ConvertAlphaToMask(unsigned threshold)
         wxLogError( _("No unused colour in image being masked.") );
         return false;
     }
-    
+
     SetMask(true);
     SetMaskColour(mr, mg, mb);
-    
+
     unsigned char *imgdata = GetData();
     unsigned char *alphadata = GetAlpha();
 
-    size_t w = GetWidth();
-    size_t h = GetHeight();
+    int w = GetWidth();
+    int h = GetHeight();
 
-    for (size_t y = 0; y < h; y++)
+    for (int y = 0; y < h; y++)
     {
-        for (size_t x = 0; x < w; x++, imgdata += 3, alphadata++)
+        for (int x = 0; x < w; x++, imgdata += 3, alphadata++)
         {
             if (*alphadata < threshold)
             {
@@ -972,6 +972,8 @@ bool wxImage::ConvertAlphaToMask(unsigned threshold)
 
     free(M_IMGDATA->m_alpha);
     M_IMGDATA->m_alpha = NULL;
+
+    return true;
 }
 
 #if wxUSE_PALETTE