diff options
| -rw-r--r-- | basegfx/source/polygon/b2dpolypolygoncutter.cxx | 4 | ||||
| -rw-r--r-- | include/basegfx/polygon/b2dpolypolygoncutter.hxx | 2 | ||||
| -rw-r--r-- | svgio/source/svgreader/svgclippathnode.cxx | 2 | ||||
| -rw-r--r-- | svgio/source/svgreader/svgstyleattributes.cxx | 4 | ||||
| -rw-r--r-- | vcl/skia/gdiimpl.cxx | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/basegfx/source/polygon/b2dpolypolygoncutter.cxx b/basegfx/source/polygon/b2dpolypolygoncutter.cxx index f314fcb716cc..9d3cd7b450df 100644 --- a/basegfx/source/polygon/b2dpolypolygoncutter.cxx +++ b/basegfx/source/polygon/b2dpolypolygoncutter.cxx @@ -1067,9 +1067,9 @@ namespace basegfx::utils } } - B2DPolyPolygon mergeToSinglePolyPolygon(const B2DPolyPolygonVector& rInput) + B2DPolyPolygon mergeToSinglePolyPolygon(B2DPolyPolygonVector&& rInput) { - B2DPolyPolygonVector aInput(rInput); + B2DPolyPolygonVector aInput(std::move(rInput)); // first step: prepareForPolygonOperation and simple merge of non-overlapping // PolyPolygons for speedup; this is possible for the wanted OR-operation diff --git a/include/basegfx/polygon/b2dpolypolygoncutter.hxx b/include/basegfx/polygon/b2dpolypolygoncutter.hxx index a5f4ba6626af..864d84643281 100644 --- a/include/basegfx/polygon/b2dpolypolygoncutter.hxx +++ b/include/basegfx/polygon/b2dpolypolygoncutter.hxx @@ -136,7 +136,7 @@ namespace basegfx::utils @return A single tools::PolyPolygon containing the Or-merged result */ - BASEGFX_DLLPUBLIC B2DPolyPolygon mergeToSinglePolyPolygon(const B2DPolyPolygonVector& rInput); + BASEGFX_DLLPUBLIC B2DPolyPolygon mergeToSinglePolyPolygon(B2DPolyPolygonVector&& rInput); } // end of namespace basegfx::utils diff --git a/svgio/source/svgreader/svgclippathnode.cxx b/svgio/source/svgreader/svgclippathnode.cxx index 31ac632d33dc..7f4b4beae8ec 100644 --- a/svgio/source/svgreader/svgclippathnode.cxx +++ b/svgio/source/svgreader/svgclippathnode.cxx @@ -148,7 +148,7 @@ namespace svgio::svgreader if(nSize > 1) { // merge to single clipPolyPolygon - aClipPolyPolygon = basegfx::utils::mergeToSinglePolyPolygon(rResult); + aClipPolyPolygon = basegfx::utils::mergeToSinglePolyPolygon(std::vector(rResult)); } else { diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx index 62133fbb11fb..8a61d2e9dfe6 100644 --- a/svgio/source/svgreader/svgstyleattributes.cxx +++ b/svgio/source/svgreader/svgstyleattributes.cxx @@ -303,7 +303,7 @@ namespace svgio::svgreader if(!aTextFillVector.empty()) { - aMergedArea = basegfx::utils::mergeToSinglePolyPolygon(aTextFillVector); + aMergedArea = basegfx::utils::mergeToSinglePolyPolygon(std::move(aTextFillVector)); } } @@ -762,7 +762,7 @@ namespace svgio::svgreader { const basegfx::B2DPolyPolygon aMergedArea( basegfx::utils::mergeToSinglePolyPolygon( - rLineFillVector)); + std::vector(rLineFillVector))); if(aMergedArea.count()) { diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx index c580471a9608..00bbbe6660c3 100644 --- a/vcl/skia/gdiimpl.cxx +++ b/vcl/skia/gdiimpl.cxx @@ -1070,8 +1070,8 @@ void SkiaSalGraphicsImpl::checkPendingDrawing() { for (basegfx::B2DPolyPolygon& p : polygons) roundPolygonPoints(p); - performDrawPolyPolygon(basegfx::utils::mergeToSinglePolyPolygon(polygons), transparency, - true); + performDrawPolyPolygon(basegfx::utils::mergeToSinglePolyPolygon(std::move(polygons)), + transparency, true); } } } |