X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fsp-filter.cpp;h=150033895202aea50541345839874ed4431463a5;hb=57eb32794c2df43d60ee8f0a9aa8576567358ce6;hp=2b1b94b1fa9c32782fe0b978c2501cb3ea39be29;hpb=ef1b9366178b231dc7a25a228e5e0f62f2cb4192;p=inkscape.git

diff --git a/src/sp-filter.cpp b/src/sp-filter.cpp
index 2b1b94b1f..150033895 100644
--- a/src/sp-filter.cpp
+++ b/src/sp-filter.cpp
@@ -28,6 +28,8 @@ using std::pair;
 #include "sp-filter-reference.h"
 #include "uri.h"
 #include "xml/repr.h"
+#include <cstring>
+#include <string>
 
 #define SP_MACROS_SILENT
 #include "macros.h"
@@ -107,15 +109,15 @@ sp_filter_init(SPFilter *filter)
     filter->primitiveUnits = SP_FILTER_UNITS_OBJECTBOUNDINGBOX;
     filter->filterUnits_set = FALSE;
     filter->primitiveUnits_set = FALSE;
-    filter->_primitive_count=0;
-    
-    filter->_primitive_table_size = 1;
-    filter->_primitives = new SPFilterPrimitive*[1];
-    filter->_primitives[0] = NULL;
 
     filter->_renderer = NULL;
-    
-    filter->_image_name = map<gchar *, int, ltstr>();
+
+    filter->_image_name = new std::map<gchar *, int, ltstr>;
+    filter->_image_name->clear();
+
+    filter->filterRes = NumberOptNumber();
+
+    new (&filter->modified_connection) sigc::connection();
 }
 
 /**
@@ -161,14 +163,15 @@ sp_filter_release(SPObject *object)
 
     //release href
     if (filter->href) {
-        if (filter->href->getObject()) {
-            sp_signal_disconnect_by_data(filter->href->getObject(), filter);
-        }
+        filter->modified_connection.disconnect();
         filter->href->detach();
         delete filter->href;
         filter->href = NULL;
     }
 
+    filter->modified_connection.~connection();
+    delete filter->_image_name;
+
     if (((SPObjectClass *) filter_parent_class)->release)
         ((SPObjectClass *) filter_parent_class)->release(object);
 }
@@ -210,24 +213,25 @@ sp_filter_set(SPObject *object, unsigned int key, gchar const *value)
             }
             object->requestModified(SP_OBJECT_MODIFIED_FLAG);
             break;
-    case SP_ATTR_X:
+        case SP_ATTR_X:
             filter->x.readOrUnset(value);
-        object->requestModified(SP_OBJECT_MODIFIED_FLAG);
+            object->requestModified(SP_OBJECT_MODIFIED_FLAG);
             break;
-    case SP_ATTR_Y:
-        filter->y.readOrUnset(value);
-        object->requestModified(SP_OBJECT_MODIFIED_FLAG);
+        case SP_ATTR_Y:
+            filter->y.readOrUnset(value);
+            object->requestModified(SP_OBJECT_MODIFIED_FLAG);
             break;
-    case SP_ATTR_WIDTH:
-        filter->width.readOrUnset(value);
-        object->requestModified(SP_OBJECT_MODIFIED_FLAG);
+        case SP_ATTR_WIDTH:
+            filter->width.readOrUnset(value);
+            object->requestModified(SP_OBJECT_MODIFIED_FLAG);
             break;
-    case SP_ATTR_HEIGHT:
-        filter->height.readOrUnset(value);
-        object->requestModified(SP_OBJECT_MODIFIED_FLAG);
+        case SP_ATTR_HEIGHT:
+            filter->height.readOrUnset(value);
+            object->requestModified(SP_OBJECT_MODIFIED_FLAG);
             break;
-    case SP_ATTR_FILTERRES:
-        filter->filterRes.set(value);
+        case SP_ATTR_FILTERRES:
+            filter->filterRes.set(value);
+            object->requestModified(SP_OBJECT_MODIFIED_FLAG);
             break;
         case SP_ATTR_XLINK_HREF:
             if (value) {
@@ -242,7 +246,7 @@ sp_filter_set(SPObject *object, unsigned int key, gchar const *value)
             }
             break;
         default:
-            // See if any parents need this value. 
+            // See if any parents need this value.
             if (((SPObjectClass *) filter_parent_class)->set) {
                 ((SPObjectClass *) filter_parent_class)->set(object, key, value);
             }
@@ -357,61 +361,36 @@ static void
 filter_ref_changed(SPObject *old_ref, SPObject *ref, SPFilter *filter)
 {
     if (old_ref) {
-        sp_signal_disconnect_by_data(old_ref, filter);
+        filter->modified_connection.disconnect();
     }
     if ( SP_IS_FILTER(ref)
          && ref != filter )
     {
-        ref->connectModified(sigc::bind(sigc::ptr_fun(&filter_ref_modified), filter));
-        //g_signal_connect(G_OBJECT(ref), "modified", G_CALLBACK(filter_ref_modified), filter);
+        filter->modified_connection =
+            ref->connectModified(sigc::bind(sigc::ptr_fun(&filter_ref_modified), filter));
     }
 
     filter_ref_modified(ref, 0, filter);
 }
 
 static void
-filter_ref_modified(SPObject *href, guint flags, SPFilter *filter)
+filter_ref_modified(SPObject */*href*/, guint /*flags*/, SPFilter *filter)
 {
     SP_OBJECT(filter)->requestModified(SP_OBJECT_MODIFIED_FLAG);
 }
 
-
-void _enlarge_primitive_table(SPFilter * filter) {
-    SPFilterPrimitive **new_tbl = new SPFilterPrimitive*[filter->_primitive_table_size * 2];
-    for (int i = 0 ; i < filter->_primitive_count ; i++) {
-        new_tbl[i] = filter->_primitives[i];
-    }
-    filter->_primitive_table_size *= 2;
-    for (int i = filter->_primitive_count ; i < filter->_primitive_table_size ; i++) {
-        new_tbl[i] = NULL;
-    }
-    delete[] filter->_primitives;
-    filter->_primitives = new_tbl;
-}
-
-SPFilterPrimitive *add_primitive(SPFilter *filter, SPFilterPrimitive *primitive)
-{
-    if (filter->_primitive_count >= filter->_primitive_table_size) {
-        _enlarge_primitive_table(filter);
-    }
-    filter->_primitives[filter->_primitive_count] = primitive;
-    filter->_primitive_count++;
-    return primitive;
-}
-
 /**
  * Callback for child_added event.
  */
 static void
 sp_filter_child_added(SPObject *object, Inkscape::XML::Node *child, Inkscape::XML::Node *ref)
-{/*
-    SPFilter *f = SP_FILTER(object);
+{
+    //SPFilter *f = SP_FILTER(object);
 
     if (((SPObjectClass *) filter_parent_class)->child_added)
         (* ((SPObjectClass *) filter_parent_class)->child_added)(object, child, ref);
 
     object->requestModified(SP_OBJECT_MODIFIED_FLAG);
-	*/
 }
 
 /**
@@ -419,17 +398,13 @@ sp_filter_child_added(SPObject *object, Inkscape::XML::Node *child, Inkscape::XM
  */
 static void
 sp_filter_remove_child(SPObject *object, Inkscape::XML::Node *child)
-{/*
-    SPFilter *f = SP_FILTER(object);
+{
+//    SPFilter *f = SP_FILTER(object);
 
     if (((SPObjectClass *) filter_parent_class)->remove_child)
         (* ((SPObjectClass *) filter_parent_class)->remove_child)(object, child);
 
-    SPObject *ochild;
-
-    
     object->requestModified(SP_OBJECT_MODIFIED_FLAG);
-	*/
 }
 
 void sp_filter_build_renderer(SPFilter *sp_filter, NR::Filter *nr_filter)
@@ -444,28 +419,48 @@ void sp_filter_build_renderer(SPFilter *sp_filter, NR::Filter *nr_filter)
     nr_filter->set_width(sp_filter->width);
     nr_filter->set_height(sp_filter->height);
 
-    nr_filter->clear_primitives();
-    for (int i = 0 ; i < sp_filter->_primitive_count ; i++) {
-        SPFilterPrimitive *primitive = sp_filter->_primitives[i];
-        g_assert(primitive != NULL);
-        if (((SPFilterPrimitiveClass*) G_OBJECT_GET_CLASS(primitive))->build_renderer) {
-            ((SPFilterPrimitiveClass *) G_OBJECT_GET_CLASS(primitive))->build_renderer(primitive, nr_filter);
+    if (sp_filter->filterRes.getNumber() >= 0) {
+        if (sp_filter->filterRes.getOptNumber() >= 0) {
+            nr_filter->set_resolution(sp_filter->filterRes.getNumber(),
+                                      sp_filter->filterRes.getOptNumber());
         } else {
-            g_warning("Cannot build filter renderer: missing builder");
+            nr_filter->set_resolution(sp_filter->filterRes.getNumber());
         }
     }
+
+    nr_filter->clear_primitives();
+    SPObject *primitive_obj = sp_filter->children;
+    while (primitive_obj) {
+        if (SP_IS_FILTER_PRIMITIVE(primitive_obj)) {
+            SPFilterPrimitive *primitive = SP_FILTER_PRIMITIVE(primitive_obj);
+            g_assert(primitive != NULL);
+            if (((SPFilterPrimitiveClass*) G_OBJECT_GET_CLASS(primitive))->build_renderer) {
+                ((SPFilterPrimitiveClass *) G_OBJECT_GET_CLASS(primitive))->build_renderer(primitive, nr_filter);
+            } else {
+                g_warning("Cannot build filter renderer: missing builder");
+            }
+        }
+        primitive_obj = primitive_obj->next;
+    }
 }
 
 int sp_filter_primitive_count(SPFilter *filter) {
     g_assert(filter != NULL);
-    return filter->_primitive_count;
+    int count = 0;
+
+    SPObject *primitive_obj = filter->children;
+    while (primitive_obj) {
+        if (SP_IS_FILTER_PRIMITIVE(primitive_obj)) count++;
+        primitive_obj = primitive_obj->next;
+    }
+    return count;
 }
 
 int sp_filter_get_image_name(SPFilter *filter, gchar const *name) {
     gchar *name_copy = strdup(name);
-    map<gchar *, int, ltstr>::iterator result = filter->_image_name.find(name_copy);
+    map<gchar *, int, ltstr>::iterator result = filter->_image_name->find(name_copy);
     free(name_copy);
-    if (result == filter->_image_name.end()) return -1;
+    if (result == filter->_image_name->end()) return -1;
     else return (*result).second;
 }
 
@@ -473,7 +468,8 @@ int sp_filter_set_image_name(SPFilter *filter, gchar const *name) {
     int value = filter->_image_number_next;
     filter->_image_number_next++;
     gchar *name_copy = strdup(name);
-    pair<map<gchar*,int,ltstr>::iterator,bool> ret = filter->_image_name.insert(pair<gchar*,int>(name_copy, value));
+    pair<gchar*,int> new_pair(name_copy, value);
+    pair<map<gchar*,int,ltstr>::iterator,bool> ret = filter->_image_name->insert(new_pair);
     if (ret.second == false) {
         return (*ret.first).second;
     }