diff options
| author | Jasper van de Gronde <jasper.vandegronde@gmail.com> | 2008-05-27 07:25:44 +0000 |
|---|---|---|
| committer | jaspervdg <jaspervdg@users.sourceforge.net> | 2008-05-27 07:25:44 +0000 |
| commit | 5f42a2adaa576029d9f512ce03c935ae25affab0 (patch) | |
| tree | 0fcd34b706d3b319be725b90a507862abd8282f1 /src/svg/path-string.cpp | |
| parent | * converted nr-svgfont.cpp to C++ code so that we can render multiple instanc... (diff) | |
| download | inkscape-5f42a2adaa576029d9f512ce03c935ae25affab0.tar.gz inkscape-5f42a2adaa576029d9f512ce03c935ae25affab0.zip | |
Fix for PathString to eliminate use of sscanf (which is locale dependent).
(bzr r5757)
Diffstat (limited to 'src/svg/path-string.cpp')
| -rw-r--r-- | src/svg/path-string.cpp | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/src/svg/path-string.cpp b/src/svg/path-string.cpp index 44b474dd2..c1725db6b 100644 --- a/src/svg/path-string.cpp +++ b/src/svg/path-string.cpp @@ -14,6 +14,7 @@ #include "svg/path-string.h" #include "svg/stringstream.h" +#include "svg/svg.h" #include "prefs-utils.h" #include <algorithm> @@ -60,19 +61,25 @@ void Inkscape::SVG::PathString::State::append(NR::Point p) { void Inkscape::SVG::PathString::State::append(NR::Coord v, NR::Coord &rv) { SVGOStringStream os; - os << ' ' << v; - str.append(os.str()); + os << v; + str += ' '; + str += os.str(); double c; - sscanf(os.str().c_str(), " %lf", &c); + sp_svg_number_read_d(os.str().c_str(), &c); rv = c; } void Inkscape::SVG::PathString::State::append(NR::Point p, NR::Point &rp) { - SVGOStringStream os; - os << ' ' << p[NR::X] << ',' << p[NR::Y]; - str.append(os.str()); + SVGOStringStream osx, osy; + osx << p[NR::X]; + osy << p[NR::Y]; + str += ' '; + str += osx.str(); + str += ','; + str += osy.str(); double x, y; - sscanf(os.str().c_str(), " %lf,%lf", &x, &y); + sp_svg_number_read_d(osx.str().c_str(), &x); + sp_svg_number_read_d(osy.str().c_str(), &y); rp[NR::X] = x; rp[NR::Y] = y; } |