474897ff01
Made some changes specefict to 4 channel images. Fixed step value for tptr
2014-10-08 22:08:14 +05:30
a77a2f357c
Merge pull request #3297 from asmorkalov:ocv_docs_fix
2014-10-02 10:56:08 +00: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
073a7ff95a
Fixed CMake issue with FFMPEG highgui configuration
...
Currently, FFMPEG source files are included in highgui project file regardless of CMake WITH_FFMPEG option.
After applying this PR FFMPEG files are included only if WITH_FFMPEG option is enabled.
2014-09-23 23:46:03 +02:00
5bf1a4c08c
Fixed MSMF file capture error while opening the file containing unsupported video stream format
2014-09-23 20:21:53 +02:00
562ff9d111
Merge pull request #3255 from bhack:fix_cuda_macosx
2014-09-23 15:40:23 +00:00
32f6e1a554
Fix for bug #3469 CV_XADD failing in clang+nvcc combination
...
Taken from 3f07655231
2014-09-23 12:39:16 +02:00
10bbcca11e
Merge pull request #3251 from a-wi:MSMF_camera_errors
2014-09-23 08:42:57 +00:00
19b3aab23f
Merge pull request #3244 from tstellarAMD:2.4-ocl-inline-fix-v2
2014-09-23 07:19:38 +00:00
df28bb5ccd
Merge pull request #3190 from StevenPuttemans:fix_simpleblobdetector
2014-09-23 07:18:01 +00:00
d4ec359f11
Fixing errors
2014-09-22 22:12:27 +02:00
3603102c89
Fixed assertion warning in MSMF frame grabber
2014-09-22 19:38:04 +02:00
a615102947
Fixed MSMF video capture initialization
2014-09-22 19:35:36 +02:00
9c91d0103f
Merge pull request #3247 from a-wi:CMake_MSMF_configuration
2014-09-22 15:31:09 +00:00
37a1767286
Merge pull request #3243 from a-wi:MSMF_linking_error
2014-09-22 15:29:32 +00:00
03662c0589
fix blobdetector
2014-09-22 13:58:45 +02:00
7c354c14f7
CMake configuration for MSMF capture
2014-09-21 21:03:41 +02:00
d2ba09e6ff
Fix linking error under Win 7 - do not import MinCore_Downlevel.lib if target is Win 7 or earlier.
2014-09-19 22:46:09 +02:00
934394c5e2
ocl: Don't use 'inline' attribute on functions
...
In C99 'inline' is not a hint to the compiler to inline the function,
it is an attribute that affects the linkage of the function. 'inline'
functions are required to have a definition in a different compiliation
unit, so compilers are free to delete 'inline' functions if they want to.
This issue can be seen in Clang when compiling at -O0. Clang
will sometimes delete 'inline' functions which creates an invalid
program.
Issue 3746: http://code.opencv.org/issues/3746
2014-09-19 16:13:57 -04:00
6c3cadbd73
Merge pull request #3240 from a-wi:MSMF_compilation_errors
2014-09-19 17:36:13 +00:00
4dda2002f6
Merge pull request #3241 from WilhelmHannemann:bugfix_brute_force_match_cl
2014-09-19 17:35:07 +00:00
539f8032dc
Fixed compilation errors under VS 2010 and Win 7
2014-09-19 17:07:52 +02:00
Nisarg Thakkar