From 9dbdf34f32fbfbd10438b64f822af87e4f8070ba Mon Sep 17 00:00:00 2001
From: Chih-Wei Chang <me@cwchang.me>
Date: Sat, 14 Feb 2015 22:31:03 +0800
Subject: [PATCH] Use std_vector instead of wrapping ourself.

---
 opencv2/gcv_calib3d/gcv_calib3d.swigcxx |  4 +--
 opencv2/gcv_calib3d/gcv_calib3d_test.go | 22 +++++++-------
 opencv2/gcv_calib3d/gcv_core.hpp        | 38 -------------------------
 3 files changed, 13 insertions(+), 51 deletions(-)

diff --git a/opencv2/gcv_calib3d/gcv_calib3d.swigcxx b/opencv2/gcv_calib3d/gcv_calib3d.swigcxx
index ecdf7ce..f918e4e 100644
--- a/opencv2/gcv_calib3d/gcv_calib3d.swigcxx
+++ b/opencv2/gcv_calib3d/gcv_calib3d.swigcxx
@@ -10,6 +10,6 @@
 %include "gcv_core.hpp"
 
 namespace std {
-   %template(IntVector) vector<int>;
-   %template(DoubleVector) vector<double>;
+   %template(GcvPoint3fVector) vector<cv::Point3f>;
+   %template(GcvPoint2fVector) vector<cv::Point2f>;
 };
diff --git a/opencv2/gcv_calib3d/gcv_calib3d_test.go b/opencv2/gcv_calib3d/gcv_calib3d_test.go
index 2317482..62a897d 100644
--- a/opencv2/gcv_calib3d/gcv_calib3d_test.go
+++ b/opencv2/gcv_calib3d/gcv_calib3d_test.go
@@ -16,17 +16,17 @@ import "testing"
 //  [  0.00000000e+00   0.00000000e+00   1.00000000e+00]]
 
 func TestGcvInitCameraMatrix2D(t *testing.T) {
-	objPts := NewGcvVecPoint3f()
-	objPts.PushBack(NewGcvPoint3f(0, 25, 0).Get())
-	objPts.PushBack(NewGcvPoint3f(0, -25, 0).Get())
-	objPts.PushBack(NewGcvPoint3f(-47, 25, 0).Get())
-	objPts.PushBack(NewGcvPoint3f(-47, -25, 0).Get())
+	objPts := NewGcvPoint3fVector(int64(4))
+	objPts.Set(0, NewGcvPoint3f(0, 25, 0).Get())
+	objPts.Set(1, NewGcvPoint3f(0, -25, 0).Get())
+	objPts.Set(2, NewGcvPoint3f(-47, 25, 0).Get())
+	objPts.Set(3, NewGcvPoint3f(-47, -25, 0).Get())
 
-	imgPts := NewGcvVecPoint2f()
-	imgPts.PushBack(NewGcvPoint2f(1136.4140625, 1041.89208984).Get())
-	imgPts.PushBack(NewGcvPoint2f(1845.33190918, 671.39581299).Get())
-	imgPts.PushBack(NewGcvPoint2f(302.73373413, 634.79998779).Get())
-	imgPts.PushBack(NewGcvPoint2f(1051.46154785, 352.76107788).Get())
+	imgPts := NewGcvPoint2fVector(int64(4))
+	imgPts.Set(0, NewGcvPoint2f(1136.4140625, 1041.89208984).Get())
+	imgPts.Set(1, NewGcvPoint2f(1845.33190918, 671.39581299).Get())
+	imgPts.Set(2, NewGcvPoint2f(302.73373413, 634.79998779).Get())
+	imgPts.Set(3, NewGcvPoint2f(1051.46154785, 352.76107788).Get())
 
-	GcvInitCameraMatrix2D(objPts.Get(), imgPts.Get())
+	GcvInitCameraMatrix2D(objPts, imgPts)
 }
diff --git a/opencv2/gcv_calib3d/gcv_core.hpp b/opencv2/gcv_calib3d/gcv_core.hpp
index 613cc03..c1efb45 100644
--- a/opencv2/gcv_calib3d/gcv_core.hpp
+++ b/opencv2/gcv_calib3d/gcv_core.hpp
@@ -18,25 +18,6 @@ private:
         cv::Point3f _data;
 };
 
-class GcvVecPoint3f
-{
-public:
-        GcvVecPoint3f () {};
-        ~GcvVecPoint3f () {};
-
-        void PushBack(cv::Point3f pt) {
-                _data.push_back(pt);
-        }
-
-        void Clear() {
-                _data.clear();
-        }
-
-        std::vector<cv::Point3f> Get() { return _data; }
-private:
-        std::vector<cv::Point3f> _data;
-};
-
 class GcvPoint2f
 {
 public:
@@ -51,22 +32,3 @@ public:
 private:
         cv::Point2f _data;
 };
-
-class GcvVecPoint2f
-{
-public:
-        GcvVecPoint2f () {};
-        ~GcvVecPoint2f () {};
-
-        void PushBack(cv::Point2f pt) {
-                _data.push_back(pt);
-        }
-
-        void Clear() {
-                _data.clear();
-        }
-
-        std::vector<cv::Point2f> Get() { return _data; }
-private:
-        std::vector<cv::Point2f> _data;
-};