diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2021-03-13 12:00:28 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2021-03-13 12:17:49 +0100 |
| commit | 68bc6a5dd68006ab86e7ef26f9e5d241cb118879 (patch) | |
| tree | debd00d1a05228759974b2d09666dfcccb379ab3 /vcl/backendtest | |
| parent | a73f24f47aea2dfa57459424f48b11b2b835e334 (diff) | |
add PixelFormat enum that replaces bit count in Bitmap/BitmapEx
Bit count for the image is a numeric value (sal_uInt16) but only
a handful of values make sense - namely 1,4,8,24 and 32. This
replaces the numeric value with an enum, which only accepts those
values and checks the correct values are used at compile time.
Change-Id: I0fc137c62bce3b0d021f05019a1648da628521bc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112408
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'vcl/backendtest')
| -rw-r--r-- | vcl/backendtest/outputdevice/bitmap.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vcl/backendtest/outputdevice/bitmap.cxx b/vcl/backendtest/outputdevice/bitmap.cxx index 50060b88b7ed..2c7d7569cde6 100644 --- a/vcl/backendtest/outputdevice/bitmap.cxx +++ b/vcl/backendtest/outputdevice/bitmap.cxx @@ -18,7 +18,7 @@ namespace vcl::test { Bitmap OutputDeviceTestBitmap::setupDrawTransformedBitmap() { Size aBitmapSize(9, 9); - Bitmap aBitmap(aBitmapSize, 24); + Bitmap aBitmap(aBitmapSize, vcl::PixelFormat::N24_BPP); { BitmapScopedWriteAccess aWriteAccess(aBitmap); aWriteAccess->Erase(constFillColor); @@ -43,7 +43,7 @@ Bitmap OutputDeviceTestBitmap::setupDrawTransformedBitmap() Bitmap OutputDeviceTestBitmap::setupDrawBitmap() { Size aBitmapSize(9, 9); - Bitmap aBitmap(aBitmapSize, 24); + Bitmap aBitmap(aBitmapSize, vcl::PixelFormat::N24_BPP); { BitmapScopedWriteAccess aWriteAccess(aBitmap); aWriteAccess->Erase(constFillColor); @@ -65,7 +65,7 @@ Bitmap OutputDeviceTestBitmap::setupDrawBitmap() Bitmap OutputDeviceTestBitmap::setupDrawBitmapExWithAlpha() { Size aBitmapSize(9, 9); - Bitmap aBitmap(aBitmapSize, 24); + Bitmap aBitmap(aBitmapSize, vcl::PixelFormat::N24_BPP); { BitmapScopedWriteAccess aWriteAccess(aBitmap); aWriteAccess->Erase(COL_WHITE); @@ -95,7 +95,7 @@ Bitmap OutputDeviceTestBitmap::setupDrawBitmapExWithAlpha() Bitmap OutputDeviceTestBitmap::setupDrawMask() { Size aBitmapSize(9, 9); - Bitmap aBitmap(aBitmapSize, 24); + Bitmap aBitmap(aBitmapSize, vcl::PixelFormat::N24_BPP); { BitmapScopedWriteAccess aWriteAccess(aBitmap); aWriteAccess->Erase(COL_WHITE); @@ -114,7 +114,7 @@ Bitmap OutputDeviceTestBitmap::setupDrawMask() BitmapEx OutputDeviceTestBitmap::setupDrawBlend() { Size aBitmapSize(9, 9); - Bitmap aBitmap(aBitmapSize, 24); + Bitmap aBitmap(aBitmapSize, vcl::PixelFormat::N24_BPP); { BitmapScopedWriteAccess aWriteAccess(aBitmap); aWriteAccess->Erase(COL_WHITE); |