Ilya Lavrenov
bd5e4c6c49
other kernels now use row scheme
2014-05-26 12:19:06 +03:00
Ilya Lavrenov
15738bf7ef
multiple rows in KF kernel
2014-05-26 12:19:06 +03:00
Ilya Lavrenov
5ee398bfd6
multiple rows per work-item
2014-05-26 12:19:05 +03:00
Roman Donchenko
0a2d22bf31
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2014-05-26 12:32:14 +04:00
Ilya Lavrenov
c83455d8a4
optimized cv::repeat
2014-05-23 13:16:27 +03:00
Alexander Alekhin
c43e32854a
Merge pull request #2713 from alalek:icv_enable_fns
2014-05-23 13:35:45 +04:00
Roman Donchenko
09f9b35bc6
Merge pull request #2742 from StevenPuttemans:feature_3176
2014-05-22 18:03:56 +04:00
StevenPuttemans
fea4396023
Added more info on the data input variable of kmeans
2014-05-22 12:56:44 +02:00
Alexander Alekhin
694d7726b5
Merge pull request #2762 from ilya-lavrenov:ipp_sort
2014-05-22 12:30:53 +04:00
Alexander Alekhin
d940093fb5
Merge pull request #2723 from ilya-lavrenov:tapi_intel_vector_width
2014-05-21 19:56:00 +04:00
Alexander Alekhin
cf5dd88cf2
Merge pull request #2776 from ilya-lavrenov:tapi_meanstddev
2014-05-21 17:43:29 +04:00
Ilya Lavrenov
0e1b37675c
added performance test for cv::meanStdDev with mask
2014-05-21 11:50:31 +04:00
Alexander Alekhin
7032a5a46c
Merge pull request #2763 from ilya-lavrenov:tapi_perf_norm_relative
2014-05-21 11:44:25 +04:00
Roman Donchenko
7ea1bf3cf0
Fixed several problems found by PVS-Studio.
...
This fixes all problems from the article "Checking OpenCV with PVS-Studio"
<http://www.viva64.com/en/b/0191/ > that are not already fixed and are
not in 3rdparty or the legacy module.
The problems fixed are two instances of useless code and one instance
of unspecified behavior (right-shifting a negative number).
2014-05-20 13:54:00 +04:00
Roman Donchenko
3d7a457c97
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
doc/tutorials/introduction/linux_install/linux_install.rst
modules/core/doc/operations_on_arrays.rst
modules/core/include/opencv2/core/core.hpp
modules/core/src/system.cpp
modules/gpu/src/cuda/resize.cu
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/video/src/bgfg_gaussmix2.cpp
2014-05-19 18:39:20 +04:00
Vadim Pisarevsky
c6113c6cb3
Merge pull request #2630 from isarandi:concat_corr
2014-05-19 17:36:20 +04:00
Vadim Pisarevsky
934cb6c452
Merge pull request #2680 from adrians:remove_cv_err
2014-05-19 17:35:03 +04:00
Vadim Pisarevsky
118b27f5b4
Merge pull request #2744 from jet47:kmeans-fix
2014-05-19 17:33:10 +04:00
Roman Donchenko
cba5235f08
Merge pull request #2698 from GregoryMorse:patch-2
2014-05-19 14:52:58 +04:00
Roman Donchenko
06b335b2d7
Merge pull request #2733 from StevenPuttemans:bug_2162
2014-05-19 13:04:54 +04:00
Kazuki Matsuda
fa292c3d8d
Implimentation "cv::Mat::forEach"
...
I propose forEach method for cv::Mat and cv::Mat_.
This is solution for the overhead of MatIterator_<_Tp>.
I runs a test that micro opecode runs all over the pixel of cv::Mat_<cv::Point3_<uint8_t>>.
And this implementation 40% faster than the simple pointer, 80% faster than iterator.
With OpenMP, 70% faster than simple pointer, 95% faster than iterator (Core i7 920).
Above all, code is more readable.
My test code is here.
https://gist.github.com/kazuki-ma/8285876
Thanks.
2014-05-18 11:01:45 +09:00
Ilya Lavrenov
1e46a99d9f
added performance test for cv::norm with NORM_RELATIVE
2014-05-16 14:15:31 +04:00
Ilya Lavrenov
eb1dd1900b
fixed conditions
2014-05-16 12:18:35 +04:00
Elena Gvozdeva
c7dc884855
T-API: optimized ocl_flip
2014-05-16 11:01:10 +04:00
Vladislav Vinogradov
746185652a
add additional tests for different input cases
2014-05-15 12:08:38 +04:00
Vladislav Vinogradov
f16503743f
use more accurate reshape
2014-05-15 12:08:01 +04:00
Alexander Mordvintsev
2756ae2051
exposed OpenCL-control functions to python
2014-05-14 17:42:21 +04:00
Roman Donchenko
f13e05cdcb
Merge pull request #2740 from ilya-lavrenov:tapi_norm_fix
2014-05-14 12:40:19 +04:00
Alexander Alekhin
46d672dcc3
Merge pull request #2663 from ilya-lavrenov:ipp_slow
2014-05-14 12:30:05 +04:00
Vladislav Vinogradov
55a714c83b
fix cv::kmeans function
...
reshape input matrix, since the function works with data
as with [N x dims] matrix
2014-05-13 18:00:17 +04:00
Ilya Lavrenov
d16e0b377f
disabled IPP functions that slower than OpenCV
2014-05-13 15:06:38 +04:00
Roman Donchenko
4a24ecd176
Merge pull request #2731 from StevenPuttemans:bug_2626
2014-05-13 14:21:36 +04:00
Ilya Lavrenov
f64dfeb222
fix for cv::norm (norm_inf)
2014-05-13 14:21:07 +04:00
StevenPuttemans
006956c324
Fixing as suggested in bug 2626, made naming same for both C, C++ and python API
2014-05-13 11:02:01 +02:00
Roman Donchenko
ff2d76ec0d
Merge pull request #2699 from GregoryMorse:patch-1
2014-05-13 11:58:25 +04:00
StevenPuttemans
a0a8fb4fd9
fixed bug 2626
2014-05-12 16:43:07 +02:00
Roman Donchenko
313a0ad255
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/internal.hpp
modules/core/src/arithm.cpp
modules/imgproc/src/imgwarp.cpp
modules/objdetect/src/hog.cpp
2014-05-12 17:38:07 +04:00
Ilya Lavrenov
1e5694e082
heuristic for Intel
2014-05-12 16:08:39 +04:00
Alexander Alekhin
1f638a3e5b
icv: enable functions
2014-05-12 15:38:38 +04:00
Alexander Alekhin
c74fed1fcf
Merge pull request #2706 from ilya-lavrenov:ipp_2.4_warnings
2014-05-08 17:04:18 +04:00
Ilya Lavrenov
19a2495067
fixed IPP related warnings
2014-05-08 13:31:27 +04:00
Vladislav Vinogradov
77275031ab
finally fix cv::subtract
2014-05-08 13:11:42 +04:00
Vladislav Vinogradov
629461c836
fix output matrix allocation in cv::subtract
2014-05-07 19:52:35 +04:00
Alexander Alekhin
07d5f56707
Merge pull request #2679 from alalek:ippicv_update
2014-05-07 18:24:41 +04:00
Alexander Alekhin
849228ac6a
Merge pull request #2684 from ElenaGvozdeva:ippiDFT
2014-05-07 17:57:17 +04:00
Alexander Alekhin
d54aa307fd
Merge pull request #2676 from ilya-lavrenov:ipp_gaussianblur
2014-05-07 16:49:59 +04:00
Alexander Alekhin
0e1bf58195
Merge pull request #2634 from ElenaGvozdeva:ippiDCT
2014-05-07 14:49:13 +04:00
Vladislav Vinogradov
4c66614e07
fix cv::subtract function:
...
call dst.create(...) before using it
2014-05-07 13:15:19 +04:00
GregoryMorse
38db7a78df
WinRT core compatibility fixes
...
Update system.cpp
Update system.cpp
Update system.cpp
Update matching.cpp
Update matching.cpp
2014-05-07 06:17:37 +08:00
GregoryMorse
b1443bc1bc
WinRT core compatibility fixes
...
Update system.cpp
Update system.cpp
Update ocl.cpp
Update matching.cpp
Update ocl.cpp
Update matching.cpp
2014-05-07 06:15:54 +08:00
Elena Gvozdeva
12279e2631
fixed
2014-05-06 14:49:03 +04:00
Alexander Alekhin
01f31dc007
Merge pull request #2687 from ilya-lavrenov:tapi_norm_inf_234cn
2014-05-06 13:27:03 +04:00
Elena Gvozdeva
e362c3fb38
fixed
2014-05-06 13:09:45 +04:00
Alexander Alekhin
03b1d133df
Merge pull request #2660 from arkunze:pullreq/140423-filter2D
2014-05-06 12:59:03 +04:00
Ilya Lavrenov
c80faff42f
added cn>1 support to cv::norm (NORM_INF)
2014-04-30 14:59:37 +04:00
Alexander Alekhin
b62e59aac0
icv: enable functions
2014-04-29 15:36:43 +04:00
Alexander Alekhin
5658ba0002
icv: update package
2014-04-29 15:35:27 +04:00
Elena Gvozdeva
043b917c7d
IPP: cv::dft fixed
2014-04-29 12:23:23 +04:00
Adrian Stratulat
cbf3c1fbf1
remove unused macros
2014-04-28 19:40:11 +00:00
Elena Gvozdeva
507ea95265
fixed
2014-04-28 16:46:11 +04:00
Elena Gvozdeva
16629bff4c
Added parallel version for DCT_ROWS
2014-04-28 16:05:19 +04:00
Elena Gvozdeva
6880dbfd95
IPP: cv::dct
2014-04-28 16:05:19 +04:00
Alexander Alekhin
649935596e
Merge pull request #2653 from alalek:ipp_lut
2014-04-28 15:15:11 +04:00
Alexander Alekhin
0e5b0677c9
Merge pull request #2654 from ElenaGvozdeva:ipp_DFT
2014-04-28 15:14:40 +04:00
Ilya Lavrenov
55bbca2d09
added more types to cv::GaussianBlur
2014-04-28 13:50:28 +04:00
Istvan Sarandi
4bf1df7da3
Suppress warning in constructor.
2014-04-26 00:42:26 +02:00
Alexander Alekhin
7ee1d5f69b
ipp: added LUT optimization
2014-04-25 12:09:06 +04:00
Elena Gvozdeva
10d1b3a534
Added parallel version for DFT_ROWS
2014-04-25 11:39:19 +04:00
Alexander Alekhin
32b25de583
Merge pull request #2656 from ilya-lavrenov:ipp_copymakeborder
2014-04-24 20:30:34 +04:00
Ilya Lavrenov
46e8d9d02d
cv::copyMakeBorder
2014-04-24 14:27:51 +04:00
Istvan Sarandi
c20cab9ec1
Added test for concatenation with empty matrices.
2014-04-24 03:09:07 +02:00
Aaron Kunze
1f8b41f390
Optimizes filter2D for Intel GPUs
2014-04-23 10:20:09 -07:00
Alexander Alekhin
dcc4d3640b
Merge pull request #2651 from ilya-lavrenov:ipp_minmaxidx_3cn
2014-04-23 20:06:55 +04:00
Elena Gvozdeva
2d71c094b3
IPP: CV::dft
2014-04-23 15:52:05 +04:00
Andrey Pavlenko
d93161812b
Merge pull request #2620 from ilya-lavrenov:ipp_integration
2014-04-23 15:12:45 +04:00
Alexander Alekhin
ba0ab8edb0
Merge pull request #2647 from vbystricky:ipp_norm
2014-04-23 11:50:13 +04:00
Ilya Lavrenov
493679dc56
cv::minMaxIdx for cn > 1
2014-04-22 23:47:04 +04:00
vbystricky
dfe6adebb9
Fix error in arguments of ipp function
2014-04-22 15:07:03 +04:00
Ilya Lavrenov
51e2a8ec96
fixes
2014-04-22 14:51:39 +04:00
vbystricky
e68a55cca2
Fix error in ipp function call
2014-04-22 14:35:27 +04:00
vbystricky
9cdb330452
Change test conditions
2014-04-22 13:27:20 +04:00
vbystricky
f5c729396d
Fix call of ippiConvert.
2014-04-22 10:50:35 +04:00
Ilya Lavrenov
fe644ede19
cv::multiply
2014-04-21 13:14:55 +04:00
Ilya Lavrenov
9cc80a68db
fixed warnings
2014-04-21 13:14:55 +04:00
Ilya Lavrenov
8603c58f37
Mat::setTo(with mask)
2014-04-21 13:14:55 +04:00
Ilya Lavrenov
0b678c2451
Mat::setTo(Scalar::all(0))
2014-04-21 13:14:55 +04:00
Ilya Lavrenov
3bd8211a72
Mat::copyTo
2014-04-21 13:14:55 +04:00
Ilya Lavrenov
f7ec4a5c47
Mat::copyTo with mask
2014-04-21 13:14:55 +04:00
Ilya Lavrenov
8d24a83c9c
cv::flip inplace
2014-04-21 13:14:55 +04:00
Ilya Lavrenov
5ca3d855a2
cv::transpose inplace
2014-04-21 13:14:55 +04:00
Ilya Lavrenov
d453a598f8
cv::min/cv::max CV_64F
2014-04-21 13:14:55 +04:00
Andrey Pavlenko
82c67abbfa
Merge pull request #2622 from ilya-lavrenov:ipp_sort
2014-04-18 14:47:06 +04:00
Ilya Lavrenov
9a109440df
cv::reduce sum/avg
2014-04-18 14:44:12 +04:00
Ilya Lavrenov
aa5767421a
cv::reduce (min/max to single column)
2014-04-18 14:39:33 +04:00
Ilya Lavrenov
1f6b719776
added ippisFlip to cv::sort
2014-04-18 14:37:46 +04:00
Ilya Lavrenov
26e8c6216f
cv:;sortIdx
2014-04-18 14:31:27 +04:00
Ilya Lavrenov
d5513f522b
cv::sort
2014-04-18 14:31:27 +04:00
Ilya Lavrenov
05a47d9014
cmd option
2014-04-17 18:06:14 +04:00
Ilya Lavrenov
6f9ca3d77c
fixed some errors
2014-04-17 11:08:02 +04:00
Ilya Lavrenov
ce0941160e
added status check
2014-04-17 11:08:02 +04:00
Ilya Lavrenov
2cd7a913ed
verbose errors
2014-04-17 11:07:01 +04:00
Ilya Lavrenov
f3c56f8310
first attemp
2014-04-17 11:07:01 +04:00
Istvan Sarandi
e18224110c
Removed emptiness check from cv::hconcat and cv::vconcat. Sometimes you want to concatenate with an empty matrix.
2014-04-17 02:41:52 +02:00
KayKwon
e13e3be16e
Merge branch 'master' into matlab_formatter
2014-04-16 11:13:02 +09:00
KayKwon
84257b57d0
Fix for (Bug #2789 )
...
Add MatlabFormatter for matlab style output.
See http://code.opencv.org/issues/2789
2014-04-16 10:56:27 +09:00
Andrey Pavlenko
80ef1f6753
Merge pull request #2621 from arkunze:pullreq/140319-resize-b
2014-04-15 19:56:56 +04:00
Andrey Pavlenko
dab8e920b0
Merge pull request #2565 from apavlenko:tapi_stitching
2014-04-15 19:56:11 +04:00
Roman Donchenko
534f9623f2
Merge pull request #2616 from SpecLad:merge-2.4
2014-04-15 12:06:13 +04:00
Aaron Kunze
ebbac3c66d
Optimizes OpenCL resize and optical flow to use image extension.
2014-04-14 16:09:17 -07:00
Andrey Pavlenko
5ff59af09d
Merge pull request #2610 from ilya-lavrenov:ipp_cvtcolor
2014-04-14 18:52:07 +04:00
Roman Donchenko
799d2dabd6
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/test/test_arithm.cpp
modules/cuda/src/cascadeclassifier.cpp
modules/imgproc/doc/geometric_transformations.rst
modules/objdetect/src/hog.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/src/gftt.cpp
modules/ocl/src/moments.cpp
2014-04-14 16:08:02 +04:00
Ilya Lavrenov
884b706b3a
fixed warning
2014-04-14 14:40:40 +04:00
Ilya Lavrenov
ad7f2311c0
cv::Laplacian
2014-04-14 14:34:28 +04:00
Ilya Lavrenov
2a051a124f
cvtColor
2014-04-14 14:29:36 +04:00
Roman Donchenko
4c2db3d6e7
Merge pull request #2579 from maksqwe:test_operations_fix
2014-04-11 14:14:33 +04:00
Ilya Lavrenov
19d470749b
added macro for denoting region for suppression of "Wdeprecated-declarations"
2014-04-11 13:45:20 +04:00
Andrey Pavlenko
925178749a
removing SuppressWarning
and CV_OPENCL_RUN
2014-04-11 13:09:19 +04:00
Alexander Alekhin
3578f0afe9
ocl: workaround for synchronization issue in ::map()
2014-04-11 13:09:18 +04:00
Alexander Alekhin
e6cc1be7e8
stitching: allow to use dynamic DescriptorMatcher
2014-04-11 13:01:13 +04:00
Alexander Alekhin
06738468af
TAPI: stiching: add custom OpenCL kernels for MultiBandBlender
2014-04-11 13:01:12 +04:00
Alexander Alekhin
1d9808e5d5
TAPI: stitching, replaced Mat->UMat/_Array
2014-04-11 13:01:06 +04:00
Andrey Pavlenko
7ae547a208
Merge pull request #2597 from ilya-lavrenov:ipp_countnonzero
2014-04-11 12:43:24 +04:00
Vadim Pisarevsky
b5755b1228
Merge pull request #2588 from vpisarev:fix_samples_n_unused
2014-04-10 13:30:20 +04:00
Ilya Lavrenov
b2379b51b5
cv::countNonZero
2014-04-10 13:21:52 +04:00
Maks Naumov
29d1bce85f
remove unused variable in TEST_P()
2014-04-09 23:06:06 +03:00
Andrey Pavlenko
7b366df822
Merge pull request #2589 from alalek:icv_update
2014-04-09 18:23:35 +04:00
Andrey Pavlenko
cd02a7002b
Merge pull request #2596 from ilya-lavrenov:tapi_setto
2014-04-09 18:23:15 +04:00
Alexander Alekhin
ab691a4a24
ipp: some functions are not available in the ICV package #2
2014-04-09 18:20:49 +04:00
Alexander Alekhin
1461ab41bc
ipp: added support for updated ICV package
2014-04-09 18:20:49 +04:00
Andrey Pavlenko
ced81b9121
Merge pull request #2594 from arkunze:pullreq/140319-dll-shutdown-fix-b
2014-04-09 14:25:12 +04:00
Andrey Pavlenko
e6d6a3a85b
Merge pull request #2586 from ilya-lavrenov:ipp_disable
2014-04-09 14:16:25 +04:00
Ilya Lavrenov
bcd7151867
added UMat::setTo accuracy test
2014-04-09 14:15:22 +04:00
Aaron Kunze
629ddf0bf8
Resolves bug #3450 (Improperly cleaning up resources in DllMain)
2014-04-08 16:21:33 -07:00
Ilya Lavrenov
444ab0ef0d
fixed (IppiSize&)sz
2014-04-09 00:19:56 +04:00
Ilya Lavrenov
c735594178
cv::scaleAdd
2014-04-09 00:12:48 +04:00
Ilya Lavrenov
fd3a6f0db7
cv::blur
2014-04-09 00:11:28 +04:00
Ilya Lavrenov
a624ec167d
cv::Mat::convertTo
2014-04-09 00:11:28 +04:00
Ilya Lavrenov
b72b256fda
cv::pow (added ippiSqr_32f_C1R for power=2)
2014-04-09 00:11:28 +04:00
Ilya Lavrenov
77723db034
cv::flip
2014-04-09 00:11:28 +04:00
Ilya Lavrenov
ed1ca00bf6
cv::magnitude
2014-04-09 00:11:27 +04:00
Ilya Lavrenov
bf860dbb31
cv::pow
2014-04-09 00:11:27 +04:00
Ilya Lavrenov
49d1691a3e
cv::sqrt
2014-04-09 00:11:27 +04:00
Ilya Lavrenov
5ddff235bb
cv::polarToCart
2014-04-09 00:11:27 +04:00
Ilya Lavrenov
46cb4e0cbc
cv::transpose
2014-04-09 00:11:26 +04:00
Ilya Lavrenov
e090aa07db
disabled some IPP funcs
2014-04-08 22:30:18 +04:00
Vadim Pisarevsky
1b339eb0d4
fixed slow down in getRectSubPix (original patch by Markus JR Mueller); removed some unused variables and functions
2014-04-08 17:54:08 +04:00
Ilya Lavrenov
aa5326c231
cv::norm -> cvtest::norm in tests
...
Conflicts:
modules/core/src/stat.cpp
2014-04-08 14:49:20 +04:00
Andrey Pavlenko
a6ef45aa13
Merge pull request #2582 from vbystricky:ipp_fix
2014-04-08 14:30:48 +04:00
vbystricky
9828cd6086
Remove defined(HAVE_IPP)
2014-04-08 13:05:23 +04:00
vbystricky
f23134ce01
Add IPP_VERSION_X100 define
2014-04-08 12:43:57 +04:00
Andrey Pavlenko
9ec823d800
Merge pull request #2538 from ElenaGvozdeva:ipp_async_convert
2014-04-08 11:05:30 +04:00
Elena Gvozdeva
f9c5289483
fixed
2014-04-07 18:53:07 +04:00
Roman Donchenko
6f055d7a76
Merge pull request #2580 from SpecLad:merge-2.4
2014-04-07 18:29:51 +04:00
vbystricky
7badc85b60
Fix for pullrequest comment
2014-04-07 17:06:02 +04:00
vbystricky
2d54581971
Fix ifdef for IPP version greater 8.1
2014-04-07 16:45:35 +04:00
Roman Donchenko
4f2b126b7b
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/version.hpp
modules/core/src/out.cpp
modules/cudaimgproc/test/test_hough.cpp
modules/gpu/doc/introduction.rst
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/src/generalized_hough.cpp
modules/nonfree/perf/perf_main.cpp
2014-04-07 14:59:34 +04:00
vbystricky
dbdc476b79
Check results of ipp function
2014-04-07 14:31:34 +04:00
vbystricky
38913bf5f6
Change all 'ippStsNoErr==' to '0<=', and all 'ippStsNoErr!=' to '0>'
2014-04-07 14:31:34 +04:00
vbystricky
67484e027b
Fix function names (log, exp)
2014-04-07 14:31:33 +04:00
vbystricky
1b3651d8ee
Undo changes ipp to ippicv prefix of function names
2014-04-07 14:30:03 +04:00
vbystricky
eb8c531791
Add preprocessor check for IPP version greater 8.1 on some code
2014-04-07 14:26:51 +04:00
vbystricky
188c506237
Uncomment ippiNormDiff_Inf_16s_C3R, ippiNormDiff_Inf_16s_C4R
2014-04-07 14:26:51 +04:00
vbystricky
ec6f977783
Uncomment ippicviNorm_Inf_16s_C3R, ippicviNorm_Inf_16s_C4R functions
2014-04-07 14:26:50 +04:00
vbystricky
ad23ef2a42
Remove unused #include "ippverdion.h"
2014-04-07 14:26:49 +04:00
vbystricky
9d138b2bbe
Enable ipp MeanStdDev calculation for 32F_C1 images. Decrease accuracy sanity check of the perfomance test
2014-04-07 14:26:49 +04:00
vbystricky
9b6feee1a5
Change sanity check for perfomance test of dft
2014-04-07 14:26:47 +04:00
vbystricky
01a66a2938
Prepare codes for ippicv library
2014-04-07 14:24:05 +04:00
Andrey Pavlenko
c2f859569c
Merge pull request #2563 from alalek:ipp_builds
2014-04-07 13:03:11 +04:00
Maks Naumov
8271bd5f14
fix condition in CV_OperationsTest::operations1()
2014-04-07 11:24:27 +03:00
Andrey Pavlenko
5a3200d513
Merge pull request #2567 from apavlenko:fix_compare_scalar
2014-04-03 22:08:18 +04:00
Andrey Pavlenko
9a3895d842
Merge pull request #2556 from DeanF:master
2014-04-03 17:07:06 +04:00
Andrey Pavlenko
271f60ba7a
fixing OCL run condition (build program failure for comparison 64F Mat with Scalar)
2014-04-03 16:21:04 +04:00
Alexander Alekhin
bfc546d23c
enable IPP ICV support
2014-04-03 15:05:38 +04:00
Elena Gvozdeva
037ac27ec8
Added SharedMatrix
2014-04-03 14:53:27 +04:00
Roman Donchenko
c165f07319
Merge pull request #2550 from SpecLad:merge-2.4
2014-04-02 12:00:01 +04:00
DeanF
48df67a9c5
Fixed trailing whitespace
2014-04-01 22:04:58 +03:00
DeanF
bdc91c66c9
Fixed problem with compilation without HAVE_OPENCL
...
When compiling without OpenCL, some classes from its namespace are still used in code.
2014-04-01 21:20:13 +03:00
Elena Gvozdeva
fa2d79a15b
Added IPP Async converters, doc and sample
2014-04-01 16:47:29 +04:00
Alexander Smorkalov
e23f7303a6
OpenCV version++. OpenCV Manager version++.
2014-03-31 15:00:25 -07:00
Ilya Lavrenov
322b15a459
compare with scalar (cn > 1)
2014-03-31 17:50:16 +04:00
Roman Donchenko
f77c68e0fa
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/imgproc/src/opencl/integral_sqrsum.cl
modules/nonfree/doc/feature_detection.rst
modules/nonfree/include/opencv2/nonfree/ocl.hpp
modules/nonfree/src/surf_ocl.cpp
modules/nonfree/test/test_features2d.cpp
modules/ocl/doc/image_processing.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/match_template.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/src/opencl/haarobjectdetect_scaled2.cl
modules/ocl/test/test_imgproc.cpp
2014-03-31 14:42:00 +04:00
Roman Donchenko
d6b54ff9d1
Merge pull request #2476 from minkless:3.0-bugfix-core-filestorage
2014-03-28 12:17:16 +04:00
Koji Miyazato
1ab8060b62
corrected some style errors found by review.
2014-03-28 10:45:33 +09:00
JinoBetti
91511c1521
Update out.cpp
...
Fixed a bug with the cv::format(cv::Mat, ...) method for matrices with only one row
see http://answers.opencv.org/question/21201/cvformat-does-not-format-the-way-it-should/?answer=23945#post-id-23945 for details
2014-03-27 16:28:40 +01:00
Alexander Alekhin
3488fdcb43
disable failed tests
2014-03-26 19:29:59 +04:00
Alexander Alekhin
569e1346f2
UMat: issue in OpenCLAllocator::unmap()
2014-03-26 19:29:41 +04:00
Andrey Pavlenko
04c857a4e8
Merge pull request #2505 from alalek:umat_unmap_synchronization_test
2014-03-26 19:08:15 +04:00
Ilya Lavrenov
f7d6d3cff5
improved cv::filter2D
2014-03-26 14:19:59 +04:00
Roman Donchenko
a7f9677378
Merge pull request #2404 from yashdv:old_basic_structures_doc_fix
2014-03-26 12:18:39 +04:00
Alexander Alekhin
6bd7a444bc
UMat map-unmap synchronization test
2014-03-25 16:19:52 +04:00
Roman Donchenko
85cf2d9671
Merge pull request #2524 from SpecLad:merge-2.4
2014-03-25 12:13:04 +04:00
Roman Donchenko
cc05493730
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectAndroidSDK.cmake
cmake/OpenCVGenAndroidMK.cmake
cmake/OpenCVModule.cmake
cmake/templates/OpenCV.mk.in
cmake/templates/OpenCVConfig.cmake.in
doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.rst
modules/cudabgsegm/src/cuda/mog.cu
modules/imgproc/perf/opencl/perf_filters.cpp
modules/imgproc/src/opencl/filterSep_singlePass.cl
modules/nonfree/CMakeLists.txt
modules/nonfree/perf/perf_precomp.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/opencl/bgfg_mog.cl
modules/superres/CMakeLists.txt
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/cuda/btv_l1_gpu.cu
modules/superres/src/frame_source.cpp
modules/superres/src/input_array_utility.cpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
samples/gpu/CMakeLists.txt
samples/gpu/brox_optical_flow.cpp
samples/gpu/super_resolution.cpp
2014-03-24 19:02:16 +04:00
Andrey Pavlenko
9c5745383f
Merge pull request #2512 from KonstantinMatskevich:ocl_gpu_type_parser
2014-03-24 18:46:01 +04:00
Konstantin Matskevich
c2355d3a12
case-insensitivity
2014-03-24 15:20:00 +04:00
Andrey Pavlenko
d8c018289a
Merge pull request #2491 from ilya-lavrenov:tapi_sep_filter
2014-03-24 10:37:15 +04:00
Koji Miyazato
0a5d6e10b9
Added test code for I/O of user-defined types.
2014-03-22 00:32:44 +09:00
Konstantin Matskevich
79fc3a6203
added gpu type selection in OPENCV_OPENCL_DEVICE parser
2014-03-21 17:01:37 +04:00
Andrey Pavlenko
7193762d2d
Merge pull request #2495 from ilya-lavrenov:tapi_flip
2014-03-21 16:08:46 +04:00
Ilya Lavrenov
2875ce60ea
added 3-channels support to optimized version
2014-03-21 16:02:47 +04:00
Andrey Pavlenko
2299e2ed1b
Merge pull request #2494 from ilya-lavrenov:tapi_merge
2014-03-20 13:39:39 +04:00
Andrey Pavlenko
87ae0f9990
Merge pull request #2492 from KonstantinMatskevich:ocl_fix_wrongdevice
2014-03-20 13:39:17 +04:00
Ilya Lavrenov
eb8b4c58c7
fixed bug in cv::ocl::predictOptimalVectorWidth
2014-03-20 00:28:21 +04:00
Ilya Lavrenov
291458a859
generalized OpenCL version of cv::sepFilter2D; removed some restrictions and added 3-channels support
2014-03-19 18:56:16 +04:00
Ilya Lavrenov
b73490f86c
eliminated restriction src[i].channels() == 1 in cv::merge
2014-03-19 13:56:31 +04:00
Konstantin Matskevich
f9f730c426
update error message
2014-03-19 12:14:48 +04:00
Ilya Lavrenov
04884ebf45
added 3-channels support to cv::setIdentity
2014-03-19 01:53:53 +04:00
Ilya Lavrenov
8d97d0d631
added 3-channels support to cv::flip
2014-03-18 19:31:37 +04:00
Koji Miyazato
a43ef9a6cd
WriteStructContext treats state of fs
2014-03-18 23:29:30 +09:00
Konstantin Matskevich
eebf92ba58
fix for incorrect opencl device selection
2014-03-18 15:47:35 +04:00
Roman Donchenko
d76226e21b
Merge pull request #2456 from kurodash:pr_use_cvAlloc
2014-03-18 14:39:40 +04:00
Roman Donchenko
ae2b0b0098
Merge pull request #2486 from SpecLad:merge-2.4
2014-03-18 13:55:57 +04:00
Ilya Lavrenov
82e6edfba2
optimized sep filter
2014-03-18 00:16:38 +04:00
yash
51cb6998ea
made the example consistent with the fuction definition and improved doc
...
made the example consistent with the fuction definition and improved doc
2014-03-17 18:44:02 +05:30
Roman Donchenko
40a740ff88
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/imgproc/src/opencl/precornerdetect.cl
modules/nonfree/perf/perf_main.cpp
modules/nonfree/perf/perf_surf.ocl.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/gftt.cpp
modules/ocl/src/opencl/arithm_bitwise.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
modules/ocl/src/opencl/arithm_minMax.cl
modules/ocl/src/opencl/arithm_nonzero.cl
modules/ocl/src/opencl/arithm_sum.cl
modules/ocl/test/test_arithm.cpp
modules/viz/src/precomp.hpp
modules/viz/src/vizcore.cpp
modules/viz/src/vtk/vtkCloudMatSink.h
modules/viz/src/vtk/vtkXYZReader.cpp
modules/viz/src/vtk/vtkXYZReader.h
modules/viz/test/test_precomp.hpp
2014-03-17 14:14:07 +04:00
Andrey Pavlenko
dc28451b8a
Merge pull request #2479 from alalek:ocl_compare_scalar
2014-03-17 14:04:22 +04:00
Andrey Pavlenko
2a1d5c6d43
Merge pull request #2428 from alalek:ocl_copyMakeBorder_3channels
2014-03-17 13:10:34 +04:00
Alexander Alekhin
af062b7c42
ocl: compare: remove useless perf tests
2014-03-17 12:33:12 +04:00
Roman Donchenko
136e5eb804
Merge pull request #2484 from berak:mat_doc_24
2014-03-17 11:57:10 +04:00
berak
80708008a4
missing () on Mat::type()
2014-03-16 14:04:05 +01:00
Alexander Alekhin
7ce2ca2e0c
ocl: workaround for Pow accuracy test failure
2014-03-14 19:51:19 +04:00
Alexander Alekhin
9cafd50160
ocl: fixes
2014-03-14 19:51:19 +04:00
Alexander Alekhin
755ca4b7cf
ocl: compare with scalar
2014-03-14 19:51:19 +04:00
Ilya Lavrenov
6be7869ae8
fix for unsupported doubles
2014-03-14 16:54:52 +04:00
kuroda sho
f9484bae8a
fix: use "cvAlloc" wrapper function for malloc.
2014-03-14 17:09:08 +09:00
Andrey Pavlenko
0ce8f1d5dd
Merge pull request #2477 from alalek:ocl_cleanup_workarounds
2014-03-13 18:55:28 +04:00
Andrey Pavlenko
c5bf1c108c
Merge pull request #2470 from ilya-lavrenov:tapi_reduction
2014-03-13 18:42:01 +04:00
Andrey Pavlenko
a6c40abfb2
Merge pull request #2466 from ilya-lavrenov:tapi_transpose_3cn
2014-03-13 16:56:01 +04:00
Andrey Pavlenko
0764a23eb2
Merge pull request #2459 from ilya-lavrenov:tapi_experiments
2014-03-13 16:49:57 +04:00
Alexander Alekhin
48196ad10b
ocl: cleanup workarounds
2014-03-13 15:46:38 +04:00
Koji Miyazato
b96762a48f
Fix for bug #3599 : cv::FileStorage does not work for std::vector of user-defined struct.
2014-03-13 19:41:13 +09:00
Ilya Lavrenov
9932cf41a4
3-channel reduction operations
2014-03-12 15:07:39 +04:00
Ilya Lavrenov
f138b613b7
cv::compare
2014-03-12 13:16:33 +04:00
Ilya Lavrenov
89b7c0dd93
3 channel support to cv::transpose
2014-03-12 00:17:11 +04:00
Ilya Lavrenov
2755ae5df9
experiments
2014-03-11 23:03:55 +04:00
Roman Donchenko
95a55453df
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/perf/perf_pnp.cpp
modules/contrib/src/imagelogpolprojection.cpp
modules/contrib/src/templatebuffer.hpp
modules/core/perf/opencl/perf_gemm.cpp
modules/cudafeatures2d/doc/feature_detection_and_description.rst
modules/cudafeatures2d/perf/perf_features2d.cpp
modules/cudafeatures2d/src/fast.cpp
modules/cudafeatures2d/test/test_features2d.cpp
modules/features2d/doc/feature_detection_and_description.rst
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/perf4au/main.cpp
modules/imgproc/perf/opencl/perf_blend.cpp
modules/imgproc/perf/opencl/perf_color.cpp
modules/imgproc/perf/opencl/perf_moments.cpp
modules/imgproc/perf/opencl/perf_pyramid.cpp
modules/objdetect/perf/opencl/perf_hogdetect.cpp
modules/ocl/perf/perf_arithm.cpp
modules/ocl/perf/perf_bgfg.cpp
modules/ocl/perf/perf_blend.cpp
modules/ocl/perf/perf_brute_force_matcher.cpp
modules/ocl/perf/perf_canny.cpp
modules/ocl/perf/perf_filters.cpp
modules/ocl/perf/perf_gftt.cpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_imgwarp.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/perf_matrix_operation.cpp
modules/ocl/perf/perf_ml.cpp
modules/ocl/perf/perf_moments.cpp
modules/ocl/perf/perf_opticalflow.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/cl_context.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/video/src/lkpyramid.cpp
modules/video/src/precomp.hpp
samples/gpu/morphology.cpp
2014-03-11 17:20:01 +04:00
Andrey Pavlenko
702a2a6ff6
Merge pull request #2373 from mlyashko:optflow_dualtvl1
2014-03-11 16:00:22 +04:00
Andrey Pavlenko
90c5dde887
Merge pull request #2455 from ilya-lavrenov:tapi_fix
2014-03-11 15:58:32 +04:00
Alexander Alekhin
e4608229f0
ocl: copyMakeBorder 3-channel
2014-03-10 17:22:49 +04:00
kurodash
0eaeff0641
fix: use "cvAlloc" wrapper function for malloc.
2014-03-07 19:02:37 +09:00
Andrey Pavlenko
5dbe73f94d
Merge pull request #2438 from ilya-lavrenov:tapi_flip
2014-03-07 13:54:34 +04:00
Andrey Pavlenko
182d74d33f
Merge pull request #2441 from akarsakov:ocl_platform_vendor
2014-03-07 13:54:13 +04:00
Alexander Karsakov
8660588fe9
Pass vendor macro to opencl kernel
2014-03-07 12:57:29 +04:00
mlyashko
eb2e8a11fa
changed kernel.set to support unsuccssful set
2014-03-07 11:15:54 +04:00
Ilya Lavrenov
0e2cc5ef63
fix bitwise ops and mask support
2014-03-06 23:39:05 +04:00
Andrey Pavlenko
d1d451c952
Merge pull request #2431 from ilya-lavrenov:tapi_perf
2014-03-06 22:17:44 +04:00
Andrey Pavlenko
2f0fe5b87b
Merge pull request #2450 from ilya-lavrenov:tapi_test
2014-03-06 21:55:50 +04:00
Ilya Lavrenov
f404315368
test for clEnqueueReadBufferRect
2014-03-06 12:11:46 +04:00
mlyashko
66ed6a8a50
macro for normal return from thriveless kernel.set
2014-03-06 11:43:01 +04:00
Alexander Karsakov
c1dad2178c
Added Device:: isAMD,isIntel,isNvidia methods.
2014-03-05 14:43:11 +04:00
Andrey Pavlenko
0a3aca230c
Merge pull request #2436 from ilya-lavrenov:tapi_dft_fix
2014-03-04 19:21:15 +04:00