third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
dcaf923517
opencv/modules
History
Roman Donchenko dcaf923517 Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	3rdparty/ffmpeg/ffmpeg_version.cmake
	cmake/OpenCVFindLibsGrfmt.cmake
	cmake/templates/cvconfig.h.cmake
	modules/bioinspired/doc/retina/index.rst
	modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
	modules/calib3d/src/precomp.hpp
	modules/contrib/src/inputoutput.cpp
	modules/contrib/src/precomp.hpp
	modules/core/include/opencv2/core/internal.hpp
	modules/core/include/opencv2/core/types_c.h
	modules/core/src/drawing.cpp
	modules/core/src/precomp.hpp
	modules/core/src/system.cpp
	modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst
	modules/features2d/doc/common_interfaces_of_feature_detectors.rst
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/features2d/src/precomp.hpp
	modules/flann/src/precomp.hpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/image_filtering.rst
	modules/gpu/doc/image_processing.rst
	modules/gpu/doc/video.rst
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/perf4au/main.cpp
	modules/gpu/src/imgproc.cpp
	modules/gpu/src/precomp.hpp
	modules/gpu/test/test_imgproc.cpp
	modules/highgui/CMakeLists.txt
	modules/highgui/test/test_precomp.hpp
	modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
	modules/imgproc/src/precomp.hpp
	modules/java/generator/src/cpp/Mat.cpp
	modules/legacy/src/precomp.hpp
	modules/ml/doc/k_nearest_neighbors.rst
	modules/ml/src/precomp.hpp
	modules/nonfree/doc/feature_detection.rst
	modules/nonfree/src/precomp.hpp
	modules/objdetect/include/opencv2/objdetect/objdetect.hpp
	modules/objdetect/src/cascadedetect.cpp
	modules/objdetect/src/hog.cpp
	modules/objdetect/src/precomp.hpp
	modules/objdetect/test/test_latentsvmdetector.cpp
	modules/ocl/src/hog.cpp
	modules/ocl/src/opencl/objdetect_hog.cl
	modules/ocl/src/precomp.hpp
	modules/photo/src/precomp.hpp
	modules/stitching/src/precomp.hpp
	modules/superres/perf/perf_precomp.hpp
	modules/superres/src/optical_flow.cpp
	modules/superres/src/precomp.hpp
	modules/superres/test/test_precomp.hpp
	modules/ts/include/opencv2/ts.hpp
	modules/video/src/precomp.hpp
	modules/videostab/src/precomp.hpp
	modules/world/src/precomp.hpp
2013-08-06 13:56:49 +04:00
..
androidcamera Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +04:00
bioinspired Merge remote-tracking branch 'origin/2.4' 2013-08-06 13:56:49 +04:00
calib3d Merge remote-tracking branch 'origin/2.4' 2013-08-06 13:56:49 +04:00
contrib Merge remote-tracking branch 'origin/2.4' 2013-08-06 13:56:49 +04:00
core Merge remote-tracking branch 'origin/2.4' 2013-08-06 13:56:49 +04:00
cudev added stub library for cudev module 2013-07-12 08:47:12 +04:00
features2d Merge remote-tracking branch 'origin/2.4' 2013-08-06 13:56:49 +04:00
flann Merge remote-tracking branch 'origin/2.4' 2013-08-06 13:56:49 +04:00
gpu Merge remote-tracking branch 'origin/2.4' 2013-08-06 13:56:49 +04:00
gpuarithm Merge pull request #1032 from jet47:gpuarithm-remove-obsolete-api 2013-07-21 18:45:47 +04:00
gpubgsegm Merge remote-tracking branch 'origin/2.4' 2013-08-06 13:56:49 +04:00
gpucodec Merge remote-tracking branch 'origin/2.4' 2013-08-06 13:56:49 +04:00
gpufeatures2d fixed gpu performance tests: 2013-07-16 15:43:04 +04:00
gpufilters Merge remote-tracking branch 'origin/2.4' 2013-08-06 13:56:49 +04:00
gpuimgproc Merge remote-tracking branch 'origin/2.4' 2013-08-06 13:56:49 +04:00
gpulegacy Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-06-25 15:55:52 +04:00
gpuoptflow Merge remote-tracking branch 'origin/2.4' 2013-08-06 13:56:49 +04:00
gpustereo Merge remote-tracking branch 'origin/2.4' 2013-08-06 13:56:49 +04:00
gpuwarping fixed gpu performance tests: 2013-07-16 15:43:04 +04:00
highgui Merge remote-tracking branch 'origin/2.4' 2013-08-06 13:56:49 +04:00
imgproc Merge remote-tracking branch 'origin/2.4' 2013-08-06 13:56:49 +04:00
java Merge remote-tracking branch 'origin/2.4' 2013-08-06 13:56:49 +04:00
legacy Merge remote-tracking branch 'origin/2.4' 2013-08-06 13:56:49 +04:00
ml Merge remote-tracking branch 'origin/2.4' 2013-08-06 13:56:49 +04:00
nonfree Merge remote-tracking branch 'origin/2.4' 2013-08-06 13:56:49 +04:00
objdetect Merge remote-tracking branch 'origin/2.4' 2013-08-06 13:56:49 +04:00
ocl Merge remote-tracking branch 'origin/2.4' 2013-08-06 13:56:49 +04:00
optim Minor fixes 2013-07-30 04:14:36 +03:00
photo Merge remote-tracking branch 'origin/2.4' 2013-08-06 13:56:49 +04:00
python Merge pull request #1204 from berak:Bug_3170 2013-07-30 16:13:03 +04:00
softcascade Merge pull request #1095 from jet47:gpu-perf-tests 2013-07-18 19:32:37 +04:00
stitching Merge remote-tracking branch 'origin/2.4' 2013-08-06 13:56:49 +04:00
superres Merge remote-tracking branch 'origin/2.4' 2013-08-06 13:56:49 +04:00
ts Merge remote-tracking branch 'origin/2.4' 2013-08-06 13:56:49 +04:00
video Merge remote-tracking branch 'origin/2.4' 2013-08-06 13:56:49 +04:00
videostab Merge remote-tracking branch 'origin/2.4' 2013-08-06 13:56:49 +04:00
world Remove HAVE_CVCONFIG_H - it's always defined. 2013-07-10 16:02:07 +04:00
CMakeLists.txt Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-06-10 18:18:01 +04:00
refman.rst.in