Alexander Alekhin
|
5658ba0002
|
icv: update package
|
2014-04-29 15:35:27 +04:00 |
|
Adrian Stratulat
|
cbf3c1fbf1
|
remove unused macros
|
2014-04-28 19:40:11 +00:00 |
|
Ilya Lavrenov
|
55bbca2d09
|
added more types to cv::GaussianBlur
|
2014-04-28 13:50:28 +04:00 |
|
Alexander Alekhin
|
7ee1d5f69b
|
ipp: added LUT optimization
|
2014-04-25 12:09:06 +04:00 |
|
Ilya Lavrenov
|
05a47d9014
|
cmd option
|
2014-04-17 18:06:14 +04:00 |
|
Ilya Lavrenov
|
2cd7a913ed
|
verbose errors
|
2014-04-17 11:07:01 +04:00 |
|
Ilya Lavrenov
|
f3c56f8310
|
first attemp
|
2014-04-17 11:07:01 +04:00 |
|
KayKwon
|
e13e3be16e
|
Merge branch 'master' into matlab_formatter
|
2014-04-16 11:13:02 +09:00 |
|
KayKwon
|
84257b57d0
|
Fix for (Bug #2789)
Add MatlabFormatter for matlab style output.
See http://code.opencv.org/issues/2789
|
2014-04-16 10:56:27 +09:00 |
|
Andrey Pavlenko
|
80ef1f6753
|
Merge pull request #2621 from arkunze:pullreq/140319-resize-b
|
2014-04-15 19:56:56 +04:00 |
|
Andrey Pavlenko
|
dab8e920b0
|
Merge pull request #2565 from apavlenko:tapi_stitching
|
2014-04-15 19:56:11 +04:00 |
|
Aaron Kunze
|
ebbac3c66d
|
Optimizes OpenCL resize and optical flow to use image extension.
|
2014-04-14 16:09:17 -07:00 |
|
Ilya Lavrenov
|
ad7f2311c0
|
cv::Laplacian
|
2014-04-14 14:34:28 +04:00 |
|
Ilya Lavrenov
|
19d470749b
|
added macro for denoting region for suppression of "Wdeprecated-declarations"
|
2014-04-11 13:45:20 +04:00 |
|
Andrey Pavlenko
|
925178749a
|
removing SuppressWarning and CV_OPENCL_RUN
|
2014-04-11 13:09:19 +04:00 |
|
Alexander Alekhin
|
06738468af
|
TAPI: stiching: add custom OpenCL kernels for MultiBandBlender
|
2014-04-11 13:01:12 +04:00 |
|
Alexander Alekhin
|
1d9808e5d5
|
TAPI: stitching, replaced Mat->UMat/_Array
|
2014-04-11 13:01:06 +04:00 |
|
Alexander Alekhin
|
1461ab41bc
|
ipp: added support for updated ICV package
|
2014-04-09 18:20:49 +04:00 |
|
Ilya Lavrenov
|
444ab0ef0d
|
fixed (IppiSize&)sz
|
2014-04-09 00:19:56 +04:00 |
|
Andrey Pavlenko
|
a6ef45aa13
|
Merge pull request #2582 from vbystricky:ipp_fix
|
2014-04-08 14:30:48 +04:00 |
|
vbystricky
|
f23134ce01
|
Add IPP_VERSION_X100 define
|
2014-04-08 12:43:57 +04:00 |
|
Andrey Pavlenko
|
9ec823d800
|
Merge pull request #2538 from ElenaGvozdeva:ipp_async_convert
|
2014-04-08 11:05:30 +04:00 |
|
Alexander Alekhin
|
bfc546d23c
|
enable IPP ICV support
|
2014-04-03 15:05:38 +04:00 |
|
Elena Gvozdeva
|
037ac27ec8
|
Added SharedMatrix
|
2014-04-03 14:53:27 +04:00 |
|
Elena Gvozdeva
|
fa2d79a15b
|
Added IPP Async converters, doc and sample
|
2014-04-01 16:47:29 +04:00 |
|
Alexander Smorkalov
|
e23f7303a6
|
OpenCV version++. OpenCV Manager version++.
|
2014-03-31 15:00:25 -07:00 |
|
Ilya Lavrenov
|
2875ce60ea
|
added 3-channels support to optimized version
|
2014-03-21 16:02:47 +04:00 |
|
Ilya Lavrenov
|
82e6edfba2
|
optimized sep filter
|
2014-03-18 00:16:38 +04:00 |
|
Alexander Alekhin
|
9cafd50160
|
ocl: fixes
|
2014-03-14 19:51:19 +04:00 |
|
Alexander Alekhin
|
755ca4b7cf
|
ocl: compare with scalar
|
2014-03-14 19:51:19 +04:00 |
|
Andrey Pavlenko
|
0764a23eb2
|
Merge pull request #2459 from ilya-lavrenov:tapi_experiments
|
2014-03-13 16:49:57 +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
|
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 |
|
Alexander Karsakov
|
c1dad2178c
|
Added Device:: isAMD,isIntel,isNvidia methods.
|
2014-03-05 14:43:11 +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 |
|
Roman Donchenko
|
bd5d8404c9
|
Merge pull request #2393 from ilya-lavrenov:coverity
|
2014-02-26 12:16:36 +04:00 |
|
Roman Donchenko
|
c9a4a82667
|
Merge pull request #2358 from rohitgirdhar:rotatedRect
|
2014-02-25 17:43:48 +04:00 |
|
Ilya Lavrenov
|
fe38aab84a
|
core tapi optimization
|
2014-02-25 14:14:42 +04:00 |
|
Ilya Lavrenov
|
32eb38ec98
|
fixed defects from coverity.com
|
2014-02-23 20:21:08 +04:00 |
|
Alexander Alekhin
|
9b3c76a3db
|
TAPI: coverity bug fix
|
2014-02-21 14:04:01 +04:00 |
|
Rohit Girdhar
|
b939b4ae3b
|
removed inline, changed interface
|
2014-02-19 20:58:40 +05:30 |
|
Roman Donchenko
|
bcf4307345
|
Merge pull request #2356 from SpecLad:merge-2.4
|
2014-02-18 12:14:57 +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 |
|
Ilya Lavrenov
|
510680a5df
|
typo
|
2014-02-16 01:42:02 +04:00 |
|
Alexander Alekhin
|
95e38e457f
|
core/umat: usage flags (with proposals from PR #2195)
|
2014-02-14 15:40:16 +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
|
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 |
|
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
|
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
|
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 |
|
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 |
|
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
|
0fef7f8b96
|
Merge pull request #2217 from ilya-lavrenov:tapi_superres
|
2014-02-03 14:38:59 +04:00 |
|
Ilya Lavrenov
|
e844c08203
|
some fixes and improvements in cv::matchTemplate
|
2014-02-02 19:20:37 +04:00 |
|
Ilya Lavrenov
|
02692f9ac0
|
fix MACRO
|
2014-02-01 22:43:41 +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 |
|
Ilya Lavrenov
|
372cdac07c
|
moved kernelToStr to ocl.hpp
|
2014-01-30 15:23:11 +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 |
|
Andrey Pavlenko
|
fff5a6c058
|
Merge pull request #2213 from ilya-lavrenov:tapi_buildPyramid
|
2014-01-28 16:31:30 +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 |
|
Ilya Lavrenov
|
321782b9b7
|
added macro with ability of returning values
|
2014-01-27 12:32:26 +04:00 |
|
Andrey Pavlenko
|
a64d3c1744
|
Merge pull request #2155 from vbystricky:ocl_calcOpticalFlowPyrLK
|
2014-01-25 17:08:07 +04:00 |
|
Andrey Pavlenko
|
3f61007563
|
Merge pull request #2191 from ilya-lavrenov:tapi_macro
|
2014-01-25 16:32:54 +04:00 |
|
Ilya Lavrenov
|
7f785e0a11
|
refactored core using new macro
|
2014-01-24 23:59:00 +04:00 |
|
vbystricky
|
c57e427fba
|
Move OpticalFlowPyrLK from ocl module to video module
|
2014-01-24 17:37:50 +04:00 |
|
Ilya Lavrenov
|
cc514ac7a9
|
added new macros useful for tracking whether OpenCL impl run or not
|
2014-01-24 17:16:40 +04:00 |
|
Andrey Pavlenko
|
5424c55565
|
Merge pull request #2142 from KonstantinMatskevich:ocl_tapi_bfmatcher
|
2014-01-24 16:50:03 +04:00 |
|
Konstantin Matskevich
|
ae827a638c
|
fixes
|
2014-01-24 14:01:31 +04:00 |
|
Konstantin Matskevich
|
f90e41d54e
|
dumpinfo
|
2014-01-22 17:04:44 +04:00 |
|
Konstantin Matskevich
|
ca5689e0db
|
BFMatcher
match
radiusMatch
|
2014-01-22 15:31:26 +04:00 |
|
Anatoly Baksheev
|
02ebc4368c
|
Viz initial backport, compilation fixes, moved viz/viz.hpp header according to 2.4 style
|
2014-01-20 22:51:33 +04:00 |
|
Roman Donchenko
|
9710b25c7d
|
Merge pull request #2173 from Nerei:viz
|
2014-01-20 18:05:11 +04:00 |
|
Anatoly Baksheev
|
ac035b9b8e
|
review comments
|
2014-01-20 15:22:58 +04:00 |
|
Anatoly Baksheev
|
0d702b83f4
|
updated code to use mapper->SetInput instead of SetInputConnection. All widgets except plane, images ans texts
|
2014-01-19 18:38:51 +04:00 |
|
Anatoly Baksheev
|
7b28f730f4
|
traits for Affine3
|
2014-01-19 18:38:47 +04:00 |
|
Anatoly Baksheev
|
a76a34d28e
|
added Affine3: 3x4 input Mat support
|
2014-01-19 18:38:46 +04:00 |
|
Anatoly Baksheev
|
3e071491c9
|
added Affine3 ctor from array
|
2014-01-19 18:38:46 +04:00 |
|
Anatoly Baksheev
|
b1c0bf1fee
|
Affine::rotate(rvec) method
|
2014-01-19 18:38:45 +04:00 |
|
Anatoly Baksheev
|
7e952e2f10
|
removed incorrect and unnecessarily methods from Affine3f
|
2014-01-19 18:38:43 +04:00 |
|
Ilya Lavrenov
|
37789f015a
|
deleted excess semicolons, commas
|
2014-01-18 01:31:33 +04:00 |
|
Roman Donchenko
|
79fcc06a4b
|
Merge pull request #2146 from SpecLad:merge-2.4
|
2014-01-17 16:28:30 +04:00 |
|