7e403195e5
...with a boost::optional fallback for Xcode < 10 (as std::optional is only
available starting with Xcode 10 according to
<https://en.cppreference.com/w/cpp/compiler_support>, and our baseline for iOS
and macOS is still Xcode 9.3 according to README.md). And mechanically rewrite
all code to use o3tl::optional instead of boost::optional.
One immediate benefit is that disabling -Wmaybe-uninitialized for GCC as per
fed7c3deb3 "Slience bogus
-Werror=maybe-uninitialized" should no longer be necessary (and whose check
happened to no longer trigger for GCC 10 trunk, even though that compiler would
still emit bogus -Wmaybe-uninitialized for uses of boost::optional under
--enable-optimized, which made me ponder whether this switch from
boost::optional to std::optional would be a useful thing to do; I keep that
configure.ac check for now, though, and will only remove it in a follow up
commit).
Another longer-term benefit is that the code is now already in good shape for an
eventual switch to std::optional (a switch we would have done anyway once we no
longer need to support Xcode < 10).
Only desktop/qa/desktop_lib/test_desktop_lib.cxx heavily uses
boost::property_tree::ptree::get_child_optional returning boost::optional, so
let it keep using boost::optional for now.
After a number of preceding commits have paved the way for this change, this
commit is completely mechanical, done with
> git ls-files -z | grep -vz -e '^bin/find-unneeded-includes$' -e '^configure.ac$' -e '^desktop/qa/desktop_lib/test_desktop_lib.cxx$' -e '^dictionaries$' -e '^external/' -e '^helpcontent2$' -e '^include/IwyuFilter_include.yaml$' -e '^sc/IwyuFilter_sc.yaml$' -e '^solenv/gdb/boost/optional.py$' -e '^solenv/vs/LibreOffice.natvis$' -e '^translations$' -e '\.svg$' | xargs -0 sed -i -E -e 's|\<boost(/optional)?/optional\.hpp\>|o3tl/optional.hxx|g' -e 's/\<boost(\s*)::(\s*)(make_)?optional\>/o3tl\1::\2\3optional/g' -e 's/\<boost(\s*)::(\s*)none\>/o3tl\1::\2nullopt/g'
(before committing include/o3tl/optional.hxx, and relying on some GNU features).
It excludes some files where mention of boost::optional et al should apparently
not be changed (and the sub-repo directory stubs). It turned out that all uses
of boost::none across the code base were in combination with boost::optional, so
had all to be rewritten as o3tl::nullopt.
Change-Id: Ibfd9f4b3d5a8aee6e6eed310b988c4e5ffd8b11b
Reviewed-on: https://gerrit.libreoffice.org/84128
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
97 lines
2.8 KiB
C++
97 lines
2.8 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
*/
|
|
|
|
#ifndef INCLUDED_VCL_INC_BITMAPWRITEACCESS_HXX
|
|
#define INCLUDED_VCL_INC_BITMAPWRITEACCESS_HXX
|
|
|
|
#include <vcl/alpha.hxx>
|
|
#include <vcl/bitmap.hxx>
|
|
#include <vcl/bitmapaccess.hxx>
|
|
#include <o3tl/optional.hxx>
|
|
|
|
typedef vcl::ScopedBitmapAccess<BitmapWriteAccess, Bitmap, &Bitmap::AcquireWriteAccess>
|
|
BitmapScopedWriteAccess;
|
|
|
|
typedef vcl::ScopedBitmapAccess<BitmapWriteAccess, AlphaMask, &AlphaMask::AcquireAlphaWriteAccess>
|
|
AlphaScopedWriteAccess;
|
|
|
|
class VCL_DLLPUBLIC BitmapWriteAccess : public BitmapReadAccess
|
|
{
|
|
public:
|
|
BitmapWriteAccess(Bitmap& rBitmap);
|
|
virtual ~BitmapWriteAccess() override;
|
|
|
|
void CopyScanline(long nY, const BitmapReadAccess& rReadAcc);
|
|
void CopyScanline(long nY, ConstScanline aSrcScanline, ScanlineFormat nSrcScanlineFormat,
|
|
sal_uInt32 nSrcScanlineSize);
|
|
|
|
void CopyBuffer(const BitmapReadAccess& rReadAcc);
|
|
|
|
void SetPalette(const BitmapPalette& rPalette)
|
|
{
|
|
assert(mpBuffer && "Access is not valid!");
|
|
|
|
mpBuffer->maPalette = rPalette;
|
|
}
|
|
|
|
void SetPaletteEntryCount(sal_uInt16 nCount)
|
|
{
|
|
assert(mpBuffer && "Access is not valid!");
|
|
|
|
mpBuffer->maPalette.SetEntryCount(nCount);
|
|
}
|
|
|
|
void SetPaletteColor(sal_uInt16 nColor, const BitmapColor& rBitmapColor)
|
|
{
|
|
assert(mpBuffer && "Access is not valid!");
|
|
assert(HasPalette() && "Bitmap has no palette!");
|
|
|
|
mpBuffer->maPalette[nColor] = rBitmapColor;
|
|
}
|
|
|
|
void SetPixel(long nY, long nX, const BitmapColor& rBitmapColor)
|
|
{
|
|
assert(mpBuffer && "Access is not valid!");
|
|
assert(nX < mpBuffer->mnWidth && "x-coordinate out of range!");
|
|
assert(nY < mpBuffer->mnHeight && "y-coordinate out of range!");
|
|
|
|
mFncSetPixel(GetScanline(nY), nX, rBitmapColor, maColorMask);
|
|
}
|
|
|
|
void SetPixelIndex(long nY, long nX, sal_uInt8 cIndex)
|
|
{
|
|
SetPixel(nY, nX, BitmapColor(cIndex));
|
|
}
|
|
|
|
void SetLineColor(const Color& rColor);
|
|
|
|
void SetFillColor();
|
|
void SetFillColor(const Color& rColor);
|
|
|
|
void Erase(const Color& rColor);
|
|
|
|
void DrawLine(const Point& rStart, const Point& rEnd);
|
|
|
|
void FillRect(const tools::Rectangle& rRect);
|
|
void DrawRect(const tools::Rectangle& rRect);
|
|
|
|
private:
|
|
o3tl::optional<BitmapColor> mpLineColor;
|
|
o3tl::optional<BitmapColor> mpFillColor;
|
|
|
|
BitmapWriteAccess() = delete;
|
|
BitmapWriteAccess(const BitmapWriteAccess&) = delete;
|
|
BitmapWriteAccess& operator=(const BitmapWriteAccess&) = delete;
|
|
};
|
|
|
|
#endif
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|