X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fsp-fetile.cpp;h=598ccdb84bd5b98108b08366039198369c7ef102;hb=9e973c4fb2183b877bb600a7e9c75e93b3e7d6d1;hp=a00bdd1e1a662b019f08fc721ebacb5d8fa2d4c3;hpb=8c833a9abfd335f0305466ad7451c03c2f6b50dd;p=inkscape.git diff --git a/src/sp-fetile.cpp b/src/sp-fetile.cpp index a00bdd1e1..598ccdb84 100644 --- a/src/sp-fetile.cpp +++ b/src/sp-fetile.cpp @@ -32,7 +32,8 @@ static void sp_feTile_build(SPObject *object, SPDocument *document, Inkscape::XM static void sp_feTile_release(SPObject *object); static void sp_feTile_set(SPObject *object, unsigned int key, gchar const *value); static void sp_feTile_update(SPObject *object, SPCtx *ctx, guint flags); -static Inkscape::XML::Node *sp_feTile_write(SPObject *object, Inkscape::XML::Node *repr, guint flags); +static Inkscape::XML::Node *sp_feTile_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags); +static void sp_feTile_build_renderer(SPFilterPrimitive *primitive, NR::Filter *filter); static SPFilterPrimitiveClass *feTile_parent_class; @@ -61,6 +62,7 @@ static void sp_feTile_class_init(SPFeTileClass *klass) { SPObjectClass *sp_object_class = (SPObjectClass *)klass; + SPFilterPrimitiveClass *sp_primitive_class = (SPFilterPrimitiveClass *)klass; feTile_parent_class = (SPFilterPrimitiveClass*)g_type_class_peek_parent(klass); @@ -69,10 +71,11 @@ 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; } static void -sp_feTile_init(SPFeTile *feTile) +sp_feTile_init(SPFeTile */*feTile*/) { } @@ -108,8 +111,9 @@ static void sp_feTile_set(SPObject *object, unsigned int key, gchar const *value) { SPFeTile *feTile = SP_FETILE(object); + (void)feTile; - switch(key) { + switch(key) { /*DEAL WITH SETTING ATTRIBUTES HERE*/ default: if (((SPObjectClass *) feTile_parent_class)->set) @@ -141,25 +145,39 @@ sp_feTile_update(SPObject *object, SPCtx *ctx, guint flags) * Writes its settings to an incoming repr object, if any. */ static Inkscape::XML::Node * -sp_feTile_write(SPObject *object, Inkscape::XML::Node *repr, guint flags) +sp_feTile_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"); + //repr->mergeFrom(SP_OBJECT_REPR(object), "id"); } else { - repr = SP_OBJECT_REPR(object)->duplicate(); + repr = SP_OBJECT_REPR(object)->duplicate(doc); } } if (((SPObjectClass *) feTile_parent_class)->write) { - ((SPObjectClass *) feTile_parent_class)->write(object, repr, flags); + ((SPObjectClass *) feTile_parent_class)->write(object, doc, repr, flags); } return repr; } +static void sp_feTile_build_renderer(SPFilterPrimitive *primitive, NR::Filter *filter) { + g_assert(primitive != NULL); + g_assert(filter != NULL); + + SPFeTile *sp_tile = SP_FETILE(primitive); + (void)sp_tile; + + int primitive_n = filter->add_primitive(NR::NR_FILTER_TILE); + NR::FilterPrimitive *nr_primitive = filter->get_primitive(primitive_n); + NR::FilterTile *nr_tile = dynamic_cast(nr_primitive); + g_assert(nr_tile != NULL); + + sp_filter_primitive_renderer_common(primitive, nr_primitive); +} /* Local Variables: