summaryrefslogtreecommitdiffstats
path: root/src/style-internal.cpp
diff options
context:
space:
mode:
authorMichael Soegtrop <MSoegtrop@yahoo.de>2016-06-12 10:52:33 +0000
committerMichael Soegtrop <MSoegtrop@yahoo.de>2016-06-12 10:52:33 +0000
commit013ba80c5b0115dbb0f6da01e1f42806a4037eb8 (patch)
treefe8d764a8e808c2084df8ace149d472109f3ae25 /src/style-internal.cpp
parentFixed Bool LPE review issues (diff)
parentOptionally sort attributes and properties into a canonical order. (diff)
downloadinkscape-013ba80c5b0115dbb0f6da01e1f42806a4037eb8.tar.gz
inkscape-013ba80c5b0115dbb0f6da01e1f42806a4037eb8.zip
updated to latest trunk
(bzr r14876.2.3)
Diffstat (limited to 'src/style-internal.cpp')
-rw-r--r--src/style-internal.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/style-internal.cpp b/src/style-internal.cpp
index b425a1c80..62b0de52d 100644
--- a/src/style-internal.cpp
+++ b/src/style-internal.cpp
@@ -1810,9 +1810,11 @@ SPIDashArray::read( gchar const *str ) {
return;
}
+ // std::vector<Glib::ustring> tokens = Glib::Regex::split_simple("[,\\s]+", str );
+
gchar *e = NULL;
bool LineSolid = true;
- while (e != str) {
+ while (e != str && *str != '\0') {
/* TODO: Should allow <length> rather than just a unitless (px) number. */
double number = g_ascii_strtod(str, (char **) &e);
values.push_back( number );
@@ -1821,7 +1823,7 @@ SPIDashArray::read( gchar const *str ) {
if (e != str) {
str = e;
}
- while (str && *str && !isalnum(*str)) str += 1;
+ while (str && *str && !(isalnum(*str) || *str=='.')) str += 1;
}
if (LineSolid) {