Follow-up to complete fix for gradient stops and icc.

[inkscape.git] / src / style.cpp

diff --git a/src/style.cpp b/src/style.cpp
index 380decc48776b4b3611a19f40b8ae748f83c1226..a4094621f8d9712abc32bf5f7d551f0513b27ee6 100644 (file)
--- a/src/style.cpp
+++ b/src/style.cpp
@@ -1,5 +1,3 @@
-#define __SP_STYLE_C__
-
 /** @file
  * @brief SVG stylesheets implementation.
  */
@@ -487,11 +485,11 @@ sp_style_new_from_object(SPObject *object)
     g_return_val_if_fail(object != NULL, NULL);
     g_return_val_if_fail(SP_IS_OBJECT(object), NULL);
 
-    SPStyle *style = sp_style_new(SP_OBJECT_DOCUMENT(object));
+    SPStyle *style = sp_style_new( object->document );
     style->object = object;
     style->release_connection = object->connectRelease(sigc::bind<1>(sigc::ptr_fun(&sp_style_object_release), style));
 
-    if (object && SP_OBJECT_IS_CLONED(object)) {
+    if (object && object->cloned) {
         style->cloned = true;
     }
 
@@ -573,7 +571,7 @@ sp_style_read(SPStyle *style, SPObject *object, Inkscape::XML::Node *repr)
 
     sp_style_clear(style);
 
-    if (object && SP_OBJECT_IS_CLONED(object)) {
+    if (object && object->cloned) {
         style->cloned = true;
     }
 
@@ -4031,6 +4029,7 @@ SPIPaint::SPIPaint() :
     noneSet(0),
     value()
 {
+    value.color.set( 0 );
     value.href = 0;
 }