potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00
Code Packages Releases Wiki Activity

Fixed Android build

Browse Source
This commit is contained in:
Andrey Kamaev
2012-06-08 08:11:17 +00:00
parent ec0ec69307
commit 2f40905548
22 changed files with 170 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/android/CMakeLists.txt
+2
View File
@@ -4,6 +4,8 @@
# ----------------------------------------------------------------------------
add_custom_target(opencv_android_examples)
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wmissing-declarations)
add_subdirectory(15-puzzle)
add_subdirectory(face-detection)
add_subdirectory(image-manipulations)
samples/cpp/videostab.cpp
+4 -4
View File
@@ -215,7 +215,7 @@ public:
outlierRejector = tblor;
}
#if HAVE_OPENCV_GPU
#ifdef HAVE_OPENCV_GPU
if (gpu)
{
KeypointBasedMotionEstimatorGpu *kbest = new KeypointBasedMotionEstimatorGpu(est);
@@ -256,7 +256,7 @@ public:
outlierRejector = tblor;
}
#if HAVE_OPENCV_GPU
#ifdef HAVE_OPENCV_GPU
if (gpu)
{
KeypointBasedMotionEstimatorGpu *kbest = new KeypointBasedMotionEstimatorGpu(est);
@@ -341,7 +341,7 @@ int main(int argc, const char **argv)
return 0;
}
#if HAVE_OPENCV_GPU
#ifdef HAVE_OPENCV_GPU
if (arg("gpu") == "yes")
{
cout << "initializing GPU..."; cout.flush();
@@ -419,7 +419,7 @@ int main(int argc, const char **argv)
{
MoreAccurateMotionWobbleSuppressorBase *ws = new MoreAccurateMotionWobbleSuppressor();
if (arg("gpu") == "yes")
#if HAVE_OPENCV_GPU
#ifdef HAVE_OPENCV_GPU
ws = new MoreAccurateMotionWobbleSuppressorGpu();
#else
throw runtime_error("OpenCV is built without GPU support");