Alexander Alekhin
f73b4f4a26
imgproc: revert #13843
...
This reverts commit 00e8c7810f
2019-03-13 15:07:37 +03:00
Alexander Alekhin
332c37f332
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-03-06 11:43:16 +03:00
Alexander Alekhin
3ba49ccecc
imgproc: removed LSD code due original code license conflict
2019-03-01 16:25:39 +03:00
Pierre Chatelier
00e8c7810f
LineIterator witout a Mat ( #13843 )
...
* LineIterator witout a Mat
cv::LineIterator can be used without being attached to any cv::Mat, it only needs the size and type of data. An alternative constructor has been defined for that.
In that case, a LineIterator can no more be dereferenced with the * operator, but pos() still returns valid pixel positions.
It can be useful when LineIterator is just used to compute positions of pixels on a line, without requiring to build a Mat just for that.
Use case : with a dataset that would represent a huge image, pixel positions can be pre-computed before querying the dataset API.
* Update imgproc.hpp
removed trailing spaces
* Update drawing.cpp
fixed warning
2019-02-19 13:44:41 +03:00
Alexander Alekhin
7e2ebecd52
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-01-10 12:29:41 +03:00
catree
d745af6763
Add Matplotlib Perceptually Uniform Sequential colormaps (viridis, plasma, inferno, magma, cividis, twilight and twilight shifted).
2019-01-06 22:48:06 +01:00
Alexander Alekhin
e82e672a93
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-12-06 07:06:58 +00:00
Namgoo Lee
83c7dfb6a4
Fix error in LineIterator example code in doc
2018-12-05 11:31:19 +09:00
Alexander Alekhin
a574788e89
move legacy C-API constants into separate files
2018-11-17 23:47:51 +00:00
Suleyman TURKMEN
182f43b6f9
Update imgproc.hpp
2018-11-05 04:48:49 +03:00
Alexander Alekhin
687fa6a8ca
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-02 05:33:35 +00:00
Suleyman TURKMEN
4d0ed5c13c
Merge pull request #12971 from sturkmen72:upd_imgproc_hpp
...
* Update imgproc.hpp
* update color conversion codes
2018-10-31 18:08:24 +03:00
Alexander Alekhin
dada5a422d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-09 21:20:15 +00:00
Apoorv Goel
b8aa0cddab
Merge pull request #12777 from UnderscoreAsterisk:document-cvtColorTwoPlane
...
* Add documentation for cvtColorTwoPlane
* Change brief and add links
2018-10-09 15:49:17 +03:00
Alexander Alekhin
8f1f4273a2
calib3d: move undistort files from imgproc
2018-10-05 07:52:21 +00:00
Suleyman TURKMEN
8eb987e393
Update findContours parameter type
2018-09-28 18:42:48 +03:00
Alexander Alekhin
e6171d17f8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-18 12:49:52 +03:00
Gaetano Checinski
e628fd7bce
Merge pull request #12503 from nikhedonia:12500-move-gcgraph
...
* feat: move gcgraph to detail
* chore: puts gcgraph cv::detail namespace
2018-09-17 20:13:47 +03:00
take1014
57ae3ac7a2
fix document about HoughLines
2018-09-12 22:18:30 +09:00
Alexander Alekhin
73bfe68821
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-07 12:40:27 +03:00
Alexander Alekhin
8a3c394d6a
don't use constructors for C API structures
2018-09-06 14:34:16 +03:00
Alexander Alekhin
ad146e5a6b
core: remove constructors from C API structures
...
POD structures can't have constructors.
2018-09-06 14:34:09 +03:00
Hamdi Sahloul
532eace7d6
Extensive wrapping of CUDA functionalities for Python
2018-08-30 22:50:33 +09:00
Suleyman TURKMEN
d8cd1d8fcc
Merge pull request #12246 from sturkmen72:move_enums
...
* Update core.hpp
* Update imgproc.hpp
* Update ImgprocTest.java
* Update CameraCalibrator.java
* Update OnCameraFrameRender.java
* Update FindContoursDemo.java
* Update IntroductionToSVMDemo.java
* Update NonLinearSVMsDemo.java
* Update IntroductionToPCADemo.java
* Update Smoothing.java
* Update MainActivity.java
* Update CalcBackProjectDemo1.java
* Update CornerSubPixDemo.java
* Update CornerDetectorDemo.java
* Update GoodFeaturesToTrackDemo.java
2018-08-24 11:11:34 +03:00
Alexander Alekhin
7d4bb9428b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-08-20 19:30:18 +03:00
Alexander Alekhin
e593d5bbc5
Merge pull request #12255 from csukuangfj:patch_5
2018-08-20 13:47:41 +00:00
Kuang Fangjun
ab8ba047a5
fix a typo.
2018-08-20 15:52:18 +08:00
Kuang Fangjun
cecc19381f
fix an error in the formula for cv::cornerSubPix
2018-08-20 15:49:35 +08:00
Alexander Alekhin
31fef14d76
Merge pull request #12136 from sturkmen72:update_documentation
2018-08-17 14:02:20 +00:00
Suleyman TURKMEN
c61bc3a0cb
Update documentation and samples
2018-08-17 14:21:29 +03:00
Alexander Alekhin
4eb2966559
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-08-07 20:12:10 +03:00
tompollok
061149cbbd
imgproc: update cornerSubPix documentation
2018-08-02 18:00:43 +02:00
CJ Smith
da41ac9e60
Merge pull request #12106 from CJSmith-0141:warpPerspective_typofix
...
* Fixes typo in function name hal::warpPerspective.
* Fixes remaining typos in word Perspective (was Perspectve).
2018-08-01 14:41:20 +03:00
Alexander Alekhin
82c477c9f7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-07-31 21:35:00 +03:00
Kuang Fangjun
83039c8752
fix a typo.
2018-07-30 18:18:18 +08:00
Alexander Alekhin
d044ac1c66
imgproc(getPerspectiveTransform): add solveMethod parameter
...
drop compatibility workaround via runtime parameter
2018-07-26 18:22:59 +03:00
Alexander Alekhin
45dd575ed2
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
...
Revert "documentation: avoid links to 'master' branch from 3.4 maintenance branch"
This reverts commit 9ba9358ecb
.
Revert "documentation: avoid links to 'master' branch from 3.4 maintenance branch (2)"
This reverts commit f185802489
.
2018-06-04 19:26:10 +03:00
take1014
4ec9afac57
add imgproc snippets
2018-06-01 23:42:00 +09:00
Alexander Alekhin
0f298a4203
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-05-28 11:22:55 +00:00
yuki takehara
ed207d79e7
Merge pull request #11108 from take1014:hough_4303
...
* Added accumulator value to the output of HoughLines and HoughCircles
* imgproc: refactor Hough patch
- eliminate code duplication
- fix type handling, fix OpenCL code
- fix test data generation
- re-generated test data in debug mode via plain CPU code path
2018-05-23 20:42:12 +00:00
Alexander Alekhin
4d7d630e92
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-04-23 18:45:02 +03:00
Vadim Pisarevsky
7ea5029ae5
Grabcut with frozen models ( #11339 )
...
* model is not learned when grabcut is called with GC_EVAL
* fixed test, was writing to wrong file.
* modified patch by Iwan Paolucci; added GC_EVAL_FREEZE_MODEL in addition to GC_EVAL (which semantics is retained)
2018-04-19 15:23:50 +03:00
Vadim Pisarevsky
b8b7ca7302
Rewite polar transforms ( #11323 )
...
* Rewrite polar transformations
- A new wrapPolar function encapsulate both linear and semi-log remap
- Destination size is a parameter or calculated automatically to keep objects size between remapping
- linearPolar and logPolar has been deprecated
* Fix build warning and error in accuracy test
* Fix function name to warpPolar
* Explicitly specify the mapping mode, so we retain all the parameters as non-optional.
Introduces WarpPolarMode enum to specify the mapping mode in flags
* resolves performance warning on windows build
* removed duplicated logPolar and linearPolar implementations
2018-04-17 15:50:52 +03:00
Alexander Alekhin
7e5581cd86
Merge pull request #11286 from sturkmen72:update_rectangle
2018-04-13 13:38:50 +00:00
Suleyman TURKMEN
8b6a6d4546
Update the function rectangle
2018-04-12 14:55:04 +03:00
Alexander Alekhin
2b2fa58f97
next: drop DISABLE_OPENCV_24_COMPATIBILITY
2018-04-10 18:09:53 +03:00
Alexander Alekhin
7f9253ea0a
samples: avoid using of legacy C-like API
...
- CV_RGB() macro is moved into opencv2/imgproc.hpp from imgproc_c.h
- samples/cpp/filestorage_base64.cpp is dropped
2018-03-26 13:42:35 +03:00
Florian Echtler
6a8f57e5d7
Merge pull request #10081 from floe:java-camera2-view
...
* add (untested) JavaCamera2View class
* initial fixes
* minor cleanup
* exclude JavaCamera2View from build for older SDK version
* fix method name typo
* add asserts + sanity checks
* fix preview format checks
* fix the memory leak
* export cvtTwoPlaneYUVtoBGR for Java usage
* add handling for two-plane YUV frames (C wrapper still missing)
* add two-plane cvtColor helper function
* fix warnings
* actually use the new cvtColorTwoPlane helper func
* fix wrong output matrix size
* fix wrong conversion type
* simplify method signature, add error condition
* minor fixes to Mat types
* remove leftover semaphore from camera api 1
* android: JavaCamera2View minor refactoring
- re-apply Java code style
- imports cleanup
- dump exceptions information
* android: JavaCamera2View: pause/resume fixes
* android: JavaCamera2View: fix mScale
2018-02-17 15:01:24 +03:00
luz.paz
d05714995c
Misc. modules/ cont. pt2
...
Found via `codespell`
2018-02-13 11:28:11 -05:00
take1014
03407a9da0
Merge pull request #10646 from take1014:master
...
* Add a new interface for hough transform
* Fixed warning code
* Fix HoughLinesUsingSetOfPoints based on HoughLinesStandard
* Delete memset
* Rename HoughLinesUsingSetOfPoints and add common function
* Fix test error
* Change static function name
* Change using CV_Assert instead of if-block and add integer test case
* I solve the conflict and delete 'std :: tr1' and changed it to use 'tuple'
* I deleted std::tr1::get and changed int to use 'get'
* Fixed sample code
* revert test_main.cpp
* Delete sample code in comment and add snippets
* Change file name
* Delete static function
* Fixed build error
2018-02-08 22:54:43 +03:00