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
marina.kolpakova
2e0161c6c5
create objects mat if empty
2012-11-28 10:50:33 +04:00
marina.kolpakova
d985861462
remove unused std imports
2012-11-28 03:51:37 +04:00
marina.kolpakova
1d97a4549d
fixed compilation for GCC 4.6
2012-11-28 03:51:37 +04:00
Andrey Kamaev
ae149adb29
Merge pull request #190 from asmorkalov:ninja_fix
2012-11-27 23:41:30 +04:00
Vladislav Vinogradov
0b2c1dc871
fixed build without CUDA
2012-11-27 18:43:17 +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
Vladislav Vinogradov
d2591704e8
Merge branch 'kepler-optimization' into cuda-dev
2012-11-27 16:34:45 +04:00
Ilya Lavrenov
b8b13ccd5c
parallel version of Bayer2Gray
2012-11-27 15:27:58 +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
Jason Newton
00bdca7684
A few changes to comply with upstream requirements for merge.
...
-Change input/output order from (out Labeled, in Image) -> (in Image, Out Labeled) and convert
to Input/OutputArrays in the process.
-Adopt OutputArray for statistics export so that the algorithm is "wrapper friendly" and not requiring a new struct in
language bindings at the expense of using doubles for everything and slowing statistics computation down..
2012-11-27 02:31:38 -08:00
Ilya Lavrenov
ce5e9a71b5
fixed some warnings on Windows and added debug messages
2012-11-27 13:54:11 +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
Ilya Lavrenov
4116cbe2c0
Merge remote-tracking branch 'upstream/master' into Demosaicing
2012-11-27 12:46:49 +04:00
Vladislav Vinogradov
2eca75ccdd
added common TransformFunctorTraits for element operations
2012-11-27 11:08:53 +04:00
marina.kolpakova
22b0ea1cf0
sort for Hough sanity checks
2012-11-26 23:54:10 +04:00
marina.kolpakova
554a7cb33a
add epsilon in sanity checks
2012-11-26 23:52:56 +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
Ilya Lavrenov
3fa630639f
fixed bayer2bgra in case when size.width <= 2
2012-11-26 19:45:56 +04:00
marina.kolpakova
209f16455d
Merge cuda-geek/soft-cascade-gpu into cuda-dev
2012-11-26 19:15:02 +04:00
marina.kolpakova
1712d0930c
Merge origin/master into cuda-dev
2012-11-26 18:56:33 +04:00
marina.kolpakova
05cd88ae42
clean code; fix problems in documentation
2012-11-26 18:50:08 +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
marina.kolpakova
bd3179bda8
fix CUDA support for streams for NMS; refactor tests
2012-11-26 17:53:25 +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
60c0e41ba5
integrate NMS (Dollar's criteria)
2012-11-26 17:22:47 +04:00
Ilya Lavrenov
5225672dc0
added edge-aware demosaicing and bayer to bgra conversion
2012-11-26 16:17:43 +04:00
Vladislav Vinogradov
f022b12c57
saturate_cast via asm cvt command
2012-11-26 15:36:15 +04:00
marina.kolpakova
d2e88e1d4d
nms: part 1
2012-11-26 15:26:11 +04:00
Vladislav Vinogradov
63a022dcd7
added explicit unroll to reduce implementation
2012-11-26 13:12:50 +04:00
Vladislav Vinogradov
11c6eb6305
element operations
2012-11-26 11:45:25 +04:00
