fixed GetWeekOfYear() for first/last week in some cases (patch 908793)

[wxWidgets.git] / src / common / image.cpp

diff --git a/src/common/image.cpp b/src/common/image.cpp
index 03a7d4fb9f76fa952ea9a187135d8a7254225709..469260fb478d2a04fbd4a4ea3e2fcfd8fe488725 100644 (file)
--- 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;
@@ -954,12 +954,12 @@ bool wxImage::ConvertAlphaToMask(unsigned threshold)
     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)
             {