Andrey Kamaev
940cf978b1
Merge pull request #213 from qwaker00/patch-1
...
Update modules/ml/doc/gradient_boosted_trees.rst
2012-12-10 08:07:00 -08:00
Eugene Gritskevich
8ca86e2f52
Update modules/ml/doc/gradient_boosted_trees.rst
2012-12-06 21:44:55 +03:00
cuda-geek
722dedb04d
Merge pull request #201 from taka-no-me:drop_unsupported_highgui
2012-12-05 12:22:38 +04:00
Andrey Kamaev
ae5649d3f7
Drop unsupported imageio from grfmt
2012-12-03 09:56:09 +04:00
Andrey Kamaev
00fbf58902
Revert incompletely applied patch from #2192
...
This reverts commit 2e7656dbdf
.
2012-12-03 09:55:53 +04:00
Andrey Kamaev
476efd7d37
Drop unsupported yzx and mil camera backends
2012-12-03 09:28:01 +04:00
Andrey Kamaev
e10ee89ec4
Merge branch 2.4
2012-11-30 19:54:24 +04:00
Andrey Kamaev
f6ca38a579
Adjust Android Manager version from 2.2 to 2.3
2012-11-30 17:09:30 +04:00
Andrey Kamaev
f12d945712
Remove compiled pdf files from source control
...
The documentation is available online at http://opencv.org/documentation.html
2012-11-30 14:56:00 +04:00
Andrey Kamaev
49c35fafc0
Adjust OpenCV version to 2.4.3.1
2012-11-30 14:33:28 +04:00
Andrey Kamaev
60a98aa5f7
Merge pull request #199 from apavlenko/remove_android_tutorial0
...
removing Android tutorial 0
2012-11-30 01:20:07 -08:00
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
50bebd6f0b
Merge pull request #166 from askforeric:pvapi_updates
2012-11-28 11:31:01 +04:00
askforeric
3923484341
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.
2012-11-28 11:28:16 +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
61a40ddff8
Merge pull request #186 from vpisarev:doc_fixes_master
2012-11-26 22:34:42 +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
70c409f0e8
fixed building PDFs in master
2012-11-26 20:40:45 +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