From: ellson <devnull@localhost>
Date: Tue, 26 Feb 2008 19:33:14 +0000 (+0000)
Subject: smyrna Makefile.am fixes
X-Git-Tag: LAST_LIBGRAPH~32^2~4682
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4a926b7ef7073bb76399f9041c29aa5a1734f993;p=graphviz

smyrna Makefile.am fixes
---

diff --git a/lib/filter/Makefile.am b/lib/filter/Makefile.am
index 462f41074..a9940c9f5 100644
--- a/lib/filter/Makefile.am
+++ b/lib/filter/Makefile.am
@@ -7,17 +7,16 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/gui \
 	-I$(top_srcdir)/lib/topfish \
 	-I$(top_srcdir)/cmd/smyrna \
+	-I$(top_srcdir)/lib/glcomp \
 	-I$(top_srcdir)/lib/xdot \
 	-I$(top_srcdir)/lib/cgraph \
 	-I$(top_srcdir)/lib/cdt \
 	$(GTK_CFLAGS) $(GTKGL_CFLAGS) $(GTKGLEXT_CFLAGS) $(GLADE_CFLAGS) $(FREETYPE2_CFLAGS)
 
 if WITH_SMYRNA
-noinst_HEADERS = \
-	btree.h filter.h 
+noinst_HEADERS = btree.h filter.h 
 
 noinst_LTLIBRARIES = libfilter_C.la
 endif
 
-libfilter_C_la_SOURCES = \
-	Filter.c btree.c
+libfilter_C_la_SOURCES = filter.c btree.c
diff --git a/lib/filter/filter.c b/lib/filter/filter.c
new file mode 100644
index 000000000..c51da2ada
--- /dev/null
+++ b/lib/filter/filter.c
@@ -0,0 +1,50 @@
+/* $Id$ $Revision$ */
+/* vim:set shiftwidth=4 ts=8: */
+
+/**********************************************************
+*      This software is part of the graphviz package      *
+*                http://www.graphviz.org/                 *
+*                                                         *
+*            Copyright (c) 1994-2004 AT&T Corp.           *
+*                and is licensed under the                *
+*            Common Public License, Version 1.0           *
+*                      by AT&T Corp.                      *
+*                                                         *
+*        Information and Software Systems Research        *
+*              AT&T Research, Florham Park NJ             *
+**********************************************************/
+
+#include "filter.h"
+
+int clear_filter(tv_filter* f)
+{
+	delete_node(f->root);
+}
+
+int init_filters(tv_filters* filters)
+{
+	filters->filter_count=0;
+	filters->filters=0;
+}
+int add_filter_to_filters(tv_filters* filters,tv_filter* filter)
+{
+	filters->filters=realloc(filters->filters,sizeof(tv_filter*)*(filters->filter_count+1));
+	filters->filters[filters->filter_count]=filter;
+	filters->filter_count++;
+}
+int clear_filters(tv_filters* filters)
+{
+	//deep clear
+	int ind=0;
+	for (ind =0;ind < filters->filter_count ; ind ++)
+	{
+		clear_filter(filters->filters[ind]);
+		free(filters->filters[ind]);
+	}
+	filters->filter_count=0;
+}
+int union_filter(tv_filter* f1,tv_filter* f2)
+{
+		
+}
+int intersect_filter(tv_filter* f1,tv_filter* f2);