Merge from fe-moved

(bzr r6891)

1 files changed, 0 insertions, 259 deletions

diff --git a/src/sp-fedisplacementmap.cpp b/src/sp-fedisplacementmap.cpp
deleted file mode 100644
index a30dd2f9b..000000000
--- a/src/sp-fedisplacementmap.cpp
+++ /dev/null
@@ -1,259 +0,0 @@
-#define __SP_FEDISPLACEMENTMAP_CPP__
-
-/** \file
- * SVG <feDisplacementMap> implementation.
- *
- */
-/*
- * Authors:
- *   hugo Rodrigues <haa.rodrigues@gmail.com>
- *
- * Copyright (C) 2006 Hugo Rodrigues
- *
- * Released under GNU GPL, read the file 'COPYING' for more information
- */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include "attributes.h"
-#include "svg/svg.h"
-#include "sp-fedisplacementmap.h"
-#include "xml/repr.h"
-#include "display/nr-filter-displacement-map.h"
-#include "helper-fns.h"
-
-/* FeDisplacementMap base class */
-
-static void sp_feDisplacementMap_class_init(SPFeDisplacementMapClass *klass);
-static void sp_feDisplacementMap_init(SPFeDisplacementMap *feDisplacementMap);
-
-static void sp_feDisplacementMap_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
-static void sp_feDisplacementMap_release(SPObject *object);
-static void sp_feDisplacementMap_set(SPObject *object, unsigned int key, gchar const *value);
-static void sp_feDisplacementMap_update(SPObject *object, SPCtx *ctx, guint flags);
-static void sp_feDisplacementMap_build_renderer(SPFilterPrimitive *primitive, NR::Filter *filter);
-static Inkscape::XML::Node *sp_feDisplacementMap_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
-
-static SPFilterPrimitiveClass *feDisplacementMap_parent_class;
-
-GType
-sp_feDisplacementMap_get_type()
-{
-    static GType feDisplacementMap_type = 0;
-
-    if (!feDisplacementMap_type) {
-        GTypeInfo feDisplacementMap_info = {
-            sizeof(SPFeDisplacementMapClass),
-            NULL, NULL,
-            (GClassInitFunc) sp_feDisplacementMap_class_init,
-            NULL, NULL,
-            sizeof(SPFeDisplacementMap),
-            16,
-            (GInstanceInitFunc) sp_feDisplacementMap_init,
-            NULL,    /* value_table */
-        };
-        feDisplacementMap_type = g_type_register_static(SP_TYPE_FILTER_PRIMITIVE, "SPFeDisplacementMap", &feDisplacementMap_info, (GTypeFlags)0);
-    }
-    return feDisplacementMap_type;
-}
-
-static void
-sp_feDisplacementMap_class_init(SPFeDisplacementMapClass *klass)
-{
-    SPObjectClass *sp_object_class = (SPObjectClass *)klass;
-    SPFilterPrimitiveClass *sp_primitive_class = (SPFilterPrimitiveClass *)klass;
-
-    feDisplacementMap_parent_class = (SPFilterPrimitiveClass*)g_type_class_peek_parent(klass);
-
-    sp_object_class->build = sp_feDisplacementMap_build;
-    sp_object_class->release = sp_feDisplacementMap_release;
-    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;
-}
-
-static void
-sp_feDisplacementMap_init(SPFeDisplacementMap *feDisplacementMap)
-{
-    feDisplacementMap->scale=0;
-    feDisplacementMap->xChannelSelector = DISPLACEMENTMAP_CHANNEL_ALPHA;
-    feDisplacementMap->yChannelSelector = DISPLACEMENTMAP_CHANNEL_ALPHA;
-    feDisplacementMap->in2 = NR::NR_FILTER_SLOT_NOT_SET;
-}
-
-/**
- * Reads the Inkscape::XML::Node, and initializes SPFeDisplacementMap variables.  For this to get called,
- * our name must be associated with a repr via "sp_object_type_register".  Best done through
- * sp-object-repr.cpp's repr_name_entries array.
- */
-static void
-sp_feDisplacementMap_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
-{
-    if (((SPObjectClass *) feDisplacementMap_parent_class)->build) {
-        ((SPObjectClass *) feDisplacementMap_parent_class)->build(object, document, repr);
-    }
-
-    /*LOAD ATTRIBUTES FROM REPR HERE*/
-    sp_object_read_attr(object, "scale");
-    sp_object_read_attr(object, "in2");
-    sp_object_read_attr(object, "xChannelSelector");
-    sp_object_read_attr(object, "yChannelSelector");
-}
-
-/**
- * Drops any allocated memory.
- */
-static void
-sp_feDisplacementMap_release(SPObject *object)
-{
-    if (((SPObjectClass *) feDisplacementMap_parent_class)->release)
-        ((SPObjectClass *) feDisplacementMap_parent_class)->release(object);
-}
-
-static FilterDisplacementMapChannelSelector sp_feDisplacementMap_readChannelSelector(gchar const *value)
-{
-    if (!value) return DISPLACEMENTMAP_CHANNEL_ALPHA;
-    switch (value[0]) {
-        case 'R':
-            return DISPLACEMENTMAP_CHANNEL_RED;
-            break;
-        case 'G':
-            return DISPLACEMENTMAP_CHANNEL_GREEN;
-            break;
-        case 'B':
-            return DISPLACEMENTMAP_CHANNEL_BLUE;
-            break;
-        case 'A':
-            return DISPLACEMENTMAP_CHANNEL_ALPHA;
-            break;
-        default:
-            // error
-            g_warning("Invalid attribute for Channel Selector. Valid modes are 'R', 'G', 'B' or 'A'");
-            break;
-    }
-    return DISPLACEMENTMAP_CHANNEL_ALPHA; //default is Alpha Channel
-}
-
-/**
- * Sets a specific value in the SPFeDisplacementMap.
- */
-static void
-sp_feDisplacementMap_set(SPObject *object, unsigned int key, gchar const *value)
-{
-    SPFeDisplacementMap *feDisplacementMap = SP_FEDISPLACEMENTMAP(object);
-    (void)feDisplacementMap;
-    int input;
-    double read_num;
-    FilterDisplacementMapChannelSelector read_selector;
-    switch(key) {
-	/*DEAL WITH SETTING ATTRIBUTES HERE*/
-        case SP_ATTR_XCHANNELSELECTOR:
-            read_selector = sp_feDisplacementMap_readChannelSelector(value);
-            if (read_selector != feDisplacementMap->xChannelSelector){
-                feDisplacementMap->xChannelSelector = read_selector;
-                object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
-            }
-            break;
-        case SP_ATTR_YCHANNELSELECTOR:
-            read_selector = sp_feDisplacementMap_readChannelSelector(value);
-            if (read_selector != feDisplacementMap->yChannelSelector){
-                feDisplacementMap->yChannelSelector = read_selector;
-                object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
-            }
-            break;
-        case SP_ATTR_SCALE:
-            read_num = helperfns_read_number(value);
-            if (read_num != feDisplacementMap->scale) {
-                feDisplacementMap->scale = read_num;
-                object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
-            }
-            break;
-        case SP_ATTR_IN2:
-            input = sp_filter_primitive_read_in(feDisplacementMap, value);
-            if (input != feDisplacementMap->in2) {
-                feDisplacementMap->in2 = input;
-                object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
-            }
-            break;
-        default:
-            if (((SPObjectClass *) feDisplacementMap_parent_class)->set)
-                ((SPObjectClass *) feDisplacementMap_parent_class)->set(object, key, value);
-            break;
-    }
-
-}
-
-/**
- * Receives update notifications.
- */
-static void
-sp_feDisplacementMap_update(SPObject *object, SPCtx *ctx, guint flags)
-{
-    if (flags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG |
-                 SP_OBJECT_VIEWPORT_MODIFIED_FLAG)) {
-
-        /* do something to trigger redisplay, updates? */
-
-    }
-
-    if (((SPObjectClass *) feDisplacementMap_parent_class)->update) {
-        ((SPObjectClass *) feDisplacementMap_parent_class)->update(object, ctx, flags);
-    }
-}
-
-/**
- * Writes its settings to an incoming repr object, if any.
- */
-static Inkscape::XML::Node *
-sp_feDisplacementMap_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(doc);
-        }
-    }
-
-    if (((SPObjectClass *) feDisplacementMap_parent_class)->write) {
-        ((SPObjectClass *) feDisplacementMap_parent_class)->write(object, doc, repr, flags);
-    }
-
-    return repr;
-}
-
-static void sp_feDisplacementMap_build_renderer(SPFilterPrimitive *primitive, NR::Filter *filter) {
-    g_assert(primitive != NULL);
-    g_assert(filter != NULL);
-
-    SPFeDisplacementMap *sp_displacement_map = SP_FEDISPLACEMENTMAP(primitive);
-
-    int primitive_n = filter->add_primitive(NR::NR_FILTER_DISPLACEMENTMAP);
-    NR::FilterPrimitive *nr_primitive = filter->get_primitive(primitive_n);
-    NR::FilterDisplacementMap *nr_displacement_map = dynamic_cast<NR::FilterDisplacementMap*>(nr_primitive);
-    g_assert(nr_displacement_map != NULL);
-
-    sp_filter_primitive_renderer_common(primitive, nr_primitive);
-
-    nr_displacement_map->set_input(1, sp_displacement_map->in2);
-    nr_displacement_map->set_scale(sp_displacement_map->scale);
-    nr_displacement_map->set_channel_selector(0, sp_displacement_map->xChannelSelector);
-    nr_displacement_map->set_channel_selector(1, sp_displacement_map->yChannelSelector);
-}
-
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :