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
11 years ago
Vladislav Vinogradov
f46b7fcf86
fixed warnings in resize.cu
11 years ago
Vladislav Vinogradov
1ad4592bfc
Merge branch 'master' into gpu-cuda-rename
...
Conflicts:
modules/cudaoptflow/perf/perf_optflow.cpp
modules/cudaoptflow/src/tvl1flow.cpp
samples/gpu/stereo_multi.cpp
11 years ago
Roman Donchenko
009919872f
Merge pull request #1389 from SpecLad:merge-2.4
11 years ago
Roman Donchenko
79457f8f49
Merge pull request #1224 from mbarnach:pca_io
11 years ago
Roman Donchenko
18bb951574
Nuked the rest of the precomp.cpp files.
...
Consider this a part of merging #1357 .
11 years ago
Roman Donchenko
9218f4976c
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/contrib/src/retina.cpp
modules/gpu/perf/perf_video.cpp
modules/gpuoptflow/src/tvl1flow.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_calib3d.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/src/precomp.hpp
samples/gpu/stereo_multi.cpp
11 years ago
Roman Donchenko
99043f6fc2
Merge pull request #1385 from asmorkalov:winrt_glob_fix
11 years ago
Alexander Smorkalov
6d3102141c
Globbing accuracy test fail on Windows RT fixed.
11 years ago
Roman Donchenko
188d3f02ee
Merge pull request #1302 from kdrobnyh:compare
11 years ago
Roman Donchenko
ff2b12334d
Merge pull request #1355 from jet47:gpu-stereo-multi-gpu-sample
11 years ago
Vladislav Vinogradov
12f50d7f67
fixed video_writer sample
11 years ago
Vladislav Vinogradov
ba4bf04c6c
fixed incorrect GPUs -> CUDAs replacement
11 years ago
Vladislav Vinogradov
a41006754e
fix documentation
11 years ago
Vladislav Vinogradov
429bfad225
removed precomp.cpp files
11 years ago
Vladislav Vinogradov
cbe437571e
fixed docs
11 years ago
Vladislav Vinogradov
f936c1283b
fixed sanity test for cuda module
11 years ago
Vladislav Vinogradov
fd88654b45
replaced GPU -> CUDA
11 years ago
Vladislav Vinogradov
3c34b24f1f
replaced gpu->cuda in files names
11 years ago
Vladislav Vinogradov
80b9fd87dc
removed gpu module from OPENCV2_BASE_MODULES
11 years ago
Vladislav Vinogradov
ae94256edc
renmaed gpu module -> cuda
11 years ago
Vladislav Vinogradov
29386f1449
renamed gpubgsegm -> cudabgsegm
11 years ago
Vladislav Vinogradov
259ceb7eaa
renamed gpufeatures2d -> cudafeatures2d
11 years ago
Vladislav Vinogradov
5660d6a680
renamed gpuoptflow -> cudaoptflow
11 years ago
Vladislav Vinogradov
a0ae602bb7
renamed gpuimgproc -> cudaimgproc
11 years ago
Vladislav Vinogradov
219b662127
renamed gpufilters -> cudafilters
11 years ago
Vladislav Vinogradov
71d61e07b1
renamed gpustereo -> cudastereo
11 years ago
Vladislav Vinogradov
d4901a99ea
renamed gpuwarping -> cudawarping
11 years ago
Vladislav Vinogradov
dcd600cc47
renamed gpuarithm -> cudaarithm
11 years ago
Vladislav Vinogradov
6d216d78d9
renamed gpulegacy -> cudalegacy
11 years ago
Vladislav Vinogradov
dbeb3e2968
renamed gpucodec -> cudacodec
11 years ago
Vladislav Vinogradov
cfe4a71dc6
renamed gpu* source to cuda* in core module
11 years ago
Vladislav Vinogradov
91dd44e7fa
removed compatibility headers
11 years ago
Vladislav Vinogradov
fef646d4f8
removed mark_nvidia.py script
11 years ago
Vladislav Vinogradov
a6308118b4
removed perf4au test
11 years ago
Vladislav Vinogradov
5a85f1b6da
renamed gpucodec namespace -> cudacodec
11 years ago
Vladislav Vinogradov
8282f6ebc1
renamed gpu::cudev namespace -> cuda::device
...
cudev is used for new device layer
11 years ago
Vladislav Vinogradov
e895b7455e
renamed gpu namespace -> cuda
11 years ago
Vladislav Vinogradov
e12496d150
removed gpu name usage from ocl module
11 years ago
Roman Donchenko
bd7930ada1
Merge pull request #1345 from pengx17:2.4_tvl1ocl_opt
11 years ago
Roman Donchenko
7e4c0ac4d6
Merge pull request #1371 from HapeMask:fix-png-warnings
11 years ago
Roman Donchenko
46d74d7c6b
Merge pull request #1360 from vpisarev:24_ipp_dft_canny_morphrect
11 years ago
Gabe Schwartz
b2bedef26f
Added interlace handling to PNG decoder.
...
libpng 1.5+ recommends a call to png_set_interlace_handling() if you use
png_read_update_info and png_read_image. It will generate a warning
without it.
11 years ago
Gabe Schwartz
e2441e0034
Removed incorrect iCCP chunks from GUI resources.
...
Also removed malformed tEXt chunk from a logo PNG.
11 years ago
Roman Donchenko
d6e8216b16
Merge pull request #1374 from zacstewart:2.4
11 years ago
Roman Donchenko
42b4d830e8
Merge pull request #1266 from kdrobnyh:core_stat_functions
11 years ago
Roman Donchenko
96a0afce50
Merge pull request #1236 from pengx17:2.4_fix_retina_color_param
11 years ago
Zac Stewart
8049296cda
Correct name of eye function
11 years ago
Zac Stewart
f36a9f745f
Remove extraneous colon before ':basicstructures:'
11 years ago
Roman Donchenko
114bec52fe
Merge pull request #1363 from ilya-lavrenov:ocl_enable_tests
11 years ago