drawinglayer/source/primitive2d/gridprimitive2d.cxx | 2 +-
drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx | 4 ++--
drawinglayer/source/processor2d/cairopixelprocessor2d.cxx | 6 +++---
drawinglayer/source/processor2d/d2dpixelprocessor2d.cxx | 2 +-
drawinglayer/source/processor2d/vclprocessor2d.cxx | 2 +-
include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx | 8 ++++----
svx/source/sdr/contact/viewcontactofsdrobj.cxx | 2 +-
svx/source/svdraw/svddrgmt.cxx | 4 ++--
8 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit a04bef2419ef838439c006b8f406f01b01d5af10
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Aug 6 21:45:01 2025 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Aug 7 10:42:59 2025 +0200
BitmapEx->Bitmap in MarkerArrayPrimitive2D
now that Bitmap supports transparency
Change-Id: I72f649ab39388281834682efe9325e0698734fee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189025
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/drawinglayer/source/primitive2d/gridprimitive2d.cxx
b/drawinglayer/source/primitive2d/gridprimitive2d.cxx
index 80bc56e2250c..738f88ca07ca 100644
--- a/drawinglayer/source/primitive2d/gridprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/gridprimitive2d.cxx
@@ -248,7 +248,7 @@ namespace drawinglayer::primitive2d
}
else
{
- aContainer.push_back(new
MarkerArrayPrimitive2D(std::move(aPositionsCross), getCrossMarker()));
+ aContainer.push_back(new
MarkerArrayPrimitive2D(std::move(aPositionsCross), Bitmap(getCrossMarker())));
}
return new GroupPrimitive2D(std::move(aContainer));
}
diff --git a/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx
b/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx
index 1702b16496d8..4c756d1fba17 100644
--- a/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx
@@ -65,7 +65,7 @@ namespace drawinglayer::primitive2d
aContainer.push_back(
new BitmapPrimitive2D(
- getMarker(),
+ BitmapEx(getMarker()),
aTransform));
}
return new GroupPrimitive2D(std::move(aContainer));
@@ -73,7 +73,7 @@ namespace drawinglayer::primitive2d
MarkerArrayPrimitive2D::MarkerArrayPrimitive2D(
std::vector< basegfx::B2DPoint >&& rPositions,
- const BitmapEx& rMarker)
+ const Bitmap& rMarker)
: maPositions(std::move(rPositions)),
maMarker(rMarker)
{
diff --git a/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx
b/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx
index f0114a6da4fb..b3bbdd36536e 100644
--- a/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx
@@ -2104,7 +2104,7 @@ void CairoPixelProcessor2D::processMarkerArrayPrimitive2D(
return;
}
- const BitmapEx& rMarker(rMarkerArrayCandidate.getMarker());
+ const Bitmap& rMarker(rMarkerArrayCandidate.getMarker());
if (rMarker.IsEmpty())
{
@@ -2150,8 +2150,8 @@ void CairoPixelProcessor2D::processMarkerArrayPrimitive2D(
Bitmap aBitmap(rMarker.GetSizePixel(), vcl::PixelFormat::N24_BPP);
aBitmap.Erase(Color(aReplacementColor));
- if (rMarker.IsAlpha())
- aBitmapEx = BitmapEx(aBitmap, rMarker.GetAlphaMask());
+ if (rMarker.HasAlpha())
+ aBitmapEx = BitmapEx(aBitmap,
BitmapEx(rMarker).GetAlphaMask());
else
aBitmapEx = BitmapEx(aBitmap);
}
diff --git a/drawinglayer/source/processor2d/d2dpixelprocessor2d.cxx
b/drawinglayer/source/processor2d/d2dpixelprocessor2d.cxx
index 305d1f987f72..412fbaa92a59 100644
--- a/drawinglayer/source/processor2d/d2dpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/d2dpixelprocessor2d.cxx
@@ -1391,7 +1391,7 @@ void D2DPixelProcessor2D::processMarkerArrayPrimitive2D(
return;
}
- const BitmapEx& rMarker(rMarkerArrayCandidate.getMarker());
+ BitmapEx rMarker(rMarkerArrayCandidate.getMarker());
if (rMarker.IsEmpty())
{
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index 8f53bf710d77..ddc9b4b2a963 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -1094,7 +1094,7 @@ void VclProcessor2D::RenderMarkerArrayPrimitive2D(
return;
// get pixel size
- const BitmapEx& rMarker(rMarkArrayCandidate.getMarker());
+ const Bitmap& rMarker(rMarkArrayCandidate.getMarker());
const Size aBitmapSize(rMarker.GetSizePixel());
if (!(aBitmapSize.Width() && aBitmapSize.Height()))
diff --git a/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx
b/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx
index d45e472d5df4..1914d984fb32 100644
--- a/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx
@@ -22,7 +22,7 @@
#include <drawinglayer/drawinglayerdllapi.h>
#include <drawinglayer/primitive2d/BufferedDecompositionPrimitive2D.hxx>
-#include <vcl/bitmapex.hxx>
+#include <vcl/bitmap.hxx>
// MarkerArrayPrimitive2D class
@@ -49,7 +49,7 @@ namespace drawinglayer::primitive2d
std::vector< basegfx::B2DPoint > maPositions;
/// the marker definition to visualize
- BitmapEx maMarker;
+ Bitmap maMarker;
/// create local decomposition
virtual Primitive2DReference create2DDecomposition(const
geometry::ViewInformation2D& rViewInformation) const override;
@@ -58,11 +58,11 @@ namespace drawinglayer::primitive2d
/// constructor
MarkerArrayPrimitive2D(
std::vector< basegfx::B2DPoint >&& rPositions,
- const BitmapEx& rMarker);
+ const Bitmap& rMarker);
/// data read access
const std::vector< basegfx::B2DPoint >& getPositions() const {
return maPositions; }
- const BitmapEx& getMarker() const { return maMarker; }
+ const Bitmap& getMarker() const { return maMarker; }
/// compare operator
virtual bool operator==(const BasePrimitive2D& rPrimitive) const
override;
diff --git a/svx/source/sdr/contact/viewcontactofsdrobj.cxx
b/svx/source/sdr/contact/viewcontactofsdrobj.cxx
index 13986c236b73..5f13af5cbe65 100644
--- a/svx/source/sdr/contact/viewcontactofsdrobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrobj.cxx
@@ -145,7 +145,7 @@ drawinglayer::primitive2d::Primitive2DContainer
ViewContactOfSdrObj::createGlueP
{
const drawinglayer::primitive2d::Primitive2DReference
xReference(
new drawinglayer::primitive2d::MarkerArrayPrimitive2D(
- std::move(aGluepointVector),
BitmapEx(SdrHdl::createGluePointBitmap())));
+ std::move(aGluepointVector),
SdrHdl::createGluePointBitmap()));
xRetval = drawinglayer::primitive2d::Primitive2DContainer{
xReference };
}
}
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index d0b956520bb4..80b3b0bf6b3b 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -257,14 +257,14 @@ drawinglayer::primitive2d::Primitive2DContainer
SdrDragEntryPointGlueDrag::creat
aRetval = drawinglayer::primitive2d::Primitive2DContainer {
new
drawinglayer::primitive2d::MarkerArrayPrimitive2D(std::move(aTransformedPositions),
-
BitmapEx(drawinglayer::primitive2d::createDefaultCross_3x3(aColor)))
+
drawinglayer::primitive2d::createDefaultCross_3x3(aColor))
};
}
else
{
aRetval = drawinglayer::primitive2d::Primitive2DContainer {
new
drawinglayer::primitive2d::MarkerArrayPrimitive2D(std::move(aTransformedPositions),
-
BitmapEx(SdrHdl::createGluePointBitmap()))
+
SdrHdl::createGluePointBitmap())
};
}
}
