Alexander Alekhin
9ac35173e3
cmake: remove non-ascii symbols
2016-02-09 14:44:05 +03:00
Alexander Alekhin
1dac67f013
cmake: add version control revision info for extra modules
2016-02-09 14:39:05 +03:00
Alexander Alekhin
de8b3ee231
cmake: add timestamp into build info log (6089)
2016-02-09 14:39:04 +03:00
StevenPuttemans
6cdf3116c4
deactivate build options by default that are not supposed the be ON by default
2016-02-05 11:01:21 +01:00
Maksim Shabunin
68eab8ea00
Merge pull request #5884 from alalek:cmake_vars
2016-01-17 09:43:17 +00:00
Alexander Alekhin
64057965f5
Merge pull request #5979 from alalek:world_disable_pch
2016-01-15 17:28:48 +00:00
Alexander Alekhin
c75f9c80c7
cmake: turn off precompiled headers in case of opencv_world builds
2016-01-15 19:43:24 +03:00
Alexander Alekhin
9cd6731894
cmake: add DEBUG_PRE/DEBUG_POST commands handling
...
Useful for debug purposes:
cmake -DDEBUG_POST="ocv_cmake_dump_vars(CUDA)" .
cmake -DCMAKE_PRE="ocv_cmake_dump_vars(\"OPENCL|opencl\")" .
2016-01-15 14:36:03 +03:00
Alexander Alekhin
9d4ee2f54d
cmake: added generation of CMakeVars.txt
...
related: #5845
2016-01-15 13:54:28 +03:00
Alexander Alekhin
c35ddcba1a
cmake: refactor OpenCL detection, allow custom configurations
2016-01-15 13:05:16 +03:00
Alexander Alekhin
c8ff7a4867
build: fix opencv_world with CUDA
2016-01-14 17:23:55 +03:00
Alexander Alekhin
8d79285d02
Merge pull request #5840 from paroj:v4ldefault
2015-12-24 10:08:59 +00:00
Pavel Rojtberg
96654f0084
make sure cap_v4l is used by default on Linux
...
cap_v4l is better maintained and generally the code is in
better shape than cap_libv4l.
2015-12-20 01:19:48 +01:00
Vadim Pisarevsky
97dc5be841
Merge pull request #5821 from alalek:build_framework
2015-12-18 10:12:55 +00:00
Alexander Alekhin
ec0e43a95b
Merge pull request #5801 from enpe:matlab-switch
2015-12-18 09:34:36 +00:00
Vadim Pisarevsky
d02627ea89
Merge pull request #5825 from GregoryMorse:master
2015-12-18 07:17:29 +00:00
Gregory Morse
af5bec70cd
merge Win10/VS2015 changes
2015-12-17 21:15:59 +01:00
Alexander Alekhin
be23846c4e
update osx and ios build_framework.py
2015-12-17 16:17:31 +03:00
Maksim Shabunin
84f37d352f
HAL moved back to core
2015-12-17 12:33:23 +03:00
Nils Plath
4474845dd5
Simplified status update.
2015-12-16 21:53:34 +01:00
Nils Plath
a1173dfa27
Added switch to CMakeLists.txt in order to enable/disable Matlab.
2015-12-14 23:30:28 +01:00
Alexander Alekhin
5053aeeb19
cmake: DOWNLOAD_EXTERNAL_TEST_DATA option
2015-12-12 15:23:31 +03:00
Alexander Alekhin
c2a86a6a84
NEON flags fix
2015-12-11 12:06:24 +03:00
Dan
46ec9c386b
Gstreamer 1.0 on windows.
2015-12-09 09:11:45 -05:00
Vadim Pisarevsky
9c0a5523e4
Merge pull request #5757 from alalek:merge-2.4
2015-12-08 11:51:29 +00:00
Alexander Alekhin
d86d8ed909
Merge 2.4 into master
...
PR #2968 : cce2d99
8578f9c
Fixed bug which caused crash of GPU version of feature matcher in stitcher
The bug caused crash of GPU version of feature matcher in stitcher when
we use ORB features.
PR #3236 : 5947519
Check sure that we're not already below required leaf false alarm rate before continuing to get negative samples.
PR #3190
fix blobdetector
PR #3562 (part): 82bd82e
TBB updated to 4.3u2. Fix for aarch64 support.
PR #3604 (part): 091c7a3
OpenGL interop sample reworked not ot use cvconfig.h
PR #3792 : afdf319
Add -L for CUDA libs path to pkg-config
Add all dirs from CUDA_LIBS_PATH as -L linker options to
OPENCV_LINKER_LIBS. These will end up in opencv.pc.
PR #3893 : 122b9f8
Turn ocv_convert_to_lib_name into a function
PR #5490 : ec5244a
fixed memory leak in findHomography tests
PR #5491 : 0d5b739
delete video readers
PR #5574
PR #5202
2015-12-08 10:24:54 +03:00
Maksim Shabunin
b4bcdd10a1
HAL: improvements
...
- added new functions from core module: split, merge, add, sub, mul, div, ...
- added function replacement mechanism
- added example of HAL replacement library
2015-12-03 14:43:37 +03:00
Vadim Pisarevsky
7323823b38
Merge pull request #5582 from sizeofvoid:master
2015-11-02 11:39:43 +00:00
Rafael Sadowski
e38b54a786
fix cmake OpenBSD linker libs
...
OpenBSD needs m and pthread like Net- and FreeBSD.
2015-10-28 22:47:00 +01:00
Vladislav Vinogradov
02c48ab7d6
add CTest support to build tree
2015-10-13 17:34:08 +03:00
Vadim Pisarevsky
9533982729
Merge pull request #5272 from avershov:opencl-vaapi-fallback
2015-09-14 11:54:20 +00:00
Maksim Shabunin
10d8e956f4
Enabled pthreads backend for mingw
2015-09-10 17:12:22 +03:00
Alexey Ershov
68a0347ff9
fallback path & sample timing implemented
...
fixed trailing whitespaces
renamed files *vaapi* to *va_intel*
changed names vaapi* to va_intel*
2015-09-04 02:42:49 +03:00
Maksim Shabunin
e009d79cc8
fixup! Some changes to support mingw-w64
2015-09-01 12:14:40 +03:00
Maksim Shabunin
771af4f32d
Some changes to support mingw-w64
...
- IPP is disabled by default when compiler is mingw (couldn't make it
work)
- fixed some warnings
- fixed some `__GNUC__` version checks (for correctness and convenience)
- removed UTF-8 BOM from hough.cpp (fixes #5253 )
2015-09-01 00:59:08 +03:00
Alexey Ershov
a8656ea20f
implemented core support & sample
...
fixed whitespaces
fixed issues
fixed issue
fixed module statement issues
fixed access mode
added initialization check
fixed warning
2015-08-21 02:44:03 +03:00
Alexander Alekhin
63bae5da71
vtk: disable on cross-compilation
2015-08-03 19:09:07 +03:00
Evgeny Agafonchikov
6a6d58d389
Adding test support for WINRT
2015-06-30 15:35:20 +03:00
Alexander Alekhin
a482dcce46
fix support for pthreads parallel_for
2015-06-11 16:53:07 +03:00
Vadim Pisarevsky
799622affd
make sure opencv builds fine with the recent versions of libav (e.g. from Ubuntu 14.10)
...
(cherry picked from commit 2b2e3ee93c
)
Conflicts:
cmake/OpenCVFindLibsVideo.cmake
modules/videoio/src/cap.cpp
modules/videoio/src/cap_ffmpeg_impl.hpp
modules/videoio/src/ffmpeg_codecs.hpp
modules/videoio/test/test_ffmpeg.cpp
2015-06-09 15:53:08 +03:00
Maksim Shabunin
caffbaafbe
Updated Manager for Android
2015-06-02 17:33:04 +03:00
kalistratovag
bf5393ae58
parallel for on pthreads initial commit
...
removing trailing whitespaces
Compilation error on Mac fix & warning on android
Warnings fixed on iOs
2015-06-01 17:48:21 +03:00
Maksim Shabunin
3863dc5b2b
Updated pkg-config generation, added sample makefile
2015-05-22 16:09:07 +03:00
Piotr Dobrowolski
6d0407b65e
VideoCapture with digital camera and gPhoto2 library
2015-05-21 00:41:39 +02:00
Vadim Pisarevsky
eb41a574b7
Merge pull request #4005 from MSOpenTech:videoio-contrib
2015-05-16 18:08:28 +00:00
Maxim Kostin
55f78f8a83
Added configuration changes enabling videoio WinRT support.
...
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-05-15 16:29:06 +03:00
Vladislav Vinogradov
cde697dd14
introduce BUILD_TINY_GPU_MODULE CMake option
...
it adds OPENCV_TINY_GPU_MODULE definition, that will allow
to build tiny version of gpu module (with limited image format support)
2015-05-06 17:13:59 +03:00
Ruslan Baratov
441f93d58d
Unify iOS platform check
...
There is only one place that use condition `CMAKE_SYSTEM_NAME STREQUAL iOS`.
All other `if` command use just IOS.
2015-05-02 23:44:19 +02:00
Ying Xiong
82668e06d4
Silence cmake 3.0+ warnings about MACOSX_RPATH
2015-04-24 22:39:49 +02:00
Vadim Pisarevsky
2b2e3ee93c
make sure opencv builds fine with the recent versions of libav (e.g. from Ubuntu 14.10)
2015-04-22 21:57:29 +03:00