index 8b7578fe8f058b751e54715cb95c412725487624..e6eab5032264c454b762b7029d827e2c2bf4b719 100644 (file)
--- a/src/sp-gaussian-blur.cpp
+++ b/src/sp-gaussian-blur.cpp
static void sp_gaussianBlur_release(SPObject *object);
static void sp_gaussianBlur_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_gaussianBlur_update(SPObject *object, SPCtx *ctx, guint flags);
-static Inkscape::XML::Node *sp_gaussianBlur_write(SPObject *object, Inkscape::XML::Node *repr, guint flags);
-static void sp_gaussianBlur_build_renderer(SPFilterPrimitive *primitive, NR::Filter *filter);
+static Inkscape::XML::Node *sp_gaussianBlur_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
+static void sp_gaussianBlur_build_renderer(SPFilterPrimitive *primitive, Inkscape::Filters::Filter *filter);
static SPFilterPrimitiveClass *gaussianBlur_parent_class;
}
static void
-sp_gaussianBlur_init(SPGaussianBlur *gaussianBlur)
+sp_gaussianBlur_init(SPGaussianBlur */*gaussianBlur*/)
{
}
sp_gaussianBlur_set(SPObject *object, unsigned int key, gchar const *value)
{
SPGaussianBlur *gaussianBlur = SP_GAUSSIANBLUR(object);
-
+
switch(key) {
case SP_ATTR_STDDEVIATION:
gaussianBlur->stdDeviation.set(value);
* Writes its settings to an incoming repr object, if any.
*/
static Inkscape::XML::Node *
-sp_gaussianBlur_write(SPObject *object, Inkscape::XML::Node *repr, guint flags)
+sp_gaussianBlur_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags)
{
-
- // Inkscape-only object, not copied during an "plain SVG" dump:
- if (flags & SP_OBJECT_WRITE_EXT) {
- if (repr) {
- // is this sane?
- // repr->mergeFrom(SP_OBJECT_REPR(object), "id");
- } else {
- repr = SP_OBJECT_REPR(object)->duplicate(NULL); // FIXME
- }
+ /* TODO: Don't just clone, but create a new repr node and write all
+ * relevant values into it */
+ if (!repr) {
+ repr = SP_OBJECT_REPR(object)->duplicate(doc);
}
if (((SPObjectClass *) gaussianBlur_parent_class)->write) {
- ((SPObjectClass *) gaussianBlur_parent_class)->write(object, repr, flags);
+ ((SPObjectClass *) gaussianBlur_parent_class)->write(object, doc, repr, flags);
}
return repr;
@@ -186,12 +181,12 @@ void sp_gaussianBlur_setDeviation(SPGaussianBlur *blur, float num, float optnum
blur->stdDeviation.setOptNumber(optnum);
}
-static void sp_gaussianBlur_build_renderer(SPFilterPrimitive *primitive, NR::Filter *filter) {
+static void sp_gaussianBlur_build_renderer(SPFilterPrimitive *primitive, Inkscape::Filters::Filter *filter) {
SPGaussianBlur *sp_blur = SP_GAUSSIANBLUR(primitive);
- int handle = filter->add_primitive(NR::NR_FILTER_GAUSSIANBLUR);
- NR::FilterPrimitive *nr_primitive = filter->get_primitive(handle);
- NR::FilterGaussian *nr_blur = dynamic_cast<NR::FilterGaussian*>(nr_primitive);
+ int handle = filter->add_primitive(Inkscape::Filters::NR_FILTER_GAUSSIANBLUR);
+ Inkscape::Filters::FilterPrimitive *nr_primitive = filter->get_primitive(handle);
+ Inkscape::Filters::FilterGaussian *nr_blur = dynamic_cast<Inkscape::Filters::FilterGaussian*>(nr_primitive);
sp_filter_primitive_renderer_common(primitive, nr_primitive);