drawinglayer/source/primitive2d/BitmapAlphaPrimitive2D.cxx | 6 +++---
drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx | 4 ++--
drawinglayer/source/processor2d/cairopixelprocessor2d.cxx | 4 ++--
drawinglayer/source/processor2d/hittestprocessor2d.cxx | 2 +-
include/drawinglayer/primitive2d/BitmapAlphaPrimitive2D.hxx | 6 +++---
5 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 873a848cadd987aa3ab00b2e2688b2e187ced67e
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Aug 7 13:28:17 2025 +0200
Commit: Noel Grandin <noelgran...@gmail.com>
CommitDate: Mon Aug 11 21:36:17 2025 +0200
BitmapEx->Bitmap in BitmapAlphaPrimitive2D
now that Bitmap supports transparency
Change-Id: Ia0ce9eff727a67326d218eb8f3dfd1e926db2c2a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189137
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
diff --git a/drawinglayer/source/primitive2d/BitmapAlphaPrimitive2D.cxx
b/drawinglayer/source/primitive2d/BitmapAlphaPrimitive2D.cxx
index 180ae0ae3c81..3fe9301054e8 100644
--- a/drawinglayer/source/primitive2d/BitmapAlphaPrimitive2D.cxx
+++ b/drawinglayer/source/primitive2d/BitmapAlphaPrimitive2D.cxx
@@ -46,16 +46,16 @@ Primitive2DReference
BitmapAlphaPrimitive2D::create2DDecomposition(
if (basegfx::fTools::equalZero(getTransparency()))
{
// no transparency, use simple BitmapPrimitive2D
- return Primitive2DReference{ new
BitmapPrimitive2D(Bitmap(getBitmap()), getTransform()) };
+ return Primitive2DReference{ new BitmapPrimitive2D(getBitmap(),
getTransform()) };
}
// default: embed to UnifiedTransparencePrimitive2D
- Primitive2DContainer aContent{ new BitmapPrimitive2D(Bitmap(getBitmap()),
getTransform()) };
+ Primitive2DContainer aContent{ new BitmapPrimitive2D(getBitmap(),
getTransform()) };
return Primitive2DReference{ new
UnifiedTransparencePrimitive2D(std::move(aContent),
getTransparency()) };
}
-BitmapAlphaPrimitive2D::BitmapAlphaPrimitive2D(BitmapEx xXBitmap,
basegfx::B2DHomMatrix aTransform,
+BitmapAlphaPrimitive2D::BitmapAlphaPrimitive2D(Bitmap xXBitmap,
basegfx::B2DHomMatrix aTransform,
double fTransparency)
: maBitmap(std::move(xXBitmap))
, maTransform(std::move(aTransform))
diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
index 65b25b301aa2..99f90b0d8d29 100644
--- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
@@ -225,7 +225,7 @@ namespace drawinglayer::primitive2d
if (basegfx::fTools::equal(getTransparency(), 0.0))
return new BitmapPrimitive2D(Bitmap(bitmap),
getTransform());
- return new BitmapAlphaPrimitive2D(bitmap, getTransform(),
getTransparency());
+ return new BitmapAlphaPrimitive2D(Bitmap(bitmap),
getTransform(), getTransparency());
}
void checkSafeToBuffer(sal_uInt32 nIndex)
@@ -673,7 +673,7 @@ namespace drawinglayer::primitive2d
{
rContainer.append(
new BitmapAlphaPrimitive2D(
- rGraphic.GetBitmapEx(),
+ Bitmap(rGraphic.GetBitmapEx()),
rTransform,
fTransparency));
}
diff --git a/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx
b/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx
index 3cc449ea7367..e72c5a5d8d66 100644
--- a/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx
@@ -3617,13 +3617,13 @@ void
CairoPixelProcessor2D::processBitmapAlphaPrimitive2D(
if (!rBitmapAlphaPrimitive2D.hasTransparency())
{
// do what CairoPixelProcessor2D::processPolyPolygonColorPrimitive2D
does
- paintBitmapAlpha(Bitmap(rBitmapAlphaPrimitive2D.getBitmap()),
+ paintBitmapAlpha(rBitmapAlphaPrimitive2D.getBitmap(),
rBitmapAlphaPrimitive2D.getTransform());
}
else
{
// draw with alpha directly
- paintBitmapAlpha(Bitmap(rBitmapAlphaPrimitive2D.getBitmap()),
+ paintBitmapAlpha(rBitmapAlphaPrimitive2D.getBitmap(),
rBitmapAlphaPrimitive2D.getTransform(),
rBitmapAlphaPrimitive2D.getTransparency());
}
diff --git a/drawinglayer/source/processor2d/hittestprocessor2d.cxx
b/drawinglayer/source/processor2d/hittestprocessor2d.cxx
index c210d3cb007b..d0e1081a65e4 100644
--- a/drawinglayer/source/processor2d/hittestprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/hittestprocessor2d.cxx
@@ -466,7 +466,7 @@ namespace drawinglayer::processor2d
{
checkBitmapHit(
rCandidate.getB2DRange(getViewInformation2D()),
- rBitmapAlphaCandidate.getBitmap(),
+ BitmapEx(rBitmapAlphaCandidate.getBitmap()),
rBitmapAlphaCandidate.getTransform());
}
break;
diff --git a/include/drawinglayer/primitive2d/BitmapAlphaPrimitive2D.hxx
b/include/drawinglayer/primitive2d/BitmapAlphaPrimitive2D.hxx
index 105eb4c516c4..d5b89a2b129b 100644
--- a/include/drawinglayer/primitive2d/BitmapAlphaPrimitive2D.hxx
+++ b/include/drawinglayer/primitive2d/BitmapAlphaPrimitive2D.hxx
@@ -38,7 +38,7 @@ class DRAWINGLAYER_DLLPUBLIC BitmapAlphaPrimitive2D final :
public BufferedDecom
{
private:
/// the Bitmap-data
- BitmapEx maBitmap;
+ Bitmap maBitmap;
/** the object transformation from unit coordinates, defining
size, shear, rotate and position
@@ -54,11 +54,11 @@ private:
public:
/// constructor
- BitmapAlphaPrimitive2D(BitmapEx xBitmap, basegfx::B2DHomMatrix aTransform,
+ BitmapAlphaPrimitive2D(Bitmap xBitmap, basegfx::B2DHomMatrix aTransform,
double fTransparency = 0.0);
/// data read access
- const BitmapEx& getBitmap() const { return maBitmap; }
+ const Bitmap& getBitmap() const { return maBitmap; }
const basegfx::B2DHomMatrix& getTransform() const { return maTransform; }
double getTransparency() const { return mfTransparency; }
bool hasTransparency() const { return
!basegfx::fTools::equalZero(mfTransparency); }
