small optimization in wxConfigPathChanger: don't change the path if it is already...

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

diff --git a/src/common/image.cpp b/src/common/image.cpp
index a01eece6e5ee534d6458d0775030b61b7a7eb39c..d5ea5590e77f3ad5bd0dc03f10d613b229ba493c 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -231,7 +231,7 @@ wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const
 {
     if( xFactor == 1 && yFactor == 1 )
         return Copy() ;
-        
+
     wxImage image;
 
     wxCHECK_MSG( Ok(), image, wxT("invalid image") );
@@ -242,7 +242,7 @@ wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const
 
     long old_height = M_IMGDATA->m_height,
          old_width  = M_IMGDATA->m_width;
-         
+
     wxCHECK_MSG( (old_height > 0) && (old_width > 0), image,
                  wxT("invalid old image size") );
 
@@ -265,14 +265,14 @@ wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const
         maskRed = M_IMGDATA->m_maskRed;
         maskGreen = M_IMGDATA->m_maskGreen;
         maskBlue =M_IMGDATA->m_maskBlue ;
-      
+
         image.SetMaskColour( M_IMGDATA->m_maskRed,
                              M_IMGDATA->m_maskGreen,
                              M_IMGDATA->m_maskBlue );
     }
     char unsigned *source_data = M_IMGDATA->m_data;
     char unsigned *target_data = data;
-    
+
     for (long y = 0; y < height; y++)
     {
         for (long x = 0; x < width; x++)
@@ -935,8 +935,8 @@ bool wxImage::SetMaskFromImage(const wxImage& mask,
 
     return true;
 }
-    
-bool wxImage::ConvertAlphaToMask(unsigned threshold)
+
+bool wxImage::ConvertAlphaToMask(unsigned char threshold)
 {
     if (!HasAlpha())
         return true;
@@ -954,14 +954,14 @@ 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 ((unsigned)(*alphadata) < threshold)
+            if (*alphadata < threshold)
             {
                 imgdata[0] = mr;
                 imgdata[1] = mg;