a18bc9651d
fixed bug reported by Irina K. Also tried to fix LBP detector regression in quality (probably it did not help but still ...)
2014-02-12 17:42:09 +04:00
511e79aef7
Merge pull request #2311 from SvenWe:master
2014-02-11 17:11:06 +04:00
1cef6f9fb1
Merge pull request #2313 from m3d:patch-1
2014-02-11 17:10:23 +04:00
dad536f490
Merge pull request #1851 from dneelyep:patch-1
2014-02-11 16:46:35 +04:00
7a35f4593e
Merge pull request #2310 from SpecLad:merge-2.4
2014-02-11 13:44:51 +04:00
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
47a41449e3
fixed spelling and removed return images
2014-02-10 20:32:54 +01:00
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.
2014-02-10 16:53:17 +01:00
1d68a89947
Merge pull request #2303 from jet47:gpu-canny-fix
2014-02-07 19:03:14 +04:00
86b6c48712
Merge pull request #2295 from alalek:opencl_align_rw_buffers
2014-02-07 17:45:15 +04:00
48f95d92ae
Merge pull request #2294 from jet47:fix-gpu-issues
2014-02-07 16:54:49 +04:00
8b16b8b657
Merge pull request #2296 from apavlenko:fix_coverity_scan
2014-02-07 16:54:30 +04:00
5dbdadb769
fixed several bugs in CUDA Canny implementation:
...
* out of border access in edgesHysteresisLocalKernel
* incorrect usage of atomicAdd
2014-02-07 16:04:29 +04:00
5a8363a44e
Merge pull request #2301 from jet47:fix-nonfree-build
2014-02-07 15:34:46 +04:00
d534d04f25
Merge pull request #2297 from asmorkalov:ocv_testdata_install_perms_fix
2014-02-07 15:33:59 +04:00
bfc27271e2
Revert "disable gpu Canny and HoughCircles perf tests:"
...
This reverts commit dbce90692a
2014-02-07 14:55:06 +04:00
ce992c8269
ocl: update gftt
2014-02-07 14:51:59 +04:00
e371901dd9
ocl: workaround for failures with misaligned host buffers
2014-02-07 14:51:58 +04:00
b86088b89c
Implicit testdata directory permissions setup added.
2014-02-07 14:42:35 +04:00
c1b6bf21d5
Merge pull request #2300 from asmorkalov:android_no_cuda_not_armeabiv7a
2014-02-07 14:39:09 +04:00
3e1f74f2ca
fix nonfree module compilation without CUDA
2014-02-07 13:40:37 +04:00
b10d4b05ed
dynamicuda module disabled in OpenCv.mk for all arches except armeabi-v7a.
2014-02-07 12:46:24 +04:00
4b31b9cb8c
Merge pull request #2251 from ilya-lavrenov:tapi_sqrboxfilter
2014-02-07 11:33:49 +04:00
710d51bb41
Merge pull request #2287 from ilya-lavrenov:mat_step
2014-02-06 21:38:22 +04:00
9ff5a24f92
Merge pull request #2289 from ilya-lavrenov:umat_expr
2014-02-06 21:37:57 +04:00
38f46eb3b4
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
412468e0ae
added cv::sqrBoxFilter to T-API
2014-02-06 19:19:18 +04:00
5d099df578
Revert "disable CUDA generalized Hough Transform"
...
This reverts commit 33d42b740c
2014-02-06 18:02:14 +04:00
3e4bb371c8
fix epsilons for several gpu tests
2014-02-06 18:02:14 +04:00
b6ba1f226c
Revert "disable gpu CvtColor.*2HSV tests:"
...
This reverts commit 952027a853
2014-02-06 18:02:14 +04:00
da44a2fac1
Revert "disable gpu Subtract_Array test:"
...
This reverts commit e91bf95d58
2014-02-06 18:02:14 +04:00
7daf26d398
Merge pull request #2269 from Nerei:qt5_vtk_guards
2014-02-06 16:47:15 +04:00
34b02f6437
Merge pull request #2276 from asmorkalov:android_install_cuda
2014-02-06 16:45:49 +04:00
af0040eab0
condition for Mat step
2014-02-06 15:44:27 +04:00
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.
2014-02-06 15:32:57 +04:00
e91b818e3e
Merge pull request #2292 from asmorkalov:ocv_deb_tests_script_path_fix
2014-02-06 14:59:31 +04:00
b6675ee2a8
Merge pull request #2278 from KonstantinMatskevich:ocl_toinputarray
2014-02-06 12:55:04 +04:00
a078653ab4
Merge pull request #2285 from KonstantinMatskevich:ocl_test_cascade2.4
2014-02-06 12:52:28 +04:00
530702c5f2
Absolute path to tests in opencv_run_app_tests.sh fixed.
2014-02-06 12:35:14 +04:00
feed2c074d
Merge pull request #2288 from asmorkalov:android_project_properties_generation_fix
2014-02-06 12:20:08 +04:00
e190d3fd36
added perf test
2014-02-05 20:24:30 +04:00
563dc5aa38
implemented umat expressions
2014-02-05 19:23:42 +04:00
721d0145e0
Merge pull request #2002 from abak:stereo_calibrate
2014-02-05 17:47:27 +04:00
65b4d77959
project.properties file generation fixed for per-component installation.
2014-02-05 17:34:19 +04:00
9493a4ec4e
Merge tag '3.0-ocl-tp2' (-s ours)
...
OpenCV 3.0 OpenCL Technical Preview 2
2014-02-05 14:00:20 +04:00
9f8de69505
Set status to -tp2.
2014-02-05 13:57:04 +04:00
bdfa9fa14a
fixes2
2014-02-05 13:51:14 +04:00
02bf4984cb
Merge pull request #2284 from KonstantinMatskevich:ocl_test_cascade
2014-02-05 13:37:06 +04:00
4ab891e9e5
Merge pull request #2277 from asmorkalov:android_test_path_fix
2014-02-05 12:36:37 +04:00
435615ba2e
update test CascadeClassifier
2014-02-05 12:23:36 +04:00
Vadim Pisarevsky
Roman Donchenko
Martin Dlouhy
Sven Wehner
Andrey Pavlenko
Vladislav Vinogradov
Alexander Alekhin
Alexander Smorkalov
Ilya Lavrenov
Konstantin Matskevich