Roman Donchenko
bb4199b177
Merge pull request #2314 from ilya-lavrenov:typo
11 years ago
Roman Donchenko
dad536f490
Merge pull request #1851 from dneelyep:patch-1
11 years ago
Ilya Lavrenov
281666887e
typo
11 years ago
Roman Donchenko
7a35f4593e
Merge pull request #2310 from SpecLad:merge-2.4
11 years ago
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
11 years ago
Martin Dlouhy
47a41449e3
fixed spelling and removed return images
11 years ago
Sven Wehner
f7041bacc0
grabcut.py sample: Allow drawing rect from bottom/right
...
The grabcut sample script isn't able to create rectangles correctly that are
drawn from e.g. bottom-right to top-left.
This small commit uses four min() calls to determine the correct
top-left point of the rectangle.
It also removes some unnecessary white spaces before colons.
11 years ago
Matt Venn
2d33063a59
removed whitespace at end of line 96
11 years ago
Roman Donchenko
63dbe66b41
Merge pull request #2308 from jet47:gpu-tests-timeout
11 years ago
Roman Donchenko
3cc27c769c
Merge pull request #2309 from Nerei:fixed_cl_exe_hang_with_eigen
11 years ago
Anatoly Baksheev
becbfa6281
Fixed Cl.exe hang for VS2008 x64 with Eigen::exp() function
11 years ago
Vladislav Vinogradov
8b44a42a40
decrease input size for several gpu tests to fix "timed out" error:
...
* BruteForceNonLocalMeans
* OpticalFlowBM
11 years ago
berak
3959329ef4
proper initialization for ccimpl in bool CascadeClassifier::read(const FileNode
11 years ago
Matt Venn
3170414ca8
fixed whitespace
11 years ago
Matt Venn
a0bfdb9bf1
fixed examples for opencv 2.4.8
11 years ago
Roman Donchenko
1d68a89947
Merge pull request #2303 from jet47:gpu-canny-fix
11 years ago
Andrey Pavlenko
86b6c48712
Merge pull request #2295 from alalek:opencl_align_rw_buffers
11 years ago
Roman Donchenko
48f95d92ae
Merge pull request #2294 from jet47:fix-gpu-issues
11 years ago
Roman Donchenko
8b16b8b657
Merge pull request #2296 from apavlenko:fix_coverity_scan
11 years ago
Vladislav Vinogradov
5dbdadb769
fixed several bugs in CUDA Canny implementation:
...
* out of border access in edgesHysteresisLocalKernel
* incorrect usage of atomicAdd
11 years ago
Roman Donchenko
5a8363a44e
Merge pull request #2301 from jet47:fix-nonfree-build
11 years ago
Roman Donchenko
d534d04f25
Merge pull request #2297 from asmorkalov:ocv_testdata_install_perms_fix
11 years ago
Vladislav Vinogradov
bfc27271e2
Revert "disable gpu Canny and HoughCircles perf tests:"
...
This reverts commit dbce90692a
.
11 years ago
Alexander Alekhin
ce992c8269
ocl: update gftt
11 years ago
Alexander Alekhin
e371901dd9
ocl: workaround for failures with misaligned host buffers
11 years ago
Alexander Smorkalov
b86088b89c
Implicit testdata directory permissions setup added.
11 years ago
Roman Donchenko
c1b6bf21d5
Merge pull request #2300 from asmorkalov:android_no_cuda_not_armeabiv7a
11 years ago
Vladislav Vinogradov
3e1f74f2ca
fix nonfree module compilation without CUDA
11 years ago
Alexander Smorkalov
b10d4b05ed
dynamicuda module disabled in OpenCv.mk for all arches except armeabi-v7a.
11 years ago
Andrey Pavlenko
4b31b9cb8c
Merge pull request #2251 from ilya-lavrenov:tapi_sqrboxfilter
11 years ago
Andrey Pavlenko
710d51bb41
Merge pull request #2287 from ilya-lavrenov:mat_step
11 years ago
Andrey Pavlenko
9ff5a24f92
Merge pull request #2289 from ilya-lavrenov:umat_expr
11 years ago
Andrey Pavlenko
38f46eb3b4
fixing issues from coverity scan 1167937, 1167938, 1167939, 1127248 ( http://scan.coverity.com/projects/169?tab=Overview )
11 years ago
Ilya Lavrenov
412468e0ae
added cv::sqrBoxFilter to T-API
11 years ago
Vladislav Vinogradov
5d099df578
Revert "disable CUDA generalized Hough Transform"
...
This reverts commit 33d42b740c
.
11 years ago
Vladislav Vinogradov
3e4bb371c8
fix epsilons for several gpu tests
11 years ago
Vladislav Vinogradov
b6ba1f226c
Revert "disable gpu CvtColor.*2HSV tests:"
...
This reverts commit 952027a853
.
11 years ago
Vladislav Vinogradov
da44a2fac1
Revert "disable gpu Subtract_Array test:"
...
This reverts commit e91bf95d58
.
11 years ago
Roman Donchenko
7daf26d398
Merge pull request #2269 from Nerei:qt5_vtk_guards
11 years ago
Roman Donchenko
34b02f6437
Merge pull request #2276 from asmorkalov:android_install_cuda
11 years ago
Ilya Lavrenov
af0040eab0
condition for Mat step
11 years ago
Alexander Smorkalov
6ae4a9b09b
Multiple improvements in OpenCV examples build.
...
EMBED_CUDA and FORCE_EMBED_OPENCV flags added to cmake macro add_android_project;
INSTALL_CUDA_LIBRARIES option added to OpenCV.mk
opencv_dynamicuda library installation with enabled OPENCV_INSTALL_MODULES flag fixed;
CUDA initialization apportunity added to OpenCVLoader.initDebug();
Tutorial-4-CUDA sample reimplemented with static OpenCV and CUDA initialization.
11 years ago
Roman Donchenko
e91b818e3e
Merge pull request #2292 from asmorkalov:ocv_deb_tests_script_path_fix
11 years ago
Andrey Pavlenko
b6675ee2a8
Merge pull request #2278 from KonstantinMatskevich:ocl_toinputarray
11 years ago
Andrey Pavlenko
a078653ab4
Merge pull request #2285 from KonstantinMatskevich:ocl_test_cascade2.4
11 years ago
Alexander Smorkalov
530702c5f2
Absolute path to tests in opencv_run_app_tests.sh fixed.
11 years ago
Roman Donchenko
feed2c074d
Merge pull request #2288 from asmorkalov:android_project_properties_generation_fix
11 years ago
Ilya Lavrenov
e190d3fd36
added perf test
11 years ago
Ilya Lavrenov
563dc5aa38
implemented umat expressions
11 years ago
Roman Donchenko
721d0145e0
Merge pull request #2002 from abak:stereo_calibrate
11 years ago