summaryrefslogtreecommitdiffstats
path: root/src/style.cpp
diff options
context:
space:
mode:
authorLiam P. White <inkscapebronyat-signgmaildotcom>2014-03-09 02:56:07 +0000
committerLiam P. White <inkscapebronyat-signgmaildotcom>2014-03-09 02:56:07 +0000
commitc515627314d3ec501dc6de928fb60b5d7895c557 (patch)
tree8a4e5c479e8b41df87494fe555934f42aa424537 /src/style.cpp
parentRemove all trace of the Tags dialog (diff)
parentRemove useless r variable and warning (diff)
downloadinkscape-c515627314d3ec501dc6de928fb60b5d7895c557.tar.gz
inkscape-c515627314d3ec501dc6de928fb60b5d7895c557.zip
Update to trunk
(bzr r13090.1.22)
Diffstat (limited to 'src/style.cpp')
-rw-r--r--src/style.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/style.cpp b/src/style.cpp
index 7ad9749f0..f3a12db86 100644
--- a/src/style.cpp
+++ b/src/style.cpp
@@ -3731,7 +3731,7 @@ sp_style_read_ipaintorder(SPIPaintOrder *val, gchar const *str)
val->layer[i] = SP_CSS_PAINT_ORDER_STROKE;
val->layer_set[i] = true;
used[1] = true;
- } else if( !strcmp( c[i], "marker")) {
+ } else if( !strcmp( c[i], "markers")) {
val->layer[i] = SP_CSS_PAINT_ORDER_MARKER;
val->layer_set[i] = true;
used[2] = true;
@@ -4785,7 +4785,7 @@ sp_style_write_ifontsize(gchar *p, gint const len, gchar const *key,
return g_snprintf(p, len, "%s:inherit;", key);
} else if (val->type == SP_FONT_SIZE_LITERAL) {
for (unsigned i = 0; enum_font_size[i].key; i++) {
- if (enum_font_size[i].value == static_cast< gint > (val->value) ) {
+ if (enum_font_size[i].value == static_cast< gint > (val->literal) ) {
return g_snprintf(p, len, "%s:%s;", key, enum_font_size[i].key);
}
}