Vadim Pisarevsky
07c0d50edf
put the detection-based tracker back (to objdetect module), so that the Android face detection sample builds fine. The patch by Konstantin Matskevich that adds C++11 threads support has been merged in too. Also, fixed compile error in the doc builder.
2014-06-24 21:16:09 +04:00
Nisarg Thakkar
98421e5970
Fix for Bug#3757: All dimension values are 0 after release is called
2014-06-23 20:15:23 +05:30
Alexander Alekhin
4f1d06d14a
Merge pull request #2874 from vbystricky:ocl_LUTAMDfix
2014-06-23 14:23:26 +00:00
Ilya Lavrenov
e89cee35e5
optimized cv::inRange
2014-06-23 13:12:08 +04:00
Ilya Lavrenov
0528d2e2b3
added 32s to 32u conversion
2014-06-23 13:09:54 +04:00
Alexander Alekhin
07446ec954
Merge pull request #2847 from ilya-lavrenov:tapi_pow
2014-06-20 08:47:18 +00:00
Marc Rollins
05e0b3b7e6
Fixing build error when using post-increment operator.
2014-06-19 14:14:10 -07:00
Alexander Alekhin
d9daa0cbaa
ocl: added runtime flags for debugging
2014-06-19 17:52:46 +04:00
vbystricky
ea6da6ee95
Change uchar2 to short
2014-06-18 15:44:56 +04:00
vbystricky
9391ccfe35
Move some variables into #ifdef
2014-06-18 15:03:09 +04:00
Hans Johnson
4c7ed03b5f
COMP: Fix problem with narrowing in c++11
...
modules/core/src/arithm.cpp:345:51:
error: constant expression evaluates to 4294967295 which cannot be narrowed to type 'int' [-Wc++11-narrowing]
static int CV_DECL_ALIGNED(16) v64f_absmask[] = { 0xffffffff, 0x7fffffff, 0xffffffff, 0x7fffffff };
^~~~~~~~~~
Converted to unsigned int. This variable is only used to initialize a bit pattern anywhy for a 128bit type.
2014-06-17 15:49:06 -05:00
Ilya Lavrenov
6dd658a0af
optimized cv::setIdentity
2014-06-16 13:41:43 +04:00
Ilya Lavrenov
316c044e06
used abs in reduction operations
2014-06-11 18:54:43 +04:00
Ilya Lavrenov
f1e24381d1
used abs
2014-06-11 18:33:46 +04:00
Ilya Lavrenov
b2c2aabd04
used built-in functions
2014-06-11 18:32:42 +04:00
Alexander Alekhin
88ceee05c6
Merge pull request #2837 from ilya-lavrenov:tapi_norm_relative
2014-06-10 22:21:09 +04:00
Ilya Lavrenov
03f665e870
some optimizaions of cv::pow
2014-06-10 18:37:35 +04:00
Ilya Lavrenov
9edd24fe51
changed power in cv::pow test to test actual kernel
2014-06-10 17:41:43 +04:00
Ilya Lavrenov
634da9f3bf
added norm_inf support to minmaxloc kernel
2014-06-09 20:05:26 +04:00
Roman Donchenko
ed1c56e063
Merge pull request #2817 from bf:patch-1
2014-06-09 15:06:07 +04:00
Ilya Lavrenov
7f2662b310
fixes
2014-06-09 00:50:14 +04:00
Ilya Lavrenov
5403bdd228
optimized cv::norm with NORM_RELATIVE
2014-06-07 21:26:40 +04:00
Ilya Lavrenov
2040995801
optimized cv::norm with 2 args
2014-06-07 20:45:28 +04:00
Ilya Lavrenov
1a7a262f74
optimized cv::norm with NORM_INF
2014-06-06 19:34:26 +04:00
Alexander Alekhin
ea417ac04a
Merge pull request #2755 from vbystricky:oclopt_LUT
2014-06-06 18:52:40 +04:00
Ilya Lavrenov
fd5a8b3e97
minmaxloc
2014-06-06 18:39:08 +04:00
Alexander Alekhin
f30301d171
Merge pull request #2801 from ilya-lavrenov:tapi_reduction
2014-06-06 18:38:22 +04:00
VBystricky
5d924b7a75
If lut table has one channel and src aligned to 4, work with src as with one channel matrix
2014-06-05 19:31:31 +04:00
VBystricky
0c0ebca855
Read 4 pixel for aligned data with 1 channel
2014-06-04 23:50:23 +04:00
VBystricky
8a5f2781fc
Fix kernel by comments
2014-06-04 20:13:42 +04:00
Alexander Alekhin
3f485d58bb
Merge pull request #2808 from ilya-lavrenov:tapi_normalize_mask
2014-06-04 18:10:13 +04:00
Ilya Lavrenov
405f12fe80
optimized cv::flip (CV_8UC1)
2014-06-04 14:21:42 +04:00
Alexander Alekhin
6d3413bc6a
Merge pull request #2810 from ilya-lavrenov:tapi_copytomask
2014-06-04 12:23:36 +04:00
Alexander Alekhin
c2ca059baf
Merge pull request #2798 from ilya-lavrenov:tapi_copymakeborder
2014-06-04 12:22:52 +04:00
Alexander Alekhin
ee8adc10a1
Merge pull request #2821 from ilya-lavrenov:tapi_reduce
2014-06-04 12:18:30 +04:00
Alexander Alekhin
607cd37b48
Merge pull request #2750 from ilya-lavrenov:tapi_convertto
2014-06-03 16:36:48 +04:00
Alexander Alekhin
93af92c878
Merge pull request #2795 from ilya-lavrenov:tapi_setto
2014-06-03 13:21:05 +04:00
Alexander Alekhin
5e8a3cde94
Merge pull request #2757 from ElenaGvozdeva:ocl_flip
2014-06-03 13:19:42 +04:00
Ilya Lavrenov
26b73a7bbd
merged 2 kernels
2014-06-03 13:14:51 +04:00
Roman Donchenko
c836613bad
Merge pull request #2819 from SpecLad:merge-2.4
2014-06-02 17:12:07 +04:00
Ilya Lavrenov
ab428c9dbd
optimized cv::copyMakeBorder
2014-06-02 15:46:44 +04:00
Ilya Lavrenov
67bb1c6a70
optimized UMat::setTo
2014-06-02 15:39:36 +04:00
Ilya Lavrenov
17956a5ae5
optimized cv::normalize in case of mask
2014-06-02 15:33:19 +04:00
Alexander Alekhin
fc2f79701d
Merge pull request #2778 from vbystricky:oclopt_reduce
2014-06-02 13:57:57 +04:00
Roman Donchenko
33087f9eaa
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2014-06-02 13:43:28 +04:00
Benjamin Flesch
62533d0d26
perspectiveTransform simplify assert() for better debuggin
...
When using perspectiveTransform in rather complicated settings, it would be easier for developers to have two separate assertions for each part of the boolean expression in order to pinpoint problems more efficiently. In my case I am struggling in Python2.7 with finding out whether scn+1 == m.cols or the depth == CV_32F || depth == CV_64F is making a problem, which is kind of hard.
2014-06-02 00:27:32 +02:00
Alexander Alekhin
78badcd651
Merge pull request #2781 from ilya-lavrenov:tapi_meanstddev
2014-05-31 22:50:44 +04:00
Alexander Alekhin
89e4118b30
Merge pull request #2809 from ilya-lavrenov:tapi_copy_perf
2014-05-31 22:49:34 +04:00
Alexander Alekhin
17d6083e01
Merge pull request #2787 from ilya-lavrenov:tapi_repeat
2014-05-31 22:46:21 +04:00
Ilya Lavrenov
80470f9cf6
added performance test
2014-05-30 18:34:04 +04:00
Ilya Lavrenov
7f818e9bc3
optimized UMat::copyTo with mask
2014-05-30 18:27:55 +04:00
Ilya Lavrenov
d156f5af6d
added missed tests for cv::norm, cv::normalize
2014-05-29 16:00:38 +04:00
Roman Donchenko
9a5e9d3442
Merge pull request #2771 from SpecLad:pvs-checks-opencv
2014-05-29 14:50:42 +04:00
Ilya Lavrenov
c52a77b90f
optimized cv::UMat::dot
2014-05-29 13:16:16 +04:00
Ilya Lavrenov
579499d900
optimized cv::sum (CV_8UC1)
2014-05-28 19:46:08 +04:00
Ilya Lavrenov
002a79bfc4
optimized cv::countNonZero
2014-05-28 18:42:42 +04:00
Ilya Lavrenov
7804d57f8b
optimized index calculation
2014-05-28 18:01:03 +04:00
Ilya Lavrenov
33173d900a
optimized cv::meanStdDev
2014-05-28 17:55:30 +04:00
Elena Gvozdeva
437927b7bb
optimized index access
2014-05-28 16:27:08 +04:00
vbystricky
b4498d1d48
Fix some errors
2014-05-26 16:55:31 +04:00
vbystricky
63584bffda
fix code in the kernel
2014-05-26 16:54:26 +04:00
vbystricky
04433b2d2b
Change buffer cols count from 64 to 32
2014-05-26 16:54:25 +04:00
vbystricky
169351b01d
Optimize openCL version of reduce function
2014-05-26 16:54:25 +04:00
vbystricky
cfabf32492
Fix some errors
2014-05-26 16:53:01 +04:00
vbystricky
48d82fd911
Fix some errors
2014-05-26 16:53:01 +04:00
vbystricky
a8bfab3cb7
Optimize OpenCL LUT function
2014-05-26 16:53:00 +04:00
vbystricky
6667cea0f4
Optimize OpenCL LUT function
2014-05-26 16:53:00 +04:00
vbystricky
72727111c7
Use 4 pixels for one unit. Some ocl code refactoring
2014-05-26 16:52:59 +04:00
vbystricky
47b092e527
Optimize OpenCL LUT function
2014-05-26 16:52:59 +04:00
Ilya Lavrenov
50fa809a96
fixed cv::mixChannels
2014-05-26 14:20:16 +04:00
Ilya Lavrenov
ec3c68c8ea
fix
2014-05-26 12:19:07 +03:00
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