summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2015-04-22 18:51:06 +0000
committerJabiertxof <jtx@jtx.marker.es>2015-04-22 18:51:06 +0000
commit81dd40474313f2adbb1f59fb4ad9a38342f03752 (patch)
treec6bd75ebb6e8d7cb6f47ab8deccfbb04ff15574b /src
parentupdate to trunk (diff)
downloadinkscape-81dd40474313f2adbb1f59fb4ad9a38342f03752.tar.gz
inkscape-81dd40474313f2adbb1f59fb4ad9a38342f03752.zip
prevent overflow index on a pathinfo function
(bzr r13645.1.84)
Diffstat (limited to 'src')
-rw-r--r--src/helper/geom-pointwise.cpp25
-rw-r--r--src/helper/geom-pointwise.h1
2 files changed, 0 insertions, 26 deletions
diff --git a/src/helper/geom-pointwise.cpp b/src/helper/geom-pointwise.cpp
index 74c594d68..89bde4130 100644
--- a/src/helper/geom-pointwise.cpp
+++ b/src/helper/geom-pointwise.cpp
@@ -223,27 +223,6 @@ void Pointwise::subpathReverse(size_t start, size_t end)
setPwd2(remove_short_cuts(paths_to_pw(tmp_path), 0.01));
}
-void Pointwise::pathReverse()
-{
- start++;
- for (size_t i = _satellites.size()-1; i >= 0; i--) {
- _satellites.insert(_satellites.begin() + _satellites.size(), _satellites[i]);
- _satellites.erase(_satellites.begin() + i);
- }
- std::vector<Geom::Path> path_in =
- path_from_piecewise(remove_short_cuts(_pwd2, 0.1), 0.001);
- std::vector<Geom::Path> tmp_path;
- for (PathVector::const_iterator path_it = path_in.begin();
- path_it != path_in.end(); ++path_it) {
- if (path_it->empty()) {
- continue;
- }
- tmp_path.push_back(path_it->reverse());
- }
- setPwd2(remove_short_cuts(paths_to_pw(tmp_path), 0.01));
-}
-
-
/** Fired when a path is modified duplicating a node. Piecewise ignore degenerated curves.
*/
void Pointwise::insertDegenerateSatellites(Piecewise<D2<SBasis> > A, Geom::PathVector B, Satellite S)
@@ -253,10 +232,6 @@ void Pointwise::insertDegenerateSatellites(Piecewise<D2<SBasis> > A, Geom::PathV
size_t size_B = _path_info.size();
size_t satellite_gap = size_B - size_A;
if (satellite_gap == 0){
- if(_path_info.subPathSize(1) > 0 && !are_near(_pwd2[0].initialPoint(), A[0].initialPoint()) &&
- !are_near(_pwd2[size_A-1].finalPoint(), A[size_A-1].finalPoint())){
- pathReverse();
- }
return;
}
size_t counter = 0;
diff --git a/src/helper/geom-pointwise.h b/src/helper/geom-pointwise.h
index 590f25f6f..e4b9f2b05 100644
--- a/src/helper/geom-pointwise.h
+++ b/src/helper/geom-pointwise.h
@@ -52,7 +52,6 @@ public:
void pwd2Sustract(Piecewise<D2<SBasis> > A);
void pwd2Append(Piecewise<D2<SBasis> > A, Satellite S);
void subpathToBack(size_t subpath);
- void pathReverse();
void subpathReverse(size_t start, size_t end);
void insertDegenerateSatellites(Piecewise<D2<SBasis> > A, Geom::PathVector B, Satellite S);