Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
dlib
Commits
dd16139a
Commit
dd16139a
authored
Mar 22, 2017
by
Davis King
Browse files
Made the mex wrapper deal with cell arrays that have null elements.
parent
b8e1282a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
29 additions
and
0 deletions
+29
-0
dlib/matlab/mex_wrapper.cpp
dlib/matlab/mex_wrapper.cpp
+29
-0
No files found.
dlib/matlab/mex_wrapper.cpp
View file @
dd16139a
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment