summaryrefslogtreecommitdiffstats
path: root/src/xml
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2014-04-19 22:26:37 +0000
committerJabiertxof <jtx@jtx.marker.es>2014-04-19 22:26:37 +0000
commit23be58fdf34cbcb29040b312de7e2b6764f60c50 (patch)
treed25a24e24f830c7618edeadc9d211e15e576c3fa /src/xml
parentupdate to trunk (diff)
parentMerge in outline bitmap image preference feature (diff)
downloadinkscape-23be58fdf34cbcb29040b312de7e2b6764f60c50.tar.gz
inkscape-23be58fdf34cbcb29040b312de7e2b6764f60c50.zip
update to trunk
(bzr r11950.1.329)
Diffstat (limited to 'src/xml')
-rw-r--r--src/xml/repr-css.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/xml/repr-css.cpp b/src/xml/repr-css.cpp
index 24e2db9e1..32a1e7f5d 100644
--- a/src/xml/repr-css.cpp
+++ b/src/xml/repr-css.cpp
@@ -382,7 +382,10 @@ static void sp_repr_css_merge_from_decl(SPCSSAttr *css, CRDeclaration const *con
std::string characters;
std::string temp;
bool number_valid = !(ss >> number).fail();
- if( !number_valid ) ss.clear();
+ if (!number_valid) {
+ ss.clear();
+ ss.seekg(0); // work-around for a bug in libc++ (see lp:1300271)
+ }
while( !(ss >> temp).eof() ) {
characters += temp;
characters += " ";