Alexander Smorkalov
9932bbad3a
Added Debian changelog installation step for Debian package generation.
...
(cherry picked from commit ddc1b965b6
2015-04-19 13:36:47 +03:00
Vijay Pradeep
39ac84ff04
Fixing race condition by expanding resultsMutex lock section
...
(cherry picked from commit 042ff210d5
2015-04-19 13:36:17 +03:00
Vladislav Vinogradov
fcbefaff86
fix tests for gpu::matchTemplate:
...
use ASSERT_FLOAT_EQ to compare float values, it is more robust for
large values
(cherry picked from commit d00f36ec75
2015-04-19 13:32:24 +03:00
Roman Donchenko
bf2256fb89
cvOpenFileStorage: reduce the scope of xml_buf and make sure it's freed...
...
... before any exceptions occur.
(cherry picked from commit 08da247a87
2015-04-19 13:31:52 +03:00
Vladislav Vinogradov
b0b2fc9e3f
get rid of cuda.h usage
...
(cherry picked from commit eeb997261d
2015-04-19 13:29:45 +03:00
Roman Donchenko
1ccd64e102
Fix uninitialized memory reads and memory leaks in StereoGC
...
(cherry picked from commit 7d8e5f623a
2015-04-19 13:27:55 +03:00
Vicente Olivert Riera
23bf3e337a
superres: Fix return value VideoFrameSource_GPU
...
superres module fails to compile with the following error messages:
[100%] Building CXX object modules/superres/CMakeFiles/opencv_superres.dir/src/super_resolution.cpp.o
/opencv-2.4.10/modules/superres/src/frame_source.cpp: In function 'cv::Ptr<cv::superres::FrameSource> cv::superres::createFrameSource_Video_GPU(const string&)':
/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: expected type-specifier before 'VideoFrameSource'
/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: could not convert '(int*)operator new(4ul)' from 'int*' to 'cv::Ptr<cv::superres::FrameSource>'
/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: expected ';' before 'VideoFrameSource'
/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:41: error: 'VideoFrameSource' was not declared in this scope
/opencv-2.4.10/modules/superres/src/frame_source.cpp:264:1: error: control reaches end of non-void function [-Werror=return-type]
cc1plus: some warnings being treated as errors
make[3]: *** [modules/superres/CMakeFiles/opencv_superres.dir/src/frame_source.cpp.o] Error 1
make[3]: *** Waiting for unfinished jobs....
This is caused because the return value of the createFrameSource_Video_GPU function should be a VideoFrameSource_GPU object.
(cherry picked from commit 2e393ab833
2015-04-19 13:25:16 +03:00
Vladislav Vinogradov
3cf265992f
fix installation layout for debian packages:
...
Install symlinks to shared libraries as a part of development package,
not runtime package.
It is default behavior for debian packages.
(cherry picked from commit f55c1cc0fb
2015-04-19 13:23:47 +03:00
Alexander Smorkalov
67635c6d65
Version++.
2014-11-05 08:46:55 +03:00
Vladislav Vinogradov
a26e496d00
minor fix for StereoCSBP data cost compute kernel and test
...
(cherry picked from commit 84f33d0578
2014-11-04 10:19:38 +03:00
Vladislav Vinogradov
d579d3e596
increase epsilons for some tests, which functions use floating point arithm
...
(cherry picked from commit 5c07e0b6d3
2014-11-04 10:19:18 +03:00
Vladislav Vinogradov
5a77176654
avoid pointer arithmetic on register memory in color conversion
...
(cherry picked from commit e0827069c1
2014-11-04 10:18:58 +03:00
Andrey Pavlenko
7018f94959
Merge pull request #3288 from StevenPuttemans:fix_ts_dependencies
2014-10-01 07:33:36 +00:00
Andrey Pavlenko
533fde66e3
Merge pull request #3281 from a-wi:MSMF_remove_ATL_dependency
2014-10-01 07:26:25 +00:00
Andrey Pavlenko
5bd18155be
Merge pull request #3290 from asmorkalov:android_disable_fisheye.rectify_for_tegra
2014-10-01 07:26:04 +00:00
Andrey Pavlenko
aa6b5ac124
Merge pull request #3291 from asmorkalov:android_superres_video_check
2014-10-01 07:25:15 +00:00
Alexander Smorkalov
ca40a749b6
Turn off superres accuracy tests if video i/o is not supported.
2014-10-01 09:15:24 +04:00
Roman Donchenko
d54d580f79
Merge pull request #3275 from asmorkalov:ocv_gstreamer_backport
2014-09-30 15:55:26 +00:00
Roman Donchenko
774d6c1d0a
Merge pull request #3285 from asmorkalov:android_servive_big.little_fix
2014-09-30 15:19:07 +00:00
Roman Donchenko
302d80d744
Merge pull request #3287 from asmorkalov:android_manager_version_inc5
2014-09-30 14:44:36 +00:00
Alexander Smorkalov
286c6b496d
OpenCV Manager hardware detector workaround for not detected ARM SoC support.
2014-09-30 18:43:11 +04:00
Maksim Shabunin
44da1f795f
Merge pull request #3282 from asmorkalov:android_exclude_ocl
2014-09-30 10:53:16 +00:00
Alexander Smorkalov
71c4e96e17
Test fisheye.rectify disabled for Tegra.
2014-09-30 14:49:33 +04:00
StevenPuttemans
60fd5c2a3a
fixing dependencies
2014-09-30 11:53:46 +02:00
Alexander Smorkalov
8271c4e9c4
Highgui_Video.prop_fps disabled as fails with FFmpeg in Ubuntu 14.04.
2014-09-30 13:35:19 +04:00
Alexander Smorkalov
1f4fe3bb27
GStreamer 1.0 backport from master branch.
2014-09-30 12:30:09 +04:00
Alexander Smorkalov
a0431acb37
OpenCV Manager version++.
2014-09-30 12:05:46 +04:00
Artur Wieczorek
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
Alexander Smorkalov
1c3c94fd2c
Exclude OpenCL tests from default test list for Android as they are experimental.
2014-09-29 20:45:12 +04:00
Roman Donchenko
45a1063c4a
Merge pull request #3263 from asmorkalov:python_tests_package_lintian
2014-09-29 14:53:02 +00:00
Alexander Smorkalov
1cc80f10ba
Added implicit dependency from python and python-py to debian packages.
2014-09-29 17:43:54 +04:00
Maksim Shabunin
a160158cb3
Merge pull request #3272 from mgeorg:reset_ffmpeg_mutex_2_4
2014-09-29 12:07:22 +00:00
Vadim Pisarevsky
6a53cb9307
Merge pull request #3266 from mshabunin:arm_warning
2014-09-27 13:06:44 +00:00
Vadim Pisarevsky
1920232268
Merge pull request #3260 from a-wi:MSMF_file_error
2014-09-27 13:06:18 +00:00
Manfred Georg
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
Maksim Shabunin
e88a36621e
Fixed warning during cross compile for ARM
2014-09-25 12:27:48 +04:00
Vadim Pisarevsky
467f5fc90f
Merge pull request #3261 from a-wi:CMake_FFMPEG_config
2014-09-24 17:03:08 +00:00
Vadim Pisarevsky
ad018da224
Merge pull request #3262 from StevenPuttemans:fix_window_param
2014-09-24 12:22:20 +00:00
StevenPuttemans
90a1c6b1f0
fixing some wrong CPP prefixes - still old interface
2014-09-24 09:33:22 +02:00
Artur Wieczorek
93d1ceae43
Use FFMPEG capture only if HAVE_FFMPEG flag is defined.
2014-09-24 02:11:59 +02:00
Artur Wieczorek
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
Artur Wieczorek
5bf1a4c08c
Fixed MSMF file capture error while opening the file containing unsupported video stream format
2014-09-23 20:21:53 +02:00
Vadim Pisarevsky
562ff9d111
Merge pull request #3255 from bhack:fix_cuda_macosx
2014-09-23 15:40:23 +00:00
bhack
32f6e1a554
Fix for bug #3469 CV_XADD failing in clang+nvcc combination
...
Taken from 3f07655231
2014-09-23 12:39:16 +02:00
Vadim Pisarevsky
10bbcca11e
Merge pull request #3251 from a-wi:MSMF_camera_errors
2014-09-23 08:42:57 +00:00
Vadim Pisarevsky
19b3aab23f
Merge pull request #3244 from tstellarAMD:2.4-ocl-inline-fix-v2
2014-09-23 07:19:38 +00:00
Vadim Pisarevsky
df28bb5ccd
Merge pull request #3190 from StevenPuttemans:fix_simpleblobdetector
2014-09-23 07:18:01 +00:00
StevenPuttemans
d4ec359f11
Fixing errors
2014-09-22 22:12:27 +02:00
Artur Wieczorek
3603102c89
Fixed assertion warning in MSMF frame grabber
2014-09-22 19:38:04 +02:00
Artur Wieczorek
a615102947
Fixed MSMF video capture initialization
2014-09-22 19:35:36 +02:00
