[Libreoffice-commits] core.git: drawinglayer/source

[Caolán McNamara (via logerrit)]

 drawinglayer/source/processor2d/cairopixelprocessor2d.cxx |    3 +--
 drawinglayer/source/processor2d/d2dpixelprocessor2d.cxx   |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit eeaee6726c803cf18c84cd90fca381eb11e9d21f
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Dec 29 12:03:17 2022 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Dec 29 13:08:43 2022 +0000

    cid#1518242 Logically dead code
    
    Change-Id: Ie0a426c207746cca19b652a51b6f567e4b9a0752
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144860
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx 
b/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx
index 9235bc095c81..24cc193ab93f 100644
--- a/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx
@@ -175,8 +175,7 @@ std::vector<sal_uInt8> createBitmapData(const BitmapEx& 
rBitmapEx)
     {
         Bitmap aSrcAlpha(rBitmapEx.GetAlpha().GetBitmap());
         Bitmap::ScopedReadAccess 
pReadAccess(const_cast<Bitmap&>(rBitmapEx.GetBitmap()));
-        Bitmap::ScopedReadAccess pAlphaReadAccess(bAlpha ? 
aSrcAlpha.AcquireReadAccess() : nullptr,
-                                                  aSrcAlpha);
+        Bitmap::ScopedReadAccess 
pAlphaReadAccess(aSrcAlpha.AcquireReadAccess(), aSrcAlpha);
         const tools::Long nHeight(pReadAccess->Height());
         const tools::Long nWidth(pReadAccess->Width());
 
diff --git a/drawinglayer/source/processor2d/d2dpixelprocessor2d.cxx 
b/drawinglayer/source/processor2d/d2dpixelprocessor2d.cxx
index 794f0dee5b68..b830f2c7a3e6 100644
--- a/drawinglayer/source/processor2d/d2dpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/d2dpixelprocessor2d.cxx
@@ -418,8 +418,7 @@ ID2D1Bitmap* createB2DBitmap(const BitmapEx& rBitmapEx)
     {
         Bitmap aSrcAlpha(rBitmapEx.GetAlpha().GetBitmap());
         Bitmap::ScopedReadAccess 
pReadAccess(const_cast<Bitmap&>(rBitmapEx.GetBitmap()));
-        Bitmap::ScopedReadAccess pAlphaReadAccess(bAlpha ? 
aSrcAlpha.AcquireReadAccess() : nullptr,
-                                                  aSrcAlpha);
+        Bitmap::ScopedReadAccess 
pAlphaReadAccess(aSrcAlpha.AcquireReadAccess(), aSrcAlpha);
         const tools::Long nHeight(pReadAccess->Height());
         const tools::Long nWidth(pReadAccess->Width());