Tony [Thu, 10 Apr 2014 22:28:23 +0000 (23:28 +0100)]
Fix logic error in OpenCVFindLibsGUI.cmake
When with_gtk is selected but GTK3 is not present the current logic
fails to check for GTK2. This edit corrects this.
Tony [Thu, 10 Apr 2014 19:10:28 +0000 (20:10 +0100)]
Merge remote-tracking branch 'upstream/master' into gtk3
Conflicts:
CMakeLists.txt
Tony [Wed, 9 Apr 2014 21:07:59 +0000 (22:07 +0100)]
Correct error with GTK3 not found selection
When GTK3 is not found, HAVE_GTK was being set to TRUE. This edit
ensures that HAVE_GTK is only set if GTK3 or GTK2 (meeting minimum
version requirements) is present.
Selection logic for printing 'GTK: No' when the libraries are not found
has also been removed so the message is printed when GTK is not found or
selected in common with other libraries.
Changes committed:
modified: CMakeLists.txt
modified: cmake/OpenCVFindLibsGUI.cmake
Andrey Pavlenko [Wed, 9 Apr 2014 14:23:34 +0000 (18:23 +0400)]
Merge pull request #2589 from alalek:icv_update
Andrey Pavlenko [Wed, 9 Apr 2014 14:23:14 +0000 (18:23 +0400)]
Merge pull request #2596 from ilya-lavrenov:tapi_setto
Alexander Alekhin [Wed, 9 Apr 2014 12:01:51 +0000 (16:01 +0400)]
ipp: some functions are not available in the ICV package #2
Alexander Alekhin [Tue, 8 Apr 2014 14:00:21 +0000 (18:00 +0400)]
ipp: some functions are not available in the ICV package
Alexander Alekhin [Tue, 8 Apr 2014 10:01:44 +0000 (14:01 +0400)]
ipp: added support for updated ICV package
Andrey Pavlenko [Wed, 9 Apr 2014 10:25:12 +0000 (14:25 +0400)]
Merge pull request #2594 from arkunze:pullreq/140319-dll-shutdown-fix-b
Andrey Pavlenko [Wed, 9 Apr 2014 10:17:48 +0000 (14:17 +0400)]
Merge pull request #2584 from akarsakov:ipp_threshold
Andrey Pavlenko [Wed, 9 Apr 2014 10:16:24 +0000 (14:16 +0400)]
Merge pull request #2586 from ilya-lavrenov:ipp_disable
Ilya Lavrenov [Wed, 9 Apr 2014 10:15:22 +0000 (14:15 +0400)]
added UMat::setTo accuracy test
Andrey Pavlenko [Wed, 9 Apr 2014 10:14:13 +0000 (14:14 +0400)]
Merge pull request #2583 from ilya-lavrenov:ippicv
Andrey Pavlenko [Wed, 9 Apr 2014 10:06:13 +0000 (14:06 +0400)]
Merge pull request #2592 from ilya-lavrenov:tests
Ilya Lavrenov [Tue, 8 Apr 2014 20:00:13 +0000 (00:00 +0400)]
cv2cvtest part2
Alexander Karsakov [Fri, 4 Apr 2014 11:07:17 +0000 (15:07 +0400)]
Added ippiThreshold to cv::threshold
Aaron Kunze [Mon, 24 Mar 2014 20:38:57 +0000 (13:38 -0700)]
Resolves bug #3450 (Improperly cleaning up resources in DllMain)
Tony [Tue, 8 Apr 2014 22:13:27 +0000 (23:13 +0100)]
Change quotes around GTK headers for angle brackets
The linux buildbots have started to fail compilation due to not
finding the gtk headers. The quotes have been changed to angle brackets
to indicate to the compiler that these are system includes.
Tony [Tue, 8 Apr 2014 20:21:40 +0000 (21:21 +0100)]
Fix bug in GTK+3 logic introduced by previous merge
During merging of conflicting versions of this file, I erroneously
deleted several lines in the GUI reporting section. This is repaired
in this commit.
Ilya Lavrenov [Mon, 7 Apr 2014 13:09:11 +0000 (17:09 +0400)]
fixed (IppiSize&)sz
Ilya Lavrenov [Mon, 7 Apr 2014 11:35:51 +0000 (15:35 +0400)]
cv::scaleAdd
Ilya Lavrenov [Sun, 6 Apr 2014 12:09:38 +0000 (16:09 +0400)]
cv::blur
Ilya Lavrenov [Sat, 5 Apr 2014 21:21:18 +0000 (01:21 +0400)]
cv::Mat::convertTo
Ilya Lavrenov [Sat, 5 Apr 2014 19:54:29 +0000 (23:54 +0400)]
cv::pow (added ippiSqr_32f_C1R for power=2)
Ilya Lavrenov [Sat, 5 Apr 2014 18:35:21 +0000 (22:35 +0400)]
cv::updateMotionHistory
Ilya Lavrenov [Sat, 5 Apr 2014 17:54:25 +0000 (21:54 +0400)]
cv::flip
Ilya Lavrenov [Fri, 4 Apr 2014 19:46:50 +0000 (23:46 +0400)]
cv::boxFilter
Ilya Lavrenov [Fri, 4 Apr 2014 11:52:13 +0000 (15:52 +0400)]
cv::medianBlur
Ilya Lavrenov [Fri, 4 Apr 2014 10:18:53 +0000 (14:18 +0400)]
cv::magnitude
Ilya Lavrenov [Fri, 4 Apr 2014 09:49:22 +0000 (13:49 +0400)]
cv::pow
Ilya Lavrenov [Fri, 4 Apr 2014 08:20:18 +0000 (12:20 +0400)]
cv::sqrt
Ilya Lavrenov [Thu, 3 Apr 2014 20:27:48 +0000 (00:27 +0400)]
cv::accumulateSquare && cv::acumulateProduct
Ilya Lavrenov [Thu, 3 Apr 2014 20:05:36 +0000 (00:05 +0400)]
cv::accumulateWeighted
Ilya Lavrenov [Thu, 3 Apr 2014 19:45:41 +0000 (23:45 +0400)]
cv::polarToCart
Ilya Lavrenov [Thu, 3 Apr 2014 19:41:13 +0000 (23:41 +0400)]
cv::transpose
Ilya Lavrenov [Thu, 3 Apr 2014 19:39:01 +0000 (23:39 +0400)]
cv::warpPerspective and cv::warpAffine
Ilya Lavrenov [Tue, 8 Apr 2014 10:37:46 +0000 (14:37 +0400)]
disabled some IPP funcs
Tony [Tue, 8 Apr 2014 18:25:51 +0000 (19:25 +0100)]
Merge remote-tracking branch 'upstream/master' into gtk3
Conflicts:
CMakeLists.txt
Andrey Pavlenko [Tue, 8 Apr 2014 14:01:23 +0000 (18:01 +0400)]
Merge pull request #2585 from ilya-lavrenov:norm
Andrey Pavlenko [Tue, 8 Apr 2014 13:58:16 +0000 (17:58 +0400)]
Merge pull request #2566 from krodyush:pullreq/140319-PyrLKOpticalFlow
Ilya Lavrenov [Mon, 7 Apr 2014 21:11:58 +0000 (01:11 +0400)]
cv::norm -> cvtest::norm in tests
Conflicts:
modules/core/src/stat.cpp
Andrey Pavlenko [Tue, 8 Apr 2014 10:30:48 +0000 (14:30 +0400)]
Merge pull request #2582 from vbystricky:ipp_fix
vbystricky [Tue, 8 Apr 2014 09:05:23 +0000 (13:05 +0400)]
Remove defined(HAVE_IPP)
vbystricky [Tue, 8 Apr 2014 08:43:57 +0000 (12:43 +0400)]
Add IPP_VERSION_X100 define
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
krodyush [Mon, 7 Apr 2014 13:32:39 +0000 (17:32 +0400)]
fix previous merge error
vbystricky [Mon, 7 Apr 2014 13:06:02 +0000 (17:06 +0400)]
Fix for pullrequest comment
vbystricky [Mon, 7 Apr 2014 12:45:35 +0000 (16:45 +0400)]
Fix ifdef for IPP version greater 8.1
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
krodyush [Fri, 4 Apr 2014 07:26:08 +0000 (11:26 +0400)]
Merge remote-tracking branch 'github/master' into pullreq/140319-PyrLKOpticalFlow
Conflicts:
modules/video/src/opencl/pyrlk.cl
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
Tony [Tue, 1 Apr 2014 22:01:18 +0000 (23:01 +0100)]
Improve GTK+ library selection logic.
The new logic will select GTK+3 by default if WITH_GTK is selected. If
the GTK+3 libraries are not found, then GTK+2 libraries will be selected
if found.
This can be overridden by using WITH_GTK_2_X to force selection of GTK+2
(if found).
Ilya Lavrenov [Tue, 1 Apr 2014 19:18:07 +0000 (23:18 +0400)]
fixed condition in cv::FNLM