Maksim Shabunin
c4c1c4c9bb
Replaced several hal:: classes with functions, marked old variants deprecated
2017-02-27 12:13:31 +03:00
Maksim Shabunin
0d7666a012
Merge branch 'master' into master
2017-02-26 07:46:59 +03:00
PkLab.net
e03c81d90a
Change image e small fix to cv::ellipse() Doc
2017-02-23 09:10:48 +01:00
Vadim Pisarevsky
9053839282
Merge pull request #8178 from tomoaki0705:addBayer2RGBA
2017-02-16 15:01:49 +00:00
Tomoaki Teshima
37be9ddeec
add enum Bayer**2BGRA
...
- let it possible to reach Bayer2BGRA conversion
2017-02-11 00:20:57 +09:00
Vadim Pisarevsky
fb3298f076
Merge pull request #7904 from paroj:initmapfc2
2017-02-08 13:30:15 +00:00
LaurentBerger
b3c1bd788a
Add note about OTSU and TRIANGLE (comment sovrasov)
2017-02-07 10:14:24 +01:00
LaurentBerger
fa4d32f7dd
Solve issue 8136 opencv doc of threshold
2017-02-06 22:49:18 +01:00
LaurentBerger
48e2d38be7
Merge branch 'master' of git://github.com/Opencv/opencv into UserColormap
2017-01-28 11:25:11 +01:00
LaurentBerger
5e08d588f8
Merge branch 'master' of git://github.com/Opencv/opencv into UserColormap
2017-01-09 10:38:08 +01:00
LaurentBerger
e6f27240d5
dd a note in findcontours doc
2017-01-08 15:24:29 +01:00
Lorena García
3650ec02be
HitMiss tutorial
2017-01-03 18:34:04 +01:00
Pavel Rojtberg
40686b5e87
initUndistortRectifyMap: CV_32FC2 is also supported as m1type
2016-12-20 10:22:32 +01:00
LaurentBerger
61b9484155
ApplyColorMap can be used with a user colormap
2016-12-15 10:17:05 +01:00
Michele Cancilla
89a0a46a69
Removed parallel version for CV_16U label type
2016-11-28 14:54:44 +01:00
Michele Cancilla
5b23c0b176
Fixed unnecessary black spaces;
...
Extended parallel version to all frameworks supported by OpenCV;
Added some documentation notes in modules/imgproc/include/opencv2/imgproc.hpp;
2016-11-24 15:03:36 +01:00
monoid911
b879126584
Fix docs explaining the returnPoints argument of convexHull.
2016-11-23 20:43:52 +09:00
Vadim Pisarevsky
a2d6d96ef1
Merge pull request #7161 from terfendail:shortline_fix
2016-11-10 16:02:20 +00:00
Vadim Pisarevsky
3dc022ae84
Merge pull request #7423 from grahamfyffe:leading_edges
2016-11-03 11:20:43 +00:00
Vladislav Sovrasov
af01267f23
Add assertion to prevent processing of large images in remap
2016-11-02 14:17:56 +03:00
Vladislav Sovrasov
34df4ae02a
Add a regression test, fix documentation
2016-10-25 11:38:07 +03:00
Vitaly Tuzov
26c9889c6b
Fix for incorrect line drawing beyond 32768 row or column
2016-10-14 18:37:59 +03:00
StevenPuttemans
947f32d2e0
add border replicate note
2016-10-10 09:55:13 +02:00
Graham Fyffe
57be99ff18
Added getLeadingEdges function to subdivision2d
2016-10-06 18:01:34 -07:00
Vadim Pisarevsky
a3d44d523d
Merge pull request #7214 from mshabunin:hal_integral
2016-10-04 12:26:58 +00:00
Vadim Pisarevsky
2e2ac54eca
Merge pull request #7374 from catree:fix_hitmiss_doc_link
2016-10-04 12:15:58 +00:00
Alexander Alekhin
1c18b1d245
Merge pull request #7370 from souch55:Fixxn
2016-10-01 10:44:56 +00:00
catree
2dd77f886a
Fix dead link for hit or miss documentation.
2016-09-30 20:34:30 +02:00
sourin
a34fbf7bb1
Fixed identifiers warns
2016-09-30 15:16:29 +05:30
Maksim Shabunin
3d5c0f1faf
HAL interface for cv::integral
2016-09-29 12:12:10 +03:00
Vadim Pisarevsky
ab3814f9b9
Merge pull request #7191 from anirudt:docs_moments
2016-09-14 12:30:27 +00:00
anirudt
2879eada25
docs: truncated commit msg
2016-09-13 16:14:05 +05:30
anirudt
06e0fb25e9
docs: adds doxygen @note for python in docs related to contour moments
2016-09-09 13:23:43 +05:30
Maksim Shabunin
c16f96cb5b
Merge pull request #7221 from terfendail:sepfilter_vec_kernel
2016-09-06 20:41:28 +00:00
Pavel Rojtberg
cfcf8abbb6
doxygen: imgproc - underscores should not be escaped in texttt
2016-09-02 16:41:45 +02:00
Pavel Rojtberg
62cabb58a9
doxygen: undistortPoints - replace matlab code by latex forumlae
2016-09-02 16:41:45 +02:00
Vitaly Tuzov
f773f45d90
Updated HAL interface for separable filters to address that both kernels are vectors.
2016-09-02 14:42:01 +03:00
anirudt
6825375694
docs: adds note for python in docs related to moments
2016-08-29 20:22:08 +05:30
Vadim Pisarevsky
5ddd25313f
Add Grana's connected components algorithm for 8-way connectivity. ( #6823 )
...
* Add Grana's connected components algorithm for 8-way connectivity. That algorithm is faster than Wu's one (currently implemented in opencv). For more details see https://github.com/prittt/YACCLAB .
* New functions signature and distance transform compatibility
* Add tests to imgproc/test/test_connectedcomponents.cpp
* Change of test_connectedcomponents.cpp for c++98 support
2016-08-26 16:01:00 +04:00
Suleyman TURKMEN
fcc28fecb6
Make Up
2016-08-23 22:17:30 +03:00
PkLab.net
4b099e8ade
Fix rho,phi exchange and amend linearPolar & logPolar docs with details and pics.
2016-08-16 12:49:33 +02:00
Alexander Alekhin
460b1dc2fa
imgproc: Canny with custom gradient
2016-07-19 17:15:36 +03:00
Maksim Shabunin
9e7124127f
Merge pull request #6906 from jet47:goodFeaturesToTrack-maxCorners-docs
2016-07-15 09:06:55 +00:00
Vladislav Vinogradov
1c8b1b2d2b
add note about "maxCorners <= 0" case in goodFeaturesToTrack
2016-07-14 15:48:08 +03:00
Sergei Nosov
dce310e03c
provide better error messages
2016-07-12 18:03:28 +03:00
Maksim Shabunin
5e9192287d
Added HAL cvtColor interface
2016-04-18 16:34:25 +03:00
Suleyman TURKMEN
abab67b574
Update imgproc.hpp
...
update documentation of calcBackProject() calcHist() compareHist()
2016-05-21 14:08:14 +03:00
Maksim Shabunin
5877debb6f
HAL resize, warpAffine, warpPerspective interface
...
- added HAL documentation support
- added documentation to HAL replacement interface
- updated several HAL functions in imgproc module
2016-04-07 18:47:24 +03:00
Vadim Pisarevsky
e792ee89de
Merge pull request #6243 from mshabunin:hal_morph
2016-03-23 13:09:19 +00:00
Maksim Shabunin
3b6190dfad
Merge pull request #6150 from lvv:fix-6149-applColorMap
2016-03-21 09:20:52 +00:00
Maksim Shabunin
83379695a0
HAL interface for morphology operations
2016-03-21 09:32:06 +03:00
Leonid Volnitsky
bebab8d647
fix: 6149 (through CV_Error on wrong image type)
2016-03-19 19:57:05 +02:00
Maksim Shabunin
98fff4a601
Added separate hal::SepFilter2D class
2016-03-03 18:56:12 +03:00
Maksim Shabunin
17cd1dac06
HAL Filter2D interface: Updated according to comments
2016-03-03 18:56:12 +03:00
Maksim Shabunin
27abd4d3a3
Filter2D HAL interface
2016-03-03 18:56:12 +03:00
Elad Joseph
238b47dfce
Added param documentation
...
Added param description to remove doxygen warning
2016-03-02 08:55:53 +02:00
Elad Joseph
2234016a22
Added Subdiv2D class documentation
...
Added documentation to the Subdiv2D documentation, based on the previous
C API.
2016-03-01 23:08:48 +02:00
Rahul Chhabra
232f564011
Update imgproc.hpp
...
In reference to Issue #6110 , the order of markerType and color is changed.
2016-02-14 10:18:14 +05:30
Thomas Dunker
6882c10b45
Extension of the camera distortion model for tilted image sensors (Scheimpflug condition) including test
2015-12-14 15:20:34 +01:00
Keita Kita
1621043bd2
Add documentation about detail of image type
...
connectedComponents and connectedComponentsWithStats in
imgproc accept 8-bit single channel image only for input.
2015-12-06 14:06:17 +09:00
Vadim Pisarevsky
67ef84d883
Merge pull request #5386 from StevenPuttemans:add_markers
2015-11-02 15:45:38 +00:00
Vadim Pisarevsky
3c31d6add3
Merge pull request #5515 from LorenaGdL:hitAndMiss
2015-11-02 11:49:37 +00:00
Suleyman TURKMEN
51e687f7a9
Update imgproc.hpp
2015-10-18 15:53:15 +03:00
Lorena García
33f77774c5
Hit&Miss morphological operation
2015-10-14 14:01:53 +02:00
StevenPuttemans
587dca9b1c
adding markers to OpenCV
2015-10-02 08:48:15 +02:00
Philip Salvaggio
fcf971bded
Improved documentation for connectedComponentsWithStats.
2015-09-14 09:25:32 -04:00
Vadim Pisarevsky
bd43c62a75
Merge pull request #5232 from sturkmen72:patch-6
2015-08-27 07:07:53 +00:00
Suleyman TURKMEN
f660461bb3
documentation patch
2015-08-26 17:40:38 +03:00
Lorena García
9d01818e8a
Small update of Colormap documentation
...
Small change in documentation: http://docs.opencv.org/master/d3/d50/group__imgproc__colormap.html#gga9a805d8262bcbe273f16be9ea2055a65a5d4a709cda1130bfa3cc4b4c5ae8f82a&gsc.tab=0
In the enum images, the "parula" colormap has wrongly assigned subtitle 'hot'
2015-08-23 19:09:15 +02:00
Seon-Wook Park
6803d1ed28
Support non continuous, BORDER_REPLICATE
...
TODO: HAL-accelerated code
2015-06-26 14:49:31 +02:00
Seon-Wook Park
e633c991b0
spatialGradient: Doc, fix dangling newline error
2015-06-19 04:57:01 +02:00
Seon-Wook Park
9f1c641199
spatialGradient: Add test class and Sobel proxy method
2015-06-18 17:42:32 +02:00
Suleyman TURKMEN
caa0058d5b
Update imgproc.hpp
2015-06-11 11:46:42 +03:00
Suleyman TURKMEN
dac715ad1f
Update imgproc.hpp
2015-06-11 11:03:14 +03:00
Suleyman TURKMEN
061131a5ee
Update imgproc.hpp
2015-06-10 13:18:40 +03:00
Dikay900
7ca0557b40
typos in comments
2015-05-23 17:36:45 +02:00
Christian Richardt
6425ac3b13
Added color map similar to Matlab's new default color map 'parula'.
2015-05-13 17:34:14 +02:00
Belev
2200e0fb7e
Fix typo
...
Fixed difference in the given arguments to the ellipse function and the description after that
Fixed two more typos
Replaced unnecessary the with to
2015-04-28 13:10:08 +03:00
Samyak Datta
20efcff166
Added doxygen comments for sqrBoxFilter() method
2015-03-06 03:50:51 +05:30
Vadim Pisarevsky
5dc569866e
Merge pull request #3743 from StevenPuttemans:fix_3887_master
2015-02-24 15:37:13 +00:00
StevenPuttemans
6902fa6b1c
fix formula getGaussianKernel in docs
2015-02-23 15:23:02 +01:00
StevenPuttemans
7401b02022
fix ellipse fitting notice
2015-02-23 15:05:55 +01:00
karelknoest
b5bd2fd880
Improved documentation and method comment to clarify that LineSegmentDetector::detect method accepts both Vec4i and Vec4f as return vector.
2015-01-20 17:05:57 +01:00
karelknoest
1ded2de2dd
Let LineSegmentDetector output line segment coordinates in float precision, as supported by the LSD algorithm.
2015-01-20 17:05:38 +01:00
Vadim Pisarevsky
5cc4aa0e93
Merge pull request #3554 from wangyan42164:match_template_mask
2015-01-19 11:03:44 +00:00
Yan Wang
46ed461e22
Add template match with mask.
...
Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
2015-01-16 11:09:26 +08:00
Maksim Shabunin
11591b3e9d
Added Qt help generation support
2014-12-26 19:17:18 +03:00
Maksim Shabunin
c485aee464
Included c-headers for better 2.4 compatibility
2014-12-19 17:05:26 +03:00
Maksim Shabunin
03e213ccae
Doxygen documentation: BiB references and fixes
2014-12-01 15:50:55 +03:00
Maksim Shabunin
1523fdcc1c
Doxygen documentation: more fixes and cleanups
2014-12-01 15:50:36 +03:00
Maksim Shabunin
555fdf893a
Documenting imgproc module
...
- disabled doxygen tree
- enabled doxygen enum listing
- added imgproc reference to main page
- enabled BiB support
- chenged doxygen root page format
2014-11-18 14:00:56 +03:00
Maksim Shabunin
6aa7a86ae9
Doxygen documentation for core module
2014-11-12 14:21:58 +03:00
Vadim Pisarevsky
1d804bc695
Merge pull request #3360 from mirab:threshold_triangle
2014-11-06 08:36:24 +00:00
Miroslav Benes
5b1fd739d9
Add Triangle thresholding algorithm
...
Add Triangle method for automatic threshold computation next to the existing
Otsu's method. Triangle deals better with images whose histogram does not
contain dominant peak.
See paper Zack GW, Rogers WE, Latt SA.: Automatic measurement of sister
chromatid exchange frequency. J Histochem Cytochem. 1977 Jul;25(7):741-53.
2014-10-22 16:54:39 +02:00
Maksim Shabunin
ba5f343c38
Basic doxygen documentation support
...
- updated existing Doxyfile.in
- added corresponding cmake instructions
- added some specific files (layout, icon)
- clean existing doxygen warnings
2014-10-22 15:24:15 +04:00
Vadim Pisarevsky
257463719b
removed optim module; moved its functionality to core and photo modules; moved drawing functions from core to imgproc. Removed FilterEngine etc. from public API
2014-08-14 12:50:07 +04:00
Vadim Pisarevsky
e2f24f43c9
added some basic functionality needed by the new face module (moved from the old "contrib")
2014-08-10 01:54:16 +04:00
pradeep
c5b4b99350
Implemented Kullback-Leibler divergence
2014-05-17 23:44:31 +08:00
Elena Gvozdeva
0265247504
Added ippiDistanceTransform for cv::distanceTransform, maskSize=3,5
2014-04-21 15:17:55 +04:00
Roman Donchenko
95a55453df
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/perf/perf_pnp.cpp
modules/contrib/src/imagelogpolprojection.cpp
modules/contrib/src/templatebuffer.hpp
modules/core/perf/opencl/perf_gemm.cpp
modules/cudafeatures2d/doc/feature_detection_and_description.rst
modules/cudafeatures2d/perf/perf_features2d.cpp
modules/cudafeatures2d/src/fast.cpp
modules/cudafeatures2d/test/test_features2d.cpp
modules/features2d/doc/feature_detection_and_description.rst
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/perf4au/main.cpp
modules/imgproc/perf/opencl/perf_blend.cpp
modules/imgproc/perf/opencl/perf_color.cpp
modules/imgproc/perf/opencl/perf_moments.cpp
modules/imgproc/perf/opencl/perf_pyramid.cpp
modules/objdetect/perf/opencl/perf_hogdetect.cpp
modules/ocl/perf/perf_arithm.cpp
modules/ocl/perf/perf_bgfg.cpp
modules/ocl/perf/perf_blend.cpp
modules/ocl/perf/perf_brute_force_matcher.cpp
modules/ocl/perf/perf_canny.cpp
modules/ocl/perf/perf_filters.cpp
modules/ocl/perf/perf_gftt.cpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_imgwarp.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/perf_matrix_operation.cpp
modules/ocl/perf/perf_ml.cpp
modules/ocl/perf/perf_moments.cpp
modules/ocl/perf/perf_opticalflow.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/cl_context.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/video/src/lkpyramid.cpp
modules/video/src/precomp.hpp
samples/gpu/morphology.cpp
2014-03-11 17:20:01 +04:00
Ilya Lavrenov
099ea91823
typos
2014-03-04 12:47:40 +04:00
Scott Breyfogle
aaa9be7c65
Merge remote-tracking branch 'original/master' into constrained-hough-lines
2014-01-31 14:27:51 -08:00
Ilya Lavrenov
c01e8e9361
removed ABF
2014-01-31 19:15:40 +04:00
Ivy Lee
b7f2b671a2
Fixed Bug #3514 Incorrect Chi-Square distance used in LBPH FaceRecognizer
2014-01-30 21:53:05 +00:00
Ilya Lavrenov
37789f015a
deleted excess semicolons, commas
2014-01-18 01:31:33 +04:00
Scott Breyfogle
0ea454301f
Added optional constraints to non-probablistic hough lines functions
2014-01-15 13:22:56 -08:00
Roman Donchenko
0e552ea6e2
Merge commit '1acc1085d' into merge-2.4
2013-12-30 16:37:39 +04:00
Alex Willisson
4293a54447
Fixed typo in comment
2013-12-24 19:53:50 -05:00
Vadim Pisarevsky
f41f633d2d
fixed various warnings from the “doc” and other builders
2013-12-19 16:31:30 +04:00
Vadim Pisarevsky
a1784b7320
converted old haar cascades to the new format; added the conversion function; added OpenCL optimization into CascadeClassfier; optimized the data structures and CPU code for the stump case.
2013-12-19 14:48:42 +04:00
Vadim Pisarevsky
9d3e7e027a
almost finished opencl-ization of cascade classifier
2013-12-17 14:29:30 +04:00
Ilya Lavrenov
c9e6ed7a29
added cv::blendLinear
2013-12-10 13:07:52 +04:00
Ilya Lavrenov
3eaa8f149b
added cv::intergal to T-API
2013-12-06 13:18:25 +04:00
Roman Donchenko
4f1aed98de
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
modules/contrib/src/detection_based_tracker.cpp
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/src/gpumat.cpp
modules/core/src/opengl.cpp
modules/gpu/src/cuda/safe_call.hpp
modules/highgui/src/cap.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/ocl/doc/image_processing.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/kmeans.cpp
modules/ocl/src/svm.cpp
modules/ocl/test/test_objdetect.cpp
samples/ocl/adaptive_bilateral_filter.cpp
2013-11-11 16:55:36 +04:00
Harris Gasparakis
a1de91a4fd
Cleaned up adaptive bilateral filtering, added support for gaussian interpolation, updated sample and docs
2013-11-06 16:48:50 +04:00
Roman Donchenko
03bbee327b
Merge pull request #1486 from nzjrs:cv2-logpolar
2013-10-29 16:15:57 +04:00
Roman Donchenko
4036f6a3d0
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
apps/CMakeLists.txt
modules/contrib/CMakeLists.txt
modules/core/include/opencv2/core/version.hpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/java/generator/gen_java.py
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/cl_runtime/cl_runtime.cpp
modules/ocl/src/columnsum.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/test/main.cpp
modules/ocl/test/test_color.cpp
modules/ocl/test/test_imgproc.cpp
samples/gpu/CMakeLists.txt
2013-10-22 14:28:00 +04:00
Ilya Lavrenov
bebc1c9330
misprint
2013-10-19 22:59:47 +04:00
Roman Donchenko
184ae873d4
Merge pull request #1526 from vpisarev:linedetector_python
2013-10-01 19:49:17 +04:00
John Stowers
51341738ba
Add cv::logPolar, cv::linearPolar, and a python example
2013-09-30 22:31:19 +02:00
Alexander Mordvintsev
0a8d62e5fd
createLineSegmentDetectorPtr -> createLineSegmentDetector
2013-09-30 14:30:01 +04:00
Alexander Mordvintsev
f0b050fa88
exposed LineSegemntDetector to python
2013-09-30 14:30:00 +04:00
Nghia Ho
5921c77613
Merge remote-tracking branch 'upstream/master'
2013-09-26 23:08:23 +10:00
Alexander Smorkalov
4b203f7b1a
Merge pull request #1470 from IceRage:min_enclosing_triangle
2013-09-26 16:28:54 +04:00
Ovidiu Parvu
e324446c70
Changed the signature of the minEnclosingTriangle function such that it returns the area automatically. Moreover, the overloaded function was no longer required so it was removed. Sample code, documentation and unit tests were updated correspondingly.
2013-09-19 16:22:30 +01:00
Ovidiu Parvu
52cdae6e2b
Removed the cvMinEnclosingTriangle function since the C API will be deprecated starting with OpenCV 3.0
2013-09-19 15:37:10 +01:00
Nghia Ho
8e8ff4dd33
Merge remote-tracking branch 'upstream/master'
2013-09-19 23:58:19 +10:00
Ovidiu Parvu
130b4d8e26
Changed the return type of cvMinEnclosingTriangle to CVAPI(void). Added the implementation of the function to the min_enclosing_triangle.cpp source file.
2013-09-15 23:25:36 +01:00
Ovidiu Parvu
7ac768651f
Added the signature cvMinEnclosingTriangle (C version) to the imgproc_c.h header
2013-09-15 22:40:57 +01:00
Ovidiu Parvu
8bada4c751
Overloaded the minEnclosingTriangle function such that there is an alternative function with the same name which does not require the output parameter ``area''.
...
Changed the sample source file minarea.cpp to use the overloaded version of the function.
Updated some comments in the min_enclosing_triangle.cpp source file.
2013-09-12 23:47:48 +01:00
Ovidiu Parvu
4fce8e6b0e
Changed the semantics of the minEnclosingTriangle function such that:
...
1. The function receives a set of points as input instead of a convex polygon with more than three vertices
2. The convex hull P is computed inside the function
3.1. If the number of vertices of P is greater than three then the algorithm which was implemented before executes
3.2. Otherwise the vertices of the triangle are picked from the vertices of the given polygon and the area computed
2013-09-12 13:29:10 +01:00
Ovidiu Parvu
510ad8e779
- Changed the type of the minEnclosingTriangle function parameters by using proxy classes InputArray/OutputArray instead of std::vector<T>
...
- Adapted the source code to accommodate this change
2013-09-12 10:11:38 +01:00
Ovidiu Parvu
e6b58c4e79
- Added the minEnclosingTriangle function declaration to the imgproc header
...
- Added the source code for the function in the separate file min_enclosing_triangle.cpp
2013-09-11 18:07:19 +01:00
Roman Donchenko
242e4254f3
Merge pull request #1427 from SpecLad:merge-2.4
2013-09-10 18:28:20 +04:00
Roman Donchenko
95c2e8b51f
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst
modules/gpu/src/match_template.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_precomp.hpp
2013-09-10 11:30:19 +04:00
Roman Donchenko
4ee5599d4b
Merge pull request #1381 from 23pointsNorth:master
2013-09-09 19:53:56 +04:00
Nghia Ho
0e06465a23
Merge remote-tracking branch 'upstream/master'
2013-09-09 23:23:12 +10:00
Roman Donchenko
254d4ae429
Boring changes - imgproc.
2013-09-05 18:26:43 +04:00
Daniel Angelov
b5e1eb7d48
Removed IOArray constness.
2013-09-04 14:59:57 +03:00
Nghia Ho
cc15898353
Merged with HEAD and removed C interface to rotatedRectangleIntersection
2013-09-04 20:45:10 +10:00
Daniel Angelov
9d78b8003e
Update on LSD no to use any Mat* (IOArrays instead).
...
Updated to new license.
2013-08-31 13:46:24 +03:00
yao
26b5eb3e39
add adaptive bilateral filter (cpp and ocl version)
2013-08-29 10:48:15 +08:00
Roman Donchenko
1840fd5f00
Merge pull request #1248 from vkocheganov:chi_square_alt
2013-08-28 11:44:41 +04:00
Roman Donchenko
f55740da70
Deleted all trailing whitespace.
2013-08-21 18:59:24 +04:00
Roman Donchenko
f76dd99299
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVModule.cmake
doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
doc/tutorials/features2d/feature_detection/feature_detection.rst
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
doc/tutorials/features2d/feature_homography/feature_homography.rst
modules/core/include/opencv2/core/operations.hpp
modules/core/src/arithm.cpp
modules/gpu/perf/perf_video.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/java/generator/gen_java.py
modules/java/generator/src/cpp/VideoCapture.cpp
modules/nonfree/src/opencl/surf.cl
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/color.cpp
modules/ocl/src/filtering.cpp
modules/ocl/test/test_color.cpp
modules/ocl/test/test_objdetect.cpp
modules/python/src2/cv2.cpp
samples/gpu/CMakeLists.txt
samples/gpu/super_resolution.cpp
2013-08-19 19:02:36 +04:00
Nghia Ho
2c9c4188ae
Merge https://github.com/Itseez/opencv
2013-08-14 22:38:39 +10:00
Roman Donchenko
7992402ecf
Merge pull request #1149 from jet47:generalized-hough-refactoring
2013-08-14 13:26:24 +04:00
abidrahmank
96c1df14f4
CLAHE Python bindings
2013-08-13 19:51:32 +05:30
kocheganovvm
086db9d6db
Introduce CV_COMP_CHISQR_ALT, an alternative method to calculate ChiSquare Histogram comparison
...
There's some disagreement about the correct formula.
has its supporters, however, for texture analysis, the newly introduced formula became
standard. The commit enables both uses without breaking backward compatibility.
First contributor of this commit was sperrholz.
2013-08-12 13:51:52 +04:00
Nghia Ho
3fcdbbe734
Merge https://github.com/Itseez/opencv
2013-07-30 23:58:10 +10:00
Nghia Ho
cb16f733b9
Added C interface
2013-07-28 15:31:58 +10:00
Nghia Ho
a40f217a38
changed from isnormal to isfinite, the prev ignored zero
2013-07-28 01:06:55 +10:00
Nghia Ho
e2f00ce846
New intersection function for rotated rectangles
2013-07-28 00:12:24 +10:00
Roman Donchenko
31de2833b4
Replace "const InputArray" with "InputArray".
...
InputArray is a reference, and references are always constant anyway. Making
it const even causes a GCC warning.
2013-07-26 14:52:56 +04:00
Daniel Angelov
6fa4834f31
Update on the class. Edited tests and samples.
2013-07-22 00:55:29 +03:00
Daniel Angelov
965b3759b1
Update on the class to reflect the review. Split the class into virtual and implementation. change of name to LineSegmentDetector, using Input/Output-Arrays, general clean ups.
2013-07-21 01:31:51 +03:00
Vladislav Vinogradov
7b87d72d80
refactored generalized hough (both CPU and GPU):
...
removed set/get methods from Algorithm (implement owns)
removed GHT_* enumeration
2013-07-18 15:17:33 +04:00
Daniel Angelov
694d9ff2eb
LSD enum now anonymous.
2013-07-15 23:28:19 +03:00
Daniel Angelov
d35601209e
Added define guard for ln10. Fixed some warnings.
2013-07-14 14:29:56 +03:00
Daniel Angelov
22c8010b2d
Added needed header, changed macro name.
2013-07-14 12:56:22 +03:00
Daniel Angelov
6bd5e12be3
Added a sample to show usage of the class.
2013-07-13 04:11:27 +03:00
Daniel Angelov
e51e00ac5f
Added LSD accuracy tests.
2013-07-13 04:09:28 +03:00
Daniel Angelov
5350a2f1d9
Added Line Segmen Detector.
2013-07-13 00:21:02 +03:00
abidrahmank
37f4e400e4
Added cv2.boxPoints() functionality to Python bindings (Feature #2023 )
...
http://www.code.opencv.org/issues/2023
eg:
In [3]: box = ((10,10),(5,5),0)
In [4]: cv2.boxPoints(box)
Out[4]:
array([[ 7.5, 12.5],
[ 7.5, 7.5],
[ 12.5, 7.5],
[ 12.5, 12.5]], dtype=float32)
2013-06-24 12:13:59 +05:30
Andrey Kamaev
8f32902ce6
Minimize usages of legacy C API inside the library
2013-04-16 12:00:02 +04:00
Andrey Kamaev
c98c246fc2
Move border type constants and Moments class to core module
2013-04-10 19:14:24 +04:00
Andrey Kamaev
288a0634c2
Make imgproc.hpp independent from C API
2013-04-08 15:47:28 +04:00
Andrey Kamaev
2b1ef95415
Completely separate C and C++ API of OpenCV core
2013-04-01 15:24:34 +04:00
Andrey Kamaev
f77a375354
Merge branch '2.4'
2013-03-29 19:38:35 +04:00
Vladislav Vinogradov
5810a73d30
CPU implementation of CLAHE
2013-03-25 17:44:31 +04:00
Andrey Kamaev
1ca8f33b4e
Merge branch '2.4'
2013-03-21 23:11:54 +04:00
Daniil Osokin
e153f0631c
Added missing enums for cvtColor RGB to YUV420p
2013-03-18 10:33:44 +04:00
Andrey Kamaev
a1c456b7c3
Extract common base header for C and C++ APIs
2013-03-15 10:38:38 +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
9b7dfd677d
Merge branch '2.4'
2013-03-11 18:50:19 +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
Daniil Osokin
7255ede3af
Added implementation for RGB to YUV420p color conversion
2013-02-24 23:07:05 +04:00
Jason Newton
4cb25e9584
update documentation to latest connected components interface
2012-12-19 14:55:46 -08:00
Vadim Pisarevsky
1eae455acb
fixed build warnings from VS; hopefully, fixes Android build too
2012-12-15 23:14:50 +04:00
Vadim Pisarevsky
2a42960ff2
Merge branch 'master' of https://github.com/nevion/opencv into cc
2012-12-15 21:45:55 +04:00
Jason Newton
e70b3ef598
use a ltype parameter to determine result Label image type; export stats with differening types over different outputarrays
2012-12-08 23:09:14 -08:00
Jason Newton
00bdca7684
A few changes to comply with upstream requirements for merge.
...
-Change input/output order from (out Labeled, in Image) -> (in Image, Out Labeled) and convert
to Input/OutputArrays in the process.
-Adopt OutputArray for statistics export so that the algorithm is "wrapper friendly" and not requiring a new struct in
language bindings at the expense of using doubles for everything and slowing statistics computation down..
2012-11-27 02:31:38 -08:00
Ilya Lavrenov
5225672dc0
added edge-aware demosaicing and bayer to bgra conversion
2012-11-26 16:17:43 +04:00
Jason Newton
d5aa679d3f
adjust output type to return int32... it should at least be unsigned but this breaks python bindings;
...
remove non-8bit input type support, not worth the binary size
2012-11-22 21:26:52 -08:00
Jason Newton
85880397c4
connectedcomponents: use opencv integral types, add to docs, fix up things for a python export
2012-11-05 12:02:53 -08:00
Jason Newton
4c0cb2576d
connectedComponents: peep-hole optimizations, mostly surrouding the fact that cv::Mat::at is expensive in a tight-loop -also added a "blobstats" version
2012-11-05 08:10:35 -08:00
Jason Newton
45b4f4f32b
connectedComponents: warning free version
2012-11-05 08:10:29 -08: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
Andrey Kamaev
ed51162568
Fix binary compatibility of Java wrappers
2012-10-17 02:09:37 +04:00
Andrey Kamaev
0442bca235
Revert "partially recovered binary compatibility (ticket #2415 )"
...
This reverts commit 94b97b7a63
.
2012-10-16 19:37:12 +04:00
Andrey Kamaev
64b56d7018
Revert "remaining C-style planar subdivisions data structures are moved to legacy"
...
This reverts commit 4aaaef5967
.
Conflicts:
modules/imgproc/include/opencv2/imgproc/types_c.h
modules/legacy/include/opencv2/legacy/legacy.hpp
2012-10-16 15:13:00 +04:00
Andrey Kamaev
58f31819cc
Return drawContours back to imgproc
...
This partly reverts commit 6ca618277c
.
2012-10-15 18:12:33 +04:00
Vadim Pisarevsky
94b97b7a63
partially recovered binary compatibility (ticket #2415 )
2012-10-08 17:06:05 +04:00
Vladislav Vinogradov
98c92f196e
added Generalized Hough implementation
2012-09-10 16:49:40 +04:00
Andrey Pavlenko
a72f4474b4
fixing bug #1987(android keeps RGBA in alpha pre-multiplied form, Mat <-> Bitmap should handle this correctly)
2012-06-29 15:38:10 +00:00
Vadim Pisarevsky
87d1731714
added synonym CV_COMP_HELLIGNER for CV_COMP_BHATTACHARYAA to reflect the real formula used (bug report #2073 )
2012-06-22 15:12:19 +00:00
Vadim Pisarevsky
0c65ea976a
added the optional output maxima value to phaseCorrelate (patch #2071 by Robert Huitl)
2012-06-22 13:34:03 +00:00
Andrey Kamaev
05de6302fd
Fixed documentation: corrected parameter names
2012-05-29 10:36:19 +00:00
Andrey Kamaev
6ca618277c
More fixes for documentation.
2012-05-28 20:11:38 +00:00
Andrey Kamaev
4aaaef5967
remaining C-style planar subdivisions data structures are moved to legacy
2012-05-28 13:57:45 +00:00
Andrey Kamaev
eb2f1f81ed
Fixed hundreds of documentation problems
2012-05-28 07:36:14 +00:00
Vadim Pisarevsky
d5a0088bbe
merged 2.4 into trunk
2012-04-30 14:33:52 +00:00
Andrey Kamaev
d95721107c
Fixed typo.
2012-03-31 17:34:24 +00:00
Andrey Kamaev
124ceb96a7
#1732 Added yuv420p to RGB conversion. Thanks to Robert Abel.
2012-03-31 15:33:03 +00:00
Vadim Pisarevsky
7fb8e9d328
added borderType to pyrDown, pyrUp & buildPyramid (patch #925 )
2012-03-30 16:58:24 +00:00
Andrey Pavlenko
aea24ffcd5
#796 , #1701 fixing doc vs code arg-s naming consistency
2012-03-30 14:22:34 +00:00
Vadim Pisarevsky
beb7fc3c92
a LOT of obsolete stuff has been moved to the legacy module.
2012-03-30 12:19:25 +00:00
Vadim Pisarevsky
e36ad50825
added cv::convexityDefects (ticket #796 )
2012-03-29 19:42:47 +00:00
Vadim Pisarevsky
e8fab91d51
added DIST_LABEL_PIXEL labelType to distanceTransform, ticket #1641 (thanks to Mikhail Matrosov for the patch)
2012-03-27 09:06:21 +00:00
Vadim Pisarevsky
f196dd5ff7
preliminary version of a multi-level findcontours
2012-03-24 20:03:07 +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
Andrey Pavlenko
36890cc959
( #1636 ) Java API: adding undistortPoints() support and smoke test; minor improvements in Java stuff
2012-03-14 07:37:48 +00:00
Andrey Kamaev
e426dfc396
Fixed #1613 : removed YUV420i color conversion constants
2012-02-21 15:08:03 +00:00
Vadim Pisarevsky
53c39a7a53
added getGaborKernel function
2012-02-06 01:09:54 +00:00
Vadim Pisarevsky
00a58c9af8
fixed bug #1422 (thanks to jondo for the patch)
2012-01-29 14:31:10 +00:00
Vadim Pisarevsky
4f86af7e16
fixed bug #1531 . added separate distanceTransformWithLabels function that returns labels, since normally the labels are not needed.
2012-01-25 12:17:59 +00:00
Vadim Pisarevsky
04c0783b2f
applied patch by Will Lucas; improved separable filter performance (in particular cv::GaussianBlur) on 16s images (for [much] faster SIFT)
2012-01-23 12:14:46 +00:00
Andrey Kamaev
c377804ee8
Refactored YUV420 to RGB/BGR/RGBA/BGRA conversion
2012-01-16 14:38:07 +00:00
Vadim Pisarevsky
2e9f5c434b
added improved ORB implementation, convex-convex polygon intersection, eigen2x2 low-level function ...
2011-11-08 12:01:49 +00:00
Vadim Pisarevsky
65e036fe6d
fixed bug #1368
2011-09-27 15:34:39 +00:00
Vadim Pisarevsky
3535aacc23
fixed bug #1389
2011-09-27 15:17:00 +00:00
Andrey Pavlenko
f2da701723
cvtColor: dst channels number default is set to 4 for RGBA/BGRA cases; added new codes for yuv420 to RGBA/BGRA.
2011-09-06 08:35:31 +00:00
Vadim Pisarevsky
32ed1bf858
added phaseCorrelate function by Will Lucas.
2011-09-05 07:57:18 +00:00
Vadim Pisarevsky
c9ed7fee34
fixed C++ implementation of Delaunay triangulation and moved it from sample to imgproc.
2011-08-10 10:28:01 +00:00
Vadim Pisarevsky
f85b9754e0
fixed Vec*scalar operations, fixed minEnclosingCircle Python interface.
2011-08-01 12:01:43 +00:00
Andrey Kamaev
ac7e16fdf6
Fixed camera output format handling
2011-07-25 12:32:33 +00:00
Vadim Pisarevsky
1badec0b2d
eliminated opencv_extra_api.hpp (all the functionality is moved to the regular OpenCV headers)
2011-07-18 16:31:30 +00:00
Vadim Pisarevsky
16ba62dcd5
added COLOR_... enumeration to imgproc.hpp and EVENT_... enumeration to highgui.hpp
2011-07-18 13:05:34 +00:00
Vadim Pisarevsky
f2e1a64c1b
fixed "import cv" in the new python samples. corrected Python bindings to match the documentation and vice versa (NOTE: in cv2.stereoCalibrate the parameter ordering has been changed)
2011-07-16 09:35:56 +00:00
Vadim Pisarevsky
2dea07f9f8
repaired Python bindings for functions using InputOutputArray
2011-07-14 14:13:10 +00:00
Vadim Pisarevsky
5649f35757
some more bugfixed in 2.3 propagated to trunk
2011-07-07 11:43:21 +00:00
Vadim Pisarevsky
c37e063914
removed serveral CV_EXPORTS_AS() to make Python function names in cv2 the same as in C++.
2011-06-18 10:03:01 +00:00
Vadim Pisarevsky
20aca7440f
a lot of small corrections to bring down the number of undocumented functions, reported by the script; added em.cpp sample
2011-06-09 01:16:45 +00:00
Vadim Pisarevsky
2d2b8a496e
renamed "None()" to "noArray()" to avoid conflicts with X11 (ticket #1122 )
2011-06-08 06:55:04 +00:00
Vadim Pisarevsky
0c877f62e9
replaced "const InputArray&" => "InputArray"; made InputArray and OutputArray references. added "None()" constant (no array()).
2011-06-06 14:51:27 +00:00
Andrey Kamaev
cdda5ec491
YUV420i to RGB conversion is added to cvtColor
2011-06-04 18:15:52 +00:00
Vadim Pisarevsky
abeeb40d46
a big patch; use special proxy types (Input/OutputArray, Input/OutputArrayOfArrays) for passing in vectors, matrices etc.
2011-04-17 13:14:45 +00:00
Vadim Pisarevsky
061b49e0b2
reworked nearly all of the OpenCV tests (except for opencv_gpu tests) - they now use the Google Test engine.
2011-02-09 20:55:11 +00:00
Vadim Pisarevsky
51d039945a
fixed cv::CHAIN_APPROX_* definitions (ticket #755 )
2010-12-12 20:46:06 +00:00
Vadim Pisarevsky
fcdce4edcb
fixed border processing bayer2rgb & bayer2gray; made the test "color-bayer" pass; renamed CV_Bayer*2Gray -> CV_Bayer*2GRAY for consistency
2010-12-11 10:43:32 +00:00
Vadim Pisarevsky
da293ee3d9
SSE2 optimization for Bayer->RGB; added Bayer->Gray with SSE2 optimization; corrected some bugs noted in the yahoogroups forum
2010-12-10 19:06:38 +00:00
Vadim Pisarevsky
6a15ff8d13
added cvSave(contours) to the contours demo; added rational model demonstration to stereo_calib; fixed formatting in imgproc/types_c.h
2010-12-03 19:09:06 +00:00
Vadim Pisarevsky
70d2c57e35
moved estimateAffine3D declaration from imgproc to calib3d, where it is really implemented (ticket #705 )
2010-11-29 20:51:02 +00:00
Vadim Pisarevsky
54ef4c08c2
moved some old stuff to the legacy module; merge "compat_c.h" headers and moved to the legacy as well. moved implementation of many non-critical/obsolete inline functions and methods to .cpp to improve Opencv build time
2010-11-26 17:58:20 +00:00
Vadim Pisarevsky
59e2afe4d2
fixed the ordering of parameters in PyArg_ParseTupleAndKeywords, added correct Ptr<CvDTreeSplit>::delete_obj() (ticket #406 )
2010-11-25 23:16:32 +00:00
Vadim Pisarevsky
f5e5b677c9
added hconcat & vconcat functions for joining matrices; moved some inline functions out of the headers; fixed several bugs in documentation; removed MatND from docs
2010-11-23 16:39:20 +00:00
Ethan Rublee
89c4bc54d9
fix little warning - opencv2/imgproc/types_c.h:235: warning: comma at end of enumerator list
2010-11-23 00:06:33 +00:00
Vadim Pisarevsky
96ad3b57b8
LANCZOS4 interpolation constant added to C interface
2010-11-18 22:04:32 +00:00
Vadim Pisarevsky
e15a2ea95a
fixed remap with transparent border (ticket #582 )
2010-11-10 21:14:57 +00:00
Vadim Pisarevsky
5a53d82e30
fixed most of the failures in opencv_test
2010-11-06 14:56:01 +00:00
Vadim Pisarevsky
5b6a755719
almost finished Python wrappers
2010-11-02 17:58:22 +00:00
Vadim Pisarevsky
893fb90b87
extended Python bindings; not merged into cv.cpp yet; and many of the helper functions, like pyopencv_to_*, pyopencv_from_* etc. are still missing
2010-10-29 13:09:49 +00:00
Vadim Pisarevsky
83f6085773
added more helper macros to the function declarations, to assist the Python wrapper generator. Fixed memleak in Mat::operator()(Range,Range) and the related functions (Mat::row, Mat::col etc.)
2010-10-27 18:26:39 +00:00
Vadim Pisarevsky
1b1eab8e67
added helper macros to the function declarations
2010-10-16 20:34:34 +00:00
Vadim Pisarevsky
bc4532bd07
added initWideAngleProjMap() function
2010-08-06 10:20:49 +00:00
Maria Dimashova
cba926a428
added c++ interface for cvPyrMeanShiftFiltering; added sample on meanshift segmentation
2010-07-28 16:41:12 +00:00
Vadim Pisarevsky
2f2f06b925
rewrote color conversion functions; added sRGB<->CIE Lab/Luv conversion; added RGB<->YUV conversion; improved [s]RGB->Lab conversion speed
2010-07-27 14:10:14 +00:00
Vadim Pisarevsky
f48bd3d281
added VNG demosaicing algorithm (ticket #466 )
2010-07-20 15:51:32 +00:00
Vadim Pisarevsky
08cba33f9d
fixed some more MSVC2010 warnings
2010-07-17 10:35:17 +00:00
Vadim Pisarevsky
266c4642ea
doxygenated opencv_video & opencv_calib3d modules (C++ part only)
2010-05-25 15:59:48 +00:00
Vadim Pisarevsky
4632d65889
doxygenated core and imgproc modules (C++ API only)
2010-05-25 14:57:10 +00:00
Vadim Pisarevsky
33447e0bba
fixed mixed-type exp and log functions, used in HMMs (thanks to V. Mityaev)
2010-05-21 12:07:00 +00:00
Vadim Pisarevsky
4a073bd951
fixed build on Linux
2010-05-12 07:33:21 +00:00
Vadim Pisarevsky
127d6649a1
"atomic bomb" commit. Reorganized OpenCV directory structure
2010-05-11 17:44:00 +00:00