Roman Donchenko
cc05493730
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectAndroidSDK.cmake
cmake/OpenCVGenAndroidMK.cmake
cmake/OpenCVModule.cmake
cmake/templates/OpenCV.mk.in
cmake/templates/OpenCVConfig.cmake.in
doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.rst
modules/cudabgsegm/src/cuda/mog.cu
modules/imgproc/perf/opencl/perf_filters.cpp
modules/imgproc/src/opencl/filterSep_singlePass.cl
modules/nonfree/CMakeLists.txt
modules/nonfree/perf/perf_precomp.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/opencl/bgfg_mog.cl
modules/superres/CMakeLists.txt
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/cuda/btv_l1_gpu.cu
modules/superres/src/frame_source.cpp
modules/superres/src/input_array_utility.cpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
samples/gpu/CMakeLists.txt
samples/gpu/brox_optical_flow.cpp
samples/gpu/super_resolution.cpp
2014-03-24 19:02:16 +04:00
Alexander Smorkalov
b4e4f13f9e
Superres module enabled for Android. GPU samples build fixed for Android.
2014-03-18 17:07:19 +04:00
Vladislav Vinogradov
6d216d78d9
renamed gpulegacy -> cudalegacy
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
cfe4a71dc6
renamed gpu* source to cuda* in core module
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
91dd44e7fa
removed compatibility headers
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
e895b7455e
renamed gpu namespace -> cuda
2013-09-02 14:00:41 +04:00
Vladislav Vinogradov
3eeaa9189c
Revert "Revert "Merge pull request #836 from jet47:gpu-modules""
2013-06-07 13:05:39 +04:00
Andrey Kamaev
416fb50594
Revert "Merge pull request #836 from jet47:gpu-modules"
...
This reverts commit fba72cb60d02131ffb62
2013-04-18 15:03:50 +04:00
Vladislav Vinogradov
508fb6aa5b
renamed gpunvidia -> gpulegacy
2013-04-18 11:33:33 +04:00
Vladislav Vinogradov
a6648b5372
gpuobjdetect module for object detection
2013-04-18 11:33:32 +04:00
Vladislav Vinogradov
fc1fa28556
gpuvideo module for video processing
2013-04-18 11:33:32 +04:00
Vladislav Vinogradov
229ca0914a
gpunvidia module for NCV & NPP API
2013-04-18 11:33:30 +04:00
Vladislav Vinogradov
ba1a1aecaa
fixed gpu module compilation
2013-04-09 10:41:35 +04:00
Vladislav Vinogradov
ae6266e101
fixes for gpu module:
...
- fixed printCudaDeviceInfo for new CC
- fixed some compilation errors and warnings
- removed unset command from CMake script
- removed unused std imports
2013-01-23 21:05:06 +04:00
marina.kolpakova
d65b3e0617
fix warning in CUDA samples
2012-11-10 04:59:55 +04:00
OpenCV Buildbot
81f826db2b
Normalize line endings and whitespace
2012-10-17 15:57:49 +04:00
OpenCV Buildbot
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
Marina Kolpakova
680a44189c
merged the trunk r8704:8716
2012-06-28 16:13:29 +00:00
Andrey Kamaev
e94e5866a1
Fixed mingw build warnings
2012-06-20 17:57:26 +00:00
Andrey Kamaev
bd0e0b5800
Merged the trunk r8589:8653 - all changes related to build warnings
2012-06-15 13:04:17 +00:00
Andrey Kamaev
49a1ba6038
Set stricter warning rules for gcc
2012-06-07 17:21:29 +00:00
Andrey Kamaev
50ad690993
Merged the trunk till r8291
2012-05-18 12:18:17 +00:00
Vladislav Vinogradov
f65d841d6f
fixed several warnings (VS2010, Win64)
...
added getParams method to VideoWriter_GPU
2012-04-23 14:22:02 +00:00
Andrey Kamaev
5eb6ee6290
Fixing build with CUDA enabled
2012-02-03 12:54:52 +00:00
Andrey Kamaev
984eb99428
Global CMake reorganization:
...
[~] Automatically tracked dependencies between modules
[+] Support for optional module dependencies
[+] Options to choose modules to build
[~] Removed hardcoded modules lists from OpenCVConfig.cmake, opencv.pc and OpenCV.mk
[+] Added COMPONENTS support for FIND_PACKAGE(OpenCV)
[~] haartraining and traincascade are moved outside of modules folder since they aren't the modules
2012-02-03 11:26:49 +00:00
Vladislav Vinogradov
d38ca09738
added gpu::printCudaDeviceInfo to all samples
2012-01-30 07:20:09 +00:00
Alexey Spizhevoy
a2090a44db
Updated CLI for GPU samples
2011-10-24 08:34:15 +00:00
Anatoly Baksheev
78e678b1f8
optflow_gpu compilation under ubuntu
2011-10-03 10:14:59 +00:00
Anatoly Baksheev
336e000ecc
optical flow sample compilation under ubuntu
2011-10-03 10:05:41 +00:00
Anatoly Baksheev
5e831f7fca
compilation under ubuntu
2011-09-30 12:00:44 +00:00
Andrey Kamaev
43ce5e6cc0
Fixed Linux build
2011-09-30 08:06:24 +00:00
Anton Obukhov
42c7aece36
[+] Added Brox optical flow (implementation courtesy of Michael Smirnov)
2011-09-29 14:46:39 +00:00
