Alexander Alekhin
808ba552c5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-14 23:44:35 +00:00
Hamdi Sahloul
5d54def264
Add semicolons after CV_INSTRUMENT
macros
2018-09-14 06:45:31 +09:00
Alexander Alekhin
5b17a60dde
next: drop HAVE_TEGRA_OPTIMIZATION/TADP
2018-04-10 18:09:54 +03:00
Vladislav Sovrasov
234ad8fbee
photo: add assertion on empty image in denoising
2017-06-14 13:57:07 +03:00
Pavel Vlasov
30a6cee2fe
Instrumentation for OpenCV API regions and IPP functions;
2016-08-19 18:10:03 +03:00
Vadim Pisarevsky
b37aaa8303
significantly improved parallel non-local means by using granularity parameter in parallel_for_ loop. Because the algorithm deals with sliding sums, it's essential that each thread has enough work to do, otherwise the algorithm gets higher theoretical complexity and thus there is no speedup comparing to 1-thread code (at best).
2015-05-14 15:39:42 +03:00
Erik Karlsson
01d3df0d00
Added normType parameter to fastNlMeansDenoisingMulti
2015-03-24 02:01:31 +01:00
Erik Karlsson
5f8d688664
Added parameter normType to fastNlMeansDenoising
2015-03-24 00:47:11 +01:00
Erik Karlsson
9fff7896c5
Removed fastNlMeansDenoisingColored[Multi]Abs
2015-03-23 23:23:35 +01:00
Erik Karlsson
82c54104d6
Fix warnings on Win x64
2015-03-10 01:39:43 +01:00
Erik Karlsson
8aa0783995
Changed parameter type of fastNlMeansDenoising[Multi][Abs] from std::vector<float> to const std::vector<float>&
2015-03-09 23:47:49 +01:00
Erik Karlsson
5a7118a88b
Merging in master
2015-03-09 22:00:58 +01:00
Erik Karlsson
b471f9ee26
Fixed call to tegra::fastNlMeansDenoising
2015-03-09 18:52:25 +01:00
Erik Karlsson
a594a0677a
Cleanup
2015-03-09 16:00:24 +01:00
Erik Karlsson
c44488629a
Changed parameters of fastNlMeansDenoising[Multi][Abs] from float * to std::vector<float>
2015-03-09 15:52:16 +01:00
Erik Karlsson
cc8d94c6fc
Addition of per-channel h-values for fastNlMeansDenoising[Multi][Abs]
2015-03-06 20:43:55 +01:00
Erik Karlsson
324fa26848
Refactoring of OpenCL implementation
2015-03-06 19:07:13 +01:00
Erik Karlsson
c41efe4e30
Refactoring in preparation for per-channel h-values
2015-03-05 17:50:52 +01:00
Erik Karlsson
ae08884854
Added support for 4-component input for fastNlMeansDenoising[Multi][Abs]
2015-03-03 01:19:34 +01:00
Erik Karlsson
a9ff335a89
Added OpenCL support for FastNlMeansDenoisingAbs
2015-03-01 22:21:36 +01:00
Vladislav Vinogradov
cda6fed41f
move tegra namespace out of cv to prevent conflicts
2015-02-27 12:52:11 +03:00
Vladislav Vinogradov
44e41baffe
use new functions before all tegra:: calls
2015-02-26 19:34:58 +03:00
Erik Karlsson
8e7aff4486
Changed fastNlMeansDenoising and fastNlMeansDenoisingMulti back to sum of sq distances. Moved sq sum of abs distances to fastNlMeansDenoisingAbs and fastNlMeansDenoisingMultiAbs
2015-02-18 14:59:52 +01:00
Erik Karlsson
c339720af9
Preparation for 16-bit colored denoising. Currently not working due to cvtColor not supportint 16-bit Lab conversion.
2015-02-13 13:38:37 +01:00
Erik Karlsson
42db9e7153
Basic 16-bit implmentation of fastNlMeansDenoising. Table-based exponetiation leads to high memory footprint and loss of precision in 16-bit mode.
2015-02-12 22:14:01 +01:00
Erik Karlsson
e178294b49
Refactoring in preparation for 16-bit implementation of fastNlMeansDenoising
2015-02-12 15:23:28 +01:00
Alexander Karsakov
75ede6e17c
Minimal image size is set to 5*5 for OCL path of fastNlMeansDenoising and fastNlMeansDenoisingColored since it breaks tests with test_loop_times=30 and in general doesn't make sense for computation on GPU.
2014-08-14 12:14:33 +04:00
Ilya Lavrenov
6fe71bd27c
added 4 channels support to fnlm
2014-03-18 14:29:02 +04:00
Andrey Pavlenko
6b6cfa893d
Merge pull request #2382 from ilya-lavrenov:tapi_nlmeans
2014-03-13 16:48:38 +04:00
Roman Donchenko
db85c35e69
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/contrib/src/basicretinafilter.hpp
modules/contrib/src/magnoretinafilter.hpp
modules/contrib/src/parvoretinafilter.hpp
modules/contrib/src/retinacolor.hpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/highgui/src/cap_tyzx.cpp
modules/ocl/perf/perf_filters.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/test/test_filters.cpp
modules/ocl/test/test_objdetect.cpp
2014-03-03 13:45:22 +04:00
Ilya Lavrenov
eedf86402d
typos
2014-03-02 21:04:17 +04:00
Ilya Lavrenov
8bf616e4c7
added color image support via L*a*b*
2014-02-19 18:35:37 +04:00
Ilya Lavrenov
891dbeabba
implemented OpenCL version of cv::fastNlMeansDenoising
2014-02-18 14:32:03 +04:00
Ilya Lavrenov
d27068f79a
some more refactoring
2014-02-18 14:32:03 +04:00
Fedor Morozov
f99be6bda6
Mergin itseez
2013-09-18 18:55:12 +04:00
Roman Donchenko
2c4bbb313c
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
2013-08-27 13:26:44 +04:00
Roman Donchenko
e9a28f66ee
Normalized file endings.
2013-08-21 18:59:25 +04:00
Fedor Morozov
302bf23f82
All hdr functions as Algorithms
2013-08-01 03:24:47 +04:00
Roman Donchenko
bae85660da
Merge remote-tracking branch 'origin/2.4'
...
Pull requests:
#943 from jet47:cuda-5.5-support
#944 from jet47:cmake-2.8.11-cuda-fix
#912 from SpecLad:contributing
#934 from SpecLad:parallel-for
#931 from jet47:gpu-test-fixes
#932 from bitwangyaoyao:2.4_fixBFM
#918 from bitwangyaoyao:2.4_samples
#924 from pengx17:2.4_arithm_fix
#925 from pengx17:2.4_canny_tmp_fix
#927 from bitwangyaoyao:2.4_perf
#930 from pengx17:2.4_haar_ext
#928 from apavlenko:bugfix_3027
#920 from asmorkalov:android_move
#910 from pengx17:2.4_oclgfft
#913 from janm399:2.4
#916 from bitwangyaoyao:2.4_fixPyrLK
#919 from abidrahmank:2.4
#923 from pengx17:2.4_macfix
Conflicts:
modules/calib3d/src/stereobm.cpp
modules/features2d/src/detectors.cpp
modules/gpu/src/error.cpp
modules/gpu/src/precomp.hpp
modules/imgproc/src/distransform.cpp
modules/imgproc/src/morph.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/precomp.cpp
modules/ocl/perf/precomp.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/src/pyrlk.cpp
modules/video/src/bgfg_gaussmix2.cpp
modules/video/src/lkpyramid.cpp
platforms/linux/scripts/cmake_arm_gnueabi_hardfp.sh
platforms/linux/scripts/cmake_arm_gnueabi_softfp.sh
platforms/scripts/ABI_compat_generator.py
samples/ocl/facedetect.cpp
2013-06-05 15:42:07 +04:00
Roman Donchenko
29b13ec1de
Replaced most of the usages of parallel_for with that of parallel_for_.
...
This should allow many algorithms to take advantage of more parallelization
technologies.
2013-05-31 12:22:04 +04:00
Andrey Kamaev
69648f0a6f
Make photo.hpp independent from C API
2013-04-08 15:47:29 +04:00
Andrey Kamaev
288a0634c2
Make imgproc.hpp independent from C API
2013-04-08 15:47:28 +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
2a6fb2867e
Remove all using directives for STL namespace and members
...
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
2013-02-25 15:04:17 +04:00
Andrey Kamaev
06e7101795
Add Tegra optimization for fastNlMeansDenoising
2012-09-28 18:56:36 +04:00
Andrey Kamaev
44e8d76d74
Change denoising strength parameter from int to float
2012-09-20 17:27:48 +04:00
Andrey Kamaev
f42b38ac44
Refactor fast NL-means denoising
...
* reorder arguments
* rewrite accuracy tests
* replace doubles with integer arithmetic inside the main loop
2012-09-19 16:50:56 +04:00
Andrey Kamaev
7e35838849
Minor refactoring of NL-means denoising
2012-09-17 17:19:00 +04:00
Leonid Beynenson
6a5d996ca8
Removed the header opencv2/photo/denoising.hpp
...
All the functions from it are moved to the header
opencv2/photo/photo.hpp
2012-08-22 17:51:52 +04:00
Vadim Pisarevsky
2f1cc018c9
enabled SSE3 by default; integrated SSE3-optimized bilateral filter (by Grigoriy Frolov); modified API of non-local means (use Input/OutputArrays)
2012-08-21 17:39:40 +04:00