opencv/modules/highgui/src
Roman Donchenko f77c68e0fa Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/imgproc/src/opencl/integral_sqrsum.cl
	modules/nonfree/doc/feature_detection.rst
	modules/nonfree/include/opencv2/nonfree/ocl.hpp
	modules/nonfree/src/surf_ocl.cpp
	modules/nonfree/test/test_features2d.cpp
	modules/ocl/doc/image_processing.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/match_template.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/ocl/src/opencl/haarobjectdetect_scaled2.cl
	modules/ocl/test/test_imgproc.cpp
2014-03-31 14:42:00 +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 Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-01-14 11:53:59 +04:00
cap_android.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-03-24 19:02:16 +04:00
cap_avfoundation.mm Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-03-31 14:42:00 +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 2014-01-14 11:53:59 +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_intelperc.cpp Remove implementation of CvCapture interface for Intel PerC camera. Add IVideoCapture interface and implementation of this one for Intel PerC camera 2014-02-25 10:59:35 +04:00
cap_intelperc.hpp Change text of copyright 2014-03-05 13:06:36 +04:00
cap_ios_abstract_camera.mm removed trailing spaces 2014-02-18 13:56:26 +04:00
cap_ios_photo_camera.mm fixed Kirill's comments 2013-06-18 06:59:52 +04:00
cap_ios_video_camera.mm deleted excess semicolons, commas 2014-01-18 01:31:33 +04:00
cap_libv4l.cpp Fix for #3554 2014-03-05 02:44:40 +00:00
cap_msmf.cpp Update cap_msmf.cpp 2014-03-04 01:52:17 +08:00
cap_msmf.hpp Update cap_msmf.cpp 2014-03-04 01:52:17 +08:00
cap_openni.cpp compilation 2013-12-07 18:58:29 +04:00
cap_pvapi.cpp Added PVAPI enums to highgui.hpp 2014-01-14 21:38:57 +11: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 Fix for #3554 2014-03-05 02:44:40 +00: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 Remove implementation of CvCapture interface for Intel PerC camera. Add IVideoCapture interface and implementation of this one for Intel PerC camera 2014-02-25 10:59:35 +04: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 deleted excess semicolons, commas 2014-01-18 01:31:33 +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 added jpeg with optimized coding support. 2014-03-27 13:34:33 -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 Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-02-25 15:02:24 +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
ppltasks_winrt.h Update cap_msmf.cpp 2014-03-04 01:52:17 +08:00
precomp.hpp Move declaration of IVideoCapture class into precomp.hpp, make some methods of IVideoCapture pure virtual 2014-03-07 16:25:15 +04:00
rgbe.cpp deleted excess semicolons, commas 2014-01-18 01:31:33 +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 typos 2014-03-04 12:47:40 +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 Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-10 12:51:00 +04:00
window_QT.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-03-11 17:20:01 +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 horisontal mwhell support 2014-01-19 18:32:22 +04:00
window.cpp [HighGUI] Updated mouse wheel delta to reside within the 'flags' variable. Updated C++ API. 2014-01-14 21:33:32 +02:00