vcl: add initializer_list constructor to BitmapPalette and use it

Change-Id: Ib24266e435765bd5e05193aea5cee61d7a9346b0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113133
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
This commit is contained in:
Tomaž Vajngerl
2021-03-26 08:18:19 +01:00
committed by Tomaž Vajngerl
parent de746cd639
commit b849373b2b
4 changed files with 11 additions and 11 deletions
@@ -202,9 +202,9 @@ namespace
const ::Color& rMaskColor )
{
const ::Color aWhite( COL_WHITE );
BitmapPalette aBiLevelPalette(2);
aBiLevelPalette[0] = aWhite;
aBiLevelPalette[1] = rMaskColor;
BitmapPalette aBiLevelPalette{
aWhite, rMaskColor
};
Bitmap aMask( rBitmap.CreateMask( aWhite ));
Bitmap aSolid( rBitmap.GetSizePixel(),
+3 -4
View File
@@ -670,10 +670,9 @@ namespace wmfemfhelper
static BitmapEx createMaskBmpEx(const Bitmap& rBitmap, const Color& rMaskColor)
{
const Color aWhite(COL_WHITE);
BitmapPalette aBiLevelPalette(2);
aBiLevelPalette[0] = aWhite;
aBiLevelPalette[1] = rMaskColor;
BitmapPalette aBiLevelPalette {
aWhite, rMaskColor
};
Bitmap aMask(rBitmap.CreateMask(aWhite));
Bitmap aSolid(rBitmap.GetSizePixel(), vcl::PixelFormat::N1_BPP, &aBiLevelPalette);
+1 -4
View File
@@ -1334,15 +1334,12 @@ sal_uInt8 TransColToIco( const Color& rCol )
case sal_uInt32(COL_AUTO): nCol = 0; break;
default:
static const Color aColArr[ 16 ] = {
static const BitmapPalette aBmpPal {
COL_BLACK, COL_LIGHTBLUE, COL_LIGHTCYAN, COL_LIGHTGREEN,
COL_LIGHTMAGENTA,COL_LIGHTRED, COL_YELLOW, COL_WHITE,
COL_BLUE, COL_CYAN, COL_GREEN, COL_MAGENTA,
COL_RED, COL_BROWN, COL_GRAY, COL_LIGHTGRAY
};
BitmapPalette aBmpPal(16);
for( sal_uInt16 i = 0; i < 16; ++i )
aBmpPal[i] = aColArr[ i ];
nCol = static_cast< sal_uInt8 >(GetBestIndex(aBmpPal, rCol) + 1);
break;
+4
View File
@@ -57,6 +57,10 @@ public:
{
}
BitmapPalette(std::initializer_list<BitmapColor> aBitmapColor) : maBitmapColor(aBitmapColor)
{
}
BitmapPalette(sal_uInt16 nCount)
: maBitmapColor(nCount)
{