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/workben/vcldemo.cxx | |
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/workben/vcldemo.cxx')
-rw-r--r-- | vcl/workben/vcldemo.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index e37ac96eba9b..1a877bfa794a 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -855,7 +855,7 @@ public: aRight.Crop(tools::Rectangle(Point((nSlice * 3) + 3, (nSlice * 2) + 1), Size(nSlice, 1))); AlphaMask aAlphaMask(aRight.GetBitmap()); - Bitmap aBlockColor(aAlphaMask.GetSizePixel(), 24); + Bitmap aBlockColor(aAlphaMask.GetSizePixel(), vcl::PixelFormat::N24_BPP); aBlockColor.Erase(COL_RED); BitmapEx aShadowStretch(aBlockColor, aAlphaMask); @@ -874,7 +874,7 @@ public: } AlphaMask aWholeMask(aPageShadowMask.GetBitmap()); - aBlockColor = Bitmap(aPageShadowMask.GetSizePixel(), 24); + aBlockColor = Bitmap(aPageShadowMask.GetSizePixel(), vcl::PixelFormat::N24_BPP); aBlockColor.Erase(COL_GREEN); BitmapEx aWhole(aBlockColor, aWholeMask); @@ -1300,7 +1300,7 @@ public: Bitmap aWhiteBmp = aWhite->GetBitmap(Point(),aSrc.GetSizePixel()); Bitmap aBlackBmp = aBlack->GetBitmap(Point(),aSrc.GetSizePixel()); AlphaMask aMask(aSrc.GetSizePixel()); - Bitmap aRecovered(aSrc.GetSizePixel(), 24); + Bitmap aRecovered(aSrc.GetSizePixel(), vcl::PixelFormat::N24_BPP); { AlphaScopedWriteAccess pMaskAcc(aMask); BitmapScopedWriteAccess pRecAcc(aRecovered); |