Applied patch #423927, (Min size for stretch parts of wxBoxSizer)

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

diff --git a/src/common/image.cpp b/src/common/image.cpp
index c19e9da9d73e08be605ea4a7d4abc3553ff661dc..fbf84266bb9c9bc933d5fce9653a99cf5420e6e5 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -414,31 +414,31 @@ void wxImage::Paste( const wxImage &image, int x, int y )
         }
         return;
     }
-    
+
     if (!HasMask() && image.HasMask())
     {
         unsigned char r = image.GetMaskRed();
         unsigned char g = image.GetMaskGreen();
         unsigned char b = image.GetMaskBlue();
-        
+
         width *= 3;
         unsigned char* source_data = image.GetData() + xx*3 + yy*3*image.GetWidth();
         int source_step = image.GetWidth()*3;
 
         unsigned char* target_data = GetData() + (x+xx)*3 + (y+yy)*3*M_IMGDATA->m_width;
         int target_step = M_IMGDATA->m_width*3;
-        
+
         for (int j = 0; j < height; j++)
         {
             for (int i = 0; i < width; i+=3)
             {
-                if ((source_data[i]   != r) && 
-                    (source_data[i+1] != g) && 
+                if ((source_data[i]   != r) &&
+                    (source_data[i+1] != g) &&
                     (source_data[i+2] != b))
                 {
                     memcpy( target_data+i, source_data+i, 3 );
                 }
-            } 
+            }
             source_data += source_step;
             target_data += target_step;
         }
@@ -1023,7 +1023,10 @@ wxImageHandler *wxImage::FindHandlerMime( const wxString& mimetype )
 
 void wxImage::InitStandardHandlers()
 {
-  AddHandler( new wxBMPHandler );
+    AddHandler(new wxBMPHandler);
+#if !defined(__WXGTK__) && !defined(__WXMOTIF__)
+    AddHandler(new wxXPMHandler);
+#endif
 }
 
 void wxImage::CleanUpHandlers()
@@ -1140,7 +1143,8 @@ unsigned long wxImage::CountColours( unsigned long stopafter )
 {
     wxHashTable h;
     wxObject dummy;
-    unsigned char r, g, b, *p;
+    unsigned char r, g, b;
+       unsigned char *p;
     unsigned long size, nentries, key;
 
     p = GetData();
@@ -1174,7 +1178,8 @@ unsigned long wxImage::CountColours( unsigned long stopafter )
 //
 unsigned long wxImage::ComputeHistogram( wxHashTable &h )
 {
-    unsigned char r, g, b, *p;
+    unsigned char r, g, b;
+       unsigned char *p;
     unsigned long size, nentries, key;
     wxHNode *hnode;