8c55d7be5e
Ximea camera fix (see issue #4235 )
2015-04-03 22:50:05 +03:00
a9d4e05346
Changes to be committed:
...
(use "git reset HEAD <file>..." to unstage)
modified: highgui/include/opencv2/highgui/highgui_c.h
modified: highgui/src/cap_dshow.cpp
modified: java/generator/gen_java.py
The correction of the orthographic error in the enumeration constant
CAP_PROP_MONOCROME has been undone.
2015-03-25 15:45:20 +01:00
e5e6367223
Merge remote-tracking branch 'upstream/2.4' into 2.4
2015-03-25 13:38:49 +01:00
756c1a22d9
Merge remote-tracking branch 'upstream/2.4' into 2.4
2015-03-20 01:44:29 +01:00
a7bf1d53d8
Changes to be committed:
...
(use "git reset HEAD <file>..." to unstage)
modified: modules/highgui/include/opencv2/highgui/highgui_c.h
modified: modules/highgui/src/cap_dshow.cpp
modified: modules/highgui/src/cap_pvapi.cpp
modified: modules/java/generator/gen_java.py
Änderungen in der PvAPI hinzugefügt.
2015-03-20 01:42:16 +01:00
7711cd284b
Fix a bug that impede to set the trackbar pos using the Qt control panel
2015-03-19 21:25:10 +01:00
d14a1de947
Fixing the bug #4244 that I just reported in code.opencv.org
2015-03-18 20:07:08 +01:00
65e4df751c
Merge pull request #3705 from SpecLad:unused-nNull
2015-02-19 18:40:22 +00:00
4e8aac5308
Merge pull request #3683 from SeninAndrew:2.4
2015-02-18 17:15:10 +00:00
d218f28070
cap_msmf.hpp: fix a warning about nNull being unused
...
The two functions featuring nNull are not particularly needed, so
I simply removed them.
2015-02-16 19:31:51 +03:00
77578d415f
Fix a memory leak in CvCapture_FFMPEG::close
...
FFmpeg now requires that frames allocated with avcodec_alloc_frame are
freed with avcodec_free_frame.
2015-02-13 15:12:52 +03:00
b9a6edfe3d
Fixing XIMEA parameters mapping (issue #4176 )
2015-02-09 15:15:23 +03:00
e938563de5
Modified resetCvImage() in cap_ximea.cpp, so that the IplImage* frame is also updated after the resolution has changed via set(CV_CAP_PROP_FRAME_WIDTH, value)/set(CV_CAP_PROP_XI_DOWNSAMPLING, value)
2015-02-02 15:04:29 +01:00
9a6a046caf
Merge pull request #3613 from asmorkalov:aarch64_tiff
2015-01-20 12:36:38 +00:00
72d90ba8d2
In cvAddText, construct QString from "text" using fromUtf8.
2015-01-16 14:57:11 -08:00
d277a1ba75
TIFF support hack for aarch64 reverted.
2015-01-17 01:25:58 +03:00
8acd4c3ff4
More accurate fix for libtiff and aarch64.
2014-12-28 12:44:24 +03:00
c105b72945
Assorted fixes:
...
* cmake CMP0054 and CMP0045
* aarch64 build
* portable code options in PCH cmake
* some of gcc 4.9 warnings
2014-12-25 12:41:16 +03:00
63c49be487
highgui: Support to change trackbar count in setTrackbarPos and replaced deprecated CreateToolbarEx in Windows.
2014-12-06 11:56:01 -05:00
f151b1d277
fix wrong property name and corresponding documentation
2014-11-19 14:00:40 +01:00
d9164bdd4c
added extra BUFFERSIZE doc and getter
2014-11-14 14:09:43 +01:00
2b8229f716
adding extra buffer parameter
2014-11-12 13:09:53 +01:00
e05a0bc6c5
Merge pull request #3322 from StevenPuttemans:fix_pvpapi_interface
2014-11-10 08:27:42 +00:00
7dce2d0b8f
fixing cap_pvpapi interface and making sure both AVT Manta and Proscilla
...
series are supported. Testing this with both cams for Windows and Linux
exhaustively.
Optimizing memory footprint by removing unused calls.
Adapted with the input of Shai
Added small example that illustrates how it should work.
2014-10-28 15:33:37 +01:00
09fb7512ed
Fixed iOS framework compilation warnings
2014-10-27 15:28:21 +03:00
0cf170587f
Merge pull request #3363 from asmorkalov:qnx_support
2014-10-26 17:42:24 +00:00
6bb6039ebb
Fixes for QNX 6.6 Neitrino support.
2014-10-23 17:17:35 +04:00
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
81c0537b0c
iOS: fix crash from overrelease in UIImageToMat
2014-10-17 17:49:14 +09: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
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
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
533fde66e3
Merge pull request #3281 from a-wi:MSMF_remove_ATL_dependency
2014-10-01 07:26:25 +00:00
1f4fe3bb27
GStreamer 1.0 backport from master branch.
2014-09-30 12:30:09 +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
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
93d1ceae43
Use FFMPEG capture only if HAVE_FFMPEG flag is defined.
2014-09-24 02:11:59 +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
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
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
539f8032dc
Fixed compilation errors under VS 2010 and Win 7
2014-09-19 17:07:52 +02:00
ccaedaedc8
Merge pull request #2047 from GregoryMorse:patch-4
2014-09-17 12:48:45 +00:00
Andrew Senin