third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
f76dd99299
opencv/modules/java/generator/src/cpp
History
Roman Donchenko f76dd99299 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	cmake/OpenCVModule.cmake
	doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
	doc/tutorials/features2d/feature_detection/feature_detection.rst
	doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
	doc/tutorials/features2d/feature_homography/feature_homography.rst
	modules/core/include/opencv2/core/operations.hpp
	modules/core/src/arithm.cpp
	modules/gpu/perf/perf_video.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/java/generator/gen_java.py
	modules/java/generator/src/cpp/VideoCapture.cpp
	modules/nonfree/src/opencl/surf.cl
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_precomp.hpp
	modules/ocl/src/color.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/test/test_color.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/python/src2/cv2.cpp
	samples/gpu/CMakeLists.txt
	samples/gpu/super_resolution.cpp
2013-08-19 19:02:36 +04:00
..
common.h Move non-CV functionality from core.hpp to separate utility.hpp header 2013-03-20 17:56:06 +04:00
converters.cpp Remove all using directives for STL namespace and members 2013-02-25 15:04:17 +04:00
converters.h Main module headers are moved 1 level up 2013-03-13 17:26:56 +04:00
core_manual.cpp Move non-CV functionality from core.hpp to separate utility.hpp header 2013-03-20 17:56:06 +04:00
core_manual.hpp Main module headers are moved 1 level up 2013-03-13 17:26:56 +04:00
features2d_manual.hpp Completely separate C and C++ API of OpenCV core 2013-04-01 15:24:34 +04:00
jni_part.cpp Main module headers are moved 1 level up 2013-03-13 17:26:56 +04:00
Mat.cpp Fixed compilation errors. 2013-08-06 18:07:08 +04:00
utils.cpp Fix build errors 2013-04-08 17:10:31 +04:00