diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2018-04-20 22:22:44 +1000 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2018-05-09 05:17:42 +0200 |
| commit | b781a6b6b2fc0a6688a6335a9408143fb120aa6e (patch) | |
| tree | b3c3eb433001aac650de3ef00e889a901a7ff1ee /vcl/workben | |
| parent | 2af7daa18467cc7c3f4f435c58cd19ee682f754f (diff) | |
vcl: get rid of Bitmap{Ex}::Filter() and Animation::Filter()
Change-Id: I510d7b286df732712aa9206b0a7c7910af34c83f
Reviewed-on: https://gerrit.libreoffice.org/53206
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'vcl/workben')
| -rw-r--r-- | vcl/workben/outdevgrind.cxx | 7 | ||||
| -rw-r--r-- | vcl/workben/vcldemo.cxx | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx index 341b509905ba..04889307c8ce 100644 --- a/vcl/workben/outdevgrind.cxx +++ b/vcl/workben/outdevgrind.cxx @@ -32,6 +32,7 @@ #include <vcl/virdev.hxx> #include <vcl/hatch.hxx> #include <vcl/bitmap.hxx> +#include <vcl/BitmapEmbossGreyFilter.hxx> #include <vcl/wall.hxx> #include <vcl/image.hxx> #include <vcl/gdimtf.hxx> @@ -127,7 +128,11 @@ void setupMethodStubs( functor_vector_type& res ) const Bitmap aBitmap( aIntro.GetBitmap() ); Bitmap aBitmapBW( aBitmap ); - aBitmapBW.Filter( BmpFilter::EmbossGrey ); + + BitmapEx aTmpBmpEx(aBitmapBW); + BitmapFilter::Filter(aTmpBmpEx, BitmapEmbossGreyFilter(0, 0)); + aBitmapBW = aTmpBmpEx.GetBitmap(); + Bitmap aBitmapAlien( Size( 100, 100 ), 8 ); aBitmapAlien.Erase( COL_RED ); #endif diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index 841cc2103cd8..d2349ed33cfe 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -45,6 +45,7 @@ #include <vcl/help.hxx> #include <vcl/menu.hxx> #include <vcl/ImageTree.hxx> +#include <vcl/BitmapEmbossGreyFilter.hxx> #include <bitmapwriteaccess.hxx> #include <basegfx/numeric/ftools.hxx> @@ -144,7 +145,10 @@ public: Application::Abort("Failed to load intro image"); maIntroBW = maIntro.GetBitmap(); - maIntroBW.Filter(BmpFilter::EmbossGrey); + + BitmapEx aTmpBmpEx(maIntroBW); + BitmapFilter::Filter(aTmpBmpEx, BitmapEmbossGreyFilter(0, 0)); + maIntroBW = aTmpBmpEx.GetBitmap(); InitRenderers(); mnSegmentsY = rtl::math::round(std::sqrt(maRenderers.size()), 0, |