diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2018-03-13 15:38:44 +1100 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2018-04-16 03:19:23 +0200 |
commit | 6631cc554557c56000e0b87d595493b36e6fb7da (patch) | |
tree | 5c5c169fbe648e9daccb62f69f9bfde04d20541e /vcl/source/image/ImplImageTree.cxx | |
parent | 9fb7aaf570c03c8a26d763f1205fb8c890e8211a (diff) |
vcl: migrated BitmapProcessor and scale classes to BitmapFilterEx classes
Change-Id: I0530824cdefb3c714d2664988f887d123e471840
Reviewed-on: https://gerrit.libreoffice.org/52898
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'vcl/source/image/ImplImageTree.cxx')
-rw-r--r-- | vcl/source/image/ImplImageTree.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx index b6803009a3b4..d27eaec8d018 100644 --- a/vcl/source/image/ImplImageTree.cxx +++ b/vcl/source/image/ImplImageTree.cxx @@ -50,7 +50,7 @@ #include <vcl/IconThemeScanner.hxx> #include <vcl/pngwrite.hxx> -#include <BitmapProcessor.hxx> +#include <BitmapLightenFilter.hxx> bool ImageRequestParameters::convertToDarkTheme() { @@ -160,8 +160,10 @@ void loadImageFromStream(std::shared_ptr<SvStream> const & xStream, OUString con { rParameters.mbWriteImageToCache = true; // We always want to cache a SVG image vcl::bitmap::loadFromSvg(*xStream.get(), rPath, rParameters.mrBitmap, aScalePercentage / 100.0); + if (bConvertToDarkTheme) - rParameters.mrBitmap = BitmapProcessor::createLightImage(rParameters.mrBitmap); + BitmapFilter::Filter(rParameters.mrBitmap, BitmapLightenFilter()); + return; } else @@ -172,7 +174,7 @@ void loadImageFromStream(std::shared_ptr<SvStream> const & xStream, OUString con if (bConvertToDarkTheme) { rParameters.mbWriteImageToCache = true; // Cache the dark variant - rParameters.mrBitmap = BitmapProcessor::createLightImage(rParameters.mrBitmap); + BitmapFilter::Filter(rParameters.mrBitmap, BitmapLightenFilter()); } if (aScalePercentage > 100) |