opencv/src at 406f342dc339a8c44ad0de628ca5035994497eaa - opencv - Atria-soft GIT

generic-library/opencv

History

Roman Donchenko f36f8067bc Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
	modules/calib3d/include/opencv2/calib3d/calib3d.hpp
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/cuda/limits.hpp
	modules/core/include/opencv2/core/internal.hpp
	modules/core/src/matrix.cpp
	modules/nonfree/test/test_features2d.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/hog.cpp
	modules/ocl/test/test_haar.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/ocl/test/test_pyrup.cpp
	modules/ts/src/precomp.hpp
	samples/ocl/facedetect.cpp
	samples/ocl/hog.cpp
	samples/ocl/pyrlk_optical_flow.cpp
	samples/ocl/surf_matcher.cpp

2013-06-25 15:55:52 +04:00

..

Normalize whitespace in documentation and text files

2012-10-17 21:42:09 +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

Main module headers are moved 1 level up

2013-03-13 17:26:56 +04:00

cap_cmu.cpp

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

cap_dc1394_v2.cpp

libd1394 2.x support for mingw on windows added

2013-05-14 16:30:12 +02:00

cap_dc1394.cpp

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

cap_dshow.cpp

Merge remote-tracking branch 'origin/2.4'

2013-06-19 15:25:37 +04:00

cap_ffmpeg_api.hpp

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

cap_ffmpeg_impl.hpp

Fix compiler error due to missing pthread header (Issue #2953 )

2013-06-13 16:11:39 +04:00

cap_ffmpeg.cpp

Fix build errors

2013-04-08 17:10:31 +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

allow for arbitraty number of sources and sinks

2013-06-13 11:16:33 +02:00

cap_images.cpp

"atomic bomb" commit. Reorganized OpenCV directory structure

2010-05-11 17:44:00 +00:00

cap_ios_abstract_camera.mm

updated licenses

2013-06-18 07:02:09 +04:00

cap_ios_photo_camera.mm

fixed Kirill's comments

2013-06-18 06:59:52 +04:00

cap_ios_video_camera.mm

updated licenses

2013-06-18 07:02:09 +04:00

cap_libv4l.cpp

Added setting feature of FPS in cap_libv4l

2013-05-01 01:07:03 +02:00

cap_msmf.cpp

Code review notes fixed.

2013-04-03 04:14:40 -07:00

cap_openni.cpp

Fix build of various backends

2013-03-22 22:14:40 +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

Main module headers are moved 1 level up

2013-03-13 17:26:56 +04:00

cap_unicap.cpp

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

cap_v4l.cpp

Merge branch '2.4'

2013-04-12 15:35:38 +04:00

cap_vfw.cpp

fixed incorrect sizeof() expression in CvCaptureCAM_VFW::open

2013-04-01 11:35:33 +04:00

cap_ximea.cpp

Fixed Ximea cameras support

2013-06-11 21:17:31 +04:00

cap_xine.cpp

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

cap.cpp

Make highgui.hpp independent from C API

2013-04-08 15:47:29 +04:00

ffmpeg_codecs.hpp

Fix build errors

2013-04-08 17:10:31 +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

Remove all using directives for STL namespace and members

2013-02-25 15:04:17 +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

Drop outdated definitions from internal.hpp

2013-04-01 15:24:35 +04:00

grfmt_exr.hpp

Remove all using directives for STL namespace and members

2013-02-25 15:04:17 +04:00

grfmt_jpeg2000.cpp

Drop outdated definitions from internal.hpp

2013-04-01 15:24:35 +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

Merge remote-tracking branch 'origin/2.4'

2013-05-21 17:19:23 +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

Merge remote-tracking branch 'origin/2.4'

2013-05-21 17:19:23 +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

Drop cv:: prefix from cv::String used inside the cv namespace

2013-03-22 22:14:50 +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

Remove all using directives for STL namespace and members

2013-02-25 15:04:17 +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

Drop cv:: prefix from cv::String used inside the cv namespace

2013-03-22 22:14:50 +04:00

grfmt_tiff.hpp

Drop cv:: prefix from cv::String used inside the cv namespace

2013-03-22 22:14:50 +04:00

grfmt_webp.cpp

Drop cv:: prefix from cv::String used inside the cv namespace

2013-03-22 22:14:50 +04:00

grfmt_webp.hpp

Drop cv:: prefix from cv::String used inside the cv namespace

2013-03-22 22:14:50 +04:00

grfmts.hpp

This code is based on https://github.com/prasannatsm/opencv code.

2013-03-11 11:51:38 +04:00

loadsave.cpp

Drop cv:: prefix from cv::String used inside the cv namespace

2013-03-22 22:14:50 +04:00

precomp.cpp

"atomic bomb" commit. Reorganized OpenCV directory structure

2010-05-11 17:44:00 +00:00

precomp.hpp

Move border type constants and Moments class to core module

2013-04-10 19:14:24 +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

fixed compilation with CUDA

2013-04-08 13:29:04 +04:00

window_QT.cpp

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-06-25 15:55:52 +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

Drop outdated definitions from internal.hpp

2013-04-01 15:24:35 +04:00

window.cpp

Merge remote-tracking branch 'origin/2.4'

2013-06-19 15:25:37 +04:00