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
75fbc56c
Commit
75fbc56c
authored
Mar 01, 2014
by
Davis King
Browse files
Fixed name conflicts that prevented the python bindings from compiling in visual sudio 2013.
parent
badd34ef
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
tools/python/src/other.cpp
tools/python/src/other.cpp
+2
-2
tools/python/src/vector.cpp
tools/python/src/vector.cpp
+2
-2
No files found.
tools/python/src/other.cpp
View file @
75fbc56c
...
...
@@ -31,14 +31,14 @@ void _make_sparse_vector2 (
make_sparse_vector_inplace
(
v
[
i
]);
}
tuple
_load_libsvm_formatted_data
(
boost
::
python
::
tuple
_load_libsvm_formatted_data
(
const
std
::
string
&
file_name
)
{
std
::
vector
<
sparse_vect
>
samples
;
std
::
vector
<
double
>
labels
;
load_libsvm_formatted_data
(
file_name
,
samples
,
labels
);
return
make_tuple
(
samples
,
labels
);
return
boost
::
python
::
make_tuple
(
samples
,
labels
);
}
void
_save_libsvm_formatted_data
(
...
...
tools/python/src/vector.cpp
View file @
75fbc56c
...
...
@@ -128,9 +128,9 @@ cv cv__getitem2__(cv& m, slice r)
return
temp
;
}
tuple
cv_get_matrix_size
(
cv
&
m
)
boost
::
python
::
tuple
cv_get_matrix_size
(
cv
&
m
)
{
return
make_tuple
(
m
.
nr
(),
m
.
nc
());
return
boost
::
python
::
make_tuple
(
m
.
nr
(),
m
.
nc
());
}
void
bind_vector
()
...
...
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