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

[Stephan Bergmann (via logerrit)]

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

New commits:
commit 3300111c7e8d5f5ffa15b8814d0f6597fae923ec
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed May 13 15:46:36 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed May 13 21:25:53 2020 +0200

    Avoid -Werror=unused-variable with --disable-assert-always-abort
    
    ...as reported by e.g.
    <https://ci.libreoffice.org/job/lo_tb_random_config_linux/2228/>
    
    Change-Id: If6bc1105fd723f78dbcb36616371a823ee665611
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94132
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/vcl/skia/salbmp.cxx b/vcl/skia/salbmp.cxx
index fa88cac5ac87..d48e67c4e904 100644
--- a/vcl/skia/salbmp.cxx
+++ b/vcl/skia/salbmp.cxx
@@ -841,8 +841,8 @@ void SkiaSalBitmap::verify() const
     if (!mBuffer)
         return;
     // Use mPixelsSize, that describes the size of the actual data.
-    size_t canary = mScanlineSize * mPixelsSize.Height();
-    assert(memcmp(mBuffer.get() + canary, CANARY, sizeof(CANARY)) == 0);
+    assert(memcmp(mBuffer.get() + mScanlineSize * mPixelsSize.Height(), CANARY, sizeof(CANARY))
+           == 0);
 }
 
 #endif