Commit Graph

1749 Commits

Author SHA1 Message Date
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
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
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
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