generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #893 from jet47:gpu-arm-fixes

Browse Source
This commit is contained in:
Roman Donchenko 2013-06-04 17:52:30 +04:00 committed by OpenCV Buildbot
commit 5b5815d8cf
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
samples/gpu/cascadeclassifier_nvidia_api.cpp
View File

@ -17,12 +17,21 @@ using namespace std;
using namespace cv; using namespace cv;
#if !defined(HAVE_CUDA) #if !defined(HAVE_CUDA) || defined(__arm__)
int main( int, const char** ) int main( int, const char** )
{ {
cout << "Please compile the library with CUDA support" << endl; #if !defined(HAVE_CUDA)
return -1; std::cout << "CUDA support is required (CMake key 'WITH_CUDA' must be true)." << std::endl;
#endif
#if defined(__arm__)
std::cout << "Unsupported for ARM CUDA library." << std::endl;
#endif
return 0;
} }
#else #else

6
samples/gpu/driver_api_multi.cpp
View File

@ -11,7 +11,7 @@
#include "opencv2/core/core.hpp" #include "opencv2/core/core.hpp"
#include "opencv2/gpu/gpu.hpp" #include "opencv2/gpu/gpu.hpp"
#if !defined(HAVE_CUDA) || !defined(HAVE_TBB) #if !defined(HAVE_CUDA) || !defined(HAVE_TBB) || defined(__arm__)
int main() int main()
{ {
@ -23,6 +23,10 @@ int main()
std::cout << "TBB support is required (CMake key 'WITH_TBB' must be true).\n"; std::cout << "TBB support is required (CMake key 'WITH_TBB' must be true).\n";
#endif #endif
#if defined(__arm__)
std::cout << "Unsupported for ARM CUDA library." << std::endl;
#endif
return 0; return 0;
} }

6
samples/gpu/driver_api_stereo_multi.cpp
View File

@ -13,7 +13,7 @@
#include "opencv2/highgui/highgui.hpp" #include "opencv2/highgui/highgui.hpp"
#include "opencv2/gpu/gpu.hpp" #include "opencv2/gpu/gpu.hpp"
#if !defined(HAVE_CUDA) || !defined(HAVE_TBB) #if !defined(HAVE_CUDA) || !defined(HAVE_TBB) || defined(__arm__)
int main() int main()
{ {
@ -25,6 +25,10 @@ int main()
std::cout << "TBB support is required (CMake key 'WITH_TBB' must be true).\n"; std::cout << "TBB support is required (CMake key 'WITH_TBB' must be true).\n";
#endif #endif
#if defined(__arm__)
std::cout << "Unsupported for ARM CUDA library." << std::endl;
#endif
return 0; return 0;
} }