vbystricky
07e84c635a
Remove unused code
2014-04-07 14:26:45 +04:00
vbystricky
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
2014-04-07 14:26:45 +04:00
vbystricky
3b03044047
Fix warning
2014-04-07 14:26:44 +04:00
vbystricky
58de8bc917
Change deprecated functions to valid
2014-04-07 14:24:06 +04:00
vbystricky
01a66a2938
Prepare codes for ippicv library
2014-04-07 14:24:05 +04:00
Andrey Pavlenko
c2f859569c
Merge pull request #2563 from alalek:ipp_builds
2014-04-07 13:03:11 +04:00
Maks Naumov
8271bd5f14
fix condition in CV_OperationsTest::operations1()
2014-04-07 11:24:27 +03:00
Roman Donchenko
1cee868e88
Merge pull request #2572 from jet47:gpu-generalized-hough
2014-04-07 11:57:52 +04:00
Andrey Pavlenko
def4f5e2a3
Merge pull request #2499 from mlyashko:back_proj_fix1
2014-04-07 10:57:21 +04:00
Vladislav Vinogradov
d822d6f101
disable GeneralizedHough tests on gcc 4.7
2014-04-07 09:49:17 +04:00
akrynski
1dba47b77b
Update crop_face.py
...
I propose some changes, to automate file cropping
2014-04-06 18:48:38 +02:00
Tony
572e4f5255
Merge remote-tracking branch 'upstream/master'
2014-04-06 11:49:23 +01:00
Ievgen Khvedchenia
5848e75168
Clean-up from unused utils.h/utils/cpp
2014-04-05 15:25:59 +03:00
Ievgen Khvedchenia
17f305140b
Added unit-tests for KAZE and AKAZE features
2014-04-05 10:25:59 +03:00
Ievgen Khvedchenia
137ff7eccb
Added KAZE and AKAZE wrappers
2014-04-05 10:25:46 +03:00
Ievgen Khvedchenia
703e012a5b
Prepare KAZE and AKAZE sources for integration
2014-04-05 10:24:27 +03:00
Ievgen Khvedchenia
7a59435490
KAZE and AKAZE integration initial commit
2014-04-04 14:25:38 +03:00
Andrey Pavlenko
d1710a8547
Merge pull request #2562 from akarsakov:gftt_fix
2014-04-04 13:34:31 +04:00
krodyush
4ca695cab0
Merge remote-tracking branch 'github/master' into pullreq/140319-PyrLKOpticalFlow
...
Conflicts:
modules/video/src/opencl/pyrlk.cl
2014-04-04 11:26:08 +04:00
Vladislav Vinogradov
f8d922ad3e
disable gpu::GeneralizedHough compilation on gcc 4.7
2014-04-04 10:31:33 +04:00
Andrey Pavlenko
5a3200d513
Merge pull request #2567 from apavlenko:fix_compare_scalar
2014-04-03 22:08:18 +04:00
Andrey Pavlenko
9a3895d842
Merge pull request #2556 from DeanF:master
2014-04-03 17:07:06 +04:00
Alexander Karsakov
c747426fc1
Enabled integer arithmetic for filterSepSinglePass
2014-04-03 16:53:57 +04:00
Andrey Pavlenko
271f60ba7a
fixing OCL run condition (build program failure for comparison 64F Mat with Scalar)
2014-04-03 16:21:04 +04:00
Alexander Alekhin
bfc546d23c
enable IPP ICV support
2014-04-03 15:05:38 +04:00
Elena Gvozdeva
037ac27ec8
Added SharedMatrix
2014-04-03 14:53:27 +04:00
Alexander Karsakov
fc10ffefb8
Enabled integer arithmetic for row_filter_C1_D0
2014-04-03 13:31:06 +04:00
Alexander Karsakov
2cf3a6e26c
Fixed error in case corners not found
2014-04-03 10:30:55 +04:00
Alexander Karsakov
a3825acee4
Small refactoring
2014-04-02 16:38:32 +04:00
Andrey Pavlenko
2aab7b2926
Merge pull request #2557 from ilya-lavrenov:tapi_fnlm_fix
2014-04-02 13:01:08 +04:00
Roman Donchenko
c165f07319
Merge pull request #2550 from SpecLad:merge-2.4
2014-04-02 12:00:01 +04:00
Tony
7daec9e9a8
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).
2014-04-01 23:01:18 +01:00
Ilya Lavrenov
2cd51c04e4
fixed condition in cv::FNLM
2014-04-01 23:18:07 +04:00
DeanF
48df67a9c5
Fixed trailing whitespace
2014-04-01 22:04:58 +03:00
DeanF
bdc91c66c9
Fixed problem with compilation without HAVE_OPENCL
...
When compiling without OpenCL, some classes from its namespace are still used in code.
2014-04-01 21:20:13 +03:00
Elena Gvozdeva
fa2d79a15b
Added IPP Async converters, doc and sample
2014-04-01 16:47:29 +04:00
Andrey Pavlenko
6ef94b52ad
Merge pull request #2536 from ilya-lavrenov:tapi_resize_linear
2014-04-01 12:54:07 +04:00
Roman Donchenko
a8cb5c3983
Merge pull request #2554 from asmorkalov:ocv_249_version
2014-04-01 12:16:25 +04:00
Alexander Smorkalov
e23f7303a6
OpenCV version++. OpenCV Manager version++.
2014-03-31 15:00:25 -07:00
Tony
7f671406db
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
2014-03-31 22:05:09 +01:00
Andrey Pavlenko
0d5ffec521
Merge pull request #2553 from ilya-lavrenov:typo
2014-03-31 23:21:07 +04:00
Andrey Pavlenko
aa3c4ae5d2
Merge pull request #2552 from ilya-lavrenov:tapi_compare
2014-03-31 21:22:00 +04:00
Andrey Pavlenko
97eac3f394
Merge pull request #2551 from ilya-lavrenov:ocl_nonfree
2014-03-31 21:21:27 +04:00
Ilya Lavrenov
31f864a22b
integer cv::resize (INTER_LINEAR && CV_8UC(cn))
2014-03-31 20:25:53 +04:00
Andrey Pavlenko
bb3c0c066c
Merge pull request #2548 from jet47:gpu_mog2_test
2014-03-31 20:19:21 +04:00
Ilya Lavrenov
9b9769169f
doc typos
2014-03-31 19:57:05 +04:00
Andrey Pavlenko
d170faeb5c
Merge pull request #2549 from ilya-lavrenov:tapi_laplacian
2014-03-31 19:36:44 +04:00
Andrey Pavlenko
6c2d77079f
Merge pull request #2487 from ilya-lavrenov:tapi_perf_orb
2014-03-31 18:17:50 +04:00
Ilya Lavrenov
322b15a459
compare with scalar (cn > 1)
2014-03-31 17:50:16 +04:00
Ilya Lavrenov
7df92bbb77
fixed C4505
2014-03-31 17:30:15 +04:00