threshold is pixel value, it should use unsigned char

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/image.h b/include/wx/image.h
index f39648b4d788f6442a094f85b9dfcd4afe0bb1bf..153065c764b3cb2a537929c65d164d9a26e439bf 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -209,7 +209,7 @@ public:
 
     // converts image's alpha channel to mask, if it has any, does nothing
     // otherwise:
 
     // converts image's alpha channel to mask, if it has any, does nothing
     // otherwise:

-    bool ConvertAlphaToMask(unsigned threshold = 128);
+    bool ConvertAlphaToMask(unsigned char threshold = 128);

 
     static bool CanRead( const wxString& name );
     static int GetImageCount( const wxString& name, long type = wxBITMAP_TYPE_ANY );
 
     static bool CanRead( const wxString& name );
     static int GetImageCount( const wxString& name, long type = wxBITMAP_TYPE_ANY );

diff --git a/src/common/image.cpp b/src/common/image.cpp
index a01eece6e5ee534d6458d0775030b61b7a7eb39c..b55fd180703def1bdc25a225abbd9039aa7be3fe 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -936,7 +936,7 @@ bool wxImage::SetMaskFromImage(const wxImage& mask,
     return true;
 }
     
     return true;
 }
     

-bool wxImage::ConvertAlphaToMask(unsigned threshold)
+bool wxImage::ConvertAlphaToMask(unsigned char threshold)

 {
     if (!HasAlpha())
         return true;
 {
     if (!HasAlpha())
         return true;


@@ -954,12 +954,12 @@ bool wxImage::ConvertAlphaToMask(unsigned threshold)
     unsigned char *imgdata = GetData();
     unsigned char *alphadata = GetAlpha();
 
     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 ((unsigned)(*alphadata) < threshold)
             {
         {
             if ((unsigned)(*alphadata) < threshold)
             {