2f9dad5ce8
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
11 years ago
8592022bd8
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.
11 years ago
838bb4bdeb
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.
11 years ago
d60be58a92
Merge remote-tracking branch 'upstream/master' into gtk3
...
Conflicts:
CMakeLists.txt
11 years ago
5600bc54f4
Merge pull request #2585 from ilya-lavrenov:norm
11 years ago
ac92d4c701
Merge pull request #2566 from krodyush:pullreq/140319-PyrLKOpticalFlow
11 years ago
aa5326c231
cv::norm -> cvtest::norm in tests
...
Conflicts:
modules/core/src/stat.cpp
11 years ago
a6ef45aa13
Merge pull request #2582 from vbystricky:ipp_fix
11 years ago
9828cd6086
Remove defined(HAVE_IPP)
11 years ago
f23134ce01
Add IPP_VERSION_X100 define
11 years ago
9ec823d800
Merge pull request #2538 from ElenaGvozdeva:ipp_async_convert
11 years ago
f9c5289483
fixed
11 years ago
6f055d7a76
Merge pull request #2580 from SpecLad:merge-2.4
11 years ago
616ec74beb
fix previous merge error
11 years ago
7badc85b60
Fix for pullrequest comment
11 years ago
2d54581971
Fix ifdef for IPP version greater 8.1
11 years ago
f690440533
Merge pull request #2568 from vbystricky:ippicv
11 years ago
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
11 years ago
268c0caa7a
Fix problems in CMakeLists.txt
11 years ago
e8f79d6e1f
Fix rebase errors
11 years ago
dbdc476b79
Check results of ipp function
11 years ago
38913bf5f6
Change all 'ippStsNoErr==' to '0<=', and all 'ippStsNoErr!=' to '0>'
11 years ago
67484e027b
Fix function names (log, exp)
11 years ago
566f783968
Fix errors
11 years ago
23e1b50837
Check 8.1 ipp version for color convertion functions, which not exists in versions before this.
11 years ago
06acb8b0ee
Check 8.1 ipp version for gaussian functions, which not exists in versions before this.
11 years ago
be29d628d3
Check 8.1 ipp version for morphology functions, which not exists in versions before this.
11 years ago
4512d06484
Fix const src matrix in IPPresizeInvoker
11 years ago
824ed8a3ae
Fix errors
11 years ago
1b3651d8ee
Undo changes ipp to ippicv prefix of function names
11 years ago
eb8c531791
Add preprocessor check for IPP version greater 8.1 on some code
11 years ago
188c506237
Uncomment ippiNormDiff_Inf_16s_C3R, ippiNormDiff_Inf_16s_C4R
11 years ago
ec6f977783
Uncomment ippicviNorm_Inf_16s_C3R, ippicviNorm_Inf_16s_C4R functions
11 years ago
a9a0ea3706
Fix error not initialized IppStatus before ipp functions call
11 years ago
c321330777
Comment ipp version of CV_BGR2GRAY color convertion, by problems in BRIEF accuracy test and Path_Idx_Cn_NPoints_WSize perfomance test
11 years ago
ad23ef2a42
Remove unused #include "ippverdion.h"
11 years ago
9d138b2bbe
Enable ipp MeanStdDev calculation for 32F_C1 images. Decrease accuracy sanity check of the perfomance test
11 years ago
c29583eacc
Change Canny input image description, we can use multichannel image now
11 years ago
ee2df645f4
Canny uncommented, prefix of ipp function changed. Ipp version of Canny called only for images with one channels
11 years ago
9b6feee1a5
Change sanity check for perfomance test of dft
11 years ago
a6b53489e6
Change sanity check for perfomance test of bilateral filter
11 years ago
aece433b15
Check ippStsNoErr as result of ipp function instead >=0
11 years ago
c65e5a1e7b
Fix error BGRA2RGBA color convertion by ipp. Uncomment ipp color converstion, which pass tests
11 years ago
b3db990daa
Remove unused code
11 years ago
07e84c635a
Remove unused code
11 years ago
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
11 years ago
3b03044047
Fix warning
11 years ago
58de8bc917
Change deprecated functions to valid
11 years ago
01a66a2938
Prepare codes for ippicv library
11 years ago
c2f859569c
Merge pull request #2563 from alalek:ipp_builds
11 years ago
Tony
Andrey Pavlenko
Ilya Lavrenov
vbystricky
Elena Gvozdeva
Roman Donchenko
krodyush