From 68ec840bca073bc8e8ea2f58ad36078df9c619c1 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Mon, 15 Jul 2002 01:46:17 +0000 Subject: ** fixes for #10781 2002-07-10 Not Zed ** fixes for #10781 * filter-int.c (xml_encode): (xml_decode): Handle encoding/decoding with a type name, in a manner compatible with the score/label elemtns. (filter_int_new_type): New constructor to create a generic 'int' type. * filter-score.c: Removed. Now relies on using a filter-int with appropriate settings. * filter-label.[ch]: Now inherits from filter-int. * rule-context.c (rule_context_revert): New method to revert a filter context back to a user-file's definition. (revert): implementation. * filter-rule.h: Added new virtual method _eq and wrapper, and fixed all subclasses to implement it. * filter-element.h: Added new virtual method _eq and wrapper. Fixed all subclasses to implement it. svn path=/trunk/; revision=17448 --- filter/filter-colour.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'filter/filter-colour.c') diff --git a/filter/filter-colour.c b/filter/filter-colour.c index 0836c30932..2a3f68b887 100644 --- a/filter/filter-colour.c +++ b/filter/filter-colour.c @@ -30,6 +30,7 @@ #define d(x) +static int colour_eq(FilterElement *fe, FilterElement *cm); static void xml_create(FilterElement *fe, xmlNodePtr node); static xmlNodePtr xml_encode(FilterElement *fe); static int xml_decode(FilterElement *fe, xmlNodePtr node); @@ -88,6 +89,7 @@ filter_colour_class_init (FilterColourClass *class) object_class->finalize = filter_colour_finalise; /* override methods */ + filter_element->eq = colour_eq; filter_element->xml_create = xml_create; filter_element->xml_encode = xml_encode; filter_element->xml_decode = xml_decode; @@ -130,6 +132,18 @@ filter_colour_new(void) return o; } +static int +colour_eq(FilterElement *fe, FilterElement *cm) +{ + FilterColour *fc = (FilterColour *)fe, *cc = (FilterColour *)cm; + + return ((FilterElementClass *)(parent_class))->eq(fe, cm) + && fc->r == cc->r + && fc->g == cc->g + && fc->b == cc->b + && fc->a == cc->a; +} + static void xml_create(FilterElement *fe, xmlNodePtr node) { /*FilterColour *fc = (FilterColour *)fe;*/ -- cgit v1.2.3