From 85c4308da13f45a481ccd169df67a2eb73839c67 Mon Sep 17 00:00:00 2001 From: Jabiertxof Date: Thu, 24 Feb 2022 10:00:31 +0100 Subject: [PATCH 1/2] Sink inkscape with 2Geom Repo --- src/3rdparty/2geom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3rdparty/2geom b/src/3rdparty/2geom index 541f3a1dad..78c7c23bdc 160000 --- a/src/3rdparty/2geom +++ b/src/3rdparty/2geom @@ -1 +1 @@ -Subproject commit 541f3a1dad4a1829409dd288991525fecd410f02 +Subproject commit 78c7c23bdc1b88d7df5c7cdaa53877bdb04e2a8f -- GitLab From b19194f0cd41db531a6c01801afa985ea178ab5e Mon Sep 17 00:00:00 2001 From: Jabiertxof Date: Thu, 24 Feb 2022 17:14:37 +0100 Subject: [PATCH 2/2] Fix tests --- testfiles/src/path-boolop-test.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/testfiles/src/path-boolop-test.cpp b/testfiles/src/path-boolop-test.cpp index 4cfd7ad4a0..9f0d4537eb 100644 --- a/testfiles/src/path-boolop-test.cpp +++ b/testfiles/src/path-boolop-test.cpp @@ -56,7 +56,8 @@ TEST_F(PathBoolopTest, UnionInside){ TEST_F(PathBoolopTest, UnionInsideSwap){ // test that the union of two objects where one is completely inside the other is the larger shape, even when the order is swapped Geom::PathVector pvRectangleUnion = sp_pathvector_boolop(pvRectangleSmaller, pvRectangleBigger, bool_op_union, fill_oddEven, fill_oddEven); - comparePaths(pvRectangleUnion, pvRectangleBigger); + // reversed by 2GEOM:78c7c23bdc1b88d7df5c7cdaa53877bdb04e2a8f + comparePaths(pvRectangleUnion, pvRectangleBigger.reversed()); } TEST_F(PathBoolopTest, IntersectionInside){ @@ -74,8 +75,8 @@ TEST_F(PathBoolopTest, DifferenceInside){ TEST_F(PathBoolopTest, DifferenceOutside){ // test that the difference of two objects where one is completely outside the other is multiple shapes Geom::PathVector pvRectangleDifference = sp_pathvector_boolop(pvRectangleSmaller, pvRectangleBigger, bool_op_diff, fill_oddEven, fill_oddEven); - std::string bothPaths = rectangle_bigger + rectangle_smaller; - Geom::PathVector pvBothPaths = pvRectangleBigger; + // reversed by 2GEOM:78c7c23bdc1b88d7df5c7cdaa53877bdb04e2a8f + Geom::PathVector pvBothPaths = pvRectangleBigger.reversed(); for(Geom::Path _path : pvRectangleSmaller){ pvBothPaths.push_back(_path); -- GitLab