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
Alexander Alekhin
6e0d77469a
Merge pull request #2864 from ilya-lavrenov:tapi_boxfilter
2014-06-20 08:47:51 +00:00
Alexander Alekhin
7688a18264
Merge pull request #2840 from ilya-lavrenov:tapi_calchist
2014-06-20 08:46:32 +00:00
vbystricky
655465d9f8
Increase epsilon for pass sanity check
2014-06-19 18:52:25 +04:00
vbystricky
eb54c83985
Fix error
2014-06-19 18:09:23 +04:00
vbystricky
6d6ad1b1d9
Change threshold
2014-06-19 17:45:04 +04:00
vbystricky
b32fbe72f6
Add peromance tests for OCL integral sum of square
2014-06-19 17:07:09 +04:00
Ilya Lavrenov
c41a134394
increased number of rows per work-item
2014-06-17 19:24:25 +04:00
Alexander Alekhin
ce5bae1c67
Merge pull request #2871 from vbystricky:oclopt_integral
2014-06-17 18:23:31 +04:00
Alexander Karsakov
06fb5da7c8
Removed storing of zeros in local memory
2014-06-17 17:24:11 +04:00
Elena Gvozdeva
dcaa8735ba
used vector data types for CCORR cn==1
2014-06-17 17:09:39 +04:00
Elena Gvozdeva
13db948023
added dft for CCORR
2014-06-17 17:09:38 +04:00
Elena Gvozdeva
82da445a15
changed CCOEFF cn==1
2014-06-17 17:09:38 +04:00
Elena Gvozdeva
a7036d9668
changed support for 3-channels, changed CCOEFF
2014-06-17 17:06:51 +04:00
Alexander Alekhin
1db9cc3f0d
Merge pull request #2854 from ilya-lavrenov:tapi_filter2d
2014-06-17 16:59:00 +04:00
Alexander Alekhin
04628d770c
Merge pull request #2849 from ElenaGvozdeva:ocl_matchTemplate_3cn
2014-06-17 14:37:52 +04:00
Ilya Lavrenov
93712e913a
optimization of cv::warpAffine INTER_CUBIC
2014-06-17 00:47:19 +04:00
vbystricky
606df0469a
Fix pointer conversion
2014-06-16 18:14:05 +04:00
vbystricky
9bf296eeb0
Small refactoring
2014-06-16 17:17:16 +04:00
Ilya Lavrenov
c424d36041
optimized cv::boxFilter
2014-06-16 17:00:10 +04:00
Ilya Lavrenov
7391df386f
fixed usage of reshape
2014-06-16 15:19:13 +04:00
vbystricky
6550c4f682
Join kernel code for int and float destination types
2014-06-16 15:08:15 +04:00
Alexander Alekhin
f269a89792
Merge pull request #2865 from ilya-lavrenov:morph
2014-06-16 13:35:57 +04:00
Alexander Alekhin
758a1eb63d
Merge pull request #2855 from ilya-lavrenov:tapi_warpp_fix
2014-06-16 13:22:03 +04:00
vbystricky
504bc7634a
Remove pre_invalid parameter
2014-06-16 13:07:39 +04:00
Ilya Lavrenov
d5244eb645
invoking OCL before IPP
2014-06-16 12:33:13 +04:00
Vadim Pisarevsky
41ceadf9ed
Merge pull request #2799 from 23pointsNorth:patch-1
2014-06-12 21:40:53 +04:00