Replaced virtual function call to "build_renderer".

(bzr r11608.1.53)

19 files changed, 25 insertions, 23 deletions

diff --git a/src/filters/blend.cpp b/src/filters/blend.cpp
index a48c8bc52..5292fdcbd 100644
--- a/src/filters/blend.cpp
+++ b/src/filters/blend.cpp
@@ -79,7 +79,7 @@ sp_feBlend_class_init(SPFeBlendClass *klass)
     sp_object_class->set = sp_feBlend_set;
     sp_object_class->update = sp_feBlend_update;
 
-    sp_primitive_class->build_renderer = sp_feBlend_build_renderer;
+    //sp_primitive_class->build_renderer = sp_feBlend_build_renderer;
 }
 
 CFeBlend::CFeBlend(SPFeBlend* blend) : CFilterPrimitive(blend) {
diff --git a/src/filters/colormatrix.cpp b/src/filters/colormatrix.cpp
index 593811651..5e27043fd 100644
--- a/src/filters/colormatrix.cpp
+++ b/src/filters/colormatrix.cpp
@@ -77,7 +77,7 @@ sp_feColorMatrix_class_init(SPFeColorMatrixClass *klass)
     sp_object_class->write = sp_feColorMatrix_write;
     sp_object_class->set = sp_feColorMatrix_set;
     sp_object_class->update = sp_feColorMatrix_update;
-    sp_primitive_class->build_renderer = sp_feColorMatrix_build_renderer;
+    //sp_primitive_class->build_renderer = sp_feColorMatrix_build_renderer;
 }
 
 CFeColorMatrix::CFeColorMatrix(SPFeColorMatrix* matrix) : CFilterPrimitive(matrix) {
diff --git a/src/filters/componenttransfer.cpp b/src/filters/componenttransfer.cpp
index 9060d7838..792ff9a4d 100644
--- a/src/filters/componenttransfer.cpp
+++ b/src/filters/componenttransfer.cpp
@@ -78,7 +78,7 @@ sp_feComponentTransfer_class_init(SPFeComponentTransferClass *klass)
     sp_object_class->child_added = sp_feComponentTransfer_child_added;
     sp_object_class->remove_child = sp_feComponentTransfer_remove_child;
 
-    sp_primitive_class->build_renderer = sp_feComponentTransfer_build_renderer;
+    //sp_primitive_class->build_renderer = sp_feComponentTransfer_build_renderer;
 }
 
 CFeComponentTransfer::CFeComponentTransfer(SPFeComponentTransfer* tr) : CFilterPrimitive(tr) {
diff --git a/src/filters/composite.cpp b/src/filters/composite.cpp
index 6bcb57a5b..bd23243ea 100644
--- a/src/filters/composite.cpp
+++ b/src/filters/composite.cpp
@@ -74,7 +74,7 @@ sp_feComposite_class_init(SPFeCompositeClass *klass)
     sp_object_class->set = sp_feComposite_set;
     sp_object_class->update = sp_feComposite_update;
 
-    sp_primitive_class->build_renderer = sp_feComposite_build_renderer;
+    //sp_primitive_class->build_renderer = sp_feComposite_build_renderer;
 }
 
 CFeComposite::CFeComposite(SPFeComposite* comp) : CFilterPrimitive(comp) {
diff --git a/src/filters/convolvematrix.cpp b/src/filters/convolvematrix.cpp
index 1f6980a6a..759ebff16 100644
--- a/src/filters/convolvematrix.cpp
+++ b/src/filters/convolvematrix.cpp
@@ -77,7 +77,7 @@ sp_feConvolveMatrix_class_init(SPFeConvolveMatrixClass *klass)
     sp_object_class->set = sp_feConvolveMatrix_set;
     sp_object_class->update = sp_feConvolveMatrix_update;
 
-    sp_primitive_class->build_renderer = sp_feConvolveMatrix_build_renderer;
+    //sp_primitive_class->build_renderer = sp_feConvolveMatrix_build_renderer;
 }
 
 CFeConvolveMatrix::CFeConvolveMatrix(SPFeConvolveMatrix* matrix) : CFilterPrimitive(matrix) {
diff --git a/src/filters/diffuselighting.cpp b/src/filters/diffuselighting.cpp
index 1512c1cc5..32e0b2438 100644
--- a/src/filters/diffuselighting.cpp
+++ b/src/filters/diffuselighting.cpp
@@ -91,7 +91,7 @@ sp_feDiffuseLighting_class_init(SPFeDiffuseLightingClass *klass)
     sp_object_class->remove_child = sp_feDiffuseLighting_remove_child;
     sp_object_class->order_changed = sp_feDiffuseLighting_order_changed;
 
-    sp_primitive_class->build_renderer = sp_feDiffuseLighting_build_renderer;
+    //sp_primitive_class->build_renderer = sp_feDiffuseLighting_build_renderer;
 }
 
 CFeDiffuseLighting::CFeDiffuseLighting(SPFeDiffuseLighting* dl) : CFilterPrimitive(dl) {
diff --git a/src/filters/displacementmap.cpp b/src/filters/displacementmap.cpp
index e9f859bf6..8e795564d 100644
--- a/src/filters/displacementmap.cpp
+++ b/src/filters/displacementmap.cpp
@@ -73,7 +73,7 @@ sp_feDisplacementMap_class_init(SPFeDisplacementMapClass *klass)
     sp_object_class->write = sp_feDisplacementMap_write;
     sp_object_class->set = sp_feDisplacementMap_set;
     sp_object_class->update = sp_feDisplacementMap_update;
-    sp_primitive_class->build_renderer = sp_feDisplacementMap_build_renderer;
+    //sp_primitive_class->build_renderer = sp_feDisplacementMap_build_renderer;
 }
 
 CFeDisplacementMap::CFeDisplacementMap(SPFeDisplacementMap* map) : CFilterPrimitive(map) {
diff --git a/src/filters/flood.cpp b/src/filters/flood.cpp
index 13f797c7c..b4a3cdc1a 100644
--- a/src/filters/flood.cpp
+++ b/src/filters/flood.cpp
@@ -73,7 +73,7 @@ static void sp_feFlood_class_init(SPFeFloodClass *klass)
     sp_object_class->write = sp_feFlood_write;
     sp_object_class->set = sp_feFlood_set;
     sp_object_class->update = sp_feFlood_update;
-    sp_primitive_class->build_renderer = sp_feFlood_build_renderer;
+    //sp_primitive_class->build_renderer = sp_feFlood_build_renderer;
 }
 
 CFeFlood::CFeFlood(SPFeFlood* flood) : CFilterPrimitive(flood) {
diff --git a/src/filters/gaussian-blur.cpp b/src/filters/gaussian-blur.cpp
index 872e34a76..aa01d2226 100644
--- a/src/filters/gaussian-blur.cpp
+++ b/src/filters/gaussian-blur.cpp
@@ -79,7 +79,7 @@ sp_gaussianBlur_class_init(SPGaussianBlurClass *klass)
     sp_object_class->set = sp_gaussianBlur_set;
     sp_object_class->update = sp_gaussianBlur_update;
 
-    sp_primitive_class->build_renderer = sp_gaussianBlur_build_renderer;
+    //sp_primitive_class->build_renderer = sp_gaussianBlur_build_renderer;
 }
 
 CGaussianBlur::CGaussianBlur(SPGaussianBlur* gb) : CFilterPrimitive(gb) {
diff --git a/src/filters/image.cpp b/src/filters/image.cpp
index 336c9c898..7e68d0932 100644
--- a/src/filters/image.cpp
+++ b/src/filters/image.cpp
@@ -76,7 +76,7 @@ static void sp_feImage_class_init(SPFeImageClass *klass)
     sp_object_class->set = sp_feImage_set;
     sp_object_class->update = sp_feImage_update;
 
-    sp_primitive_class->build_renderer = sp_feImage_build_renderer;
+    //sp_primitive_class->build_renderer = sp_feImage_build_renderer;
 }
 
 CFeImage::CFeImage(SPFeImage* image) : CFilterPrimitive(image) {
diff --git a/src/filters/merge.cpp b/src/filters/merge.cpp
index c16783d84..73810483e 100644
--- a/src/filters/merge.cpp
+++ b/src/filters/merge.cpp
@@ -73,7 +73,7 @@ sp_feMerge_class_init(SPFeMergeClass *klass)
     sp_object_class->set = sp_feMerge_set;
     sp_object_class->update = sp_feMerge_update;
 
-    sp_primitive_class->build_renderer = sp_feMerge_build_renderer;
+    //sp_primitive_class->build_renderer = sp_feMerge_build_renderer;
 }
 
 CFeMerge::CFeMerge(SPFeMerge* merge) : CFilterPrimitive(merge) {
diff --git a/src/filters/morphology.cpp b/src/filters/morphology.cpp
index ad448837a..1fca4e2ac 100644
--- a/src/filters/morphology.cpp
+++ b/src/filters/morphology.cpp
@@ -74,7 +74,7 @@ sp_feMorphology_class_init(SPFeMorphologyClass *klass)
     sp_object_class->write = sp_feMorphology_write;
     sp_object_class->set = sp_feMorphology_set;
     sp_object_class->update = sp_feMorphology_update;
-    sp_primitive_class->build_renderer = sp_feMorphology_build_renderer;
+    //sp_primitive_class->build_renderer = sp_feMorphology_build_renderer;
 }
 
 CFeMorphology::CFeMorphology(SPFeMorphology* morph) : CFilterPrimitive(morph) {
diff --git a/src/filters/offset.cpp b/src/filters/offset.cpp
index a06668f27..d46e549cc 100644
--- a/src/filters/offset.cpp
+++ b/src/filters/offset.cpp
@@ -74,7 +74,7 @@ sp_feOffset_class_init(SPFeOffsetClass *klass)
     sp_object_class->set = sp_feOffset_set;
     sp_object_class->update = sp_feOffset_update;
 
-    sp_primitive_class->build_renderer = sp_feOffset_build_renderer;
+    //sp_primitive_class->build_renderer = sp_feOffset_build_renderer;
 }
 
 CFeOffset::CFeOffset(SPFeOffset* offset) : CFilterPrimitive(offset) {
diff --git a/src/filters/specularlighting.cpp b/src/filters/specularlighting.cpp
index 5214b9310..f9fb26ddb 100644
--- a/src/filters/specularlighting.cpp
+++ b/src/filters/specularlighting.cpp
@@ -91,7 +91,7 @@ sp_feSpecularLighting_class_init(SPFeSpecularLightingClass *klass)
     sp_object_class->remove_child = sp_feSpecularLighting_remove_child;
     sp_object_class->order_changed = sp_feSpecularLighting_order_changed;
 
-    sp_primitive_class->build_renderer = sp_feSpecularLighting_build_renderer;
+    //sp_primitive_class->build_renderer = sp_feSpecularLighting_build_renderer;
 }
 
 CFeSpecularLighting::CFeSpecularLighting(SPFeSpecularLighting* lighting) : CFilterPrimitive(lighting) {
diff --git a/src/filters/tile.cpp b/src/filters/tile.cpp
index 83141bd8c..fd9fbe1f6 100644
--- a/src/filters/tile.cpp
+++ b/src/filters/tile.cpp
@@ -70,7 +70,7 @@ sp_feTile_class_init(SPFeTileClass *klass)
     sp_object_class->write = sp_feTile_write;
     sp_object_class->set = sp_feTile_set;
     sp_object_class->update = sp_feTile_update;
-    sp_primitive_class->build_renderer = sp_feTile_build_renderer;
+    //sp_primitive_class->build_renderer = sp_feTile_build_renderer;
 }
 
 CFeTile::CFeTile(SPFeTile* tile) : CFilterPrimitive(tile) {
diff --git a/src/filters/turbulence.cpp b/src/filters/turbulence.cpp
index 416e6bfc1..11b86dfe4 100644
--- a/src/filters/turbulence.cpp
+++ b/src/filters/turbulence.cpp
@@ -77,7 +77,7 @@ sp_feTurbulence_class_init(SPFeTurbulenceClass *klass)
     sp_object_class->set = sp_feTurbulence_set;
     sp_object_class->update = sp_feTurbulence_update;
 
-    sp_primitive_class->build_renderer = sp_feTurbulence_build_renderer;
+    //sp_primitive_class->build_renderer = sp_feTurbulence_build_renderer;
 }
 
 CFeTurbulence::CFeTurbulence(SPFeTurbulence* turb) : CFilterPrimitive(turb) {
diff --git a/src/sp-filter-primitive.cpp b/src/sp-filter-primitive.cpp
index b3926a695..f389f7adb 100644
--- a/src/sp-filter-primitive.cpp
+++ b/src/sp-filter-primitive.cpp
@@ -73,7 +73,7 @@ static void sp_filter_primitive_class_init(SPFilterPrimitiveClass *klass)
     
     /* This should never be called on this base class, but only on derived
      * classes. */
-    klass->build_renderer = NULL;
+    //klass->build_renderer = NULL;
 }
 
 CFilterPrimitive::CFilterPrimitive(SPFilterPrimitive* fp) : CObject(fp) {
diff --git a/src/sp-filter-primitive.h b/src/sp-filter-primitive.h
index 38fd566f7..8e0950f3c 100644
--- a/src/sp-filter-primitive.h
+++ b/src/sp-filter-primitive.h
@@ -45,7 +45,7 @@ public:
 
 struct SPFilterPrimitiveClass {
     SPObjectClass sp_object_class;
-    void (* build_renderer)(SPFilterPrimitive*, Inkscape::Filters::Filter*);
+    //void (* build_renderer)(SPFilterPrimitive*, Inkscape::Filters::Filter*);
 };
 
 class CFilterPrimitive : public CObject {
diff --git a/src/sp-filter.cpp b/src/sp-filter.cpp
index 2a2c6de1c..db6b933e7 100644
--- a/src/sp-filter.cpp
+++ b/src/sp-filter.cpp
@@ -760,11 +760,13 @@ void sp_filter_build_renderer(SPFilter *sp_filter, Inkscape::Filters::Filter *nr
         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");
-            }
+
+//            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");
+//            }  // CPPIFY: => FilterPrimitive should be abstract.
+            primitive->cfilterprimitive->onBuildRenderer(nr_filter);
         }
         primitive_obj = primitive_obj->next;
     }