From f01a18216e26fd87a53188018e03527c7fdf8a57 Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Tue, 23 Dec 2014 10:25:08 +0100
Subject: Use gray for 'context-fill' and 'context-stroke' in marker selector.
 Fix rendering bug when elements with 'context-fill' and 'context-stroke' are
 inside groups.

(bzr r13822)
---
 src/display/nr-style.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'src/display/nr-style.cpp')

diff --git a/src/display/nr-style.cpp b/src/display/nr-style.cpp
index 9dadaf3f1..1740785e2 100644
--- a/src/display/nr-style.cpp
+++ b/src/display/nr-style.cpp
@@ -101,13 +101,14 @@ void NRStyle::set(SPStyle *style, SPStyle *context_style)
         if( context_style != NULL ) {
             style_fill = &(context_style->fill);
         } else {
-            std::cerr << "NRStyle::set: 'context-fill': 'context_style' is NULL" << std::endl;
+            // A marker in the defs section will result in ending up here.
+            //std::cerr << "NRStyle::set: 'context-fill': 'context_style' is NULL" << std::endl;
         }
     } else if ( style_fill->paintOrigin == SP_CSS_PAINT_ORIGIN_CONTEXT_STROKE ) {
         if( context_style != NULL ) {
             style_fill = &(context_style->stroke);
         } else {
-            std::cerr << "NRStyle::set: 'context-stroke': 'context_style' is NULL" << std::endl;
+            //std::cerr << "NRStyle::set: 'context-stroke': 'context_style' is NULL" << std::endl;
         }
     }
     
@@ -125,9 +126,10 @@ void NRStyle::set(SPStyle *style, SPStyle *context_style)
     } else if ( style_fill->isNone() ) {
         fill.clear();
     } else if ( style_fill->paintOrigin == SP_CSS_PAINT_ORIGIN_CONTEXT_FILL ) {
-        std::cerr << "NRStyle::set: fill: context-fill: Double" << std::endl;
+        // A marker in the defs section will result in ending up here.
+        //std::cerr << "NRStyle::set: fill: context-fill: Double" << std::endl;
     } else if ( style_fill->paintOrigin == SP_CSS_PAINT_ORIGIN_CONTEXT_STROKE ) {
-        std::cerr << "NRStyle::set: fill: context-stroke: Double" << std::endl;
+        //std::cerr << "NRStyle::set: fill: context-stroke: Double" << std::endl;
     } else {
         g_assert_not_reached();
     }
@@ -150,13 +152,13 @@ void NRStyle::set(SPStyle *style, SPStyle *context_style)
         if( context_style != NULL ) {
             style_stroke = &(context_style->fill);
         } else {
-            std::cerr << "NRStyle::set: 'context-fill': 'context_style' is NULL" << std::endl;
+            //std::cerr << "NRStyle::set: 'context-fill': 'context_style' is NULL" << std::endl;
         }
     } else if ( style_stroke->paintOrigin == SP_CSS_PAINT_ORIGIN_CONTEXT_STROKE ) {
         if( context_style != NULL ) {
             style_stroke = &(context_style->stroke);
         } else {
-            std::cerr << "NRStyle::set: 'context-stroke': 'context_style' is NULL" << std::endl;
+            //std::cerr << "NRStyle::set: 'context-stroke': 'context_style' is NULL" << std::endl;
         }
     }
     
@@ -174,9 +176,9 @@ void NRStyle::set(SPStyle *style, SPStyle *context_style)
     } else if ( style_stroke->isNone() ) {
         stroke.clear();
     } else if ( style_stroke->paintOrigin == SP_CSS_PAINT_ORIGIN_CONTEXT_FILL ) {
-        std::cerr << "NRStyle::set: stroke: context-fill: Double" << std::endl;
+        //std::cerr << "NRStyle::set: stroke: context-fill: Double" << std::endl;
     } else if ( style_stroke->paintOrigin == SP_CSS_PAINT_ORIGIN_CONTEXT_STROKE ) {
-        std::cerr << "NRStyle::set: stroke: context-stroke: Double" << std::endl;
+        //std::cerr << "NRStyle::set: stroke: context-stroke: Double" << std::endl;
     } else {
         g_assert_not_reached();
     }
-- 
cgit v1.2.3