generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
dad536f490
opencv/modules
History
Roman Donchenko 72aabb8a84 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	CMakeLists.txt
	cmake/OpenCVGenAndroidMK.cmake
	cmake/templates/OpenCV.mk.in
	doc/tutorials/viz/creating_widgets/creating_widgets.rst
	doc/tutorials/viz/launching_viz/launching_viz.rst
	doc/tutorials/viz/table_of_content_viz/images/image_effects.png
	doc/tutorials/viz/transformations/transformations.rst
	doc/tutorials/viz/widget_pose/widget_pose.rst
	modules/core/include/opencv2/core/affine.hpp
	modules/core/include/opencv2/core/core.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/src/cuda/canny.cu
	modules/gpu/src/cuda/generalized_hough.cu
	modules/gpu/src/generalized_hough.cpp
	modules/gpu/src/imgproc.cpp
	modules/gpu/test/test_color.cpp
	modules/gpu/test/test_core.cpp
	modules/gpu/test/test_gpumat.cpp
	modules/gpu/test/test_hough.cpp
	modules/nonfree/CMakeLists.txt
	modules/nonfree/include/opencv2/nonfree/gpu.hpp
	modules/nonfree/perf/perf_gpu.cpp
	modules/nonfree/src/cuda/surf.cu
	modules/nonfree/src/precomp.hpp
	modules/nonfree/src/surf_gpu.cpp
	modules/nonfree/test/test_gpu.cpp
	modules/ocl/perf/perf_haar.cpp
	modules/stitching/CMakeLists.txt
	modules/stitching/include/opencv2/stitching/detail/matchers.hpp
	modules/stitching/include/opencv2/stitching/detail/seam_finders.hpp
	modules/stitching/include/opencv2/stitching/detail/warpers.hpp
	modules/stitching/include/opencv2/stitching/warpers.hpp
	modules/stitching/src/blenders.cpp
	modules/stitching/src/matchers.cpp
	modules/stitching/src/precomp.hpp
	modules/stitching/src/seam_finders.cpp
	modules/stitching/src/stitcher.cpp
	modules/stitching/src/warpers.cpp
	modules/viz/doc/widget.rst
	modules/viz/include/opencv2/viz/types.hpp
	modules/viz/include/opencv2/viz/viz3d.hpp
	modules/viz/include/opencv2/viz/widget_accessor.hpp
	modules/viz/src/precomp.hpp
	modules/viz/src/shapes.cpp
	modules/viz/src/vizcore.cpp
	modules/viz/src/vtk/vtkCloudMatSink.h
	modules/viz/src/vtk/vtkCloudMatSource.h
	modules/viz/test/test_precomp.hpp
	modules/viz/test/tests_simple.cpp
	samples/android/tutorial-4-cuda/CMakeLists.txt
	samples/android/tutorial-4-cuda/jni/Android.mk
	samples/android/tutorial-4-cuda/src/org/opencv/samples/tutorial4/Tutorial4Activity.java
	samples/cpp/stitching_detailed.cpp
	samples/cpp/tutorial_code/viz/creating_widgets.cpp
	samples/cpp/tutorial_code/viz/launching_viz.cpp
	samples/cpp/tutorial_code/viz/transformations.cpp
	samples/cpp/tutorial_code/viz/widget_pose.cpp
2014-02-11 12:05:01 +04:00
..
androidcamera Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-01-27 15:28:14 +04:00
calib3d Merge pull request #2002 from abak:stereo_calibrate 2014-02-05 17:47:27 +04:00
contrib Fixed Bug #3514 Incorrect Chi-Square distance used in LBPH FaceRecognizer 2014-01-30 21:53:05 +00:00
core Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-02-11 12:05:01 +04:00
cuda Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-02-11 12:05:01 +04:00
cudaarithm Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-02-11 12:05:01 +04:00
cudabgsegm Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-03 17:35:21 +04:00
cudacodec Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-03 17:35:21 +04:00
cudafeatures2d Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-03 17:35:21 +04:00
cudafilters Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-03 17:35:21 +04:00
cudaimgproc Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-02-11 12:05:01 +04:00
cudalegacy Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-02-03 13:23:59 +04:00
cudaoptflow Merge commit '05b9c991dd' into merge-2.4 2013-12-30 17:30:59 +04:00
cudastereo Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-03 17:35:21 +04:00
cudawarping Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-03 17:35:21 +04:00
cudev Removed another usage of __func__, following #1763. 2013-11-11 17:02:50 +04:00
features2d Merge pull request #2278 from KonstantinMatskevich:ocl_toinputarray 2014-02-06 12:55:04 +04:00
flann Merge pull request #2031 from berak:b_flann_timer_30 2014-02-03 17:00:21 +04:00
highgui Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-02-03 13:23:59 +04:00
imgproc ocl: update gftt 2014-02-07 14:51:59 +04:00
java Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-02-11 12:05:01 +04:00
legacy features2d 2014-02-04 16:55:07 +04:00
matlab Replace $(Configuration) with $<CONFIGURATION> 2013-10-24 18:20:16 +01:00
ml Fixed alignment 2014-01-30 16:43:56 +02:00
nonfree fix nonfree module compilation without CUDA 2014-02-07 13:40:37 +04:00
objdetect fixing issues from coverity scan 1167937, 1167938, 1167939, 1127248 (http://scan.coverity.com/projects/169?tab=Overview) 2014-02-06 21:33:44 +04:00
optim Merge pull request #1521 from nailbiter:optimCG 2013-10-29 16:14:32 +04:00
photo deleted excess semicolons, commas 2014-01-18 01:31:33 +04:00
python bug fix for issue 3470 2014-02-03 14:46:22 +04:00
shape Merge pull request #1567 from ilya-lavrenov:warn_fix 2013-10-08 13:50:49 +04:00
softcascade deleted excess semicolons, commas 2014-01-18 01:31:33 +04:00
stitching Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-02-11 12:05:01 +04:00
superres added perf test 2014-02-05 20:24:30 +04:00
ts cleaned up super_resolution sample from old OCL 2014-02-05 00:28:10 +04:00
video Merge pull request #2252 from ilya-lavrenov:ocl_ref 2014-02-04 16:34:28 +04:00
videostab Code review fixes. 2013-12-23 11:34:46 +04:00
viz modified viz module header layout for 2.4 compatibility 2014-02-02 16:23:34 +04:00
world Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-11 16:55:36 +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