[Libreoffice-commits] core.git: vcl/quartz

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Thu May 28 20:26:33 UTC 2020


 vcl/quartz/salbmp.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 2d13059635ecc8505023c052e29ed2bb164d6af4
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu May 28 19:13:46 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu May 28 22:25:54 2020 +0200

    loplugin:simplifypointertobool (macOS)
    
    Change-Id: Ie26580277fa6d0734b8af1eb029e0883a3c6f886
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95064
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index 2f6820b2877e..87861256be43 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -145,7 +145,7 @@ bool QuartzSalBitmap::Create( const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount
 {
     const QuartzSalBitmap& rSourceBitmap = static_cast<const QuartzSalBitmap&>(rSalBmp);
 
-    if (isValidBitCount(nNewBitCount) && rSourceBitmap.m_pUserBuffer.get())
+    if (isValidBitCount(nNewBitCount) && rSourceBitmap.m_pUserBuffer)
     {
         mnBits = nNewBitCount;
         mnWidth = rSourceBitmap.mnWidth;
@@ -249,7 +249,7 @@ bool QuartzSalBitmap::CreateContext()
         }
     }
 
-    if (m_pContextBuffer.get())
+    if (m_pContextBuffer)
     {
         maGraphicContext.set(CGBitmapContextCreate(m_pContextBuffer.get(), mnWidth, mnHeight,
                                                    bitsPerComponent, nContextBytesPerRow,
@@ -695,7 +695,7 @@ static const BitmapPalette& GetDefaultPalette( int mnBits, bool bMonochrome )
 BitmapBuffer* QuartzSalBitmap::AcquireBuffer( BitmapAccessMode /*nMode*/ )
 {
     // TODO: AllocateUserData();
-    if (!m_pUserBuffer.get())
+    if (!m_pUserBuffer)
         return nullptr;
 
     BitmapBuffer* pBuffer = new BitmapBuffer;
@@ -843,7 +843,7 @@ CGImageRef QuartzSalBitmap::CreateColorMask( int nX, int nY, int nWidth,
                                              int nHeight, Color nMaskColor ) const
 {
     CGImageRef xMask = nullptr;
-    if (m_pUserBuffer.get() && (nX + nWidth <= mnWidth) && (nY + nHeight <= mnHeight))
+    if (m_pUserBuffer && (nX + nWidth <= mnWidth) && (nY + nHeight <= mnHeight))
     {
         const sal_uInt32 nDestBytesPerRow = nWidth << 2;
         std::unique_ptr<sal_uInt32[]> pMaskBuffer(new (std::nothrow) sal_uInt32[ nHeight * nDestBytesPerRow / 4] );


More information about the Libreoffice-commits mailing list