Tony
8fd11f477b
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.
11 years ago
Tony
47d4f8cd61
Merge remote-tracking branch 'upstream/master' into gtk3
...
Conflicts:
CMakeLists.txt
11 years ago
Tony
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
Andrey Pavlenko
7b366df822
Merge pull request #2589 from alalek:icv_update
11 years ago
Andrey Pavlenko
cd02a7002b
Merge pull request #2596 from ilya-lavrenov:tapi_setto
11 years ago
Alexander Alekhin
ab691a4a24
ipp: some functions are not available in the ICV package #2
11 years ago
Alexander Alekhin
0d477ffea1
ipp: some functions are not available in the ICV package
11 years ago
Alexander Alekhin
1461ab41bc
ipp: added support for updated ICV package
11 years ago
Andrey Pavlenko
ced81b9121
Merge pull request #2594 from arkunze:pullreq/140319-dll-shutdown-fix-b
11 years ago
Andrey Pavlenko
e9bc737485
Merge pull request #2584 from akarsakov:ipp_threshold
11 years ago
Andrey Pavlenko
e6d6a3a85b
Merge pull request #2586 from ilya-lavrenov:ipp_disable
11 years ago
Ilya Lavrenov
bcd7151867
added UMat::setTo accuracy test
11 years ago
Andrey Pavlenko
e013f04669
Merge pull request #2583 from ilya-lavrenov:ippicv
11 years ago
Andrey Pavlenko
96484e1ad7
Merge pull request #2592 from ilya-lavrenov:tests
11 years ago
Ilya Lavrenov
4a63b3dd90
cv2cvtest part2
11 years ago
Alexander Karsakov
35494f81ef
Added ippiThreshold to cv::threshold
11 years ago
Aaron Kunze
629ddf0bf8
Resolves bug #3450 (Improperly cleaning up resources in DllMain)
11 years ago
Tony
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
Tony
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
Ilya Lavrenov
444ab0ef0d
fixed (IppiSize&)sz
11 years ago
Ilya Lavrenov
c735594178
cv::scaleAdd
11 years ago
Ilya Lavrenov
fd3a6f0db7
cv::blur
11 years ago
Ilya Lavrenov
a624ec167d
cv::Mat::convertTo
11 years ago
Ilya Lavrenov
b72b256fda
cv::pow (added ippiSqr_32f_C1R for power=2)
11 years ago
Ilya Lavrenov
b56b9c43dc
cv::updateMotionHistory
11 years ago
Ilya Lavrenov
77723db034
cv::flip
11 years ago
Ilya Lavrenov
f2a35d6388
cv::boxFilter
11 years ago
Ilya Lavrenov
c6f208e1c8
cv::medianBlur
11 years ago
Ilya Lavrenov
ed1ca00bf6
cv::magnitude
11 years ago
Ilya Lavrenov
bf860dbb31
cv::pow
11 years ago
Ilya Lavrenov
49d1691a3e
cv::sqrt
11 years ago
Ilya Lavrenov
c224cfa628
cv::accumulateSquare && cv::acumulateProduct
11 years ago
Ilya Lavrenov
2c0c887f70
cv::accumulateWeighted
11 years ago
Ilya Lavrenov
5ddff235bb
cv::polarToCart
11 years ago
Ilya Lavrenov
46cb4e0cbc
cv::transpose
11 years ago
Ilya Lavrenov
f1b38c4198
cv::warpPerspective and cv::warpAffine
11 years ago
Ilya Lavrenov
e090aa07db
disabled some IPP funcs
11 years ago
Tony
d60be58a92
Merge remote-tracking branch 'upstream/master' into gtk3
...
Conflicts:
CMakeLists.txt
11 years ago
Andrey Pavlenko
5600bc54f4
Merge pull request #2585 from ilya-lavrenov:norm
11 years ago
Andrey Pavlenko
ac92d4c701
Merge pull request #2566 from krodyush:pullreq/140319-PyrLKOpticalFlow
11 years ago
Ilya Lavrenov
aa5326c231
cv::norm -> cvtest::norm in tests
...
Conflicts:
modules/core/src/stat.cpp
11 years ago
Andrey Pavlenko
a6ef45aa13
Merge pull request #2582 from vbystricky:ipp_fix
11 years ago
vbystricky
9828cd6086
Remove defined(HAVE_IPP)
11 years ago
vbystricky
f23134ce01
Add IPP_VERSION_X100 define
11 years ago
Andrey Pavlenko
9ec823d800
Merge pull request #2538 from ElenaGvozdeva:ipp_async_convert
11 years ago
Elena Gvozdeva
f9c5289483
fixed
11 years ago
Roman Donchenko
6f055d7a76
Merge pull request #2580 from SpecLad:merge-2.4
11 years ago
krodyush
616ec74beb
fix previous merge error
11 years ago
vbystricky
7badc85b60
Fix for pullrequest comment
11 years ago
vbystricky
2d54581971
Fix ifdef for IPP version greater 8.1
11 years ago