opencv

Go to file

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

3rdparty

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

2013-11-26 15:05:26 +04:00

apps

Fixed compilation errors: removed using namespace from hpp file. This led to pulling cv::ACCESS_MASK to global namespace where conflict with the same name in 'windows.h'

2013-11-17 14:08:56 +04:00

cmake

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

2013-11-26 15:05:26 +04:00

data

fixed malformed XML