Alexander Alekhin
a574788e89
move legacy C-API constants into separate files
2018-11-17 23:47:51 +00:00
Alexander Alekhin
22dbcf98c5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-17 14:17:35 +00:00
Vitaly Tuzov
9ad1a84853
Unrolled bilateral filter neighbor processing loop
2018-11-16 13:51:46 +03:00
Vitaly Tuzov
f5b6bea2d4
Raised bilateralFilter processing precision for CV_32F matrices containing NaNs
2018-11-16 12:07:04 +03:00
Alexander Alekhin
1c04a5ec47
Merge pull request #12965 from terfendail:medianBlur_wintr
2018-11-16 00:47:11 +00:00
Alexander Alekhin
8409aa9eba
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-14 19:41:09 +00:00
Alexander Alekhin
42742727d6
imgproc(ocl): fix morph generic filter checks
...
'ksize' is not updated with 'kernel'
2018-11-14 20:15:01 +03:00
Alexander Alekhin
1913482cf5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-10 20:50:26 +00:00
Vitaly Tuzov
2dd98e7cc6
bilateralFilter implementation moved to separate file
2018-11-09 18:26:26 +03:00
Vadim Pisarevsky
841741aa52
significantly reduced OpenCV binary size by disabling IPP in some funcs ( #13085 )
...
* significantly reduced OpenCV binary size by disabling IPP calls in some OpenCV functions: Sobel, Scharr, medianBlur, GaussianBlur, filter2D, mean, meanStdDev, norm, sum, minMaxIdx, sort.
* re-enable IPP in norm, since it's much faster (without adding too much space overhead)
2018-11-09 17:39:29 +03:00
Vadim Pisarevsky
8f15a609af
mostly removed obsolete C API from calib3d (at least at the interface level) ( #13081 )
2018-11-09 16:12:22 +03:00
Vitaly Tuzov
28fd967148
Updated bilateralFilter implementations to use wide universal intrinsics
2018-11-09 15:27:30 +03:00
Vadim Pisarevsky
11eafca3e2
removed C API in the following modules: photo, video, imgcodecs, videoio ( #13060 )
...
* removed C API in the following modules: photo, video, imgcodecs, videoio
* trying to fix various compile errors and warnings on Windows and Linux
* continue to fix compile errors and warnings
* continue to fix compile errors, warnings, as well as the test failures
* trying to resolve compile warnings on Android
* Update cap_dc1394_v2.cpp
fix warning from the new GCC
2018-11-09 00:52:09 +03:00
tompollok
2da56d5af6
refactoring catching all exceptions as const ref
2018-11-08 19:59:47 +03:00
Alexander Alekhin
b74b05d1b3
Revert CV_TRY/CV_CATCH macros
...
This reverts commit 7349b8f5ce
(partially).
2018-11-08 19:56:52 +03:00
Alexander Alekhin
777eaa7352
Merge pull request #13057 from sturkmen72:Mat_to_IOArray
2018-11-07 21:00:14 +00:00
Vitaly Tuzov
e5d7f446d6
Merge pull request #13056 from terfendail:box_wintr
...
* Updated boxFilter implementations to use wide universal intrinsics
* boxFilter implementation moved to separate file
* Replaced ROUNDUP macro with roundUp() function
2018-11-07 23:59:36 +03:00
Alexander Alekhin
4531f9f2f4
Merge pull request #13023 from terfendail:medianBlur_sep
2018-11-06 20:22:08 +00:00
Alexander Alekhin
2c6f1ab57d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-06 20:04:31 +00:00
lqy123000
cceeca3052
Merge pull request #12916 from lqy123000:bugfix_templmatch
...
* avoid rounding errors
* imgproc: replace condition in matchTemplate
2018-11-06 19:13:48 +03:00
Suleyman TURKMEN
182f43b6f9
Update imgproc.hpp
2018-11-05 04:48:49 +03:00
Vitaly Tuzov
877de883b0
medianBlur() implementation moved to separate file
2018-11-02 16:28:23 +03:00
Vitaly Tuzov
0fda551dbc
Updated medianBlur implementations to use wide universal intrinsics
2018-11-02 12:26:23 +03:00
Alexander Alekhin
687fa6a8ca
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-02 05:33:35 +00:00
Vadim Pisarevsky
0f622206e4
completely new C++ persistence implementation ( #13011 )
...
* integrated the new C++ persistence; removed old persistence; most of OpenCV compiles fine! the tests have not been run yet
* fixed multiple bugs in the new C++ persistence
* fixed raw size of the parsed empty sequences
* [temporarily] excluded obsolete applications traincascade and createsamples from build
* fixed several compiler warnings and multiple test failures
* undo changes in cocoa window rendering (that was fixed in another PR)
* fixed more compile warnings and the remaining test failures (hopefully)
* trying to fix the last little warning
2018-11-02 00:27:06 +03: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
Rostislav Vasilikhin
fa91d621fa
Merge pull request #12876 from savuor:color_rgb2rgb_wide
...
* RGB2RGB initially rewritten
* NEON impl removed
* templated version added for ushort, float
* data copying allowed for RGB2RGB
* inplace processing fixed
* fields to local vars
* no zeroupper until it's fixed
* vx_cleanup() added back
2018-10-30 18:36:23 +03:00
Alexander Alekhin
50bec53afc
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-26 17:56:55 +03:00
Maksim Shabunin
0ccd810738
Fixed several issues found by static analysis
2018-10-25 10:45:59 +03:00
maver1
e397434cb6
Merge pull request #12877 from maver1:3.4
...
* Updated ICV packages and IPP integration
* core(test): minMaxIdx IPP regression test
* core(ipp): workaround minMaxIdx problem
* core(ipp): workaround meanStdDev() CV_32FC3 buffer overrun
* Returned semicolon after CV_INSTRUMENT_REGION_IPP()
2018-10-24 15:02:53 +03:00
Vadim Pisarevsky
ea31c09384
rewrote the line segment intersection function to make the static analyzer happy ( #12902 )
...
* rewrote the line segment intersection function to make the static analyzer happy
* fixed bug with improper "no intersection" detection in some of corner cases
* fixed bug with improper "no intersection" detection in some of corner cases
2018-10-23 17:09:23 +03:00
Alexander Alekhin
9c23f2f1a6
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-20 11:37:54 +00:00
Michał Janiszewski
c8e6ce304f
Catch exceptions by const-reference
...
Exceptions caught by value incur needless cost in C++, most of them can
be caught by const-reference, especially as nearly none are actually
used. This could allow compiler generate a slightly more efficient code.
2018-10-16 22:43:54 +02:00
Alexander Alekhin
edacd91a27
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-15 20:15:42 +00:00
Alexander Alekhin
1cc3f7abbb
Merge pull request #12516 from seiko2plus:changeUnvMultiply16
2018-10-15 12:07:40 +00:00
tompollok
0b77600718
change area() emptiness checks to empty()
2018-10-13 21:35:10 +02:00
Alexander Alekhin
5115e5decb
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-13 16:19:05 +00:00
Alexander Alekhin
0d63c4c28e
Merge pull request #12811 from take1014:resize_large_image
2018-10-12 16:59:25 +00:00
take1014
24af70c7e0
resolves 11283
2018-10-12 23:08:25 +09:00
Alexander Alekhin
1ed9ff17e1
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-12 10:05:55 +00:00
Sayed Adel
9dc1d388af
imgproc: Enable VSX on pyrDown & pyrUp
2018-10-11 23:03:57 +00:00
Alexander Alekhin
53785b6ac6
Merge pull request #12784 from terfendail:pyramids_wintr
2018-10-11 19:26:36 +00:00
Alexander Alekhin
2332fb852d
Merge pull request #12748 from terfendail:resize_wintr2
2018-10-11 19:26:17 +00:00
Sayed Adel
8965f3ae06
imgproc:simd Enable VSX and wide universal intrinsics for accumulate operations
...
- improve cpu dispatching calls to allow more SIMD extentions
(SSE4.1, AVX2, VSX)
- wide universal intrinsics
- replace dummy v_expand with v_expand_low
- replace v_expand + v_mul_wrap with v_mul_expand for product accumulate operations
- use FMA for accumulate operations
- add mask and more types to accumulate's performance tests
2018-10-11 04:37:12 +02:00
Sayed Adel
5771fd693d
Change behaviour of 16-bit multiply operator
...
- redefine 16-bit multiply operator to perform saturating multiply
instead of non-saturating multiply
- implement 8-bit multiply operator to perform saturating multiply
- implement v_mul_wrap() for 8-bit, 16-bit non-saturating multiply
- improve performance of v_mul_hi() for VSX
- update intrin tests with new changes
- replace unv 16-bit multiplication operator with v_mul_wrap due behavior changes
- Several improvements depend on vpisarev review
* initial forward declarations for universal intrinsics
* move emulating SSE intrinsics into separate file
* implement v_mul_expand for 8-bit
* reimplement saturating multiply using v_mul_expand + v_pack
* map v_expand, v_load_expand, v_load_expand_q to sse4.1
* fix overflow avx2::v_pack(uint32)
* implement two universal intrinsics v_expand_low and v_expand_high
2018-10-11 04:35:39 +02:00
Vitaly Tuzov
cc10e6b344
pyrDown and pyrUp SSE2 implementations replaced with wide universal intrinsics implementations
2018-10-10 21:12:47 +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
Vitaly Tuzov
9d602f2752
Replaced SSE2 area resize implementation with wide universal intrinsic implementation
2018-10-08 16:27:52 +03:00
Alexander Alekhin
8f1f4273a2
calib3d: move undistort files from imgproc
2018-10-05 07:52:21 +00:00
Vitaly Tuzov
6b84990620
integral() implementation updated to utilize wide universal intrinsics
2018-10-01 17:25:43 +03:00
Suleyman TURKMEN
8eb987e393
Update findContours parameter type
2018-09-28 18:42:48 +03:00
Pavel Rojtberg
d1c842cf29
core: fix printf warnings by using c++11 format
2018-09-24 11:31:40 +03:00
Alexander Alekhin
e6171d17f8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-18 12:49:52 +03:00
Alexander Alekhin
70f38b4dfa
Merge pull request #12510 from take1014:doc_hough
2018-09-17 21:39:12 +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
Alexander Alekhin
808ba552c5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-14 23:44:35 +00:00
Alexander Alekhin
92ec971453
Merge pull request #12526 from terfendail:avx2_resize_fix
2018-09-14 15:57:47 +00:00
Hamdi Sahloul
5d54def264
Add semicolons after CV_INSTRUMENT
macros
2018-09-14 06:45:31 +09:00
Vitaly Tuzov
29770e13e8
Fixed bit-exact resize SIMD implementation for AVX2 baseline
2018-09-13 18:20:27 +03:00
Mark Harfouche
095b0d3272
Fix BayerXX2RGBA when blue is on the first line.
2018-09-12 16:06:44 -04:00
take1014
57ae3ac7a2
fix document about HoughLines
2018-09-12 22:18:30 +09:00
Alexander Alekhin
dca657a2fd
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-10 00:10:21 +03:00
Mark Harfouche
53bbed89ae
Output RGBA images when bayer_xx2YYYA is called
2018-09-07 16:03:04 -04:00
Hamdi Sahloul
a39e0daacf
Utilize CV_UNUSED macro
2018-09-07 20:33:52 +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
bd98ed46bd
Merge pull request #12446 from alalek:imgproc_grabcut_numeric_issues
2018-09-06 20:18:45 +00:00
Alexander Alekhin
24e72e151a
imgproc: grabcut numeric stability
2018-09-06 17:05:54 +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
Rostislav Vasilikhin
da7e1cfb49
Merge pull request #12279 from savuor:cvtcolor_bgr2gray_8u_15bits
...
* bgr2gray 8u fixed to be in conformance with IPP code
* coefficients fixed so their sum is 32768
* java test for CascadeDetect fixed: equalizeHist added
2018-09-06 13:28:24 +03:00
Alexander Alekhin
43b64140ae
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-05 19:54:09 +03:00
Alexander Alekhin
e70526625f
imgproc: fix Subdiv2D::getTriangleList()
2018-09-05 16:24:27 +03:00
Alexander Alekhin
d74b98c3d9
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-04 18:39:03 +00:00
Alexander Alekhin
7f7f30a08b
Merge pull request #12406 from alalek:backport_12357_12391
2018-09-04 16:09:44 +00:00
Alexander Alekhin
fda99c1c6c
Merge pull request #12394 from alalek:imgproc_GaussianBlur_allow_HAL_8U
2018-09-04 15:16:08 +00:00
Alexander Alekhin
acce95f446
backport fixes for static analyzer warnings
...
Commits:
- 09837928d9
- 10fb88d027
Excluded changes with std::atomic (C++98 requirement)
2018-09-04 16:49:42 +03:00
cyy
10fb88d027
Merge pull request #12391 from DEEPIR:master
...
fix some errors found by static analyzer. (#12391 )
* fix possible divided by zero and by negative values
* only 4 elements are used in these arrays
* fix uninitialized member
* use boolean type for semantic boolean variables
* avoid invalid array index
* to avoid exception and because base64_beg is only used in this block
* use std::atomic<bool> to avoid thread control race condition
2018-09-04 16:39:19 +03:00
Vitaly Tuzov
f9a5c4d181
Fixed bit-exact resize wide intrinsics implementation for 16U
2018-09-03 20:37:25 +03:00
Alexander Alekhin
1e362ff5c3
imgproc(GaussianBlur): restore processing order
2018-09-03 18:39:42 +03:00
Vadim Pisarevsky
fc71316690
Merge pull request #12371 from alalek:issue_12366
2018-09-03 14:30:16 +00:00
yuki takehara
cb7ee27cd9
Fix bug in distanceTransform ( #12278 )
...
* fix 12218
* Update test_distancetransform.cpp
marked the test as "BIGDATA_TEST" in order to skip it on low-mem platforms
* modify test
* use a smaller image in the test
* fix test code
2018-09-03 17:18:10 +03:00
cyy
09837928d9
Merge pull request #12357 from DEEPIR:master
...
* fix some static analyzer warnings
* fix some static analyzer warnings
* fix race condition of workthread control
2018-09-02 16:34:43 +03:00
Alexander Alekhin
0f9f2696be
imgproc: small code refactoring (findContours -> l_cinfo)
2018-09-01 12:58:40 +00:00
Alexander Alekhin
65a0587ce8
imgproc(segmentation): don't increase mask NULL pointer
...
Avoid manual address arithmetic
2018-09-01 12:38:57 +00:00
Vitaly Tuzov
0f2b535fcc
Bit-exact GaussianBlur reworked to use wide intrinsics ( #12073 )
...
* Bit-exact GaussianBlur reworked to use wide intrinsics
* Added v_mul_hi universal intrinsic
* Removed custom SSE2 branch from bit-exact GaussianBlur
* Removed loop unrolling for gaussianBlur horizontal smoothing
2018-08-31 17:04:59 +03:00
Vitaly Tuzov
e345cb03d5
Bit-exact resize reworked to use wide intrinsics ( #12038 )
...
* Bit-exact resize reworked to use wide intrinsics
* Reworked bit-exact resize row data loading
* Added bit-exact resize row data loaders for SIMD256 and SIMD512
* Fixed type punned pointer dereferencing warning
* Reworked loading of source data for SIMD256 and SIMD512 bit-exact resize
2018-08-31 16:54:05 +03:00
Jakub Golinowski
9f1218b00b
Merge pull request #11897 from Jakub-Golinowski:hpx_backend
...
* Add HPX backend for OpenCV implementation
Adds hpx backend for cv::parallel_for_() calls respecting the nstripes chunking parameter. C++ code for the backend is added to modules/core/parallel.cpp. Also, the necessary changes to cmake files are introduced.
Backend can operate in 2 versions (selectable by cmake build option WITH_HPX_STARTSTOP): hpx (runtime always on) and hpx_startstop (start and stop the backend for each cv::parallel_for_() call)
* WIP: Conditionally include hpx_main.hpp to tests in core module
Header hpx_main.hpp is included to both core/perf/perf_main.cpp and core/test/test_main.cpp.
The changes to cmake files for linking hpx library to above mentioned test executalbles are proposed but have issues.
* Add coditional iclusion of hpx_main.hpp to cpp cpu modules
* Remove start/stop version of hpx backend
2018-08-31 16:23:26 +03:00
Vadim Pisarevsky
bab4f4f5d8
Merge pull request #12348 from take1014:subdiv_getTriangleList_5788
2018-08-31 13:01:16 +00:00
Alexander Alekhin
90f47eb952
Merge pull request #12234 from cv3d:python/cuda/wrapping_functionalities
2018-08-30 20:23:38 +00:00
take1014
e1ee744e15
resolve #5788
2018-08-31 00:59:00 +09:00
Hamdi Sahloul
532eace7d6
Extensive wrapping of CUDA functionalities for Python
2018-08-30 22:50:33 +09:00
Vadim Pisarevsky
258a769567
Merge pull request #12327 from take1014:distanceTransform_type
2018-08-30 13:12:08 +00:00
take1014
1ae477a46d
fix typo
2018-08-28 22:14:47 +09:00
Suleyman TURKMEN
6d165dae5e
related moved enums
2018-08-27 00:43:04 +03: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
98c5ce9347
imgproc(test): refactor test_intersection.cpp
...
don't use legacy test API
2018-08-16 15:27:24 +03:00
Alexander Alekhin
f89defad5d
imgproc: fix rotatedRectangleIntersection()
2018-08-16 15:27:24 +03:00
Bahram Dahi
96f92c6705
imgproc(tests): intersetion calculation of RotatedRect
2018-08-16 15:00:01 +03:00
Alexander Alekhin
e76b375a31
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-08-13 18:57:57 +03:00
Alexander Alekhin
f16f818f5f
Merge pull request #12184 from alalek:issue_12163
2018-08-08 20:50:54 +00:00
Alexander Alekhin
a0cff0be94
imgproc(cvtColor): slightly improve error messages
...
Do not try to process empty inputs.
2018-08-08 17:16:42 +03:00
Alexander Alekhin
b00758babe
imgproc(cvtColor): temporary disable IPP for 8U GRAY2BGR mode
...
Details 12176
2018-08-08 13:58:45 +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
9787ab598b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-07-24 22:48:54 +03:00
Maksim Shabunin
cbb1e867e5
More issues found by static analysis
2018-07-24 16:04:42 +03:00
Maksim Shabunin
e0603bb45f
Fixed several issues found by static analysis tools
2018-07-23 17:22:47 +03:00
Alexander Alekhin
4560909a5e
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-07-17 19:27:48 +03:00
Alexander Alekhin
f3ee07ca11
Merge pull request #11986 from alalek:build_eliminate_gcc8_warnings
2018-07-17 15:41:36 +00:00
Maksim Shabunin
c473718bc2
Check for empty Mat in compare, operator= and RNG::fill, fixed related tests
2018-07-17 17:50:50 +03:00
Maksim Shabunin
1da46fe6fb
Fixed issues found by static analysis (mostly DBZ)
2018-07-17 16:14:54 +03:00
Alexander Alekhin
d5951bc033
build: eliminate GCC8 warnings
2018-07-16 17:24:12 +03:00
Alexander Alekhin
0155851929
imgproc(getPerspectiveTransform): add configuration parameter
2018-07-13 15:31:33 +03:00
Alexander Alekhin
71c6cb9c22
imgproc(getPerspectiveTransform): solve(DECOMP_SVD -> LU)
2018-07-13 15:31:33 +03:00
Alexander Alekhin
2170811e48
imgproc(perf): update getPerspectiveTransform perf test
...
Function is very fast, so 0.000 ms results are useless.
1000 runs requires 25ms on i7-6700K.
2018-07-13 15:31:33 +03:00
Alexander Alekhin
2da96be217
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-07-09 19:44:51 +03:00
Alexander Alekhin
b09a4a98d4
opencv: Use cv::AutoBuffer<>::data()
2018-07-04 19:11:29 +03:00
Alexander Alekhin
0d6518aaa0
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
...
OpenCV FFmpeg wrapper download links are preserved from ffmpeg/master branch
2018-06-13 19:34:44 +03:00
gnthibault
b46fef327e
Fixed Assertin error due to Size.area() overflowing
2018-06-08 11:22:36 +02:00
Vadim Pisarevsky
5e5d997dff
Merge pull request #11620 from terfendail:hmmorph_fix
2018-06-07 11:19:21 +00:00
Vitaly Tuzov
2e22f8e790
Fix for morphologyEx MORPH_HITMISS mode
2018-06-06 21:04:17 +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
Alexander Alekhin
6912c20380
Merge pull request #11659 from take1014:snippet_11597
2018-06-01 16:48:10 +00:00
take1014
4ec9afac57
add imgproc snippets
2018-06-01 23:42:00 +09:00
Vadim Pisarevsky
d734e83af0
Hsv2rgb univ intrin ( #11637 )
...
* add universal intrinsics for HSV2RGB_b
* rewritten HSV2RGB_b without using extra universal intrinsics
* removed unused variable
* undo changes in v_load_deinterleave
2018-05-31 21:59:45 +03:00
Alexander Alekhin
0349e8c9af
Merge pull request #11608 from take1014:hist_11544
2018-05-31 16:44:02 +00:00
Vadim Pisarevsky
7d19bd6c19
Merge pull request #11634 from vpisarev:empty_mat_with_types_2
...
fixes handling of empty matrices in some functions (#11634 )
* a part of PR #11416 by Yuki Takehara
* moved the empty mat check in Mat::copyTo()
* fixed some test failures
2018-05-31 16:36:39 +00:00
take1014
229e8b1b18
Correct handling when IPP is enabled
2018-05-31 22:54:32 +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
yuki takehara
2d5d98ec0f
Merge pull request #11551 from take1014:filter2d_10683
...
* Add arguments to dftFilter2D
* test: add expected test values
2018-05-23 20:25:11 +00:00
Alexander Alekhin
471c17321f
improve code quality
...
- eliminate rand() calls
- non initialized members/ variables
- unused return values
- missing/useless NULL checks
2018-05-22 17:08:31 +03:00
Alexander Alekhin
db88cd1b25
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-05-21 16:20:14 +03:00
Alexander Alekhin
085b27fc3d
Merge pull request #11390 from dkurt:east_text_detection
2018-05-21 13:02:29 +00:00
shengyu
72d3e14e8f
fix wrong indentation on github page (tab to space)
2018-05-19 11:23:51 +08:00
Dmitry Kurtaev
07dc6d2b45
Return a convex hull from rotatedRectangleIntersection
2018-05-18 14:20:17 +03:00
Alexander Alekhin
703f79b757
tests: add "bigdata" tests
2018-05-15 15:56:26 +03:00
Vadim Pisarevsky
e0dbe5cfcc
handle huge matrices correctly ( #11505 )
...
* make sure that the matrix with more than INT_MAX elements is marked as non-continuous, and thus all the pixel-wise functions process it correctly (i.e. row-by-row, not as a single row, where integer overflow may occur when computing the total number of elements)
2018-05-14 15:29:14 +03:00
Alexander Alekhin
51e543050c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-05-10 18:19:56 +03:00
Vadim Pisarevsky
9e3b6a228a
Merge pull request #11418 from K-Shinotsuka:issue42
2018-05-10 15:15:04 +00:00
Vadim Pisarevsky
566cb5e3d8
Merge pull request #11430 from K-Shinotsuka:issue43
2018-05-10 15:14:39 +00:00
k-shinotsuka
ecb4ea8f76
add universal intrinsics for RGB2HSV_f
2018-05-04 00:58:46 +09:00
k-shinotsuka
a5f68e98f4
add universal intrinsics for HLS2RGB_f
2018-05-03 23:50:38 +09:00
Alexander Alekhin
000a13b6a3
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-05-03 14:30:38 +00:00
Tomoaki Teshima
87a4f4ab3a
Merge pull request #11409 from tomoaki0705/fixCLAHEfailure
...
Arm: fix the test failure of OCL_Imgproc/CLAHETest.Accuracy on ODROID-XU4 (#11409 )
* fix the test failure of OCL_Imgproc/CLAHETest.Accuracy on ODROID-XU4
* avoid the race condition in the reduce
* imgproc(ocl): simplify CLAHE code
* remove unused class
2018-04-27 16:41:56 +03:00
Alexander Alekhin
9166e6052b
imgproc: fixed fixedpoint coding style
...
- fixed wrong condition (always true)
- replaced unnecessary shift operation: '>> 63' to '< 0'
- used CV_BIG_INT()/CV_BIG_UINT() macros
2018-04-25 17:33:57 +03:00
Alexander Alekhin
469dc6ac42
imgproc: fix fixed point build
...
avoid using of templated 'operator T ()'
2018-04-25 16:34:44 +03:00
Alexander Alekhin
cd2b188c9a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-04-24 18:13:06 +03:00
Alexander Alekhin
6b581c4e51
build: unreachable code after CV_Error() (part 2)
2018-04-24 16:03:40 +03:00
Alexander Alekhin
4d7d630e92
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-04-23 18:45:02 +03:00
Alexander Alekhin
f659f80c7f
Merge pull request #11374 from lupustr3:pvlasov/morph_big_fix
2018-04-23 09:14:23 +00:00
Pavel Vlasov
a42789f330
IPP morphology with big images hotfix.
2018-04-23 10:50:20 +03:00
Alexander Alekhin
c8b515ea69
Merge pull request #11315 from tomoaki0705:featureComparePixelCount
2018-04-20 14:50:40 +00:00
Alexander Alekhin
12e8e33144
build: enable -Wimplicit-fallthrough warning for OpenCV modules
2018-04-19 19:54:03 +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
Alexander Alekhin
ad2127765f
Merge pull request #11309 from K-Shinotsuka:issue41
2018-04-19 10:58:00 +00:00
Tomoaki Teshima
98d9369a38
add new comparison to tolerate with rounding error
...
* restore resize of carotene
* clean up the source code
* remove unused member function (Near)
* add strict test on the border
2018-04-19 17:31:42 +09: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
k-shinotsuka
b3755ae670
add universal intrinsics for RGB2HLS_f
2018-04-17 19:37:36 +09:00
Alexander Alekhin
59b413c8a1
imgproc(ipp): disable parallel GaussianBlur
2018-04-16 13:31:52 +03:00
Alexander Alekhin
4b2d1aaeea
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-04-16 12:41:47 +03:00
Alexander Alekhin
7e5581cd86
Merge pull request #11286 from sturkmen72:update_rectangle
2018-04-13 13:38:50 +00:00
Alexander Alekhin
cfaca4327b
Merge pull request #11169 from tomoaki0705:universalRemap
2018-04-13 13:24:06 +00:00
Alexander Alekhin
a2d6ee2d31
Merge pull request #11305 from tomoaki0705:typoNVIDIA
2018-04-13 12:56:42 +00:00
Tomoaki Teshima
a82e70cd40
remove raw SSE2/NEON implementation from imgwarp.cpp
...
* use universal intrinsic instead of raw intrinsic
* add 2 channels de-interleave on x86 platform
* add v_int32x4 version of v_muladd
* add accumulate version of v_dotprod based on the commit from seiko2plus on bf1852d
* remove some verify check in performance test
* avoid the out of boundary access and keep the performance
2018-04-13 21:19:16 +09:00
Tomoaki Teshima
a40354d16f
use correct name for NVIDIA
...
* remove NVidia and Nvidia
* replace Cuda with CUDA
* keep the letters for API
2018-04-13 20:33:19 +09:00
Suleyman TURKMEN
8b6a6d4546
Update the function rectangle
2018-04-12 14:55:04 +03:00
Vitaly Tuzov
c80a168d9d
Updated warpAffine test to ensure bit-exactness for CV_8U ( #10921 )
...
* Updated warpAffine test to ensure bit-exactness for CV_8U
* Updated invertAffineTransform to bit-exact evaluation
2018-04-11 18:08:29 +03:00
Vitaly Tuzov
62cf71002e
Bit-exact GaussianBlur performance update ( #10898 )
...
* Added custom implementation for NxN bit-exact GaussianBlur
* Reworked fixedpoint interface a bit
* Reworked horizontal line estimation for bit-exact GaussianBlur
* Reworked vertical line estimation for bit-exact GaussianBlur
* Updated range estimation for vectorized part of bit-exact GaussianBlur evaluation
2018-04-11 18:07:48 +03:00
Alexander Alekhin
5b17a60dde
next: drop HAVE_TEGRA_OPTIMIZATION/TADP
2018-04-10 18:09:54 +03:00
Alexander Alekhin
98c8584b88
next: drop CV_CXX11 conditions
...
define itself is still here for compatibility
2018-04-10 18:09:54 +03:00
Alexander Alekhin
2b2fa58f97
next: drop DISABLE_OPENCV_24_COMPATIBILITY
2018-04-10 18:09:53 +03:00
Alexander Alekhin
d2d9fd6945
build: fix MSVS build problems
...
with 'CL=/permissive-'
2018-04-10 14:50:56 +03:00
shimat
68db42e9be
fix LSD test (wrong detector kind)
2018-04-10 11:38:35 +09:00
Alexander Alekhin
b76ce0e0a4
Merge pull request #11253 from mshabunin:decrease-tbb-dependency
2018-04-09 16:03:34 +00:00
shimat
e172935658
LSD: support vector<Vec4i> lines ( #11042 )
...
* add LSD supportsVec4iResult
* LineSegmentDetector.drawSegments: support vector<Vec4i>
* test_lsd.cpp: replace detect()
* test_lsd.cpp: add compareSegments tests
* lsd.cpp: LSD.compareSegments support Vec4i
* test_lsd.cpp: fix trailing whitespace
2018-04-09 17:31:56 +03:00
Vadim Pisarevsky
20334e3f09
Merge pull request #11264 from K-Shinotsuka:issue39
2018-04-09 13:20:48 +00:00
k-shinotsuka
fbdcc0e8e4
add universal intrinsics for HSV2RGB_f
2018-04-08 01:47:22 +09:00
Alexander Alekhin
15837b43ca
imgproc: don't call .unlock() on non-holded mutex in houghCircles()
2018-04-07 13:00:17 +00:00
Maksim Shabunin
b88609a921
Reduced direct TBB dependencies
2018-04-06 14:21:15 +03:00
Alexander Alekhin
7f63b31ca8
avoid calling of setNumThreads() to respect user settings
2018-03-29 13:04:26 +03:00
Alexander Alekhin
8a0cc5009e
build: eliminate MSVC warning
2018-03-28 18:43:28 +03:00
Alexander Alekhin
5d36ee2fe7
imgproc: apply CV_OVERRIDE/CV_FINAL
2018-03-28 17:57:59 +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
Tomoaki Teshima
06babf90a5
let the test OCL_ImgprocWarp/Resize.Mat pass on ARM/Aarch64
...
* disable carotenete when calling resize on ARM/Aarch64
* loosen eps on Aarch64
2018-03-22 21:35:34 +09:00
Alexander Alekhin
b390e86b12
Merge pull request #11124 from terfendail:minenctriangle_fix
2018-03-22 10:23:10 +00:00
Vitaly Tuzov
91c35a7d01
Updated handling of collinear edges while searching for intersection.
2018-03-21 19:15:34 +03:00
yuki takehara
41f8e788b2
Merge pull request #11083 from take1014:lsd_#9363
...
* Fix #9363
* Renamed the structure and added a new function to the LineSegmentDetectorImpl class as a static member
* Added a new function to the LineSegmentDetectorImpl class as a static member
2018-03-16 19:31:55 +03:00
Rostislav Vasilikhin
64916d3d83
Merge pull request #10869 from savuor:color_cpp_split
...
color.cpp split (#10869 )
* initial split is done
* files renamed (these names are excluded during compilation)
* IPP code moved to corresponding files
* splineBuild, splineInterpolate -> color_lab.cpp
* Lab, Luv: little refactored
* it compiles (didn't check work); Lab OCL code moved to color_lab.cpp
* cvtcolor.cl: Lab/Luv part moved to color_lab.cl
* cvtcolor.cl: color_rgb.cl extracted
* cvtcolor.cl: color_yuv.cl separated
* cvtcolor.cl: color_hsv.cl extracted
* cvtcolor.cl: extracted to color_lab.cl and color_rgb.cl
* helper functions moved to hpp file
* Lab, Luv: moved to color_lab.cpp
* CPU XYZ: to color_lab.cpp
* OCL XYZ: to color_lab.cpp
* warning fixed
* CvtHelper added
* CPU YUV: to color_yuv.cpp, helpers to color.hpp
* CPU HLS/HSV: to color_hsv.cpp
* CPU BGR2BGR: to color_rgb.cpp
* CPU RGB: to color_rgb.cpp
* extra arg removed
* CPU YUV: to color_yuv.cpp
* color code decoded
* OclHelper added, some funcs rewritten
* color_lab.cpp: refactored to use OclHelper
* OCL RGB: to color_rgb.cpp
* OCL HLS/HSV: to color_hsv.cpp
* OCL YUV: to color_yuv.cpp
* OCL YUV planes: to color_yuv.cpp
* OCL: color code reduced
* licence to demosaicing.cpp
* IPP func tables to color_rgb.cpp
* code cleanup
* HAVE_OPENCL ifdefs added
* helpers made more common
* fixed two plane YUV with separate mats
* fixed warning in gcc7.2.0
* precomp header fixed
* color space classification functions fixed
* helpers fixed
* rename: isSRGB -> is_sRGB
2018-03-15 14:10:40 +03:00