Changes

virtuald · virtuald · commit b9796e37d108 · 2017-01-19T00:13:42.000-05:00
diff --git a/setup.py b/setup.py
@@ -21,6 +21,7 @@ def __str__(self):
         import pybind11
         return pybind11.get_include(self.user)
 
+import cv2
 
 ext_modules = [
     Extension(
@@ -33,7 +34,10 @@ def __str__(self):
             "include",
             "/home/virtuald/src/frc/ext/opencv-python/opencv/build/prefix/include",
         ],
-        language='c++'
+        library_dirs=[cv2.distutils.get_lib_path()],
+        libraries=['opencv_core', 'opencv_imgproc'],
+        language='c++',
+        runtime_library_dirs=['$ORIGIN/cv2'],
     ),
 ]
 
diff --git a/src/main.cpp b/src/main.cpp
@@ -1,15 +1,16 @@
 #include <pybind11/pybind11.h>
+#include <pybind11/numpy.h>
 namespace py = pybind11;
 
 #include <opencv2/core.hpp>
 #include <opencv2/imgproc.hpp>
 #include <opencv2/python/pyapi.hpp>
 
-PyObject * draw_rect(PyObject * in) {
+PyObject * draw_rect(py::array in) {
     
     cv::Mat mat;
     
-    if (!PyOpenCV_NdarrayToMat(in, mat, "in"))
+    if (!PyOpenCV_NdarrayToMat(in.ptr(), mat, "in"))
         return NULL;
     
     cv::Point pt1, pt2;
@@ -24,11 +25,10 @@ PyObject * draw_rect(PyObject * in) {
 }
 
 
-PYBIND11_PLUGIN(python_example) {
+PYBIND11_PLUGIN(test_package) {
     
-    import_opencv();
     
-    py::module m("python_example");
+    py::module m("test_package");
     
     m.def("draw_rect", &draw_rect);
 
@@ -38,5 +38,6 @@ PYBIND11_PLUGIN(python_example) {
     m.attr("__version__") = py::str("dev");
 #endif
 
+    import_opencv();
     return m.ptr();
 }
