73b10bc8ca
Merge pull request #1133 from abidrahmank:denoising_pydocs
2013-07-19 12:20:56 +04:00
b87d2e9ec2
cosmetic change
2013-07-19 03:10:38 +04:00
919f35644e
Merge branch 'master' of https://github.com/f-morozov/opencv
2013-07-19 01:08:49 +04:00
35a39c19a3
minor changes
2013-07-19 01:08:42 +04:00
ec668ce3a7
Documentation
2013-07-19 00:23:49 +04:00
245dc99248
added include precomp
2013-07-18 01:13:35 +04:00
707048f6e1
removed tonemap_algorithms due to wrapping problems
2013-07-18 00:55:39 +04:00
4716f63444
fixed gpu performance tests:
...
used new CV_PERF_TEST_MAIN_WITH_IMPLS mechanism
2013-07-16 15:43:04 +04:00
61e50e2fda
python docs for non-local means denoising
2013-07-13 16:00:15 +05:30
091b48de60
MTB alignment. Missing main file.
2013-07-12 16:08:06 +04:00
35133df0de
MTB alignment. Code, tests, application
2013-07-12 16:03:53 +04:00
ac39bfb4cc
Remove HAVE_CVCONFIG_H - it's always defined.
2013-07-10 16:02:07 +04:00
0aee5b61e3
Exposure fusion. Code, tests.
2013-07-05 16:14:08 +04:00
a5e11079d7
Fixes, missing files, tests
2013-07-04 16:51:39 +04:00
122f85f352
Tonemapping code
2013-06-28 16:25:12 +04:00
84ea0c9a97
Tests and rgbe fix
2013-06-24 05:54:58 +04:00
7469c935f3
HDR formats support and HDR making. Code only.
2013-06-23 14:19:09 +04:00
439c3574ed
renamed gpu_private.hpp to private.gpu.hpp
2013-06-10 12:40:32 +04:00
4c9773d55f
renamed gpu headers (made it more consistent)
2013-06-10 12:40:30 +04:00
3eeaa9189c
Revert "Revert "Merge pull request #836 from jet47:gpu-modules""
2013-06-07 13:05:39 +04:00
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
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
416fb50594
Revert "Merge pull request #836 from jet47:gpu-modules"
...
This reverts commit fba72cb60d02131ffb62
2013-04-18 15:03:50 +04:00
f375c86dfb
photo module fixes
2013-04-18 12:36:11 +04:00
43d5e2d8b4
removed gpu BORDER_* constants
2013-04-18 11:33:34 +04:00
d5ee931287
fixed compilation issues
2013-04-18 11:33:34 +04:00
e72ba73e70
moved gpu nlm to photo module
2013-04-18 11:33:33 +04:00
8fdab9f631
Merge branch '2.4'
2013-04-17 12:07:17 +04:00
96b008cd29
Eliminate the need of ::testsing::ValuesIn() for CV_ENUM
...
Also cv::, cv::gpu:: and cv::ocl:: namespace prefixes can be safely omitted
inside CV_ENUM and CV_FLAGS
2013-04-15 19:39:49 +04:00
8b294c6c90
Remove documentation for old python wrapper
2013-04-12 19:37:40 +04:00
69648f0a6f
Make photo.hpp independent from C API
2013-04-08 15:47:29 +04:00
0738ea7d0f
Make highgui.hpp independent from C API
2013-04-08 15:47:29 +04:00
288a0634c2
Make imgproc.hpp independent from C API
2013-04-08 15:47:28 +04:00
517062039e
Make core/internal.hpp a private header
2013-04-01 17:29:10 +04:00
89356ff16d
Move non-CV functionality from core.hpp to separate utility.hpp header
2013-03-20 17:56:06 +04:00
a42a0f5fca
Added compatibility headers
2013-03-13 17:26:56 +04:00
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
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
61079547f0
Merge branch '2.4'
2013-02-01 14:59:40 +04:00
ed4c687d45
Increased time limits, eliminated extra params
2013-01-31 16:18:52 +04:00
0734d9b877
Merge branch '2.4'
2013-01-29 14:16:07 +04:00
7374445398
Fix integer overflow in NL-Means denoising on white input
...
Issues #2646
2013-01-28 14:35:51 +04:00
7e92826efc
Add test for issue #2646
2013-01-28 14:35:51 +04:00
d83914d478
Change Imgproc_ prefix to Photo_ in all accuracy tests of photo module
2013-01-28 14:01:22 +04:00
e10ee89ec4
Merge branch 2.4
2012-11-30 19:54:24 +04:00
8877066846
increased time-limits
2012-11-28 18:17:33 +04:00
9719ea93b6
Merge branch 2.4
2012-11-13 19:54:48 +04:00
a126532cb7
Fix OS X build warnings
2012-11-09 11:29:52 +04:00
4d059e9e5b
Merge release 2.4.3
2012-11-02 17:58:02 +04:00
7a5b9a6b7f
replase __APPLE__ marco with __clang__
2012-11-01 19:34:05 +04:00
Roman Donchenko
Alexander Shishkov
Fedor Morozov
Vladislav Vinogradov
abidrahmank
Andrey Kamaev
Anna Kogan
marina.kolpakova