Andrey Pavlenko [Tue, 8 Apr 2014 07:05:29 +0000 (11:05 +0400)]
Merge pull request #2538 from ElenaGvozdeva:ipp_async_convert
Elena Gvozdeva [Fri, 4 Apr 2014 08:08:22 +0000 (12:08 +0400)]
fixed
Roman Donchenko [Mon, 7 Apr 2014 14:29:51 +0000 (18:29 +0400)]
Merge pull request #2580 from SpecLad:merge-2.4
Andrey Pavlenko [Mon, 7 Apr 2014 11:52:31 +0000 (15:52 +0400)]
Merge pull request #2568 from vbystricky:ippicv
Roman Donchenko [Mon, 7 Apr 2014 10:59:34 +0000 (14:59 +0400)]
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
vbystricky [Mon, 7 Apr 2014 10:53:30 +0000 (14:53 +0400)]
Fix problems in CMakeLists.txt
vbystricky [Mon, 7 Apr 2014 10:43:09 +0000 (14:43 +0400)]
Fix rebase errors
vbystricky [Mon, 7 Apr 2014 10:17:22 +0000 (14:17 +0400)]
Check results of ipp function
vbystricky [Mon, 7 Apr 2014 06:51:22 +0000 (10:51 +0400)]
Change all 'ippStsNoErr==' to '0<=', and all 'ippStsNoErr!=' to '0>'
vbystricky [Fri, 4 Apr 2014 10:32:15 +0000 (14:32 +0400)]
Fix function names (log, exp)
vbystricky [Fri, 4 Apr 2014 09:24:08 +0000 (13:24 +0400)]
Fix errors
vbystricky [Fri, 4 Apr 2014 09:12:37 +0000 (13:12 +0400)]
Check 8.1 ipp version for color convertion functions, which not exists in versions before this.
vbystricky [Fri, 4 Apr 2014 09:00:18 +0000 (13:00 +0400)]
Check 8.1 ipp version for gaussian functions, which not exists in versions before this.
vbystricky [Fri, 4 Apr 2014 08:34:45 +0000 (12:34 +0400)]
Check 8.1 ipp version for morphology functions, which not exists in versions before this.
vbystricky [Thu, 3 Apr 2014 13:58:54 +0000 (17:58 +0400)]
Fix const src matrix in IPPresizeInvoker
vbystricky [Thu, 3 Apr 2014 13:40:46 +0000 (17:40 +0400)]
Fix errors
vbystricky [Thu, 3 Apr 2014 09:18:28 +0000 (13:18 +0400)]
Undo changes ipp to ippicv prefix of function names
vbystricky [Thu, 3 Apr 2014 08:26:40 +0000 (12:26 +0400)]
Add preprocessor check for IPP version greater 8.1 on some code
vbystricky [Thu, 3 Apr 2014 08:14:28 +0000 (12:14 +0400)]
Uncomment ippiNormDiff_Inf_16s_C3R, ippiNormDiff_Inf_16s_C4R
vbystricky [Thu, 3 Apr 2014 06:49:07 +0000 (10:49 +0400)]
Uncomment ippicviNorm_Inf_16s_C3R, ippicviNorm_Inf_16s_C4R functions
vbystricky [Thu, 3 Apr 2014 06:48:20 +0000 (10:48 +0400)]
Fix error not initialized IppStatus before ipp functions call
vbystricky [Thu, 3 Apr 2014 06:47:06 +0000 (10:47 +0400)]
Comment ipp version of CV_BGR2GRAY color convertion, by problems in BRIEF accuracy test and Path_Idx_Cn_NPoints_WSize perfomance test
vbystricky [Thu, 3 Apr 2014 06:44:23 +0000 (10:44 +0400)]
Remove unused #include "ippverdion.h"
vbystricky [Wed, 2 Apr 2014 11:45:03 +0000 (15:45 +0400)]
Enable ipp MeanStdDev calculation for 32F_C1 images. Decrease accuracy sanity check of the perfomance test
vbystricky [Wed, 2 Apr 2014 09:27:29 +0000 (13:27 +0400)]
Change Canny input image description, we can use multichannel image now
vbystricky [Wed, 2 Apr 2014 08:20:12 +0000 (12:20 +0400)]
Canny uncommented, prefix of ipp function changed. Ipp version of Canny called only for images with one channels
vbystricky [Fri, 28 Mar 2014 11:49:16 +0000 (15:49 +0400)]
Change sanity check for perfomance test of dft
vbystricky [Fri, 28 Mar 2014 10:36:25 +0000 (14:36 +0400)]
Change sanity check for perfomance test of bilateral filter
vbystricky [Fri, 28 Mar 2014 08:49:12 +0000 (12:49 +0400)]
Check ippStsNoErr as result of ipp function instead >=0
vbystricky [Fri, 28 Mar 2014 07:33:19 +0000 (11:33 +0400)]
Fix error BGRA2RGBA color convertion by ipp. Uncomment ipp color converstion, which pass tests
vbystricky [Thu, 27 Mar 2014 07:39:25 +0000 (11:39 +0400)]
Remove unused code
vbystricky [Wed, 26 Mar 2014 13:43:21 +0000 (17:43 +0400)]
Remove unused code
vbystricky [Wed, 26 Mar 2014 12:30:48 +0000 (16:30 +0400)]
Change deprecated function ippicviMulC_32f_C1IR to ippicviMulC_32f_C1R. Check results of ipp function, if error was return run opencv branch of code
vbystricky [Wed, 26 Mar 2014 12:27:06 +0000 (16:27 +0400)]
Fix warning
vbystricky [Wed, 26 Mar 2014 12:25:14 +0000 (16:25 +0400)]
Change deprecated functions to valid
vbystricky [Fri, 21 Mar 2014 11:27:56 +0000 (15:27 +0400)]
Prepare codes for ippicv library
Andrey Pavlenko [Mon, 7 Apr 2014 09:03:10 +0000 (13:03 +0400)]
Merge pull request #2563 from alalek:ipp_builds
Roman Donchenko [Mon, 7 Apr 2014 07:57:52 +0000 (11:57 +0400)]
Merge pull request #2572 from jet47:gpu-generalized-hough
Andrey Pavlenko [Mon, 7 Apr 2014 06:57:21 +0000 (10:57 +0400)]
Merge pull request #2499 from mlyashko:back_proj_fix1
Vladislav Vinogradov [Mon, 7 Apr 2014 05:49:17 +0000 (09:49 +0400)]
disable GeneralizedHough tests on gcc 4.7
Andrey Pavlenko [Fri, 4 Apr 2014 09:34:30 +0000 (13:34 +0400)]
Merge pull request #2562 from akarsakov:gftt_fix
Vladislav Vinogradov [Fri, 4 Apr 2014 06:31:33 +0000 (10:31 +0400)]
disable gpu::GeneralizedHough compilation on gcc 4.7
Andrey Pavlenko [Thu, 3 Apr 2014 18:08:17 +0000 (22:08 +0400)]
Merge pull request #2567 from apavlenko:fix_compare_scalar
Andrey Pavlenko [Thu, 3 Apr 2014 13:07:06 +0000 (17:07 +0400)]
Merge pull request #2556 from DeanF:master
Andrey Pavlenko [Thu, 3 Apr 2014 12:21:04 +0000 (16:21 +0400)]
fixing OCL run condition (build program failure for comparison 64F Mat with Scalar)
Alexander Alekhin [Wed, 2 Apr 2014 14:32:19 +0000 (18:32 +0400)]
enable IPP ICV support
Elena Gvozdeva [Thu, 27 Mar 2014 13:40:50 +0000 (17:40 +0400)]
Added SharedMatrix
Alexander Karsakov [Wed, 2 Apr 2014 13:10:10 +0000 (17:10 +0400)]
Fixed error in case corners not found
Andrey Pavlenko [Wed, 2 Apr 2014 09:01:08 +0000 (13:01 +0400)]
Merge pull request #2557 from ilya-lavrenov:tapi_fnlm_fix
Roman Donchenko [Wed, 2 Apr 2014 08:00:00 +0000 (12:00 +0400)]
Merge pull request #2550 from SpecLad:merge-2.4
Ilya Lavrenov [Tue, 1 Apr 2014 19:18:07 +0000 (23:18 +0400)]
fixed condition in cv::FNLM
DeanF [Tue, 1 Apr 2014 19:04:58 +0000 (22:04 +0300)]
Fixed trailing whitespace
DeanF [Tue, 1 Apr 2014 18:20:13 +0000 (21:20 +0300)]
Fixed problem with compilation without HAVE_OPENCL
When compiling without OpenCL, some classes from its namespace are still used in code.
Elena Gvozdeva [Mon, 24 Feb 2014 06:44:54 +0000 (10:44 +0400)]
Added IPP Async converters, doc and sample
Andrey Pavlenko [Tue, 1 Apr 2014 08:54:06 +0000 (12:54 +0400)]
Merge pull request #2536 from ilya-lavrenov:tapi_resize_linear
Roman Donchenko [Tue, 1 Apr 2014 08:16:25 +0000 (12:16 +0400)]
Merge pull request #2554 from asmorkalov:ocv_249_version
Alexander Smorkalov [Mon, 31 Mar 2014 16:23:56 +0000 (09:23 -0700)]
OpenCV version++. OpenCV Manager version++.
Andrey Pavlenko [Mon, 31 Mar 2014 19:21:06 +0000 (23:21 +0400)]
Merge pull request #2553 from ilya-lavrenov:typo
Andrey Pavlenko [Mon, 31 Mar 2014 17:21:59 +0000 (21:21 +0400)]
Merge pull request #2552 from ilya-lavrenov:tapi_compare
Andrey Pavlenko [Mon, 31 Mar 2014 17:21:27 +0000 (21:21 +0400)]
Merge pull request #2551 from ilya-lavrenov:ocl_nonfree
Ilya Lavrenov [Tue, 25 Mar 2014 16:06:26 +0000 (20:06 +0400)]
integer cv::resize (INTER_LINEAR && CV_8UC(cn))
Andrey Pavlenko [Mon, 31 Mar 2014 16:19:21 +0000 (20:19 +0400)]
Merge pull request #2548 from jet47:gpu_mog2_test
Ilya Lavrenov [Mon, 31 Mar 2014 15:45:55 +0000 (19:45 +0400)]
doc typos
Andrey Pavlenko [Mon, 31 Mar 2014 15:36:43 +0000 (19:36 +0400)]
Merge pull request #2549 from ilya-lavrenov:tapi_laplacian
Andrey Pavlenko [Mon, 31 Mar 2014 14:17:49 +0000 (18:17 +0400)]
Merge pull request #2487 from ilya-lavrenov:tapi_perf_orb
Ilya Lavrenov [Mon, 31 Mar 2014 13:20:36 +0000 (17:20 +0400)]
compare with scalar (cn > 1)
Ilya Lavrenov [Mon, 31 Mar 2014 13:30:08 +0000 (17:30 +0400)]
fixed C4505
Andrey Pavlenko [Mon, 31 Mar 2014 11:48:45 +0000 (15:48 +0400)]
Merge pull request #2541 from JinoBetti:2.4
Ilya Lavrenov [Fri, 14 Mar 2014 08:59:14 +0000 (12:59 +0400)]
performance tests for FAST
mlyashko [Mon, 31 Mar 2014 10:57:03 +0000 (14:57 +0400)]
copyright fix
Roman Donchenko [Mon, 31 Mar 2014 10:42:00 +0000 (14:42 +0400)]
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
Ilya Lavrenov [Fri, 28 Mar 2014 13:41:19 +0000 (17:41 +0400)]
added support of ksize >= 5 to cv::Laplacian
mlyashko [Mon, 31 Mar 2014 06:58:15 +0000 (10:58 +0400)]
bug fix
Vladislav Vinogradov [Mon, 31 Mar 2014 01:02:03 +0000 (18:02 -0700)]
increase epsilon for MOG2::getBackgroundImage test:
it uses float arithmetics
Andrey Pavlenko [Fri, 28 Mar 2014 19:17:07 +0000 (23:17 +0400)]
Merge pull request #2543 from apavlenko:24_haar_revert
Roman Donchenko [Fri, 28 Mar 2014 15:37:03 +0000 (19:37 +0400)]
Merge pull request #2534 from asmorkalov:opencv_config_cut_cuda_abs_path
Alexander Smorkalov [Wed, 26 Mar 2014 19:26:21 +0000 (23:26 +0400)]
OpenCVConfig.cmake fix after cutting absolute CUDA libraries path.
Andrey Pavlenko [Fri, 28 Mar 2014 12:08:11 +0000 (16:08 +0400)]
Revert pull request #1929 from @alalek "ocl: added workaround into Haar kernels"
This reverts commit
3dcddad88aa13b729313939648c29f420a9f8054.
Conflicts:
modules/ocl/src/opencl/haarobjectdetect.cl
Andrey Pavlenko [Fri, 28 Mar 2014 12:06:39 +0000 (16:06 +0400)]
- fix test
Andrey Pavlenko [Fri, 28 Mar 2014 12:05:04 +0000 (16:05 +0400)]
Revert "Merge pull request #1779 from perping:integral_2.4"
This reverts commit
54ea5bbac77a9dbd10f314ee1ee2b10e3b6c44fa, reversing
changes made to
28e0d3d771d9db9d03ea55f8d0504558e17139b2.
Roman Donchenko [Fri, 28 Mar 2014 08:45:39 +0000 (12:45 +0400)]
Merge pull request #2542 from asmorkalov:android_javacam_cvtcolor_fix
Roman Donchenko [Fri, 28 Mar 2014 08:17:16 +0000 (12:17 +0400)]
Merge pull request #2476 from minkless:3.0-bugfix-core-filestorage
Roman Donchenko [Fri, 28 Mar 2014 08:13:13 +0000 (12:13 +0400)]
Merge pull request #2403 from hbristow:issue-3451
Roman Donchenko [Fri, 28 Mar 2014 08:08:55 +0000 (12:08 +0400)]
Merge pull request #2379 from ngryman:optimize_jpeg
Roman Donchenko [Fri, 28 Mar 2014 08:08:23 +0000 (12:08 +0400)]
Merge pull request #2533 from kenaniah:master
Roman Donchenko [Fri, 28 Mar 2014 07:58:23 +0000 (11:58 +0400)]
Merge pull request #2539 from mjul:fixtypos
Roman Donchenko [Fri, 28 Mar 2014 07:58:11 +0000 (11:58 +0400)]
Merge pull request #2540 from mjul:fixtypos_2.4
Koji Miyazato [Fri, 28 Mar 2014 01:45:33 +0000 (10:45 +0900)]
corrected some style errors found by review.
Alexander Smorkalov [Fri, 28 Mar 2014 00:56:31 +0000 (04:56 +0400)]
Bug #3553 JavaCameraView frame format and cvtColor format inconsistency fixed.
Nicolas Gryman [Wed, 19 Feb 2014 04:45:48 +0000 (23:45 -0500)]
added jpeg with optimized coding support.
JinoBetti [Thu, 27 Mar 2014 15:28:40 +0000 (16:28 +0100)]
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
Roman Donchenko [Thu, 27 Mar 2014 13:43:02 +0000 (17:43 +0400)]
Merge pull request #2537 from ilya-lavrenov:doc_fix
mlyashko [Thu, 27 Mar 2014 13:08:05 +0000 (17:08 +0400)]
both tests by picture and rand mat
Martin Jul [Thu, 27 Mar 2014 12:52:49 +0000 (13:52 +0100)]
Fixed typo in BFMatcher in docs.
Ilya Lavrenov [Thu, 27 Mar 2014 12:30:29 +0000 (16:30 +0400)]
doc fix
Martin Jul [Thu, 27 Mar 2014 12:20:48 +0000 (13:20 +0100)]
Merge branch '2.4' into fixtypos
Andrey Pavlenko [Thu, 27 Mar 2014 11:22:45 +0000 (15:22 +0400)]
Merge pull request #2535 from akarsakov:stereobm_fix
Alexander Karsakov [Thu, 27 Mar 2014 07:18:30 +0000 (11:18 +0400)]
Fixed incorrect calculation of best_disp
Andrey Pavlenko [Thu, 27 Mar 2014 07:05:21 +0000 (11:05 +0400)]
Merge pull request #2286 from alalek:umat_unmap_issue
Kenaniah Cerny [Thu, 27 Mar 2014 06:15:42 +0000 (23:15 -0700)]
Fixed type gPython -> Python