Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adapt to support boost 1.65 #35

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Adapt to support boost 1.65 #35

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 24 additions & 13 deletions cells/cv_bp/opencv/cv_mat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@
#include <boost/python/stl_iterator.hpp>
#include <boost/format.hpp>
#include <boost/python/suite/indexing/vector_indexing_suite.hpp>
// Boost python numpy available in Boost 1.63+
// Boost python numeric removed in Boost 1.65+
#if BOOST_VERSION < 106500
#include <boost/python/numeric.hpp>
typedef typename boost::python::numeric::array NumpyArrayType;
#else
#include <boost/python/numpy.hpp>
typedef typename boost::python::numpy::ndarray NumpyArrayType;
#endif

#include <string>

Expand Down Expand Up @@ -81,16 +90,16 @@ namespace
}

//Create a Numeric array with dimensions dimens and Numeric type t
bp::numeric::array
NumpyArrayType
makeNum(std::vector<int> dimens, PyArray_TYPES t = PyArray_DOUBLE)
{
using namespace bp;
object obj(handle<>(PyArray_FromDims(dimens.size(), &dimens[0], t)));
return extract<numeric::array>(obj);
return extract<NumpyArrayType>(obj);
}

void*
data(bp::numeric::array arr)
data(NumpyArrayType arr)
{
if (!PyArray_Check(arr.ptr()))
{
Expand All @@ -102,7 +111,7 @@ namespace

//Copy data into the array
void
copy_data(boost::python::numeric::array arr, const uchar* new_data)
copy_data(NumpyArrayType arr, const uchar* new_data)
{
uchar* arr_data = (uchar*) data(arr);
size_t nbytes = PyArray_NBYTES(arr.ptr());
Expand All @@ -114,7 +123,7 @@ namespace

//Copy data into the array
void
copy_data(uchar* new_data, boost::python::numeric::array arr)
copy_data(uchar* new_data, NumpyArrayType arr)
{
uchar* arr_data = (uchar*) data(arr);
size_t nbytes = PyArray_NBYTES(arr.ptr());
Expand All @@ -124,14 +133,14 @@ namespace
}
}
PyArray_TYPES
type(bp::numeric::array arr)
type(NumpyArrayType arr)
{
return PyArray_TYPES(PyArray_TYPE(arr.ptr()));
}

//Return the number of dimensions
int
rank(bp::numeric::array arr)
rank(NumpyArrayType arr)
{
using namespace bp;
//std::cout << "inside rank" << std::endl;
Expand All @@ -144,7 +153,7 @@ namespace
}

std::vector<npy_intp>
shape(bp::numeric::array arr)
shape(NumpyArrayType arr)
{
using namespace bp;
std::vector<npy_intp> out_dims;
Expand All @@ -164,7 +173,7 @@ namespace
}

void
mat_from_array(cv::Mat& m, bp::numeric::array array)
mat_from_array(cv::Mat& m, NumpyArrayType array)
{
std::vector<npy_intp> shape = numpy_helpers::shape(array);
int cv_depth = numpy_helpers::fromPyArray_TYPES(numpy_helpers::type(array));
Expand All @@ -179,13 +188,13 @@ namespace
bp::object
mat_to_array(cv::Mat& m)
{
typedef bp::numeric::array array_t;
typedef NumpyArrayType array_t;
std::vector<int> dim(2);
dim[0] = m.rows;
dim[1] = m.cols;
if(m.channels() != 1)
dim.push_back(m.channels());
bp::numeric::array array(numpy_helpers::makeNum(dim, numpy_helpers::fromCVDepth(m.depth())));
NumpyArrayType array(numpy_helpers::makeNum(dim, numpy_helpers::fromCVDepth(m.depth())));
numpy_helpers::copy_data(array, m.ptr(0));
return array;
}
Expand Down Expand Up @@ -321,7 +330,7 @@ namespace
return m.t();
}

boost::shared_ptr<cv::Mat> from_numpy( bp::numeric::array array)
boost::shared_ptr<cv::Mat> from_numpy( NumpyArrayType array)
{
cv::Mat m;
mat_from_array(m,array);
Expand All @@ -336,7 +345,9 @@ namespace opencv_wrappers
wrap_mat()
{
import_array();
bp::numeric::array::set_module_and_type("numpy", "ndarray");
#if BOOST_VERSION < 106500
NumpyArrayType::set_module_and_type("numpy", "ndarray");
#endif

typedef std::vector<uchar> buffer_t;
bp::class_<std::vector<uchar> >("buffer").def(bp::vector_indexing_suite<std::vector<uchar>, false>());
Expand Down