From 9d9f38c875ebf9161a533e0fcaaacde3719c5a3a Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Fri, 12 May 2023 17:48:41 +0900 Subject: [PATCH] common: code refactoring Replace standard casting with tvg::cast() --- src/examples/Duplicate.cpp | 10 +-- src/examples/GradientStroke.cpp | 4 +- src/examples/Stroke.cpp | 4 +- src/savers/tvg/tvgTvgSaver.cpp | 2 +- src/wasm/thorvgwasm.cpp | 2 +- test/testFill.cpp | 4 +- test/testPaint.cpp | 2 +- test/testPicture.cpp | 2 +- test/testSwEngine.cpp | 108 ++++++++++++++++---------------- 9 files changed, 69 insertions(+), 69 deletions(-) diff --git a/src/examples/Duplicate.cpp b/src/examples/Duplicate.cpp index 8da1885a..12a7c38b 100644 --- a/src/examples/Duplicate.cpp +++ b/src/examples/Duplicate.cpp @@ -46,7 +46,7 @@ void tvgDrawCmds(tvg::Canvas* canvas) shape1->fill(255, 0, 0, 255); //Duplicate Shape, Switch fill method - auto shape2 = unique_ptr(static_cast(shape1->duplicate())); + auto shape2 = tvg::cast(shape1->duplicate()); shape2->translate(0, 220); auto fill = tvg::LinearGradient::gen(); @@ -60,7 +60,7 @@ void tvgDrawCmds(tvg::Canvas* canvas) shape2->fill(move(fill)); //Duplicate Shape 2 - auto shape3 = unique_ptr(static_cast(shape2->duplicate())); + auto shape3 = tvg::cast(shape2->duplicate()); shape3->translate(0, 440); canvas->push(move(shape1)); @@ -93,7 +93,7 @@ void tvgDrawCmds(tvg::Canvas* canvas) scene1->translate(400, 0); //Duplicate Scene1 - auto scene2 = unique_ptr(static_cast(scene1->duplicate())); + auto scene2 = tvg::cast(scene1->duplicate()); scene2->translate(600, 0); canvas->push(move(scene1)); @@ -107,7 +107,7 @@ void tvgDrawCmds(tvg::Canvas* canvas) picture1->translate(350, 200); picture1->scale(0.25); - auto picture2 = unique_ptr(static_cast(picture1->duplicate())); + auto picture2 = tvg::cast(picture1->duplicate()); picture2->translate(550, 250); canvas->push(move(picture1)); @@ -128,7 +128,7 @@ void tvgDrawCmds(tvg::Canvas* canvas) picture1->scale(0.8); picture1->translate(400, 450); - auto picture2 = unique_ptr(static_cast(picture1->duplicate())); + auto picture2 = tvg::cast(picture1->duplicate()); picture2->translate(600, 550); picture2->scale(0.7); picture2->rotate(8); diff --git a/src/examples/GradientStroke.cpp b/src/examples/GradientStroke.cpp index a0f516ef..29b1a506 100644 --- a/src/examples/GradientStroke.cpp +++ b/src/examples/GradientStroke.cpp @@ -87,7 +87,7 @@ void tvgDrawCmds(tvg::Canvas* canvas) fillStroke2->colorStops(colorStops2, 2); shape2->stroke(move(fillStroke2)); - auto shape3 = unique_ptr(static_cast(shape2->duplicate())); + auto shape3 = tvg::cast(shape2->duplicate()); shape3->translate(0, 200); auto fillStroke3 = tvg::LinearGradient::gen(); @@ -95,7 +95,7 @@ void tvgDrawCmds(tvg::Canvas* canvas) fillStroke3->colorStops(colorStops3, 2); shape3->stroke(move(fillStroke3)); - auto shape4 = unique_ptr(static_cast(shape2->duplicate())); + auto shape4 = tvg::cast(shape2->duplicate()); shape4->translate(0, 400); if (canvas->push(move(shape2)) != tvg::Result::Success) return; diff --git a/src/examples/Stroke.cpp b/src/examples/Stroke.cpp index 54c37b25..bcc69d20 100644 --- a/src/examples/Stroke.cpp +++ b/src/examples/Stroke.cpp @@ -114,8 +114,8 @@ void tvgDrawCmds(tvg::Canvas* canvas) line1->stroke(15); line1->stroke(tvg::StrokeCap::Round); - auto line2 = std::unique_ptr((tvg::Shape*)line1->duplicate()); - auto line3 = std::unique_ptr((tvg::Shape*)line1->duplicate()); + auto line2 = tvg::cast(line1->duplicate()); + auto line3 = tvg::cast(line1->duplicate()); if (canvas->push(move(line1)) != tvg::Result::Success) return; line2->stroke(tvg::StrokeCap::Square); diff --git a/src/savers/tvg/tvgTvgSaver.cpp b/src/savers/tvg/tvgTvgSaver.cpp index 41185a00..00db3314 100644 --- a/src/savers/tvg/tvgTvgSaver.cpp +++ b/src/savers/tvg/tvgTvgSaver.cpp @@ -351,7 +351,7 @@ TvgBinCounter TvgSaver::serializeChild(const Paint* parent, const Paint* child, } //propagate composition - if (compTarget) const_cast(child)->composite(unique_ptr(compTarget->duplicate()), compMethod); + if (compTarget) const_cast(child)->composite(cast(compTarget->duplicate()), compMethod); return serialize(child, transform); } diff --git a/src/wasm/thorvgwasm.cpp b/src/wasm/thorvgwasm.cpp index 98a67997..21522e82 100644 --- a/src/wasm/thorvgwasm.cpp +++ b/src/wasm/thorvgwasm.cpp @@ -144,7 +144,7 @@ public: mErrorMsg = "None"; auto saver = tvg::Saver::gen(); - auto duplicate = unique_ptr(static_cast(mPicture->duplicate())); + auto duplicate = tvg::Cast(mPicture->duplicate()); if (!saver || !duplicate) { mErrorMsg = "Saving initialization failed"; return false; diff --git a/test/testFill.cpp b/test/testFill.cpp index 4cc0af38..2cda1afe 100644 --- a/test/testFill.cpp +++ b/test/testFill.cpp @@ -194,7 +194,7 @@ TEST_CASE("Linear Filling Dupliction", "[tvgFill]") REQUIRE(fill->transform(m) == Result::Success); //Duplication - auto dup = unique_ptr(static_cast(fill->duplicate())); + auto dup = tvg::cast(fill->duplicate()); REQUIRE(dup); REQUIRE(dup->spread() == FillSpread::Reflect); @@ -249,7 +249,7 @@ TEST_CASE("Radial Filling Dupliction", "[tvgFill]") REQUIRE(fill->transform(m) == Result::Success); //Duplication - auto dup = unique_ptr(static_cast(fill->duplicate())); + auto dup = tvg::cast(fill->duplicate()); REQUIRE(dup); REQUIRE(dup->spread() == FillSpread::Reflect); diff --git a/test/testPaint.cpp b/test/testPaint.cpp index bb84fdd1..1f0c37fd 100644 --- a/test/testPaint.cpp +++ b/test/testPaint.cpp @@ -159,7 +159,7 @@ TEST_CASE("Duplication", "[tvgPaint]") REQUIRE(shape->composite(move(comp), CompositeMethod::ClipPath) == Result::Success); //Duplication - auto dup = unique_ptr((Shape*)shape->duplicate()); + auto dup = tvg::cast(shape->duplicate()); REQUIRE(dup); //Compare properties diff --git a/test/testPicture.cpp b/test/testPicture.cpp index 82a4276b..31a1a869 100644 --- a/test/testPicture.cpp +++ b/test/testPicture.cpp @@ -216,7 +216,7 @@ TEST_CASE("Picture Duplication", "[tvgPicture]") REQUIRE(picture->load(data, 200, 300, false) == Result::Success); REQUIRE(picture->size(100, 100) == Result::Success); - auto dup = unique_ptr((Picture*)picture->duplicate()); + auto dup = tvg::cast(picture->duplicate()); REQUIRE(dup); float w, h; diff --git a/test/testSwEngine.cpp b/test/testSwEngine.cpp index 4b910804..6f463c0e 100644 --- a/test/testSwEngine.cpp +++ b/test/testSwEngine.cpp @@ -125,31 +125,31 @@ TEST_CASE("Image Draw", "[tvgSwEngine]") REQUIRE(rleMask->fill(100, 100, 100, 255) == Result::Success); // Rect images - auto basicPicture2 = std::unique_ptr(static_cast(basicPicture->duplicate())); + auto basicPicture2 = tvg::cast(basicPicture->duplicate()); REQUIRE(basicPicture2); - auto rectMask2 = std::unique_ptr(static_cast(rectMask->duplicate())); + auto rectMask2 = tvg::cast(rectMask->duplicate()); REQUIRE(rectMask2); - auto basicPicture3 = std::unique_ptr(static_cast(basicPicture->duplicate())); + auto basicPicture3 = tvg::cast(basicPicture->duplicate()); REQUIRE(basicPicture3); - auto rectMask3 = std::unique_ptr(static_cast(rectMask->duplicate())); + auto rectMask3 = tvg::cast(rectMask->duplicate()); REQUIRE(rectMask3); - auto basicPicture4 = std::unique_ptr(static_cast(basicPicture->duplicate())); + auto basicPicture4 = tvg::cast(basicPicture->duplicate()); REQUIRE(basicPicture4); - auto rectMask4 = std::unique_ptr(static_cast(rectMask->duplicate())); + auto rectMask4 = tvg::cast(rectMask->duplicate()); REQUIRE(rectMask4); - auto basicPicture5 = std::unique_ptr(static_cast(basicPicture->duplicate())); + auto basicPicture5 = tvg::cast(basicPicture->duplicate()); REQUIRE(basicPicture5); // Rle images - auto basicPicture6 = std::unique_ptr(static_cast(basicPicture->duplicate())); + auto basicPicture6 = tvg::cast(basicPicture->duplicate()); REQUIRE(basicPicture6); - auto basicPicture7 = std::unique_ptr(static_cast(basicPicture->duplicate())); + auto basicPicture7 = tvg::cast(basicPicture->duplicate()); REQUIRE(basicPicture7); - auto rleMask7 = std::unique_ptr(static_cast(rleMask->duplicate())); + auto rleMask7 = tvg::cast(rleMask->duplicate()); REQUIRE(rleMask7); // Rect @@ -191,31 +191,31 @@ TEST_CASE("Image Draw", "[tvgSwEngine]") REQUIRE(rleMask->appendRect(0, 10, 20, 30, 5, 5) == Result::Success); // Rect images - basicPicture2 = std::unique_ptr(static_cast(basicPicture->duplicate())); + basicPicture2 = tvg::cast(basicPicture->duplicate()); REQUIRE(basicPicture2); - rectMask2 = std::unique_ptr(static_cast(rectMask->duplicate())); + rectMask2 = tvg::cast(rectMask->duplicate()); REQUIRE(rectMask2); - basicPicture3 = std::unique_ptr(static_cast(basicPicture->duplicate())); + basicPicture3 = tvg::cast(basicPicture->duplicate()); REQUIRE(basicPicture3); - rectMask3 = std::unique_ptr(static_cast(rectMask->duplicate())); + rectMask3 = tvg::cast(rectMask->duplicate()); REQUIRE(rectMask3); - basicPicture4 = std::unique_ptr(static_cast(basicPicture->duplicate())); + basicPicture4 = tvg::cast(basicPicture->duplicate()); REQUIRE(basicPicture4); - rectMask4 = std::unique_ptr(static_cast(rectMask->duplicate())); + rectMask4 = tvg::cast(rectMask->duplicate()); REQUIRE(rectMask4); - basicPicture5 = std::unique_ptr(static_cast(basicPicture->duplicate())); + basicPicture5 = tvg::cast(basicPicture->duplicate()); REQUIRE(basicPicture5); // Rle images - basicPicture6 = std::unique_ptr(static_cast(basicPicture->duplicate())); + basicPicture6 = tvg::cast(basicPicture->duplicate()); REQUIRE(basicPicture6); - basicPicture7 = std::unique_ptr(static_cast(basicPicture->duplicate())); + basicPicture7 = tvg::cast(basicPicture->duplicate()); REQUIRE(basicPicture7); - rleMask7 = std::unique_ptr(static_cast(rleMask->duplicate())); + rleMask7 = tvg::cast(rleMask->duplicate()); REQUIRE(rleMask7); // Rect @@ -256,31 +256,31 @@ TEST_CASE("Image Draw", "[tvgSwEngine]") REQUIRE(rleMask->appendRect(0, 10, 20, 30, 5, 5) == Result::Success); // Rect images - basicPicture2 = std::unique_ptr(static_cast(basicPicture->duplicate())); + basicPicture2 = tvg::cast(basicPicture->duplicate()); REQUIRE(basicPicture2); - rectMask2 = std::unique_ptr(static_cast(rectMask->duplicate())); + rectMask2 = tvg::cast(rectMask->duplicate()); REQUIRE(rectMask2); - basicPicture3 = std::unique_ptr(static_cast(basicPicture->duplicate())); + basicPicture3 = tvg::cast(basicPicture->duplicate()); REQUIRE(basicPicture3); - rectMask3 = std::unique_ptr(static_cast(rectMask->duplicate())); + rectMask3 = tvg::cast(rectMask->duplicate()); REQUIRE(rectMask3); - basicPicture4 = std::unique_ptr(static_cast(basicPicture->duplicate())); + basicPicture4 = tvg::cast(basicPicture->duplicate()); REQUIRE(basicPicture4); - rectMask4 = std::unique_ptr(static_cast(rectMask->duplicate())); + rectMask4 = tvg::cast(rectMask->duplicate()); REQUIRE(rectMask4); - basicPicture5 = std::unique_ptr(static_cast(basicPicture->duplicate())); + basicPicture5 = tvg::cast(basicPicture->duplicate()); REQUIRE(basicPicture5); // Rle images - basicPicture6 = std::unique_ptr(static_cast(basicPicture->duplicate())); + basicPicture6 = tvg::cast(basicPicture->duplicate()); REQUIRE(basicPicture6); - basicPicture7 = std::unique_ptr(static_cast(basicPicture->duplicate())); + basicPicture7 = tvg::cast(basicPicture->duplicate()); REQUIRE(basicPicture7); - rleMask7 = std::unique_ptr(static_cast(rleMask->duplicate())); + rleMask7 = tvg::cast(rleMask->duplicate()); REQUIRE(rleMask7); // Rect @@ -321,31 +321,31 @@ TEST_CASE("Image Draw", "[tvgSwEngine]") REQUIRE(rleMask->appendRect(0, 10, 20, 30, 5, 5) == Result::Success); // Rect images - basicPicture2 = std::unique_ptr(static_cast(basicPicture->duplicate())); + basicPicture2 = tvg::cast(basicPicture->duplicate()); REQUIRE(basicPicture2); - rectMask2 = std::unique_ptr(static_cast(rectMask->duplicate())); + rectMask2 = tvg::cast(rectMask->duplicate()); REQUIRE(rectMask2); - basicPicture3 = std::unique_ptr(static_cast(basicPicture->duplicate())); + basicPicture3 = tvg::cast(basicPicture->duplicate()); REQUIRE(basicPicture3); - rectMask3 = std::unique_ptr(static_cast(rectMask->duplicate())); + rectMask3 = tvg::cast(rectMask->duplicate()); REQUIRE(rectMask3); - basicPicture4 = std::unique_ptr(static_cast(basicPicture->duplicate())); + basicPicture4 = tvg::cast(basicPicture->duplicate()); REQUIRE(basicPicture4); - rectMask4 = std::unique_ptr(static_cast(rectMask->duplicate())); + rectMask4 = tvg::cast(rectMask->duplicate()); REQUIRE(rectMask4); - basicPicture5 = std::unique_ptr(static_cast(basicPicture->duplicate())); + basicPicture5 = tvg::cast(basicPicture->duplicate()); REQUIRE(basicPicture5); // Rle images - basicPicture6 = std::unique_ptr(static_cast(basicPicture->duplicate())); + basicPicture6 = tvg::cast(basicPicture->duplicate()); REQUIRE(basicPicture6); - basicPicture7 = std::unique_ptr(static_cast(basicPicture->duplicate())); + basicPicture7 = tvg::cast(basicPicture->duplicate()); REQUIRE(basicPicture7); - rleMask7 = std::unique_ptr(static_cast(rleMask->duplicate())); + rleMask7 = tvg::cast(rleMask->duplicate()); REQUIRE(rleMask7); // Rect @@ -401,22 +401,22 @@ TEST_CASE("Rect Draw", "[tvgSwEngine]") REQUIRE(basicMask->appendRect(10, 10, 30, 30, 0, 0) == Result::Success); REQUIRE(basicShape->fill(255, 255, 255, 155) == Result::Success); - auto basicShape2 = std::unique_ptr(static_cast(basicShape->duplicate())); + auto basicShape2 = tvg::cast(basicShape->duplicate()); REQUIRE(basicShape2); - auto basicMask2 = std::unique_ptr(static_cast(basicMask->duplicate())); + auto basicMask2 = tvg::cast(basicMask->duplicate()); REQUIRE(basicMask2); - auto basicShape3 = std::unique_ptr(static_cast(basicShape->duplicate())); + auto basicShape3 = tvg::cast(basicShape->duplicate()); REQUIRE(basicShape3); - auto basicMask3 = std::unique_ptr(static_cast(basicMask->duplicate())); + auto basicMask3 = tvg::cast(basicMask->duplicate()); REQUIRE(basicMask3); - auto basicShape4 = std::unique_ptr(static_cast(basicShape->duplicate())); + auto basicShape4 = tvg::cast(basicShape->duplicate()); REQUIRE(basicShape4); - auto basicMask4 = std::unique_ptr(static_cast(basicMask->duplicate())); + auto basicMask4 = tvg::cast(basicMask->duplicate()); REQUIRE(basicMask4); - auto basicShape5 = std::unique_ptr(static_cast(basicShape->duplicate())); + auto basicShape5 = tvg::cast(basicShape->duplicate()); REQUIRE(basicShape5); REQUIRE(basicShape->composite(move(basicMask), tvg::CompositeMethod::AlphaMask) == Result::Success); @@ -460,22 +460,22 @@ TEST_CASE("RLE Draw", "[tvgSwEngine]") REQUIRE(basicMask->appendRect(10, 10, 30, 30, 0, 0) == Result::Success); REQUIRE(basicShape->fill(255, 255, 255, 100) == Result::Success); - auto basicShape2 = std::unique_ptr(static_cast(basicShape->duplicate())); + auto basicShape2 = tvg::cast(basicShape->duplicate()); REQUIRE(basicShape2); - auto basicMask2 = std::unique_ptr(static_cast(basicMask->duplicate())); + auto basicMask2 = tvg::cast(basicMask->duplicate()); REQUIRE(basicMask2); - auto basicShape3 = std::unique_ptr(static_cast(basicShape->duplicate())); + auto basicShape3 = tvg::cast(basicShape->duplicate()); REQUIRE(basicShape3); - auto basicMask3 = std::unique_ptr(static_cast(basicMask->duplicate())); + auto basicMask3 = tvg::cast(basicMask->duplicate()); REQUIRE(basicMask3); - auto basicShape4 = std::unique_ptr(static_cast(basicShape->duplicate())); + auto basicShape4 = tvg::cast(basicShape->duplicate()); REQUIRE(basicShape4); - auto basicMask4 = std::unique_ptr(static_cast(basicMask->duplicate())); + auto basicMask4 = tvg::cast(basicMask->duplicate()); REQUIRE(basicMask4); - auto basicShape5 = std::unique_ptr(static_cast(basicShape->duplicate())); + auto basicShape5 = tvg::cast(basicShape->duplicate()); REQUIRE(basicShape5); REQUIRE(basicShape->composite(move(basicMask), tvg::CompositeMethod::AlphaMask) == Result::Success);