Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
244a537d
Commit
244a537d
authored
Oct 09, 2010
by
Ethan Rublee
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
_S happens to be a bad variable name for android
parent
ef6a7924
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
1 deletion
+11
-1
CMakeLists.txt
CMakeLists.txt
+3
-0
evaluation.cpp
modules/features2d/src/evaluation.cpp
+2
-0
CMakeLists.txt
modules/python/CMakeLists.txt
+5
-1
test.py
tests/python/test.py
+1
-0
No files found.
CMakeLists.txt
View file @
244a537d
...
...
@@ -24,6 +24,9 @@ if (NOT CMAKE_INSTALL_PREFIX)
endif
()
endif
()
SET
(
CMAKE_INSTALL_RPATH
"
${
CMAKE_INSTALL_PREFIX
}
/lib"
)
SET
(
CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE
)
set
(
CMAKE_CONFIGURATION_TYPES
"Debug;Release"
CACHE STRING
"Configs"
FORCE
)
set
(
CMAKE_C_FLAGS_MINSIZEREL
""
CACHE INTERNAL
""
FORCE
)
set
(
CMAKE_C_FLAGS_RELWITHDEBINFO
""
CACHE INTERNAL
""
FORCE
)
...
...
modules/features2d/src/evaluation.cpp
View file @
244a537d
...
...
@@ -46,6 +46,8 @@
using
namespace
cv
;
using
namespace
std
;
//for android ndk
#undef _S
static
inline
Point2f
applyHomography
(
const
Mat_
<
double
>&
H
,
const
Point2f
&
pt
)
{
double
z
=
H
(
2
,
0
)
*
pt
.
x
+
H
(
2
,
1
)
*
pt
.
y
+
H
(
2
,
2
);
...
...
modules/python/CMakeLists.txt
View file @
244a537d
...
...
@@ -57,5 +57,9 @@ if(WIN32)
ARCHIVE DESTINATION
"Python
${
PYTHON_VERSION_MAJOR_MINOR
}
/Lib/site-packages"
COMPONENT main
)
else
()
install
(
FILES
${
LIBRARY_OUTPUT_PATH
}
/cv
${
CVPY_SUFFIX
}
DESTINATION
${
PYTHON_PACKAGES_PATH
}
)
#install(FILES ${LIBRARY_OUTPUT_PATH}/cv${CVPY_SUFFIX} DESTINATION ${PYTHON_PACKAGES_PATH})
install
(
TARGETS
${
the_target
}
RUNTIME DESTINATION
${
PYTHON_PACKAGES_PATH
}
COMPONENT main
LIBRARY DESTINATION
${
PYTHON_PACKAGES_PATH
}
COMPONENT main
ARCHIVE DESTINATION
${
PYTHON_PACKAGES_PATH
}
COMPONENT main
)
endif
()
tests/python/test.py
View file @
244a537d
import
roslib
;
roslib
.
load_manifest
(
'opencv2'
)
import
unittest
import
random
import
time
...
...
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