Suleyman TURKMEN
e59da10bf1
Update highgui.hpp
2016-05-28 05:25:25 +03:00
Alexander Alekhin
67a734ce73
Merge branch '2.4' into master
...
Commits:
67fe57a
add fixed video
db0ae2c
Restore 2.4 source branch for bug fix 6317.
97ac59c
Fix a memory leak indirectly caused by cvDestroyWindow
eb40afa
Add a workaround for FFmpeg's color conversion accessing past the end of the buffer
421fcf9
Rearrange CvVideoWriter_FFMPEG::writeFrame for better readability
912592d
Remove "INSTALL_NAME_DIR lib" target property
bb1c2d7
fix bug on border at pyrUp
2016-04-21 20:15:08 +03:00
Kevin, Hu
db0ae2ca50
Restore 2.4 source branch for bug fix 6317.
2016-04-19 19:27:42 +08:00
Suleyman TURKMEN
194f1beae8
fix for writing 16-bit jpeg2000
2016-04-18 14:51:55 +03:00
Alexander Alekhin
6f139b4f8e
ffmpeg: interrupt callback fix
...
backport from master
2016-04-05 14:19:44 +03:00
Roman Donchenko
97ac59cb73
Fix a memory leak indirectly caused by cvDestroyWindow
2016-03-29 14:06:05 +03:00
Pavel Rojtberg
0ac31a0bd7
highgui: add CV_GUI_* flags to enum in cpp so they appear in bindings
2016-03-24 23:58:47 +01:00
Roman Donchenko
eb40afa26a
Add a workaround for FFmpeg's color conversion accessing past the end of the buffer
...
I delete the LIBAVFORMAT_BUILD < 5231 branch, because I couldn't even find FFmpeg with
such a small build number, let alone test with it.
2016-03-16 20:04:33 +03:00
Roman Donchenko
421fcf9e35
Rearrange CvVideoWriter_FFMPEG::writeFrame for better readability
2016-03-16 16:28:59 +03:00
Roman Donchenko
9a5d7f1a0b
Backport PR #3813 to 2.4
...
It has already been partially backported by #6199 ; this commit completes
the backport.
2016-03-16 12:34:41 +03:00
WANG Guoqin
8cfc87cf01
MacOSX / QTKit capture: trying to fix invalid timer call
2016-03-10 02:49:10 +08:00
Alexander Alekhin
a61b19b524
backport ffmpeg fixes
2016-03-02 18:42:53 +03:00
Maksim Shabunin
ee2f8d006f
Cocoa backend: added checks before accessing sliders dictionary
2016-02-25 11:51:01 +03:00
Vitaly Tuzov
389f176a67
Removed ioctl calls to query for VIDIOC_G_INPUT and VIDIOC_ENUMINPUT since information returned by the calls is never used.
...
Fixed icvCaptureFromCAM_V4L return value in case of V4L2 camera initialization failure.
2016-01-18 12:54:53 +03:00
Gregory Morse
5427ede6a1
WinRT consistency
2015-12-31 14:31:26 +01:00
Alexander Alekhin
0862e8e34c
fix build
2015-12-17 13:25:10 +03:00
Maksim Shabunin
eebd4cad66
Fix compilation problems with XCode 7.1.1 and cmake 3.3.2
2015-11-17 18:52:55 +03:00
Ilya Lavrenov
9e2395e7e0
return false in grabFrame failed in open method
2015-10-27 16:56:31 +03:00
Ilya Lavrenov
05945bf00e
fixed case when grabbing failed
2015-10-27 16:26:24 +03:00
Ilya Lavrenov
9d78a1ea9f
allow to retrieve videocapture properties before first frame reading
2015-10-26 14:37:38 +03:00
Pavel Rojtberg
cfd498a8eb
fix compilation with qt
...
QSlider does not have getMinimum/Maximum getters. Probably was not
compile tested.
2015-10-23 21:42:11 +02:00
Aman Verma
d5e314e728
Fixing compilation errors in windows and mac
2015-10-19 10:58:43 +00:00
Aman Verma
b0209ad7f7
Fix for #5495 : add setTrackbarMin
2015-10-19 08:44:06 +00:00
spmallick
066c775321
Update window_QT.h
...
QPushButton was included twice.
2015-10-13 15:51:43 -07:00
a-andre
d16fb30512
install opencv2/highgui.hpp header
2015-10-13 18:16:14 +02:00
Ilya Lavrenov
0d5b739d35
delete video readers
2015-10-12 00:40:23 +03:00
Sergiu Dotenco
514b202d7b
highgui: CV_WINDOW_AUTOSIZE does not resize with GTK3
2015-10-06 17:01:28 +02:00
Alexander Alekhin
60a689d27c
Merge pull request #5202 from ilya-lavrenov:gstreamer-v4l2
2015-09-24 14:46:23 +00:00
Vadim Pisarevsky
f838a832b2
Merge pull request #5357 from fxtentacle:ha-2.4.11
2015-09-21 14:31:13 +00:00
Suleyman TURKMEN
dff9d2288b
Update window_w32.cpp
2015-09-21 00:34:15 +03:00
Hajo Nils Krabbenhöft
7825cbeb7d
buffer_size should be in bytes, not bits
2015-09-16 22:19:51 +02:00
Hajo Nils Krabbenhöft
d38fee7599
fix crash for large BW tif images
2015-09-16 22:04:42 +02:00
Maksim Shabunin
0a6e93dd3a
Merge pull request #5258 from sturkmen72:patch-6
2015-09-10 09:22:07 +00:00
Suleyman TURKMEN
e15dabf1db
documentation patch
2015-09-05 10:41:01 +03:00
Maksim Shabunin
771af4f32d
Some changes to support mingw-w64
...
- IPP is disabled by default when compiler is mingw (couldn't make it
work)
- fixed some warnings
- fixed some `__GNUC__` version checks (for correctness and convenience)
- removed UTF-8 BOM from hough.cpp (fixes #5253 )
2015-09-01 00:59:08 +03:00
Vadim Pisarevsky
bd43c62a75
Merge pull request #5232 from sturkmen72:patch-6
2015-08-27 07:07:53 +00:00
Suleyman TURKMEN
f660461bb3
documentation patch
2015-08-26 17:40:38 +03:00
Vadim Pisarevsky
587b0cc7b4
Merge pull request #4200 from Astero92:#3800
2015-08-25 18:08:54 +00:00
Ilya Lavrenov
75fcedf0ed
added some property setting and getting
2015-08-16 21:25:36 +03:00
Ilya Lavrenov
c19ed39a78
repaired GStreamer 0.10 version
2015-08-16 21:01:22 +03:00
Ilya Lavrenov
dbd7912b88
repaired gstreamer camera capture:
...
1. Enabled property retrieval: height, width, FPS
2. Fixed issue when isOpened returns always true even for non-existing devices
3. Ability to work with non-0 device. Camera capture index is taken into account
2015-08-16 11:16:25 +03:00
Suleyman TURKMEN
7522527827
Update window_w32.cpp
2015-07-20 16:35:00 +03:00
Dominik Kleiser
f363670934
Bug #3800 - Resize viewport when CV_WINDOW_KEEPRATIO was set (Qt)
2015-07-17 20:02:01 +02:00
Alexander Alekhin
aa871ca506
fix wrong usage of status(), remove useless message in videoio
2015-07-10 19:18:07 +03:00
Maxim Kostin
face069874
Added support for highgui module on WinRT 8.1+
...
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-06-26 23:41:25 +03:00
Maxim Kostin
6724a0b8cd
Added dummy highgui WinRT implementation
2015-06-15 15:59:16 +03:00
Vincent Rabaud
50842b9036
get code to compile on Ubuntu Saucy
...
A define was forgotten for the codecs and there was a typo for
another.
(cherry picked from commit f052b0bc4d
)
Conflicts:
modules/videoio/src/ffmpeg_codecs.hpp
2015-06-09 15:53:08 +03:00
Vadim Pisarevsky
3d6413cfc6
fixed compile warnings; hopefully fixed test failures
...
(cherry picked from commit 30912b49f3
)
Conflicts:
modules/videoio/src/cap_ffmpeg_impl.hpp
modules/videoio/src/ffmpeg_codecs.hpp
2015-06-09 15:53:08 +03:00
Vadim Pisarevsky
799622affd
make sure opencv builds fine with the recent versions of libav (e.g. from Ubuntu 14.10)
...
(cherry picked from commit 2b2e3ee93c
)
Conflicts:
cmake/OpenCVFindLibsVideo.cmake
modules/videoio/src/cap.cpp
modules/videoio/src/cap_ffmpeg_impl.hpp
modules/videoio/src/ffmpeg_codecs.hpp
modules/videoio/test/test_ffmpeg.cpp
2015-06-09 15:53:08 +03:00
Vadim Pisarevsky
8fb37606f6
Merge pull request #4032 from mshabunin:fix-pkg-config
2015-05-26 12:47:14 +00:00