drawinglayer/source/processor2d/cairopixelprocessor2d.cxx | 10 +++++----- include/drawinglayer/processor2d/cairopixelprocessor2d.hxx | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)
New commits: commit 3c6e5d3750fd9c31bd374808c984374bf30e4d28 Author: Julien Nabet <serval2...@yahoo.fr> AuthorDate: Tue Sep 3 18:09:21 2024 +0200 Commit: Julien Nabet <serval2...@yahoo.fr> CommitDate: Wed Sep 4 08:08:56 2024 +0200 Typo mnClipRecurstionCount->mnClipRecursionCount Change-Id: I7ce859d402626da156ff36247d987a3fe3010e47 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172837 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2...@yahoo.fr> diff --git a/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx b/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx index 7f9b88dd59a5..fe7352e104b0 100644 --- a/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx +++ b/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx @@ -874,7 +874,7 @@ CairoPixelProcessor2D::CairoPixelProcessor2D(const geometry::ViewInformation2D& officecfg::Office::Common::Drawinglayer::RenderSimpleTextDirect::get()) , mbRenderDecoratedTextDirect( officecfg::Office::Common::Drawinglayer::RenderDecoratedTextDirect::get()) - , mnClipRecurstionCount(0) + , mnClipRecursionCount(0) { if (pTarget) { @@ -1490,13 +1490,13 @@ void CairoPixelProcessor2D::processMaskPrimitive2D( cairo_identity_matrix(mpRT); // process sub-content (that shall be masked) - mnClipRecurstionCount++; + mnClipRecursionCount++; process(rMaskCandidate.getChildren()); - mnClipRecurstionCount--; + mnClipRecursionCount--; cairo_restore(mpRT); - if (0 == mnClipRecurstionCount) + if (0 == mnClipRecursionCount) { // for *some* reason Cairo seems to have problems using cairo_clip // recursively, in combination with cairo_save/cairo_restore. I think diff --git a/include/drawinglayer/processor2d/cairopixelprocessor2d.hxx b/include/drawinglayer/processor2d/cairopixelprocessor2d.hxx index f654b52c58f0..944dc74c7172 100644 --- a/include/drawinglayer/processor2d/cairopixelprocessor2d.hxx +++ b/include/drawinglayer/processor2d/cairopixelprocessor2d.hxx @@ -77,7 +77,7 @@ class UNLESS_MERGELIBS(DRAWINGLAYER_DLLPUBLIC) CairoPixelProcessor2D final : pub // recursion counter for CairoPixelProcessor2D::processMaskPrimitive2D, // see comment there - sal_uInt16 mnClipRecurstionCount; + sal_uInt16 mnClipRecursionCount; // helpers for direct paints void paintPolyPoylgonRGBA(const basegfx::B2DPolyPolygon& rPolyPolygon, commit 7f50a49e6395dc36f97fda0082883e5981d1315a Author: Andrea Gelmini <andrea.gelm...@gelma.net> AuthorDate: Tue Sep 3 18:59:10 2024 +0200 Commit: Julien Nabet <serval2...@yahoo.fr> CommitDate: Wed Sep 4 08:08:44 2024 +0200 Fix typo Change-Id: I24b0dc42a8b710aaa502f590a7071e463d1aeb14 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172841 Reviewed-by: Julien Nabet <serval2...@yahoo.fr> Tested-by: Julien Nabet <serval2...@yahoo.fr> diff --git a/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx b/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx index 34438eb95f95..7f9b88dd59a5 100644 --- a/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx +++ b/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx @@ -1502,7 +1502,7 @@ void CairoPixelProcessor2D::processMaskPrimitive2D( // recursively, in combination with cairo_save/cairo_restore. I think // it *should* work as used here, see // https://www.cairographics.org/manual/cairo-cairo-t.html#cairo-clip - // where this combination is explicitely mentioned/explained. It may + // where this combination is explicitly mentioned/explained. It may // just be a error in cairo, too (?). // The error is that without that for some reason the last clip is not // restored but *stays*, so e.g. when having a shape filled with