Roman Donchenko
e8d26b02ac
Merge pull request #2339 from jet47:gpu-warnings
2014-02-17 13:35:15 +04:00
Roman Donchenko
7358b44222
Merge pull request #2343 from yashdv:template_matching_doc_fix
2014-02-17 13:33:29 +04:00
Roman Donchenko
b6dafed5ba
Merge pull request #2342 from yashdv:android_doc_fix
2014-02-17 12:21:20 +04:00
Roman Donchenko
8cbb284b7b
Merge pull request #2348 from ilya-lavrenov:typo
2014-02-17 12:02:59 +04:00
Roman Donchenko
9fcb0b2201
Merge pull request #2349 from jet47:fix-bug-3552
2014-02-17 11:52:01 +04:00
Roman Donchenko
aad289a3a2
Merge pull request #2344 from kirill-kornyakov:replace-gittip-button
2014-02-17 11:48:03 +04:00
Vladislav Vinogradov
150e522bee
fix bug #3552 :
...
replace std::swap with own code
2014-02-16 12:17:17 +04:00
Ilya Lavrenov
510680a5df
typo
2014-02-16 01:42:02 +04:00
Kirill Kornyakov
ed1aa73dd3
Replaced Gittip button
2014-02-15 13:10:09 +04:00
yash
cce225f6e9
fixed doc/tutorials/imgproc/histograms/template_matching/template_matching.rst
2014-02-15 12:48:42 +05:30
yash
e2f5001b11
fixed doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
2014-02-14 23:04:03 +05:30
Vladislav Vinogradov
8b8c368148
fixed two warnings in gpu sources (-Wshadow, -Wno-sign-promo)
2014-02-14 17:56:03 +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
Stuart Cunningham
1454843b81
Fix build of libtiff on big endian host due to defined but empty WORDS_BIGENDIAN macro
2014-02-14 16:16:17 +11:00
Ilya Lavrenov
b92a46c130
some more fixes
2014-02-13 23:47:18 +04:00
Roman Donchenko
ecbe843061
Merge pull request #2333 from asmorkalov:java_dead_code_fix
2014-02-13 19:21:56 +04:00
Roman Donchenko
b4a535272c
Merge pull request #2332 from jet47:gpu-fixes
2014-02-13 19:21:45 +04:00
Alexander Smorkalov
dbe7634286
Dead code removed as this cannot be null in Java.
2014-02-13 18:17:47 +04:00
Roman Donchenko
b8d8b0568c
Merge pull request #2331 from asmorkalov:android_native_activity_finish
2014-02-13 17:57:46 +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
Alexander Smorkalov
7da3e98dfd
Application pause/resume fix for Android sample NativeActivity.
2014-02-13 16:47:02 +04:00
Stuart Cunningham
55b9c0374c
Fix cmake detection of build platform endianness
...
Improve comments to indicate actual usage of WORDS_BIGENDIAN where
it is tested with #ifdef rather than #if
2014-02-13 22:59:30 +11:00
Roman Donchenko
91ab92c349
Merge pull request #2318 from gongzg:2.4
2014-02-13 12:16:19 +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
Roman Donchenko
e55679079f
Merge pull request #2320 from asmorkalov:ocv_readme_license_install
2014-02-12 16:27:24 +04:00
Roman Donchenko
3994cfbc59
Merge pull request #2321 from asmorkalov:android_run_all_tests
2014-02-12 15:41:29 +04:00
Alexander Smorkalov
d02c291160
opencv_run_all_tests.sh implemented for Android SDK.
2014-02-12 14:21:58 +04: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
Alexander Smorkalov
e55f2b2602
LICENSE and README files installation rules added.
2014-02-12 14:06:41 +04: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
Roman Donchenko
bb4199b177
Merge pull request #2314 from ilya-lavrenov:typo
2014-02-11 17:06:38 +04:00
Ilya Lavrenov
281666887e
typo
2014-02-11 14:25:37 +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
Roman Donchenko
5a8363a44e
Merge pull request #2301 from jet47:fix-nonfree-build
2014-02-07 15:34:46 +04:00
Roman Donchenko
d534d04f25
Merge pull request #2297 from asmorkalov:ocv_testdata_install_perms_fix
2014-02-07 15:33:59 +04:00
Vladislav Vinogradov
bfc27271e2
Revert "disable gpu Canny and HoughCircles perf tests:"
...
This reverts commit dbce90692a
2014-02-07 14:55:06 +04:00
Alexander Smorkalov
b86088b89c
Implicit testdata directory permissions setup added.
2014-02-07 14:42:35 +04:00
Roman Donchenko
c1b6bf21d5
Merge pull request #2300 from asmorkalov:android_no_cuda_not_armeabiv7a
2014-02-07 14:39:09 +04:00
Vladislav Vinogradov
3e1f74f2ca
fix nonfree module compilation without CUDA
2014-02-07 13:40:37 +04:00
