Andrey Kamaev
d28df08eb0
Refactor OpenCL search
2013-03-21 17:56:59 +04:00
Alexander Smorkalov
429cd85b46
More accurate guards for WinRT features in CMake.
2013-03-20 12:21:29 -07:00
Alexander Smorkalov
436d9bbcbb
Base for Native Activity example added.
2013-03-18 10:37:11 +04:00
Andrey Kamaev
08545b8f96
Merge pull request #603 from taka-no-me:avoid_deps_on_missing_lib
2013-03-01 17:10:46 +04:00
Andrey Kamaev
e6cb44edc3
Merge pull request #600 from taka-no-me:fix_build_warnings
2013-03-01 17:09:56 +04:00
Andrey Kamaev
1094179155
Avoid build falure in armeabi build with Android SDK
2013-03-01 16:50:42 +04:00
Andrey Kamaev
22d33373fa
Fix build warnings on MSVC x64 and OS X clang
2013-03-01 13:29:43 +04:00
Alexander
3cfd3d3ee0
Build with OpenCV.mk for all terget fixed.
2013-02-28 21:43:57 +04:00
Andrey Kamaev
bd38a1945d
Honor 2-digit python version
2013-02-28 16:32:13 +04:00
Andrey Kamaev
f4b413e830
Merge pull request #570 from taka-no-me:fix_android_cmakeconfig
2013-02-28 15:45:45 +04:00
Vladislav Vinogradov
61ef48eee6
fixed OpenCVConfig for cross-compilation:
...
* added CUDA to EXTRA libs if OpenCV uses it
* added -rpath-link option for linker if OpenCV was built as SHARED libs
2013-02-28 10:33:05 +04:00
Andrey Kamaev
024185b9ed
Fix OpenCVConfig.cmake generated for Android platform (issue #2496 )
...
* fix path to libraries in Android SDK
* allow to link to opencv_java.so as Android.mk does
To link to opencv_java.so you can either change your cmake to find OpenCV as
find_package(OpenCV opencv_java)
or pass -DOpenCV_FIND_COMPONENTS=opencv_java to your cmake command
2013-02-27 15:04:29 +04:00
marina.kolpakova
7a08bbbcc7
add CUDA_GENERATION macro
2013-02-26 20:13:47 +04:00
Alexander Smorkalov
3c7bc6a51e
Static ANdroid samples build for MIPS fixed
2013-02-26 10:32:10 +04:00
Alexander Smorkalov
4bbdfbc9e7
Bug #2821 Installation of OpenCV modules breaks build on MIPS Android fixed.
...
Native camera libs for MIPS installation fixed.
2013-02-22 11:57:42 +04:00
yao
f816e10ac9
Add auto detection to Intel OCL
2013-02-21 16:11:18 +08:00
Vladislav Vinogradov
78c924baad
removed obsolete CARMA toolchain and CMake variable
2013-02-14 16:27:17 +04:00
Andrey Kamaev
c7df17e77b
Detect and report parallel framework used
2013-02-13 15:09:30 +04:00
Andrey Kamaev
247df9f3fc
Detect version of clang compiler
2013-02-13 14:11:56 +04:00
Alexander Smorkalov
7882aba7af
TBB download and build option enabled for non Android platfroms.
2013-02-06 14:43:57 +04:00
Alexander Smorkalov
e58f4e44c8
Modules redifinition in case of multiple includes of OpenCV.mk in single Android.mk fixed.
2013-02-04 12:22:22 +04:00
Ivan Korolev
26c7e7f292
fix default include dirs for TBB
2013-01-30 17:17:04 +04:00
Andrey Kamaev
86b4b30a6d
Merge pull request #358 from taka-no-me:objc_exceptions
2013-01-30 14:40:32 +04:00
Andrey Kamaev
c78cb21999
Merge pull request #346 from taka-no-me:decouple_V4L2
2013-01-29 19:25:30 +04:00
Andrey Kamaev
0b1fe53a46
Add -fobjc-exceptions flag to ObjectiveC sources if supported (bug #2657 )
2013-01-29 17:09:23 +04:00
cuda-geek
11dfceb2c9
Merge pull request #328 from jet47:new-gpu-fixes
2013-01-29 11:00:37 +04:00
Andrey Kamaev
cf407c2ec0
Don't check for EINTR and replace xioctl with ioctl
...
This should be safe todo unless we are writing a signal handler.
2013-01-28 17:58:57 +04:00
Patrick Welche
1a84bcc565
NetBSD video(4) support, patch 3 of 3
...
xioctl() assumes that ioctl takes int request. Cope with
int ioctl(int d, unsigned long request, ...)
to avoid "invalid argument".
2013-01-28 17:11:44 +04:00
Patrick Welche
d90b8d615c
NetBSD video(4) support, patch 1 of 3
...
The video(4) driver provides a Video4Linux2 compatible API for
various video peripherals. This patch propagates HAVE_VIDEOIO if
the sys/videoio.h include file is found, which is the signature of
video(4).
2013-01-28 17:11:36 +04:00
Andrey Kamaev
b445f4b01d
Find OpenCL in AMD APP SDK
2013-01-25 14:15:26 +04:00
Vladislav Vinogradov
395f0201e3
fixed build for CARMA:
...
- added CMake toolchain file
- added WITH_NVCUVID flag
2013-01-23 21:05:08 +04:00
Andrey Kamaev
0773ab4d07
Merge pull request #315 from taka-no-me:java_on
2013-01-23 19:02:27 +04:00
Andrey Kamaev
3889b34ec3
Add option to run java tests with run.py
2013-01-23 18:08:08 +04:00
Andrey Kamaev
311d799344
Merge pull request #299 from branch 'bitwangyaoyao_ocl' into 2.4
2013-01-23 14:50:29 +04:00
yao
02c9e0a3e0
add default clAmdFft and clAmdBlas path
2013-01-23 14:48:04 +04:00
Andrey Kamaev
46c4390a2e
Hardly refactored CMake script for Java wrappers
2013-01-22 17:59:01 +04:00
Andrey Kamaev
e3474878b6
Consistently use 4-digit library version
2013-01-18 14:57:55 +04:00
Andrey Kamaev
3cb84ed17c
Fix dependencies inference for auto-disabled targets
...
Sometimes information about dependencies causing disabling were loosed and it
was not possible to correctly display these dependencies in status report
2013-01-14 18:58:24 +04:00
Andrey Kamaev
cf8deac2b2
Always touch variable controlling build of the module
...
This suppresses "unused variable" CMake warning when user explicilty disables
module unavailable in selected configuration
2013-01-10 19:05:39 +04:00
Andrey Kamaev
b6efec5f8b
Add support for Android NDK r8d
2012-12-21 15:39:23 +04:00
Andrey Kamaev
aaf779a3a2
Adjust OpenCV version to 2.4.3.2
2012-12-20 17:19:34 +04:00
Justin Muncaster
709a1cc083
Fixed typo in OpenCVDetectOpenCL.cmake that resulted in cmake not finding OpenCL on windows.
2012-12-06 13:17:25 -08:00
Andrey Kamaev
49c35fafc0
Adjust OpenCV version to 2.4.3.1
2012-11-30 14:33:28 +04:00
Alexander Smorkalov
383e04d9e4
OpenCV Manager build via ninja (Bug #2575 ) fixed.
2012-11-27 17:30:05 +04:00
marina.kolpakova
fceb62386d
fix for 2504: WITH_CUDA disabled with OSX in 2.4.3.
2012-11-23 23:11:44 +04:00
Andrey Kamaev
934b623fa9
Merging pull request #169 from taka-no-me:android-ndk-r8c
2012-11-20 17:56:12 +04:00
Andrey Kamaev
04481d9ef4
Fix Android build with clang compiler
2012-11-20 15:20:04 +04:00
Alexander Smorkalov
1f1d43fc88
Issue #2548 Missing static library libtbb.a for armeabi and mips build fixed.
2012-11-19 12:58:17 +04:00
Andrey Kamaev
6f08d03322
Advance version number to 2.4.3-rc
2012-10-23 17:59:59 +04:00
Andrey Kamaev
ed00642600
Force build with -O2 instead of -O3 on 32-bit linux
2012-10-23 15:52:11 +04:00
Andrey Kamaev
2e91405833
Fix OS X build warnings
2012-10-22 20:33:14 +04:00
Niko
5df77a841e
remove redundant OPENCL_DIR flag
...
remove as much warnings as possible
use enum instead of MACRO for ocl.hpp
add command line parser in accuracy test and perf test
some bug fix for arthim functions
2012-10-22 15:14:22 +08:00
OpenCV Buildbot
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
Andrey Kamaev
7225f89ea2
Revert opencv_videostab to the state of 2.4.2
2012-10-17 02:09:43 +04:00
Andrey Kamaev
a3b1971977
Bring back escaped virtual destructors from 2.4.2
2012-10-15 17:48:49 +04:00
Anatoly Baksheev
f9ac5e2404
minor
2012-10-12 23:03:31 +04:00
Evgeny Talanin
2e7656dbdf
#2192 patch apply
2012-10-12 13:03:43 +04:00
Vladislav Vinogradov
8abcad6b00
fixed CUDA_FAST_MATH flag
2012-10-12 12:49:10 +04:00
Anatoly Baksheev
1d68850cb2
Added CUDA fast math flag
2012-10-10 22:16:51 +04:00
Vadim Pisarevsky
e80cbbb101
fixed C= detection script
2012-10-10 16:15:27 +04:00
Vadim Pisarevsky
e625d86485
added C= support; modified threading logic in threshold
2012-10-10 15:36:32 +04:00
Andrey Kamaev
95b6a103b5
Add sanity checks support for vertor<KeyPoint>
2012-10-09 18:41:26 +04:00
Vadim Pisarevsky
a63669f819
fixed linking CLP in the case of MinGW (patch #1872 )
2012-10-08 22:24:38 +04:00
Vadim Pisarevsky
ca6f2f080f
hopefully, correctly applied modified patch #2034 that handles Windows case
2012-10-08 22:18:13 +04:00
Vadim Pisarevsky
0bfa58b68d
fixed detection of IPP 7.1 (patch #2413 : thanks to Gino van den Bergen!)
2012-10-08 22:00:25 +04:00
Vadim Pisarevsky
4be7619ce4
_InputArray/_OutputArray destructors are temporary made non-virtual. Please, restore it after 2.4.3
2012-10-08 21:37:15 +04:00
cuda_geek
6b19c76233
fix hardcoded paths for static build OpenCV with CUDA
2012-10-08 10:52:58 +04:00
Anatoly Baksheev
dffba48517
Added host compiler check before CUDA detection. For not supported compilers CUDA will be disabled.
2012-09-24 16:56:19 +04:00
Andrey Kamaev
f32eb05ea1
Fix AVX and other SIMD support detection
2012-09-17 13:30:28 +04:00
Andrey Kamaev
ece71d6a06
Remove misused REQUIRED keyword from CMake scripts
2012-09-17 13:21:20 +04:00
Vadim Pisarevsky
f53d94c645
fixed OpenCL detection in Linux (patch #2261 )
2012-09-11 14:32:31 +04:00
Andrey Kamaev
200a81746e
Improve Eigen search
...
Should now automatically detect it during Android build
2012-09-10 18:15:29 +04:00
Andrey Kamaev
b8767f5fbe
Disable TBB on Android for mips
2012-09-06 18:54:38 +04:00
Andrey Pavlenko
186f8b7417
possibility to maintain custom hardware-specific libs folders
2012-09-06 16:03:07 +04:00
Andrey Kamaev
8325a28d09
Merge branch 'android-toolchain'
2012-09-04 17:10:52 +04:00
Andrey Kamaev
02b33792cb
Fix precompiled headers support detection for gcc-4.6 toolchain from Android NDK r8b
...
The version reported by toolchain is 4.6.x-google so regex needs an adjustment.
2012-09-04 16:50:55 +04:00
Andrey Kamaev
af415085d8
Fix Android build with CMake 2.6.3-2.8.3
2012-09-04 16:21:44 +04:00
Andrey Kamaev
867777f825
Added OpenEXR library v1.7.1
2012-09-02 20:44:04 +04:00
Andrey Kamaev
3fb3851c7a
Remove debug print
2012-09-01 08:42:07 +04:00
Andrey Kamaev
bd12f636c8
Unify manifest files in Android examples
2012-08-31 17:47:12 +04:00
Sergiu Dotenco
85eae7b30d
win32: always link to vfw32
2012-08-30 14:52:39 +02:00
niko
b929012583
performance fix of convertC3C4
...
add OCL 1.2 feature for setTo
bug fix of integral
replace the error code -217 with suitable MACRO
simplify tests, no need apply a new context for each test case
add more control for tests in utility.hpp
2012-08-30 16:14:35 +08:00
Anatoly Baksheev
0ba01afd83
added GPU bilateral filter + tests
...
added GPU non local means brute force filter + tests
2012-08-29 19:20:32 +04:00
Leonid Beynenson
8dcf52c90b
Added possibility to make subfolders in modules' folders "src/".
2012-08-28 17:44:33 +04:00
Andrey Kamaev
bcf8dd510f
Added CCache support to Android build
...
To speed up rebuilds, define the NDK_CCACHE environment or CMake variable
to the path to your ccache binary. When declared, the android.cmake.toolchain
automatically uses CCache when compiling any C/C++ source file. For example:
export NDK_CCACHE=ccache
2012-08-27 18:22:00 +04:00
Anatoly Baksheev
e60a50c43c
removed /EHa flag for cuda compilation
2012-08-23 16:53:53 +04:00
Anatoly Baksheev
290030d030
possibility to enable /mp compiler flag from cmake
...
fixed MCVC warnings
2012-08-23 16:53:53 +04:00
Anatoly Baksheev
d395bf1522
minor fix in FindTBB
...
added texture_binder
2012-08-23 13:37:27 +04:00
marina.kolpakova
ee0dd4d496
disabled -Wunused-but-set-variable because of multiple warnings during building nvcc auto generated files (GCC 4.6)
2012-08-20 23:35:59 +04:00
Andrey Kamaev
682dede87e
#2215 Fix dependencies escaping in generated OpenCVConfig.cmake
2012-08-20 19:53:03 +04:00
Vladislav Vinogradov
a0aef244d6
removed perf_gpu_cpu from CMake scripts
2012-08-20 09:58:37 +04:00
Alexander Smorkalov
14fa645026
Debug build for Android added. Stripping of debug build turned off.
2012-08-14 12:03:05 +04:00
Andrey Kamaev
5100ca7508
svn repository web references are replaced with links to git
2012-08-07 14:30:36 +04:00
yao
c03ac12fcd
Add dft and gemm to ocl module, using AMD's clAmdFft and clAmdBlas libraries
2012-08-07 16:33:46 +08:00
Vadim Pisarevsky
fac3d9994c
integrated another portion of SSE optimizations from Grigory Frolov
2012-07-31 19:07:55 +04:00
niko
cf04fed369
fix the compilation bugs
2012-07-30 14:34:36 +08:00
marina.kolpakova
22673c161a
fixed 2212
2012-07-28 13:05:40 +04:00
Niko Li
5dc7752d54
fix a bug of detect opencl
2012-07-17 06:49:32 +00:00
Vadim Pisarevsky
9f4efab40a
merged ocl module from ocl branch (it's not quite usable yet; at least on Mac)
2012-07-16 17:08:14 +00:00
Andrey Kamaev
c474e27c1d
One more fix for zlib search #1902
2012-07-09 19:16:38 +00:00