From ea47f3b6e7a62608c35f2ffe30c0e618633ffe57 Mon Sep 17 00:00:00 2001
From: Alessandro Ranellucci <aar@cpan.org>
Date: Mon, 6 Jan 2014 19:42:31 +0100
Subject: [PATCH] More fixes to BoundingBox

---
 xs/MANIFEST            |  1 +
 xs/src/BoundingBox.hpp | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/xs/MANIFEST b/xs/MANIFEST
index 23943e92..a7c7cb86 100644
--- a/xs/MANIFEST
+++ b/xs/MANIFEST
@@ -73,6 +73,7 @@ t/14_geometry.t
 t/15_config.t
 t/16_flow.t
 t/17_boundingbox.t
+xsp/BoundingBox.xsp
 xsp/Clipper.xsp
 xsp/Config.xsp
 xsp/ExPolygon.xsp
diff --git a/xs/src/BoundingBox.hpp b/xs/src/BoundingBox.hpp
index 6068fa19..e0092c6d 100644
--- a/xs/src/BoundingBox.hpp
+++ b/xs/src/BoundingBox.hpp
@@ -19,9 +19,9 @@ class BoundingBoxBase
     PointClass min;
     PointClass max;
     
+    BoundingBoxBase();
     BoundingBoxBase(const std::vector<PointClass> points);
-    //virtual ~BoundingBoxBase() {};
-    void merge(const BoundingBoxBase &bb);
+    void merge(const BoundingBoxBase<PointClass> &bb);
     void scale(double factor);
 };
 
@@ -29,8 +29,8 @@ template <class PointClass>
 class BoundingBox2Base : public BoundingBoxBase<PointClass>
 {
     public:
+    BoundingBox2Base();
     BoundingBox2Base(const std::vector<PointClass> points) : BoundingBoxBase<PointClass>(points) {};
-    //virtual ~BoundingBox2Base() {};
     PointClass size() const;
     void translate(coordf_t x, coordf_t y);
     PointClass center() const;
@@ -40,9 +40,9 @@ template <class PointClass>
 class BoundingBox3Base : public BoundingBoxBase<PointClass>
 {
     public:
+    BoundingBox3Base();
     BoundingBox3Base(const std::vector<PointClass> points);
-    //virtual ~BoundingBox3Base() {};
-    void merge(const BoundingBox3Base &bb);
+    void merge(const BoundingBox3Base<PointClass> &bb);
     PointClass size() const;
     void translate(coordf_t x, coordf_t y, coordf_t z);
     PointClass center() const;
@@ -53,7 +53,7 @@ class BoundingBox : public BoundingBox2Base<Point>
     public:
     void polygon(Polygon* polygon) const;
     
-    BoundingBox();
+    BoundingBox() {};
     BoundingBox(const Points points) : BoundingBox2Base<Point>(points) {};
 };
 
@@ -62,7 +62,7 @@ class BoundingBox3  : public BoundingBox3Base<Point3> {};
 
 class BoundingBoxf3 : public BoundingBox3Base<Pointf3> {
     public:
-    BoundingBoxf3();
+    BoundingBoxf3() {};
     BoundingBoxf3(const std::vector<Pointf3> points) : BoundingBox3Base<Pointf3>(points) {};
 };