diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2014-04-09 10:45:20 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2014-04-09 10:45:20 +0000 |
| commit | f0c6ea33bcb5a03352f6276bac82d56c39c3f5fe (patch) | |
| tree | 28159b96674a5c003fb36948ff04f3eaae3ec864 /src/2geom | |
| parent | Refactor of end anchors. (diff) | |
| parent | Make extension tests compatible with VPATH builds. (diff) | |
| download | inkscape-f0c6ea33bcb5a03352f6276bac82d56c39c3f5fe.tar.gz inkscape-f0c6ea33bcb5a03352f6276bac82d56c39c3f5fe.zip | |
update to trunk
(bzr r11950.1.326)
Diffstat (limited to 'src/2geom')
| -rw-r--r-- | src/2geom/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/2geom/path.cpp | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/2geom/CMakeLists.txt b/src/2geom/CMakeLists.txt index b1c30f678..3d516dc18 100644 --- a/src/2geom/CMakeLists.txt +++ b/src/2geom/CMakeLists.txt @@ -21,6 +21,7 @@ set(2geom_SRC nearest-point.cpp numeric/matrix.cpp path-intersection.cpp + path-sink.cpp path.cpp pathvector.cpp piecewise.cpp @@ -43,7 +44,6 @@ set(2geom_SRC solve-bezier-parametric.cpp svg-elliptical-arc.cpp svg-path-parser.cpp - svg-path.cpp sweep.cpp toposweep.cpp transforms.cpp diff --git a/src/2geom/path.cpp b/src/2geom/path.cpp index 5797f475c..fc4d72028 100644 --- a/src/2geom/path.cpp +++ b/src/2geom/path.cpp @@ -104,12 +104,14 @@ Path &Path::operator*=(Affine const &m) { } Path &Path::operator*=(Translate const &m) { +/* Somehow there is something wrong here, LPE Construct grid fails with this code unshare(); Sequence::iterator last = get_curves().end() - 1; Sequence::iterator it; Point prev; for (it = get_curves().begin() ; it != last ; ++it) { - *(const_cast<Curve*>(&**it)) *= m; + //*(const_cast<Curve*>(&**it)) *= m; + const_cast<Curve*>(it->get())->operator*=(m); if ( it != get_curves().begin() && (*it)->initialPoint() != prev ) { THROW_CONTINUITYERROR(); } @@ -124,6 +126,8 @@ Path &Path::operator*=(Translate const &m) { } } return *this; +*/ + return this->operator*=(static_cast<Affine>(m)); } std::vector<double> |