mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-15 20:23:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
3939d78336
opencv/modules/java/generator/src/cpp
History
Roman Donchenko 3939d78336 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/core/include/opencv2/core/types_c.h
	modules/gpu/src/cuda/imgproc.cu
	modules/gpu/src/cuda/safe_call.hpp
	modules/gpu/src/error.cpp
	modules/gpu/src/imgproc.cpp
	modules/imgproc/src/distransform.cpp
	modules/imgproc/src/shapedescr.cpp
	modules/python/src2/cv2.cpp
	modules/python/src2/cv2.cv.hpp
2013-07-22 18:38:57 +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 Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-22 18:38:57 +04:00
utils.cpp Fix build errors 2013-04-08 17:10:31 +04:00
VideoCapture.cpp Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00