Vladislav Vinogradov [Fri, 6 Sep 2013 11:44:44 +0000 (15:44 +0400)]
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
Vladislav Vinogradov [Wed, 4 Sep 2013 07:15:18 +0000 (11:15 +0400)]
fixed warnings in resize.cu
Vladislav Vinogradov [Wed, 4 Sep 2013 05:58:32 +0000 (09:58 +0400)]
Merge branch 'master' into gpu-cuda-rename
Conflicts:
modules/cudaoptflow/perf/perf_optflow.cpp
modules/cudaoptflow/src/tvl1flow.cpp
samples/gpu/stereo_multi.cpp
Roman Donchenko [Tue, 3 Sep 2013 15:42:05 +0000 (19:42 +0400)]
Merge pull request #1389 from SpecLad:merge-2.4
Roman Donchenko [Tue, 3 Sep 2013 14:43:54 +0000 (18:43 +0400)]
Merge pull request #1224 from mbarnach:pca_io
Roman Donchenko [Mon, 2 Sep 2013 15:53:45 +0000 (19:53 +0400)]
Nuked the rest of the precomp.cpp files.
Consider this a part of merging #1357.
Roman Donchenko [Mon, 2 Sep 2013 15:44:51 +0000 (19:44 +0400)]
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
Roman Donchenko [Mon, 2 Sep 2013 12:05:14 +0000 (16:05 +0400)]
Merge pull request #1385 from asmorkalov:winrt_glob_fix
Alexander Smorkalov [Mon, 2 Sep 2013 07:57:42 +0000 (00:57 -0700)]
Globbing accuracy test fail on Windows RT fixed.
Roman Donchenko [Mon, 2 Sep 2013 11:11:19 +0000 (15:11 +0400)]
Merge pull request #1302 from kdrobnyh:compare
Roman Donchenko [Mon, 2 Sep 2013 10:10:05 +0000 (14:10 +0400)]
Merge pull request #1355 from jet47:gpu-stereo-multi-gpu-sample
Vladislav Vinogradov [Mon, 26 Aug 2013 07:34:37 +0000 (11:34 +0400)]
fixed video_writer sample
Vladislav Vinogradov [Wed, 21 Aug 2013 09:07:17 +0000 (13:07 +0400)]
fixed incorrect GPUs -> CUDAs replacement
Vladislav Vinogradov [Tue, 20 Aug 2013 13:34:32 +0000 (17:34 +0400)]
fix documentation
Vladislav Vinogradov [Tue, 20 Aug 2013 13:16:01 +0000 (17:16 +0400)]
removed precomp.cpp files
Vladislav Vinogradov [Tue, 20 Aug 2013 11:05:49 +0000 (15:05 +0400)]
fixed docs
Vladislav Vinogradov [Wed, 24 Jul 2013 10:52:32 +0000 (14:52 +0400)]
fixed sanity test for cuda module
Vladislav Vinogradov [Wed, 24 Jul 2013 09:55:18 +0000 (13:55 +0400)]
replaced GPU -> CUDA
Vladislav Vinogradov [Wed, 24 Jul 2013 08:01:34 +0000 (12:01 +0400)]
replaced gpu->cuda in files names
Vladislav Vinogradov [Wed, 24 Jul 2013 07:59:41 +0000 (11:59 +0400)]
removed gpu module from OPENCV2_BASE_MODULES
Vladislav Vinogradov [Wed, 24 Jul 2013 07:41:44 +0000 (11:41 +0400)]
renmaed gpu module -> cuda
Vladislav Vinogradov [Wed, 24 Jul 2013 06:44:39 +0000 (10:44 +0400)]
renamed gpubgsegm -> cudabgsegm
Vladislav Vinogradov [Wed, 24 Jul 2013 06:27:59 +0000 (10:27 +0400)]
renamed gpufeatures2d -> cudafeatures2d
Vladislav Vinogradov [Tue, 23 Jul 2013 13:04:38 +0000 (17:04 +0400)]
renamed gpuoptflow -> cudaoptflow
Vladislav Vinogradov [Tue, 23 Jul 2013 12:59:34 +0000 (16:59 +0400)]
renamed gpuimgproc -> cudaimgproc
Vladislav Vinogradov [Tue, 23 Jul 2013 12:24:55 +0000 (16:24 +0400)]
renamed gpufilters -> cudafilters
Vladislav Vinogradov [Tue, 23 Jul 2013 12:18:26 +0000 (16:18 +0400)]
renamed gpustereo -> cudastereo
Vladislav Vinogradov [Tue, 23 Jul 2013 11:57:59 +0000 (15:57 +0400)]
renamed gpuwarping -> cudawarping
Vladislav Vinogradov [Tue, 23 Jul 2013 11:24:10 +0000 (15:24 +0400)]
renamed gpuarithm -> cudaarithm
Vladislav Vinogradov [Tue, 23 Jul 2013 10:45:58 +0000 (14:45 +0400)]
renamed gpulegacy -> cudalegacy
Vladislav Vinogradov [Tue, 23 Jul 2013 10:29:21 +0000 (14:29 +0400)]
renamed gpucodec -> cudacodec
Vladislav Vinogradov [Tue, 23 Jul 2013 10:12:04 +0000 (14:12 +0400)]
renamed gpu* source to cuda* in core module
Vladislav Vinogradov [Tue, 23 Jul 2013 09:19:54 +0000 (13:19 +0400)]
removed compatibility headers
Vladislav Vinogradov [Tue, 23 Jul 2013 09:04:49 +0000 (13:04 +0400)]
removed mark_nvidia.py script
Vladislav Vinogradov [Tue, 23 Jul 2013 09:04:35 +0000 (13:04 +0400)]
removed perf4au test
Vladislav Vinogradov [Tue, 23 Jul 2013 08:33:11 +0000 (12:33 +0400)]
renamed gpucodec namespace -> cudacodec
Vladislav Vinogradov [Tue, 23 Jul 2013 07:33:51 +0000 (11:33 +0400)]
renamed gpu::cudev namespace -> cuda::device
cudev is used for new device layer
Vladislav Vinogradov [Wed, 28 Aug 2013 11:45:13 +0000 (15:45 +0400)]
renamed gpu namespace -> cuda
Vladislav Vinogradov [Mon, 22 Jul 2013 11:31:14 +0000 (15:31 +0400)]
removed gpu name usage from ocl module
Roman Donchenko [Mon, 2 Sep 2013 09:09:22 +0000 (13:09 +0400)]
Merge pull request #1345 from pengx17:2.4_tvl1ocl_opt
Roman Donchenko [Fri, 30 Aug 2013 13:56:06 +0000 (17:56 +0400)]
Merge pull request #1371 from HapeMask:fix-png-warnings
Roman Donchenko [Fri, 30 Aug 2013 13:55:07 +0000 (17:55 +0400)]
Merge pull request #1360 from vpisarev:24_ipp_dft_canny_morphrect
Gabe Schwartz [Thu, 29 Aug 2013 18:32:50 +0000 (14:32 -0400)]
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.
Gabe Schwartz [Tue, 27 Aug 2013 20:28:10 +0000 (16:28 -0400)]
Removed incorrect iCCP chunks from GUI resources.
Also removed malformed tEXt chunk from a logo PNG.
Roman Donchenko [Fri, 30 Aug 2013 13:28:51 +0000 (17:28 +0400)]
Merge pull request #1374 from zacstewart:2.4
Roman Donchenko [Fri, 30 Aug 2013 13:26:20 +0000 (17:26 +0400)]
Merge pull request #1266 from kdrobnyh:core_stat_functions
Roman Donchenko [Fri, 30 Aug 2013 13:25:06 +0000 (17:25 +0400)]
Merge pull request #1236 from pengx17:2.4_fix_retina_color_param
Zac Stewart [Fri, 30 Aug 2013 10:34:47 +0000 (06:34 -0400)]
Correct name of eye function
Zac Stewart [Fri, 30 Aug 2013 10:34:23 +0000 (06:34 -0400)]
Remove extraneous colon before ':basicstructures:'
Roman Donchenko [Fri, 30 Aug 2013 08:24:24 +0000 (12:24 +0400)]
Merge pull request #1363 from ilya-lavrenov:ocl_enable_tests
Roman Donchenko [Fri, 30 Aug 2013 08:21:26 +0000 (12:21 +0400)]
Merge pull request #1370 from ilya-lavrenov:ocl_decor
kdrobnyh [Thu, 29 Aug 2013 17:05:35 +0000 (21:05 +0400)]
Add IPP support in meanStdDev, minMaxIdx, norm functions
kdrobnyh [Thu, 29 Aug 2013 14:53:46 +0000 (07:53 -0700)]
Merge pull request #5 from Itseez/2.4
Some changes in OpenCV
ilya-lavrenov [Wed, 28 Aug 2013 07:25:54 +0000 (11:25 +0400)]
enabled some tests that failed before OCL_TEST_CYCLE*() macroses were defined and for some tests was disabled SANITY_CHECK, because plain and ocl results must not be completely equal
ilya-lavrenov [Thu, 29 Aug 2013 11:55:53 +0000 (15:55 +0400)]
gpu -> ocl
Roman Donchenko [Thu, 29 Aug 2013 14:09:06 +0000 (18:09 +0400)]
Merge pull request #1361 from asmorkalov:winrt_api_container
Roman Donchenko [Thu, 29 Aug 2013 14:07:57 +0000 (18:07 +0400)]
Merge pull request #1359 from asmorkalov:winrt_tiff_api_fix
kdrobnyh [Mon, 19 Aug 2013 12:41:31 +0000 (16:41 +0400)]
Add IPP support in compare function
Roman Donchenko [Thu, 29 Aug 2013 12:35:38 +0000 (16:35 +0400)]
Merge pull request #1366 from asmorkalov:ocv_autobuffer_fix
Roman Donchenko [Thu, 29 Aug 2013 12:26:55 +0000 (16:26 +0400)]
Merge pull request #1309 from pengx17:master_retina_ocl
Alexander Smorkalov [Sun, 25 Aug 2013 12:33:22 +0000 (16:33 +0400)]
AutoBuffer with initial zero size fixed.
Vadim Pisarevsky [Wed, 28 Aug 2013 15:53:40 +0000 (19:53 +0400)]
fixed bugs in rectangular morphology case
Alexander Smorkalov [Wed, 28 Aug 2013 15:36:57 +0000 (08:36 -0700)]
/apicontainer added to linker flags on WinRT to fix api test issues.
Roman Donchenko [Wed, 28 Aug 2013 15:02:08 +0000 (19:02 +0400)]
Merge pull request #1338 from asmorkalov:android_tegra_detector
Roman Donchenko [Wed, 28 Aug 2013 15:01:15 +0000 (19:01 +0400)]
Merge pull request #1343 from asmorkalov:android_img_manipulations_fix
Alexander Smorkalov [Wed, 28 Aug 2013 14:31:46 +0000 (07:31 -0700)]
LibTIFF Win32 API back-end disabled for Windows RT.
Roman Donchenko [Wed, 28 Aug 2013 14:05:10 +0000 (18:05 +0400)]
Merge pull request #1356 from SpecLad:homography-uninit
Vadim Pisarevsky [Wed, 28 Aug 2013 13:00:26 +0000 (17:00 +0400)]
fixed building OpenCV with IPP 6.x (different DFT API); added Canny and rectangular morphology (based on Alex Kapustin patches)
Alexander Smorkalov [Fri, 23 Aug 2013 13:37:43 +0000 (17:37 +0400)]
New Tegra detector with Android 4.3 support added. Manager version++.
Alexander Smorkalov [Mon, 26 Aug 2013 13:35:20 +0000 (17:35 +0400)]
Bug #3238 Android sample image manipulations blinks in non-preview modes fixed.
Roman Donchenko [Wed, 28 Aug 2013 10:52:28 +0000 (14:52 +0400)]
Merge pull request #1357 from SpecLad:less-precomps
Roman Donchenko [Wed, 28 Aug 2013 09:41:39 +0000 (13:41 +0400)]
Merge pull request #1348 from SpecLad:merge-2.4
Roman Donchenko [Wed, 28 Aug 2013 09:31:08 +0000 (13:31 +0400)]
Merge pull request #1213 from kdrobnyh:color
Roman Donchenko [Wed, 28 Aug 2013 09:23:50 +0000 (13:23 +0400)]
Deleted the now-empty ocl perf_precomp.cpp.
See pull request #1241 for why.
Roman Donchenko [Wed, 28 Aug 2013 09:20:14 +0000 (13:20 +0400)]
Fixed incomplete matrix initialization in HomographyRefineCallback.
Roman Donchenko [Wed, 28 Aug 2013 09:13:15 +0000 (13:13 +0400)]
Removed a duplicate line.
Roman Donchenko [Wed, 28 Aug 2013 08:46:01 +0000 (12:46 +0400)]
Merge pull request #1349 from ilya-lavrenov:ocl_perf_finish
Vladislav Vinogradov [Wed, 28 Aug 2013 08:41:41 +0000 (12:41 +0400)]
rewrite gpu stereo multi gpu sample:
* use different approaches -> threads and streams
* clean up code
peng xiao [Wed, 28 Aug 2013 08:23:46 +0000 (16:23 +0800)]
Remove trailing whitespace.
Roman Donchenko [Wed, 28 Aug 2013 08:00:39 +0000 (12:00 +0400)]
Merge pull request #1342 from nevion:master
Roman Donchenko [Wed, 28 Aug 2013 07:44:40 +0000 (11:44 +0400)]
Merge pull request #1248 from vkocheganov:chi_square_alt
peng xiao [Wed, 28 Aug 2013 01:17:05 +0000 (09:17 +0800)]
Let ocl::context only be initialized once in retina_ocl test.
ilya-lavrenov [Tue, 27 Aug 2013 14:46:30 +0000 (18:46 +0400)]
appended ocl::finish to test_cycle defines
Roman Donchenko [Tue, 27 Aug 2013 15:15:47 +0000 (19:15 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/gpuwarping/src/cuda/resize.cu
modules/gpuwarping/src/resize.cpp
modules/gpuwarping/test/test_resize.cpp
modules/ocl/perf/main.cpp
modules/ocl/perf/perf_calib3d.cpp
modules/ocl/perf/perf_canny.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/perf_precomp.cpp
modules/ocl/perf/perf_precomp.hpp
Roman Donchenko [Tue, 27 Aug 2013 13:47:55 +0000 (17:47 +0400)]
Merge pull request #1341 from roynos:master
Roman Donchenko [Tue, 27 Aug 2013 13:13:40 +0000 (17:13 +0400)]
War on Whitespace, master edition: tabs.
Roman Donchenko [Tue, 27 Aug 2013 10:38:52 +0000 (14:38 +0400)]
Restored one executable bit that was lost during the war on whitespace.
Roman Donchenko [Tue, 27 Aug 2013 10:23:26 +0000 (14:23 +0400)]
War on Whitespace, master edition: file endings.
Roman Donchenko [Tue, 27 Aug 2013 09:57:24 +0000 (13:57 +0400)]
War on Whitespace, master edition: trailing spaces.
Roman Donchenko [Tue, 27 Aug 2013 09:26:44 +0000 (13:26 +0400)]
Merge commit '
43aec5ad' into merge-2.4
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVLegacyOptions.cmake
modules/contrib/src/retina.cpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/video.rst
modules/gpu/src/speckle_filtering.cpp
modules/python/src2/cv2.cv.hpp
modules/python/test/test2.py
samples/python/watershed.py
Roman Donchenko [Tue, 27 Aug 2013 09:23:26 +0000 (13:23 +0400)]
Merge commit '
43aec5ad^' into merge-2.4
Conflicts:
modules/contrib/src/inputoutput.cpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpuarithm/perf/perf_element_operations.cpp
modules/gpuarithm/src/element_operations.cpp
modules/ts/src/precomp.hpp
Roman Donchenko [Tue, 27 Aug 2013 08:43:34 +0000 (12:43 +0400)]
Merge pull request #1267 from clhsieh:gpu_example_build_failed_with_cuda5p5
Roman Donchenko [Tue, 27 Aug 2013 08:37:32 +0000 (12:37 +0400)]
Merge pull request #1339 from mdim:ml_cpp_wrappers_fix
Roman Donchenko [Tue, 27 Aug 2013 08:36:44 +0000 (12:36 +0400)]
Merge pull request #1346 from jet47:gpu-tvl1-optimization
Jason Newton [Tue, 27 Aug 2013 07:34:22 +0000 (00:34 -0700)]
correct range computations, it is difficult to do the more efficient single pass 3N/2 implementations correctly in this particular setting without costing more than they save
Vladislav Vinogradov [Tue, 27 Aug 2013 07:21:41 +0000 (11:21 +0400)]
gpu TVL1 Optical Flow optimization:
do not calculate sum of error in every round of iteration;
instead the error will be summed every 2nd times or more,
if the previous sum of error is too far away from threshold.
peng xiao [Tue, 27 Aug 2013 05:02:34 +0000 (13:02 +0800)]
Remove trailing whitespace.
peng xiao [Tue, 27 Aug 2013 03:56:11 +0000 (11:56 +0800)]
Fix build error.
peng xiao [Tue, 27 Aug 2013 03:42:54 +0000 (11:42 +0800)]
Make some tweaks to make `sum` operations less frequently
Roman Donchenko [Mon, 26 Aug 2013 12:59:44 +0000 (16:59 +0400)]
Merge pull request #1311 from leszekhanusz:png_palette_alpha