[Libreoffice-commits] core.git: include/vcl
Chris Sherlock
chris.sherlock79 at gmail.com
Thu Apr 5 08:58:23 UTC 2018
include/vcl/bitmap.hxx | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
New commits:
commit 1021f45f6289ecadfcf9c46946e47a2c5e627752
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Thu Apr 5 14:48:16 2018 +1000
vcl: move public functions to private in Bitmap
Change-Id: Ifeb310c9f0b825eb6cedf6530f3cc6a1ff00de04
Reviewed-on: https://gerrit.libreoffice.org/52421
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index ebf481aa3777..69108febbe4e 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -680,9 +680,6 @@ public:
const int* pCount );
SAL_DLLPRIVATE bool ImplMakeGreyscales( sal_uInt16 nGreyscales );
- SAL_DLLPRIVATE bool ImplConvertUp( sal_uInt16 nBitCount, Color const * pExtColor = nullptr );
- SAL_DLLPRIVATE bool ImplConvertDown( sal_uInt16 nBitCount, Color const * pExtColor = nullptr );
- SAL_DLLPRIVATE bool ImplConvertGhosted();
SAL_DLLPRIVATE bool ImplDitherMatrix();
SAL_DLLPRIVATE bool ImplDitherFloyd();
SAL_DLLPRIVATE bool ImplDitherFloyd16();
@@ -727,10 +724,15 @@ public:
typedef vcl::ScopedBitmapAccess<BitmapInfoAccess, Bitmap, &Bitmap::AcquireInfoAccess> ScopedInfoAccess;
private:
+ SAL_DLLPRIVATE bool ImplConvertUp(sal_uInt16 nBitCount, Color const* pExtColor = nullptr);
+ SAL_DLLPRIVATE bool ImplConvertDown(sal_uInt16 nBitCount, Color const* pExtColor = nullptr);
+ SAL_DLLPRIVATE bool ImplConvertGhosted();
+
+private:
std::shared_ptr<ImpBitmap> mxImpBmp;
- MapMode maPrefMapMode;
- Size maPrefSize;
+ MapMode maPrefMapMode;
+ Size maPrefSize;
};
More information about the Libreoffice-commits
mailing list