diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-03-14 16:37:50 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2016-03-14 16:37:50 +0000 |
| commit | b8d22beef5345210ad27cdc2685083aeae6f8f3b (patch) | |
| tree | d69b8bfd19d3627a8425a1b265c2abf229b05354 /src/svg | |
| parent | fixes for update to trunk (diff) | |
| parent | "Relative to" option for node alignment. (diff) | |
| download | inkscape-b8d22beef5345210ad27cdc2685083aeae6f8f3b.tar.gz inkscape-b8d22beef5345210ad27cdc2685083aeae6f8f3b.zip | |
update to trunk
(bzr r13708.1.39)
Diffstat (limited to 'src/svg')
| -rw-r--r-- | src/svg/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/svg/svg-affine.cpp | 2 | ||||
| -rw-r--r-- | src/svg/svg-length.cpp | 2 | ||||
| -rw-r--r-- | src/svg/svg-length.h | 2 | ||||
| -rw-r--r-- | src/svg/svg-path.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/svg/CMakeLists.txt b/src/svg/CMakeLists.txt index f9d0bc52d..ff4bb63ab 100644 --- a/src/svg/CMakeLists.txt +++ b/src/svg/CMakeLists.txt @@ -2,7 +2,7 @@ set(svg_SRC css-ostringstream.cpp path-string.cpp - sp-svg.def + #sp-svg.def stringstream.cpp strip-trailing-zeros.cpp svg-affine.cpp diff --git a/src/svg/svg-affine.cpp b/src/svg/svg-affine.cpp index c853f9930..d9d79bba5 100644 --- a/src/svg/svg-affine.cpp +++ b/src/svg/svg-affine.cpp @@ -119,7 +119,7 @@ sp_svg_transform_read(gchar const *str, Geom::Affine *transform) if (n_args != 1 && n_args != 3) { return false; } - Geom::Rotate const rot(Geom::deg_to_rad(args[0])); + Geom::Rotate const rot(Geom::rad_from_deg(args[0])); if (n_args == 3) { a = ( Geom::Translate(-args[1], -args[2]) * rot diff --git a/src/svg/svg-length.cpp b/src/svg/svg-length.cpp index edbc59c36..cd995582d 100644 --- a/src/svg/svg-length.cpp +++ b/src/svg/svg-length.cpp @@ -463,7 +463,7 @@ unsigned int sp_svg_length_read_ldd(gchar const *str, SVGLength::Unit *unit, dou return r; } -std::string const SVGLength::write() +std::string SVGLength::write() const { return sp_svg_length_write_with_units(*this); } diff --git a/src/svg/svg-length.h b/src/svg/svg-length.h index 84056dd5f..2aaf248b1 100644 --- a/src/svg/svg-length.h +++ b/src/svg/svg-length.h @@ -57,7 +57,7 @@ public: bool read(char const *str); void readOrUnset(char const *str, Unit u = NONE, float v = 0, float c = 0); bool readAbsolute(char const *str); - std::string const write(); + std::string write() const; // To set 'v' use '=' void set(Unit u, float v); // Sets computed value based on u and v. void set(Unit u, float v, float c); // Sets all three values. diff --git a/src/svg/svg-path.cpp b/src/svg/svg-path.cpp index ba9e11452..7bb58fc9c 100644 --- a/src/svg/svg-path.cpp +++ b/src/svg/svg-path.cpp @@ -84,7 +84,7 @@ static void sp_svg_write_curve(Inkscape::SVG::PathString & str, Geom::Curve cons } else if(Geom::EllipticalArc const *elliptical_arc = dynamic_cast<Geom::EllipticalArc const *>(c)) { str.arcTo( elliptical_arc->ray(Geom::X), elliptical_arc->ray(Geom::Y), - Geom::rad_to_deg(elliptical_arc->rotationAngle()), + Geom::deg_from_rad(elliptical_arc->rotationAngle()), elliptical_arc->largeArc(), elliptical_arc->sweep(), elliptical_arc->finalPoint() ); } else { |