[Libreoffice-commits] core.git: Branch 'feature/fixes10' - vcl/source

[Tor Lillqvist]

 vcl/source/gdi/impimage.cxx |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit b425ce72ed83539de2e517f6ad85910957bae25a
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Oct 5 19:16:17 2015 +0300

    Revert "don't create "disabled" image - only to measure perf. impact"
    
    We have measurements now.
    
    This reverts commit 53501b4b339926485417d670fefcc59c7bc044cf.

diff --git a/vcl/source/gdi/impimage.cxx b/vcl/source/gdi/impimage.cxx
index 220d08f..067b6e8 100644
--- a/vcl/source/gdi/impimage.cxx
+++ b/vcl/source/gdi/impimage.cxx
@@ -349,9 +349,7 @@ pOutDev
 
 void ImplImageBmp::ImplUpdateDisabledBmpEx( int nPos )
 {
-    maDisabledBmpEx = maBmpEx;
-
-    /*const Size aTotalSize( maBmpEx.GetSizePixel() );
+    const Size aTotalSize( maBmpEx.GetSizePixel() );
 
     if( maDisabledBmpEx.IsEmpty() )
     {
@@ -399,7 +397,7 @@ void ImplImageBmp::ImplUpdateDisabledBmpEx( int nPos )
     Bitmap::ReleaseAccess( pGrey );
     aGreyAlphaMask.ReleaseAccess( pGreyAlphaMask );
 
-    maDisabledBmpEx = BitmapEx( aGrey, aGreyAlphaMask );*/
+    maDisabledBmpEx = BitmapEx( aGrey, aGreyAlphaMask );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */