diff options
| author | Noel <noel.grandin@collabora.co.uk> | 2021-03-29 14:23:16 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-03-31 09:22:27 +0200 |
| commit | a6c6f35ccc78e74cfa76397d649c1b6fc4baad29 (patch) | |
| tree | 61c47ee4099b8db2996e2c00ba99dbe5f79ab68d /include | |
| parent | 5c90f3d28de6262bb730bad106d4652e458054df (diff) | |
drop 4bpp image formats
on a path to simplifying our internal bitmap stuff, aiming to
support a smaller set of image formats, but support them
in an accelerated fashion.
Change-Id: I5f8bf3cd49abf16ce460771492cdd5f358cb34df
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113313
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/bitmap.hxx | 4 | ||||
| -rw-r--r-- | include/vcl/bitmap/BitmapTypes.hxx | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index 1bfc484fee5b..eaec09ad7037 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -72,8 +72,6 @@ enum class BmpConversion { NNONE, N1BitThreshold, - N4BitGreys, - N4BitColors, N8BitGreys, N8BitColors, N24Bit, @@ -526,7 +524,7 @@ public: const std::shared_ptr<SalBitmap>& ImplGetSalBitmap() const { return mxSalBmp; } SAL_DLLPRIVATE void ImplSetSalBitmap( const std::shared_ptr<SalBitmap>& xImpBmp ); - SAL_DLLPRIVATE bool ImplMakeGreyscales( sal_uInt16 nGreyscales ); + SAL_DLLPRIVATE bool ImplMakeGreyscales(); public: diff --git a/include/vcl/bitmap/BitmapTypes.hxx b/include/vcl/bitmap/BitmapTypes.hxx index 866cf0b2950e..7ebf9fc8dafc 100644 --- a/include/vcl/bitmap/BitmapTypes.hxx +++ b/include/vcl/bitmap/BitmapTypes.hxx @@ -17,7 +17,6 @@ enum class PixelFormat { INVALID = 0, N1_BPP = 1, - N4_BPP = 4, N8_BPP = 8, N24_BPP = 24, N32_BPP = 32 @@ -37,7 +36,8 @@ constexpr PixelFormat bitDepthToPixelFormat(sal_uInt16 nBitDepth) case 1: return PixelFormat::N1_BPP; case 4: - return PixelFormat::N4_BPP; + assert(false); + break; case 8: return PixelFormat::N8_BPP; case 24: |