platform/upstream/opencv.git
10 years agoCorrection to enable compilation on platform with only GTK2 libs
Tony [Sat, 12 Apr 2014 21:43:42 +0000 (22:43 +0100)]
Correction to enable compilation on platform with only GTK2 libs

modified:   CMakeLists.txt
modified:   cmake/OpenCVFindLibsGUI.cmake

10 years agoFix logic error in OpenCVFindLibsGUI.cmake
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.

10 years agoCorrect error with GTK3 not found selection
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

10 years agoChange quotes around GTK headers for angle brackets
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.

10 years agoFix bug in GTK+3 logic introduced by previous merge
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.

10 years agoImprove GTK+ library selection logic.
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).

10 years agoUse GTK_VERSION_MAJOR to switch between GTK+ version two and three
Tony [Mon, 31 Mar 2014 21:05:09 +0000 (22:05 +0100)]
Use GTK_VERSION_MAJOR to switch between  GTK+ version two and three
specific code. As a result of this, HAVE_GTK3 no longer needs to be
exposed.

The use of HAVE_GTK, and HAVE_ GTK3 have been changed to mirror the
method used by HAVE_QT and HAVE_QT5.
 On branch gtk3
 Changes to be committed:
        modified:   CMakeLists.txt
        modified:   cmake/OpenCVFindLibsGUI.cmake
        modified:   cmake/templates/cvconfig.h.in
        modified:   modules/highgui/src/window.cpp
        modified:   modules/highgui/src/window_gtk.cpp

10 years agoMerge remote-tracking branch 'upstream/master'
Tony [Sun, 13 Apr 2014 09:39:32 +0000 (10:39 +0100)]
Merge remote-tracking branch 'upstream/master'
Rebase to lates upstream

10 years agoMerge pull request #2600 from ilya-lavrenov:ipp_calc_hist
Andrey Pavlenko [Fri, 11 Apr 2014 11:18:04 +0000 (15:18 +0400)]
Merge pull request #2600 from ilya-lavrenov:ipp_calc_hist

10 years agoMerge pull request #2593 from arkunze:pullreq/140319-color
Andrey Pavlenko [Fri, 11 Apr 2014 11:16:32 +0000 (15:16 +0400)]
Merge pull request #2593 from arkunze:pullreq/140319-color

10 years agoMerge pull request #2587 from ElenaGvozdeva:ipp_matchTemplate
Andrey Pavlenko [Fri, 11 Apr 2014 08:47:25 +0000 (12:47 +0400)]
Merge pull request #2587 from ElenaGvozdeva:ipp_matchTemplate

10 years agoMerge pull request #2581 from vbystricky:ipp_moments
Andrey Pavlenko [Fri, 11 Apr 2014 08:45:13 +0000 (12:45 +0400)]
Merge pull request #2581 from vbystricky:ipp_moments

10 years agoMerge pull request #2597 from ilya-lavrenov:ipp_countnonzero
Andrey Pavlenko [Fri, 11 Apr 2014 08:43:24 +0000 (12:43 +0400)]
Merge pull request #2597 from ilya-lavrenov:ipp_countnonzero

10 years agoMerge pull request #2604 from alalek:binary_package_fix
Andrey Pavlenko [Fri, 11 Apr 2014 08:34:22 +0000 (12:34 +0400)]
Merge pull request #2604 from alalek:binary_package_fix

10 years agoparallel version
Ilya Lavrenov [Wed, 9 Apr 2014 20:01:10 +0000 (00:01 +0400)]
parallel version

10 years agofixed
Elena Gvozdeva [Wed, 9 Apr 2014 13:36:00 +0000 (17:36 +0400)]
fixed

10 years agoMerge pull request #1932 from seth-planet:master
Vadim Pisarevsky [Thu, 10 Apr 2014 09:36:14 +0000 (13:36 +0400)]
Merge pull request #1932 from seth-planet:master

10 years agoMerge pull request #2390 from nicolasmartin3d:master_bug3546
Vadim Pisarevsky [Thu, 10 Apr 2014 09:33:42 +0000 (13:33 +0400)]
Merge pull request #2390 from nicolasmartin3d:master_bug3546

10 years agoMerge pull request #2067 from pemmanuelviel:groupWiseCenterChooser
Vadim Pisarevsky [Thu, 10 Apr 2014 09:33:28 +0000 (13:33 +0400)]
Merge pull request #2067 from pemmanuelviel:groupWiseCenterChooser

10 years agoMerge pull request #2588 from vpisarev:fix_samples_n_unused
Vadim Pisarevsky [Thu, 10 Apr 2014 09:30:20 +0000 (13:30 +0400)]
Merge pull request #2588 from vpisarev:fix_samples_n_unused

10 years agocv::countNonZero
Ilya Lavrenov [Wed, 9 Apr 2014 11:21:35 +0000 (15:21 +0400)]
cv::countNonZero

10 years agoMerge remote-tracking branch 'upstream/master'
Tony [Thu, 10 Apr 2014 07:07:02 +0000 (08:07 +0100)]
Merge remote-tracking branch 'upstream/master'

Conflicts:
CMakeLists.txt

10 years agocv::calcHist
Ilya Lavrenov [Wed, 9 Apr 2014 12:04:21 +0000 (16:04 +0400)]
cv::calcHist

10 years agoFixes global size issue, adds #pragma unroll to loops
Aaron Kunze [Wed, 9 Apr 2014 15:42:55 +0000 (08:42 -0700)]
Fixes global size issue, adds #pragma unroll to loops

10 years agoremove ippasync samples from build without IPP-A
Alexander Alekhin [Wed, 9 Apr 2014 14:58:53 +0000 (18:58 +0400)]
remove ippasync samples from build without IPP-A

10 years agoMerge pull request #2589 from alalek:icv_update
Andrey Pavlenko [Wed, 9 Apr 2014 14:23:34 +0000 (18:23 +0400)]
Merge pull request #2589 from alalek:icv_update

10 years agoMerge pull request #2596 from ilya-lavrenov:tapi_setto
Andrey Pavlenko [Wed, 9 Apr 2014 14:23:14 +0000 (18:23 +0400)]
Merge pull request #2596 from ilya-lavrenov:tapi_setto

10 years agoipp: some functions are not available in the ICV package #2
Alexander Alekhin [Wed, 9 Apr 2014 12:01:51 +0000 (16:01 +0400)]
ipp: some functions are not available in the ICV package #2

10 years agoipp: some functions are not available in the ICV package
Alexander Alekhin [Tue, 8 Apr 2014 14:00:21 +0000 (18:00 +0400)]
ipp: some functions are not available in the ICV package

10 years agoipp: added support for updated ICV package
Alexander Alekhin [Tue, 8 Apr 2014 10:01:44 +0000 (14:01 +0400)]
ipp: added support for updated ICV package

10 years agoFix ipp ifdef
vbystricky [Wed, 9 Apr 2014 10:53:59 +0000 (14:53 +0400)]
Fix ipp ifdef

10 years agoFix IPP version ifdef
vbystricky [Mon, 7 Apr 2014 13:38:43 +0000 (17:38 +0400)]
Fix IPP version ifdef

10 years agoAdd IPP version of Moments calculattion of image
vbystricky [Mon, 7 Apr 2014 11:59:05 +0000 (15:59 +0400)]
Add IPP version of Moments calculattion of image

10 years agoMerge pull request #2594 from arkunze:pullreq/140319-dll-shutdown-fix-b
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

10 years agoMerge pull request #2584 from akarsakov:ipp_threshold
Andrey Pavlenko [Wed, 9 Apr 2014 10:17:48 +0000 (14:17 +0400)]
Merge pull request #2584 from akarsakov:ipp_threshold

10 years agoMerge pull request #2586 from ilya-lavrenov:ipp_disable
Andrey Pavlenko [Wed, 9 Apr 2014 10:16:24 +0000 (14:16 +0400)]
Merge pull request #2586 from ilya-lavrenov:ipp_disable

10 years agoadded UMat::setTo accuracy test
Ilya Lavrenov [Wed, 9 Apr 2014 10:15:22 +0000 (14:15 +0400)]
added UMat::setTo accuracy test

10 years agoMerge pull request #2583 from ilya-lavrenov:ippicv
Andrey Pavlenko [Wed, 9 Apr 2014 10:14:13 +0000 (14:14 +0400)]
Merge pull request #2583 from ilya-lavrenov:ippicv

10 years agoMerge pull request #2592 from ilya-lavrenov:tests
Andrey Pavlenko [Wed, 9 Apr 2014 10:06:13 +0000 (14:06 +0400)]
Merge pull request #2592 from ilya-lavrenov:tests

10 years agocv2cvtest part2
Ilya Lavrenov [Tue, 8 Apr 2014 20:00:13 +0000 (00:00 +0400)]
cv2cvtest part2

10 years agoAdded ippiThreshold to cv::threshold
Alexander Karsakov [Fri, 4 Apr 2014 11:07:17 +0000 (15:07 +0400)]
Added ippiThreshold to cv::threshold

10 years agofixed
Elena Gvozdeva [Wed, 9 Apr 2014 07:08:32 +0000 (11:08 +0400)]
fixed

10 years agoResolves bug #3450 (Improperly cleaning up resources in DllMain)
Aaron Kunze [Mon, 24 Mar 2014 20:38:57 +0000 (13:38 -0700)]
Resolves bug #3450 (Improperly cleaning up resources in DllMain)

10 years agoOptimizations for OpenCL color conversion.
Aaron Kunze [Thu, 20 Mar 2014 22:55:40 +0000 (15:55 -0700)]
Optimizations for OpenCL color conversion.

10 years agofixed (IppiSize&)sz
Ilya Lavrenov [Mon, 7 Apr 2014 13:09:11 +0000 (17:09 +0400)]
fixed (IppiSize&)sz

10 years agocv::scaleAdd
Ilya Lavrenov [Mon, 7 Apr 2014 11:35:51 +0000 (15:35 +0400)]
cv::scaleAdd

10 years agocv::blur
Ilya Lavrenov [Sun, 6 Apr 2014 12:09:38 +0000 (16:09 +0400)]
cv::blur

10 years agocv::Mat::convertTo
Ilya Lavrenov [Sat, 5 Apr 2014 21:21:18 +0000 (01:21 +0400)]
cv::Mat::convertTo

10 years agocv::pow (added ippiSqr_32f_C1R for power=2)
Ilya Lavrenov [Sat, 5 Apr 2014 19:54:29 +0000 (23:54 +0400)]
cv::pow (added ippiSqr_32f_C1R for power=2)

10 years agocv::updateMotionHistory
Ilya Lavrenov [Sat, 5 Apr 2014 18:35:21 +0000 (22:35 +0400)]
cv::updateMotionHistory

10 years agocv::flip
Ilya Lavrenov [Sat, 5 Apr 2014 17:54:25 +0000 (21:54 +0400)]
cv::flip

10 years agocv::boxFilter
Ilya Lavrenov [Fri, 4 Apr 2014 19:46:50 +0000 (23:46 +0400)]
cv::boxFilter

10 years agocv::medianBlur
Ilya Lavrenov [Fri, 4 Apr 2014 11:52:13 +0000 (15:52 +0400)]
cv::medianBlur

10 years agocv::magnitude
Ilya Lavrenov [Fri, 4 Apr 2014 10:18:53 +0000 (14:18 +0400)]
cv::magnitude

10 years agocv::pow
Ilya Lavrenov [Fri, 4 Apr 2014 09:49:22 +0000 (13:49 +0400)]
cv::pow

10 years agocv::sqrt
Ilya Lavrenov [Fri, 4 Apr 2014 08:20:18 +0000 (12:20 +0400)]
cv::sqrt

10 years agocv::accumulateSquare && cv::acumulateProduct
Ilya Lavrenov [Thu, 3 Apr 2014 20:27:48 +0000 (00:27 +0400)]
cv::accumulateSquare && cv::acumulateProduct

10 years agocv::accumulateWeighted
Ilya Lavrenov [Thu, 3 Apr 2014 20:05:36 +0000 (00:05 +0400)]
cv::accumulateWeighted

10 years agocv::polarToCart
Ilya Lavrenov [Thu, 3 Apr 2014 19:45:41 +0000 (23:45 +0400)]
cv::polarToCart

10 years agocv::transpose
Ilya Lavrenov [Thu, 3 Apr 2014 19:41:13 +0000 (23:41 +0400)]
cv::transpose

10 years agocv::warpPerspective and cv::warpAffine
Ilya Lavrenov [Thu, 3 Apr 2014 19:39:01 +0000 (23:39 +0400)]
cv::warpPerspective and cv::warpAffine

10 years agodisabled some IPP funcs
Ilya Lavrenov [Tue, 8 Apr 2014 10:37:46 +0000 (14:37 +0400)]
disabled some IPP funcs

10 years agoMerge remote-tracking branch 'upstream/master'
Tony [Tue, 8 Apr 2014 18:14:05 +0000 (19:14 +0100)]
Merge remote-tracking branch 'upstream/master'

10 years agoMerge pull request #2585 from ilya-lavrenov:norm
Andrey Pavlenko [Tue, 8 Apr 2014 14:01:23 +0000 (18:01 +0400)]
Merge pull request #2585 from ilya-lavrenov:norm

10 years agoMerge pull request #2566 from krodyush:pullreq/140319-PyrLKOpticalFlow
Andrey Pavlenko [Tue, 8 Apr 2014 13:58:16 +0000 (17:58 +0400)]
Merge pull request #2566 from krodyush:pullreq/140319-PyrLKOpticalFlow

10 years agofixed slow down in getRectSubPix (original patch by Markus JR Mueller); removed some...
Vadim Pisarevsky [Tue, 8 Apr 2014 13:54:08 +0000 (17:54 +0400)]
fixed slow down in getRectSubPix (original patch by Markus JR Mueller); removed some unused variables and functions

10 years agoAdded ippiSqrDistanceNorm and ippiCrossCorrNorm to cv::matchTemplate
Elena Gvozdeva [Tue, 8 Apr 2014 12:48:13 +0000 (16:48 +0400)]
Added  ippiSqrDistanceNorm and ippiCrossCorrNorm to cv::matchTemplate

10 years agocv::norm -> cvtest::norm in tests
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

10 years agoMerge pull request #2582 from vbystricky:ipp_fix
Andrey Pavlenko [Tue, 8 Apr 2014 10:30:48 +0000 (14:30 +0400)]
Merge pull request #2582 from vbystricky:ipp_fix

10 years agoRemove defined(HAVE_IPP)
vbystricky [Tue, 8 Apr 2014 09:05:23 +0000 (13:05 +0400)]
Remove defined(HAVE_IPP)

10 years agoAdd IPP_VERSION_X100 define
vbystricky [Tue, 8 Apr 2014 08:43:57 +0000 (12:43 +0400)]
Add IPP_VERSION_X100 define

10 years agoMerge pull request #2538 from ElenaGvozdeva:ipp_async_convert
Andrey Pavlenko [Tue, 8 Apr 2014 07:05:29 +0000 (11:05 +0400)]
Merge pull request #2538 from ElenaGvozdeva:ipp_async_convert

10 years agofixed
Elena Gvozdeva [Fri, 4 Apr 2014 08:08:22 +0000 (12:08 +0400)]
fixed

10 years agoMerge pull request #2580 from SpecLad:merge-2.4
Roman Donchenko [Mon, 7 Apr 2014 14:29:51 +0000 (18:29 +0400)]
Merge pull request #2580 from SpecLad:merge-2.4

10 years agofix previous merge error
krodyush [Mon, 7 Apr 2014 13:32:39 +0000 (17:32 +0400)]
fix previous merge error

10 years agoFix for pullrequest comment
vbystricky [Mon, 7 Apr 2014 13:06:02 +0000 (17:06 +0400)]
Fix for pullrequest comment

10 years agoFix ifdef for IPP version greater 8.1
vbystricky [Mon, 7 Apr 2014 12:45:35 +0000 (16:45 +0400)]
Fix ifdef for IPP version greater 8.1

10 years agoMerge pull request #2568 from vbystricky:ippicv
Andrey Pavlenko [Mon, 7 Apr 2014 11:52:31 +0000 (15:52 +0400)]
Merge pull request #2568 from vbystricky:ippicv

10 years agoMerge remote-tracking branch 'origin/2.4' into merge-2.4
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

10 years agoFix problems in CMakeLists.txt
vbystricky [Mon, 7 Apr 2014 10:53:30 +0000 (14:53 +0400)]
Fix problems in CMakeLists.txt

10 years agoFix rebase errors
vbystricky [Mon, 7 Apr 2014 10:43:09 +0000 (14:43 +0400)]
Fix rebase errors

10 years agoCheck results of ipp function
vbystricky [Mon, 7 Apr 2014 10:17:22 +0000 (14:17 +0400)]
Check results of ipp function

10 years agoChange all 'ippStsNoErr==' to '0<=', and all 'ippStsNoErr!=' to '0>'
vbystricky [Mon, 7 Apr 2014 06:51:22 +0000 (10:51 +0400)]
Change all 'ippStsNoErr=='  to '0<=', and all 'ippStsNoErr!=' to '0>'

10 years agoFix function names (log, exp)
vbystricky [Fri, 4 Apr 2014 10:32:15 +0000 (14:32 +0400)]
Fix function names (log, exp)

10 years agoFix errors
vbystricky [Fri, 4 Apr 2014 09:24:08 +0000 (13:24 +0400)]
Fix errors

10 years agoCheck 8.1 ipp version for color convertion functions, which not exists in versions...
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.

10 years agoCheck 8.1 ipp version for gaussian functions, which not exists in versions before...
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.

10 years agoCheck 8.1 ipp version for morphology functions, which not exists in versions before...
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.

10 years agoFix const src matrix in IPPresizeInvoker
vbystricky [Thu, 3 Apr 2014 13:58:54 +0000 (17:58 +0400)]
Fix const src matrix in IPPresizeInvoker

10 years agoFix errors
vbystricky [Thu, 3 Apr 2014 13:40:46 +0000 (17:40 +0400)]
Fix errors

10 years agoUndo changes ipp to ippicv prefix of function names
vbystricky [Thu, 3 Apr 2014 09:18:28 +0000 (13:18 +0400)]
Undo changes ipp to ippicv prefix of function names

10 years agoAdd preprocessor check for IPP version greater 8.1 on some code
vbystricky [Thu, 3 Apr 2014 08:26:40 +0000 (12:26 +0400)]
Add preprocessor check for IPP version greater 8.1 on some code

10 years agoUncomment ippiNormDiff_Inf_16s_C3R, ippiNormDiff_Inf_16s_C4R
vbystricky [Thu, 3 Apr 2014 08:14:28 +0000 (12:14 +0400)]
Uncomment ippiNormDiff_Inf_16s_C3R, ippiNormDiff_Inf_16s_C4R

10 years agoUncomment ippicviNorm_Inf_16s_C3R, ippicviNorm_Inf_16s_C4R functions
vbystricky [Thu, 3 Apr 2014 06:49:07 +0000 (10:49 +0400)]
Uncomment ippicviNorm_Inf_16s_C3R, ippicviNorm_Inf_16s_C4R functions

10 years agoFix error not initialized IppStatus before ipp functions call
vbystricky [Thu, 3 Apr 2014 06:48:20 +0000 (10:48 +0400)]
Fix error not initialized IppStatus before ipp functions call

10 years agoComment ipp version of CV_BGR2GRAY color convertion, by problems in BRIEF accuracy...
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

10 years agoRemove unused #include "ippverdion.h"
vbystricky [Thu, 3 Apr 2014 06:44:23 +0000 (10:44 +0400)]
Remove unused #include "ippverdion.h"

10 years agoEnable ipp MeanStdDev calculation for 32F_C1 images. Decrease accuracy sanity check...
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

10 years agoChange Canny input image description, we can use multichannel image now
vbystricky [Wed, 2 Apr 2014 09:27:29 +0000 (13:27 +0400)]
Change Canny input image description, we can use multichannel image now

10 years agoCanny uncommented, prefix of ipp function changed. Ipp version of Canny called only...
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