Ilya Lavrenov
510680a5df
typo
2014-02-16 01:42:02 +04:00
Anatoly Baksheev
03bd82796d
source compatibility with master
2014-02-15 23:40:09 +04:00
Anatoly Baksheev
56754e907d
fixed crash for windows if console widow is closed or CTRL_C/CTRL_BRAK keys in console are pressed.
2014-02-15 20:08:04 +04:00
Anatoly Baksheev
1a5dfe421d
Added WidgetMerger, Polyline - colors support for each point independently, simple widgets now compute color array instead of setting global color
2014-02-15 17:02:17 +04:00
Vladislav Vinogradov
8b8c368148
fixed two warnings in gpu sources (-Wshadow, -Wno-sign-promo)
2014-02-14 17:56:03 +04:00
Alexander Alekhin
d1606b4aa3
ocl: added SVM perf test
2014-02-14 16:36:46 +04:00
Roman Donchenko
e0d991cf46
Merge pull request #2335 from jet47:gpu-alphacomp-test
2014-02-14 16:20:45 +04:00
Roman Donchenko
fa272c43c2
Merge pull request #2323 from stuart8c:issue2601_2.4_fix_16bit_tiff_reading_on_big_endian_host
2014-02-14 15:37:09 +04:00
Roman Donchenko
a1de9e9ad5
Merge pull request #2329 from ilya-lavrenov:macosx_ogl
2014-02-14 14:38:37 +04:00
Vladislav Vinogradov
1ce5165cb7
temporary disable performance test for alphaComp function
2014-02-14 14:27:43 +04:00
Roman Donchenko
ecbe843061
Merge pull request #2333 from asmorkalov:java_dead_code_fix
2014-02-13 19:21:56 +04:00
Alexander Smorkalov
dbe7634286
Dead code removed as this cannot be null in Java.
2014-02-13 18:17:47 +04:00
Vladislav Vinogradov
eb247d826f
temporary disable perf test for StereoBeliefPropagation
2014-02-13 17:25:59 +04:00
Vladislav Vinogradov
9e69e2a07a
increase epsilon for AlphaComp sanity test for integer input
2014-02-13 17:16:43 +04:00
Ilya Lavrenov
879c0196d4
enabled OpenGL on MacOSX
2014-02-13 00:17:15 +04:00
Stuart Cunningham
5d43d3ca88
Fix Windows build of grfmt_tiff.cpp by using libtiff's integer types.
2014-02-12 23:41:38 +11:00
Stuart Cunningham
8bbce0a2a2
Fix reading of 16-bit TIFF images on big endian host.
...
Use correct integer types for arguments to TIFFGetField to avoid corruption
of values and failed loads of TIFF file when using cv::imread().
Added test where both big and little endian TIFF files are read using imread().
Fixed build of 3rdparty libtiff on big endian hosts.
Reduced memory required during decode_tile16384x16384 test by not converting
large grayscale test image to color image during read.
2014-02-12 21:21:06 +11:00
Zhigang Gong
9aef26e2ad
Workaround a LLVM/Clang 3.3 bug.
...
The LLVM/Clang 3.3 has a bug when compile a cl kernel with
assignment of a scalar to a vector data type. This patch
could work around this bug.
Signed-off-by: Zhigang Gong <zhigang.gong@intel.com>
2014-02-12 13:14:43 +08:00
Anatoly Baksheev
261546f6f6
casting Vec3b operator for viz::Color
2014-02-11 23:27:19 +04:00
Anatoly Baksheev
f1c062c30a
cloud collection finalize
2014-02-10 15:45:46 +04:00
Anatoly Baksheev
5dc17f5d58
Fixed all OpenGL issues for Macos (via objective-C++ layer)
2014-02-10 15:45:46 +04:00
Anatoly Baksheev
069dd8a068
default meshlab background
2014-02-10 15:45:45 +04:00
Anatoly Baksheev
f8ccc115ef
proper render call order (fixes some issues with VTK6.1)
2014-02-10 15:45:45 +04:00
Anatoly Baksheev
17fea0dd0a
fixed size_t/int conversion warnings
2014-02-10 15:45:45 +04:00
Anatoly Baksheev
998aefd1d1
cloud collection merges data only on rendering
2014-02-10 15:45:44 +04:00
Anatoly Baksheev
eb8728d727
Updated cloud io functionality - removed dependency from VTK legacy
2014-02-10 15:45:44 +04:00
Roman Donchenko
63dbe66b41
Merge pull request #2308 from jet47:gpu-tests-timeout
2014-02-10 15:10:31 +04:00
Roman Donchenko
3cc27c769c
Merge pull request #2309 from Nerei:fixed_cl_exe_hang_with_eigen
2014-02-10 14:59:05 +04:00
Anatoly Baksheev
becbfa6281
Fixed Cl.exe hang for VS2008 x64 with Eigen::exp() function
2014-02-10 13:41:27 +04:00
Vladislav Vinogradov
8b44a42a40
decrease input size for several gpu tests to fix "timed out" error:
...
* BruteForceNonLocalMeans
* OpticalFlowBM
2014-02-10 11:50:14 +04:00
Roman Donchenko
1d68a89947
Merge pull request #2303 from jet47:gpu-canny-fix
2014-02-07 19:03:14 +04:00
Roman Donchenko
48f95d92ae
Merge pull request #2294 from jet47:fix-gpu-issues
2014-02-07 16:54:49 +04:00
Vladislav Vinogradov
5dbdadb769
fixed several bugs in CUDA Canny implementation:
...
* out of border access in edgesHysteresisLocalKernel
* incorrect usage of atomicAdd
2014-02-07 16:04:29 +04:00
Vladislav Vinogradov
bfc27271e2
Revert "disable gpu Canny and HoughCircles perf tests:"
...
This reverts commit dbce90692acd84fbf46bde4da4b1726049f42857.
2014-02-07 14:55:06 +04:00
Vladislav Vinogradov
3e1f74f2ca
fix nonfree module compilation without CUDA
2014-02-07 13:40:37 +04:00
Vladislav Vinogradov
5d099df578
Revert "disable CUDA generalized Hough Transform"
...
This reverts commit 33d42b740c6fe938b63a0b25c9ad51741aba48c3.
2014-02-06 18:02:14 +04:00
Vladislav Vinogradov
3e4bb371c8
fix epsilons for several gpu tests
2014-02-06 18:02:14 +04:00
Vladislav Vinogradov
b6ba1f226c
Revert "disable gpu CvtColor.*2HSV tests:"
...
This reverts commit 952027a8536215a5e4308c79a59308c6b3426354.
2014-02-06 18:02:14 +04:00
Vladislav Vinogradov
da44a2fac1
Revert "disable gpu Subtract_Array test:"
...
This reverts commit e91bf95d5832e87aa70240c50f0bf7fcc587e8c8.
2014-02-06 18:02:14 +04:00
Alexander Smorkalov
6ae4a9b09b
Multiple improvements in OpenCV examples build.
...
EMBED_CUDA and FORCE_EMBED_OPENCV flags added to cmake macro add_android_project;
INSTALL_CUDA_LIBRARIES option added to OpenCV.mk
opencv_dynamicuda library installation with enabled OPENCV_INSTALL_MODULES flag fixed;
CUDA initialization apportunity added to OpenCVLoader.initDebug();
Tutorial-4-CUDA sample reimplemented with static OpenCV and CUDA initialization.
2014-02-06 15:32:57 +04:00
Konstantin Matskevich
435615ba2e
update test CascadeClassifier
2014-02-05 12:23:36 +04:00
Vadim Pisarevsky
b8c6adc569
Merge pull request #2178 from Nerei:viz_backport
2014-02-03 16:16:51 +04:00
Roman Donchenko
cd1ffd169c
Merge pull request #2261 from jet47:stitching-cuda-android
2014-02-03 15:35:55 +04:00
Andrey Pavlenko
a1ad1f0800
Merge pull request #2259 from ilya-lavrenov:ocl_surf
2014-02-03 14:24:36 +04:00
Vladislav Vinogradov
a138e5a6a5
turn on CUDA part of stitching module on Android for non-dynamic build
2014-02-03 12:35:24 +04:00
Vladislav Vinogradov
d8f7377122
turn on CUDA part of nonfree module on Android for non-dynamic build
2014-02-03 11:52:43 +04:00
Ilya Lavrenov
ede5b23753
rewrote perf tests for SURF
2014-02-03 02:00:29 +04:00
Roman Donchenko
2bef73c968
Merge pull request #2249 from jet47:gpu-tests-disable
2014-01-31 20:49:05 +04:00
Roman Donchenko
a518d7a1cb
Merge pull request #2248 from jet47:gpu-npp-disable
2014-01-31 20:48:52 +04:00
Roman Donchenko
9ef8aeadd3
Merge pull request #2247 from jet47:gpu-test-cufft
2014-01-31 20:48:38 +04:00