Alexander Karsakov
39b27a19be
Refactoring and optimization
2014-09-05 12:20:29 +04:00
Alexander Karsakov
d59a6fa518
Optimization for getLines
2014-09-05 11:37:16 +04:00
Alexander Karsakov
fee8f29f48
Refactoring, minor optimization
2014-09-04 16:31:30 +04:00
Alexander Karsakov
07d57db91c
Fixed calculation of l_stack_size
2014-09-03 17:40:17 +04:00
Alexander Karsakov
a48c1c8248
Added workaround for Nvidia: take into account that 3-channel vector type takes 4*elem_size in local memory.
2014-09-02 12:38:02 +04:00
Alexander Karsakov
214dab39f6
Fixed BORDER_REFLECT and BORDER_REFLECT_101 extrapolation for case x > 2*maxV
2014-09-02 11:53:31 +04:00
Elena Gvozdeva
31ac73c315
fix for cv::memopTypeToStr
2014-08-29 14:18:52 +04:00
Alexander Alekhin
b332152bef
Merge pull request #2956 from ilya-lavrenov:tapi_accumulate
2014-08-28 09:08:51 +00:00
Alexander Karsakov
6b6c7ccfea
Added accuracy tests with real and generated data
2014-08-27 17:58:48 +04:00
Alexander Karsakov
f7aadd07f6
Added getLines, fill_accum_local kernels
2014-08-27 17:57:22 +04:00
Vadim Pisarevsky
d66815978a
Merge pull request #3117 from KruchDmitriy:canny_opt
2014-08-27 10:07:55 +00:00
VBystricky
9ee0789174
Fix issues
2014-08-26 14:39:11 +04:00
vbystricky
e75cd74f5a
Optimize OpenCL version of Laplacian filter for kernel size great than 3
2014-08-25 17:56:09 +04:00
Alexander Karsakov
038bfb98ec
Added fill_accum kernel
2014-08-25 13:55:09 +04:00
Ilya Lavrenov
7017b1250a
used new stratehy in cv::accumulate**
2014-08-25 11:25:54 +04:00
Ilya Lavrenov
a350b76738
optimization of cv::accumulate**
2014-08-25 11:25:01 +04:00
Alexander Karsakov
5c1f71de51
Added make_point_list kernel
2014-08-22 16:50:01 +04:00
Vadim Pisarevsky
e7539bd2c8
Merge pull request #3144 from ElenaGvozdeva:ocl_morphSmall
2014-08-22 12:14:06 +00:00
U-KruchininD-ПК\KruchininD
6ed168d3af
New optimization for canny
...
new hysteresis
delete whitespaces
fix problem with mad24
Dynamic work group size
dynamic work group size
Fix problem with warnings
Fix some problems with border
Another one fix
Delete trailing whitespaces
some changes
fix problem with warning
2014-08-22 11:22:15 +04:00
Elena Gvozdeva
7ad6b47bc9
fixed ocl_boxFilter
2014-08-22 10:31:13 +04:00
Alexander Karsakov
3d222d313b
Fixed range for 'v' channel for 8U images
2014-08-21 17:22:06 +04:00
Elena Gvozdeva
5302e56071
fix for ocl_morphSmall
2014-08-21 16:31:24 +04:00
Bence Magyar
04b2d9a453
Fix color table
...
Apart from not displaying the table, it breaks the doc build of https://github.com/Itseez/opencv_contrib/pull/70 .
2014-08-19 18:00:13 +02:00
Vadim Pisarevsky
8658aef3bf
Merge pull request #3104 from dkanafeev:new_ipp_func_master
2014-08-19 09:06:45 +00:00
Alexander Karsakov
cf1ae3513f
Fixed getConversionInfo() for YUV2RGBA_* conversions
2014-08-18 18:34:44 +04:00
Vadim Pisarevsky
e9729a9601
multiple yet minor fixes to make most of the tests pass on Mac with Iris graphics
2014-08-16 00:29:10 +04:00
dkanafeev
1b0f0d7ead
Intel Summer School 2014
...
Switch branch to master.
New IPP func - ippiCopy
Conv: YUV2GRAY_420
2014-08-15 12:54:31 +04:00
Vadim Pisarevsky
95a4943762
Merge pull request #3103 from vpisarev:core_imgproc_optim_rearrangements
2014-08-14 13:39:01 +00:00
Vadim Pisarevsky
4530c7ad08
trying to fix builds
2014-08-14 13:18:04 +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
Alexander Karsakov
8760a344ec
Fixed incorrect pointer conversion for in-place threshold
2014-08-14 11:02:55 +04:00
Adil Ibragimov
9ac06a9333
fix for gcc
2014-08-13 16:34:18 +04:00
Adil Ibragimov
8a4a1bb018
Several type of formal refactoring:
...
1. someMatrix.data -> someMatrix.prt()
2. someMatrix.data + someMatrix.step * lineIndex -> someMatrix.ptr( lineIndex )
3. (SomeType*) someMatrix.data -> someMatrix.ptr<SomeType>()
4. someMatrix.data -> !someMatrix.empty() ( or !someMatrix.data -> someMatrix.empty() ) in logical expressions
2014-08-13 15:21:35 +04:00
Vadim Pisarevsky
01bd4961e3
Merge pull request #3081 from akarsakov:small_fixes
2014-08-13 10:50:33 +00:00
Vadim Pisarevsky
c97c0be4f2
Merge pull request #3082 from ElenaGvozdeva:ocl_morphSmall
2014-08-12 13:56:59 +00:00
Alexander Karsakov
b4d3b34acf
Disabled ippiFilterBoxBorder_* in case maskSize equal roiSize for any dimension
2014-08-12 16:38:11 +04:00
Vadim Pisarevsky
5119564579
Merge pull request #3033 from nathanjackson:clahe_datatypes
2014-08-12 10:45:29 +00:00
Alexander Karsakov
5898dcae4a
Added ROUNDING_EPS for identical rounding after dividing on different platforms
2014-08-12 14:28:48 +04:00
Elena Gvozdeva
8124d10526
fixed Erode and Dilate in case of kernel = Mat()
2014-08-12 12:19:13 +04:00
Nathan Jackson
563200fbf6
CPU (non-OpenCL) CLAHE now supports CV_16UC1.
2014-08-11 18:25:08 -04:00
Vadim Pisarevsky
6df1198e8b
Merge pull request #3071 from mshabunin:stitch-fix
2014-08-11 16:08:40 +00:00
Alexander Alekhin
8fd61c9aa6
Merge pull request #3075 from akarsakov:ipp_imgproc_fix
2014-08-11 15:02:53 +00:00
Alexander Alekhin
b7d1a70919
Merge pull request #3063 from akarsakov:ocl_warps_check
2014-08-11 13:20:11 +00:00
Alexander Karsakov
498da24b8b
Disabled some IPP calls of cvtColor since it breaks OCL accuracy tests
...
with test_loop_times=30
2014-08-11 15:52:53 +04:00
Alexander Karsakov
6b0e63b652
Enabled IPPMorphReplicate in case BORDER_CONSTANT only for 3x3 kernels.
2014-08-11 15:37:05 +04:00
mshabunin
c54b8f9b00
Merge remote-tracking branch 'master' into stitch-fix
...
* 'master' of github.com:itseez/opencv: (82 commits)
moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib
added some basic functionality needed by the new face module (moved from the old "contrib")
moved to the new opencv_contrib/face module
fixed various warnings and obvious errors reported by clang compiler and the coverity tool.
Fixed review comment from Vadim Pisarevsky
modified farneback sample to use T-API
ECC patch by the author (G. Evangelidis); fixed some OCL Farneback optical flow test failures on Mac
small fix for GaussianBlur ocl test
fix binary package build
small fix for ocl_resize
fix IOS framework
fixed test ocl_MatchTemplate for sparse matrix
Fixed typos
fixing error, wrong template method param.
fixing Mac build
some formal changes (generally adding constness)
Fixed choice of kercn and rowsPerWI for non-Intel device.
fixed nDiffs for CalcBackProject
fixed tests for ocl_filter2d, ocl_matchTemplate, ocl_histogram.cpp
Fixed issue: Mat::copyTo(UMat) if device copy is obsolete. Added test.
...
Conflicts:
modules/core/include/opencv2/core/mat.inl.hpp
2014-08-11 14:50:08 +04:00
Vadim Pisarevsky
0f66e2757b
Merge pull request #3069 from vpisarev:refactor_video
2014-08-11 08:47:59 +00:00
Vadim Pisarevsky
8368d54d36
Merge pull request #3061 from ElenaGvozdeva:ocl_resize
2014-08-11 06:41:48 +00:00
Vadim Pisarevsky
d0137b6d2d
moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib
2014-08-10 23:24:16 +04:00
Vadim Pisarevsky
4de4ff5682
Merge pull request #3067 from vpisarev:minor_fixes2
2014-08-10 10:52:57 +00: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
Vadim Pisarevsky
05e7c29de5
fixed various warnings and obvious errors reported by clang compiler and the coverity tool.
2014-08-10 00:10:05 +04:00
Vadim Pisarevsky
99eed2d885
Merge pull request #3057 from Adil-Ibragimov:adding-constness
2014-08-08 17:27:47 +00:00
Vadim Pisarevsky
62f90219fc
Merge pull request #3064 from ElenaGvozdeva:ocl_GaussianBlur
2014-08-08 17:16:38 +00:00
Vadim Pisarevsky
ce0297ed61
Merge pull request #3050 from ElenaGvozdeva:ocl_fixed_impg
2014-08-08 14:06:49 +00:00
Elena Gvozdeva
7cba3ac4f8
small fix for GaussianBlur ocl test
2014-08-08 17:47:57 +04:00
Alexander Karsakov
7849c35de1
Changed check condition in tests for warpAffine and warpPerspective
2014-08-08 17:14:38 +04:00
Elena Gvozdeva
b7899c3d5c
small fix for ocl_resize
2014-08-08 16:12:10 +04:00
Elena Gvozdeva
b5f251c815
fixed test ocl_MatchTemplate for sparse matrix
2014-08-08 13:37:18 +04:00
Alexander Alekhin
d0f789dc90
Merge pull request #3044 from akarsakov:fix_ocl_tests
2014-08-07 20:14:17 +00:00
Adil Ibragimov
98d5731ad8
some formal changes (generally adding constness)
2014-08-07 15:49:14 +04:00
Elena Gvozdeva
7dd7dd97cd
fixed nDiffs for CalcBackProject
2014-08-07 15:36:00 +04:00
Elena Gvozdeva
c9b5d8cf4c
fixed tests for ocl_filter2d, ocl_matchTemplate, ocl_histogram.cpp
2014-08-07 15:36:00 +04:00
Alexander Karsakov
44fbfb2cf6
Fixed extrapolation in pyrDown
2014-08-07 10:39:25 +04:00
Alexander Karsakov
2a0b39d30a
Fixed calculate_histogram kernel
2014-08-07 10:39:24 +04:00
Alexander Karsakov
eb9fdb0164
Fixed rounding in remap INTER_LINEAR mode
2014-08-07 10:39:24 +04:00
Alexander Karsakov
fec21239c8
Revert optimization for warpAffine INTER_NEAREST mode
2014-08-07 10:39:18 +04:00
Vadim Pisarevsky
ca183707f2
Merge pull request #3039 from alalek:ocv_world
2014-08-06 14:52:52 +00:00
Vadim Pisarevsky
bab5700a09
Merge pull request #3013 from ElenaGvozdeva:ocl_matchTemplate
2014-08-06 11:26:07 +00:00
Alexander Alekhin
55188fe991
world fix
2014-08-05 20:12:35 +04:00
Elena Gvozdeva
7999fbf765
fixed ocl_integral
2014-08-05 12:01:28 +04:00
Elena Gvozdeva
f32b52ea8d
fixed test for CvtColor RGB -> Luv
2014-08-05 11:54:26 +04:00
Elena Gvozdeva
8c2c3b54d9
fixed ocl tests for BlendLinear, BoxFilter, Integral
2014-08-05 11:41:08 +04:00
Vadim Pisarevsky
432b7cb235
Merge pull request #3032 from vpisarev:refactor_ml2
2014-08-04 14:51:38 +00:00
Vladislav Vinogradov
a3da3a01e1
fix test_opencv_imgproc compilation
2014-08-04 12:13:33 +04:00
Vadim Pisarevsky
222f8a3d5e
hopefully fixed test failure on Linux
2014-08-04 01:16:45 +04:00
Vadim Pisarevsky
d3cdfefa03
Merge pull request #3027 from vbystricky:cvtColorLuv2RGB
2014-08-02 21:52:24 +00:00
Alexander Alekhin
c595457ea0
Merge pull request #3011 from vbystricky:oclopt_morthosmall
2014-08-01 17:21:59 +00:00
VBystricky
0f9b79ef64
Change min-max to clamp
2014-08-01 19:45:11 +04:00
vbystricky
b724208510
Fix Luv2RGB function
2014-08-01 16:39:12 +04:00
Roman Donchenko
983e75e5de
Merge remote-tracking branch 'origin/master' into merge-2.4
2014-08-01 15:01:41 +04:00
Vadim Pisarevsky
18de8dee62
Merge pull request #3009 from vpisarev:ios_experiments
2014-07-31 18:20:07 +00:00
Alexander Alekhin
f8aecb2a32
Merge pull request #3002 from vbystricky:oclopt_pyrdown
2014-07-31 15:43:18 +00:00
Elena Gvozdeva
90ac88cb8e
use std::min,max
2014-07-30 14:28:02 +04:00
vbystricky
bd8894002e
Fix some problems
2014-07-30 11:56:28 +04:00
vbystricky
878dec65c8
Optimize OpenCL version of morfology and box filters for small filter kernels
2014-07-30 10:32:52 +04:00
Vadim Pisarevsky
101769d26c
eliminated some unnecessary instructions
2014-07-29 18:10:18 +04:00
Elena Gvozdeva
dbb5993d13
added dft for all platforms
2014-07-29 12:21:52 +04:00
Elena Gvozdeva
dc3c691c8c
new block size for dft
2014-07-29 12:06:20 +04:00
Elena Gvozdeva
e7216a5987
Used float instead of int for CV_8U in sumTemplate
2014-07-29 11:34:39 +04:00
Vadim Pisarevsky
11e9e375a3
fixed compile warning with GCC
2014-07-28 19:23:46 +04:00
Vadim Pisarevsky
4255746c00
fixed compile warnings and removed extra whitespaces
2014-07-28 15:20:25 +04:00
Vadim Pisarevsky
4dfb613c3e
optimized Bayer=>RGB/RGBA/Gray conversion using Neon intrinsics. Fixed recently introduced build error in iOS framework.
2014-07-28 14:54:41 +04:00
Sander Mathijs van Veen
d25770ee76
Fix Python 2 bindings for findContours
...
The sanity check prevents Python 2 from calling findContours, because the
Python 2 bindings pass an empty matrix for `_contours`. If `_contours` is not
empty, the channel and depth check should determine whether the matrix is of
the correct type and size.
Note: the Python 2 bindings passes a matrix of type `STD_VECTOR_MAT` to
parameters of the type `OutputArrayOfArrays`.
2014-07-26 16:40:09 +02:00
Vadim Pisarevsky
603030b005
Merge pull request #2993 from vbystricky:oclopt_warp_affine
2014-07-25 11:26:24 +00:00
vbystricky
e49d148d47
Optimize ocl function pyrDown
2014-07-25 13:39:19 +04:00
Alexander Alekhin
63a8cb594a
Merge pull request #2961 from ilya-lavrenov:tapi_corners
2014-07-22 09:38:11 +00:00
vbystricky
716218cac4
Optimize ocl version of warp_affine
2014-07-22 13:22:40 +04:00
Vadim Pisarevsky
17d69be902
Merge pull request #2933 from ilya-lavrenov:sse_moments
2014-07-18 09:25:22 +00:00
Vadim Pisarevsky
dbefbbc522
Merge pull request #2910 from ilya-lavrenov:sse2_canny
2014-07-15 09:46:28 +00:00
Vadim Pisarevsky
40370345c5
Merge pull request #2765 from pradeep-pyro:kullback_leibler
2014-07-15 08:57:31 +00:00
pradeep
7171431e7c
Changed cv::log to std::log
2014-07-15 12:32:53 +08:00
Alexander Alekhin
381986d044
Merge pull request #2882 from akarsakov:ocl_pyrDown_opt
2014-07-14 18:48:28 +00:00
Alexander Alekhin
910d8f8e0b
Merge pull request #2888 from ilya-lavrenov:tapi_remap
2014-07-11 09:59:27 +00:00
Ilya Lavrenov
fee3d6931b
corners
2014-07-10 17:17:24 +04:00
Vadim Pisarevsky
347eaa8685
Merge pull request #2943 from vbystricky:highgui_imgcodecs
2014-07-10 05:28:44 +00:00
pradeep
0d49f97128
Fixed truncation warning
2014-07-09 15:29:47 +08:00
pradeep
f8b23cff18
Fixed test errors, added support for C data types.
2014-07-09 13:39:40 +08:00
Ilya Lavrenov
e8f5c2fcf6
OpenCL before IPP
2014-07-08 18:51:27 +04:00
Roman Donchenko
a3bde36c84
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
modules/contrib/doc/facerec/facerec_api.rst
modules/contrib/include/opencv2/contrib/contrib.hpp
modules/contrib/src/facerec.cpp
modules/core/include/opencv2/core/mat.hpp
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/highgui/src/loadsave.cpp
modules/imgproc/src/pyramids.cpp
modules/ocl/include/opencv2/ocl/cl_runtime/cl_runtime.hpp
modules/python/src2/gen.py
modules/python/test/test.py
modules/superres/test/test_superres.cpp
samples/cpp/facerec_demo.cpp
2014-07-08 14:33:56 +04:00
vbystricky
4286f60387
Extract imgcodecs module from highgui
2014-07-07 16:28:08 +04:00
Beat Küng
90dce84314
imgproc: fix compiler error for gcc 4.8
...
this bug was introduced in a73809e6
.
2014-07-05 09:27:11 +02:00
Ilya Lavrenov
8fdbdb131d
SSE4.1 optimiation of cv::Moments CV_16U
2014-07-03 15:04:06 +04:00
Alexander Alekhin
e6c305cb75
Merge pull request #2897 from vbystricky:oclopt_sepFilter2D
2014-07-03 09:26:05 +00:00
Alexander Alekhin
effff27c4e
Merge pull request #2928 from ilya-lavrenov:tapi_warp_fix
2014-07-02 19:06:46 +00:00
Ilya Lavrenov
46e2216165
fixed cv::warpPerspective
2014-07-02 19:32:10 +04:00
Vadim Pisarevsky
d6233b13ba
Merge pull request #2913 from ilya-lavrenov:sse2_precornerdetect
2014-07-02 09:55:51 +00:00
Alexander Alekhin
d65abcaedb
Merge pull request #2830 from mlyashko:moments
2014-07-02 09:14:48 +00:00
Ilya Lavrenov
d40cb39616
SSE2 optimization of magnitude calculation
2014-07-02 00:05:55 +04:00
Vadim Pisarevsky
fe4bdcd71b
Merge pull request #2895 from fradelg:master
2014-07-01 17:16:22 +00:00
Alexander Alekhin
acbabedac9
Merge pull request #2869 from ilya-lavrenov:tapi_warps
2014-06-30 11:59:13 +00:00
Alexander Alekhin
e0584bb818
Merge pull request #2876 from vbystricky:oclopt_integralsum
2014-06-30 10:06:54 +00:00
Alexander Alekhin
1493160f26
Merge pull request #2899 from ilya-lavrenov:tapi_ex
2014-06-30 10:05:24 +00:00
Alexander Alekhin
667a9328fb
Merge pull request #2829 from ilya-lavrenov:tapi_cvtcolor
2014-06-30 10:02:41 +00:00
Ilya Lavrenov
654bdde8ed
SSE2 optimization of cv::preCornerDetect
2014-06-30 01:51:53 +04:00
Alexander Karsakov
d5c99a07b6
Use fma only for Intel devices
2014-06-27 12:59:44 +04:00
Ilya Lavrenov
36db85a94d
optimized some operations
2014-06-27 12:52:29 +04:00
Roman Donchenko
1576e24c93
Merge pull request #2672 from a-wi:findContours
2014-06-26 17:35:08 +04:00
Roman Donchenko
e89e3066e8
Merge pull request #2774 from 23pointsNorth:lsd-nfa-fix
2014-06-26 17:29:27 +04:00
Roman Donchenko
1138fbb940
Merge pull request #2766 from akarsakov:pyr_border_constant
2014-06-26 17:28:44 +04:00
Roman Donchenko
b0a70787e1
Merge pull request #2824 from abidrahmank:pylsd
2014-06-26 17:22:54 +04:00
vbystricky
1a73aa1f6a
Change local size
2014-06-26 15:43:40 +04:00
Ilya Lavrenov
16ab6ec534
ported changes from PR #2867
2014-06-26 13:52:44 +04:00
Ilya Lavrenov
a3592cd068
added ocl_** function
2014-06-26 13:18:03 +04:00
Ilya Lavrenov
ad9272e836
reverted to original plain C++ code
2014-06-26 13:13:01 +04:00
mlyashko
6f2fea7ea5
added perftest for moments
2014-06-26 13:05:43 +04:00
vbystricky
730ead44fe
Optimize OpenCL version of sepFilter2D
2014-06-26 12:46:03 +04:00
Fco. Javier Delgado del Hoyo
47e345bcb6
Change comment according to fix
2014-06-25 11:49:26 +02:00
Fco. Javier Delgado del Hoyo
a73809e6fc
Fix GCC 4.9 compiler warning
2014-06-25 11:46:05 +02:00
Alexander Alekhin
ea2228774d
Merge pull request #2881 from mlyashko:moments_opt
2014-06-24 16:19:52 +00:00
Alexander Alekhin
ea1b14ee95
Merge pull request #2786 from ElenaGvozdeva:ocl_matchTemplate
2014-06-24 16:12:42 +00:00
vbystricky
09bcc061dd
Change kernel for optimization. Remove restriction to align data
...
Fix kernel compilation errors on AMD system
Fix licanse information in cl file
Support CV_64F destination type
Change build options of the kernel
Optimize sum of square
Remove separate kernel for integral square
Increase epsilon for perfomance tests
Increase epsilon for perfomance tests
Test double support on AMD devices
Fix some issues
Try to fix problems with AMD device
Try to solve problem with AMD device
Fix error of destination size in kernel
Fix warnings
2014-06-24 18:32:52 +04:00
Ilya Lavrenov
87f4b47a4f
optimized INTER_LINEAR mode
2014-06-23 16:25:05 +04:00
Elena Gvozdeva
c23da52564
Fixed core for CCORR and SQDIFF. Used float instead of int for CV_8U. Fixed conditions for call dft.
2014-06-23 11:37:47 +04:00
mlyashko
44ffa42064
replaced factors computation by precomputed values, added kernel for
...
binary mode
2014-06-23 11:04:39 +04:00
Ilya Lavrenov
007593cab7
cvtColor - optimized index calculations; usage of build-in functions
2014-06-23 02:10:42 +04:00
Ilya Lavrenov
863784efc6
added extra condition
2014-06-22 19:18:14 +04:00
Alexander Alekhin
6952b90ed0
Merge pull request #2790 from akarsakov:ocl_pyrUp_unroll
2014-06-20 13:49:14 +00:00
Alexander Karsakov
eeddda4701
Optimization of cv::pyrDown for 8UC1.
2014-06-20 16:46:51 +04:00
Alexander Alekhin
01a98fae93
Merge pull request #2878 from vbystricky:ocl_integral_sqsum_perf_test
2014-06-20 08:49:36 +00:00