mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-26 18:58:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
11,337 Commits 6 Branches 127 Tags 3 GiB
73b0827ec1
Commit Graph

147 Commits

Author SHA1 Message Date
Fedor Morozov
bef8d8192e Minor fixes, new MergeDebevec 2013-08-06 15:24:01 +04:00
Roman Donchenko
dcaf923517 Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	3rdparty/ffmpeg/ffmpeg_version.cmake
	cmake/OpenCVFindLibsGrfmt.cmake
	cmake/templates/cvconfig.h.cmake
	modules/bioinspired/doc/retina/index.rst
	modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
	modules/calib3d/src/precomp.hpp
	modules/contrib/src/inputoutput.cpp
	modules/contrib/src/precomp.hpp
	modules/core/include/opencv2/core/internal.hpp
	modules/core/include/opencv2/core/types_c.h
	modules/core/src/drawing.cpp
	modules/core/src/precomp.hpp
	modules/core/src/system.cpp
	modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst
	modules/features2d/doc/common_interfaces_of_feature_detectors.rst
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/features2d/src/precomp.hpp
	modules/flann/src/precomp.hpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/image_filtering.rst
	modules/gpu/doc/image_processing.rst
	modules/gpu/doc/video.rst
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/perf4au/main.cpp
	modules/gpu/src/imgproc.cpp
	modules/gpu/src/precomp.hpp
	modules/gpu/test/test_imgproc.cpp
	modules/highgui/CMakeLists.txt
	modules/highgui/test/test_precomp.hpp
	modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
	modules/imgproc/src/precomp.hpp
	modules/java/generator/src/cpp/Mat.cpp
	modules/legacy/src/precomp.hpp
	modules/ml/doc/k_nearest_neighbors.rst
	modules/ml/src/precomp.hpp
	modules/nonfree/doc/feature_detection.rst
	modules/nonfree/src/precomp.hpp
	modules/objdetect/include/opencv2/objdetect/objdetect.hpp
	modules/objdetect/src/cascadedetect.cpp
	modules/objdetect/src/hog.cpp
	modules/objdetect/src/precomp.hpp
	modules/objdetect/test/test_latentsvmdetector.cpp
	modules/ocl/src/hog.cpp
	modules/ocl/src/opencl/objdetect_hog.cl
	modules/ocl/src/precomp.hpp
	modules/photo/src/precomp.hpp
	modules/stitching/src/precomp.hpp
	modules/superres/perf/perf_precomp.hpp
	modules/superres/src/optical_flow.cpp
	modules/superres/src/precomp.hpp
	modules/superres/test/test_precomp.hpp
	modules/ts/include/opencv2/ts.hpp
	modules/video/src/precomp.hpp
	modules/videostab/src/precomp.hpp
	modules/world/src/precomp.hpp
 2013-08-06 13:56:49 +04:00
Fedor Morozov
4c0f7f9e59 Tonemapping documentation update 2013-08-05 20:35:48 +04:00
Fedor Morozov
cb999a231e Mantiuk's tonemapping 2013-08-05 19:31:10 +04:00
Fedor Morozov
17609b90c7 Mantiuk's tonemapping 2013-08-05 19:22:42 +04:00
Alexander Shishkov
6df203c449 Fixes for Linux compilation, small changes 2013-08-03 01:45:20 +04:00
StevenPuttemans
f28496c628 Added sample links in documentation for python2, ocl and gpu 2013-08-02 14:05:08 +02:00
Fedor Morozov
c51b50b44c Algorithm names in code 2013-08-02 00:01:15 +04:00
Fedor Morozov
ed0828d0a8 New HDR documentation 2013-08-01 15:34:03 +04:00
Fedor Morozov
302bf23f82 All hdr functions as Algorithms 2013-08-01 03:24:47 +04:00
Fedor Morozov
4d2ea847fa Tonemap as 3.0 algorithm 2013-07-31 16:05:31 +04:00
Andrey Pavlenko
6a40067424 Merge pull request #1206 from StevenPuttemans:feature_3169 2013-07-31 14:31:21 +04:00
StevenPuttemans
0c5244103f Added all *.cpp samples reference to the 2.4.6 documentation as discussed in feature #3169 
- Used lunix style slashes - works on most systems
- Removed all trailing whitespaces
 2013-07-31 11:20:05 +02:00
Fedor Morozov
258b98d15b Tonemap as Algorithm 2013-07-29 21:35:10 +04:00
Fedor Morozov
af2c9077f7 Calibration, various changes 2013-07-21 13:56:20 +04:00
Fedor Morozov
703cf8cef7 Calibration, various changes 2013-07-21 13:48:57 +04:00
abidrahmank
f36b9940e8 ref in inpainting docs 2013-07-20 14:07:19 +05:30
Roman Donchenko
73b10bc8ca Merge pull request #1133 from abidrahmank:denoising_pydocs 2013-07-19 12:20:56 +04:00
Alexander Shishkov
b87d2e9ec2 cosmetic change 2013-07-19 03:10:38 +04:00
Alexander Shishkov
919f35644e Merge branch 'master' of https://github.com/f-morozov/opencv 2013-07-19 01:08:49 +04:00
Alexander Shishkov
35a39c19a3 minor changes 2013-07-19 01:08:42 +04:00
Fedor Morozov
ec668ce3a7 Documentation 2013-07-19 00:23:49 +04:00
Alexander Shishkov
245dc99248 added include precomp 2013-07-18 01:13:35 +04:00
Alexander Shishkov
707048f6e1 removed tonemap_algorithms due to wrapping problems 2013-07-18 00:55:39 +04:00
Vladislav Vinogradov
4716f63444 fixed gpu performance tests: 
used new CV_PERF_TEST_MAIN_WITH_IMPLS mechanism
 2013-07-16 15:43:04 +04:00
abidrahmank
61e50e2fda python docs for non-local means denoising 2013-07-13 16:00:15 +05:30
Fedor Morozov
091b48de60 MTB alignment. Missing main file. 2013-07-12 16:08:06 +04:00
Fedor Morozov
35133df0de MTB alignment. Code, tests, application 2013-07-12 16:03:53 +04:00
Roman Donchenko
ac39bfb4cc Remove HAVE_CVCONFIG_H - it's always defined. 2013-07-10 16:02:07 +04:00
Fedor Morozov
0aee5b61e3 Exposure fusion. Code, tests. 2013-07-05 16:14:08 +04:00
Fedor Morozov
a5e11079d7 Fixes, missing files, tests 2013-07-04 16:51:39 +04:00
Fedor Morozov
122f85f352 Tonemapping code 2013-06-28 16:25:12 +04:00
Fedor Morozov
84ea0c9a97 Tests and rgbe fix 2013-06-24 05:54:58 +04:00
Fedor Morozov
7469c935f3 HDR formats support and HDR making. Code only. 2013-06-23 14:19:09 +04:00
Vladislav Vinogradov
439c3574ed renamed gpu_private.hpp to private.gpu.hpp 2013-06-10 12:40:32 +04:00
Vladislav Vinogradov
4c9773d55f renamed gpu headers (made it more consistent) 2013-06-10 12:40:30 +04:00
Vladislav Vinogradov
3eeaa9189c Revert "Revert "Merge pull request #836 from jet47:gpu-modules"" 2013-06-07 13:05:39 +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
416fb50594 Revert "Merge pull request #836 from jet47:gpu-modules" 
This reverts commit fba72cb60d, reversing
changes made to 02131ffb62.
 2013-04-18 15:03:50 +04:00
Vladislav Vinogradov
f375c86dfb photo module fixes 2013-04-18 12:36:11 +04:00
Vladislav Vinogradov
43d5e2d8b4 removed gpu BORDER_* constants 2013-04-18 11:33:34 +04:00
Vladislav Vinogradov
d5ee931287 fixed compilation issues 2013-04-18 11:33:34 +04:00
Vladislav Vinogradov
e72ba73e70 moved gpu nlm to photo module 2013-04-18 11:33:33 +04:00
Andrey Kamaev
8fdab9f631 Merge branch '2.4' 2013-04-17 12:07:17 +04:00
Andrey Kamaev
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
Andrey Kamaev
8b294c6c90 Remove documentation for old python wrapper 2013-04-12 19:37:40 +04:00
Andrey Kamaev
69648f0a6f Make photo.hpp independent from C API 2013-04-08 15:47:29 +04:00
Andrey Kamaev
0738ea7d0f Make highgui.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
517062039e Make core/internal.hpp a private header 2013-04-01 17:29:10 +04:00
Andrey Kamaev
89356ff16d Move non-CV functionality from core.hpp to separate utility.hpp header 2013-03-20 17:56:06 +04:00
Andrey Kamaev
a42a0f5fca Added compatibility headers 2013-03-13 17:26:56 +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
61079547f0 Merge branch '2.4' 2013-02-01 14:59:40 +04:00
Anna Kogan
ed4c687d45 Increased time limits, eliminated extra params 2013-01-31 16:18:52 +04:00
Andrey Kamaev
0734d9b877 Merge branch '2.4' 2013-01-29 14:16:07 +04:00
Andrey Kamaev
7374445398 Fix integer overflow in NL-Means denoising on white input 
Issues #2646
 2013-01-28 14:35:51 +04:00
Andrey Kamaev
7e92826efc Add test for issue #2646 2013-01-28 14:35:51 +04:00
Andrey Kamaev
d83914d478 Change Imgproc_ prefix to Photo_ in all accuracy tests of photo module 2013-01-28 14:01:22 +04:00
Andrey Kamaev
e10ee89ec4 Merge branch 2.4 2012-11-30 19:54:24 +04:00
Anna Kogan
8877066846 increased time-limits 2012-11-28 18:17:33 +04:00
Andrey Kamaev
9719ea93b6 Merge branch 2.4 2012-11-13 19:54:48 +04:00
Andrey Kamaev
a126532cb7 Fix OS X build warnings 2012-11-09 11:29:52 +04:00
Andrey Kamaev
4d059e9e5b Merge release 2.4.3 2012-11-02 17:58:02 +04:00
marina.kolpakova
7a5b9a6b7f replase __APPLE__ marco with __clang__ 2012-11-01 19:34:05 +04:00
Andrey Kamaev
2b0072d823 Suppress more warnings in gtest on OS X 2012-10-24 20:36:30 +04:00
Andrey Kamaev
73bbabf207 Eliminate discrepancies between signatures in documentation and OpenCV headers 
All errors were found by doc/check_docs2.py
 2012-10-18 13:03:12 +04:00
Andrey Kamaev
0e7ca71dcc Normalize whitespace in documentation and text files 2012-10-17 21:42:09 +04:00
Andrey Kamaev
461b69f6ee Eliminate discrepancies between signatures in documentation and OpenCV headers 
All errors were found by doc/check_docs2.py
 2012-10-17 21:24:55 +04:00
OpenCV Buildbot
81f826db2b Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00
OpenCV Buildbot
04384a71e4 Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
Vadim Pisarevsky
06a13d9ba0 replaced jpegs with png's. Accuracy tests pass; performance tests were not tried yet 2012-10-02 23:07:46 +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
56ac2937d8 Fix typo 2012-09-19 16:56:54 +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
Vadim Pisarevsky
0bd68a70f1 fixed #2297, #2300; fixed several warnings 2012-08-28 13:45:35 +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
Andrey Kamaev
10dcf9ea39 Fix Java API build 2012-08-21 18:34:02 +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
Victor Passichenko
18de45f7bc Add CV_Asserts for channels count 2012-08-21 16:05:18 +04:00
Victor Passichenko
92edd4fc6e Fix building for MS VS C++: remove allocation of arrays of dynamic size in stack 2012-08-21 15:41:51 +04:00
Victor Passichenko
017ab51bf4 Fix wrong memory deallocation 2012-08-21 15:38:38 +04:00
Victor Passichenko
1f42de39a3 Add non-local means denoising algorithm implementatation into photo module 2012-08-19 13:13:58 +04:00
Andrey Kamaev
e900952b87 quiet most of the OSX build warnings 2012-07-05 12:56:31 +00:00
Andrey Kamaev
d9c74f63e1 All tests writing temporary files are updated to use cv::tempfile() function 2012-06-25 11:24:06 +00:00
Andrey Kamaev
c5aba337e9 Fixed number of warnings. Fixed mingw64 build. 2012-06-12 14:46:12 +00:00
Andrey Kamaev
47a4e87784 Ignored warnings from gtest with precompiled headers enabled 2012-06-08 14:54:17 +00:00
Andrey Kamaev
49a1ba6038 Set stricter warning rules for gcc 2012-06-07 17:21:29 +00:00
Andrey Kamaev
eb2f1f81ed Fixed hundreds of documentation problems 2012-05-28 07:36:14 +00:00
Vadim Pisarevsky
2fd1e2ea57 merged all the latest changes from 2.4 to trunk 2012-04-13 21:50:59 +00:00
Andrey Pavlenko
5c4b984738 fixing arg name according to ref man 2012-03-21 14:59:56 +00:00
Andrey Pavlenko
20cceb8fdf moving the rest of inpaint() to the 'photo' module, temporary disabling Java test for it, adding 'photo' to Java API 2012-03-16 15:11:56 +00:00
Vadim Pisarevsky
957e80abbd lot's of changes; nonfree & photo modules added; SIFT & SURF -> nonfree module; Inpainting -> photo; refactored features2d (ORB is still failing tests), optimized brute-force matcher and made it non-template. 2012-03-15 14:36:01 +00:00