diff options
Diffstat (limited to 'vcl/source/bitmap')
| -rw-r--r-- | vcl/source/bitmap/BitmapLightenFilter.cxx | 3 | ||||
| -rw-r--r-- | vcl/source/bitmap/BitmapSolarizeFilter.cxx | 8 | ||||
| -rw-r--r-- | vcl/source/bitmap/BitmapTools.cxx | 10 | ||||
| -rw-r--r-- | vcl/source/bitmap/bitmappaint.cxx | 19 |
4 files changed, 22 insertions, 18 deletions
diff --git a/vcl/source/bitmap/BitmapLightenFilter.cxx b/vcl/source/bitmap/BitmapLightenFilter.cxx index 52e41ae33e97..45013b143783 100644 --- a/vcl/source/bitmap/BitmapLightenFilter.cxx +++ b/vcl/source/bitmap/BitmapLightenFilter.cxx @@ -37,7 +37,8 @@ BitmapEx BitmapLightenFilter::execute(BitmapEx const& rBitmapEx) const = pRead->HasPalette() ? pRead->GetPaletteColor(pRead->GetIndexFromData(pScanlineRead, nX)) : pRead->GetPixelFromData(pScanlineRead, nX); - basegfx::BColor aBColor(aBmpColor.Invert().GetColor().getBColor()); + aBmpColor.Invert(); + basegfx::BColor aBColor(aBmpColor.getBColor()); aBColor = basegfx::utils::rgb2hsl(aBColor); double fHue = aBColor.getRed(); diff --git a/vcl/source/bitmap/BitmapSolarizeFilter.cxx b/vcl/source/bitmap/BitmapSolarizeFilter.cxx index d12986c81c9f..179868aa5e2d 100644 --- a/vcl/source/bitmap/BitmapSolarizeFilter.cxx +++ b/vcl/source/bitmap/BitmapSolarizeFilter.cxx @@ -32,7 +32,8 @@ BitmapEx BitmapSolarizeFilter::execute(BitmapEx const& rBitmapEx) const if (rPal[i].GetLuminance() >= mcSolarGreyThreshold) { BitmapColor aCol(rPal[i]); - pWriteAcc->SetPaletteColor(i, aCol.Invert()); + aCol.Invert(); + pWriteAcc->SetPaletteColor(i, aCol); } } } @@ -50,7 +51,10 @@ BitmapEx BitmapSolarizeFilter::execute(BitmapEx const& rBitmapEx) const aCol = pWriteAcc->GetPixelFromData(pScanline, nX); if (aCol.GetLuminance() >= mcSolarGreyThreshold) - pWriteAcc->SetPixelOnData(pScanline, nX, aCol.Invert()); + { + aCol.Invert(); + pWriteAcc->SetPixelOnData(pScanline, nX, aCol); + } } } } diff --git a/vcl/source/bitmap/BitmapTools.cxx b/vcl/source/bitmap/BitmapTools.cxx index 380d46a7f7f7..531a49bc9cc5 100644 --- a/vcl/source/bitmap/BitmapTools.cxx +++ b/vcl/source/bitmap/BitmapTools.cxx @@ -675,7 +675,7 @@ static bool readAlpha( BitmapReadAccess const * pAlphaReadAcc, long nY, const lo BitmapColor const& rColor( pAlphaReadAcc->GetPaletteColor(*pReadScan)); pReadScan++; - nAlpha = data[ nOff ] = 255 - rColor.GetBlueOrIndex(); + nAlpha = data[ nOff ] = 255 - rColor.GetIndex(); if( nAlpha != 255 ) bIsAlpha = true; nOff += 4; @@ -747,7 +747,7 @@ void CanvasCairoExtractBitmapData( BitmapEx const & aBmpEx, Bitmap & aBitmap, un else nAlpha = data[ nOff + 3 ] = 255; #endif - aColor = pBitmapReadAcc->GetPaletteColor(*pReadScan++).GetColor(); + aColor = pBitmapReadAcc->GetPaletteColor(*pReadScan++); #ifdef OSL_BIGENDIAN data[ nOff++ ] = premultiply_table[nAlpha][aColor.GetRed()]; @@ -888,7 +888,7 @@ void CanvasCairoExtractBitmapData( BitmapEx const & aBmpEx, Bitmap & aBitmap, un for( nX = 0; nX < nWidth; nX++ ) { - aColor = pBitmapReadAcc->GetColor( nY, nX ).GetColor(); + aColor = pBitmapReadAcc->GetColor( nY, nX ); // cairo need premultiplied color values // TODO(rodo) handle endianness @@ -1025,8 +1025,8 @@ void CanvasCairoExtractBitmapData( BitmapEx const & aBmpEx, Bitmap & aBitmap, un // #i123564# background and foreground were exchanged; of course // rPalette[0] is the background color - o_rFront = rPalette[1].GetColor(); - o_rBack = rPalette[0].GetColor(); + o_rFront = rPalette[1]; + o_rBack = rPalette[0]; bRet = true; } diff --git a/vcl/source/bitmap/bitmappaint.cxx b/vcl/source/bitmap/bitmappaint.cxx index 02df3c8a6b29..04b301d47d89 100644 --- a/vcl/source/bitmap/bitmappaint.cxx +++ b/vcl/source/bitmap/bitmappaint.cxx @@ -140,8 +140,9 @@ bool Bitmap::Invert() Scanline pScanline = pAcc->GetScanline(nY); for (long nX = 0; nX < nWidth; nX++) { - pAcc->SetPixelOnData(pScanline, nX, - pAcc->GetPixelFromData(pScanline, nX).Invert()); + BitmapColor aBmpColor = pAcc->GetPixelFromData(pScanline, nX); + aBmpColor.Invert(); + pAcc->SetPixelOnData(pScanline, nX, aBmpColor); } } } @@ -830,9 +831,8 @@ bool Bitmap::Replace(const AlphaMask& rAlpha, const Color& rMergeColor) for (long nX = 0; nX < nWidth; nX++) { aCol = pAcc->GetColor(nY, nX); - pNewAcc->SetPixelOnData( - pScanline, nX, - aCol.Merge(rMergeColor, 255 - pAlphaAcc->GetIndexFromData(pScanlineAlpha, nX))); + aCol.Merge(rMergeColor, 255 - pAlphaAcc->GetIndexFromData(pScanlineAlpha, nX)); + pNewAcc->SetPixelOnData(pScanline, nX, aCol); } } @@ -1132,11 +1132,10 @@ bool Bitmap::Blend(const AlphaMask& rAlpha, const Color& rBackgroundColor) Scanline pScanlineAlpha = pAlphaAcc->GetScanline(nY); for (long nX = 0; nX < nWidth; ++nX) { - pAcc->SetPixelOnData( - pScanline, nX, - pAcc->GetPixelFromData(pScanline, nX) - .Merge(rBackgroundColor, - 255 - pAlphaAcc->GetIndexFromData(pScanlineAlpha, nX))); + BitmapColor aBmpColor = pAcc->GetPixelFromData(pScanline, nX); + aBmpColor.Merge(rBackgroundColor, + 255 - pAlphaAcc->GetIndexFromData(pScanlineAlpha, nX)); + pAcc->SetPixelOnData(pScanline, nX, aBmpColor); } } |