krodyush
|
616ec74beb
|
fix previous merge error
|
2014-04-07 17:32:39 +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 |
|
Andrey Pavlenko
|
f690440533
|
Merge pull request #2568 from vbystricky:ippicv
|
2014-04-07 15:52:32 +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
|
268c0caa7a
|
Fix problems in CMakeLists.txt
|
2014-04-07 14:53:30 +04:00 |
|
vbystricky
|
e8f79d6e1f
|
Fix rebase errors
|
2014-04-07 14:44:01 +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
|
566f783968
|
Fix errors
|
2014-04-07 14:31:33 +04:00 |
|
vbystricky
|
23e1b50837
|
Check 8.1 ipp version for color convertion functions, which not exists in versions before this.
|
2014-04-07 14:31:33 +04:00 |
|
vbystricky
|
06acb8b0ee
|
Check 8.1 ipp version for gaussian functions, which not exists in versions before this.
|
2014-04-07 14:31:32 +04:00 |
|
vbystricky
|
be29d628d3
|
Check 8.1 ipp version for morphology functions, which not exists in versions before this.
|
2014-04-07 14:31:32 +04:00 |
|
vbystricky
|
4512d06484
|
Fix const src matrix in IPPresizeInvoker
|
2014-04-07 14:31:31 +04:00 |
|
vbystricky
|
824ed8a3ae
|
Fix errors
|
2014-04-07 14:31:31 +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
|
a9a0ea3706
|
Fix error not initialized IppStatus before ipp functions call
|
2014-04-07 14:26:50 +04:00 |
|
vbystricky
|
c321330777
|
Comment ipp version of CV_BGR2GRAY color convertion, by problems in BRIEF accuracy test and Path_Idx_Cn_NPoints_WSize perfomance test
|
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
|
c29583eacc
|
Change Canny input image description, we can use multichannel image now
|
2014-04-07 14:26:48 +04:00 |
|
vbystricky
|
ee2df645f4
|
Canny uncommented, prefix of ipp function changed. Ipp version of Canny called only for images with one channels
|
2014-04-07 14:26:48 +04:00 |
|
vbystricky
|
9b6feee1a5
|
Change sanity check for perfomance test of dft
|
2014-04-07 14:26:47 +04:00 |
|
vbystricky
|
a6b53489e6
|
Change sanity check for perfomance test of bilateral filter
|
2014-04-07 14:26:47 +04:00 |
|
vbystricky
|
aece433b15
|
Check ippStsNoErr as result of ipp function instead >=0
|
2014-04-07 14:26:47 +04:00 |
|
vbystricky
|
c65e5a1e7b
|
Fix error BGRA2RGBA color convertion by ipp. Uncomment ipp color converstion, which pass tests
|
2014-04-07 14:26:46 +04:00 |
|
vbystricky
|
b3db990daa
|
Remove unused code
|
2014-04-07 14:26:46 +04:00 |
|
vbystricky
|
07e84c635a
|
Remove unused code
|
2014-04-07 14:26:45 +04:00 |
|
vbystricky
|
06434bedfd
|
Change deprecated function ippicviMulC_32f_C1IR to ippicviMulC_32f_C1R. Check results of ipp function, if error was return run opencv branch of code
|
2014-04-07 14:26:45 +04:00 |
|
vbystricky
|
3b03044047
|
Fix warning
|
2014-04-07 14:26:44 +04:00 |
|
vbystricky
|
58de8bc917
|
Change deprecated functions to valid
|
2014-04-07 14:24:06 +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 |
|
Roman Donchenko
|
1cee868e88
|
Merge pull request #2572 from jet47:gpu-generalized-hough
|
2014-04-07 11:57:52 +04:00 |
|
Andrey Pavlenko
|
def4f5e2a3
|
Merge pull request #2499 from mlyashko:back_proj_fix1
|
2014-04-07 10:57:21 +04:00 |
|
Vladislav Vinogradov
|
d822d6f101
|
disable GeneralizedHough tests on gcc 4.7
|
2014-04-07 09:49:17 +04:00 |
|
akrynski
|
1dba47b77b
|
Update crop_face.py
I propose some changes, to automate file cropping
|
2014-04-06 18:48:38 +02:00 |
|
Andrey Pavlenko
|
d1710a8547
|
Merge pull request #2562 from akarsakov:gftt_fix
|
2014-04-04 13:34:31 +04:00 |
|
krodyush
|
4ca695cab0
|
Merge remote-tracking branch 'github/master' into pullreq/140319-PyrLKOpticalFlow
Conflicts:
modules/video/src/opencl/pyrlk.cl
|
2014-04-04 11:26:08 +04:00 |
|
Vladislav Vinogradov
|
f8d922ad3e
|
disable gpu::GeneralizedHough compilation on gcc 4.7
|
2014-04-04 10:31:33 +04: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 |
|
Alexander Karsakov
|
c747426fc1
|
Enabled integer arithmetic for filterSepSinglePass
|
2014-04-03 16:53:57 +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 |
|