\

Updated bitmap blitting code as per 2_4


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

src/gtk/bitmap.cpp

@@ -414,10 +414,18 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
     for (int h = 0; h < height; h++)
     {
         char outbyte = 0;
+        int old_x = -1;
+        guint32 old_pixval;
 
         for (int w=0; w<width; w++)
         {
-            guint32 pixval = gdk_image_get_pixel( img, tablex[w], tabley[h] );
+            guint32 pixval;
+            int x = tablex[w];
+            if (x == old_x)
+                pixval = old_pixval;
+            else
+                pixval = gdk_image_get_pixel( img, x, tabley[h] );
+                
             if (bpp==1)
             {
                 if (!pixval)

src/gtk/dcclient.cpp

@@ -1270,11 +1270,14 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
         wxCoord bm_width = memDC->m_selected.GetWidth();
         wxCoord bm_height = memDC->m_selected.GetHeight();
 
-        // get clip coords
+        // Get clip coords for the bitmap. If we don't
-        wxRegion tmp( xx,yy,ww,hh );
+        // use wxBitmap::Rescale(), which can clip the
-        tmp.Intersect( m_currentClippingRegion );
+        // bitmap, these are the same as the original
-        wxCoord cx,cy,cw,ch;
+        // coordinates
-        tmp.GetBox(cx,cy,cw,ch);
+        wxCoord cx = xx;
+        wxCoord cy = yy;
+        wxCoord cw = ww;
+        wxCoord ch = hh;
         
         // interpret userscale of src too
         double xsc,ysc;
@@ -1285,16 +1288,23 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
         wxCoord bm_ww = XLOG2DEVREL( bm_width );
         wxCoord bm_hh = YLOG2DEVREL( bm_height );
 
-        // scale bitmap if required
+        // Scale bitmap if required
         wxBitmap use_bitmap;
-
         if ((bm_width != bm_ww) || (bm_height != bm_hh))
         {
+            // This indicates that the blitting code below will get
+            // a clipped bitmap and therefore needs to move the origin
+            // accordingly
+            wxRegion tmp( xx,yy,ww,hh );
+            tmp.Intersect( m_currentClippingRegion );
+            tmp.GetBox(cx,cy,cw,ch);
+            
+            // Scale and clipped bitmap
             use_bitmap = memDC->m_selected.Rescale(cx-xx,cy-yy,cw,ch,bm_ww,bm_hh);
         }
         else
         {
-            // FIXME: use cx,cy,cw,ch here, too?
+            // Don't scale bitmap
             use_bitmap = memDC->m_selected;
         }
 
@@ -1463,7 +1473,7 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
 
     int w,h;
     
-    if (abs(m_scaleY - 1.0) < 0.00001)
+    if (fabs(m_scaleY - 1.0) < 0.00001)
     {
          // If there is a user or actually any scale applied to
          // the device context, scale the font.

src/gtk1/bitmap.cpp

@@ -414,10 +414,18 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
     for (int h = 0; h < height; h++)
     {
         char outbyte = 0;
+        int old_x = -1;
+        guint32 old_pixval;
 
         for (int w=0; w<width; w++)
         {
-            guint32 pixval = gdk_image_get_pixel( img, tablex[w], tabley[h] );
+            guint32 pixval;
+            int x = tablex[w];
+            if (x == old_x)
+                pixval = old_pixval;
+            else
+                pixval = gdk_image_get_pixel( img, x, tabley[h] );
+                
             if (bpp==1)
             {
                 if (!pixval)

src/gtk1/dcclient.cpp

@@ -1270,11 +1270,14 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
         wxCoord bm_width = memDC->m_selected.GetWidth();
         wxCoord bm_height = memDC->m_selected.GetHeight();
 
-        // get clip coords
+        // Get clip coords for the bitmap. If we don't
-        wxRegion tmp( xx,yy,ww,hh );
+        // use wxBitmap::Rescale(), which can clip the
-        tmp.Intersect( m_currentClippingRegion );
+        // bitmap, these are the same as the original
-        wxCoord cx,cy,cw,ch;
+        // coordinates
-        tmp.GetBox(cx,cy,cw,ch);
+        wxCoord cx = xx;
+        wxCoord cy = yy;
+        wxCoord cw = ww;
+        wxCoord ch = hh;
         
         // interpret userscale of src too
         double xsc,ysc;
@@ -1285,16 +1288,23 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
         wxCoord bm_ww = XLOG2DEVREL( bm_width );
         wxCoord bm_hh = YLOG2DEVREL( bm_height );
 
-        // scale bitmap if required
+        // Scale bitmap if required
         wxBitmap use_bitmap;
-
         if ((bm_width != bm_ww) || (bm_height != bm_hh))
         {
+            // This indicates that the blitting code below will get
+            // a clipped bitmap and therefore needs to move the origin
+            // accordingly
+            wxRegion tmp( xx,yy,ww,hh );
+            tmp.Intersect( m_currentClippingRegion );
+            tmp.GetBox(cx,cy,cw,ch);
+            
+            // Scale and clipped bitmap
             use_bitmap = memDC->m_selected.Rescale(cx-xx,cy-yy,cw,ch,bm_ww,bm_hh);
         }
         else
         {
-            // FIXME: use cx,cy,cw,ch here, too?
+            // Don't scale bitmap
             use_bitmap = memDC->m_selected;
         }
 
@@ -1463,7 +1473,7 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
 
     int w,h;
     
-    if (abs(m_scaleY - 1.0) < 0.00001)
+    if (fabs(m_scaleY - 1.0) < 0.00001)
     {
          // If there is a user or actually any scale applied to
          // the device context, scale the font.