From 05db125c57ea3c8f04a304561209c32cc5c45a67 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Thu, 13 Sep 2018 15:00:56 +0200
Subject: loplugin:staticconstfield improvements

Change-Id: Ia0a19736dfd4500bb17b04c072710f8ee8744031
Reviewed-on: https://gerrit.libreoffice.org/60526
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 .../source/mtfrenderer/transparencygroupaction.cxx | 29 ++++------------------
 1 file changed, 5 insertions(+), 24 deletions(-)

(limited to 'cppcanvas')

diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
index c7cd718fc805..8fdfca98a39e 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
@@ -120,7 +120,6 @@ namespace cppcanvas
                 // mxBufferBitmap content
                 CanvasSharedPtr                                     mpCanvas;
                 rendering::RenderState                              maState;
-                const double                                        mnAlpha;
             };
 
 
@@ -151,8 +150,7 @@ namespace cppcanvas
                 mxBufferBitmap(),
                 maLastTransformation(),
                 mpCanvas( rCanvas ),
-                maState(),
-                mnAlpha( 1.0 )
+                maState()
             {
                 tools::initRenderState(maState,rState);
                 implSetupTransform( maState, rDstPoint );
@@ -400,27 +398,10 @@ namespace cppcanvas
                 aLocalState.DeviceColor = maState.DeviceColor;
 #endif
 
-                if( ::rtl::math::approxEqual(mnAlpha, 1.0) )
-                {
-                    // no further alpha changes necessary -> draw directly
-                    mpCanvas->getUNOCanvas()->drawBitmap( mxBufferBitmap,
-                                                          mpCanvas->getViewState(),
-                                                          aLocalState );
-                }
-                else
-                {
-                    // add alpha modulation value to DeviceColor
-                    uno::Sequence<rendering::ARGBColor> aCols(1);
-                    aCols[0] = rendering::ARGBColor( mnAlpha, 1.0, 1.0, 1.0);
-                    aLocalState.DeviceColor =
-                        mpCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace()->convertFromARGB(
-                            aCols);
-
-                    mpCanvas->getUNOCanvas()->drawBitmapModulated( mxBufferBitmap,
-                                                                   mpCanvas->getViewState(),
-                                                                   aLocalState );
-                }
-
+                // no further alpha changes necessary -> draw directly
+                mpCanvas->getUNOCanvas()->drawBitmap( mxBufferBitmap,
+                                                      mpCanvas->getViewState(),
+                                                      aLocalState );
                 return true;
             }
 
-- 
cgit v1.2.3