Tony
47d4f8cd61
Merge remote-tracking branch 'upstream/master' into gtk3
...
Conflicts:
CMakeLists.txt
2014-04-10 20:10:28 +01:00
Ilya Lavrenov
b970ec7dae
parallel version
2014-04-10 19:39:00 +04:00
Elena Gvozdeva
43c29a6751
fixed
2014-04-10 17:26:38 +04:00
Alexander Karsakov
7369cfd9ec
Added perf test for cornerMinEigenVal
2014-04-10 16:09:48 +04:00
Vadim Pisarevsky
f417c79d16
Merge pull request #1932 from seth-planet:master
2014-04-10 13:36:14 +04:00
Vadim Pisarevsky
604a64b206
Merge pull request #2390 from nicolasmartin3d:master_bug3546
2014-04-10 13:33:43 +04:00
Vadim Pisarevsky
a0bf7f82ba
Merge pull request #2067 from pemmanuelviel:groupWiseCenterChooser
2014-04-10 13:33:29 +04:00
Vadim Pisarevsky
dae04aacc3
Merge pull request #2575 from rold2007:Bugfix_1437
2014-04-10 13:31:33 +04:00
Vadim Pisarevsky
b66adc81a4
Merge pull request #2599 from maksqwe:test_calibration_2.4
2014-04-10 13:30:37 +04:00
Vadim Pisarevsky
b5755b1228
Merge pull request #2588 from vpisarev:fix_samples_n_unused
2014-04-10 13:30:20 +04:00
Vadim Pisarevsky
211d44cfc5
Merge pull request #2591 from Nerei:viz_cloud_shading_support
2014-04-10 13:29:58 +04:00
Ilya Lavrenov
b2379b51b5
cv::countNonZero
2014-04-10 13:21:52 +04:00
Tony
34984328fd
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
CMakeLists.txt
2014-04-10 08:07:02 +01:00
Alexander Karsakov
d9556a998f
Added ippiMinEigenVal_ to cv::cornerMinEigenVal
2014-04-10 11:00:08 +04:00
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
2014-04-09 22:07:59 +01:00
Maks Naumov
eb89f5207c
remove unused variables in CV_KDTreeTest_CPP::findNeighbors()
2014-04-09 23:07:48 +03:00
Maks Naumov
29d1bce85f
remove unused variable in TEST_P()
2014-04-09 23:06:06 +03:00
Maks Naumov
79eb3c5cde
remove unused variable in OCL_PERF_TEST_P()
2014-04-09 23:04:29 +03:00
Maks Naumov
befbe89bdf
remove unused variable in ocl_moments()
2014-04-09 23:01:49 +03:00
Maks Naumov
eb45cf0c93
remove unused variable in findCorners_caller()
2014-04-09 22:59:52 +03:00
Maks Naumov
9b52b61451
remove unused variable in HOGDescriptor::groupRectangles()
2014-04-09 22:56:19 +03:00
Maks Naumov
a01659825c
remove unused variable in loadFromXML()
2014-04-09 22:53:36 +03:00
Maks Naumov
c098c18942
Merge pull request #1 from Itseez/2.4
...
2.4
2014-04-09 22:48:19 +03:00
Ilya Lavrenov
18ef25ec30
cv::calcHist
2014-04-09 21:46:09 +04:00
Aaron Kunze
785acc1834
Fixes global size issue, adds #pragma unroll to loops
2014-04-09 08:42:55 -07:00
Alexander Alekhin
03773cb117
remove ippasync samples from build without IPP-A
2014-04-09 18:58:53 +04:00
Andrey Pavlenko
7b366df822
Merge pull request #2589 from alalek:icv_update
2014-04-09 18:23:35 +04:00
Andrey Pavlenko
cd02a7002b
Merge pull request #2596 from ilya-lavrenov:tapi_setto
2014-04-09 18:23:15 +04:00
Alexander Alekhin
ab691a4a24
ipp: some functions are not available in the ICV package #2
2014-04-09 18:20:49 +04:00
Alexander Alekhin
0d477ffea1
ipp: some functions are not available in the ICV package
2014-04-09 18:20:49 +04:00
Alexander Alekhin
1461ab41bc
ipp: added support for updated ICV package
2014-04-09 18:20:49 +04:00
Maks Naumov
b033a63e63
fix typo in test_cameracalibration
2014-04-09 14:41:16 +03:00
vbystricky
b6d58d1d3b
Fix ipp ifdef
2014-04-09 14:53:59 +04:00
vbystricky
d9013a85f1
Fix IPP version ifdef
2014-04-09 14:49:37 +04:00
vbystricky
8899ec1586
Add IPP version of Moments calculattion of image
2014-04-09 14:49:36 +04:00
Andrey Pavlenko
ced81b9121
Merge pull request #2594 from arkunze:pullreq/140319-dll-shutdown-fix-b
2014-04-09 14:25:12 +04:00
Andrey Pavlenko
e9bc737485
Merge pull request #2584 from akarsakov:ipp_threshold
2014-04-09 14:17:48 +04:00
Andrey Pavlenko
e6d6a3a85b
Merge pull request #2586 from ilya-lavrenov:ipp_disable
2014-04-09 14:16:25 +04:00
Ilya Lavrenov
bcd7151867
added UMat::setTo accuracy test
2014-04-09 14:15:22 +04:00
Andrey Pavlenko
e013f04669
Merge pull request #2583 from ilya-lavrenov:ippicv
2014-04-09 14:14:14 +04:00
Andrey Pavlenko
96484e1ad7
Merge pull request #2592 from ilya-lavrenov:tests
2014-04-09 14:06:14 +04:00
Ilya Lavrenov
4a63b3dd90
cv2cvtest part2
2014-04-09 13:08:51 +04:00
Alexander Karsakov
a66db67b83
Attempt to improve performance
2014-04-09 11:54:09 +04:00
Alexander Karsakov
35494f81ef
Added ippiThreshold to cv::threshold
2014-04-09 11:41:35 +04:00
Elena Gvozdeva
6119ae0ea9
fixed
2014-04-09 11:09:51 +04:00
David Rolland
cb8ddb1179
Corrected bug #1437 . Corrected the cast of two short values from an lParam. lParam contains two signed-short, the position can be negative when another mouse event happens with a mouse_move (mouse_click, etc.)
...
The Microsoft documentation specifies NOT to use LOWORD and HIWORD macros to extract the x/y positions as it won't work correctly with multiple monitors. See http://msdn.microsoft.com/en-us/library/windows/desktop/ms645607(v=vs.85).aspx .
2014-04-09 18:24:21 +12:00
Aaron Kunze
629ddf0bf8
Resolves bug #3450 (Improperly cleaning up resources in DllMain)
2014-04-08 16:21:33 -07:00
Aaron Kunze
bea2515f0e
Optimizations for OpenCL color conversion.
2014-04-08 15:58:04 -07:00
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.
2014-04-08 23:13:27 +01:00
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.
2014-04-08 21:21:40 +01:00
