Some OS/2 Modifications

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

diff --git a/src/common/image.cpp b/src/common/image.cpp
index c19e9da9d73e08be605ea4a7d4abc3553ff661dc..fe48bf366af3b2f6e342ad7a56964c8cea4b8fcb 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -58,7 +58,9 @@ public:
     unsigned char   m_maskRed,m_maskGreen,m_maskBlue;
     bool            m_ok;
     bool            m_static;
     unsigned char   m_maskRed,m_maskGreen,m_maskBlue;
     bool            m_ok;
     bool            m_static;

+#if wxUSE_PALETTE

     wxPalette       m_palette;
     wxPalette       m_palette;

+#endif // wxUSE_PALETTE

     wxArrayString   m_optionNames;
     wxArrayString   m_optionValues;
 };
     wxArrayString   m_optionNames;
     wxArrayString   m_optionValues;
 };


@@ -210,7 +212,14 @@ wxImage wxImage::Scale( int width, int height ) const
 
     wxCHECK_MSG( Ok(), image, wxT("invalid image") );
 
 
     wxCHECK_MSG( Ok(), image, wxT("invalid image") );
 

-    wxCHECK_MSG( (width > 0) && (height > 0), image, wxT("invalid image size") );
+    // can't scale to/from 0 size
+    wxCHECK_MSG( (width > 0) && (height > 0), image,
+                 wxT("invalid new image size") );
+
+    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") );

 
     image.Create( width, height );
 
 
     image.Create( width, height );
 


@@ -219,14 +228,39 @@ wxImage wxImage::Scale( int width, int height ) const
     wxCHECK_MSG( data, image, wxT("unable to create image") );
 
     if (M_IMGDATA->m_hasMask)
     wxCHECK_MSG( data, image, wxT("unable to create image") );
 
     if (M_IMGDATA->m_hasMask)

-        image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
-
-    long old_height = M_IMGDATA->m_height;
-    long old_width  = M_IMGDATA->m_width;
+    {
+        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;
 
 
     char unsigned *source_data = M_IMGDATA->m_data;
     char unsigned *target_data = data;
 

+#if 0
+    // This is nonsense, RR.
+
+    // We do (x, y) -> (x, y)*oldSize/newSize but the valid values of x and y
+    // are from 0 to size-1, hence all decrement the sizes
+    long old_old_width = old_width;
+    old_height--;
+    old_width--;
+    height--;
+    width--;
+    for ( long j = 0; j <= height; j++ )
+    {
+        // don't crash for images with height == 1
+        long y_offset = height ? (j * old_height / height)* old_old_width : 0;
+
+        for ( long i = 0; i <= width; i++ )
+        {
+            long x_offset = width ? (i * old_width) / width : 0;
+
+            memcpy( target_data, source_data + 3*(y_offset + x_offset), 3 );
+            target_data += 3;
+        }
+    }
+#else

     for (long j = 0; j < height; j++)
     {
         long y_offset = (j * old_height / height) * old_width;
     for (long j = 0; j < height; j++)
     {
         long y_offset = (j * old_height / height) * old_width;


@@ -239,6 +273,7 @@ wxImage wxImage::Scale( int width, int height ) const
             target_data += 3;
         }
     }
             target_data += 3;
         }
     }

+#endif

 
     return image;
 }
 
     return image;
 }


@@ -414,31 +449,31 @@ void wxImage::Paste( const wxImage &image, int x, int y )
         }
         return;
     }
         }
         return;
     }

-    
+

     if (!HasMask() && image.HasMask())
     {
         unsigned char r = image.GetMaskRed();
         unsigned char g = image.GetMaskGreen();
         unsigned char b = image.GetMaskBlue();
     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;
         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)
             {
         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[i+2] != b))
                 {
                     memcpy( target_data+i, source_data+i, 3 );
                 }

-            } 
+            }

             source_data += source_step;
             target_data += target_step;
         }
             source_data += source_step;
             target_data += target_step;
         }


@@ -685,6 +720,8 @@ int wxImage::GetHeight() const
     return M_IMGDATA->m_height;
 }
 
     return M_IMGDATA->m_height;
 }
 

+#if wxUSE_PALETTE
+

 // Palette functions
 
 bool wxImage::HasPalette() const
 // Palette functions
 
 bool wxImage::HasPalette() const


@@ -709,6 +746,8 @@ void wxImage::SetPalette(const wxPalette& palette)
     M_IMGDATA->m_palette = palette;
 }
 
     M_IMGDATA->m_palette = palette;
 }
 

+#endif // wxUSE_PALETTE
+

 // Option functions (arbitrary name/value mapping)
 void wxImage::SetOption(const wxString& name, const wxString& value)
 {
 // Option functions (arbitrary name/value mapping)
 void wxImage::SetOption(const wxString& name, const wxString& value)
 {


@@ -1023,7 +1062,10 @@ wxImageHandler *wxImage::FindHandlerMime( const wxString& mimetype )
 
 void wxImage::InitStandardHandlers()
 {
 
 void wxImage::InitStandardHandlers()
 {

-  AddHandler( new wxBMPHandler );
+    AddHandler(new wxBMPHandler);
+#if wxUSE_XPM && !defined(__WXGTK__) && !defined(__WXMOTIF__)
+    AddHandler(new wxXPMHandler);
+#endif

 }
 
 void wxImage::CleanUpHandlers()
 }
 
 void wxImage::CleanUpHandlers()


@@ -1140,7 +1182,8 @@ unsigned long wxImage::CountColours( unsigned long stopafter )
 {
     wxHashTable h;
     wxObject dummy;
 {
     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();
     unsigned long size, nentries, key;
 
     p = GetData();


@@ -1174,7 +1217,8 @@ unsigned long wxImage::CountColours( unsigned long stopafter )
 //
 unsigned long wxImage::ComputeHistogram( wxHashTable &h )
 {
 //
 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;
 
     unsigned long size, nentries, key;
     wxHNode *hnode;