Kaydet (Commit) 507d0ded authored tarafından Caolán McNamara's avatar Caolán McNamara

keep disable image at same depth as original

that way the "preferred" image format for a platform
for icons etc remains sticky

Change-Id: Ia76af0b7c4f27650038cab214b6406b8ef1a5fc4
üst 5049d582
...@@ -59,7 +59,7 @@ BitmapEx BitmapProcessor::createDisabledImage(const BitmapEx& rBitmapEx) ...@@ -59,7 +59,7 @@ BitmapEx BitmapProcessor::createDisabledImage(const BitmapEx& rBitmapEx)
{ {
const Size aSize(rBitmapEx.GetSizePixel()); const Size aSize(rBitmapEx.GetSizePixel());
Bitmap aGrey(aSize, 8, &Bitmap::GetGreyPalette(256)); Bitmap aGrey(aSize, rBitmapEx.GetBitCount());
AlphaMask aGreyAlpha(aSize); AlphaMask aGreyAlpha(aSize);
Bitmap aBitmap(rBitmapEx.GetBitmap()); Bitmap aBitmap(rBitmapEx.GetBitmap());
...@@ -77,14 +77,14 @@ BitmapEx BitmapProcessor::createDisabledImage(const BitmapEx& rBitmapEx) ...@@ -77,14 +77,14 @@ BitmapEx BitmapProcessor::createDisabledImage(const BitmapEx& rBitmapEx)
if (pRead && pReadAlpha && pGrey && pGreyAlpha) if (pRead && pReadAlpha && pGrey && pGreyAlpha)
{ {
BitmapColor aGreyValue(0);
BitmapColor aGreyAlphaValue(0); BitmapColor aGreyAlphaValue(0);
for (long nY = 0; nY < aSize.Height(); ++nY) for (long nY = 0; nY < aSize.Height(); ++nY)
{ {
for (long nX = 0; nX < aSize.Width(); ++nX) for (long nX = 0; nX < aSize.Width(); ++nX)
{ {
aGreyValue.SetIndex(pRead->GetLuminance(nY, nX)); const sal_uInt8 nLum(pRead->GetLuminance(nY, nX));
BitmapColor aGreyValue(nLum, nLum, nLum);
pGrey->SetPixel(nY, nX, aGreyValue); pGrey->SetPixel(nY, nX, aGreyValue);
const BitmapColor aBitmapAlphaValue(pReadAlpha->GetPixel(nY, nX)); const BitmapColor aBitmapAlphaValue(pReadAlpha->GetPixel(nY, nX));
...@@ -101,14 +101,14 @@ BitmapEx BitmapProcessor::createDisabledImage(const BitmapEx& rBitmapEx) ...@@ -101,14 +101,14 @@ BitmapEx BitmapProcessor::createDisabledImage(const BitmapEx& rBitmapEx)
{ {
if (pRead && pGrey && pGreyAlpha) if (pRead && pGrey && pGreyAlpha)
{ {
BitmapColor aGreyValue(0);
BitmapColor aGreyAlphaValue(0); BitmapColor aGreyAlphaValue(0);
for (long nY = 0; nY < aSize.Height(); ++nY) for (long nY = 0; nY < aSize.Height(); ++nY)
{ {
for (long nX = 0; nX < aSize.Width(); ++nX) for (long nX = 0; nX < aSize.Width(); ++nX)
{ {
aGreyValue.SetIndex(pRead->GetLuminance(nY, nX)); const sal_uInt8 nLum(pRead->GetLuminance(nY, nX));
BitmapColor aGreyValue(nLum, nLum, nLum);
pGrey->SetPixel(nY, nX, aGreyValue); pGrey->SetPixel(nY, nX, aGreyValue);
aGreyAlphaValue.SetIndex(128); aGreyAlphaValue.SetIndex(128);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment