![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/sp-filter.cpp b/src/sp-filter.cpp
index e89108d1cae83c3773dd7fc31921a30da7ebeb0f..cfd6253a3e7c0e64b8b9dd023abfad2e95ea0c92 100644 (file)
--- a/src/sp-filter.cpp
+++ b/src/sp-filter.cpp
-#define __SP_FILTER_CPP__
-
/** \file
* SVG <filter> implementation.
*/
* Authors:
* Hugo Rodrigues <haa.rodrigues@gmail.com>
* Niko Kiirala <niko@kiirala.com>
+ * Jon A. Cruz <jon@joncruz.org>
+ * Abhishek Sharma
*
* Copyright (C) 2006,2007 Authors
*
using std::map;
using std::pair;
+#include <gtkmm.h>
+
#include "attributes.h"
#include "document.h"
#include "sp-filter.h"
#include "sp-filter-reference.h"
#include "uri.h"
#include "xml/repr.h"
+#include <cstring>
+#include <string>
#define SP_MACROS_SILENT
#include "macros.h"
-#include "display/nr-filter.cpp"
+#include "display/nr-filter.h"
/* Filter base class */
Inkscape::XML::Node *child,
Inkscape::XML::Node *ref);
static void sp_filter_remove_child(SPObject *object, Inkscape::XML::Node *child);
-static Inkscape::XML::Node *sp_filter_write(SPObject *object, Inkscape::XML::Node *repr, guint flags);
+static Inkscape::XML::Node *sp_filter_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
static void filter_ref_changed(SPObject *old_ref, SPObject *ref, SPFilter *filter);
static void filter_ref_modified(SPObject *href, guint flags, SPFilter *filter);
filter->height = 0;
filter->filterUnits = SP_FILTER_UNITS_OBJECTBOUNDINGBOX;
- filter->primitiveUnits = SP_FILTER_UNITS_OBJECTBOUNDINGBOX;
+ filter->primitiveUnits = SP_FILTER_UNITS_USERSPACEONUSE;
filter->filterUnits_set = FALSE;
filter->primitiveUnits_set = FALSE;
filter->_renderer = NULL;
- filter->_image_name = map<gchar *, int, ltstr>();
+ filter->_image_name = new std::map<gchar *, int, ltstr>;
+ filter->_image_name->clear();
+ filter->_image_number_next = 0;
filter->filterRes = NumberOptNumber();
@@ -130,17 +136,17 @@ sp_filter_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *rep
}
//Read values of key attributes from XML nodes into object.
- sp_object_read_attr(object, "filterUnits");
- sp_object_read_attr(object, "primitiveUnits");
- sp_object_read_attr(object, "x");
- sp_object_read_attr(object, "y");
- sp_object_read_attr(object, "width");
- sp_object_read_attr(object, "height");
- sp_object_read_attr(object, "filterRes");
- sp_object_read_attr(object, "xlink:href");
+ object->readAttr( "filterUnits" );
+ object->readAttr( "primitiveUnits" );
+ object->readAttr( "x" );
+ object->readAttr( "y" );
+ object->readAttr( "width" );
+ object->readAttr( "height" );
+ object->readAttr( "filterRes" );
+ object->readAttr( "xlink:href" );
//is this necessary?
- sp_document_add_resource(document, "filter", object);
+ document->addResource("filter", object);
}
/**
if (SP_OBJECT_DOCUMENT(object)) {
/* Unregister ourselves */
- sp_document_remove_resource(SP_OBJECT_DOCUMENT(object), "filter", SP_OBJECT(object));
+ SP_OBJECT_DOCUMENT(object)->removeResource("filter", SP_OBJECT(object));
}
//TODO: release resources here
}
filter->modified_connection.~connection();
+ delete filter->_image_name;
if (((SPObjectClass *) filter_parent_class)->release)
((SPObjectClass *) filter_parent_class)->release(object);
break;
case SP_ATTR_PRIMITIVEUNITS:
if (value) {
- if (!strcmp(value, "userSpaceOnUse")) {
- filter->primitiveUnits = SP_FILTER_UNITS_USERSPACEONUSE;
- } else {
+ if (!strcmp(value, "objectBoundingBox")) {
filter->primitiveUnits = SP_FILTER_UNITS_OBJECTBOUNDINGBOX;
+ } else {
+ filter->primitiveUnits = SP_FILTER_UNITS_USERSPACEONUSE;
}
filter->primitiveUnits_set = TRUE;
} else {
- filter->primitiveUnits = SP_FILTER_UNITS_OBJECTBOUNDINGBOX;
+ filter->primitiveUnits = SP_FILTER_UNITS_USERSPACEONUSE;
filter->primitiveUnits_set = FALSE;
}
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
* Writes its settings to an incoming repr object, if any.
*/
static Inkscape::XML::Node *
-sp_filter_write(SPObject *object, Inkscape::XML::Node *repr, guint flags)
+sp_filter_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags)
{
SPFilter *filter = SP_FILTER(object);
- if (!repr) {
- repr = SP_OBJECT_REPR(object)->duplicate(NULL); // FIXME
+ // Original from sp-item-group.cpp
+ if (flags & SP_OBJECT_WRITE_BUILD) {
+ if (!repr) {
+ repr = doc->createElement("svg:filter");
+ }
+ GSList *l = NULL;
+ for ( SPObject *child = object->firstChild(); child; child = child->getNext() ) {
+ Inkscape::XML::Node *crepr = child->updateRepr(doc, NULL, flags);
+ if (crepr) {
+ l = g_slist_prepend (l, crepr);
+ }
+ }
+ while (l) {
+ repr->addChild((Inkscape::XML::Node *) l->data, NULL);
+ Inkscape::GC::release((Inkscape::XML::Node *) l->data);
+ l = g_slist_remove (l, l->data);
+ }
+ } else {
+ for ( SPObject *child = object->firstChild() ; child; child = child->getNext() ) {
+ child->updateRepr(flags);
+ }
}
if ((flags & SP_OBJECT_WRITE_ALL) || filter->filterUnits_set) {
if ((flags & SP_OBJECT_WRITE_ALL) || filter->primitiveUnits_set) {
switch (filter->primitiveUnits) {
- case SP_FILTER_UNITS_USERSPACEONUSE:
- repr->setAttribute("primitiveUnits", "userSpaceOnUse");
+ case SP_FILTER_UNITS_OBJECTBOUNDINGBOX:
+ repr->setAttribute("primitiveUnits", "objectBoundingBox");
break;
default:
- repr->setAttribute("primitiveUnits", "objectBoundingBox");
+ repr->setAttribute("primitiveUnits", "userSpaceOnUse");
break;
}
}
g_free(uri_string);
}
+ // TODO: This is evil, correctly implement support for color-interpolation-filters!!!
+ // The color-interpolation-filters attribute is initially set to linearRGB according to the SVG standard.
+ // However, Inkscape completely ignores it and implicitly assumes that it is sRGB (like color-interpolation-filters).
+ // This results in a discrepancy between Inkscape and other renderers in how they render filters.
+ // To mitigate this problem I've (Jasper van de Gronde,th.v.d.gronde@hccnet.nl) added this to ensure that at least
+ // any filters written by Inkscape will henceforth be rendered the same in other renderers.
+ // In the future Inkscape should have proper support for the color-interpolation properties and this should be changed.
+ repr->setAttribute("color-interpolation-filters", "sRGB");
+
if (((SPObjectClass *) filter_parent_class)->write) {
- ((SPObjectClass *) filter_parent_class)->write(object, repr, flags);
+ ((SPObjectClass *) filter_parent_class)->write(object, doc, repr, flags);
}
return repr;
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
}
-void sp_filter_build_renderer(SPFilter *sp_filter, NR::Filter *nr_filter)
+void sp_filter_build_renderer(SPFilter *sp_filter, Inkscape::Filters::Filter *nr_filter)
{
g_assert(sp_filter != NULL);
g_assert(nr_filter != NULL);
sp_filter->_renderer = nr_filter;
+ nr_filter->set_filter_units(sp_filter->filterUnits);
+ nr_filter->set_primitive_units(sp_filter->primitiveUnits);
nr_filter->set_x(sp_filter->x);
nr_filter->set_y(sp_filter->y);
nr_filter->set_width(sp_filter->width);
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;
}
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;
}
return value;
}
+gchar const *sp_filter_name_for_image(SPFilter const *filter, int const image) {
+ switch (image) {
+ case Inkscape::Filters::NR_FILTER_SOURCEGRAPHIC:
+ return "SourceGraphic";
+ break;
+ case Inkscape::Filters::NR_FILTER_SOURCEALPHA:
+ return "SourceAlpha";
+ break;
+ case Inkscape::Filters::NR_FILTER_BACKGROUNDIMAGE:
+ return "BackgroundImage";
+ break;
+ case Inkscape::Filters::NR_FILTER_BACKGROUNDALPHA:
+ return "BackgroundAlpha";
+ break;
+ case Inkscape::Filters::NR_FILTER_STROKEPAINT:
+ return "StrokePaint";
+ break;
+ case Inkscape::Filters::NR_FILTER_FILLPAINT:
+ return "FillPaint";
+ break;
+ case Inkscape::Filters::NR_FILTER_SLOT_NOT_SET:
+ case Inkscape::Filters::NR_FILTER_UNNAMED_SLOT:
+ return 0;
+ break;
+ default:
+ for (map<gchar *, int, ltstr>::const_iterator i
+ = filter->_image_name->begin() ;
+ i != filter->_image_name->end() ; i++) {
+ if (i->second == image) {
+ return i->first;
+ }
+ }
+ }
+ return 0;
+}
+
+Glib::ustring sp_filter_get_new_result_name(SPFilter *filter) {
+ g_assert(filter != NULL);
+ int largest = 0;
+
+ SPObject *primitive_obj = filter->children;
+ while (primitive_obj) {
+ if (SP_IS_FILTER_PRIMITIVE(primitive_obj)) {
+ Inkscape::XML::Node *repr = SP_OBJECT_REPR(primitive_obj);
+ char const *result = repr->attribute("result");
+ int index;
+ if (result && sscanf(result, "result%d", &index) == 1) {
+ if (index > largest) {
+ largest = index;
+ }
+ }
+ }
+ primitive_obj = primitive_obj->next;
+ }
+
+ return "result" + Glib::Ascii::dtostr(largest + 1);
+}
+
bool ltstr::operator()(const char* s1, const char* s2) const
{
return strcmp(s1, s2) < 0;
fill-column:99
End:
*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :