1. 17 2月, 2014 2 次提交
  2. 14 2月, 2014 6 次提交
  3. 13 2月, 2014 9 次提交
  4. 12 2月, 2014 8 次提交
  5. 11 2月, 2014 7 次提交
    • I
      added performance tests for NLMeans · 4f2cdc9b
      Ilya Lavrenov 提交于
      4f2cdc9b
    • R
      Merge pull request #2311 from SvenWe:master · 511e79ae
      Roman Donchenko 提交于
      511e79ae
    • R
      Merge pull request #2313 from m3d:patch-1 · 1cef6f9f
      Roman Donchenko 提交于
      1cef6f9f
    • R
      Merge pull request #1851 from dneelyep:patch-1 · dad536f4
      Roman Donchenko 提交于
      dad536f4
    • R
      Merge pull request #2310 from SpecLad:merge-2.4 · 7a35f459
      Roman Donchenko 提交于
      7a35f459
    • R
      Merge remote-tracking branch 'origin/2.4' into merge-2.4 · 72aabb8a
      Roman Donchenko 提交于
      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
      72aabb8a
    • M
      fixed spelling and removed return images · 47a41449
      Martin Dlouhy 提交于
      47a41449
  6. 10 2月, 2014 2 次提交
  7. 08 2月, 2014 3 次提交
  8. 07 2月, 2014 3 次提交