drawinglayer/source/primitive2d/glowprimitive2d.cxx | 14 ++++---- drawinglayer/source/primitive2d/graphicprimitive2d.cxx | 2 - drawinglayer/source/primitive2d/sceneprimitive2d.cxx | 2 - drawinglayer/source/processor2d/SDPRProcessor2dTools.cxx | 2 - drawinglayer/source/processor2d/cairopixelprocessor2d.cxx | 22 ++++++------- drawinglayer/source/processor2d/hittestprocessor2d.cxx | 4 +- drawinglayer/source/processor2d/processor2dtools.cxx | 2 - drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 2 - drawinglayer/source/processor2d/vclpixelprocessor2d.cxx | 2 - drawinglayer/source/processor2d/vclprocessor2d.cxx | 2 - drawinglayer/source/tools/converters.cxx | 4 +- 11 files changed, 29 insertions(+), 29 deletions(-)
New commits: commit c87d9766724310ca793d368495329d66408aced1 Author: Noel Grandin <[email protected]> AuthorDate: Mon Sep 1 13:44:29 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Mon Sep 1 22:26:58 2025 +0200 BitmapEx->Bitmap in GlowPrimitive2D now that Bitmap supports transparency Change-Id: Id5d99268b832d832572153fb82991511be431531 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190485 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/drawinglayer/source/primitive2d/glowprimitive2d.cxx b/drawinglayer/source/primitive2d/glowprimitive2d.cxx index d1e094017cef..5f565c28341f 100644 --- a/drawinglayer/source/primitive2d/glowprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/glowprimitive2d.cxx @@ -163,7 +163,7 @@ void GlowPrimitive2D::create2DDecomposition( new primitive2d::TransformPrimitive2D(aEmbedding, Primitive2DContainer(getChildren()))); primitive2d::Primitive2DContainer xEmbedSeq{ xEmbedRef }; - // Create BitmapEx using drawinglayer tooling, including a MaximumQuadraticPixel + // Create Bitmap using drawinglayer tooling, including a MaximumQuadraticPixel // limitation to be safe and not go runtime/memory havoc. Use a pretty small // limit due to this is glow functionality and will look good with bitmap scaling // anyways. The value of 250.000 square pixels below maybe adapted as needed. @@ -217,7 +217,7 @@ void GlowPrimitive2D::create2DDecomposition( // The end result is the bitmap filled with glow color and blurred 8-bit alpha mask Bitmap bmp(aAlpha.GetSizePixel(), vcl::PixelFormat::N24_BPP); bmp.Erase(getGlowColor()); - BitmapEx result(bmp, mask); + Bitmap result(bmp, mask); #ifdef DBG_UTIL static bool bDoSaveForVisualControl(false); // loplugin:constvars:ignore @@ -229,7 +229,7 @@ void GlowPrimitive2D::create2DDecomposition( { SvFileStream aNew(sDumpPath + "test_glow.png", StreamMode::WRITE | StreamMode::TRUNC); vcl::PngImageWriter aPNGWriter(aNew); - aPNGWriter.write(Bitmap(result)); + aPNGWriter.write(result); } } #endif @@ -237,10 +237,10 @@ void GlowPrimitive2D::create2DDecomposition( // Independent from discrete sizes of glow alpha creation, always // map and project glow result to geometry range extended by glow // radius, but to the eventually clipped instance (ClippedRange) - const primitive2d::Primitive2DReference xEmbedRefBitmap(new BitmapPrimitive2D( - Bitmap(result), basegfx::utils::createScaleTranslateB2DHomMatrix( - aClippedRange.getWidth(), aClippedRange.getHeight(), - aClippedRange.getMinX(), aClippedRange.getMinY()))); + const primitive2d::Primitive2DReference xEmbedRefBitmap( + new BitmapPrimitive2D(result, basegfx::utils::createScaleTranslateB2DHomMatrix( + aClippedRange.getWidth(), aClippedRange.getHeight(), + aClippedRange.getMinX(), aClippedRange.getMinY()))); rContainer = primitive2d::Primitive2DContainer{ xEmbedRefBitmap }; } commit 7c0163e0cbc7c13a6a7c7be32313347fce35b419 Author: Noel Grandin <[email protected]> AuthorDate: Mon Sep 1 13:40:50 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Mon Sep 1 22:26:49 2025 +0200 BitmapEx->Bitmap in some comments leftover from earlier conversion Change-Id: I8d2f5a79709ef0975c444697f67e762a4cc9b28d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190484 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx index 0a5a5060b0cb..0f0d3771867f 100644 --- a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx @@ -79,7 +79,7 @@ GraphicPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D&) co const bool isDrawMode(GraphicDrawMode::Standard != getGraphicAttr().GetDrawMode()); // I have now added buffering BColorModifierStack-adapted Bitmaps, - // see BitmapEx::ModifyBitmapEx, thus the primitive case is fast now. + // see Bitmap::Modify, thus the primitive case is fast now. // It buffers the adapted bitmap and at that the SDPRs can then buffer // the system-dependent representation. // I keep the code below (adding a static switch). It modifies the diff --git a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx index 2ba6cdf2b8a7..b57f0fabbdf8 100644 --- a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx @@ -493,7 +493,7 @@ namespace drawinglayer::primitive2d } else { - // use default 3D primitive processor to create BitmapEx for aUnitVisiblePart and process + // use default 3D primitive processor to create Bitmap for aUnitVisiblePart and process processor3d::ZBufferProcessor3D aZBufferProcessor3D( aViewInformation3D, getSdrSceneAttribute(), diff --git a/drawinglayer/source/processor2d/SDPRProcessor2dTools.cxx b/drawinglayer/source/processor2d/SDPRProcessor2dTools.cxx index b70aa691d2a7..6cd60cd1cb13 100644 --- a/drawinglayer/source/processor2d/SDPRProcessor2dTools.cxx +++ b/drawinglayer/source/processor2d/SDPRProcessor2dTools.cxx @@ -240,7 +240,7 @@ bool prepareBitmapForDirectRender( // The Bitmap may be created here exactly for the needed target size // (using local D2DBitmapPixelProcessor2D and the vector data), // but since we have a HW renderer and re-use of system-dependent data - // at BitmapEx is possible, just get the default fallback Bitmap from the + // at Bitmap is possible, just get the default fallback Bitmap from the // vector data to continue. Trust the existing converters for now to // do something with good quality. rTarget = rGraphic.GetBitmap(); diff --git a/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx b/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx index d0f70a509177..c54a223c1e5c 100644 --- a/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx +++ b/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx @@ -425,7 +425,7 @@ class CairoSurfaceHelper // evtl. MipMapped data (pre-scale to reduce data processing load) mutable std::unordered_map<sal_uInt64, cairo_surface_t*> maDownscaled; - // create 32bit RGBA data for given BitmapEx + // create 32bit RGBA data for given Bitmap void createRGBA(const Bitmap& rBitmap) { BitmapScopedReadAccess pReadAccess(rBitmap); @@ -461,7 +461,7 @@ class CairoSurfaceHelper cairo_surface_mark_dirty(mpCairoSurface); } - // create 32bit RGB data for given BitmapEx + // create 32bit RGB data for given Bitmap void createRGB(const Bitmap& rBitmap) { BitmapScopedReadAccess pReadAccess(rBitmap); @@ -498,8 +498,8 @@ class CairoSurfaceHelper // #define TEST_RGB16 #ifdef TEST_RGB16 - // experimental: create 16bit RGB data for given BitmapEx - void createRGB16(const BitmapEx& rBitmap) + // experimental: create 16bit RGB data for given Bitmap + void createRGB16(const Bitmap& rBitmap) { BitmapScopedReadAccess pReadAccess(rBitmap); const tools::Long nHeight(pReadAccess->Height()); @@ -1129,7 +1129,7 @@ CairoPixelProcessor2D::~CairoPixelProcessor2D() Bitmap CairoPixelProcessor2D::extractBitmap() const { - // default is empty BitmapEx + // default is empty Bitmap Bitmap aRetval; if (nullptr == mpRT) @@ -1345,14 +1345,14 @@ void CairoPixelProcessor2D::paintBitmapAlpha(const Bitmap& rBitmap, std::shared_ptr<CairoSurfaceHelper> aCairoSurfaceHelper(getOrCreateCairoSurfaceHelper(aBitmap)); if (!aCairoSurfaceHelper) { - SAL_WARN("drawinglayer", "SDPRCairo: No SurfaceHelper from BitmapEx (!)"); + SAL_WARN("drawinglayer", "SDPRCairo: No SurfaceHelper from Bitmap (!)"); return; } cairo_surface_t* pTarget(aCairoSurfaceHelper->getCairoSurface(nDestWidth, nDestHeight)); if (nullptr == pTarget) { - SAL_WARN("drawinglayer", "SDPRCairo: No CairoSurface from BitmapEx SurfaceHelper (!)"); + SAL_WARN("drawinglayer", "SDPRCairo: No CairoSurface from Bitmap SurfaceHelper (!)"); return; } @@ -2133,7 +2133,7 @@ void CairoPixelProcessor2D::processMarkerArrayPrimitive2D( std::shared_ptr<CairoSurfaceHelper> aCairoSurfaceHelper(getOrCreateCairoSurfaceHelper(aBitmap)); if (!aCairoSurfaceHelper) { - SAL_WARN("drawinglayer", "SDPRCairo: No SurfaceHelper from BitmapEx (!)"); + SAL_WARN("drawinglayer", "SDPRCairo: No SurfaceHelper from Bitmap (!)"); return; } @@ -2141,7 +2141,7 @@ void CairoPixelProcessor2D::processMarkerArrayPrimitive2D( cairo_surface_t* pTarget(aCairoSurfaceHelper->getCairoSurface()); if (nullptr == pTarget) { - SAL_WARN("drawinglayer", "SDPRCairo: No CairoSurface from BitmapEx SurfaceHelper (!)"); + SAL_WARN("drawinglayer", "SDPRCairo: No CairoSurface from Bitmap SurfaceHelper (!)"); return; } @@ -2590,14 +2590,14 @@ void CairoPixelProcessor2D::processFillGraphicPrimitive2D( getOrCreateCairoSurfaceHelper(aPreparedBitmap)); if (!aCairoSurfaceHelper) { - SAL_WARN("drawinglayer", "SDPRCairo: No SurfaceHelper from BitmapEx (!)"); + SAL_WARN("drawinglayer", "SDPRCairo: No SurfaceHelper from Bitmap (!)"); return; } cairo_surface_t* pTarget(aCairoSurfaceHelper->getCairoSurface(nDestWidth, nDestHeight)); if (nullptr == pTarget) { - SAL_WARN("drawinglayer", "SDPRCairo: No CairoSurface from BitmapEx SurfaceHelper (!)"); + SAL_WARN("drawinglayer", "SDPRCairo: No CairoSurface from Bitmap SurfaceHelper (!)"); return; } diff --git a/drawinglayer/source/processor2d/hittestprocessor2d.cxx b/drawinglayer/source/processor2d/hittestprocessor2d.cxx index 488b9ac97781..f67b4c6fe878 100644 --- a/drawinglayer/source/processor2d/hittestprocessor2d.cxx +++ b/drawinglayer/source/processor2d/hittestprocessor2d.cxx @@ -148,8 +148,8 @@ namespace drawinglayer::processor2d { if(!getHitTextOnly()) { - // The recently added BitmapEx::GetTransparency() makes it easy to extend - // the BitmapPrimitive2D HitTest to take the contained BitmapEx and it's + // The recently added Bitmap::GetTransparency() makes it easy to extend + // the BitmapPrimitive2D HitTest to take the contained Bitmap and it's // transparency into account if(!aRange.isEmpty()) { diff --git a/drawinglayer/source/processor2d/processor2dtools.cxx b/drawinglayer/source/processor2d/processor2dtools.cxx index 54f3840699e4..366e2ed469f7 100644 --- a/drawinglayer/source/processor2d/processor2dtools.cxx +++ b/drawinglayer/source/processor2d/processor2dtools.cxx @@ -175,7 +175,7 @@ Bitmap extractBitmapFromBaseProcessor2D(const std::unique_ptr<BaseProcessor2D>& // avoid unused parameter errors (void)rProcessor; - // default: return empty BitmapEx + // default: return empty Bitmap return aRetval; } diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx index 56baa0c58453..7d8c1f93647c 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx @@ -789,7 +789,7 @@ void VclMetafileProcessor2D::processBasePrimitive2D(const primitive2d::BasePrimi } case PRIMITIVE2D_ID_BITMAPPRIMITIVE2D: { - // direct draw of transformed BitmapEx primitive; use default processing, but without + // direct draw of transformed Bitmap primitive; use default processing, but without // former testing if graphic content is inside discrete local viewport; this is not // setup for metafile targets (metafile renderer tries to render in logic coordinates, // the mapping is kept to the OutputDevice for better Metafile recording) diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx index 9e4be16ef399..90dd5c5fb420 100644 --- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx @@ -214,7 +214,7 @@ void VclPixelProcessor2D::processBasePrimitive2D(const primitive2d::BasePrimitiv } case PRIMITIVE2D_ID_BITMAPPRIMITIVE2D: { - // direct draw of transformed BitmapEx primitive + // direct draw of transformed Bitmap primitive processBitmapPrimitive2D( static_cast<const primitive2d::BitmapPrimitive2D&>(rCandidate)); break; diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx index 69d2ee8cbf93..b3f319f51d8f 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx @@ -512,7 +512,7 @@ void VclProcessor2D::RenderPolygonHairlinePrimitive2D( mpOutputDevice->DrawPolyLine(aLocalPolygon, 0.0); } -// direct draw of transformed BitmapEx primitive +// direct draw of transformed Bitmap primitive void VclProcessor2D::RenderBitmapPrimitive2D(const primitive2d::BitmapPrimitive2D& rBitmapCandidate) { Bitmap aBitmap(rBitmapCandidate.getBitmap()); diff --git a/drawinglayer/source/tools/converters.cxx b/drawinglayer/source/tools/converters.cxx index 33861573ac94..69c888213c84 100644 --- a/drawinglayer/source/tools/converters.cxx +++ b/drawinglayer/source/tools/converters.cxx @@ -176,7 +176,7 @@ Bitmap convertToBitmap(drawinglayer::primitive2d::Primitive2DContainer&& rSeq, // render content pRGBAProcessor->process(aSequence); - // create final BitmapEx result (content) + // create final Bitmap result (content) const Bitmap aRetval(processor2d::extractBitmapFromBaseProcessor2D(pRGBAProcessor)); // check if we have a result and return if so @@ -243,7 +243,7 @@ Bitmap convertToBitmap(drawinglayer::primitive2d::Primitive2DContainer&& rSeq, // render content pContentProcessor->process(aSequence); - // create final BitmapEx result (content) + // create final Bitmap result (content) Bitmap aRetval(pContent->GetBitmap(aEmptyPoint, aSizePixel)); #ifdef DBG_UTIL
