Fix broken logic and possible NULL pointer dereference for Bundle XML.

[ardour.git] / libs / canvas / canvas / lookup_table.h

diff --git a/libs/canvas/canvas/lookup_table.h b/libs/canvas/canvas/lookup_table.h
index c9a126505180b66502795966a34656b2bc4ff524..29452365cdb2db38bd50617042a3949e07cfba55 100644 (file)
--- a/libs/canvas/canvas/lookup_table.h
+++ b/libs/canvas/canvas/lookup_table.h
@@ -22,6 +22,8 @@
 
 #include <vector>
 #include <boost/multi_array.hpp>
+
+#include "canvas/visibility.h"
 #include "canvas/types.h"
 
 class OptimizingLookupTableTest;
@@ -29,12 +31,11 @@ class OptimizingLookupTableTest;
 namespace ArdourCanvas {
 
 class Item;
-class Group;
 
-class LookupTable
+class LIBCANVAS_API LookupTable
 {
 public:
-    LookupTable (Group const &);
+    LookupTable (Item const &);
     virtual ~LookupTable ();
     
     virtual std::vector<Item*> get (Rect const &) = 0;
@@ -43,23 +44,23 @@ public:
 
 protected:
        
-    Group const & _group;
+    Item const & _item;
 };
 
-class DumbLookupTable : public LookupTable
+class LIBCANVAS_API DumbLookupTable : public LookupTable
 {
 public:
-    DumbLookupTable (Group const &);
+       DumbLookupTable (Item const &);
     
     std::vector<Item*> get (Rect const &);
     std::vector<Item*> items_at_point (Duple const &) const;
     bool has_item_at_point (Duple const & point) const;
 };
 
-class OptimizingLookupTable : public LookupTable
+class LIBCANVAS_API OptimizingLookupTable : public LookupTable
 {
 public:
-    OptimizingLookupTable (Group const &, int);
+    OptimizingLookupTable (Item const &, int);
     ~OptimizingLookupTable ();
     std::vector<Item*> get (Rect const &);
     std::vector<Item*> items_at_point (Duple const &) const;