Registered classes with new factory. Hkern, Vkern and FeFuncX have to be rewritten, as they aren't real classes.

(bzr r11608.1.69)

19 files changed, 190 insertions, 0 deletions

diff --git a/src/filters/blend.cpp b/src/filters/blend.cpp
index e5159d522..4ca8a8496 100644
--- a/src/filters/blend.cpp
+++ b/src/filters/blend.cpp
@@ -30,6 +30,16 @@
 #include "display/nr-filter-blend.h"
 #include "display/nr-filter-types.h"
 
+#include "sp-factory.h"
+
+namespace {
+	SPObject* createBlend() {
+		return new SPFeBlend();
+	}
+
+	bool blendRegistered = SPFactory::instance().registerObject("svg:feBlend", createBlend);
+}
+
 /* FeBlend base class */
 G_DEFINE_TYPE(SPFeBlend, sp_feBlend, G_TYPE_OBJECT);
 
diff --git a/src/filters/colormatrix.cpp b/src/filters/colormatrix.cpp
index 889913e2e..ee27a85e6 100644
--- a/src/filters/colormatrix.cpp
+++ b/src/filters/colormatrix.cpp
@@ -29,6 +29,16 @@
 #include "display/nr-filter.h"
 #include "display/nr-filter-colormatrix.h"
 
+#include "sp-factory.h"
+
+namespace {
+	SPObject* createColorMatrix() {
+		return new SPFeColorMatrix();
+	}
+
+	bool colorMatrixRegistered = SPFactory::instance().registerObject("svg:feColorMatrix", createColorMatrix);
+}
+
 /* FeColorMatrix base class */
 G_DEFINE_TYPE(SPFeColorMatrix, sp_feColorMatrix, G_TYPE_OBJECT);
 
diff --git a/src/filters/componenttransfer.cpp b/src/filters/componenttransfer.cpp
index ec1cdb641..0a35c9a14 100644
--- a/src/filters/componenttransfer.cpp
+++ b/src/filters/componenttransfer.cpp
@@ -27,6 +27,16 @@
 #include "display/nr-filter.h"
 #include "display/nr-filter-component-transfer.h"
 
+#include "sp-factory.h"
+
+namespace {
+	SPObject* createComponentTransfer() {
+		return new SPFeComponentTransfer();
+	}
+
+	bool componentTransferRegistered = SPFactory::instance().registerObject("svg:feComponentTransfer", createComponentTransfer);
+}
+
 /* FeComponentTransfer base class */
 G_DEFINE_TYPE(SPFeComponentTransfer, sp_feComponentTransfer, G_TYPE_OBJECT);
 
diff --git a/src/filters/composite.cpp b/src/filters/composite.cpp
index cddcc86bd..a6bf107d9 100644
--- a/src/filters/composite.cpp
+++ b/src/filters/composite.cpp
@@ -25,6 +25,16 @@
 #include "display/nr-filter-composite.h"
 #include "sp-filter.h"
 
+#include "sp-factory.h"
+
+namespace {
+	SPObject* createComposite() {
+		return new SPFeComposite();
+	}
+
+	bool compositeRegistered = SPFactory::instance().registerObject("svg:feComposite", createComposite);
+}
+
 /* FeComposite base class */
 G_DEFINE_TYPE(SPFeComposite, sp_feComposite, G_TYPE_OBJECT);
 
diff --git a/src/filters/convolvematrix.cpp b/src/filters/convolvematrix.cpp
index 174c74288..d1be96a73 100644
--- a/src/filters/convolvematrix.cpp
+++ b/src/filters/convolvematrix.cpp
@@ -28,6 +28,16 @@
 #include "display/nr-filter.h"
 #include "display/nr-filter-convolve-matrix.h"
 
+#include "sp-factory.h"
+
+namespace {
+	SPObject* createConvolveMatrix() {
+		return new SPFeConvolveMatrix();
+	}
+
+	bool convolveMatrixRegistered = SPFactory::instance().registerObject("svg:feConvolveMatrix", createConvolveMatrix);
+}
+
 /* FeConvolveMatrix base class */
 G_DEFINE_TYPE(SPFeConvolveMatrix, sp_feConvolveMatrix, G_TYPE_OBJECT);
 
diff --git a/src/filters/diffuselighting.cpp b/src/filters/diffuselighting.cpp
index b53451f73..8cdd5e76b 100644
--- a/src/filters/diffuselighting.cpp
+++ b/src/filters/diffuselighting.cpp
@@ -36,6 +36,16 @@
 /* FeDiffuseLighting base class */
 static void sp_feDiffuseLighting_children_modified(SPFeDiffuseLighting *sp_diffuselighting);
 
+#include "sp-factory.h"
+
+namespace {
+	SPObject* createDiffuseLighting() {
+		return new SPFeDiffuseLighting();
+	}
+
+	bool diffuseLightingRegistered = SPFactory::instance().registerObject("svg:feDiffuseLighting", createDiffuseLighting);
+}
+
 G_DEFINE_TYPE(SPFeDiffuseLighting, sp_feDiffuseLighting, G_TYPE_OBJECT);
 
 static void
diff --git a/src/filters/displacementmap.cpp b/src/filters/displacementmap.cpp
index 79431c251..b192083c1 100644
--- a/src/filters/displacementmap.cpp
+++ b/src/filters/displacementmap.cpp
@@ -25,6 +25,16 @@
 #include "display/nr-filter.h"
 #include "display/nr-filter-displacement-map.h"
 
+#include "sp-factory.h"
+
+namespace {
+	SPObject* createDisplacementMap() {
+		return new SPFeDisplacementMap();
+	}
+
+	bool displacementMapRegistered = SPFactory::instance().registerObject("svg:feDisplacementMap", createDisplacementMap);
+}
+
 /* FeDisplacementMap base class */
 G_DEFINE_TYPE(SPFeDisplacementMap, sp_feDisplacementMap, G_TYPE_OBJECT);
 
diff --git a/src/filters/flood.cpp b/src/filters/flood.cpp
index 7d8df14fb..eb24d2748 100644
--- a/src/filters/flood.cpp
+++ b/src/filters/flood.cpp
@@ -27,6 +27,16 @@
 #include "display/nr-filter.h"
 #include "display/nr-filter-flood.h"
 
+#include "sp-factory.h"
+
+namespace {
+	SPObject* createFlood() {
+		return new SPFeFlood();
+	}
+
+	bool floodRegistered = SPFactory::instance().registerObject("svg:feFlood", createFlood);
+}
+
 /* FeFlood base class */
 G_DEFINE_TYPE(SPFeFlood, sp_feFlood, G_TYPE_OBJECT);
 
diff --git a/src/filters/gaussian-blur.cpp b/src/filters/gaussian-blur.cpp
index 643b695e6..f66e045f2 100644
--- a/src/filters/gaussian-blur.cpp
+++ b/src/filters/gaussian-blur.cpp
@@ -30,6 +30,16 @@
 //#define SP_MACROS_SILENT
 //#include "macros.h"
 
+#include "sp-factory.h"
+
+namespace {
+	SPObject* createGaussianBlur() {
+		return new SPGaussianBlur();
+	}
+
+	bool gaussianBlurRegistered = SPFactory::instance().registerObject("svg:feGaussianBlur", createGaussianBlur);
+}
+
 /* GaussianBlur base class */
 G_DEFINE_TYPE(SPGaussianBlur, sp_gaussianBlur, G_TYPE_OBJECT);
 
diff --git a/src/filters/image.cpp b/src/filters/image.cpp
index 6c8af9c01..e6d1eceec 100644
--- a/src/filters/image.cpp
+++ b/src/filters/image.cpp
@@ -29,6 +29,16 @@
 
 #include "display/nr-filter.h"
 
+#include "sp-factory.h"
+
+namespace {
+	SPObject* createImage() {
+		return new SPFeImage();
+	}
+
+	bool imageRegistered = SPFactory::instance().registerObject("svg:feImage", createImage);
+}
+
 /* FeImage base class */
 G_DEFINE_TYPE(SPFeImage, sp_feImage, G_TYPE_OBJECT);
 
diff --git a/src/filters/merge.cpp b/src/filters/merge.cpp
index 01fb4bb72..505f12887 100644
--- a/src/filters/merge.cpp
+++ b/src/filters/merge.cpp
@@ -24,6 +24,16 @@
 #include "display/nr-filter.h"
 #include "display/nr-filter-merge.h"
 
+#include "sp-factory.h"
+
+namespace {
+	SPObject* createMerge() {
+		return new SPFeMerge();
+	}
+
+	bool mergeRegistered = SPFactory::instance().registerObject("svg:feMerge", createMerge);
+}
+
 /* FeMerge base class */
 G_DEFINE_TYPE(SPFeMerge, sp_feMerge, G_TYPE_OBJECT);
 
diff --git a/src/filters/mergenode.cpp b/src/filters/mergenode.cpp
index c1c5c6067..fbdcc9277 100644
--- a/src/filters/mergenode.cpp
+++ b/src/filters/mergenode.cpp
@@ -23,6 +23,16 @@
 #include "filters/merge.h"
 #include "display/nr-filter-types.h"
 
+#include "sp-factory.h"
+
+namespace {
+	SPObject* createMergeNode() {
+		return new SPFeMergeNode();
+	}
+
+	bool mergeNodeRegistered = SPFactory::instance().registerObject("svg:feMergeNode", createMergeNode);
+}
+
 G_DEFINE_TYPE(SPFeMergeNode, sp_feMergeNode, G_TYPE_OBJECT);
 
 static void
diff --git a/src/filters/morphology.cpp b/src/filters/morphology.cpp
index 87d7dafdc..bbdb702c0 100644
--- a/src/filters/morphology.cpp
+++ b/src/filters/morphology.cpp
@@ -26,6 +26,16 @@
 #include "display/nr-filter.h"
 #include "display/nr-filter-morphology.h"
 
+#include "sp-factory.h"
+
+namespace {
+	SPObject* createMorphology() {
+		return new SPFeMorphology();
+	}
+
+	bool morphologyRegistered = SPFactory::instance().registerObject("svg:feMorphology", createMorphology);
+}
+
 /* FeMorphology base class */
 G_DEFINE_TYPE(SPFeMorphology, sp_feMorphology, G_TYPE_OBJECT);
 
diff --git a/src/filters/offset.cpp b/src/filters/offset.cpp
index 26607e590..ce0490e0d 100644
--- a/src/filters/offset.cpp
+++ b/src/filters/offset.cpp
@@ -25,6 +25,16 @@
 #include "display/nr-filter.h"
 #include "display/nr-filter-offset.h"
 
+#include "sp-factory.h"
+
+namespace {
+	SPObject* createOffset() {
+		return new SPFeOffset();
+	}
+
+	bool offsetRegistered = SPFactory::instance().registerObject("svg:feOffset", createOffset);
+}
+
 /* FeOffset base class */
 G_DEFINE_TYPE(SPFeOffset, sp_feOffset, G_TYPE_OBJECT);
 
diff --git a/src/filters/pointlight.cpp b/src/filters/pointlight.cpp
index 749a4c82b..371166880 100644
--- a/src/filters/pointlight.cpp
+++ b/src/filters/pointlight.cpp
@@ -29,6 +29,16 @@
 #define SP_MACROS_SILENT
 #include "macros.h"
 
+#include "sp-factory.h"
+
+namespace {
+	SPObject* createpPointLight() {
+		return new SPFePointLight();
+	}
+
+	bool pointLightRegistered = SPFactory::instance().registerObject("svg:fePointLight", createPointLight);
+}
+
 G_DEFINE_TYPE(SPFePointLight, sp_fepointlight, G_TYPE_OBJECT);
 
 static void
diff --git a/src/filters/specularlighting.cpp b/src/filters/specularlighting.cpp
index 4b8fe96b6..1409bc88b 100644
--- a/src/filters/specularlighting.cpp
+++ b/src/filters/specularlighting.cpp
@@ -36,6 +36,16 @@
 /* FeSpecularLighting base class */
 static void sp_feSpecularLighting_children_modified(SPFeSpecularLighting *sp_specularlighting);
 
+#include "sp-factory.h"
+
+namespace {
+	SPObject* createSpecularLighting() {
+		return new SPFeSpecularLighting();
+	}
+
+	bool specularLightingRegistered = SPFactory::instance().registerObject("svg:feSpecularLighting", createSpecularLighting);
+}
+
 G_DEFINE_TYPE(SPFeSpecularLighting, sp_feSpecularLighting, G_TYPE_OBJECT);
 
 static void
diff --git a/src/filters/spotlight.cpp b/src/filters/spotlight.cpp
index a1cff9db9..9e89139e3 100644
--- a/src/filters/spotlight.cpp
+++ b/src/filters/spotlight.cpp
@@ -29,6 +29,16 @@
 #define SP_MACROS_SILENT
 #include "macros.h"
 
+#include "sp-factory.h"
+
+namespace {
+	SPObject* createSpotLight() {
+		return new SPFeSpotLight();
+	}
+
+	bool spotLightRegistered = SPFactory::instance().registerObject("svg:feSpotLight", createSpotLight);
+}
+
 G_DEFINE_TYPE(SPFeSpotLight, sp_fespotlight, G_TYPE_OBJECT);
 
 static void
diff --git a/src/filters/tile.cpp b/src/filters/tile.cpp
index 8aefc14c6..f6b4c00d6 100644
--- a/src/filters/tile.cpp
+++ b/src/filters/tile.cpp
@@ -22,6 +22,16 @@
 #include "display/nr-filter.h"
 #include "display/nr-filter-tile.h"
 
+#include "sp-factory.h"
+
+namespace {
+	SPObject* createTile() {
+		return new SPFeTile();
+	}
+
+	bool tileRegistered = SPFactory::instance().registerObject("svg:feTile", createTile);
+}
+
 /* FeTile base class */
 G_DEFINE_TYPE(SPFeTile, sp_feTile, G_TYPE_OBJECT);
 
diff --git a/src/filters/turbulence.cpp b/src/filters/turbulence.cpp
index 758322b9f..8aa168114 100644
--- a/src/filters/turbulence.cpp
+++ b/src/filters/turbulence.cpp
@@ -28,6 +28,16 @@
 #include "display/nr-filter.h"
 #include "display/nr-filter-turbulence.h"
 
+#include "sp-factory.h"
+
+namespace {
+	SPObject* createTurbulence() {
+		return new SPFeTurbulence();
+	}
+
+	bool turbulenceRegistered = SPFactory::instance().registerObject("svg:feTurbulence", createTurbulence);
+}
+
 /* FeTurbulence base class */
 G_DEFINE_TYPE(SPFeTurbulence, sp_feTurbulence, G_TYPE_OBJECT);