a5e89bf724
Merge pull request #3329 from taka-no-me:patch-1
2014-10-11 17:41:23 +00:00
0d196529f7
Merge pull request #3300 from rohitrawat:bug_3787_docs_NAryMatIterator
2014-10-11 17:35:51 +00:00
77b57459c4
Merge pull request #3327 from JonasVautherin:patch_cmake_android_r10
2014-10-11 17:26:19 +00:00
5dde172452
silence cmake 3.0+ warnings on LOCATION attribute
2014-10-11 20:35:48 +04:00
d83372a8dc
Patch for NDK r10
2014-10-10 15:16:51 +02:00
ff8e32453b
Merge pull request #3307 from ilya-lavrenov:ffmpeg_rtsp
2014-10-10 11:02:50 +00:00
fb2012def2
TCP instead of UDP
2014-10-09 19:23:51 +04:00
d7ba03a9cb
Merge pull request #3298 from a-wi:DShow_capture
2014-10-09 15:00:25 +00:00
1e744bf5b1
Merge pull request #3309 from nisargthakkar:Thickness1NoLineCV_AA
2014-10-09 14:42:44 +00:00
8364ea3954
Merge pull request #3311 from BarneyBear:2.4-drawMatches-flag-fix
2014-10-09 14:20:23 +00:00
c24e6f7ae9
Merge pull request #3316 from nisargthakkar:Bug3887
2014-10-09 14:19:12 +00:00
ed2fb773cd
Merge pull request #3319 from Trundle:tiff_infinite_rowsperstrip
2014-10-09 14:15:03 +00:00
afb164cc15
Don't allocate lots of memory when reading TIFFs with infinite rows per strip.
...
Some TIFF images consist of only one strip. The magic value 2**32-1 for the
"rows per strip" tag reflects that fact, effectively meaning "infinite".
2014-10-08 23:31:30 +02:00
474897ff01
Made some changes specefict to 4 channel images. Fixed step value for tptr
2014-10-08 22:08:14 +05:30
29fb2b6e47
Fixed doc for Bug #3887
...
Fixed doc for Bug #3887
2014-10-08 19:52:35 +05:30
af72e6b8f4
Fixes #3910 , flags in _prepareImgAndDrawKeypoints are now binary OR'ed instead of added.
2014-10-07 09:40:56 +02:00
2ad8c6dbd0
Fixing bug in NAryMatIterator documentation(Bug #3787 ).
...
Fixed the non-working code example for NAryMatIterator.
The documentation of NAryMatIterator in file:
modules/core/include/opencv2/core/core.hpp has a working example which
was used for these edits.
2014-10-02 18:48:31 -05:00
5c96021172
Fixed getting CV_CAP_PROP_FOURCC property value
...
Save selected FCC in order to return proper CV_CAP_PROP_FOURCC property value (currently FCC for RGB24 is always returned).
2014-10-02 21:41:54 +02:00
4b1bb702ce
Fixed media type GUID for I420 format in DShow capture.
...
FOURCC code bytes should be placed in the reverse order.
2014-10-02 13:07:50 +02:00
a77a2f357c
Merge pull request #3297 from asmorkalov:ocv_docs_fix
2014-10-02 10:56:08 +00:00
7e78b5d06e
Fixed selecting media type in DShow video capture.
...
Set correct value of sample size when calling IAMStreamConfig::SetFormat function. For non-RGB media type it can be set to zero value.
(See http://msdn.microsoft.com/en-us/library/windows/desktop/dd373477%28v=vs.85%29.aspx )
2014-10-02 12:08:37 +02:00
11c81067dc
doc/check_docs2.py warnings fixes
2014-10-02 13:40:30 +04:00
7018f94959
Merge pull request #3288 from StevenPuttemans:fix_ts_dependencies
2014-10-01 07:33:36 +00:00
533fde66e3
Merge pull request #3281 from a-wi:MSMF_remove_ATL_dependency
2014-10-01 07:26:25 +00:00
5bd18155be
Merge pull request #3290 from asmorkalov:android_disable_fisheye.rectify_for_tegra
2014-10-01 07:26:04 +00:00
aa6b5ac124
Merge pull request #3291 from asmorkalov:android_superres_video_check
2014-10-01 07:25:15 +00:00
ca40a749b6
Turn off superres accuracy tests if video i/o is not supported.
2014-10-01 09:15:24 +04:00
d54d580f79
Merge pull request #3275 from asmorkalov:ocv_gstreamer_backport
2014-09-30 15:55:26 +00:00
774d6c1d0a
Merge pull request #3285 from asmorkalov:android_servive_big.little_fix
2014-09-30 15:19:07 +00:00
302d80d744
Merge pull request #3287 from asmorkalov:android_manager_version_inc5
2014-09-30 14:44:36 +00:00
286c6b496d
OpenCV Manager hardware detector workaround for not detected ARM SoC support.
2014-09-30 18:43:11 +04:00
44da1f795f
Merge pull request #3282 from asmorkalov:android_exclude_ocl
2014-09-30 10:53:16 +00:00
71c4e96e17
Test fisheye.rectify disabled for Tegra.
2014-09-30 14:49:33 +04:00
60fd5c2a3a
fixing dependencies
2014-09-30 11:53:46 +02:00
8271c4e9c4
Highgui_Video.prop_fps disabled as fails with FFmpeg in Ubuntu 14.04.
2014-09-30 13:35:19 +04:00
1f4fe3bb27
GStreamer 1.0 backport from master branch.
2014-09-30 12:30:09 +04:00
a0431acb37
OpenCV Manager version++.
2014-09-30 12:05:46 +04:00
e3f1d722e7
Remove ATL dependency from MSMF capture code
...
Use _com_ptr_t instead of CComPtr in ComPtr wrapper to avoid ATL dependency.
2014-09-30 01:35:59 +02:00
1c3c94fd2c
Exclude OpenCL tests from default test list for Android as they are experimental.
2014-09-29 20:45:12 +04:00
45a1063c4a
Merge pull request #3263 from asmorkalov:python_tests_package_lintian
2014-09-29 14:53:02 +00:00
1cc80f10ba
Added implicit dependency from python and python-py to debian packages.
2014-09-29 17:43:54 +04:00
a160158cb3
Merge pull request #3272 from mgeorg:reset_ffmpeg_mutex_2_4
2014-09-29 12:07:22 +00:00
6a53cb9307
Merge pull request #3266 from mshabunin:arm_warning
2014-09-27 13:06:44 +00:00
1920232268
Merge pull request #3260 from a-wi:MSMF_file_error
2014-09-27 13:06:18 +00:00
7f4eb4f6c6
set ffmpeg mutex to NULL on destruction.
...
The Mutex manager registered with ffmpeg must reset the mutex to NULL after destruction, otherwise ffmpeg will give the invalid mutex to the next mutex manager when it asks it to CREATE a new mutex.
See ffmpeg code: http://git.videolan.org/?p=ffmpeg.git;a=blob;f=libavcodec/utils.c;h=28c5785398fcf11a3d3c70a8cd09e9df798e2734;hb=HEAD#l3423
Cherry picked from head (file has moved but issue is the same).
Conflicts:
modules/videoio/src/cap_ffmpeg_impl.hpp
2014-09-26 10:19:34 -07:00
e88a36621e
Fixed warning during cross compile for ARM
2014-09-25 12:27:48 +04:00
467f5fc90f
Merge pull request #3261 from a-wi:CMake_FFMPEG_config
2014-09-24 17:03:08 +00:00
ad018da224
Merge pull request #3262 from StevenPuttemans:fix_window_param
2014-09-24 12:22:20 +00:00
90a1c6b1f0
fixing some wrong CPP prefixes - still old interface
2014-09-24 09:33:22 +02:00
93d1ceae43
Use FFMPEG capture only if HAVE_FFMPEG flag is defined.
2014-09-24 02:11:59 +02:00
Vadim Pisarevsky
Andrey Kamaev
Jonas Vautherin
Ilya Lavrenov
Andreas Stührk
Nisarg Thakkar
Niklas Frisk
Rohit Rawat
Artur Wieczorek
Maksim Shabunin
Alexander Smorkalov
Andrey Pavlenko
Roman Donchenko
StevenPuttemans
Manfred Georg