Commit dd16139a authored by Davis King's avatar Davis King

Made the mex wrapper deal with cell arrays that have null elements.

parent b8e1282a
...@@ -387,6 +387,29 @@ namespace mex_binding ...@@ -387,6 +387,29 @@ namespace mex_binding
return escape_percent(sout.str()); return escape_percent(sout.str());
} }
// -------------------------------------------------------
template <
typename matrix_type
>
typename dlib::enable_if_c<is_matrix<matrix_type>::value || is_array2d<matrix_type>::value >::type
clear_mat (
matrix_type& m
)
{
m.set_size(0,0);
}
template <
typename matrix_type
>
typename dlib::disable_if_c<is_matrix<matrix_type>::value || is_array2d<matrix_type>::value >::type
clear_mat (
matrix_type&
)
{
}
// ------------------------------------------------------- // -------------------------------------------------------
template < template <
...@@ -651,6 +674,12 @@ namespace mex_binding ...@@ -651,6 +674,12 @@ namespace mex_binding
} }
else if (is_matrix<T>::value || is_array2d<T>::value) else if (is_matrix<T>::value || is_array2d<T>::value)
{ {
if (prhs == NULL)
{
clear_mat(arg);
return;
}
typedef typename inner_type<T>::type type; typedef typename inner_type<T>::type type;
const int num_dims = mxGetNumberOfDimensions(prhs); const int num_dims = mxGetNumberOfDimensions(prhs);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment