Roman Donchenko
3542da7167
Merge pull request #2336 from SpecLad:useOclChanged
11 years ago
Andrey Pavlenko
0fc248fb70
Merge pull request #2326 from vpisarev:ocl_ch3
11 years ago
Roman Donchenko
88f993dbda
Deleted an assignment to a variable that doesn't exist.
11 years ago
Andrey Pavlenko
534bec3a90
Merge pull request #2315 from ilya-lavrenov:nlmeans_perf
11 years ago
Andrey Pavlenko
d68c688f22
Merge pull request #1735 from KonstantinMatskevich:umat_tests
11 years ago
Roman Donchenko
3def7778dc
Merge pull request #2062 from cook:bug3440
11 years ago
Yantao Xie
6b00c4e337
Use CMAKE_CFG_INTDIR meta-variable to get the library output directory of the opencv_matlab.
11 years ago
Vadim Pisarevsky
630bdbf42f
fixed OpenCL kernel flag in resize (thanks to Ilya L)
11 years ago
Konstantin Matskevich
5f76072c62
update
11 years ago
Roman Donchenko
f297ec55ae
Merge pull request #2304 from mattvenn:master
11 years ago
Roman Donchenko
935e36bc72
Merge pull request #2319 from m3d:patch-1
11 years ago
Andrey Pavlenko
0ee5c34f40
Merge pull request #2324 from vpisarev:fix_facedetect
11 years ago
Matt Venn
7acd28fbea
added imgpoints back
11 years ago
Konstantin Matskevich
a0a3b8b56d
Some tests for UMat
11 years ago
Vadim Pisarevsky
91587059ad
tab => spaces
11 years ago
Vadim Pisarevsky
290fbc0121
3-channel support in OpenCL kernels for setTo, resize, warpAffine and warpPerspective
11 years ago
Vadim Pisarevsky
a18bc9651d
fixed bug reported by Irina K. Also tried to fix LBP detector regression in quality (probably it did not help but still ...)
11 years ago
Roman Donchenko
863e9c699a
Merge pull request #2322 from berak:b_cc_read
11 years ago
Roman Donchenko
fa38ea6d50
Merge pull request #2317 from blueskymonster:master
11 years ago
Martin Dlouhy
d9a322f606
undo changes of cv2.cv.* functions/constants
11 years ago
Vadim Pisarevsky
f7620dc7d1
added 3-channel support to arithmetic operations
11 years ago
Martin Dlouhy
bbefc101de
removed return images and fixed cv2 names
11 years ago
Elliot Godzich
2806679781
Updated DisplayImage.cpp program to compile
...
CV_WINDOW_AUTOSIZE -> WINDOW_AUTOSIZE
11 years ago
Ilya Lavrenov
4f2cdc9bac
added performance tests for NLMeans
11 years ago
Roman Donchenko
511e79aef7
Merge pull request #2311 from SvenWe:master
11 years ago
Roman Donchenko
1cef6f9fb1
Merge pull request #2313 from m3d:patch-1
11 years ago
Roman Donchenko
dad536f490
Merge pull request #1851 from dneelyep:patch-1
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
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