Translations. French translation minor update.

[inkscape.git] / src / sp-paint-server.cpp

diff --git a/src/sp-paint-server.cpp b/src/sp-paint-server.cpp
index 90263d17cba9dd507add4774db03b61f0b44bbc0..4b5366a46f5749113af6f67668054cb580f33f4b 100644 (file)
--- a/src/sp-paint-server.cpp
+++ b/src/sp-paint-server.cpp
@@ -1,22 +1,26 @@
-#define __SP_PAINT_SERVER_C__
-
 /*
  * Base class for gradients and patterns
  *
  * Author:
  *   Lauris Kaplinski <lauris@kaplinski.com>
+ *   Jon A. Cruz <jon@joncruz.org>
  *
  * Copyright (C) 1999-2002 Lauris Kaplinski
  * Copyright (C) 2000-2001 Ximian, Inc.
+ * Copyright (C) 2000-2001 Ximian, Inc.
+ * Copyright (C) 2010 Authors
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <libnr/nr-pixblock-pattern.h>
+#include <string.h>
+#include "libnr/nr-pixblock-pattern.h"
 #include "sp-paint-server.h"
 
+#include "sp-gradient.h"
+#include "xml/node.h"
+
 static void sp_paint_server_class_init(SPPaintServerClass *psc);
-static void sp_paint_server_init(SPPaintServer *ps);
 
 static void sp_paint_server_release(SPObject *object);
 
@@ -25,21 +29,21 @@ static void sp_painter_stale_fill(SPPainter *painter, NRPixBlock *pb);
 static SPObjectClass *parent_class;
 static GSList *stale_painters = NULL;
 
-GType sp_paint_server_get_type (void)
+GType SPPaintServer::getType(void)
 {
     static GType type = 0;
     if (!type) {
         GTypeInfo info = {
             sizeof(SPPaintServerClass),
-            NULL,      /* base_init */
-            NULL,      /* base_finalize */
+            NULL,       /* base_init */
+            NULL,       /* base_finalize */
             (GClassInitFunc) sp_paint_server_class_init,
-            NULL,      /* class_finalize */
-            NULL,      /* class_data */
+            NULL,       /* class_finalize */
+            NULL,       /* class_data */
             sizeof(SPPaintServer),
-            16,        /* n_preallocs */
-            (GInstanceInitFunc) sp_paint_server_init,
-            NULL,      /* value_table */
+            16, /* n_preallocs */
+            (GInstanceInitFunc) SPPaintServer::init,
+            NULL,       /* value_table */
         };
         type = g_type_register_static(SP_TYPE_OBJECT, "SPPaintServer", &info, (GTypeFlags) 0);
     }
@@ -53,9 +57,10 @@ static void sp_paint_server_class_init(SPPaintServerClass *psc)
     parent_class = (SPObjectClass *) g_type_class_ref(SP_TYPE_OBJECT);
 }
 
-static void sp_paint_server_init(SPPaintServer *ps)
+void SPPaintServer::init(SPPaintServer *ps)
 {
     ps->painters = NULL;
+    ps->swatch = false;
 }
 
 static void sp_paint_server_release(SPObject *object)
@@ -77,8 +82,8 @@ static void sp_paint_server_release(SPObject *object)
 }
 
 SPPainter *sp_paint_server_painter_new(SPPaintServer *ps,
-                                       NR::Matrix const &full_transform,
-                                       NR::Matrix const &parent_transform,
+                                       Geom::Matrix const &full_transform,
+                                       Geom::Matrix const &parent_transform,
                                        const NRRect *bbox)
 {
     g_return_val_if_fail(ps != NULL, NULL);
@@ -145,11 +150,30 @@ SPPainter *sp_painter_free(SPPainter *painter)
     return NULL;
 }
 
-static void sp_painter_stale_fill(SPPainter *painter, NRPixBlock *pb)
+static void sp_painter_stale_fill(SPPainter */*painter*/, NRPixBlock *pb)
 {
     nr_pixblock_render_gray_noise(pb, NULL);
 }
 
+bool SPPaintServer::isSwatch() const
+{
+    return swatch;
+}
+
+bool SPPaintServer::isSolid() const
+{
+    bool solid = false;
+    if (swatch && SP_IS_GRADIENT(this)) {
+        SPGradient *grad = SP_GRADIENT(this);
+        if ( grad->hasStops() && (grad->getStopCount() == 0) ) {
+            solid = true;
+        }
+    }
+    return solid;
+}
+
+
+
 
 /*
   Local Variables: