diff options
| author | Noel <noel.grandin@collabora.co.uk> | 2021-03-31 14:32:02 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-03-31 17:38:04 +0200 |
| commit | 740757d17452e3b2f9bfa7897c05dedeca639e34 (patch) | |
| tree | 653ebc09c09e53fd9d94863bc057d43a1a163c5b /include | |
| parent | b5558e4ac6c2f134f07ea87a143694b17adb4482 (diff) | |
remove internal 4bit scanline formats
since we have already removed the 4-bit internal bitmap formats.
Change-Id: Ie481aaa8e25642a47e30beb6f37e2d3beda304e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113412
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/BitmapReadAccess.hxx | 8 | ||||
| -rw-r--r-- | include/vcl/Scanline.hxx | 5 |
2 files changed, 1 insertions, 12 deletions
diff --git a/include/vcl/BitmapReadAccess.hxx b/include/vcl/BitmapReadAccess.hxx index 845e9994aa6b..b68332e89294 100644 --- a/include/vcl/BitmapReadAccess.hxx +++ b/include/vcl/BitmapReadAccess.hxx @@ -119,10 +119,6 @@ public: const ColorMask& rMask); static BitmapColor GetPixelForN1BitLsbPal(ConstScanline pScanline, tools::Long nX, const ColorMask& rMask); - static BitmapColor GetPixelForN4BitMsnPal(ConstScanline pScanline, tools::Long nX, - const ColorMask& rMask); - static BitmapColor GetPixelForN4BitLsnPal(ConstScanline pScanline, tools::Long nX, - const ColorMask& rMask); static BitmapColor GetPixelForN8BitPal(ConstScanline pScanline, tools::Long nX, const ColorMask& rMask); static BitmapColor GetPixelForN24BitTcBgr(ConstScanline pScanline, tools::Long nX, @@ -152,10 +148,6 @@ public: const BitmapColor& rBitmapColor, const ColorMask& rMask); static void SetPixelForN1BitLsbPal(Scanline pScanline, tools::Long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); - static void SetPixelForN4BitMsnPal(Scanline pScanline, tools::Long nX, - const BitmapColor& rBitmapColor, const ColorMask& rMask); - static void SetPixelForN4BitLsnPal(Scanline pScanline, tools::Long nX, - const BitmapColor& rBitmapColor, const ColorMask& rMask); static void SetPixelForN8BitPal(Scanline pScanline, tools::Long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); static void SetPixelForN24BitTcBgr(Scanline pScanline, tools::Long nX, diff --git a/include/vcl/Scanline.hxx b/include/vcl/Scanline.hxx index 707ee41fa9cd..6f40ce7a0c58 100644 --- a/include/vcl/Scanline.hxx +++ b/include/vcl/Scanline.hxx @@ -31,9 +31,6 @@ enum class ScanlineFormat { N1BitMsbPal = 0x00000001, N1BitLsbPal = 0x00000002, - N4BitMsnPal = 0x00000004, - N4BitLsnPal = 0x00000008, - N8BitPal = 0x00000010, N24BitTcBgr = 0x00000100, @@ -50,7 +47,7 @@ enum class ScanlineFormat { namespace o3tl { - template<> struct typed_flags<ScanlineFormat> : is_typed_flags<ScanlineFormat, 0x0001fb1f> {}; + template<> struct typed_flags<ScanlineFormat> : is_typed_flags<ScanlineFormat, 0x0001fb13> {}; } inline ScanlineFormat RemoveScanline(ScanlineFormat nFormat) |