67ce03d7dd
Merge branch 2.4
2012-12-10 23:51:34 +04:00
709a1cc083
Fixed typo in OpenCVDetectOpenCL.cmake that resulted in cmake not finding OpenCL on windows.
2012-12-06 13:17:25 -08:00
ae5649d3f7
Drop unsupported imageio from grfmt
2012-12-03 09:56:09 +04:00
00fbf58902
Revert incompletely applied patch from #2192
...
This reverts commit 2e7656dbdf
2012-12-03 09:55:53 +04:00
e10ee89ec4
Merge branch 2.4
2012-11-30 19:54:24 +04:00
49c35fafc0
Adjust OpenCV version to 2.4.3.1
2012-11-30 14:33:28 +04:00
383e04d9e4
OpenCV Manager build via ninja (Bug #2575 ) fixed.
2012-11-27 17:30:05 +04:00
fceb62386d
fix for 2504: WITH_CUDA disabled with OSX in 2.4.3.
2012-11-23 23:11:44 +04:00
7f542e391a
Merge branch 2.4
...
Conflicts:
android/service/engine/AndroidManifest.xml - use file from 2.4
modules/contrib/src/detection_based_tracker.cpp - move #include <pthread.h> as in 2.4
modules/java/android_test/src/org/opencv/test/OpenCVTestRunner.java - use file from 2.4
2012-11-20 19:12:00 +04:00
934b623fa9
Merging pull request #169 from taka-no-me:android-ndk-r8c
2012-11-20 17:56:12 +04:00
04481d9ef4
Fix Android build with clang compiler
2012-11-20 15:20:04 +04:00
1f1d43fc88
Issue #2548 Missing static library libtbb.a for armeabi and mips build fixed.
2012-11-19 12:58:17 +04:00
f14a711bda
Merge pull request #85 from Nerei/master
2012-10-23 20:47:56 +04:00
91f47d2779
Merge branch '2.4'
...
Conflicts:
modules/core/include/opencv2/core/version.hpp
2012-10-23 20:39:02 +04:00
8dbde3297e
Merge branch '2.4'
2012-10-23 20:32:19 +04:00
6f08d03322
Advance version number to 2.4.3-rc
2012-10-23 17:59:59 +04:00
ed00642600
Force build with -O2 instead of -O3 on 32-bit linux
2012-10-23 15:52:11 +04:00
275ab53ebc
Added default Eigen search path to support Eigen that comes with PCL
2012-10-23 15:12:39 +04:00
2e91405833
Fix OS X build warnings
2012-10-22 20:33:14 +04:00
57775988e7
Merge branch '2.4'
2012-10-22 16:57:56 +04:00
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
81f826db2b
Normalize line endings and whitespace
2012-10-17 15:57:49 +04:00
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
7225f89ea2
Revert opencv_videostab to the state of 2.4.2
2012-10-17 02:09:43 +04:00
a3b1971977
Bring back escaped virtual destructors from 2.4.2
2012-10-15 17:48:49 +04:00
f9ac5e2404
minor
2012-10-12 23:03:31 +04:00
2e7656dbdf
#2192 patch apply
2012-10-12 13:03:43 +04:00
8abcad6b00
fixed CUDA_FAST_MATH flag
2012-10-12 12:49:10 +04:00
1d68850cb2
Added CUDA fast math flag
2012-10-10 22:16:51 +04:00
e80cbbb101
fixed C= detection script
2012-10-10 16:15:27 +04:00
e625d86485
added C= support; modified threading logic in threshold
2012-10-10 15:36:32 +04:00
95b6a103b5
Add sanity checks support for vertor<KeyPoint>
2012-10-09 18:41:26 +04:00
a63669f819
fixed linking CLP in the case of MinGW (patch #1872 )
2012-10-08 22:24:38 +04:00
ca6f2f080f
hopefully, correctly applied modified patch #2034 that handles Windows case
2012-10-08 22:18:13 +04:00
0bfa58b68d
fixed detection of IPP 7.1 (patch #2413 : thanks to Gino van den Bergen!)
2012-10-08 22:00:25 +04:00
4be7619ce4
_InputArray/_OutputArray destructors are temporary made non-virtual. Please, restore it after 2.4.3
2012-10-08 21:37:15 +04:00
6b19c76233
fix hardcoded paths for static build OpenCV with CUDA
2012-10-08 10:52:58 +04:00
dffba48517
Added host compiler check before CUDA detection. For not supported compilers CUDA will be disabled.
2012-09-24 16:56:19 +04:00
f32eb05ea1
Fix AVX and other SIMD support detection
2012-09-17 13:30:28 +04:00
ece71d6a06
Remove misused REQUIRED keyword from CMake scripts
2012-09-17 13:21:20 +04:00
f53d94c645
fixed OpenCL detection in Linux (patch #2261 )
2012-09-11 14:32:31 +04:00
200a81746e
Improve Eigen search
...
Should now automatically detect it during Android build
2012-09-10 18:15:29 +04:00
b8767f5fbe
Disable TBB on Android for mips
2012-09-06 18:54:38 +04:00
186f8b7417
possibility to maintain custom hardware-specific libs folders
2012-09-06 16:03:07 +04:00
8325a28d09
Merge branch 'android-toolchain'
2012-09-04 17:10:52 +04:00
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
af415085d8
Fix Android build with CMake 2.6.3-2.8.3
2012-09-04 16:21:44 +04:00
867777f825
Added OpenEXR library v1.7.1
2012-09-02 20:44:04 +04:00
3fb3851c7a
Remove debug print
2012-09-01 08:42:07 +04:00
bd12f636c8
Unify manifest files in Android examples
2012-08-31 17:47:12 +04:00
Andrey Kamaev