Skip to content
Snippets Groups Projects
Commit 68200670 authored by Manuel Günther's avatar Manuel Günther
Browse files

Now returning the correct type (numpy.ndarray, not bob.blitz.array) in convert()

parent 413a698c
No related branches found
No related tags found
No related merge requests found
...@@ -35,17 +35,17 @@ PyObject* inner_convert (PyBlitzArrayObject* src, ...@@ -35,17 +35,17 @@ PyObject* inner_convert (PyBlitzArrayObject* src,
if (dst_min) { //both src_range and dst_range are valid if (dst_min) { //both src_range and dst_range are valid
auto bz_dst = convert<Tdst,Tsrc>(*bz_src, c_dst_min, c_dst_max, c_src_min, c_src_max); auto bz_dst = convert<Tdst,Tsrc>(*bz_src, c_dst_min, c_dst_max, c_src_min, c_src_max);
return PyBlitzArrayCxx_NewFromArray(bz_dst); return PyBlitzArrayCxx_AsNumpy(bz_dst);
} }
//only src_range is valid //only src_range is valid
auto bz_dst = convertFromRange<Tdst,Tsrc>(*bz_src, c_src_min, c_src_max); auto bz_dst = convertFromRange<Tdst,Tsrc>(*bz_src, c_src_min, c_src_max);
return PyBlitzArrayCxx_NewFromArray(bz_dst); return PyBlitzArrayCxx_AsNumpy(bz_dst);
} }
else if (dst_min) { //only dst_range is valid else if (dst_min) { //only dst_range is valid
auto bz_dst = convertToRange<Tdst,Tsrc>(*bz_src, c_dst_min, c_dst_max); auto bz_dst = convertToRange<Tdst,Tsrc>(*bz_src, c_dst_min, c_dst_max);
return PyBlitzArrayCxx_NewFromArray(bz_dst); return PyBlitzArrayCxx_AsNumpy(bz_dst);
} }
//use all defaults //use all defaults
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment