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 |
|
Andrey Pavlenko
|
fe5eaae102
|
adding missing include (fixing 'no ocl implementation' error)
|
2014-03-21 14:30:49 +04:00 |
|
Vladislav Vinogradov
|
3c34b24f1f
|
replaced gpu->cuda in files names
|
2013-09-02 14:00:44 +04:00 |
|
Vladislav Vinogradov
|
9f33de7071
|
added cvconfig.hpp header file to gpu tests
it uses HAVE_CUDA, HAVE_NVCUVID, etc. macroses
|
2013-08-19 12:46:57 +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 fba72cb60d, reversing
changes made to 02131ffb62.
|
2013-04-18 15:03:50 +04:00 |
|
Vladislav Vinogradov
|
12f16b7a26
|
nonfree module fixes
|
2013-04-18 12:36:11 +04:00 |
|
Vladislav Vinogradov
|
204a19b431
|
moved common gpu utility functionality to gpu_private.hpp
|
2013-04-08 17:25:15 +04:00 |
|
Andrey Kamaev
|
f77a375354
|
Merge branch '2.4'
|
2013-03-29 19:38:35 +04:00 |
|
Vladislav Vinogradov
|
4dbd0f0e8f
|
fixed compilation issues with gpu modules:
* disabled warnings from thrust
* fixed warnings from ts_gtest.h
* possibly fixed superres compilation in Debug mode on Windows
|
2013-03-26 12:33:13 +04:00 |
|
marina.kolpakova
|
84f45e1e03
|
fixed build with CUDA after latest merge
|
2013-03-25 08:08:36 +04:00 |
|
Andrey Kamaev
|
1ca8f33b4e
|
Merge branch '2.4'
|
2013-03-21 23:11:54 +04:00 |
|
Andrey Kamaev
|
1b4afcca30
|
Move OpenCl SURF perf tests to nonfree and fix build of samples
|
2013-03-21 18:19:52 +04:00 |
|
Vladislav Vinogradov
|
0a65f2f4af
|
merged gpunonfree and nonfree module
|
2013-03-18 16:14:37 +04:00 |
|
Andrey Kamaev
|
ad5cddc007
|
Main module headers are moved 1 level up
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
|
2013-03-13 17:26:56 +04:00 |
|
Andrey Kamaev
|
a126532cb7
|
Fix OS X build warnings
|
2012-11-09 11:29:52 +04:00 |
|
marina.kolpakova
|
7a5b9a6b7f
|
replase __APPLE__ marco with __clang__
|
2012-11-01 19:34:05 +04:00 |
|
Andrey Kamaev
|
2b0072d823
|
Suppress more warnings in gtest on OS X
|
2012-10-24 20:36:30 +04:00 |
|
Andrey Kamaev
|
e900952b87
|
quiet most of the OSX build warnings
|
2012-07-05 12:56:31 +00:00 |
|
Andrey Kamaev
|
47a4e87784
|
Ignored warnings from gtest with precompiled headers enabled
|
2012-06-08 14:54:17 +00:00 |
|
Andrey Kamaev
|
49a1ba6038
|
Set stricter warning rules for gcc
|
2012-06-07 17:21:29 +00:00 |
|
Vadim Pisarevsky
|
957e80abbd
|
lot's of changes; nonfree & photo modules added; SIFT & SURF -> nonfree module; Inpainting -> photo; refactored features2d (ORB is still failing tests), optimized brute-force matcher and made it non-template.
|
2012-03-15 14:36:01 +00:00 |
|