drawinglayer/source/attribute/fillgraphicattribute.cxx | 2
drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx | 4 -
drawinglayer/source/processor2d/vclprocessor2d.cxx | 24 +++++------
drawinglayer/source/tools/emfphelperdata.cxx | 4 -
filter/source/msfilter/msdffimp.cxx | 2
5 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit 4c85558251b98a80e9a207ece13e131f647b3759
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Aug 26 15:32:21 2025 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Aug 26 17:33:59 2025 +0200
BitmapEx->Bitmap in drawinglayer
now that Bitmap supports transparency
Change-Id: I1894a0187d6f661ad10aa631c55fc3ea66ff1d3d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190224
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/drawinglayer/source/attribute/fillgraphicattribute.cxx
b/drawinglayer/source/attribute/fillgraphicattribute.cxx
index 3da913eee8d0..5a401dbc0133 100644
--- a/drawinglayer/source/attribute/fillgraphicattribute.cxx
+++ b/drawinglayer/source/attribute/fillgraphicattribute.cxx
@@ -58,7 +58,7 @@ namespace drawinglayer::attribute
// available when a renderer works with multi-threading.
// When changing this, please check if it is still possible to
// use a metafile as texture for a 3D object
- maGraphic.GetBitmapEx();
+ maGraphic.GetBitmap();
}
ImpFillGraphicAttribute()
diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
index 99f90b0d8d29..ba44885c3160 100644
--- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
@@ -666,14 +666,14 @@ namespace drawinglayer::primitive2d
{
rContainer.append(
new BitmapPrimitive2D(
- Bitmap(rGraphic.GetBitmapEx()),
+ rGraphic.GetBitmap(),
rTransform));
}
else
{
rContainer.append(
new BitmapAlphaPrimitive2D(
- Bitmap(rGraphic.GetBitmapEx()),
+ rGraphic.GetBitmap(),
rTransform,
fTransparency));
}
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index 175093bb9e4c..69d2ee8cbf93 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -628,7 +628,7 @@ bool VclProcessor2D::RenderFillGraphicPrimitive2DImpl(
// nBWidth, nBHeight is the pixel size of the needed bitmap. To not need
to scale it
// in vcl many times, create a size-optimized version
const Size aNeededBitmapSizePixel(nBWidth, nBHeight);
- BitmapEx aBitmapEx(rFillGraphicAttribute.getGraphic().GetBitmapEx());
+ Bitmap aBitmap(rFillGraphicAttribute.getGraphic().GetBitmap());
const bool bPreScaled(nBWidth * nBHeight < (250 * 250));
// ... but only up to a maximum size, else it gets too expensive
@@ -637,26 +637,26 @@ bool VclProcessor2D::RenderFillGraphicPrimitive2DImpl(
// if color depth is below 24bit, expand before scaling for better
quality.
// This is even needed for low colors, else the scale will produce
// a bitmap in gray or Black/White (!)
- if (isPalettePixelFormat(aBitmapEx.getPixelFormat()))
+ if (isPalettePixelFormat(aBitmap.getPixelFormat()))
{
- aBitmapEx.Convert(BmpConversion::N24Bit);
+ aBitmap.Convert(BmpConversion::N24Bit);
}
- aBitmapEx.Scale(aNeededBitmapSizePixel, BmpScaleFlag::Interpolate);
+ aBitmap.Scale(aNeededBitmapSizePixel, BmpScaleFlag::Interpolate);
}
if (rFillBitmapCandidate.hasTransparency())
- aBitmapEx.BlendAlpha(
+ aBitmap.BlendAlpha(
static_cast<sal_uInt8>(255 -
(rFillBitmapCandidate.getTransparency() * 255)));
if (maBColorModifierStack.count())
{
// when color modifier, apply to bitmap
- aBitmapEx = aBitmapEx.ModifyBitmapEx(maBColorModifierStack);
+ aBitmap = aBitmap.Modify(maBColorModifierStack);
// ModifyBitmapEx uses empty bitmap as sign to return that
// the content will be completely replaced to mono color, use shortcut
- if (aBitmapEx.IsEmpty())
+ if (aBitmap.IsEmpty())
{
// color gets completely replaced, get it
const basegfx::BColor aModifiedColor(
@@ -726,7 +726,7 @@ bool VclProcessor2D::RenderFillGraphicPrimitive2DImpl(
if (nOffsetX == 0 && nOffsetY == 0 && aNeededBitmapSizePixel.getWidth() ==
1
&& aNeededBitmapSizePixel.getHeight() == 1)
{
- Color col = aBitmapEx.GetPixelColor(0, 0);
+ Color col = aBitmap.GetPixelColor(0, 0);
mpOutputDevice->SetLineColor(col);
mpOutputDevice->SetFillColor(col);
mpOutputDevice->DrawRect(aVisiblePixel);
@@ -745,12 +745,12 @@ bool VclProcessor2D::RenderFillGraphicPrimitive2DImpl(
{
if (bPreScaled)
{
- mpOutputDevice->DrawBitmapEx(aOutRectPixel.TopLeft(),
aBitmapEx);
+ mpOutputDevice->DrawBitmapEx(aOutRectPixel.TopLeft(),
aBitmap);
}
else
{
mpOutputDevice->DrawBitmapEx(aOutRectPixel.TopLeft(),
- aNeededBitmapSizePixel,
aBitmapEx);
+ aNeededBitmapSizePixel,
aBitmap);
}
}
}
@@ -770,12 +770,12 @@ bool VclProcessor2D::RenderFillGraphicPrimitive2DImpl(
{
if (bPreScaled)
{
- mpOutputDevice->DrawBitmapEx(aOutRectPixel.TopLeft(),
aBitmapEx);
+ mpOutputDevice->DrawBitmapEx(aOutRectPixel.TopLeft(),
aBitmap);
}
else
{
mpOutputDevice->DrawBitmapEx(aOutRectPixel.TopLeft(),
- aNeededBitmapSizePixel,
aBitmapEx);
+ aNeededBitmapSizePixel,
aBitmap);
}
}
}
diff --git a/drawinglayer/source/tools/emfphelperdata.cxx
b/drawinglayer/source/tools/emfphelperdata.cxx
index 438559e1e13d..9f583702dcc2 100644
--- a/drawinglayer/source/tools/emfphelperdata.cxx
+++ b/drawinglayer/source/tools/emfphelperdata.cxx
@@ -1502,7 +1502,7 @@ namespace emfplushelper
Size aSize;
if (image->type == ImageDataTypeBitmap)
{
- aSize =
image->graphic.GetBitmapEx().GetSizePixel();
+ aSize =
image->graphic.GetBitmap().GetSizePixel();
SAL_INFO("drawinglayer.emf", "EMF+ Bitmap
size: " << aSize.Width()
<< "x"
<< aSize.Height());
@@ -1549,7 +1549,7 @@ namespace emfplushelper
if (image->type == ImageDataTypeBitmap)
{
- Bitmap aBmp(image->graphic.GetBitmapEx());
+ Bitmap aBmp(image->graphic.GetBitmap());
aBmp.Crop(aSource);
aSize = aBmp.GetSizePixel();
if (aSize.Width() > 0 && aSize.Height() > 0)
commit 238f7f0f72d3d47d754cd76c4357e8459db54c74
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Aug 26 14:26:03 2025 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Aug 26 17:33:49 2025 +0200
BitmapEx->Bitmap in filter
now that Bitmap supports transparency
Change-Id: I68bfd5589be9eb7cdc9034c5cea4579279059c90
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190221
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index da400284cb36..c39c865abb3a 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -1396,7 +1396,7 @@ void DffPropertyReader::ApplyFillAttributes( SvStream&
rIn, SfxItemSet& rSet, co
{
if ( eMSO_FillType == mso_fillPattern )
{
- Bitmap aBmp( aGraf.GetBitmapEx().GetBitmap() );
+ Bitmap aBmp( aGraf.GetBitmap().CreateColorBitmap() );
if (aBmp.GetSizePixel().Width() == 8 &&
aBmp.GetSizePixel().Height() == 8 &&
aBmp.getPixelFormat() == vcl::PixelFormat::N8_BPP)
