Andrey Kamaev [Mon, 10 Dec 2012 19:51:14 +0000 (23:51 +0400)]
Merge branch 2.4
Andrey Kamaev [Mon, 10 Dec 2012 19:48:28 +0000 (11:48 -0800)]
Merge pull request #212 from taka-no-me/fix_2602
Prevent imread from illegal memory access (Bug #2602)
Andrey Kamaev [Mon, 10 Dec 2012 16:07:48 +0000 (08:07 -0800)]
Merge pull request #203 from asmorkalov/android_cam_stub
Native camera warper libraries build improvements
Andrey Kamaev [Mon, 10 Dec 2012 16:07:39 +0000 (08:07 -0800)]
Merge pull request #204 from asmorkalov/manager_internal_lib
Feature #2565 implementation
Andrey Kamaev [Mon, 10 Dec 2012 16:07:30 +0000 (08:07 -0800)]
Merge pull request #205 from taka-no-me/gtest_r629
Update googletest to the latest upstream
Andrey Kamaev [Mon, 10 Dec 2012 16:07:19 +0000 (08:07 -0800)]
Merge pull request #206 from asmorkalov/manager_version_fix
Bug #2595 in OpenCV Manager fixed.
Andrey Kamaev [Mon, 10 Dec 2012 16:07:00 +0000 (08:07 -0800)]
Merge pull request #213 from qwaker00/patch-1
Update modules/ml/doc/gradient_boosted_trees.rst
Andrey Kamaev [Mon, 10 Dec 2012 16:06:50 +0000 (08:06 -0800)]
Merge pull request #214 from jmunk1/bugfix-2610
Fixed typo in OpenCVDetectOpenCL.cmake that resulted in cmake not findin...
Andrey Kamaev [Mon, 10 Dec 2012 16:06:15 +0000 (08:06 -0800)]
Merge pull request #219 from kirill-kornyakov/hack-hough-lines-sanity-test-on-win32
Ugly hack to make HoughLines sanity check pass on Windows
Kirill Kornyakov [Mon, 10 Dec 2012 14:16:15 +0000 (18:16 +0400)]
Ugly hack to make HoughLines sanity check pass on Wun32
Justin Muncaster [Thu, 6 Dec 2012 21:17:25 +0000 (13:17 -0800)]
Fixed typo in OpenCVDetectOpenCL.cmake that resulted in cmake not finding OpenCL on windows.
Eugene Gritskevich [Thu, 6 Dec 2012 18:44:55 +0000 (21:44 +0300)]
Update modules/ml/doc/gradient_boosted_trees.rst
Andrey Kamaev [Thu, 6 Dec 2012 15:42:17 +0000 (19:42 +0400)]
Prevent imread from illegal memory access (Bug #2602)
The change is based on pull request #211.
Alexander Smorkalov [Thu, 6 Dec 2012 10:11:30 +0000 (14:11 +0400)]
Bug with skiped packages fixed.
Alexander Smorkalov [Wed, 5 Dec 2012 09:04:45 +0000 (13:04 +0400)]
Bug #2595 in OpenCV Manager fixed.
OpenCV Manager 2.x marks old 2.4.2 binary package for Tegra as "in use".
The latest version of OpenCV library compatible with platform is used now.
Alexander Smorkalov [Tue, 4 Dec 2012 14:04:11 +0000 (18:04 +0400)]
GetPublicName function removed for OpenCV LibraryInfo class;
Some OpenCV Manager UI behavior updates;
CMake build fix.
cuda-geek [Wed, 5 Dec 2012 08:22:37 +0000 (12:22 +0400)]
Merge pull request #201 from taka-no-me:drop_unsupported_highgui
Andrey Kamaev [Tue, 4 Dec 2012 22:52:30 +0000 (02:52 +0400)]
Update gtest to upstream r629
Vadim Pisarevsky [Tue, 4 Dec 2012 17:02:10 +0000 (21:02 +0400)]
Merge pull request #197 from asmorkalov:ffmpeg_status_message_fix
Alexander Smorkalov [Tue, 4 Dec 2012 12:34:53 +0000 (16:34 +0400)]
Info library loading implemeneted.
Alexander Smorkalov [Tue, 4 Dec 2012 11:37:27 +0000 (15:37 +0400)]
Internal version of OpenCV inside OpenCV Manager added to the list of installed packages.
Alexander Smorkalov [Tue, 4 Dec 2012 10:23:25 +0000 (14:23 +0400)]
Initial stub for OpenCVLibraryInfo class added.
Alexander Smorkalov [Thu, 29 Nov 2012 11:44:24 +0000 (15:44 +0400)]
Feature #1322 "If dll cannot be loaded a warning should be generated" implemented.
Alexander Smorkalov [Fri, 30 Nov 2012 09:09:02 +0000 (13:09 +0400)]
Native camera warper libraries build improved
Environment variables support added to Android tree path;
Default config updated to use env variable.
Andrey Kamaev [Mon, 3 Dec 2012 05:39:18 +0000 (09:39 +0400)]
Drop unsupported imageio from grfmt
Andrey Kamaev [Mon, 3 Dec 2012 05:54:22 +0000 (09:54 +0400)]
Revert incompletely applied patch from #2192
This reverts commit
2e7656dbdfaccca8bb3245fc70ed6069f8e9f53f.
Andrey Kamaev [Mon, 3 Dec 2012 05:28:01 +0000 (09:28 +0400)]
Drop unsupported yzx and mil camera backends
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