ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

BitmapEx->Bitmap in WavyLineCache

Browse Source 
now that Bitmap can handle transparency

Change-Id: Ie72ee76c1c3e2613254f2ac744aa63909f58cb1f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188442
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2025-07-28 14:57:21 +02:00
parent b7c3f7f63b
commit e4c797af09
3 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/vcl/outdev.hxx
+7
View File
@@ -1333,6 +1333,13 @@ public:
const Point& rSrcPtPixel,
const Size& rSrcSizePixel,
const BitmapEx& rBitmapEx);
// draw bitmap (potentially with alpha)
void DrawBitmapEx(
const Point& rDestPt,
const Size& rDestSize,
const Point& rSrcPtPixel,
const Size& rSrcSizePixel,
const Bitmap& rBitmap);
SAL_DLLPRIVATE void DrawBitmapEx(
const Point& rDestPt,
vcl/source/outdev/bitmapex.cxx
+20
View File
@@ -123,6 +123,26 @@ void OutputDevice::DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
MetaActionType::BMPEXSCALEPART);
}
void OutputDevice::DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
const Point& rSrcPtPixel, const Size& rSrcSizePixel,
const Bitmap& rBitmap)
{
assert(!is_double_buffered_window());
if( ImplIsRecordLayout() )
return;
if ( !rBitmap.HasAlpha() )
{
DrawBitmap(rDestPt, rDestSize, rSrcPtPixel, rSrcSizePixel,
rBitmap);
return;
}
DrawBitmapEx(rDestPt, rDestSize, rSrcPtPixel, rSrcSizePixel, rBitmap,
MetaActionType::BMPEXSCALEPART);
}
void OutputDevice::DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
const Point& rSrcPtPixel, const Size& rSrcSizePixel,
const BitmapEx& rBitmapEx, const MetaActionType nAction )
vcl/source/outdev/textline.cxx
+7 -15
View File
@@ -52,7 +52,7 @@ namespace {
{
}
bool find( Color aLineColor, size_t nLineWidth, size_t nWaveHeight, size_t nWordWidth, BitmapEx& rOutput )
bool find( Color aLineColor, size_t nLineWidth, size_t nWaveHeight, size_t nWordWidth, Bitmap& rOutput )
{
Key aKey = { nWaveHeight, sal_uInt32(aLineColor) };
auto item = m_aItems.find( aKey );
@@ -67,7 +67,7 @@ namespace {
return true;
}
void insert( const BitmapEx& aBitmap, const Color& aLineColor, const size_t nLineWidth, const size_t nWaveHeight, const size_t nWordWidth, BitmapEx& rOutput )
void insert( const Bitmap& aBitmap, const Color& aLineColor, const size_t nLineWidth, const size_t nWaveHeight, const size_t nWordWidth, Bitmap& rOutput )
{
Key aKey = { nWaveHeight, sal_uInt32(aLineColor) };
m_aItems.insert( std::pair< Key, WavyLineCacheItem>( aKey, { nLineWidth, nWordWidth, aBitmap } ) );
@@ -93,7 +93,7 @@ namespace {
{
size_t m_aLineWidth;
size_t m_aWordWidth;
BitmapEx m_Bitmap;
Bitmap m_Bitmap;
};
struct Key
@@ -1063,7 +1063,7 @@ void OutputDevice::DrawWaveLine(const Point& rStartPos, const Point& rEndPos, to
if ( !snLineCache.get() )
return;
WavyLineCache& rLineCache = *snLineCache.get();
BitmapEx aWavylinebmp;
Bitmap aWavylinebmp;
if ( !rLineCache.find( GetLineColor(), nLineWidth, nWaveHeight, nEndX - nStartX, aWavylinebmp ) )
{
size_t nWordLength = nEndX - nStartX;
@@ -1076,19 +1076,11 @@ void OutputDevice::DrawWaveLine(const Point& rStartPos, const Point& rEndPos, to
pVirtDev->Erase();
pVirtDev->SetAntialiasing( AntialiasingFlags::Enable );
pVirtDev->ImplDrawWaveLineBezier( 0, 0, nWordLength, 0, nWaveHeight, fOrientation, nLineWidth );
BitmapEx aBitmapEx(pVirtDev->GetBitmap(Point(0, 0), pVirtDev->GetOutputSize()));
Bitmap aBitmap(pVirtDev->GetBitmap(Point(0, 0), pVirtDev->GetOutputSize()));
// Ideally we don't need this block, but in the split rgb surface + separate alpha surface
// with Antialiasing enabled and the svp/cairo backend we get both surfaces antialiased
// so their combination of aliases merge to overly wash-out the color. Hack it by taking just
// the alpha surface and use it to blend the original solid line color
Bitmap aSolidColor(aBitmapEx.GetBitmap());
aSolidColor.Erase(GetLineColor());
aBitmapEx = BitmapEx(aSolidColor, aBitmapEx.GetAlphaMask());
rLineCache.insert( aBitmapEx, GetLineColor(), nLineWidth, nWaveHeight, nWordLength, aWavylinebmp );
rLineCache.insert( aBitmap, GetLineColor(), nLineWidth, nWaveHeight, nWordLength, aWavylinebmp );
}
if ( aWavylinebmp.ImplGetBitmapSalBitmap() != nullptr )
if ( aWavylinebmp.ImplGetSalBitmap() != nullptr )
{
Size _size( nEndX - nStartX, aWavylinebmp.GetSizePixel().Height() );
DrawBitmapEx(Point( rStartPos.X(), rStartPos.Y() ), PixelToLogic( _size ), Point(), _size, aWavylinebmp);