Andrey Kamaev
677443f3ef
Merge pull request #191 from asmorkalov:custom_cam_init
2012-11-30 12:53:26 +04:00
Andrey Pavlenko
ea83d384c1
removing Android tutorial 0 since it has become irrelevant after moving to the new application framework
2012-11-30 12:32:16 +04:00
Andrey Kamaev
bbfccb61f3
Merge pull request #198 from asmorkalov:disable_warp_tests
2012-11-29 20:29:22 +04:00
Alexander Smorkalov
d36f8b9eb3
Code review comments applied
...
Sample renamed to CameraControl;
Picture taking added to show camera preview restart.
2012-11-29 18:26:57 +04:00
Alexander Smorkalov
f6ff2b87fa
Some perf tests on warping and resize disabled on Android
...
MatInfo_Size_Size.resizeDownLinear
MatInfo_Size_Size.resizeUpLinear
TestWarpPerspectiveNear_t.WarpPerspectiveNear
TestWarpPerspective.WarpPerspective
2012-11-29 18:21:22 +04:00
Andrey Kamaev
64bed2060a
Merge pull request #194 from asmorkalov/v4l_fix
...
Patch #2323 applied
2012-11-29 01:27:34 -08:00
Andrey Kamaev
7e8fab0747
Merge pull request #195 from vpisarev/inv3x3_fix
...
now invert 3x3 on "bad" matrices works well on Windows
2012-11-29 01:27:27 -08:00
Andrey Kamaev
c646bd4b7a
Merge pull request #196 from jet47/gpu-bug-2581
...
fixed Bug #2581
2012-11-29 01:27:14 -08:00
Vladislav Vinogradov
362655b02a
fixed Bug #2581
...
GoodFeaturesToTrackDetector_GPU fails when no corners found
2012-11-29 11:19:30 +04:00
Vadim Pisarevsky
b57e801c04
now invert 3x3 on "bad" matrices works well on Windows
2012-11-28 23:05:51 +04:00
Alexander Smorkalov
bb3d14e1a0
Patch #2323 "cap_libv4l.cpp clears default width and height after setting them" applied.
2012-11-28 21:53:39 +04:00
Andrey Kamaev
5047b3fba2
Merge pull request #193 from AnnaKogan8/perf-tests-increase-time-limits
...
Increased time limits for perf tests
2012-11-28 07:18:11 -08:00
Andrey Kamaev
e1a4d22da6
Merge pull request #192 from taka-no-me/ndk_selection_fix
...
Android: always sort list of NDK toolchains
2012-11-28 07:17:49 -08:00
Anna Kogan
4e21f42714
increased time-limits
2012-11-28 18:17:33 +04:00
Anna Kogan
8877066846
increased time-limits
2012-11-28 18:17:33 +04:00
Andrey Kamaev
157cdeb443
Merge pull request #175 from taka-no-me:run_py
2012-11-28 12:44:05 +04:00
Andrey Kamaev
ae149adb29
Merge pull request #190 from asmorkalov:ninja_fix
2012-11-27 23:41:30 +04:00
Andrey Kamaev
cbe22fb5d1
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.
2012-11-27 18:16:36 +04:00
Alexander Smorkalov
86f7a357ae
Tutorial-5 functionality implemented.
2012-11-27 18:06:43 +04:00
Alexander Smorkalov
24c920a33a
Base for new sample added.
2012-11-27 18:06:43 +04:00
Andrey Kamaev
03f402892d
Merge pull request #188 from asmorkalov:app_framework
2012-11-27 17:50:39 +04:00
Andrey Kamaev
930b580e0d
Merge pull request #189 from wswld:2.4
2012-11-27 17:48:55 +04:00
Alexander Smorkalov
383e04d9e4
OpenCV Manager build via ninja (Bug #2575 ) fixed.
2012-11-27 17:30:05 +04:00
Vsevolod Glumov
0711e65972
Added a note to the android_dev_intro.rst.
2012-11-27 15:10:57 +04:00
Alexander Smorkalov
2e5a7284d2
Code review comments applied.
2012-11-27 14:55:49 +04:00
Alexander Smorkalov
e95fc27490
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.
2012-11-27 12:47:41 +04:00
Alexander Smorkalov
0efc32fc21
Attribure loading from layout improved.
...
OpenCV namespace added;
Default values for camera_id added;
Aditional constructor with cameraId added.
Resolution added to FPS message.
2012-11-27 12:47:41 +04:00
Alexander Smorkalov
8266eab8b4
OpenCV app framework improved
...
FPS meter added;
Camera switching posibility added;
Attributes loading for layout filed implemented.
2012-11-27 12:47:41 +04:00
Andrey Kamaev
214629b220
Merge pull request #187 from vpisarev:doc_fixes_2.4
2012-11-26 22:33:01 +04:00
Andrey Kamaev
dc3aa27be4
Merge pull request #183 from apavlenko:perf/android_filters_accuracy
2012-11-26 22:32:38 +04:00
Andrey Kamaev
8286e1a5f7
Merge pull request #185 from apavlenko:bug2569/simplify_samples_jni_code
2012-11-26 22:32:22 +04:00
Andrey Pavlenko
c36dcbcada
Increase accuracy interval for image filters on Android and other platforms when sensible
2012-11-26 22:29:05 +04:00
Vadim Pisarevsky
db965353f4
fixed a few compile errors/warnings in 2.4 branch of the docs
2012-11-26 18:48:23 +04:00
marina.kolpakova
39da17a02a
Merge pull requst #177 from cuda-geek/another-one-integral-fix
2012-11-26 18:10:21 +04:00
marina.kolpakova
a22edb037f
fixed typo
2012-11-26 17:57:56 +04:00
Andrey Pavlenko
b19f672843
( #2569 ) simplifying code to avoid Eclipse CDT editor confusion, removing warnings and typos in comments
2012-11-26 17:32:10 +04:00
marina.kolpakova
7df45c0dcc
remove unnecessary copying in SURF
2012-11-25 03:26:50 +04:00
marina.kolpakova
91913364d6
reintegrate warp shuffle based integral
2012-11-25 03:21:51 +04:00
marina.kolpakova
5460cee9e9
fix cascade classifier GFF NMS for empty candidates vector
2012-11-25 03:19:24 +04:00
Andrey Kamaev
23011ffd81
Merge pull request #179 from cuda-geek:usr-bin-env-python
2012-11-24 19:24:01 +04:00
Andrey Kamaev
6eed90e5e8
Merge pull request #180 from mdim:fix_compile_error
2012-11-24 19:22:02 +04:00
Andrey Kamaev
901c0d80c3
Merge pull request #178 from cuda-geek:fix-2504
2012-11-24 19:20:53 +04:00
Maria Dimashova
97e36b9375
fix a compile error in case of building without highgui
2012-11-24 18:10:29 +04:00
marina.kolpakova
68d04d28b6
replace offsets in surf to simple copy for better speed
2012-11-24 16:50:29 +04:00
Andrey Kamaev
8daebeac8a
run.py: add --check option for easy run of sanity checks
2012-11-24 14:12:32 +04:00
Andrey Kamaev
9db1d9ba13
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
2012-11-24 14:11:07 +04:00
marina.kolpakova
be0c20b758
align grid by 4
2012-11-24 01:55:03 +04:00
marina.kolpakova
fceb62386d
fix for 2504: WITH_CUDA disabled with OSX in 2.4.3.
2012-11-23 23:11:44 +04:00
marina.kolpakova
285d6320be
add #/usr/bin/env python to all python files
2012-11-23 22:57:22 +04:00
Andrey Kamaev
f45b5b13f1
Merge pull request #172 from asmorkalov:default_cam_lib_path
2012-11-23 14:31:04 +04:00
