Roman Donchenko [Tue, 4 Mar 2014 09:51:30 +0000 (13:51 +0400)]
Merge pull request #2439 from ilya-lavrenov:typo
Ilya Lavrenov [Mon, 3 Mar 2014 15:37:47 +0000 (19:37 +0400)]
typos
Roman Donchenko [Tue, 4 Mar 2014 07:46:28 +0000 (11:46 +0400)]
Merge pull request #2432 from ilya-lavrenov:summary_py
Ilya Lavrenov [Sun, 2 Mar 2014 12:08:37 +0000 (16:08 +0400)]
ability to merge logs with intersections only
Roman Donchenko [Mon, 3 Mar 2014 08:20:34 +0000 (12:20 +0400)]
Merge pull request #2433 from ilya-lavrenov:typos
Ilya Lavrenov [Sun, 2 Mar 2014 17:04:17 +0000 (21:04 +0400)]
typos
Andrey Pavlenko [Fri, 28 Feb 2014 14:22:03 +0000 (18:22 +0400)]
Merge pull request #2421 from akarsakov:fix_ocl_haar_intel
Alexander Karsakov [Wed, 26 Feb 2014 14:11:11 +0000 (18:11 +0400)]
OCL: Fix for Haar classifier (thanks to Konstantin Rodyushkin).
Roman Donchenko [Wed, 26 Feb 2014 13:34:49 +0000 (17:34 +0400)]
Merge pull request #2419 from linquize:tgit.icon
Linquize [Tue, 25 Feb 2014 15:34:41 +0000 (23:34 +0800)]
Add tgit.icon project config
Roman Donchenko [Tue, 25 Feb 2014 11:04:23 +0000 (15:04 +0400)]
Merge pull request #2410 from asmorkalov:android_tiff_lowmem_fix
Roman Donchenko [Tue, 25 Feb 2014 08:37:01 +0000 (12:37 +0400)]
Merge pull request #2411 from asmorkalov:android_mat_leak_fix
Alexander Smorkalov [Tue, 25 Feb 2014 07:50:55 +0000 (11:50 +0400)]
Bug #3391 org.opencv.android.NativeCameraView crashes after latest OpenCV Manager update fixed.
The crash was cased by massive Mat objects leak in NativeCameraView class.
Alexander Smorkalov [Tue, 25 Feb 2014 06:36:20 +0000 (10:36 +0400)]
Highgui_Tiff.decode_tile16384x16384 disabled for Android.
Last changes in test leads to SIGKILL on Android.
SIGKILL is called by out of memory killer.
Andrey Pavlenko [Tue, 25 Feb 2014 05:12:32 +0000 (09:12 +0400)]
Merge pull request #2406 from ilya-lavrenov:abf
Ilya Lavrenov [Mon, 24 Feb 2014 19:26:01 +0000 (23:26 +0400)]
disabled ABF tests
Roman Donchenko [Mon, 24 Feb 2014 10:26:41 +0000 (14:26 +0400)]
Merge pull request #2398 from nghiaho12:integral_doc
Nghia Ho [Mon, 24 Feb 2014 09:06:20 +0000 (20:06 +1100)]
Typo
Roman Donchenko [Mon, 24 Feb 2014 08:44:36 +0000 (12:44 +0400)]
Merge pull request #2389 from SpecLad:ios-big-endian
Roman Donchenko [Fri, 21 Feb 2014 12:08:49 +0000 (16:08 +0400)]
Hardcode iOS's endianness, since the TestBigEndian module doesn't work there
Roman Donchenko [Fri, 21 Feb 2014 13:57:36 +0000 (17:57 +0400)]
Merge pull request #2201 from mattip:2.4
Matti Picus [Fri, 21 Feb 2014 11:54:58 +0000 (13:54 +0200)]
fix merge
Andrey Pavlenko [Fri, 21 Feb 2014 11:14:11 +0000 (15:14 +0400)]
Merge pull request #2384 from ilya-lavrenov:perf_match
Matti Picus [Fri, 21 Feb 2014 09:59:49 +0000 (11:59 +0200)]
merge with origin
Matti Picus [Thu, 20 Feb 2014 20:12:22 +0000 (22:12 +0200)]
fix code, it turns out only TIFFReadRGBATile needs buffer pointer mangling
Matti Picus [Thu, 20 Feb 2014 20:10:22 +0000 (22:10 +0200)]
add test (needs updated opencv_extra repo)
Ilya Lavrenov [Thu, 20 Feb 2014 14:55:08 +0000 (18:55 +0400)]
backport of master-based perf tests for matchTemplate to 2.4
Roman Donchenko [Thu, 20 Feb 2014 09:41:45 +0000 (13:41 +0400)]
Merge pull request #2380 from jet47:fix-3562
Vladislav Vinogradov [Thu, 20 Feb 2014 06:24:52 +0000 (10:24 +0400)]
fix bug #3562:
add missing __syncthreads to edgesHysteresisLocalKernel
Roman Donchenko [Wed, 19 Feb 2014 08:03:06 +0000 (12:03 +0400)]
Merge pull request #2368 from asmorkalov:ocv_gcc48_warning_fix
Roman Donchenko [Wed, 19 Feb 2014 08:02:40 +0000 (12:02 +0400)]
Merge pull request #2357 from akarsakov:fix_ipp_compilation_linux
Alexander Smorkalov [Tue, 18 Feb 2014 08:01:01 +0000 (12:01 +0400)]
Warning fixes for GCC 4.8.
Roman Donchenko [Tue, 18 Feb 2014 14:00:13 +0000 (18:00 +0400)]
Merge pull request #2371 from ilya-lavrenov:typo
Roman Donchenko [Tue, 18 Feb 2014 13:00:53 +0000 (17:00 +0400)]
Merge pull request #2370 from ilya-lavrenov:cuda_nlm_typo
Roman Donchenko [Tue, 18 Feb 2014 13:00:32 +0000 (17:00 +0400)]
Merge pull request #2359 from SpecLad:moments-no-vectorize
Roman Donchenko [Tue, 18 Feb 2014 11:44:56 +0000 (15:44 +0400)]
Merge pull request #2361 from alekcac:ios_camera_changes
Roman Donchenko [Tue, 18 Feb 2014 10:25:16 +0000 (14:25 +0400)]
Merge pull request #2338 from asmorkalov:ocv_gcov
Ilya Lavrenov [Tue, 18 Feb 2014 10:24:17 +0000 (14:24 +0400)]
typo
Ilya Lavrenov [Tue, 18 Feb 2014 10:16:54 +0000 (14:16 +0400)]
fixes typo and unused variables
Alexander Shishkov [Tue, 18 Feb 2014 09:56:26 +0000 (13:56 +0400)]
removed trailing spaces
Roman Donchenko [Mon, 17 Feb 2014 12:08:28 +0000 (16:08 +0400)]
Worked around an apparent GCC bug in moments.
Roman Donchenko [Tue, 18 Feb 2014 09:47:45 +0000 (13:47 +0400)]
Merge pull request #2366 from yashdv:mat_copyto_doc_bug
yash [Tue, 18 Feb 2014 09:34:27 +0000 (15:04 +0530)]
edited the doc for mat::copyto and clarified the part regarding reallocation by .create
Andrey Pavlenko [Tue, 18 Feb 2014 09:33:15 +0000 (13:33 +0400)]
Merge pull request #2235 from alalek:ocl_svm_perf_test
Alexander Smorkalov [Fri, 14 Feb 2014 13:43:33 +0000 (17:43 +0400)]
gcov tool support added.
Roman Donchenko [Tue, 18 Feb 2014 07:58:10 +0000 (11:58 +0400)]
Merge pull request #2365 from yashdv:image_tutorial_doc_bug
Roman Donchenko [Tue, 18 Feb 2014 07:57:35 +0000 (11:57 +0400)]
Merge pull request #2364 from ilya-lavrenov:unused_field
Roman Donchenko [Tue, 18 Feb 2014 07:56:57 +0000 (11:56 +0400)]
Merge pull request #2363 from alekcac:introduction_tut_fix
Roman Donchenko [Tue, 18 Feb 2014 07:56:36 +0000 (11:56 +0400)]
Merge pull request #2362 from alekcac:docs_style_change
Roman Donchenko [Tue, 18 Feb 2014 07:56:20 +0000 (11:56 +0400)]
Merge pull request #2360 from Evgenij-Gr:XLSreport
yash [Tue, 18 Feb 2014 05:21:05 +0000 (10:51 +0530)]
Made a sentence in the doc for Mat::copyTo more clearer
yash [Tue, 18 Feb 2014 05:04:58 +0000 (10:34 +0530)]
Minor error in the documentation Load and Save Image
Ilya Lavrenov [Mon, 17 Feb 2014 17:50:00 +0000 (21:50 +0400)]
removed unused field
Alexander Shishkov [Mon, 17 Feb 2014 14:10:08 +0000 (18:10 +0400)]
fixed incorrect code in introduction tutorial
Alexander Shishkov [Mon, 17 Feb 2014 13:56:12 +0000 (17:56 +0400)]
fixed year in copyright
Alexander Shishkov [Mon, 17 Feb 2014 13:37:02 +0000 (17:37 +0400)]
removed tabs
Evgeniy [Mon, 17 Feb 2014 13:01:23 +0000 (17:01 +0400)]
Added more colorizing options to XLS generating script
Alexander Karsakov [Mon, 17 Feb 2014 11:28:21 +0000 (15:28 +0400)]
Fixed compilation with IPP on Linux. Added linking with Intel compiler runtime libraries.
Roman Donchenko [Mon, 17 Feb 2014 09:35:15 +0000 (13:35 +0400)]
Merge pull request #2339 from jet47:gpu-warnings
Roman Donchenko [Mon, 17 Feb 2014 09:33:28 +0000 (13:33 +0400)]
Merge pull request #2343 from yashdv:template_matching_doc_fix
Marijan Vukcevich [Tue, 4 Feb 2014 18:10:50 +0000 (10:10 -0800)]
Update cap_ios_abstract_camera.mm
AVCaptureVideoPreviewLayer setOrientation is depricated. This fixes the warning and provides backward compatibility.
Roman Donchenko [Mon, 17 Feb 2014 08:21:19 +0000 (12:21 +0400)]
Merge pull request #2342 from yashdv:android_doc_fix
Roman Donchenko [Mon, 17 Feb 2014 08:02:58 +0000 (12:02 +0400)]
Merge pull request #2348 from ilya-lavrenov:typo
Roman Donchenko [Mon, 17 Feb 2014 07:52:00 +0000 (11:52 +0400)]
Merge pull request #2349 from jet47:fix-bug-3552
Roman Donchenko [Mon, 17 Feb 2014 07:48:03 +0000 (11:48 +0400)]
Merge pull request #2344 from kirill-kornyakov:replace-gittip-button
Vladislav Vinogradov [Sun, 16 Feb 2014 08:17:17 +0000 (12:17 +0400)]
fix bug #3552:
replace std::swap with own code
Ilya Lavrenov [Sat, 15 Feb 2014 21:42:02 +0000 (01:42 +0400)]
typo
Kirill Kornyakov [Sat, 15 Feb 2014 09:08:52 +0000 (13:08 +0400)]
Replaced Gittip button
yash [Sat, 15 Feb 2014 07:18:42 +0000 (12:48 +0530)]
fixed doc/tutorials/imgproc/histograms/template_matching/template_matching.rst
yash [Fri, 14 Feb 2014 17:34:03 +0000 (23:04 +0530)]
fixed doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
Vladislav Vinogradov [Fri, 14 Feb 2014 13:56:03 +0000 (17:56 +0400)]
fixed two warnings in gpu sources (-Wshadow, -Wno-sign-promo)
Alexander Alekhin [Thu, 30 Jan 2014 13:01:48 +0000 (17:01 +0400)]
ocl: added SVM perf test
Roman Donchenko [Fri, 14 Feb 2014 12:20:44 +0000 (16:20 +0400)]
Merge pull request #2335 from jet47:gpu-alphacomp-test
Roman Donchenko [Fri, 14 Feb 2014 11:37:09 +0000 (15:37 +0400)]
Merge pull request #2323 from stuart8c:issue2601_2.4_fix_16bit_tiff_reading_on_big_endian_host
Roman Donchenko [Fri, 14 Feb 2014 10:38:36 +0000 (14:38 +0400)]
Merge pull request #2329 from ilya-lavrenov:macosx_ogl
Vladislav Vinogradov [Fri, 14 Feb 2014 10:27:43 +0000 (14:27 +0400)]
temporary disable performance test for alphaComp function
Stuart Cunningham [Fri, 14 Feb 2014 05:16:17 +0000 (16:16 +1100)]
Fix build of libtiff on big endian host due to defined but empty WORDS_BIGENDIAN macro
Ilya Lavrenov [Thu, 13 Feb 2014 19:47:18 +0000 (23:47 +0400)]
some more fixes
Roman Donchenko [Thu, 13 Feb 2014 15:21:56 +0000 (19:21 +0400)]
Merge pull request #2333 from asmorkalov:java_dead_code_fix
Roman Donchenko [Thu, 13 Feb 2014 15:21:45 +0000 (19:21 +0400)]
Merge pull request #2332 from jet47:gpu-fixes
Alexander Smorkalov [Thu, 13 Feb 2014 14:17:47 +0000 (18:17 +0400)]
Dead code removed as this cannot be null in Java.
Roman Donchenko [Thu, 13 Feb 2014 13:57:45 +0000 (17:57 +0400)]
Merge pull request #2331 from asmorkalov:android_native_activity_finish
Vladislav Vinogradov [Thu, 13 Feb 2014 13:25:59 +0000 (17:25 +0400)]
temporary disable perf test for StereoBeliefPropagation
Vladislav Vinogradov [Thu, 13 Feb 2014 13:16:43 +0000 (17:16 +0400)]
increase epsilon for AlphaComp sanity test for integer input
Alexander Smorkalov [Thu, 13 Feb 2014 12:47:02 +0000 (16:47 +0400)]
Application pause/resume fix for Android sample NativeActivity.
Stuart Cunningham [Thu, 13 Feb 2014 11:59:30 +0000 (22:59 +1100)]
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
Roman Donchenko [Thu, 13 Feb 2014 08:16:18 +0000 (12:16 +0400)]
Merge pull request #2318 from gongzg:2.4
Ilya Lavrenov [Wed, 12 Feb 2014 20:17:15 +0000 (00:17 +0400)]
enabled OpenGL on MacOSX
Stuart Cunningham [Wed, 12 Feb 2014 12:41:38 +0000 (23:41 +1100)]
Fix Windows build of grfmt_tiff.cpp by using libtiff's integer types.
Roman Donchenko [Wed, 12 Feb 2014 12:27:24 +0000 (16:27 +0400)]
Merge pull request #2320 from asmorkalov:ocv_readme_license_install
Roman Donchenko [Wed, 12 Feb 2014 11:41:28 +0000 (15:41 +0400)]
Merge pull request #2321 from asmorkalov:android_run_all_tests
Alexander Smorkalov [Wed, 12 Feb 2014 06:56:57 +0000 (10:56 +0400)]
opencv_run_all_tests.sh implemented for Android SDK.
Stuart Cunningham [Wed, 12 Feb 2014 10:21:06 +0000 (21:21 +1100)]
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.
Alexander Smorkalov [Wed, 12 Feb 2014 06:29:53 +0000 (10:29 +0400)]
LICENSE and README files installation rules added.
Zhigang Gong [Wed, 12 Feb 2014 03:23:27 +0000 (11:23 +0800)]
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>
Roman Donchenko [Tue, 11 Feb 2014 13:06:38 +0000 (17:06 +0400)]
Merge pull request #2314 from ilya-lavrenov:typo
Ilya Lavrenov [Tue, 11 Feb 2014 10:25:37 +0000 (14:25 +0400)]
typo
Roman Donchenko [Mon, 10 Feb 2014 11:10:30 +0000 (15:10 +0400)]
Merge pull request #2308 from jet47:gpu-tests-timeout
Roman Donchenko [Mon, 10 Feb 2014 10:59:04 +0000 (14:59 +0400)]
Merge pull request #2309 from Nerei:fixed_cl_exe_hang_with_eigen
Anatoly Baksheev [Mon, 10 Feb 2014 09:41:27 +0000 (13:41 +0400)]
Fixed Cl.exe hang for VS2008 x64 with Eigen::exp() function