generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
opencv/modules/highgui/src
History
Roman Donchenko 9c2272d520 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	.gitignore
	CMakeLists.txt
	doc/CMakeLists.txt
	modules/calib3d/src/stereosgbm.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/highgui/src/cap_openni.cpp
	modules/ml/include/opencv2/ml/ml.hpp
	modules/objdetect/src/hog.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/optical_flow_farneback.cpp
	platforms/scripts/camera_build.conf
	platforms/scripts/cmake_android_all_cameras.py
	samples/cpp/Qt_sample/main.cpp
	samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
2013-11-26 15:05:26 +04:00
..
files_Qt
Removed incorrect iCCP chunks from GUI resources.
2013-08-30 09:49:24 -04:00
bitstrm.cpp
Drop cv:: prefix from cv::String used inside the cv namespace
2013-03-22 22:14:50 +04:00
bitstrm.hpp
Drop cv:: prefix from cv::String used inside the cv namespace
2013-03-22 22:14:50 +04:00
cap_android.cpp
Main module headers are moved 1 level up
2013-03-13 17:26:56 +04:00
cap_avfoundation.mm
Merge commit '43aec5ad' into merge-2.4
2013-08-27 13:26:44 +04:00
cap_cmu.cpp
Normalize line endings and whitespace
2012-10-17 15:57:49 +04:00
cap_dc1394_v2.cpp
Merge remote-tracking branch 'remotes/upstream/2.4' into dc1394_2-1394b
2013-06-27 19:43:05 +02:00
cap_dc1394.cpp
Dropped the HAVE_DC1394_095 configuration macro.
2013-09-13 17:25:21 +04:00
cap_dshow.cpp
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2013-08-13 12:56:39 +04:00
cap_ffmpeg_api.hpp
Merge commit '43aec5ad' into merge-2.4
2013-08-27 13:26:44 +04:00
cap_ffmpeg_impl.hpp
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2013-11-19 16:21:09 +04:00
cap_ffmpeg.cpp
Another FFmpeg fix from master.
2013-10-25 16:08:14 +04:00
cap_giganetix.cpp
Smartek Giganetix Cameras support (Patch #2192) integrated to master.
2013-02-01 16:54:00 +04:00
cap_gstreamer.cpp
Fixed a -Wnull-conversion Clang warning in cap_gstreamer.cpp.
2013-10-03 12:11:50 +04:00
cap_images.cpp
In the image sequence capture, only search for the ordinal in the file name.
2013-11-12 16:26:21 +04:00
cap_ios_abstract_camera.mm
Normalized file endings.
2013-08-21 18:59:25 +04:00
cap_ios_photo_camera.mm
fixed Kirill's comments
2013-06-18 06:59:52 +04:00
cap_ios_video_camera.mm
Normalized file endings.
2013-08-21 18:59:25 +04:00
cap_libv4l.cpp
Fix a -Wparentheses-equality Clang warning in cap_libv4l.cpp.
2013-10-03 12:04:57 +04:00
cap_msmf.cpp
Normalized file endings.
2013-08-21 18:59:25 +04:00
cap_openni.cpp
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2013-11-26 15:05:26 +04:00
cap_pvapi.cpp
Remove all include directives for <string>
2013-03-22 22:14:47 +04:00
cap_qt.cpp
Drop outdated definitions from internal.hpp
2013-04-01 15:24:35 +04:00
cap_qtkit.mm
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2013-11-26 15:05:26 +04:00
cap_unicap.cpp
Normalize line endings and whitespace
2012-10-17 15:57:49 +04:00
cap_v4l.cpp
pr #1464 reverted as breaking the build for Linux without libv4l library.
2013-09-27 12:17:55 +04:00
cap_vfw.cpp
Media foundation video i/o fixes.
2013-06-25 03:35:30 -07:00
cap_ximea.cpp
Back to the previous coding way (using the macro with the goto).
2013-11-19 21:51:47 +01:00
cap_xine.cpp
Normalize line endings and whitespace
2012-10-17 15:57:49 +04:00
cap.cpp
updated patch to bring in the first functions with "transparent API"
2013-11-18 11:48:00 -05:00
ffmpeg_codecs.hpp
Removed some dubious FFmpeg hack that no longer works.
2013-10-23 14:56:37 +04:00
grfmt_base.cpp
Drop cv:: prefix from cv::String used inside the cv namespace
2013-03-22 22:14:50 +04:00
grfmt_base.hpp
Drop cv:: prefix from cv::String used inside the cv namespace
2013-03-22 22:14:50 +04:00
grfmt_bmp.cpp
Boring changes - highgui.
2013-09-05 18:26:43 +04:00
grfmt_bmp.hpp
Remove all using directives for STL namespace and members
2013-02-25 15:04:17 +04:00
grfmt_exr.cpp
Boring changes - highgui.
2013-09-05 18:26:43 +04:00
grfmt_exr.hpp
Remove all using directives for STL namespace and members
2013-02-25 15:04:17 +04:00
grfmt_hdr.cpp
Docs updated, added InputArray, fixes for makePtr,...
2013-09-26 19:02:35 +04:00
grfmt_hdr.hpp
Docs updated, added InputArray, fixes for makePtr,...
2013-09-26 19:02:35 +04:00
grfmt_jpeg2000.cpp
Boring changes - highgui.
2013-09-05 18:26:43 +04:00
grfmt_jpeg2000.hpp
Remove all using directives for STL namespace and members
2013-02-25 15:04:17 +04:00
grfmt_jpeg.cpp
Boring changes - highgui.
2013-09-05 18:26:43 +04:00
grfmt_jpeg.hpp
Remove all using directives for STL namespace and members
2013-02-25 15:04:17 +04:00
grfmt_png.cpp
Boring changes - highgui.
2013-09-05 18:26:43 +04:00
grfmt_png.hpp
Remove all using directives for STL namespace and members
2013-02-25 15:04:17 +04:00
grfmt_pxm.cpp
Boring changes - highgui.
2013-09-05 18:26:43 +04:00
grfmt_pxm.hpp
Drop cv:: prefix from cv::String used inside the cv namespace
2013-03-22 22:14:50 +04:00
grfmt_sunras.cpp
Boring changes - highgui.
2013-09-05 18:26:43 +04:00
grfmt_sunras.hpp
Remove all using directives for STL namespace and members
2013-02-25 15:04:17 +04:00
grfmt_tiff.cpp
fixed warnings
2013-10-08 12:46:43 +04:00
grfmt_tiff.hpp
Docs updated, added InputArray, fixes for makePtr,...
2013-09-26 19:02:35 +04:00
grfmt_webp.cpp
fixed warnings
2013-10-08 12:46:43 +04:00
grfmt_webp.hpp
added support image with alpha channel
2013-07-13 14:09:37 +04:00
grfmts.hpp
HDR formats support and HDR making. Code only.
2013-06-23 14:19:09 +04:00
ios_conversions.mm
Normalized file endings.
2013-08-21 18:59:25 +04:00
loadsave.cpp
Docs updated, added InputArray, fixes for makePtr,...
2013-09-26 19:02:35 +04:00
precomp.hpp
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2013-07-03 19:53:21 +04:00
rgbe.cpp
Docs updated, added InputArray, fixes for makePtr,...
2013-09-26 19:02:35 +04:00
rgbe.hpp
Docs updated, added InputArray, fixes for makePtr,...
2013-09-26 19:02:35 +04:00
utils.cpp
Drop outdated definitions from internal.hpp
2013-04-01 15:24:35 +04:00
utils.hpp
Normalize line endings and whitespace
2012-10-17 15:57:49 +04:00
window_carbon.cpp
Normalize line endings and whitespace
2012-10-17 15:57:49 +04:00
window_cocoa.mm
Remove all using directives for STL namespace and members
2013-02-25 15:04:17 +04:00
window_gtk.cpp
Change true for TRUE
2013-09-30 21:04:43 +01:00
window_QT.cpp
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2013-10-22 14:28:00 +04:00
window_QT.h
Fix image saving from QT toolbar
2013-06-06 11:15:00 +01:00
window_QT.qrc
QT new functions:
2010-07-16 09:12:15 +00:00
window_w32.cpp
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2013-10-22 14:28:00 +04:00
window.cpp
Merge remote-tracking branch 'origin/2.4'
2013-06-19 15:25:37 +04:00