diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-02-12 14:42:38 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-02-21 19:44:29 +0100 |
| commit | bd4ec51f9726b1fbe4c9a3fecfe298492bd8d8e5 (patch) | |
| tree | 5b5e0dda8ea914a6553603e6d083b4cc6452f844 /include | |
| parent | 541f5b508e7d356803eac2bdce4278649ee76203 (diff) | |
tdf#130573 labels exchanged in export to BMP
In the commit below, I removed the 1-bit dithered output,
so restore it.
regression from
commit b5699cd01b6a52906880c107bac6f3802ea7353d
Date: Wed Feb 8 16:18:32 2017 +0200
convert BmpConversion to scoped enum
Note that this bug has been around since LO5.4
which means that anyone who has adjusted their
setting in
officecfg/registry/schema/org/openoffice/Office/Common.xcs
with key BMP
runs the risk of having that setting now revert to its
prior (documented) meaning.
Change-Id: Ibbda8aefbac261ff37ffab7223714f5d0343c692
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88528
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit f7323482ae38c5c4bc39edeea4d1a6e282f896a2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88794
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/BitmapMonochromeMatrixFilter.hxx | 28 | ||||
| -rw-r--r-- | include/vcl/bitmap.hxx | 1 |
2 files changed, 29 insertions, 0 deletions
diff --git a/include/vcl/BitmapMonochromeMatrixFilter.hxx b/include/vcl/BitmapMonochromeMatrixFilter.hxx new file mode 100644 index 000000000000..58d1d917f65d --- /dev/null +++ b/include/vcl/BitmapMonochromeMatrixFilter.hxx @@ -0,0 +1,28 @@ +/* -*- 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_INCLUDE_VCL_BITMAPMONOCHROMEMATRIXFILTER_HXX +#define INCLUDED_INCLUDE_VCL_BITMAPMONOCHROMEMATRIXFILTER_HXX + +#include <vcl/BitmapFilter.hxx> + +class VCL_DLLPUBLIC BitmapMonochromeMatrixFilter final : public BitmapFilter +{ +public: + /** Convert to monochrome (1-bit) bitmap using dithering + */ + BitmapMonochromeMatrixFilter() {} + + virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override; +}; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index 3d57e5dfe741..72473ecbed30 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -66,6 +66,7 @@ enum class BmpConversion { NNONE, N1BitThreshold, + N1BitMatrix, // aka Dithered, used in export to bitmap N4BitGreys, N4BitColors, N8BitGreys, |