24580e348a
TIFF loader: Pass buffer size to read functions.
2014-10-19 01:22:18 +02:00
cfdcf9f2d2
TIFF loader: Allocate large enough buffer when (bpp * ncn) > 8.
2014-10-19 01:22:04 +02:00
63ac69cadf
Fix test name.
2014-10-19 01:13:35 +02:00
40efd17be4
Merge pull request #3346 from Nerei:fixed_memory_leak_in_viz
2014-10-18 16:57:55 +00:00
0f2b7fbc45
viz: fixed memory leak, issue 3961
2014-10-18 18:12:36 +04:00
81c0537b0c
iOS: fix crash from overrelease in UIImageToMat
2014-10-17 17:49:14 +09:00
8f3b876ee6
ocl: Change static variable order in cl_context.cpp to avoid crashes during destruction
...
ContextImpl::currentContext contains a reference to one of the
DeviceInfoImpl objects from:
static std::vector<DeviceInfoImpl> global_devices;
ContextImpl::currentContext is destroyed in the destructor
for the statically defined object __module, and relies on its
DeviceInfoImpl reference to query some hardware features while
being destroyed.
This means that we need to ensure that the global_devices vector is
destroyed affter __module, otherwise ContextImpl::currentContext's
DeviceInfoImpl reference will no longer be valid when __module is
destroyed.
Since these variables are all confined to a single compilation unit,
they will be destruct from bottom to top, so we need to make sure
that __module is the bottom definition so it can be destroyed first.
2014-10-14 20:54:13 -04:00
ea50be0529
core: fix x86 PIC code compilation
...
This bug was triggered by Buildroot autobuilders [1,2], causing this
kind of failures [3,4]:
[ 14%] Building CXX object modules/core/CMakeFiles/opencv_core.dir/src/system.cpp.o
/home/test/autobuild/instance-0/output/build/opencv-2.4.10/modules/core/src/system.cpp: In function '(static initializers for /home/test/autobuild/instance-0/output/build/opencv-2.4.10/modules/core/src/system.cpp)':
/home/test/autobuild/instance-0/output/build/opencv-2.4.10/modules/core/src/system.cpp:280:10: error: inconsistent operand constraints in an 'asm'
make[3]: *** [modules/core/CMakeFiles/opencv_core.dir/src/system.cpp.o] Error 1
[1] http://buildroot.org/
[2] http://autobuild.buildroot.org/
[3] http://autobuild.buildroot.org/?reason=opencv-2.4.10
[4] http://autobuild.buildroot.org/results/483/4838285b25d6293a5cf0bb9eadd5040a7c75d766/build-end.log
Signed-off-by: Samuel Martin <s.martin49@gmail.com >
2014-10-12 12:45:20 +02:00
b11b08b478
Merge pull request #3265 from BKNio:putText_develop
2014-10-11 18:06:25 +00:00
0d196529f7
Merge pull request #3300 from rohitrawat:bug_3787_docs_NAryMatIterator
2014-10-11 17:35:51 +00:00
5a797ae7de
fix issue with font;
2014-10-10 17:11:20 +04: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
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
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
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
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
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
de6edcc48a
fixing issue with "ёЁ";
2014-09-26 11:32:14 +04:00
e88a36621e
Fixed warning during cross compile for ARM
2014-09-25 12:27:48 +04:00
e9f7c4aeba
added Cyrillic;
...
added Cyrillic;
replace binary format with hex;
move duplicated code to inline function;
2014-09-25 11:15:20 +04:00
467f5fc90f
Merge pull request #3261 from a-wi:CMake_FFMPEG_config
2014-09-24 17:03:08 +00: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
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
Andreas Stührk