diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-21 16:07:55 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-08-23 16:41:59 +0200 |
| commit | 7607320e8e68cfeb2ef8933d8a5a7d06f74f16fd (patch) | |
| tree | b4b4ae5ea6bd6ec2ce1d252442351a8e2ad2d52f /include | |
| parent | 88897b74118fa6d269ce325aca6a4ac3ac1ae3de (diff) | |
tdf#119282 Area tab, Pattern color change
regression from
commit ccd316d1cb310734848bd20244f509024b549b8c
use VirtualDevice in createHistorical8x8FromArray
Move the code inside vcl so we don't need to expose BitmapWriteAccess.
I tried to detect this thing by counting the number of independent
colors in the bitmap, but that didn't work. It is used from more than
one place, and appears to be very determined that it needs a 2-color
palette to work properly.
Change-Id: Id11dd9ea78e5e522a6083d6a799e801cac81fd5b
Reviewed-on: https://gerrit.libreoffice.org/59331
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Jenkins
(cherry picked from commit cd8dd48bf89d800c012afb04b16281ed8b261de9)
Reviewed-on: https://gerrit.libreoffice.org/59416
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/xbtmpit.hxx | 6 | ||||
| -rw-r--r-- | include/vcl/BitmapTools.hxx | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/svx/xbtmpit.hxx b/include/svx/xbtmpit.hxx index 2f8e5f1181ee..218985c077d6 100644 --- a/include/svx/xbtmpit.hxx +++ b/include/svx/xbtmpit.hxx @@ -29,12 +29,6 @@ class SdrModel; class BitmapColor; -// helper to construct historical 8x8 bitmaps with two colors - -BitmapEx SVX_DLLPUBLIC createHistorical8x8FromArray(std::array<sal_uInt8,64> const & pArray, Color aColorPix, Color aColorBack); -bool SVX_DLLPUBLIC isHistorical8x8(const BitmapEx& rBitmapEx, BitmapColor& o_rBack, BitmapColor& o_rFront); - - // class XFillBitmapItem class SVX_DLLPUBLIC XFillBitmapItem : public NameOrIndex diff --git a/include/vcl/BitmapTools.hxx b/include/vcl/BitmapTools.hxx index 2064cb2d01dc..75eb6ed53077 100644 --- a/include/vcl/BitmapTools.hxx +++ b/include/vcl/BitmapTools.hxx @@ -23,6 +23,7 @@ #include <basegfx/range/b2drectangle.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <o3tl/safeint.hxx> +#include <array> namespace vcl { namespace bitmap { @@ -113,6 +114,11 @@ VCL_DLLPUBLIC void CanvasCairoExtractBitmapData( BitmapEx const & rBmpEx, Bitmap VCL_DLLPUBLIC css::uno::Sequence< sal_Int8 > CanvasExtractBitmapData(BitmapEx const & rBitmapEx, const css::geometry::IntegerRectangle2D& rect); +// helper to construct historical 8x8 bitmaps with two colors + +BitmapEx VCL_DLLPUBLIC createHistorical8x8FromArray(std::array<sal_uInt8,64> const & pArray, Color aColorPix, Color aColorBack); +bool VCL_DLLPUBLIC isHistorical8x8(const BitmapEx& rBitmapEx, BitmapColor& o_rBack, BitmapColor& o_rFront); + }} // end vcl::bitmap #endif // INCLUDED_VCL_BITMAP_TOOLS_HXX |