Andrey Kamaev [Fri, 30 Nov 2012 15:52:59 +0000 (19:52 +0400)]
Merge branch 2.4
Andrey Kamaev [Fri, 30 Nov 2012 13:09:30 +0000 (17:09 +0400)]
Adjust Android Manager version from 2.2 to 2.3
Andrey Kamaev [Fri, 30 Nov 2012 10:56:00 +0000 (14:56 +0400)]
Remove compiled pdf files from source control
The documentation is available online at http://opencv.org/documentation.html
Andrey Kamaev [Fri, 30 Nov 2012 10:33:28 +0000 (14:33 +0400)]
Adjust OpenCV version to 2.4.3.1
Andrey Kamaev [Fri, 30 Nov 2012 09:20:07 +0000 (01:20 -0800)]
Merge pull request #199 from apavlenko/remove_android_tutorial0
removing Android tutorial 0
Andrey Kamaev [Fri, 30 Nov 2012 08:53:26 +0000 (12:53 +0400)]
Merge pull request #191 from asmorkalov:custom_cam_init
Andrey Pavlenko [Fri, 30 Nov 2012 08:32:16 +0000 (12:32 +0400)]
removing Android tutorial 0 since it has become irrelevant after moving to the new application framework
Andrey Kamaev [Thu, 29 Nov 2012 16:29:22 +0000 (20:29 +0400)]
Merge pull request #198 from asmorkalov:disable_warp_tests
Alexander Smorkalov [Thu, 29 Nov 2012 08:51:49 +0000 (12:51 +0400)]
Code review comments applied
Sample renamed to CameraControl;
Picture taking added to show camera preview restart.
Alexander Smorkalov [Thu, 29 Nov 2012 13:27:44 +0000 (17:27 +0400)]
Some perf tests on warping and resize disabled on Android
MatInfo_Size_Size.resizeDownLinear
MatInfo_Size_Size.resizeUpLinear
TestWarpPerspectiveNear_t.WarpPerspectiveNear
TestWarpPerspective.WarpPerspective
Andrey Kamaev [Thu, 29 Nov 2012 09:27:34 +0000 (01:27 -0800)]
Merge pull request #194 from asmorkalov/v4l_fix
Patch #2323 applied
Andrey Kamaev [Thu, 29 Nov 2012 09:27:27 +0000 (01:27 -0800)]
Merge pull request #195 from vpisarev/inv3x3_fix
now invert 3x3 on "bad" matrices works well on Windows
Andrey Kamaev [Thu, 29 Nov 2012 09:27:14 +0000 (01:27 -0800)]
Merge pull request #196 from jet47/gpu-bug-2581
fixed Bug #2581
Vladislav Vinogradov [Thu, 29 Nov 2012 07:17:04 +0000 (11:17 +0400)]
fixed Bug #2581
GoodFeaturesToTrackDetector_GPU fails when no corners found
Vadim Pisarevsky [Wed, 28 Nov 2012 19:05:51 +0000 (23:05 +0400)]
now invert 3x3 on "bad" matrices works well on Windows
Alexander Smorkalov [Wed, 28 Nov 2012 17:53:39 +0000 (21:53 +0400)]
Patch #2323 "cap_libv4l.cpp clears default width and height after setting them" applied.
Andrey Kamaev [Wed, 28 Nov 2012 15:18:11 +0000 (07:18 -0800)]
Merge pull request #193 from AnnaKogan8/perf-tests-increase-time-limits
Increased time limits for perf tests
Andrey Kamaev [Wed, 28 Nov 2012 15:17:49 +0000 (07:17 -0800)]
Merge pull request #192 from taka-no-me/ndk_selection_fix
Android: always sort list of NDK toolchains
Anna Kogan [Wed, 28 Nov 2012 13:36:19 +0000 (17:36 +0400)]
increased time-limits
Anna Kogan [Wed, 28 Nov 2012 10:13:24 +0000 (14:13 +0400)]
increased time-limits
Andrey Kamaev [Wed, 28 Nov 2012 08:44:05 +0000 (12:44 +0400)]
Merge pull request #175 from taka-no-me:run_py
Andrey Kamaev [Wed, 28 Nov 2012 07:31:01 +0000 (11:31 +0400)]
Merge pull request #166 from askforeric:pvapi_updates
askforeric [Tue, 13 Nov 2012 21:10:22 +0000 (16:10 -0500)]
Refactored the PvAPI capture class to better facilitate dynamic property changes
- Added Gain control
- Changed default acquisition mode to grayscale
- Fixed a signed/unsigned compare issue
- Implemented frame resizing
- Implemented automatic buffer resizing on frame resize
- Corrected camera initialization so that it attempts to put the camera in Mono8
but does not fail if this doesn't succeed.
Andrey Kamaev [Tue, 27 Nov 2012 19:41:30 +0000 (23:41 +0400)]
Merge pull request #190 from asmorkalov:ninja_fix
Andrey Kamaev [Tue, 27 Nov 2012 14:14:59 +0000 (18:14 +0400)]
Android: always sort list of NDK toolchains
Order returned by CMake is unreliable but we need clang to go after gcc for
automatic toolchain selection.
Alexander Smorkalov [Tue, 27 Nov 2012 10:29:56 +0000 (14:29 +0400)]
Tutorial-5 functionality implemented.
Alexander Smorkalov [Tue, 27 Nov 2012 08:47:16 +0000 (12:47 +0400)]
Base for new sample added.
Andrey Kamaev [Tue, 27 Nov 2012 13:50:39 +0000 (17:50 +0400)]
Merge pull request #188 from asmorkalov:app_framework
Andrey Kamaev [Tue, 27 Nov 2012 13:48:54 +0000 (17:48 +0400)]
Merge pull request #189 from wswld:2.4
Alexander Smorkalov [Tue, 27 Nov 2012 13:30:05 +0000 (17:30 +0400)]
OpenCV Manager build via ninja (Bug #2575) fixed.
Vsevolod Glumov [Sat, 24 Nov 2012 09:29:10 +0000 (13:29 +0400)]
Added a note to the android_dev_intro.rst.
Alexander Smorkalov [Tue, 27 Nov 2012 10:55:49 +0000 (14:55 +0400)]
Code review comments applied.
Alexander Smorkalov [Tue, 27 Nov 2012 07:57:01 +0000 (11:57 +0400)]
Samples updated
In tutorial-1 fps meter enabled via layout.xml. Camera id is set to "any" via lauout.xml;
In tutorial-2 message moved ion the bottom of the screen.
Alexander Smorkalov [Tue, 27 Nov 2012 06:31:19 +0000 (10:31 +0400)]
Attribure loading from layout improved.
OpenCV namespace added;
Default values for camera_id added;
Aditional constructor with cameraId added.
Resolution added to FPS message.
Alexander Smorkalov [Thu, 22 Nov 2012 11:56:55 +0000 (15:56 +0400)]
OpenCV app framework improved
FPS meter added;
Camera switching posibility added;
Attributes loading for layout filed implemented.
Andrey Kamaev [Mon, 26 Nov 2012 18:34:42 +0000 (22:34 +0400)]
Merge pull request #186 from vpisarev:doc_fixes_master
Andrey Kamaev [Mon, 26 Nov 2012 18:33:01 +0000 (22:33 +0400)]
Merge pull request #187 from vpisarev:doc_fixes_2.4
Andrey Kamaev [Mon, 26 Nov 2012 18:32:38 +0000 (22:32 +0400)]
Merge pull request #183 from apavlenko:perf/android_filters_accuracy
Andrey Kamaev [Mon, 26 Nov 2012 18:32:22 +0000 (22:32 +0400)]
Merge pull request #185 from apavlenko:bug2569/simplify_samples_jni_code
Andrey Pavlenko [Mon, 26 Nov 2012 12:09:24 +0000 (16:09 +0400)]
Increase accuracy interval for image filters on Android and other platforms when sensible
Vadim Pisarevsky [Mon, 26 Nov 2012 16:40:45 +0000 (20:40 +0400)]
fixed building PDFs in master
Vadim Pisarevsky [Mon, 26 Nov 2012 14:48:23 +0000 (18:48 +0400)]
fixed a few compile errors/warnings in 2.4 branch of the docs
marina.kolpakova [Mon, 26 Nov 2012 14:10:21 +0000 (18:10 +0400)]
Merge pull requst #177 from cuda-geek/another-one-integral-fix
marina.kolpakova [Mon, 26 Nov 2012 13:57:56 +0000 (17:57 +0400)]
fixed typo
Andrey Pavlenko [Mon, 26 Nov 2012 08:13:33 +0000 (12:13 +0400)]
(#2569) simplifying code to avoid Eclipse CDT editor confusion, removing warnings and typos in comments
marina.kolpakova [Sat, 24 Nov 2012 23:26:50 +0000 (03:26 +0400)]
remove unnecessary copying in SURF
marina.kolpakova [Sat, 24 Nov 2012 23:21:51 +0000 (03:21 +0400)]
reintegrate warp shuffle based integral
marina.kolpakova [Sat, 24 Nov 2012 23:19:24 +0000 (03:19 +0400)]
fix cascade classifier GFF NMS for empty candidates vector
Andrey Kamaev [Sat, 24 Nov 2012 15:24:01 +0000 (19:24 +0400)]
Merge pull request #179 from cuda-geek:usr-bin-env-python
Andrey Kamaev [Sat, 24 Nov 2012 15:22:02 +0000 (19:22 +0400)]
Merge pull request #180 from mdim:fix_compile_error
Andrey Kamaev [Sat, 24 Nov 2012 15:20:53 +0000 (19:20 +0400)]
Merge pull request #178 from cuda-geek:fix-2504
Maria Dimashova [Sat, 24 Nov 2012 14:10:29 +0000 (18:10 +0400)]
fix a compile error in case of building without highgui
marina.kolpakova [Sat, 24 Nov 2012 12:50:29 +0000 (16:50 +0400)]
replace offsets in surf to simple copy for better speed
Andrey Kamaev [Sat, 24 Nov 2012 10:12:32 +0000 (14:12 +0400)]
run.py: add --check option for easy run of sanity checks
Andrey Kamaev [Sat, 24 Nov 2012 10:11:07 +0000 (14:11 +0400)]
run.py: improve handling of multiple Android devices
* do not lose auto-selected device while running several tests
* reduce output noise
* list available devices if unable to auto-select device
* fix error message when no devices connected
marina.kolpakova [Fri, 23 Nov 2012 21:55:03 +0000 (01:55 +0400)]
align grid by 4
marina.kolpakova [Fri, 23 Nov 2012 19:11:44 +0000 (23:11 +0400)]
fix for 2504: WITH_CUDA disabled with OSX in 2.4.3.
marina.kolpakova [Fri, 23 Nov 2012 18:57:22 +0000 (22:57 +0400)]
add #/usr/bin/env python to all python files
Andrey Kamaev [Fri, 23 Nov 2012 10:31:04 +0000 (14:31 +0400)]
Merge pull request #172 from asmorkalov:default_cam_lib_path
Andrey Kamaev [Fri, 23 Nov 2012 10:30:48 +0000 (14:30 +0400)]
Merge pull request #174 from asmorkalov:full_sreen_fix
marina.kolpakova [Fri, 23 Nov 2012 10:21:51 +0000 (14:21 +0400)]
Merge pull #173 request from cuda-geek/fix-sc-arm
Alexander Smorkalov [Fri, 23 Nov 2012 09:12:11 +0000 (13:12 +0400)]
Issue #2549 OpenCV Samples does not expand on full screen fixed.
All samples use application style in android manifest instead of system calls in onCreate event now.
marina.kolpakova [Thu, 22 Nov 2012 09:25:46 +0000 (13:25 +0400)]
fix tests for arm
Alexander Smorkalov [Thu, 22 Nov 2012 08:40:25 +0000 (12:40 +0400)]
Default native library path for native camera updated.
New versions tries to search library in arm-v7a and Manager packages only.
Alexander Smorkalov [Thu, 22 Nov 2012 08:39:06 +0000 (12:39 +0400)]
OpenCV Manager headers refactoring.
All constants moved to android independent header file.
Andrey Kamaev [Wed, 21 Nov 2012 10:55:38 +0000 (14:55 +0400)]
Merge pull request #171 from asmorkalov:android_8_neon_fix
Andrey Kamaev [Wed, 21 Nov 2012 10:50:53 +0000 (14:50 +0400)]
Merge pull request #168 from asmorkalov:android_42_camera_fix
Alexander Smorkalov [Tue, 20 Nov 2012 12:43:30 +0000 (16:43 +0400)]
Automatic minsdkversion setup added;
Linker problems on armeabi-v7a+NEON with Android 2.2 fixed;
Vadim Pisarevsky [Wed, 21 Nov 2012 07:43:18 +0000 (11:43 +0400)]
Merge branch 'ParallelVideoStreams' of https://github.com/ilya-lavrenov/opencv into 2.4
Alexander Smorkalov [Tue, 20 Nov 2012 08:59:42 +0000 (12:59 +0400)]
Issue #2547 Native camera does not work on Google Nexus 7 with Android 4.2 fixed;
Issue #2506 Unnecessary log printouts in OpenCV::camera fixed;
Native camera for MIPS Android 4.1.1 added.
Build script for camera updated.
Andrey Kamaev [Tue, 20 Nov 2012 15:12:00 +0000 (19:12 +0400)]
Merge branch 2.4
Conflicts:
android/service/engine/AndroidManifest.xml - use file from 2.4
modules/contrib/src/detection_based_tracker.cpp - move #include <pthread.h> as in 2.4
modules/java/android_test/src/org/opencv/test/OpenCVTestRunner.java - use file from 2.4
Andrey Kamaev [Tue, 20 Nov 2012 15:07:08 +0000 (19:07 +0400)]
Merge pull request #161 from apavlenko:fix/sdk_r21
Andrey Pavlenko [Tue, 20 Nov 2012 14:27:03 +0000 (18:27 +0400)]
Improving compatibility with the latest Android SDK (r21) and NDK (r8c).
- Adding Android SDK/ADT r21 compatibility;
- fixing stl headers path for new ndk;
- fixing native API level for Android projects
Andrey Kamaev [Tue, 20 Nov 2012 14:27:43 +0000 (18:27 +0400)]
Merge pull request #170 from asmorkalov:engine_build_fix
Andrey Kamaev [Tue, 20 Nov 2012 13:56:11 +0000 (17:56 +0400)]
Merging pull request #169 from taka-no-me:android-ndk-r8c
Andrey Kamaev [Tue, 20 Nov 2012 13:53:06 +0000 (17:53 +0400)]
Merging pull request #167 from asmorkalov:java_api_manager_test
Alexander Smorkalov [Tue, 20 Nov 2012 13:17:22 +0000 (17:17 +0400)]
Libinfo build fix;
Libinfo revision formating fix;
HW dependent VersionCode for Manager implemented.
Andrey Kamaev [Tue, 20 Nov 2012 13:33:33 +0000 (17:33 +0400)]
Merging pull request #162 from taka-no-me/opencv
Andrey Kamaev [Tue, 20 Nov 2012 13:23:02 +0000 (17:23 +0400)]
'Merging pull request 163 from asmorkalov/opencv'
Andrey Kamaev [Mon, 19 Nov 2012 11:16:13 +0000 (15:16 +0400)]
Fix Android build with clang compiler
Andrey Kamaev [Thu, 15 Nov 2012 08:44:57 +0000 (12:44 +0400)]
Update Android CMake toolchain for NDK r8c
Alexander Smorkalov [Tue, 20 Nov 2012 06:45:46 +0000 (10:45 +0400)]
Test execution inside Eclipse fixed;
OpenCV testing via OpenCV Manager implemented.
Ilya Lavrenov [Mon, 19 Nov 2012 12:44:23 +0000 (16:44 +0400)]
thread-safe VideoWriter and VideoCapture
Alexander Smorkalov [Mon, 19 Nov 2012 08:58:17 +0000 (12:58 +0400)]
Issue #2548 Missing static library libtbb.a for armeabi and mips build fixed.
Andrey Kamaev [Mon, 19 Nov 2012 07:43:28 +0000 (11:43 +0400)]
Update URL for TBB download. Update to TBB 4.1 update 1
Andrey Kamaev [Fri, 16 Nov 2012 13:44:34 +0000 (17:44 +0400)]
Merge pull request #160 from asmorkalov/android_4_2_manager_fix
Andrey Kamaev [Fri, 16 Nov 2012 13:44:02 +0000 (17:44 +0400)]
Merge pull request #159 from asmorkalov/libinfo_install_fix
Andrey Kamaev [Fri, 16 Nov 2012 13:43:21 +0000 (17:43 +0400)]
Merge pull request #157 from vpisarev/bug_fixes5
Alexander Smorkalov [Fri, 16 Nov 2012 13:01:25 +0000 (17:01 +0400)]
Issue #2537 OpenCV Manager doesn't work on Android 4.2 fixed.
Alexander Smorkalov [Thu, 15 Nov 2012 07:24:41 +0000 (11:24 +0400)]
Issue #2541 make install does not work for Android build fixed.
Andrey Kamaev [Wed, 14 Nov 2012 13:30:06 +0000 (17:30 +0400)]
Merge pull request #128 from LeonidBeynenson/fix_args_calcOpticalFlowSF
LeonidBeynenson [Wed, 14 Nov 2012 10:27:41 +0000 (14:27 +0400)]
Modified documentation for calcOpticalFlowSF.
marina.kolpakova [Tue, 13 Nov 2012 19:52:18 +0000 (23:52 +0400)]
Revert "Merge pull request #141 from jet47/gpu-pyrlk-fix" because this bug appears only in 2.4
This reverts commit
7e301c5c0e0591a751258d044f5f2f0889231591, reversing
changes made to
b5e009eb87154b830759fe9276b6233f852a4e77.
marina.kolpakova [Tue, 13 Nov 2012 19:37:44 +0000 (23:37 +0400)]
Merge remote-tracking branch 'cuda-geek/soft-cascade-cpu'
Alexander Mordvintsev [Mon, 12 Nov 2012 10:42:51 +0000 (14:42 +0400)]
added CV_OUT to StereoVar output paramiter
marina.kolpakova [Tue, 13 Nov 2012 19:08:19 +0000 (23:08 +0400)]
fix for negative confidence
Andrey Kamaev [Tue, 13 Nov 2012 15:54:48 +0000 (19:54 +0400)]
Merge branch 2.4
Andrey Kamaev [Tue, 13 Nov 2012 15:48:51 +0000 (19:48 +0400)]
Merge pull request #147 from taka-no-me/win_warnings
Andrey Kamaev [Tue, 13 Nov 2012 15:45:14 +0000 (19:45 +0400)]
Merge pull requests #136, #142, #150, #152 from asmorkalov/new_framework_tutorial, asmorkalov/fd_package_fix, asmorkalov/java_test_fix and asmorkalov/engine_build_fix
Andrey Kamaev [Tue, 13 Nov 2012 14:24:36 +0000 (18:24 +0400)]
Merge pull request #156 from jet47/gpu-hough-lines-fix