Erase rejected files

2 files changed, 0 insertions, 79 deletions

diff --git a/src/helper/geom-pathvectorsatellites.cpp.rej b/src/helper/geom-pathvectorsatellites.cpp.rej
deleted file mode 100644
index a480c16f5..000000000
--- a/src/helper/geom-pathvectorsatellites.cpp.rej
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/helper/geom-pathvectorsatellites.cpp
-+++ src/helper/geom-pathvectorsatellites.cpp
-@@ -41,7 +41,7 @@ size_t PathVectorSatellites::getTotalSatellites()
- {
-     size_t counter = 0;
-     for (size_t i = 0; i < _satellites.size(); ++i) {
--        for (size_t j = 0; j < _satellites[i].size(); ++j) {
-+        for (size_t j = 0; j < _satellites[i].size(); ++j) { 
-             counter++;
-         }
-     }
-@@ -204,10 +204,24 @@ void PathVectorSatellites::recalculateForNewPathVector(Geom::PathVector const pa
-     size_t previous_number_nodes = _pathvector.nodes().size();
-     for (size_t i = 0; i < pathv.size(); i++) {
-         std::vector<Satellite> path_satellites;
--        for (size_t j = 0; j < pathv[i].size_closed(); j++) {
-+        size_t count = pathv[i].size_default();
-+        if ( pathv[i].closed()) {
-+          const Geom::Curve &closingline = pathv[i].back_closed(); 
-+          if (are_near(closingline.initialPoint(), closingline.finalPoint())) {
-+            count = pathv[i].size_open();
-+          }
-+        }
-+        for (size_t j = 0; j < count; j++) {
-             found = false;
-             for (size_t k = 0; k < _pathvector.size(); k++) {
--                for (size_t l = 0; l < _pathvector[k].size_closed(); l++) {
-+                size_t count2 = _pathvector[k].size_default();
-+                if ( _pathvector[k].closed()) {
-+                  const Geom::Curve &closingline = _pathvector[k].back_closed(); 
-+                  if (are_near(closingline.initialPoint(), closingline.finalPoint())) {
-+                    count2 = _pathvector[k].size_open();
-+                  }
-+                }
-+                for (size_t l = 0; l < count2; l++) {
-                     if (Geom::are_near(_pathvector[k][l].initialPoint(),  pathv[i][j].initialPoint()))
-                     {
-                         path_satellites.push_back(_satellites[k][l]);
diff --git a/src/live_effects/lpe-fillet-chamfer.cpp.rej b/src/live_effects/lpe-fillet-chamfer.cpp.rej
deleted file mode 100644
index 8a754993d..000000000
--- a/src/live_effects/lpe-fillet-chamfer.cpp.rej
+++ /dev/null
@@ -1,41 +0,0 @@
---- src/live_effects/lpe-fillet-chamfer.cpp
-+++ src/live_effects/lpe-fillet-chamfer.cpp
-@@ -338,11 +338,11 @@ void LPEFilletChamfer::doBeforeEffect(SPLPEItem const *lpeItem)
-             doOnApply(lpeItem);
-             satellites = satellites_param.data();
-         }
-+        bool write = false;
-         if (_pathvector_satellites) {
-             size_t number_nodes = pathv.nodes().size();
-             size_t previous_number_nodes = _pathvector_satellites->getTotalSatellites();
-             if (number_nodes != previous_number_nodes) {
--                Satellites satellites;
-                 double power = radius;
-                 if (!flexible) {
-                     SPDocument * document = SP_ACTIVE_DOCUMENT;
-@@ -367,6 +367,7 @@ void LPEFilletChamfer::doBeforeEffect(SPLPEItem const *lpeItem)
-                 satellite.setHidden(hide_knots);
-                 _pathvector_satellites->recalculateForNewPathVector(pathv, satellite);
-                 satellites = _pathvector_satellites->getSatellites();
-+                write = true;
-             }
-         }
-         if (_degenerate_hide) {
-@@ -410,7 +411,7 @@ void LPEFilletChamfer::doBeforeEffect(SPLPEItem const *lpeItem)
-         }
-         _pathvector_satellites->setPathVector(pathv);
-         _pathvector_satellites->setSatellites(satellites);
--        satellites_param.setPathVectorSatellites(_pathvector_satellites, false);
-+        satellites_param.setPathVectorSatellites(_pathvector_satellites, write);
-         refreshKnots();
-     } else {
-         g_warning("LPE Fillet can only be applied to shapes (not groups).");
-@@ -549,7 +550,7 @@ LPEFilletChamfer::doEffect_path(Geom::PathVector const &path_in)
-             if (time1 == time0) {
-                 start_arc_point = curve_it1->pointAt(time0);
-             }
--            if (time1 != 1) {
-+            if (time1 != 1 && !Geom::are_near(angle,Geom::rad_from_deg(360))) {
-                 if (time1 != time0 || (time1 == 1 && time0 == 1)) {
-                     if (!knot_curve_1->isDegenerate()) {
-                         tmp_path.append(*knot_curve_1);