Roman Donchenko
|
4f1aed98de
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
.gitignore
modules/contrib/src/detection_based_tracker.cpp
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/src/gpumat.cpp
modules/core/src/opengl.cpp
modules/gpu/src/cuda/safe_call.hpp
modules/highgui/src/cap.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/ocl/doc/image_processing.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/kmeans.cpp
modules/ocl/src/svm.cpp
modules/ocl/test/test_objdetect.cpp
samples/ocl/adaptive_bilateral_filter.cpp
|
2013-11-11 16:55:36 +04:00 |
|
Vladislav Vinogradov
|
8ed47c01b7
|
used new device layer for cv::cuda::norm
|
2013-10-01 15:28:51 +04:00 |
|
Vladislav Vinogradov
|
23cc31e041
|
used new device layer for cv::cuda::LUT
|
2013-10-01 15:24:17 +04:00 |
|
Vladislav Vinogradov
|
06f07944c8
|
removed dependecy from cudalegacy
|
2013-10-01 12:18:40 +04:00 |
|
Vladislav Vinogradov
|
7839dbd2c4
|
used new device layer for cv::gpu::integral
|
2013-10-01 12:18:39 +04:00 |
|
Vladislav Vinogradov
|
224f18b06c
|
bitwise operation optimization
|
2013-10-01 12:18:39 +04:00 |
|
Vladislav Vinogradov
|
eb449968b6
|
removed unroll_detail.hpp
|
2013-10-01 12:18:39 +04:00 |
|
Vladislav Vinogradov
|
1ef211b889
|
used new device layer for cv::gpu::reduce
|
2013-10-01 12:18:39 +04:00 |
|
Vladislav Vinogradov
|
31a7814395
|
used new device layer for cv::gpu::countNonZero
|
2013-10-01 12:18:39 +04:00 |
|
Vladislav Vinogradov
|
020624c481
|
used new device layer for cv::gpu::minMaxLoc
|
2013-10-01 12:18:39 +04:00 |
|
Vladislav Vinogradov
|
3fb9c52272
|
cast to reference
|
2013-10-01 12:18:38 +04:00 |
|
Vladislav Vinogradov
|
045a856c24
|
used new device layer for cv::gpu::minMax
|
2013-10-01 12:18:38 +04:00 |
|
Vladislav Vinogradov
|
b705e0d886
|
used new device layer for cv::gpu::sum
|
2013-10-01 12:18:38 +04:00 |
|
Vladislav Vinogradov
|
e820c5c65f
|
used new device layer for cv::gpu::mulSpectrums
|
2013-10-01 12:18:38 +04:00 |
|
Vladislav Vinogradov
|
3f62e78592
|
used new device layer for cv::gpu::copyMakeBorder
|
2013-10-01 12:18:38 +04:00 |
|
Vladislav Vinogradov
|
7b3bbcea71
|
used new device layer for cv::gpu::transpose
|
2013-10-01 12:18:37 +04:00 |
|
Vladislav Vinogradov
|
6dbb32a05d
|
switched to new device layer in split/merge
|
2013-10-01 12:18:37 +04:00 |
|
Vladislav Vinogradov
|
3ab7f4b26a
|
removed arithm_func_traits.hpp
|
2013-10-01 12:18:37 +04:00 |
|
Vladislav Vinogradov
|
7c8c836a7b
|
switched to new device layer in polar <-> cart
|
2013-10-01 12:18:37 +04:00 |
|
Vladislav Vinogradov
|
5522f43b18
|
used new device layer for cv::gpu::threshold
|
2013-10-01 12:18:37 +04:00 |
|
Vladislav Vinogradov
|
e83be009a3
|
used new device layer for cv::gpu::addWeighted
|
2013-10-01 12:18:37 +04:00 |
|
Vladislav Vinogradov
|
c7a3a7d4d9
|
switched to new device layer in min/max
|
2013-10-01 12:18:36 +04:00 |
|
Vladislav Vinogradov
|
b11cccaaca
|
switched to new device layer in bitwize operations
|
2013-10-01 12:18:36 +04:00 |
|
Vladislav Vinogradov
|
fdfffa5291
|
fixed warnings
|
2013-10-01 12:18:36 +04:00 |
|
Vladislav Vinogradov
|
ef9917ecf1
|
used new device layer for cv::gpu::compare
|
2013-10-01 12:18:36 +04:00 |
|
Vladislav Vinogradov
|
43e811118b
|
fixed assertion
|
2013-10-01 12:18:36 +04:00 |
|
Vladislav Vinogradov
|
766d950ff3
|
used new device layer in math per element operations
|
2013-10-01 12:18:36 +04:00 |
|
Vladislav Vinogradov
|
7628e57fc6
|
used new device layer for cv::gpu::absdiff
|
2013-10-01 12:18:35 +04:00 |
|
Vladislav Vinogradov
|
574ff47146
|
used new device layer for cv::gpu::divide
|
2013-10-01 12:18:35 +04:00 |
|
Vladislav Vinogradov
|
e7dba695b3
|
used new device layer for cv::gpu::multiply
|
2013-10-01 12:18:35 +04:00 |
|
Vladislav Vinogradov
|
156f86ea0b
|
used new device layer for cv::gpu::subtract
|
2013-10-01 12:18:35 +04:00 |
|
Vladislav Vinogradov
|
9c5da2ea22
|
used new device layer for cv::gpu::add
|
2013-10-01 12:18:35 +04:00 |
|
Vladislav Vinogradov
|
0c7663eb3b
|
Merge branch 'master' into gpu-cuda-rename
Conflicts:
modules/core/include/opencv2/core/cuda.hpp
modules/cudacodec/src/thread.cpp
modules/cudacodec/src/thread.hpp
modules/superres/perf/perf_superres.cpp
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/optical_flow.cpp
modules/videostab/src/global_motion.cpp
modules/videostab/src/inpainting.cpp
samples/cpp/stitching_detailed.cpp
samples/cpp/videostab.cpp
samples/gpu/stereo_multi.cpp
|
2013-09-06 15:44:44 +04:00 |
|
Vladislav Vinogradov
|
429bfad225
|
removed precomp.cpp files
|
2013-09-02 14:00:44 +04:00 |
|
Vladislav Vinogradov
|
dcd600cc47
|
renamed gpuarithm -> cudaarithm
|
2013-09-02 14:00:42 +04:00 |
|