vcl/source/helper/canvasbitmap.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c78b4cdb4fc922f3b35172b71fee772385526d98
Author: Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Wed Jan 12 16:32:06 2022 +0100
Commit: Luboš Luňák <l.lu...@collabora.com>
CommitDate: Wed Jan 12 16:33:29 2022 +0100
use std::optional::operator* rather than value()
Apparently the latter doesn't work on some MacOS versions
despite it being C++17 too (see comments
at https://gerrit.libreoffice.org/c/core/+/128308)
Change-Id: I5adb95720cabecd1837d17ed1543ff656734410d
diff --git a/vcl/source/helper/canvasbitmap.cxx
b/vcl/source/helper/canvasbitmap.cxx
index 301237e18e43..8807ce7a11c5 100644
--- a/vcl/source/helper/canvasbitmap.cxx
+++ b/vcl/source/helper/canvasbitmap.cxx
@@ -102,14 +102,14 @@ Bitmap::ScopedReadAccess&
VclCanvasBitmap::getBitmapReadAccess()
// need only info access, create read access only on demand.
if(!m_pBmpReadAcc)
m_pBmpReadAcc.emplace(m_aBitmap);
- return m_pBmpReadAcc.value();
+ return *m_pBmpReadAcc;
}
Bitmap::ScopedReadAccess& VclCanvasBitmap::getAlphaReadAccess()
{
if(!m_pAlphaReadAcc)
m_pAlphaReadAcc.emplace(m_aAlpha);
- return m_pAlphaReadAcc.value();
+ return *m_pAlphaReadAcc;
}
VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) :
