From c34cb60b230cab567c1a45236bf2e33290b25b72 Mon Sep 17 00:00:00 2001 From: Tomaž Vajngerl Date: Wed, 30 Sep 2015 14:55:18 +0200 Subject: create "disabled" image (icon) only if the original changes Currently we create a "disabled" version of bitmaps in "Image" class (used for toolbar icons for example) in every draw call. This is not really optimal. The solution is to calculate the checksum of the original and create a "disabled" version only if the checksum changes. (cherry picked from commit 86186de42e13426305cf3dc8dfb076aff6a5e4ae) Conflicts: vcl/source/gdi/impimage.cxx Change-Id: I6ed2d08c64fee028b479fedb35e4384f112e98e2 Reviewed-on: https://gerrit.libreoffice.org/19160 Tested-by: Jenkins Reviewed-by: Tor Lillqvist Tested-by: Tor Lillqvist --- vcl/inc/image.h | 2 ++ vcl/source/gdi/impimage.cxx | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/vcl/inc/image.h b/vcl/inc/image.h index 3aa942418bb6..0dcc14ef7da8 100644 --- a/vcl/inc/image.h +++ b/vcl/inc/image.h @@ -40,6 +40,8 @@ public: private: BitmapEx maBmpEx; + BitmapChecksum maBitmapChecksum; + BitmapEx maDisabledBmpEx; BitmapEx* mpDisplayBmp; Size maSize; diff --git a/vcl/source/gdi/impimage.cxx b/vcl/source/gdi/impimage.cxx index 067b6e8ab95e..8ea787e605fd 100644 --- a/vcl/source/gdi/impimage.cxx +++ b/vcl/source/gdi/impimage.cxx @@ -182,7 +182,12 @@ void ImplImageBmp::Draw( sal_uInt16 nPos, OutputDevice* pOutDev, if( nStyle & DrawImageFlags::Disable ) { - ImplUpdateDisabledBmpEx( nPos); + BitmapChecksum aChecksum = maBmpEx.GetChecksum(); + if (maBitmapChecksum != aChecksum) + { + maBitmapChecksum = aChecksum; + ImplUpdateDisabledBmpEx(nPos); + } pOutDev->DrawBitmapEx( rPos, aOutSize, aSrcPos, maSize, maDisabledBmpEx ); } else -- cgit