From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 17 May 2008 22:13:22 +0000 (+0000)
Subject: don't blit more than necessary in wxBufferedDC::UnMask() (patch 1943622) [should... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4581c9136be3b3f5d722b69b104d1f95e29de733?ds=sidebyside

don't blit more than necessary in wxBufferedDC::UnMask() (patch 1943622) [should have been part of r53565]

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

diff --git a/src/common/dcbufcmn.cpp b/src/common/dcbufcmn.cpp
index 8c6c25b40e..6ae9f3ef82 100644
--- a/src/common/dcbufcmn.cpp
+++ b/src/common/dcbufcmn.cpp
@@ -128,8 +128,21 @@ void wxBufferedDC::UnMask()
     if ( m_style & wxBUFFER_CLIENT_AREA )
         GetDeviceOrigin(&x, &y);
 
-    m_dc->Blit(0, 0, m_buffer->GetWidth(), m_buffer->GetHeight(),
-               this, -x, -y );
+    // avoid blitting too much: if we were created for a bigger bitmap (and
+    // reused for a smaller one later) we should only blit the real bitmap area
+    // and not the full allocated back buffer
+    int widthDC,
+        heightDC;
+
+    m_dc->GetSize(&widthDC, &heightDC);
+
+    int widthBuf = m_buffer->GetWidth(),
+        heightBuf = m_buffer->GetHeight();
+
+    m_dc->Blit(0, 0,
+               wxMin(widthDC, widthBuf), wxMin(heightDC, heightBuf),
+               this,
+               -x, -y);
     m_dc = NULL;
 
     if ( m_style & wxBUFFER_USES_SHARED_BUFFER )