summaryrefslogtreecommitdiffstats
path: root/src/style-internal.cpp
diff options
context:
space:
mode:
authorTavmjong Bah <tavmjong@free.fr>2018-12-03 15:27:19 +0000
committerTavmjong Bah <tavmjong@free.fr>2018-12-03 15:27:19 +0000
commitb26d71edf8788add516ce94389c7ffd6c8bc6c4a (patch)
tree401252a509a4eceb7501c3acde890954135ecea6 /src/style-internal.cpp
parentRemove dependance of SVGViewWidget on SVGView and View. Remove SVGView. (diff)
downloadinkscape-b26d71edf8788add516ce94389c7ffd6c8bc6c4a.tar.gz
inkscape-b26d71edf8788add516ce94389c7ffd6c8bc6c4a.zip
Fix error comment condition, thereby fixing object-test.
Diffstat (limited to 'src/style-internal.cpp')
-rw-r--r--src/style-internal.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/style-internal.cpp b/src/style-internal.cpp
index 7459cd1b8..b02adec48 100644
--- a/src/style-internal.cpp
+++ b/src/style-internal.cpp
@@ -188,8 +188,8 @@ SPIScale24::merge( const SPIBase* const parent ) {
value = p->value;
}
} else {
- // Needed only for 'opacity' which does not inherit. See comment at bottom of file.
- if( name.compare( "opacity" ) != 0 )
+ // Needed only for 'opacity' and 'stop-opacity' which do not inherit. See comment at bottom of file.
+ if( name != "opacity" && name != "stop-opacity" )
std::cerr << "SPIScale24::merge: unhandled property: " << name << std::endl;
if( !set || (!inherit && value == SP_SCALE24_MAX) ) {
value = p->value;
@@ -2886,9 +2886,9 @@ SPIVectorEffect::operator==(const SPIBase& rhs) {
/* ---------------------------- NOTES ----------------------------- */
/*
- * opacity's effect is cumulative; we set the new value to the combined effect. The
- * default value for opacity is 1.0, not inherit. (Note that stroke-opacity and
- * fill-opacity are quite different from opacity, and don't need any special handling.)
+ * opacity's effect is cumulative; we set the new value to the combined effect. The default value
+ * for opacity is 1.0, not inherit. stop-opacity also does not inherit. (Note that stroke-opacity
+ * and fill-opacity are quite different from opacity, and don't need any special handling.)
*
* Cases:
* - parent & child were each previously unset, in which case the effective