mirror of
https://github.com/opencv/opencv.git
synced 2024-11-25 19:50:38 +08:00
72aabb8a84
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 |
||
|---|---|---|
| .. | ||
| opencv2 | ||