Pavel Vlasov
35c7216846
IPP for OpenCV 2017u2 initial enabling patch;
2017-04-20 20:26:30 +03:00
Vitaly Tuzov
4c0d833dec
Disabled vxuConvolution call for sepFilter evaluation
2017-04-11 15:57:20 +03:00
Vitaly Tuzov
87bb74312b
Disabled vxuConvolution call for Sobel, GaussianBlur and Box filter evaluation
2017-04-11 14:11:55 +03:00
Vitaly Tuzov
0f1a56da7c
Changed restrictions for OpenVX HAL calls on small images
2017-04-09 01:17:57 +03:00
Vitaly Tuzov
bf5b7843e8
Extended set of OpenVX HAL calls disabled for small images
2017-04-06 18:17:32 +03:00
Maksim Shabunin
ce50df564c
Fixed cvtColor OCL compilation issue (BGRA2mBGRA)
2017-04-05 11:48:29 +03:00
Alexander Alekhin
e93aa158cf
Merge pull request #8496 from Sahloul:fixes/wrappers/imgproc/EMD
2017-04-03 20:55:51 +00:00
Tomoaki Teshima
6ab10fc3ac
suppress warnings on GCC 4.9 series
...
- check boundary strictly
- initialize the variable before using it
2017-04-01 20:53:50 +09:00
Hamdi Sahloul
6a856d677c
Wraps cv::EMD for Python and Java
2017-04-01 17:20:03 +09:00
Artem Lukoyanov
84a0a91d16
Merge branch 'master' of https://github.com/opencv/opencv into interpMultichannelImg
...
Added assertios to remap and warpAffine functions
As @mshabunin said, remap and warpAffine functions do not support more than 4 channels in
Bicubic and Lanczos4 interpolation modes. Assertions were added. Appropriate test was chenged.
resolves #8272
2017-03-24 23:58:51 +03:00
Artem Lukoyanov
c4ae5c0ee5
Added assertios to remap and warpAffine functions
...
Remap and warpAffine functions do not support more than 4 channels in
Bicubic and Lanczos4 interpolation modes. Assertions were added.
resolve #8272
2017-03-24 11:19:58 +03:00
Vadim Pisarevsky
a57d144076
Merge pull request #7462 from alalek:cpu_multi_target
2017-03-21 19:51:32 +00:00
Alexander Alekhin
b3d128bb39
Merge pull request #8401 from avartenkov:multichannel_warp
2017-03-21 11:59:56 +00:00
Alexander Alekhin
741e51396b
Merge pull request #8416 from berak:patch-2
2017-03-21 11:57:57 +00:00
Alexander Alekhin
e77a5d5f13
Merge pull request #8422 from berak:fix_shapematchmodes
2017-03-21 09:06:30 +00:00
vartenkov
3fbe1f8d64
Fix multichannel warping with BORDER_CONSTANT
...
Warping a matrix with more than 4 channels using BORDER_CONSTANT and
INTER_NEAREST, INTER_CUBIC or INTER_LANCZOS4 interpolation led to
undefined behaviour. This commit changes the behavior of these methods
to be similar to that of INTER_LINEAR. Changed the scope of some of the
variables to more local. Modified some tests to be able to detect the
error described.
2017-03-20 15:21:49 +03:00
berak
11f3c0741e
imgproc: move ShapeMatchModes enum from c to c++ header
2017-03-20 09:59:19 +01:00
berak
0b31eca9c2
remove unnessecary print statement
...
#resolves: 7881
remove printf statement and associated variables from invMapPointSpherical() in undistort.cpp
2017-03-19 10:12:50 +01:00
Woody Chow
9eecb5a9fe
Optimize RowVec_32f and SymmColumnVec_32f with AVX2
2017-03-16 15:42:58 +09:00
Woody Chow
05476d6604
Optimize initUndistortRectifyMap with AVX2
2017-03-16 13:50:24 +09:00
Woody Chow
9a29fc2ce1
Optimize WarpAffine using AVX2
2017-03-16 10:13:56 +09:00
Fangjun KUANG
246d3761ce
Merge pull request #8383 from csukuangfj/patch-10
...
* Improve documentation.
* Update imgproc.hpp
2017-03-15 11:12:59 +00:00
Fangjun KUANG
2a30d8c9f9
Update documentation for cv::accumulate.
...
Make it more clear for the type of input argument.
2017-03-10 17:53:12 +01:00
chacha21
8c7d29e526
more minor changes to fix -Wunused-function warning on Apple platforms
2017-03-09 18:08:34 +01:00
chacha21
94c58e7347
minor changes to fix -Wunused-function warning on Apple platforms
2017-03-09 17:28:52 +01:00
Alexander Alekhin
ba8a6e3533
ocl: don't use vload4 for 3 channel images
2017-03-03 19:36:38 +03:00
chacha21
27cfe31b64
more ICV_HLINE specific cases
...
added ICV_HLINE custom implementations for element sizes up to 32
but timings show that it is not very relevant for sizes >= 12
2017-03-03 11:47:46 +01:00
Vadim Pisarevsky
b46364e436
Merge pull request #7996 from mshabunin:hal-filter-revert
2017-03-02 11:12:08 +00:00
chacha21
92a3dbe18f
more ICV_HLINE optimization
...
added 64b optimization for 3 channels case
not added 64b optimization for 4 channels case since timings did not
show any improvement
split ICV_HLINE cases into inline functions instead of macro for code
size reduction, without significand speed drawback at first sight
2017-03-02 09:44:12 +01:00
Vadim Pisarevsky
408ef5c65b
Merge pull request #8288 from Jejos:bugfix_medianBlur_accessviolation
2017-03-02 05:53:09 +00:00
Vadim Pisarevsky
5f990566c4
Merge pull request #8297 from csukuangfj:csukuangfj-patch
2017-03-02 05:47:33 +00:00
Alexander Alekhin
da0b1d8821
Merge pull request #8238 from PkLab:fix_doc_ellipse
2017-03-01 14:31:06 +00:00
Alexander Alekhin
47c4dcc8a3
Merge pull request #8204 from terfendail:ovx_tlcontext
2017-03-01 12:36:37 +00:00
Fangjun KUANG
34c70e7a1c
Fix typos.
2017-03-01 11:13:46 +01:00
Jejos
5169c79978
fix medianBlur accessviolation
...
medianBlur called with "empty" source and ksize >= 7 crashes application with accessviolation. With this extra assert this is avoided and the application may normally catch the thrown exception.
2017-02-28 08:31:28 +01:00
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
Alexander Alekhin
dcbed8d676
Merge pull request #8250 from tomoaki0705:fixNonAsciiChar
2017-02-24 11:19:00 +00:00
Tomoaki Teshima
822c67fdee
remove non ASCII character from comment
2017-02-24 01:31:32 +09:00
PkLab.net
e03c81d90a
Change image e small fix to cv::ellipse() Doc
2017-02-23 09:10:48 +01:00
Tomoaki Teshima
aec59aba34
suppress warnings
...
- brush up the implementation
2017-02-23 09:11:12 +09:00
Vitaly Tuzov
9a4b5a4545
OpenVX calls updated to use single common OpenVX context per thread
2017-02-21 16:08:23 +03:00
chacha21
afbcc07184
Merge remote-tracking branch 'origin/drawing_performance' into drawing_performance
...
# Conflicts:
# modules/imgproc/src/drawing.cpp
2017-02-21 12:03:15 +01:00
chacha21
91a0270432
try to fix Android compilation
2017-02-21 12:02:23 +01:00
Tomoaki Teshima
64cf206fb5
optimize blend using universal intrinsic
...
- add more channels/depth performance test for blend
2017-02-20 19:09:26 +09:00
Vadim Pisarevsky
9053839282
Merge pull request #8178 from tomoaki0705:addBayer2RGBA
2017-02-16 15:01:49 +00:00
Alexander Alekhin
4c7aa8645a
ocl: validate arguments in KernelArgs constructor
...
- don't use undefined flag=0. It should be CONSTANT instead.
- don't allow 'UMat* m=NULL' argument (except LOCAL/CONSTANT flags).
This case is not handled well to provide NULL __global pointers.
It is better to use '-D' macro defines instead (at least for performance)
2017-02-14 16:10:32 +03:00
Alexander Alekhin
e16227b53c
cmake: support multiple CPU targets
2017-02-13 19:52:59 +03:00
chacha21
16a9407fbf
new try to adapt to iOS build bot
2017-02-11 11:26:55 +01:00
chacha21
e19000a56f
adaptation for iOS buildbot
2017-02-11 11:07:00 +01:00
chacha21
7521bcc32c
comment unused function
...
On MacOS and iOS, the unused opencvBigToHost32 is a warning for buildbot
2017-02-10 22:34:44 +01:00
chacha21
d3a15c625a
do not use GCC_VERSION
2017-02-10 21:58:02 +01:00
chacha21
af746a9269
optimize ICV_HLINE
...
ICV_HLINE is split into several specific cases, according to pixel_size,
to optimize memory copies of the same color components along the line.
2017-02-10 16:26:24 +01: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
91e06e7c05
Merge branch 'UserColormap' of https://github.com/LaurentBerger/opencv into UserColormap
2017-02-06 16:50:31 +01:00
LaurentBerger
48e2d38be7
Merge branch 'master' of git://github.com/Opencv/opencv into UserColormap
2017-01-28 11:25:11 +01:00
Alexander Alekhin
ec47a0a6de
build: workaround for missing _mm256_setr_m128 in GCC
2017-01-26 18:39:38 +03:00
Alexander Alekhin
aa5caf83f6
Merge pull request #8072 from tomoaki0705:AVXcorner
2017-01-25 16:10:59 +00:00
Tomoaki Teshima
07979b02c3
optimize corner detection series using AVX instructions
...
- make sure SSE version will be still available for backward compatibility
2017-01-25 22:35:11 +09:00
Tomoaki Teshima
ddca982c09
remove pure SSE part
2017-01-25 22:05:53 +09:00
Tomoaki Teshima
062d2179eb
use universal intrinsic in corner detection series
2017-01-20 19:22:44 +09:00
Alexander Alekhin
5b363df2ae
Merge pull request #8000 from mshabunin:fix-opencl-clahe
2017-01-16 10:01:59 +00:00
Vadim Pisarevsky
10e639cdb9
Merge pull request #7966 from Tetragramm:Issue#4235
2017-01-13 14:24:57 +00:00
mshabunin
8c66531c42
imgproc/CLAHE/ocl: Removed unnecessary __local variable
2017-01-13 16:25:43 +03:00
LaurentBerger
587e9a554e
remove new operator
2017-01-11 16:32:14 +01:00
Tetragramm
7cc0b0f93e
Add case including both moments empty.
2017-01-10 21:38:31 -06: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
Alexander Alekhin
45f0cf0d41
Merge pull request #7959 from alalek:fix_7957
2017-01-06 02:10:06 +00:00
Tetragramm
d33d37ffd9
Add check for all zero moments. If one of the shapes is empty, the match would return zero distance between the shapes even when the other one had content. It now returns DBL_MAX if no moments had value.
2017-01-04 18:38:46 -06:00
Alexander Alekhin
fa36b9d345
imgproc: fix using of uninitialized edge[] members in FillConvexPoly
2017-01-03 22:18:27 +03:00
Lorena García
3650ec02be
HitMiss tutorial
2017-01-03 18:34:04 +01:00
LaurentBerger
a2f3692bff
Merge branch 'master' of git://github.com/Opencv/opencv into UserColormap
2016-12-26 17:03:52 +01:00
Vitaly Tuzov
be7d060ea4
Merge pull request #7802 from terfendail:ovxhal_wrappers_migration
...
* OpenVX HAL updated to use generic OpenVX wrappers
* vxErr class from OpenVX HAL replaced with ivx::WrapperError
* reduced usage of vxImage class from OpenVX HAL replaced with ivx::Image
* vxImage class rewritten as ivx::Image subclass that calls swapHandle prior release
* Fix OpenVX HAL build
* Fix for review comments
2016-12-21 15:19:06 +02:00
Pavel Rojtberg
40686b5e87
initUndistortRectifyMap: CV_32FC2 is also supported as m1type
2016-12-20 10:22:32 +01:00
Alexander Alekhin
07004a46ca
Merge pull request #7773 from savuor:openvx_harris
2016-12-19 11:39:38 +00:00
Alexander Alekhin
0e4dde1781
Merge pull request #7872 from alalek:merge-2.4
2016-12-16 16:03:14 +02:00
Rostislav Vasilikhin
a2646062b2
ivx::Scalars replaced by immediate values
2016-12-16 15:44:31 +03:00
Rostislav Vasilikhin
1e2ad7e3e3
rewritten for new macro use
2016-12-16 15:44:31 +03:00
Rostislav Vasilikhin
ee77538cf9
disabled due to bad accuracy
2016-12-16 15:44:31 +03:00
Rostislav Vasilikhin
3f1734bbc7
fixed type checks in wrappers; array downloading code simplified
2016-12-16 15:44:31 +03:00
Rostislav Vasilikhin
77f99358df
fix vxCommitArrayRange() call
2016-12-16 15:44:31 +03:00
Rostislav Vasilikhin
5f4112a1cf
added initial version of wrapper for Harris corner detection
2016-12-16 15:44:31 +03:00
Rostislav Vasilikhin
faefbf93bc
Merge pull request #7793 from savuor:openvx_pyrDown
...
OpenVX pyrDown wrappers (#7793 )
* wrappers for vx_pyramid added
* initial version of pyrDown() wrapper added
* disabled for Khronos
* rewritten for new macro use; border mode added to node
2016-12-16 12:48:58 +02:00
Alexander Alekhin
a615d79f2d
Merge pull request #7768 from terfendail:ovx_remap
2016-12-16 10:33:58 +00:00
LaurentBerger
d8fdf9321d
mend
2016-12-15 22:49:37 +01:00
Maksim Shabunin
7d5fd6a800
Merge pull request #7812 from alalek:fix_putText
2016-12-15 13:33:56 +00:00
LaurentBerger
4826d976d6
Suppress warning unused parameter
2016-12-15 10:51:08 +01:00
LaurentBerger
61b9484155
ApplyColorMap can be used with a user colormap
2016-12-15 10:17:05 +01:00
Rostislav Vasilikhin
8b9422a052
OpenVX wrappers rewritten with CV_OVX_RUN, VX_DbgThrow
2016-12-14 17:49:41 +03:00
Vitaly Tuzov
3c5eb513dd
Fixed OpenVX to OpenCV compatibility for NN remap
2016-12-14 16:53:07 +03:00
Vitaly Tuzov
f8b4d28745
Added OpenVX based processing to remap
2016-12-14 16:53:04 +03:00
Vitaly Tuzov
2c89b39eee
Added OpenVX based processing to calcHist
2016-12-13 18:33:02 +03:00
Vladislav Sovrasov
12383a124b
Disable error throwing in convexityDefects when hull is a line or point
2016-12-13 12:28:38 +03:00
apavlenko
3aedc134c2
replacing white noise with fruits picture
2016-12-12 17:55:11 +03:00
apavlenko
a99118c4c7
moving CannyVX test from ocl to cpp file
2016-12-09 15:07:53 +03:00
apavlenko
4246d3667f
disabling again
2016-12-09 14:53:06 +03:00
apavlenko
76c38f0c80
trying to enable canny_vx adding a new test comparing canny_cv vs canny_vx
2016-12-09 14:53:06 +03:00
apavlenko
f3ec56fcee
fixing build errors
2016-12-09 14:53:06 +03:00
apavlenko
541d5b02d9
disabling due to accuracy issues
2016-12-09 14:53:06 +03:00
apavlenko
ccd8031a33
fixing compilation
2016-12-09 14:53:06 +03:00
apavlenko
1e2ddc30b1
Canny via OpenVX, Node wrapper extended (query/set attribute), some naming fixes
2016-12-09 14:53:06 +03:00
Alexander Alekhin
98181e9d7f
imgproc/drawing: minor refactoring in FillConvexPoly
2016-12-08 22:14:32 +03:00
Alexander Alekhin
7e0f1ec00a
test: putText regression garbage test
2016-12-08 22:14:31 +03:00
Alexander Alekhin
bcbe2f123f
test: move more drawing tests
2016-12-08 22:14:30 +03:00
Alexander Alekhin
781ab3d481
test: minor refactoring in test_drawing
2016-12-08 22:14:29 +03:00
Alexander Alekhin
ee265962b2
test: move test_drawing into imgproc module
2016-12-07 22:04:25 +03:00
Li Peng
396921dd23
5x5 gaussian blur optimization
...
Add new 5x5 gaussian blur kernel for CV_8UC1 format,
it is 50% ~ 70% faster than current ocl kernel in the perf test.
Signed-off-by: Li Peng <peng.li@intel.com>
2016-12-06 09:42:37 +08:00
Vadim Pisarevsky
f84dc354f6
Merge pull request #7564 from terfendail:ovx_gaussianfilter
2016-12-02 15:24:03 +00:00
Vitaly Tuzov
afc7396975
Added OpenVX based processing to gaussianBlur
2016-12-02 14:46:12 +03:00
Li Peng
b69cdb2434
Image pyramids upsampling optimization
...
Add new ocl kernel for image pyramids upsampling,
It is 35% faster than current OCL kernel in perf test.
Signed-off-by: Li Peng <peng.li@intel.com>
2016-12-02 13:54:58 +08:00
Vadim Pisarevsky
c99097f89a
Merge pull request #7478 from terfendail:ovx_boxfilter
2016-12-01 17:57:46 +00:00
Vadim Pisarevsky
1d45726f47
Merge pull request #7588 from terfendail:ovx_medianblur
2016-12-01 17:54:34 +00:00
Vadim Pisarevsky
e623e710be
Merge pull request #7597 from terfendail:ovx_threshold
2016-12-01 17:53:38 +00:00
Vadim Pisarevsky
32f48a8d9c
Merge pull request #7631 from savuor:openvx_accumulate
2016-12-01 17:49:18 +00:00
Vadim Pisarevsky
8968318dfc
Merge pull request #7668 from savuor:openvx_equalize_hist
2016-12-01 17:43:44 +00:00
Vitaly Tuzov
6d55e99291
Added OpenVX based processing to boxFilter
2016-11-30 11:27:25 +03:00
Li Peng
2ca5a7e862
more optimization for warpAffine and warpPerspective
...
Add new OpenCL kernels for bicubic interploation, it is 20% faster
than current warp image kernel with bicubic interploation.
Signed-off-by: Li Peng <peng.li@intel.com>
2016-11-30 15:43:41 +08:00
Vadim Pisarevsky
c47267ef7f
Merge pull request #7538 from Tetragramm:CLAHEfix
2016-11-29 16:42:05 +00:00
Vadim Pisarevsky
57aaec1ee8
Merge pull request #7610 from terfendail:ovx_sobel
2016-11-29 16:40:10 +00:00
Rostislav Vasilikhin
0ac934d09a
added OpenVX call to equalizeHist() function
2016-11-29 17:53:47 +03:00
Rostislav Vasilikhin
7c2734ff14
added OpenVX calls to accumulate(), accumulateSquare(), accumulateWeighted()
2016-11-29 17:53:35 +03:00
Vitaly Tuzov
0cd3788624
Added OpenVX based processing to threshold
2016-11-29 15:35:52 +03:00
Vitaly Tuzov
9200db778c
Added OpenVX based processing to medianBlur
2016-11-29 15:32:07 +03:00
Vitaly Tuzov
e8f3469096
Added OpenVX based processing to Sobel
2016-11-29 15:29:00 +03:00
Alexander Alekhin
90b52cd9b8
Merge pull request #7726 from pengli:warp_image
2016-11-29 12:19:18 +00:00
Li Peng
b72d196753
optimization for warpAffine and warpPerspective
...
Add new ocl kernels for warpAffine and warpPerspective,
The average performance improvemnt is about 30%. The new
ocl kernels require CV_8UC1 format and support nearest
neighbor and bilinear interpolation.
Signed-off-by: Li Peng <peng.li@intel.com>
2016-11-29 14:55:58 +08:00
Michele Cancilla
89a0a46a69
Removed parallel version for CV_16U label type
2016-11-28 14:54:44 +01:00
Alexander Alekhin
7dc673fd56
imgproc: fix findContours (submatrix input)
2016-11-25 18:25:26 +03:00
Michele Cancilla
4b7fc59332
Fixed _P reserved variable name problem and changed getNumThreads with getNumberOfCPUs
2016-11-25 13:25:17 +01:00
Alexander Alekhin
88ef8c996e
Merge pull request #7709 from alalek:fix_java_tests
2016-11-24 16:15:56 +00: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
Alexander Alekhin
4fd00c1ae1
Merge pull request #7714 from onixie:master
...
Fix docs explaining the returnPoints argument of convexHull.
2016-11-23 17:44:05 +03:00
Rostislav Vasilikhin
7db43f9fff
fixed wrong equivalence in YUV conversion ( #7481 )
...
* fixed wrong equivalence in YUV conversion
* fixed channel order from YVU to YUV
2016-11-23 17:39:18 +03:00
Vadim Pisarevsky
b8c875d4a1
Merge pull request #7707 from K-Shinotsuka:issue37
2016-11-23 14:15:02 +00:00
monoid911
b879126584
Fix docs explaining the returnPoints argument of convexHull.
2016-11-23 20:43:52 +09:00
Alexander Alekhin
8019498c6e
java tests fixes
2016-11-23 13:53:00 +03:00
k-shinotsuka
284006e336
add NEON code for RGB2Luv_f.
2016-11-23 19:18:41 +09:00
Vadim Pisarevsky
c1ee798213
Merge pull request #7662 from K-Shinotsuka:issue34
2016-11-22 13:57:13 +00:00
Vadim Pisarevsky
af22b6c4a9
Merge pull request #7664 from K-Shinotsuka:issue35
2016-11-22 13:49:14 +00:00
Vadim Pisarevsky
b54bc2db1e
Merge pull request #7665 from K-Shinotsuka:issue36
2016-11-22 13:44:42 +00:00
Michele Cancilla
0bc9a0db18
Improvement of sequential connected components Wu's algorithm and provide parallel version of both Wu's and Grana's algorithms (using TBB library)
2016-11-22 11:42:13 +01:00
Pavel Vlasov
dfb9c574a4
IPP 2017 filter2D fix;
...
filter2D IPP runtime check;
2016-11-21 17:18:03 +03:00
Li Peng
6cb73356b1
laplacian ocl kernel optimization
...
This ocl kernel is 46%~171% faster than current laplacian 3x3
ocl kernel in the perf test, with image format "CV_8UC1".
Signed-off-by: Li Peng <peng.li@intel.com>
2016-11-17 12:01:02 +08:00
k-shinotsuka
cf5c400ecb
add SSE code for RGB2HLS_f.
2016-11-16 00:46:13 +09:00
Alexander Alekhin
c93fb14dd2
Merge pull request #7653 from pengli:deriv
2016-11-14 13:40:04 +00:00
Juha Reunanen
5bb08bae28
Merge pull request #7464 from reunanen:test-7409-7458
...
Change contour test images to be very wide (#7464 )
* Change contour test images to be very wide (#7409 , #7458 )
Unfortunately, slows down the tests.
* Decrease the number of contour test cases, in order to (at least partially) offset the test run duration increase caused by making the test images wider
* Don't test with very wide images on 32-bit architectures
2016-11-14 16:31:29 +03:00