Vladislav Vinogradov
371a9cd833
fixed build with CUDA 5.5 on arm platforms
2013-06-18 17:46:57 +04:00
Roman Donchenko
7308a4a845
Merge pull request #995 from jet47:fix-bug-2985
2013-06-14 16:22:47 +04:00
Roman Donchenko
0124902f42
Merge pull request #929 from dominikrose:mingw-libdc1394-2-windows
2013-06-14 15:46:25 +04:00
Vladislav Vinogradov
055137582c
fix for bug #2985 :
...
OPENCLAMDBLAS and OPENCLAMDFFT never detected under linux.
lib64/import and lib32/import is the path on Windows but not Linux.
for CLAMDBLAS library we should use CLAMDBLAS_PATH (not CLAMDFFT_PATH)
2013-06-13 16:13:46 +04:00
Andrew Senin
8eb6decb25
Fixed Ximea cameras support
2013-06-11 21:17:31 +04:00
Roman Donchenko
33d1f67501
Include the OpenCV config headers into every module.
...
This has no bearing on compilation, but it makes them show up in IDEs.
2013-06-07 19:07:55 +04:00
Roman Donchenko
9b46c6fb8a
Merge pull request #959 from SpecLad:qt4-build
2013-06-07 11:27:46 +04:00
Roman Donchenko
8714cbac91
Fix a missing header path when building with Qt 4.
...
Also, removing explicit include path configuration,
since QT_USE_FILE takes care of that.
2013-06-06 14:09:33 +04:00
Roman Donchenko
985bfea556
Don't resolve symlinks when looking for modules.
...
We don't really need it, it makes the code longer, and it can lead to
inconsistent paths when OpenCV is itself inside a symlink.
2013-06-05 17:17:13 +04:00
Roman Donchenko
99340b5613
Merge pull request #941 from apavlenko:signed_char
2013-06-05 11:27:08 +04:00
Vladislav Vinogradov
09a7e86a39
fixed NPP library search (it was splitted)
2013-06-03 13:37:30 +04:00
Andrey Pavlenko
081c47e3df
making the comment less ambigous
2013-05-31 19:55:51 +04:00
Andrey Pavlenko
6f006e50dc
setting 'char' to be signed by default since some tests fail when it's wrong (e.g. native compilation on ARM Linux)
2013-05-31 18:58:30 +04:00
Alexander Smorkalov
20fef00a77
android -> plarforms/android
2013-05-27 11:10:38 +04:00
Dominik Rose
76d1fa0ef6
Merge branch 'mingw-libdc1394-2-windows' of https://github.com/dominikrose/opencv into mingw-libdc1394-2-windows
2013-05-14 16:48:29 +02:00
Dominik Rose
86ec9b79fd
libd1394 2.x support for mingw on windows added
2013-05-14 16:30:12 +02:00
Andrey Pavlenko
87fcd2342f
Merge pull request #878 from apavlenko:better_glue_search
2013-05-14 11:57:25 +04:00
Andrey Pavlenko
d94ecf40e6
Merge pull request #880 from apavlenko:qt-5.0
2013-05-13 21:18:47 +04:00
Andrey Kamaev
f856f78ac0
Update CMake scripts to recognize Qt 5.0
2013-05-13 17:10:32 +04:00
Andrey Kamaev
2665c39a0d
Fix build warnings from gcc 4.8
2013-05-13 17:07:30 +04:00
Andrey Kamaev
60059a7aa0
Improve handling of native_app_glue dependency in Android samples
2013-05-13 17:01:18 +04:00
Andrey Pavlenko
108bb811c5
fixing precommit build on ubuntu-64 (now it takes OCL headers from non-default OCL SDK, but libs from default one)
2013-04-29 23:10:03 +04:00
Roman Donchenko
bd6f80faf3
Redo the Sphinx check to do the same thing on all platforms.
...
This also fixes the bug where the Sphinx version gets detected as
"Sphinx vX.Y.Z" instead of "X.Y.Z" on Unix-like systems.
2013-04-17 12:33:11 +04:00
Vadim Pisarevsky
3d39087a67
Merge pull request #806 from bitwangyaoyao:2.4_fix
2013-04-12 13:46:33 +04:00
yao
61e041673e
remove the OpenCL Dir finding in CMake
2013-04-12 14:44:55 +08:00
Roman Donchenko
e8721f1f6f
Automatically add CUDA support to a module if it has CUDA sources.
...
Backport from master.
2013-04-10 12:20:54 +04:00
Andrey Kamaev
d3083ecf6d
Fix bitness detection for target platform
2013-04-08 11:25:36 +04:00
Andrey Kamaev
c34820b53a
Merge pull request #766 from taka-no-me:try_compile_fix
2013-04-04 18:00:23 +04:00
Andrey Kamaev
7c402d1e15
Merge pull request #759 from asmorkalov:android_common_fixes
2013-04-04 17:58:44 +04:00
Andrey Kamaev
e7885bb8e4
Merge pull request #758 from taka-no-me:do_not_use_opengl_without_ui
2013-04-04 17:57:38 +04:00
Andrey Kamaev
fa64f28c6b
Fix binary directory used in CMake try_compile commands
...
Old paths can have problems with cross-compilation
2013-04-04 15:43:49 +04:00
Alexander Smorkalov
36367ec027
Several fixes android related fixes
...
Native activity build warning fixed;
Logcat messages for JavaCameraView updated (Bug #2876 );
Some fixes for feature #2893 done.
2013-04-04 12:18:13 +04:00
Andrey Kamaev
2c57445ffe
Improve CMake checks for the OpenGL availability
...
Issue #2868
2013-04-04 11:57:00 +04:00
Andrey Kamaev
bf3264b197
Add missed CMake include for check_include_file
...
Issue #2820
2013-04-04 11:04:51 +04:00
Andrey Kamaev
18536fe8f9
Fix target platform detection for x64 MinGW
2013-04-03 16:30:33 +04:00
Andrey Kamaev
91f6eb7cab
Merge pull request #745 from jet47:fix-gpu-warnings
2013-04-03 15:44:46 +04:00
Andrey Kamaev
795a513ac4
Merge pull request #716 from asmorkalov:winrt
2013-04-03 15:39:58 +04:00
Alexander Smorkalov
a2561ee0cd
Code review notes fixed.
2013-04-03 04:14:40 -07:00
Vladislav Vinogradov
870563ba25
fixed compilation warning for CUDA files
...
command line option '-Wsign-promo' is valid for C++/ObjC++ but not for C [enabled by default]
2013-04-03 13:47:59 +04:00
Alexander Smorkalov
4703f4552a
Experimental MS Media Foundation API support added
2013-04-02 18:10:55 -07:00
Misty De Meo
e143706ef9
Fix ant/Java detection in cmake scripts
...
Mac OS X 10.7 and newer don't come with Java installed. They do
include some stub binaries, which ask the user if they want to
install Java when run.
OpenCV's cmake script just checks for the existence of an ant
binary and assumes that Java's available if ant is. As a result,
cmake will configure the build to use Java and it will fail once
it tries to compile the Java bindings.
This fixes the issue by checking for the exit status of
`ant -version` - it exits 0 if Java is installed, or 1
otherwise.(cherry picked from commit a423afddc1
2013-03-29 18:29:40 +04:00
Andrey Kamaev
b5dd26e4c7
Merge pull request #704 from taka-no-me:folders
2013-03-29 18:20:27 +04:00
Alexander Smorkalov
09bc99a0c0
HAVE_WIN32UI and HAVE_VFW checks and defines added.
2013-03-27 08:03:51 -07:00
Alexander Smorkalov
6f68640d4d
Multiple fixes for WinRT
...
Fixed flann build with NEON;
Fixed Haming distance with NEON;
Honest cvRound for WinRT added;
cvRound test added;
Video IO with direct show disabled;
2013-03-26 17:19:52 -07:00
yao
f428d1874a
discard comments in kernels.cpp
2013-03-26 12:01:01 +08:00
yao
7e495a1d66
fix amdFft and amdBlas path
2013-03-26 11:48:14 +08:00
Andrey Kamaev
f282498b1d
Drop outdated targets and fix solution folders
2013-03-25 21:57:53 +04:00
Anatoly Baksheev
7fa01e3fcc
enabled png and jpeg for iOS
2013-03-25 11:19:29 +04:00
Andrey Kamaev
91ac9688a8
Allow OpenCL acceleration in every OpenCV module
2013-03-21 17:57:01 +04:00
Andrey Kamaev
d28df08eb0
Refactor OpenCL search
2013-03-21 17:56:59 +04:00
