Ilya Lavrenov
|
89b7c0dd93
|
3 channel support to cv::transpose
|
2014-03-12 00:17:11 +04:00 |
|
Ilya Lavrenov
|
2755ae5df9
|
experiments
|
2014-03-11 23:03:55 +04:00 |
|
Roman Donchenko
|
95a55453df
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/calib3d/perf/perf_pnp.cpp
modules/contrib/src/imagelogpolprojection.cpp
modules/contrib/src/templatebuffer.hpp
modules/core/perf/opencl/perf_gemm.cpp
modules/cudafeatures2d/doc/feature_detection_and_description.rst
modules/cudafeatures2d/perf/perf_features2d.cpp
modules/cudafeatures2d/src/fast.cpp
modules/cudafeatures2d/test/test_features2d.cpp
modules/features2d/doc/feature_detection_and_description.rst
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/perf4au/main.cpp
modules/imgproc/perf/opencl/perf_blend.cpp
modules/imgproc/perf/opencl/perf_color.cpp
modules/imgproc/perf/opencl/perf_moments.cpp
modules/imgproc/perf/opencl/perf_pyramid.cpp
modules/objdetect/perf/opencl/perf_hogdetect.cpp
modules/ocl/perf/perf_arithm.cpp
modules/ocl/perf/perf_bgfg.cpp
modules/ocl/perf/perf_blend.cpp
modules/ocl/perf/perf_brute_force_matcher.cpp
modules/ocl/perf/perf_canny.cpp
modules/ocl/perf/perf_filters.cpp
modules/ocl/perf/perf_gftt.cpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_imgwarp.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/perf_matrix_operation.cpp
modules/ocl/perf/perf_ml.cpp
modules/ocl/perf/perf_moments.cpp
modules/ocl/perf/perf_opticalflow.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/cl_context.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/video/src/lkpyramid.cpp
modules/video/src/precomp.hpp
samples/gpu/morphology.cpp
|
2014-03-11 17:20:01 +04:00 |
|
Andrey Pavlenko
|
702a2a6ff6
|
Merge pull request #2373 from mlyashko:optflow_dualtvl1
|
2014-03-11 16:00:22 +04:00 |
|
Andrey Pavlenko
|
90c5dde887
|
Merge pull request #2455 from ilya-lavrenov:tapi_fix
|
2014-03-11 15:58:32 +04:00 |
|
Alexander Alekhin
|
e4608229f0
|
ocl: copyMakeBorder 3-channel
|
2014-03-10 17:22:49 +04:00 |
|
kurodash
|
0eaeff0641
|
fix: use "cvAlloc" wrapper function for malloc.
|
2014-03-07 19:02:37 +09:00 |
|
Andrey Pavlenko
|
5dbe73f94d
|
Merge pull request #2438 from ilya-lavrenov:tapi_flip
|
2014-03-07 13:54:34 +04:00 |
|
Andrey Pavlenko
|
182d74d33f
|
Merge pull request #2441 from akarsakov:ocl_platform_vendor
|
2014-03-07 13:54:13 +04:00 |
|
Alexander Karsakov
|
8660588fe9
|
Pass vendor macro to opencl kernel
|
2014-03-07 12:57:29 +04:00 |
|
mlyashko
|
eb2e8a11fa
|
changed kernel.set to support unsuccssful set
|
2014-03-07 11:15:54 +04:00 |
|
Ilya Lavrenov
|
0e2cc5ef63
|
fix bitwise ops and mask support
|
2014-03-06 23:39:05 +04:00 |
|
Andrey Pavlenko
|
d1d451c952
|
Merge pull request #2431 from ilya-lavrenov:tapi_perf
|
2014-03-06 22:17:44 +04:00 |
|
Andrey Pavlenko
|
2f0fe5b87b
|
Merge pull request #2450 from ilya-lavrenov:tapi_test
|
2014-03-06 21:55:50 +04:00 |
|
Ilya Lavrenov
|
f404315368
|
test for clEnqueueReadBufferRect
|
2014-03-06 12:11:46 +04:00 |
|
mlyashko
|
66ed6a8a50
|
macro for normal return from thriveless kernel.set
|
2014-03-06 11:43:01 +04:00 |
|
Alexander Karsakov
|
c1dad2178c
|
Added Device:: isAMD,isIntel,isNvidia methods.
|
2014-03-05 14:43:11 +04:00 |
|
Andrey Pavlenko
|
0a3aca230c
|
Merge pull request #2436 from ilya-lavrenov:tapi_dft_fix
|
2014-03-04 19:21:15 +04:00 |
|
Andrey Pavlenko
|
c00f0faf24
|
Merge pull request #2408 from ilya-lavrenov:tapi_core_opt
|
2014-03-04 18:37:26 +04:00 |
|
Ilya Lavrenov
|
099ea91823
|
typos
|
2014-03-04 12:47:40 +04:00 |
|
Ilya Lavrenov
|
050cca0422
|
improved performance of cv::flip (flip cols)
|
2014-03-03 19:04:32 +04:00 |
|
Ilya Lavrenov
|
be5b5a0471
|
fixed cv::dft
|
2014-03-03 14:32:38 +04:00 |
|
Roman Donchenko
|
db85c35e69
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/contrib/src/basicretinafilter.hpp
modules/contrib/src/magnoretinafilter.hpp
modules/contrib/src/parvoretinafilter.hpp
modules/contrib/src/retinacolor.hpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/highgui/src/cap_tyzx.cpp
modules/ocl/perf/perf_filters.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/test/test_filters.cpp
modules/ocl/test/test_objdetect.cpp
|
2014-03-03 13:45:22 +04:00 |
|
Roman Donchenko
|
af8aa8a2fa
|
Merge pull request #2433 from ilya-lavrenov:typos
|
2014-03-03 12:20:35 +04:00 |
|
Ilya Lavrenov
|
eedf86402d
|
typos
|
2014-03-02 21:04:17 +04:00 |
|
Ilya Lavrenov
|
68957b2757
|
added some new performance tests
|
2014-03-02 10:29:50 +04:00 |
|
Alexander Alekhin
|
b9d68ef061
|
core/ocl: OpenCL build log improvements
|
2014-02-27 13:16:07 +04:00 |
|
Roman Donchenko
|
bd5d8404c9
|
Merge pull request #2393 from ilya-lavrenov:coverity
|
2014-02-26 12:16:36 +04:00 |
|
Roman Donchenko
|
693129902d
|
Merge pull request #2399 from SpecLad:merge-2.4
|
2014-02-25 19:42:54 +04:00 |
|
Roman Donchenko
|
c9a4a82667
|
Merge pull request #2358 from rohitgirdhar:rotatedRect
|
2014-02-25 17:43:48 +04:00 |
|
Ilya Lavrenov
|
ce0557ebb8
|
fixed defects from Xcode
|
2014-02-25 17:33:12 +04:00 |
|
Roman Donchenko
|
48432502b6
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
cmake/OpenCVDetectCUDA.cmake
doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst
modules/core/CMakeLists.txt
modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
modules/highgui/src/grfmt_tiff.cpp
modules/imgproc/src/clahe.cpp
modules/imgproc/src/moments.cpp
modules/nonfree/CMakeLists.txt
modules/ocl/perf/perf_ml.cpp
modules/superres/CMakeLists.txt
|
2014-02-25 15:02:24 +04:00 |
|
Ilya Lavrenov
|
fe38aab84a
|
core tapi optimization
|
2014-02-25 14:14:42 +04:00 |
|
Andrey Pavlenko
|
3845b96f6c
|
Merge pull request #2388 from alalek:coverity_bug_fix
|
2014-02-24 16:54:44 +04:00 |
|
Andrey Pavlenko
|
52a339cba5
|
Merge pull request #2401 from akarsakov:fix_elem_size
|
2014-02-24 16:22:28 +04:00 |
|
Alexander Karsakov
|
6d83048ec3
|
Fixed incorrect calculation of element size in OCL.(Mul/Div).Mat_Scalar_Scale.
|
2014-02-24 15:10:00 +04:00 |
|
Ilya Lavrenov
|
32eb38ec98
|
fixed defects from coverity.com
|
2014-02-23 20:21:08 +04:00 |
|
Ilya Lavrenov
|
0406898b9a
|
int2 -> ulong; to work properly with 3 channels
|
2014-02-23 15:12:38 +04:00 |
|
Rohit Girdhar
|
fd4461d543
|
addressed issues
|
2014-02-22 09:54:16 +05:30 |
|
Roman Donchenko
|
0a90d6dde6
|
Merge pull request #2266 from vpisarev:ipp_norm_fix
|
2014-02-21 19:11:57 +04:00 |
|
Vadim Pisarevsky
|
51dafc780b
|
fixed hint type declaration
|
2014-02-21 18:07:01 +04:00 |
|
Alexander Alekhin
|
9b3c76a3db
|
TAPI: coverity bug fix
|
2014-02-21 14:04:01 +04:00 |
|
Rohit Girdhar
|
347a3dc520
|
added randomized test
|
2014-02-21 12:47:01 +05:30 |
|
Rohit Girdhar
|
ea7b1bb3d2
|
added test, doc
|
2014-02-20 17:51:48 +05:30 |
|
Alexander Alekhin
|
79eba54a4f
|
some fixes in perf tests
|
2014-02-20 13:29:11 +04:00 |
|
Rohit Girdhar
|
b939b4ae3b
|
removed inline, changed interface
|
2014-02-19 20:58:40 +05:30 |
|
Roman Donchenko
|
3782c324c4
|
Merge pull request #2098 from pxli168:patch-1
|
2014-02-18 15:49:19 +04:00 |
|
Roman Donchenko
|
b7659c62f3
|
Merge pull request #2366 from yashdv:mat_copyto_doc_bug
|
2014-02-18 13:47:46 +04:00 |
|
yash
|
394c74b349
|
edited the doc for mat::copyto and clarified the part regarding reallocation by .create
|
2014-02-18 15:04:27 +05:30 |
|
Andrey Pavlenko
|
b3cfe6b446
|
Merge pull request #2341 from alalek:ocl_fix_error_processing
|
2014-02-18 13:27:38 +04:00 |
|
Roman Donchenko
|
bcf4307345
|
Merge pull request #2356 from SpecLad:merge-2.4
|
2014-02-18 12:14:57 +04:00 |
|
yash
|
38ef8894b7
|
Made a sentence in the doc for Mat::copyTo more clearer
|
2014-02-18 10:51:05 +05:30 |
|
pxli168
|
44ecb727c5
|
Change again.
Opps.
|
2014-02-18 10:13:30 +08:00 |
|
Andrey Pavlenko
|
9885a671ee
|
Merge pull request #2346 from ilya-lavrenov:umat_tests_cleanup
|
2014-02-17 17:53:05 +04:00 |
|
Andrey Pavlenko
|
47d9b933f6
|
Merge pull request #2345 from ilya-lavrenov:tapi_3cn_perf
|
2014-02-17 17:38:26 +04:00 |
|
Andrey Pavlenko
|
aeeb9f9e25
|
Merge pull request #2334 from alalek:umat_usage_flags_2
|
2014-02-17 17:34:19 +04:00 |
|
Rohit Girdhar
|
a879e1fcd6
|
fixed warnings
|
2014-02-17 19:00:36 +05:30 |
|
Rohit Girdhar
|
613a17355d
|
rotRect using points
|
2014-02-17 17:39:13 +05:30 |
|
Roman Donchenko
|
029ffb7c2d
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/core/src/gl_core_3_1.cpp
modules/core/src/opencl/convert.cl
modules/cudaimgproc/src/cuda/canny.cu
modules/cudastereo/perf/perf_stereo.cpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/test/test_denoising.cpp
modules/ocl/src/opencl/imgproc_resize.cl
samples/cpp/Qt_sample/main.cpp
|
2014-02-17 15:24:05 +04:00 |
|
Roman Donchenko
|
e8d26b02ac
|
Merge pull request #2339 from jet47:gpu-warnings
|
2014-02-17 13:35:15 +04:00 |
|
pxli168
|
70d462b352
|
Simplify the code
Simplify the code as @SpecLad suggested.
|
2014-02-17 10:21:18 +08:00 |
|
Ilya Lavrenov
|
510680a5df
|
typo
|
2014-02-16 01:42:02 +04:00 |
|
Ilya Lavrenov
|
7629bb78a4
|
extended performance tests to test 3 channels
|
2014-02-16 01:31:33 +04:00 |
|
Ilya Lavrenov
|
9b627a5e9f
|
disabled 'reshape', 'copyTo' test
|
2014-02-15 20:17:42 +04:00 |
|
Ilya Lavrenov
|
7ce2c3574a
|
restored lost in PR #1735 umat tests
|
2014-02-15 16:09:55 +04:00 |
|
Ilya Lavrenov
|
4f36bc29d9
|
cleaned-up UMat tests
|
2014-02-15 15:51:52 +04:00 |
|
Alexander Alekhin
|
915fb632fd
|
core/ocl: change error processing for missed function
|
2014-02-14 19:50:58 +04:00 |
|
Vladislav Vinogradov
|
8b8c368148
|
fixed two warnings in gpu sources (-Wshadow, -Wno-sign-promo)
|
2014-02-14 17:56:03 +04:00 |
|
Andrey Pavlenko
|
0fc248fb70
|
Merge pull request #2326 from vpisarev:ocl_ch3
|
2014-02-14 15:49:36 +04:00 |
|
Alexander Alekhin
|
95e38e457f
|
core/umat: usage flags (with proposals from PR #2195)
|
2014-02-14 15:40:16 +04:00 |
|
Konstantin Matskevich
|
5f76072c62
|
update
|
2014-02-13 13:29:53 +04:00 |
|
Konstantin Matskevich
|
a0a3b8b56d
|
Some tests for UMat
|
2014-02-13 09:59:05 +04:00 |
|
Ilya Lavrenov
|
879c0196d4
|
enabled OpenGL on MacOSX
|
2014-02-13 00:17:15 +04:00 |
|
Vadim Pisarevsky
|
290fbc0121
|
3-channel support in OpenCL kernels for setTo, resize, warpAffine and warpPerspective
|
2014-02-12 19:29:18 +04:00 |
|
Vadim Pisarevsky
|
f7620dc7d1
|
added 3-channel support to arithmetic operations
|
2014-02-12 12:18:55 +04:00 |
|
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
|
2014-02-11 12:05:01 +04:00 |
|
Andrey Pavlenko
|
86b6c48712
|
Merge pull request #2295 from alalek:opencl_align_rw_buffers
|
2014-02-07 17:45:15 +04:00 |
|
Roman Donchenko
|
8b16b8b657
|
Merge pull request #2296 from apavlenko:fix_coverity_scan
|
2014-02-07 16:54:30 +04:00 |
|
Alexander Alekhin
|
e371901dd9
|
ocl: workaround for failures with misaligned host buffers
|
2014-02-07 14:51:58 +04:00 |
|
Andrey Pavlenko
|
710d51bb41
|
Merge pull request #2287 from ilya-lavrenov:mat_step
|
2014-02-06 21:38:22 +04:00 |
|
Andrey Pavlenko
|
9ff5a24f92
|
Merge pull request #2289 from ilya-lavrenov:umat_expr
|
2014-02-06 21:37:57 +04:00 |
|
Andrey Pavlenko
|
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 |
|
Ilya Lavrenov
|
af0040eab0
|
condition for Mat step
|
2014-02-06 15:44:27 +04:00 |
|
Andrey Pavlenko
|
b6675ee2a8
|
Merge pull request #2278 from KonstantinMatskevich:ocl_toinputarray
|
2014-02-06 12:55:04 +04:00 |
|
Ilya Lavrenov
|
e190d3fd36
|
added perf test
|
2014-02-05 20:24:30 +04:00 |
|
Ilya Lavrenov
|
563dc5aa38
|
implemented umat expressions
|
2014-02-05 19:23:42 +04:00 |
|
Konstantin Matskevich
|
a0ccb46a7f
|
fixed docs
|
2014-02-05 10:49:56 +04:00 |
|
Konstantin Matskevich
|
b0f617bc01
|
fixes
|
2014-02-05 09:59:04 +04:00 |
|
Andrey Pavlenko
|
055f41c92a
|
Merge pull request #2250 from ilya-lavrenov:tapi_renaming
|
2014-02-05 09:27:06 +04:00 |
|
Ilya Lavrenov
|
2e8579fe9b
|
cleaned up super_resolution sample from old OCL
|
2014-02-05 00:28:10 +04:00 |
|
Andrey Pavlenko
|
564f5fcca3
|
Merge pull request #2280 from ilya-lavrenov:attempt_pvc
|
2014-02-04 21:22:49 +04:00 |
|
Andrey Pavlenko
|
b7ffed7b46
|
Merge pull request #2279 from alalek:fix_memory_leak_getumat
|
2014-02-04 20:45:27 +04:00 |
|
Ilya Lavrenov
|
c7fe162829
|
renamed **2 -> **
|
2014-02-04 19:55:11 +04:00 |
|
Ilya Lavrenov
|
d957e8e40d
|
attempt to fix pure virtual call in Mat::deallocate
|
2014-02-04 19:50:37 +04:00 |
|
Alexander Alekhin
|
83a2b566a3
|
fix memory leak for Mat::getUMat() operation
|
2014-02-04 17:25:09 +04:00 |
|
Alexander Alekhin
|
485635310c
|
core/ocl: OpenCLBufferPool
|
2014-02-04 16:48:35 +04:00 |
|
Andrey Pavlenko
|
bd6620fa87
|
Merge pull request #2252 from ilya-lavrenov:ocl_ref
|
2014-02-04 16:34:28 +04:00 |
|
Andrey Pavlenko
|
49db511882
|
Merge pull request #2268 from ilya-lavrenov:tapi_pow
|
2014-02-04 16:32:43 +04:00 |
|
Konstantin Matskevich
|
c684da3549
|
drawing
|
2014-02-04 11:09:29 +04:00 |
|
Ilya Lavrenov
|
da5b316b4e
|
minor ocl.cpp refactoring
fix for cv::LUT and cv::transpose
|
2014-02-04 01:52:48 +04:00 |
|
Andrey Pavlenko
|
92c8b94ba9
|
Merge pull request #2265 from vpisarev:ocl_facedetect_amd3
|
2014-02-04 00:39:09 +04:00 |
|
Ilya Lavrenov
|
98b72ff389
|
optimized cv::pow for integer power
|
2014-02-03 22:36:57 +04:00 |
|
Andrey Pavlenko
|
810dc262ad
|
Merge pull request #2196 from KonstantinMatskevich:ocl_bugcautching
|
2014-02-03 17:32:20 +04:00 |
|
Vadim Pisarevsky
|
b8c6adc569
|
Merge pull request #2178 from Nerei:viz_backport
|
2014-02-03 16:16:51 +04:00 |
|
Roman Donchenko
|
652a0bd5ce
|
Merge pull request #2262 from SpecLad:merge-2.4
|
2014-02-03 15:33:41 +04:00 |
|
Vadim Pisarevsky
|
11926dafb2
|
eliminate crash in ipp-accelerated norm and mean functions (thanks to Matt Curfman and Aaron Kunze for the patch)
|
2014-02-03 15:31:32 +04:00 |
|
Vadim Pisarevsky
|
30593ee55e
|
3rd attempt to prepare patch with improved OpenCL kernels of CascadeClassifier.
|
2014-02-03 15:12:27 +04:00 |
|
Andrey Pavlenko
|
0fef7f8b96
|
Merge pull request #2217 from ilya-lavrenov:tapi_superres
|
2014-02-03 14:38:59 +04:00 |
|
Konstantin Matskevich
|
ffeb223150
|
test for failure
|
2014-02-03 14:34:02 +04:00 |
|
Ilya Lavrenov
|
cc47edb850
|
more strict checks and reseting state
|
2014-02-03 14:32:25 +04:00 |
|
Konstantin Matskevich
|
aa23a842a1
|
test for failure
|
2014-02-03 14:32:25 +04:00 |
|
Andrey Pavlenko
|
13875b5fbc
|
Merge pull request #2257 from ilya-lavrenov:tapi_opencl_game2
|
2014-02-03 14:26:05 +04:00 |
|
Andrey Pavlenko
|
cb1e4b2ede
|
Merge pull request #2256 from ilya-lavrenov:tapi_matchTempl
|
2014-02-03 14:10:21 +04:00 |
|
Roman Donchenko
|
2bbda9d225
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/cudaimgproc/test/test_color.cpp
modules/dynamicuda/include/opencv2/dynamicuda/dynamicuda.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/test/test_core.cpp
modules/gpu/test/test_imgproc.cpp
modules/java/generator/src/cpp/VideoCapture.cpp
samples/gpu/performance/CMakeLists.txt
samples/tapi/CMakeLists.txt
|
2014-02-03 13:23:59 +04:00 |
|
Roman Donchenko
|
82330a51bd
|
Merge pull request #2253 from ilya-lavrenov:cuda
|
2014-02-03 12:12:12 +04:00 |
|
Roman Donchenko
|
c967069922
|
Merge pull request #2254 from ilya-lavrenov:opengl
|
2014-02-03 12:11:28 +04:00 |
|
Ilya Lavrenov
|
e844c08203
|
some fixes and improvements in cv::matchTemplate
|
2014-02-02 19:20:37 +04:00 |
|
Ilya Lavrenov
|
19f799ba1e
|
fix2 for OpenCL on/off
|
2014-02-02 15:35:13 +04:00 |
|
Ilya Lavrenov
|
02692f9ac0
|
fix MACRO
|
2014-02-01 22:43:41 +04:00 |
|
Andrey Pavlenko
|
75dde49b64
|
Merge pull request #2230 from ilya-lavrenov:tapi_openc_on-off_game
|
2014-02-01 22:32:39 +04:00 |
|
Ilya Lavrenov
|
ec3eb14138
|
unused function in case of unavailable OpenGL
|
2014-02-01 18:14:10 +04:00 |
|
Ilya Lavrenov
|
a6104bd025
|
fixed unused function in case of unavailable CUDA
|
2014-02-01 18:11:45 +04:00 |
|
Ilya Lavrenov
|
6ad4823f0c
|
ported superres to T-API
|
2014-02-01 17:20:18 +04:00 |
|
Andrey Pavlenko
|
25d2ab8a68
|
Merge pull request #2218 from alalek:fix_defects_code_coverity
|
2014-01-31 19:23:02 +04:00 |
|
Andrey Pavlenko
|
2c35438771
|
Merge pull request #2228 from ilya-lavrenov:tapi_experiments
|
2014-01-31 19:14:19 +04:00 |
|
Andrey Pavlenko
|
0b57d3717f
|
Merge pull request #2244 from ilya-lavrenov:tapi_device_cache
|
2014-01-31 19:04:30 +04:00 |
|
Ilya Lavrenov
|
d15bf6261a
|
redundant clFinish in upload since clEnqueueWriteBuffer above is already blocked
|
2014-01-31 14:39:03 +04:00 |
|
Ilya Lavrenov
|
50cf152977
|
cached commonly used device properties
|
2014-01-31 14:00:05 +04:00 |
|
Andrey Pavlenko
|
77bbd65fa6
|
Merge pull request #2220 from ilya-lavrenov:tapi_accumulate
|
2014-01-30 17:33:06 +04:00 |
|
Ilya Lavrenov
|
1ab1594d00
|
workaround
|
2014-01-30 17:26:56 +04:00 |
|
Ilya Lavrenov
|
372cdac07c
|
moved kernelToStr to ocl.hpp
|
2014-01-30 15:23:11 +04:00 |
|
Ilya Lavrenov
|
86353eb541
|
fix for PR 2196
|
2014-01-30 01:47:25 +04:00 |
|
Ilya Lavrenov
|
e7e63fac6c
|
eliminated possible memory leak
|
2014-01-30 01:21:04 +04:00 |
|
Ilya Lavrenov
|
6d64907f18
|
async
|
2014-01-30 00:19:18 +04:00 |
|
Ilya Lavrenov
|
384a28622d
|
added cv::calcHist to T-API (only for CV_8UC1 with 256 bins)
|
2014-01-29 20:19:15 +04:00 |
|
Alexander Alekhin
|
f91f55927e
|
fix memory management problem
|
2014-01-29 19:59:01 +04:00 |
|
Ilya Lavrenov
|
7c96d98a24
|
implemented OpenCL version of cv::accumulate****
|
2014-01-29 11:42:46 +04:00 |
|
Alexander Alekhin
|
5474935a81
|
fixes for defects from code coverity
|
2014-01-28 20:24:10 +04:00 |
|
Andrey Pavlenko
|
fff5a6c058
|
Merge pull request #2213 from ilya-lavrenov:tapi_buildPyramid
|
2014-01-28 16:31:30 +04:00 |
|
Roman Donchenko
|
84c29745f2
|
Merge pull request #2211 from SpecLad:merge-2.4
|
2014-01-28 12:44:29 +04:00 |
|
Andrey Pavlenko
|
6deda99f07
|
Merge pull request #2207 from ilya-lavrenov:tapi_macro
|
2014-01-27 18:56:06 +04:00 |
|
Ilya Lavrenov
|
78c2b3ca2a
|
refactored imgproc
|
2014-01-27 18:47:16 +04:00 |
|
Ilya Lavrenov
|
48a084c236
|
OpenCL version of cv::buildPyramid
|
2014-01-27 18:42:44 +04:00 |
|
Andrey Pavlenko
|
d9b24457fa
|
Merge pull request #2208 from alalek:ocl_dynload_warn
|
2014-01-27 18:24:14 +04:00 |
|
Roman Donchenko
|
bbc35d609d
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
cmake/OpenCVDetectPython.cmake
cmake/OpenCVModule.cmake
modules/core/src/gpumat.cpp
modules/cudaimgproc/test/test_hough.cpp
modules/gpu/CMakeLists.txt
modules/gpu/src/cuda/generalized_hough.cu
modules/gpu/src/generalized_hough.cpp
modules/python/CMakeLists.txt
|
2014-01-27 15:28:14 +04:00 |
|
Alexander Alekhin
|
1ff9a8ef52
|
core/ocl: added warning about incompatible configuration
|
2014-01-27 13:52:52 +04:00 |
|
Ilya Lavrenov
|
321782b9b7
|
added macro with ability of returning values
|
2014-01-27 12:32:26 +04:00 |
|
Ilya Lavrenov
|
f767077a41
|
fixed condition
|
2014-01-27 12:00:53 +04:00 |
|
Ilya Lavrenov
|
2dd294cc84
|
fixed cv::split; enabled test
|
2014-01-27 12:00:53 +04:00 |
|
Ilya Lavrenov
|
fa5492343a
|
added STD_VECTOR_UMAT support to _OutputArray::create
|
2014-01-27 11:59:59 +04:00 |
|