mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-24 03:03:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
14,493 Commits 6 Branches 128 Tags 3 GiB
3d222d313b
Commit Graph

10713 Commits

Author SHA1 Message Date
vbystricky
cfabf32492 Fix some errors 2014-05-26 16:53:01 +04:00
vbystricky
48d82fd911 Fix some errors 2014-05-26 16:53:01 +04:00
vbystricky
a8bfab3cb7 Optimize OpenCL LUT function 2014-05-26 16:53:00 +04:00
vbystricky
6667cea0f4 Optimize OpenCL LUT function 2014-05-26 16:53:00 +04:00
vbystricky
72727111c7 Use 4 pixels for one unit. Some ocl code refactoring 2014-05-26 16:52:59 +04:00
vbystricky
47b092e527 Optimize OpenCL LUT function 2014-05-26 16:52:59 +04:00
mletavin
4a37ac303a Added new Intel-optimized 3x3 and 5x5 kernels to medianFilter.cl file and corresponding code to host in smooth.cpp 
Only Intel platform and 1 channel images are supported.
 2014-05-26 15:54:18 +04:00
Alexander Alekhin
e6f6905868 run.py: propagate OPENCV* env variables only with --android_propagate_opencv_env flag 2014-05-26 14:32:52 +04:00
Ilya Lavrenov
50fa809a96 fixed cv::mixChannels 2014-05-26 14:20:16 +04:00
Alexander Karsakov
5022a0fae3 Added new border types for pyrDown 2014-05-26 13:57:03 +04:00
Alexander Alekhin
766600529b run.py: added --android_env parameter 2014-05-26 13:27:31 +04:00
Ilya Lavrenov
ec3c68c8ea fix 2014-05-26 12:19:07 +03:00
Ilya Lavrenov
bd5e4c6c49 other kernels now use row scheme 2014-05-26 12:19:06 +03:00
Ilya Lavrenov
15738bf7ef multiple rows in KF kernel 2014-05-26 12:19:06 +03:00
Ilya Lavrenov
5ee398bfd6 multiple rows per work-item 2014-05-26 12:19:05 +03:00
Roman Donchenko
0a2d22bf31 Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-05-26 12:32:14 +04:00
Alexander Alekhin
ab2749d648 Merge pull request #2709 from alalek:icv_update_binary_pack 2014-05-23 15:09:43 +04:00
Alexander Karsakov
4910242732 Unroll pyrUp kernel 2014-05-23 14:58:34 +04:00
Alexander Alekhin
52ba76143c icv: fix test eps on Mac for failed perf test 2014-05-23 14:54:09 +04:00
Ilya Lavrenov
c83455d8a4 optimized cv::repeat 2014-05-23 13:16:27 +03:00
Alexander Alekhin
c43e32854a Merge pull request #2713 from alalek:icv_enable_fns 2014-05-23 13:35:45 +04:00
Roman Donchenko
09f9b35bc6 Merge pull request #2742 from StevenPuttemans:feature_3176 2014-05-22 18:03:56 +04:00
Saree90
7f7064e3b9 DownhillSolverImpl::innerDownhillSimplex something looks broken here: 
Mat_<double> coord_sum(1,ndim,0.0),buf(1,ndim,0.0),y(1,ndim,0.0);
nfunk = 0;
for(i=0;i<ndim+1;++i)
{
y(i) = f->calc(p[i]);
}
y has only ndim elements, while the loop goes over ndim+1
 2014-05-22 22:52:37 +10:00
StevenPuttemans
fea4396023 Added more info on the data input variable of kmeans 2014-05-22 12:56:44 +02:00
Alexander Alekhin
7249622ce7 Merge pull request #2772 from akarsakov:ocl_pyramids 2014-05-22 13:23:50 +04:00
Alexander Alekhin
694d7726b5 Merge pull request #2762 from ilya-lavrenov:ipp_sort 2014-05-22 12:30:53 +04:00
Daniel Fernandes
a0459c2352 Merge branch 'master' of https://github.com/Itseez/opencv 2014-05-21 17:59:10 -05:00
Daniel Fernandes
6598b97b96 Fixed MATLAB bridge 
MATLAB bridge.hpp was missing definition for Ptr<DenseOpticalFlow>
 2014-05-21 17:57:35 -05:00
Gabe Schwartz
c19b6ed20e Fixed pyopencv_to w/FLANN IndexParams in python3. 
The keys() and values() functions on dictionaries in Python 3 no longer
return lists.  pyopencv_to() for flann::IndexParams now iterates over
the dictionary in a way that is version-agnostic.
 2014-05-21 15:21:41 -04:00
Alexander Alekhin
d940093fb5 Merge pull request #2723 from ilya-lavrenov:tapi_intel_vector_width 2014-05-21 19:56:00 +04:00
Alexander Alekhin
cf5dd88cf2 Merge pull request #2776 from ilya-lavrenov:tapi_meanstddev 2014-05-21 17:43:29 +04:00
Pierre-Emmanuel Viel
ec99f96c62 Add the ensureSimpleDistance() method to ensure the user the returned distance is not ^2 (the default for L2 for instance) 2014-05-21 13:16:12 +02:00
Pierre-Emmanuel Viel
2f8b5731da Fix local variable shadowing 2014-05-21 12:27:38 +02:00
Alexander Karsakov
fa1ed5580d Fixed cv::pyrUp performance test 2014-05-21 14:09:21 +04:00
Ilya Lavrenov
0e1b37675c added performance test for cv::meanStdDev with mask 2014-05-21 11:50:31 +04:00
Alexander Alekhin
7032a5a46c Merge pull request #2763 from ilya-lavrenov:tapi_perf_norm_relative 2014-05-21 11:44:25 +04:00
Aaron Kunze
ab1a37d564 Bug fixes for filter2D and associated tests. 2014-05-20 22:30:09 -07:00
Konstantin Matskevich
8d4a76925c fixed binary compatibility 2014-05-21 09:25:15 +04:00
abidrahmank
31291ced11 Issue #2540 : Python bindings for various "detectMultiScale()" 2014-05-21 08:26:16 +05:30
Pierre-Emmanuel Viel
00367cfb00 Merge remote-tracking branch 'upstream/2.4' into LshOrthogonalSubvectors 2014-05-21 01:31:52 +02:00
Pierre-Emmanuel Viel
e63d7de87c Allows to choose orthogonal sub-vectors for LSH without using a static table among LshTable instances 2014-05-20 22:52:11 +02:00
Daniel Angelov
3ca7717e17 Fixed scanning bug identified in comments in pull request #1119. 
NFA calculations now generate better line segments.
 2014-05-20 21:25:31 +01:00
Alexander Karsakov
511ed4388e Disabled BORDER_CONSTANT for pyramid functions. 2014-05-20 17:28:47 +04:00
Roman Donchenko
7ea1bf3cf0 Fixed several problems found by PVS-Studio. 
This fixes all problems from the article "Checking OpenCV with PVS-Studio"
<http://www.viva64.com/en/b/0191/> that are not already fixed and are
not in 3rdparty or the legacy module.

The problems fixed are two instances of useless code and one instance
of unspecified behavior (right-shifting a negative number).
 2014-05-20 13:54:00 +04:00
Ilya Krylov
3678020c28 Added license to source files 2014-05-20 12:37:37 +04:00
Roman Donchenko
3d7a457c97 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	doc/tutorials/introduction/linux_install/linux_install.rst
	modules/core/doc/operations_on_arrays.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/src/system.cpp
	modules/gpu/src/cuda/resize.cu
	modules/imgproc/doc/miscellaneous_transformations.rst
	modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
	modules/video/src/bgfg_gaussmix2.cpp
 2014-05-19 18:39:20 +04:00
Ilya Krylov
0d2fab86b4 Changed documentation for namespace fisheye 2014-05-19 18:16:00 +04:00
Ilya Krylov
651b13f72a Refactored class Fisheye to namespace fisheye 2014-05-19 17:55:32 +04:00
Roman Donchenko
bea46c90b5 Remove a useless loop that copies an array to itself 2014-05-19 17:38:30 +04:00
Vadim Pisarevsky
0b4eb6a964 Merge pull request #2509 from euphrat:mog2_bgimg_gray 2014-05-19 17:36:38 +04:00
Vadim Pisarevsky
c6113c6cb3 Merge pull request #2630 from isarandi:concat_corr 2014-05-19 17:36:20 +04:00
Vadim Pisarevsky
8bd1efa523 Merge pull request #2673 from BloodAxe:kaze 2014-05-19 17:35:22 +04:00
Vadim Pisarevsky
934cb6c452 Merge pull request #2680 from adrians:remove_cv_err 2014-05-19 17:35:03 +04:00
Vadim Pisarevsky
988b108858 Merge pull request #2701 from thoinvil:BugfixFilterEngineApplyROI 2014-05-19 17:34:45 +04:00
Vadim Pisarevsky
44acfc38a1 Merge pull request #2739 from StevenPuttemans:bug_1523 2014-05-19 17:33:36 +04:00
Vadim Pisarevsky
e30939f09b Merge pull request #2738 from kevmitch:2.4 2014-05-19 17:33:22 +04:00
Vadim Pisarevsky
118b27f5b4 Merge pull request #2744 from jet47:kmeans-fix 2014-05-19 17:33:10 +04:00
Vadim Pisarevsky
165789bfcd Merge pull request #2764 from hbadino:Feature_3692 2014-05-19 17:30:18 +04:00
Roman Donchenko
eded87de5b Merge pull request #2754 from thoinvil:patch-1 2014-05-19 15:41:28 +04:00
StevenPuttemans
12207ac763 fix coordinate problem with large images - bug 1523 2014-05-19 13:07:44 +02:00
Roman Donchenko
cba5235f08 Merge pull request #2698 from GregoryMorse:patch-2 2014-05-19 14:52:58 +04:00
Roman Donchenko
f77aa45cfb Merge pull request #2735 from StevenPuttemans:bug_2000 2014-05-19 14:25:47 +04:00
StevenPuttemans
7fc764f5e5 added documentation for findContours 2014-05-19 11:44:25 +02:00
Roman Donchenko
f0b0d4e867 Merge pull request #2685 from znah:ocl_control_py 2014-05-19 13:38:36 +04:00
Roman Donchenko
06b335b2d7 Merge pull request #2733 from StevenPuttemans:bug_2162 2014-05-19 13:04:54 +04:00
Roman Donchenko
62e0759ba2 Merge pull request #2719 from yashdv:patch-1 2014-05-19 13:00:32 +04:00
Konstantin Matskevich
a46f119fdf docs fixes 2014-05-19 09:54:15 +04:00
Kazuki Matsuda
fa292c3d8d Implimentation "cv::Mat::forEach" 
I propose forEach method for cv::Mat and cv::Mat_.
This is solution for the overhead of MatIterator_<_Tp>.

I runs a test that micro opecode runs all over the pixel of cv::Mat_<cv::Point3_<uint8_t>>.
And this implementation 40% faster than the simple pointer, 80% faster than iterator.
With OpenMP, 70% faster than simple pointer, 95% faster than iterator (Core i7 920).

Above all, code is more readable.

My test code is here.
    https://gist.github.com/kazuki-ma/8285876

Thanks.
 2014-05-18 11:01:45 +09:00
pradeep
c5b4b99350 Implemented Kullback-Leibler divergence 2014-05-17 23:44:31 +08:00
Hernan Badino
9a371de93b Switched insertion of connected components in filterSpecklesImpl 2014-05-16 18:49:45 -04:00
Ilya Lavrenov
1e46a99d9f added performance test for cv::norm with NORM_RELATIVE 2014-05-16 14:15:31 +04:00
Ilya Lavrenov
eb1dd1900b fixed conditions 2014-05-16 12:18:35 +04:00
Elena Gvozdeva
c7dc884855 T-API: optimized ocl_flip 2014-05-16 11:01:10 +04:00
Alexander Karsakov
8ecb8c6a3d Optimized memory access by using stride pattern 2014-05-16 10:22:03 +04:00
Aaron Kunze
033aebe668 A more efficient workaround for erode 2014-05-15 16:31:24 -07:00
Ilya Lavrenov
f3440888ef optimized stitching warpers 2014-05-15 16:28:34 +04:00
Elena Gvozdeva
ce0b808e3c IPP: fixed ipp_matchTemplate 2014-05-15 13:05:27 +04:00
Vladislav Vinogradov
746185652a add additional tests for different input cases 2014-05-15 12:08:38 +04:00
Vladislav Vinogradov
f16503743f use more accurate reshape 2014-05-15 12:08:01 +04:00
thoinvil
ea038436e6 Added condition to 1st test in cv::GaussianBlur 
Consistent with the test made in cv::boxFilter, it adjusts the kernel size to the source size only if the border is not BORDER_CONSTANT and if BORDER_ISOLATED is set. Otherwise, the source has to be considered possibly in a larger image (i.e. the source being a ROI) in witch the kernel should apply.
 2014-05-15 08:40:13 +02:00
Ilya Krylov
c30fef1f9d Fixed build issues 2014-05-14 18:58:39 +04:00
Alexander Mordvintsev
a52979c37f exposed TVL1 optical flow to python 2014-05-14 17:45:21 +04:00
Alexander Mordvintsev
2756ae2051 exposed OpenCL-control functions to python 2014-05-14 17:42:21 +04:00
Roman Donchenko
cafcfc4d0f Merge pull request #2749 from jet47:fix-bug-3678 2014-05-14 17:25:19 +04:00
Roman Donchenko
55bff44810 Merge pull request #2747 from jet47:gpu-resize-stream-fix 2014-05-14 16:34:48 +04:00
Vladislav Vinogradov
f1e44fa5ca fix bug #3678 (cuda::integral failures) 2014-05-14 12:48:12 +04:00
Roman Donchenko
f13e05cdcb Merge pull request #2740 from ilya-lavrenov:tapi_norm_fix 2014-05-14 12:40:19 +04:00
Roman Donchenko
75a1743f35 Merge pull request #2745 from yashdv:patch-3 2014-05-14 12:38:43 +04:00
Alexander Alekhin
46d672dcc3 Merge pull request #2663 from ilya-lavrenov:ipp_slow 2014-05-14 12:30:05 +04:00
Vladislav Vinogradov
7e2f7f45d7 fix bug #3690 
removed invalid condition, it is always false
 2014-05-14 10:47:28 +04:00
Vladislav Vinogradov
1f72873c55 fix cv::gpu::resize function 
add missing stream parameter to call_resize_linear_glob
 2014-05-14 10:31:28 +04:00
Ievgen Khvedchenia
12e1d7fc2b Fix "WARNING: Block quote ends without a blank line" 2014-05-13 21:07:30 +03:00
Roman Donchenko
ed5d71b45f Merge pull request #2724 from znah:python_autowrap 2014-05-13 19:50:01 +04:00
Yash Vadalia
7e56cfafbc fixed a syntax error in cap_giganetix.cpp 
Ticket 3458 (http://code.opencv.org/issues/3458)
 2014-05-13 19:59:37 +05:30
Yash Vadalia
6ecd553810 Added doc for LinearPolar Transform 2014-05-13 19:36:43 +05:30
Vladislav Vinogradov
55a714c83b fix cv::kmeans function 
reshape input matrix, since the function works with data
as with [N x dims] matrix
 2014-05-13 18:00:17 +04:00
Alexander Mordvintsev
dd67ea0210 find -> rindex 2014-05-13 17:55:57 +04:00
Alexander Karsakov
4612b4b827 Added clamp() for THRESH_TRUNC mode 2014-05-13 15:21:47 +04:00
Ilya Lavrenov
d16e0b377f disabled IPP functions that slower than OpenCV 2014-05-13 15:06:38 +04:00
Roman Donchenko
4a24ecd176 Merge pull request #2731 from StevenPuttemans:bug_2626 2014-05-13 14:21:36 +04:00
Ilya Lavrenov
f64dfeb222 fix for cv::norm (norm_inf) 2014-05-13 14:21:07 +04:00
Roman Donchenko
2cf6cea90f Merge pull request #2730 from StevenPuttemans:bug_2740 2014-05-13 14:19:42 +04:00
Roman Donchenko
c607dadc49 Merge pull request #2729 from StevenPuttemans:bug_3252 2014-05-13 14:17:09 +04:00
Ievgen Khvedchenia
87972d0d7c Fix "WARNING: Block quote ends without a blank line" 2014-05-13 13:15:24 +03:00
Kevin Mitchell
63e508abd2 doc: update/clarify behaviour of mask in floodFill 
Clarify how the mask parameter is set on output and how this is
affected by the flags parameter.

resolves Feature #2942
 2014-05-13 02:26:59 -07:00
StevenPuttemans
006956c324 Fixing as suggested in bug 2626, made naming same for both C, C++ and python API 2014-05-13 11:02:01 +02:00
Roman Donchenko
ff2d76ec0d Merge pull request #2699 from GregoryMorse:patch-1 2014-05-13 11:58:25 +04:00
Roman Donchenko
bc7b21609a Merge pull request #2692 from 1Hyena:2.4 2014-05-13 11:56:12 +04:00
Roman Donchenko
f0547e5e05 Merge pull request #2727 from StevenPuttemans:bug_3484 2014-05-13 11:55:17 +04:00
Roman Donchenko
ea5b411c0f Merge pull request #2725 from SpecLad:merge-2.4 2014-05-13 11:53:30 +04:00
1Hyena
6c118ebc51 Changed ostringstream to ostream for new print_params and added the old 
version of print_params for backwards compatibility.
 2014-05-12 23:01:44 +03:00
StevenPuttemans
a0a8fb4fd9 fixed bug 2626 2014-05-12 16:43:07 +02:00
Roman Donchenko
313a0ad255 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/core/include/opencv2/core/internal.hpp
	modules/core/src/arithm.cpp
	modules/imgproc/src/imgwarp.cpp
	modules/objdetect/src/hog.cpp
 2014-05-12 17:38:07 +04:00
StevenPuttemans
e96de8821c bug 2740 added fix 2014-05-12 15:26:56 +02:00
StevenPuttemans
b382984810 fix bug 3252 2014-05-12 15:01:15 +02:00
StevenPuttemans
2b4241c10b fixed bug 3484 2014-05-12 14:40:12 +02:00
Ilya Lavrenov
1e5694e082 heuristic for Intel 2014-05-12 16:08:39 +04:00
Alexander Mordvintsev
120b3a1e77 Work on python wrapped generation automation: 
- all parsed headers are included into "cv2.cpp" with "pyopencv_generated_include.h"
 - types starting with "Ptr_" converted to "Ptr<...>" form (avoids many typedefs in "cv2.cpp")
 2014-05-12 15:49:54 +04:00
Alexander Alekhin
1f638a3e5b icv: enable functions 2014-05-12 15:38:38 +04:00
Ilya Krylov
e4a9c0f184 Fixed review comments 2014-05-12 15:37:47 +04:00
Alexander Alekhin
e1b5a547cc Merge pull request #2722 from ilya-lavrenov:tapi_luv_eps 2014-05-12 13:03:36 +04:00
Alexander Alekhin
7ac5c367e9 Merge pull request #2715 from akarsakov:fix_corner_min_eigen 2014-05-12 13:03:19 +04:00
Ilya Lavrenov
e2558e5ee5 increased eps to pass tests 2014-05-12 11:54:15 +04:00
Konstantin Matskevich
d67c9aabff docs 2014-05-12 10:09:39 +04:00
Luis Zarrabeitia
bb5a22c504 highgui: fix segfault on CvCapture_GStreamer::retrieveFrame 
CvCapture_GStreamer::retrieveFrame assumes that RGB videos are 24BPP.
This is not necesarily the case, unless we explicitly tell GStreamer
that we want 24BPP RGB streams.

Adding bpp=(int)24 to the appsink caps.
 2014-05-11 19:00:14 -04:00
Ievgen Khvedchenia
03db61b33b FixFix documentation warnings 2014-05-10 23:06:23 +03:00
Ievgen Khvedchenia
029a8c443a Remove GSURF descriptor from KAZE algorithm 2014-05-10 20:57:37 +03:00
Ievgen Khvedchenia
a068ccbf51 Fix "Title underline too short" warning 2014-05-09 22:53:28 +03:00
Ievgen Khvedchenia
616c348536 Fix documentation warnings 2014-05-09 22:31:20 +03:00
Ievgen Khvedchenia
3a8e15fad9 Fix documentation warnings 2014-05-09 22:21:26 +03:00
Ievgen Khvedchenia
c4e49463a9 Initial commit of the KAZE & AKAZE docs 2014-05-09 19:35:41 +03:00
Ievgen Khvedchenia
b42c268164 Temporary remove of CV_WRAP 2014-05-09 19:34:54 +03:00
Ievgen Khvedchenia
1a5fcd715d Refactor of KAZE and AKAZE: 
1) Clean-up from the unused code
2) Remove of SURF extraction method
3) Enabled threading for KAZE extraction
4) Exposed new properties for runtime configuration
 2014-05-09 18:46:00 +03:00
Alexander Alekhin
eba1be711c Merge pull request #2710 from ilya-lavrenov:ipp_threshold 2014-05-08 17:33:27 +04:00
Alexander Karsakov
4e7f62fd24 Fixed ipp check for cornerMinEigenVal 2014-05-08 17:32:21 +04:00
Alexander Alekhin
c74fed1fcf Merge pull request #2706 from ilya-lavrenov:ipp_2.4_warnings 2014-05-08 17:04:18 +04:00
Alexander Alekhin
a82dd8ce48 Merge pull request #2700 from ilya-lavrenov:tapi_cvtColor 2014-05-08 17:01:38 +04:00
Alexander Alekhin
eb240cc206 Merge pull request #2697 from PhilLab:master 2014-05-08 16:57:50 +04:00
Konstantin Matskevich
aa76ef9a98 fixes 2014-05-08 15:55:55 +04:00
Ilya Lavrenov
11b01cd8b9 added ipp threshold inplace 2014-05-08 13:51:25 +04:00
Ilya Lavrenov
19a2495067 fixed IPP related warnings 2014-05-08 13:31:27 +04:00
Vladislav Vinogradov
77275031ab finally fix cv::subtract 2014-05-08 13:11:42 +04:00
Ilya Krylov
349ff631a5 Added sample of work of Fisheye::undistortImage and its description to documentation. Removed readPoints and readExtrinsic (useless) 2014-05-07 20:53:07 +04:00
thoinvil
e50ef2dab5 Bugfix #3668 removed the comment 2014-05-07 18:27:08 +02:00
Vladislav Vinogradov
629461c836 fix output matrix allocation in cv::subtract 2014-05-07 19:52:35 +04:00
Alexander Alekhin
35eb972e9a fix compilation on MSVS 2010 2014-05-07 15:20:29 +00:00
Alexander Alekhin
72e095b8a5 Merge pull request #2665 from ilya-lavrenov:ipp_filter2d 2014-05-07 19:17:57 +04:00
Alexander Alekhin
07d5f56707 Merge pull request #2679 from alalek:ippicv_update 2014-05-07 18:24:41 +04:00
Ilya Lavrenov
3ccaa5294e added OpenCL RGB <-> Luv conversions 2014-05-07 18:09:57 +04:00
Alexander Alekhin
9c780260c2 Merge pull request #2605 from akarsakov:ipp_min_eigen_val 2014-05-07 18:01:44 +04:00
Alexander Alekhin
849228ac6a Merge pull request #2684 from ElenaGvozdeva:ippiDFT 2014-05-07 17:57:17 +04:00
Alexander Alekhin
9e47672b2b Merge pull request #2658 from akarsakov:ipp_hough 2014-05-07 17:07:22 +04:00
Alexander Alekhin
e2c7adc7c4 Merge pull request #2703 from jet47:subtract-create-dst-mat 2014-05-07 16:50:50 +04:00
Alexander Alekhin
d54aa307fd Merge pull request #2676 from ilya-lavrenov:ipp_gaussianblur 2014-05-07 16:49:59 +04:00
Konstantin Matskevich
36afd4ef55 added additionalInfo in faceRecognition 2014-05-07 16:29:55 +04:00
Ilya Lavrenov
abf905154f cv::fitler2D 2014-05-07 15:47:10 +04:00
Ilya Lavrenov
1ad69aba35 changes sigma in perf tests 2014-05-07 14:59:03 +04:00
Alexander Alekhin
0e1bf58195 Merge pull request #2634 from ElenaGvozdeva:ippiDCT 2014-05-07 14:49:13 +04:00
Vladislav Vinogradov
4c66614e07 fix cv::subtract function: 
call dst.create(...) before using it
 2014-05-07 13:15:19 +04:00
Alexander Alekhin
b1a28a52fa Merge pull request #2693 from mvukad:bugfix_ippmorphop 2014-05-07 13:15:09 +04:00
GregoryMorse
38db7a78df WinRT core compatibility fixes 
Update system.cpp

Update system.cpp

Update system.cpp

Update matching.cpp

Update matching.cpp
 2014-05-07 06:17:37 +08:00
GregoryMorse
b1443bc1bc WinRT core compatibility fixes 
Update system.cpp

Update system.cpp

Update ocl.cpp

Update matching.cpp

Update ocl.cpp

Update matching.cpp
 2014-05-07 06:15:54 +08:00
Thierry Hoinville
5efd2056f0 Bugfix #3668 in FilterEngine::apply(), use the ROI properly 2014-05-06 15:33:07 +02:00
Alexander Karsakov
f6a8ac2f6c Changed check condition in tests in case ipp disabled. 2014-05-06 15:24:54 +04:00
Elena Gvozdeva
12279e2631 fixed 2014-05-06 14:49:03 +04:00
Alexander Alekhin
01f31dc007 Merge pull request #2687 from ilya-lavrenov:tapi_norm_inf_234cn 2014-05-06 13:27:03 +04:00
Elena Gvozdeva
e362c3fb38 fixed 2014-05-06 13:09:45 +04:00
Alexander Alekhin
03b1d133df Merge pull request #2660 from arkunze:pullreq/140423-filter2D 2014-05-06 12:59:03 +04:00
Ilya Krylov
1f94b7dfc9 minor 2014-05-06 11:17:10 +04:00
Ilya Krylov
ef01044b2f Added documentation for Fisheye::stereoCalibrate 2014-05-06 11:09:22 +04:00
Ievgen Khvedchenia
220de14077 Clean-up from the dead code 2014-05-05 21:48:54 +03:00
PhilLab
4ffeb01cfd Update solvepnp.cpp 
Clarified assert message for allowed PnP flags
 2014-05-05 17:44:59 +02:00
Alexander Alekhin
e9be486534 Merge pull request #2694 from rokm:matlab 2014-05-05 19:24:07 +04:00
Alexander Alekhin
787815fd00 Merge pull request #2619 from GregoryMorse:patch-3 2014-05-05 18:00:40 +04:00
Alexander Alekhin
59cf62ad9e Merge pull request #2636 from atrebbi:#3653 2014-05-05 18:00:18 +04:00
Ilya Krylov
50b291995a Added tests for stereoCalibrate 2014-05-05 17:23:03 +04:00
Alexander Alekhin
a5378186e5 Merge pull request #2688 from akarsakov:ipp_disable_resize_8u 2014-05-05 15:21:13 +04:00
Alexander Alekhin
d9d9de75db Merge pull request #2686 from vbystricky:ippicv_integral 2014-05-05 15:20:47 +04:00
Alexander Alekhin
347d5b96f3 Merge pull request #2635 from akarsakov:gaussian_float_intel 2014-05-05 15:20:20 +04:00
Alexander Karsakov
eda084e123 Used AutoBuffer instead ippsMalloc 2014-05-05 14:40:59 +04:00
Ilya Krylov
c2341fd446 Added stereoCalibrate for Fisheye camera model 2014-05-05 14:21:24 +04:00
Rok Mandeljc
c35fd55b0e Matlab bindings: CMakeLists.txt: use "${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}" as MEX_LIB_DIR only when compiling with MSVC, otherwise, use only "${LIBRARY_OUTPUT_PATH}" 2014-05-03 17:37:48 +02:00
Rok Mandeljc
fa075c50a1 Matlab bindings: fixed the functional template to perform an explicit cast to the type of an input option that is expected. This avoids issues with ternary operator not having the same type in rvalue and lvalue, such as in the case below: 
Ptr_FeatureDetector blobDetector = inputs[3].empty() ? makePtr<SimpleBlobDetector>() : inputs[3].toPtrFeatureDetector();

Which after the patch, would be:

Ptr_FeatureDetector blobDetector = inputs[3].empty() ? (Ptr_FeatureDetector) makePtr<SimpleBlobDetector>() : inputs[3].toPtrFeatureDetector();
 2014-05-03 17:37:48 +02:00
Rok Mandeljc
2d47dd7038 Matlab bindings: added missing compound type declarations from photo module 2014-05-03 17:37:47 +02:00
Ievgen Khvedchenia
e7e00201f1 Enabled parallel processing of the nld_step_scalar function 2014-05-02 14:07:30 +03:00
Ievgen Khvedchenia
9fc90f4069 Merged nldiffusion functions into one module with removal of duplicate functions 2014-05-01 22:24:15 +03:00
Michael Vukadinovic
c1aee0c312 Fixed bug in IPPMorphOp function when looping over elements of the morphology kernel. 2014-05-01 11:52:49 -07:00
1Hyena
dfdb09386f Autotuned_index now prints all info into logger instead of couting it. 2014-05-01 20:55:49 +03:00
Ievgen Khvedchenia
2df7242646 Prepare to merge KAZE and AKAZE nldiffusion_functions source files (work in progress). 2014-05-01 18:27:24 +03:00
Ievgen Khvedchenia
30f73623ce Replace runtime checks with assertions 2014-05-01 18:24:13 +03:00
Ievgen Khvedchenia
3e51da38fb Removed Feature_Suppression_Distance function that is not used anywhere. 2014-05-01 10:58:34 +03:00
Alexander Alekhin
71f871fafd replaced sanity check condition for stitching perf test 2014-04-30 18:02:06 +04:00
Alexander Karsakov
4ebe76098e Disabled IPP resize for CV_8U 2014-04-30 17:28:35 +04:00
Ilya Lavrenov
c80faff42f added cn>1 support to cv::norm (NORM_INF) 2014-04-30 14:59:37 +04:00
vbystricky
c9103730b6 Disable ipp integral in IPPICV version 2014-04-30 12:55:34 +04:00
Ievgen Khvedchenia
ab1ef08f0e Rename file config.h to KAZEConfig.h 2014-04-29 22:17:18 +03:00
Ievgen Khvedchenia
4509fe55c2 Clean-up of getters/setters that are not needed by OpenCV 2014-04-29 21:39:27 +03:00
Ievgen Khvedchenia
2daa14e3c7 Clean-up from dead code. 2014-04-29 21:07:53 +03:00
Alexander Alekhin
e8d3ebecc7 fix IPPDerivSobel condition 2014-04-29 15:36:45 +04:00
Alexander Alekhin
b62e59aac0 icv: enable functions 2014-04-29 15:36:43 +04:00
Alexander Alekhin
5658ba0002 icv: update package 2014-04-29 15:35:27 +04:00
Alexander Alekhin
dacf63a888 Merge pull request #2682 from ElenaGvozdeva:ippiDFT 2014-04-29 15:34:01 +04:00
Alexander Alekhin
0f22df2b0d Merge pull request #2667 from akarsakov:ipp_otsu 2014-04-29 15:15:33 +04:00
Alexander Alekhin
06746ba645 Merge pull request #2677 from ilya-lavrenov:ipp_compilation 2014-04-29 12:26:49 +04:00
Elena Gvozdeva
043b917c7d IPP: cv::dft fixed 2014-04-29 12:23:23 +04:00
Ilya Krylov
e6aa8ce932 Corrected notes 2014-04-29 10:24:39 +04:00
Adrian Stratulat
cbf3c1fbf1 remove unused macros 2014-04-28 19:40:11 +00:00
Ievgen Khvedchenia
a134e068ef Fix wrong checking of returned descriptor type 2014-04-28 22:25:27 +03:00
Ievgen Khvedchenia
c1bf453266 Wrapped nldiffusion functions with details::kaze or details::amaze namespace to avoid collision of function names 2014-04-28 20:41:44 +03:00
Ievgen Khvedchenia
c68cbfced3 Fix size_t to int conversion 2014-04-28 19:32:29 +03:00
Ievgen Khvedchenia
0e3bbd7026 Fix "conditional expression constant" warning 2014-04-28 19:32:04 +03:00
Ievgen Khvedchenia
a941d25f6d Fix size_t to int conversion 2014-04-28 16:46:09 +03:00
Ievgen Khvedchenia
5662294319 Rename KAZE to KAZEFeatures to fix MSVS x64 compiler error (Duplicate file name confused it) 2014-04-28 16:34:35 +03:00
Ievgen Khvedchenia
599bcfb591 Fix size_t to int conversion 2014-04-28 16:24:35 +03:00
Ievgen Khvedchenia
cc0a94c536 Fix "conditional expression constant" warning 2014-04-28 16:23:58 +03:00
Elena Gvozdeva
507ea95265 fixed 2014-04-28 16:46:11 +04:00
Ievgen Khvedchenia
2162aab0e9 Remove AKAZEFeatures desctructor 2014-04-28 15:17:09 +03:00
Ievgen Khvedchenia
f9d3c49023 Bugfix: wrong variable name 2014-04-28 15:14:03 +03:00
Ievgen Khvedchenia
f9422f60a6 Fix Fix casting from/to int/float that caused lot of compiler warnings. 2014-04-28 15:13:42 +03:00
Elena Gvozdeva
16629bff4c Added parallel version for DCT_ROWS 2014-04-28 16:05:19 +04:00
Elena Gvozdeva
6880dbfd95 IPP: cv::dct 2014-04-28 16:05:19 +04:00
Ievgen Khvedchenia
3c596184e4 Added copyright headers for KAZE and AKAZE wrappers 2014-04-28 15:01:42 +03:00
Ievgen Khvedchenia
f97e38d8a6 Fix casting from/to int/float that caused lot of compiler warnings. 2014-04-28 15:00:14 +03:00
Ilya Krylov
f0f741b796 Added documentation 2014-04-28 15:27:30 +04:00
Alexander Alekhin
649935596e Merge pull request #2653 from alalek:ipp_lut 2014-04-28 15:15:11 +04:00
Alexander Alekhin
0e5b0677c9 Merge pull request #2654 from ElenaGvozdeva:ipp_DFT 2014-04-28 15:14:40 +04:00
Alexander Alekhin
5d50917961 Merge pull request #2674 from akarsakov:ocl_hog_fix_epsilon 2014-04-28 15:06:05 +04:00
Ilya Lavrenov
59876cfb34 fixed compilation 2014-04-28 14:04:41 +04:00
Roman Donchenko
c6e91e4736 Merge pull request #2675 from SpecLad:merge-2.4 2014-04-28 13:51:44 +04:00
Ilya Lavrenov
55bbca2d09 added more types to cv::GaussianBlur 2014-04-28 13:50:28 +04:00
Roman Donchenko
47d903d968 Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-04-28 12:08:21 +04:00
Ilya Krylov
05ee15f108 Added FisheyeTest 2014-04-28 12:01:27 +04:00
Ievgen Khvedchenia
61f79c2632 Fix line ending at EOF 2014-04-28 10:53:09 +03:00
Ievgen Khvedchenia
3cfc22ae4e Fix initialisation order of parallel loop classes for AKAZE descriptor extraction 2014-04-28 10:52:05 +03:00
Ievgen Khvedchenia
f3f0e06c4d Fix parenthesis in assert statements 2014-04-28 10:51:09 +03:00
Ievgen Khvedchenia
0e243541f9 Fix shadowed variable warnings 2014-04-28 10:50:46 +03:00
Alexander Karsakov
b046210296 Changed epsilon for hog test, because hog detector is sensible to resize accuracy. 2014-04-28 11:37:46 +04:00
Ievgen Khvedchenia
ba5bec1de2 Fix mutable compilation error 2014-04-27 23:07:48 +03:00
Ievgen Khvedchenia
eada0f4b48 Fix shadowed i variable warning 2014-04-27 23:04:31 +03:00
Ievgen Khvedchenia
503bd38963 Enable multithreaded extraction of features using cv::parallel_for_ 2014-04-27 22:28:18 +03:00
Artur Wieczorek
59250e8288 cv::findContours: Check if type of output data structure is right to store contours (vector<vector<Point>>). 2014-04-27 19:22:29 +02:00
Samson Yilma
de55126b69 Fixed warnings and parameter name mismatches, added #include needed in some platforms. 2014-04-27 13:02:36 -04:00
Samson Yilma
e6420bde73 Added function decomposeHomographyMat. New files added are homography_decomp.cpp and test_homography_decomp.cpp. 
Modified files calib3d.hpp and camera_calibration_and_3d_reconstruction.rst.
 2014-04-26 20:13:27 -04:00
Ievgen Khvedchenia
d37220e8ff Clean-up of the iostream manipulator in AKAZEConfig. 2014-04-26 23:34:38 +03:00
Ievgen Khvedchenia
d8c9bb777e Fix return value of descriptorType() 2014-04-26 23:34:07 +03:00
Istvan Sarandi
4bf1df7da3 Suppress warning in constructor. 2014-04-26 00:42:26 +02:00
Alexander Karsakov
7bd9b2ac26 Added setIppErrorStatus() 2014-04-25 20:24:37 +04:00
Ilya Krylov
35e1b322cb Added test for jacobians 2014-04-25 18:36:48 +04:00
Adil Ibragimov
3bd364fce3 fixing accum_dist and operator() mismatching for HellingerDistance and KL_Divergence 2014-04-25 17:37:31 +04:00
vbystricky
a13e6ab79f Fix problem with sanity check of transform ecc with ipp resize 2014-04-25 17:33:38 +04:00
Alexander Karsakov
232c37e827 Added ippiComputeThreshold_Otsu to cv::threshold 2014-04-25 17:31:45 +04:00
Ilya Krylov
9c7e0bfd33 Added fisheye camera model 2014-04-25 14:49:36 +04:00
Alexander Alekhin
7ee1d5f69b ipp: added LUT optimization 2014-04-25 12:09:06 +04:00
Elena Gvozdeva
10d1b3a534 Added parallel version for DFT_ROWS 2014-04-25 11:39:19 +04:00
Ievgen Khvedchenia
86888bdf77 Replace swap with clear (more efficient) 2014-04-24 22:01:45 +01:00
Ievgen Khvedchenia
3e24822fff Bugfix: clear input vector of key points for detection stage 2014-04-24 22:01:29 +01:00
Ievgen Khvedchenia
33b9e4b4a3 Added missing operator() 2014-04-24 22:00:51 +01:00
Ievgen Khvedchenia
36db97068c Added missing operator() 2014-04-24 22:00:37 +01:00
Alexander Alekhin
32b25de583 Merge pull request #2656 from ilya-lavrenov:ipp_copymakeborder 2014-04-24 20:30:34 +04:00
Alexander Karsakov
dc91be86b2 Disabled ippiHoughLine_Region for cv::HoughLines 2014-04-24 18:00:03 +04:00
Alexander Karsakov
5580d08c6e Added setIppErrorStatus() 2014-04-24 16:48:46 +04:00
Ilya Lavrenov
46e8d9d02d cv::copyMakeBorder 2014-04-24 14:27:51 +04:00
Alexander Karsakov
1909978f7d Added ippiHoughProbLine to cv::HoughLinesP 2014-04-24 12:28:23 +04:00
vbystricky
82a198a8f2 Fix epsilon calculation for sanity check in x32 build 2014-04-24 10:48:32 +04:00
Istvan Sarandi
c20cab9ec1 Added test for concatenation with empty matrices. 2014-04-24 03:09:07 +02:00
Ievgen Khvedchenia
6d500cc6f7 Merge KAZE and AKAZE features with most recent version 2014-04-23 23:02:02 +01:00
Ievgen Khvedchenia
d27ed856f2 Replace config with AKAZEConfig.h 2014-04-23 22:44:03 +01:00
Adrian Stratulat
4fb5680d91 Documentation - minor fix-ups 2014-04-23 17:30:27 +00:00
Aaron Kunze
1f8b41f390 Optimizes filter2D for Intel GPUs 2014-04-23 10:20:09 -07:00
Alexander Alekhin
dcc4d3640b Merge pull request #2651 from ilya-lavrenov:ipp_minmaxidx_3cn 2014-04-23 20:06:55 +04:00
Andrey Pavlenko
8114e071c2 Merge pull request #2655 from akarsakov:ipp_fix_pyramid 2014-04-23 16:27:33 +04:00
Elena Gvozdeva
2d71c094b3 IPP: CV::dft 2014-04-23 15:52:05 +04:00
Andrey Pavlenko
d93161812b Merge pull request #2620 from ilya-lavrenov:ipp_integration 2014-04-23 15:12:45 +04:00
Alexander Karsakov
f3d1001c5d Changed tests for support intersection between expected and actual lists of lines. 2014-04-23 13:18:47 +04:00
Alexander Karsakov
751264f88a Added ippiHoughLine_Region to cv::HoughLines 2014-04-23 11:59:36 +04:00
Alexander Alekhin
9badfa1f83 Merge pull request #2646 from ilya-lavrenov:ipp_remap 2014-04-23 11:51:01 +04:00
Alexander Alekhin
ba0ab8edb0 Merge pull request #2647 from vbystricky:ipp_norm 2014-04-23 11:50:13 +04:00
Alexander Alekhin
c2319285a9 Merge pull request #2649 from ilya-lavrenov:gabor_eps 2014-04-23 11:49:43 +04:00
Alexander Karsakov
92f855f0c3 Added checking destination size for pyrUp, pyrDown. 2014-04-23 11:47:15 +04:00
Alexander Karsakov
01123aaa36 Changed integer operations to float for Intel devices 2014-04-23 11:00:32 +04:00
Ilya Lavrenov
493679dc56 cv::minMaxIdx for cn > 1 2014-04-22 23:47:04 +04:00
Alexander Alekhin
e42057c487 Merge pull request #2648 from ilya-lavrenov:ipp_dist 2014-04-22 19:00:02 +04:00
Andrey Pavlenko
cd01d705c9 Merge pull request #2627 from akarsakov:ipp_pyramids 2014-04-22 17:19:27 +04:00
Ilya Lavrenov
5c0a4878d7 changes eps 2014-04-22 15:49:17 +04:00
vbystricky
dfe6adebb9 Fix error in arguments of ipp function 2014-04-22 15:07:03 +04:00
Alexander Alekhin
580559e1e6 Merge pull request #2618 from vbystricky:ipp_Scharr 2014-04-22 15:02:13 +04:00
Ilya Lavrenov
640c9667c7 fix for IPP ICV 2014-04-22 14:55:28 +04:00
Ilya Lavrenov
51e2a8ec96 fixes 2014-04-22 14:51:39 +04:00
vbystricky
e68a55cca2 Fix error in ipp function call 2014-04-22 14:35:27 +04:00
Ilya Lavrenov
46e40343f2 cv::remap 2014-04-22 14:33:55 +04:00
Alexander Alekhin
caf3ed284d Merge pull request #2645 from vbystricky:ipp_Convert 2014-04-22 13:45:31 +04:00
vbystricky
9cdb330452 Change test conditions 2014-04-22 13:27:20 +04:00
Roman Donchenko
4211d8fbd9 Merge pull request #2641 from SpecLad:merge-2.4 2014-04-22 12:01:03 +04:00
Andrey Pavlenko
6b986489ec Merge pull request #2643 from vbystricky:ipp_GaussianBorder 2014-04-22 11:55:06 +04:00
Andrey Pavlenko
34afc72c23 Merge pull request #2642 from vbystricky:ipp_resize 2014-04-22 11:53:26 +04:00
Andrey Pavlenko
6823b36974 Merge pull request #2624 from ElenaGvozdeva:ipp_DistanceTransform 2014-04-22 11:48:25 +04:00
vbystricky
f5c729396d Fix call of ippiConvert. 2014-04-22 10:50:35 +04:00
Andrey Pavlenko
7c3d5b056a Merge pull request #2612 from grkutty:pullreq/140319-bilateral-b 2014-04-22 09:32:39 +04:00
Artur Wieczorek
f27a886314 Fix for issue #3645 (http://code.opencv.org/issues/3645). 
Implement missing features in CvCaptureCAM_VFW class.

Implemented missing CvCaptureCAM_VFW::setProperty() member function (handling CV_CAP_PROP_FRAME_WIDTH, CV_CAP_PROP_FRAME_HEIGHT, CV_CAP_PROP_FPS properties).
Extended CvCaptureCAM_VFW::setProperty()/getProperty() functions to handle also CV_CAP_PROP_FPS property.
Minor refactoring of CvCaptureCAM_VFW class.
 2014-04-21 17:10:58 +02:00
vbystricky
bb12293251 Convert opencv border type to ipp border. Check supported border before call ipp function 2014-04-21 18:32:53 +04:00
vbystricky
42079b899c Fix error in call of ippResize 2014-04-21 17:26:03 +04:00
Elena Gvozdeva
3d7872b904 fixed 2014-04-21 16:59:55 +04:00
Roman Donchenko
4db12032dc Merge remote-tracking branch 'origin/2.4' into merge-2.4 
No conflicts! Amazing!
 2014-04-21 16:47:35 +04:00
Elena Gvozdeva
b4830d896c added ippiTrueDistanceTransform_8u32f_C1R 2014-04-21 15:17:56 +04:00
Elena Gvozdeva
0265247504 Added ippiDistanceTransform for cv::distanceTransform, maskSize=3,5 2014-04-21 15:17:55 +04:00
vbystricky
d9ef5bb5a7 Fix compile warnings 2014-04-21 15:02:38 +04:00
vbystricky
f52126725f Disable scharr in icv only configuration 2014-04-21 14:43:56 +04:00
vbystricky
d97f7da7a9 Fix setIppErrorStatus placement 2014-04-21 14:19:25 +04:00
Ilya Lavrenov
fe644ede19 cv::multiply 2014-04-21 13:14:55 +04:00
Ilya Lavrenov
9cc80a68db fixed warnings 2014-04-21 13:14:55 +04:00
Ilya Lavrenov
76c415ff49 cv::filterSpeckles 2014-04-21 13:14:55 +04:00
Ilya Lavrenov
04abffeb16 cv::cornerHarris 2014-04-21 13:14:55 +04:00
Ilya Lavrenov
8603c58f37 Mat::setTo(with mask) 2014-04-21 13:14:55 +04:00
Ilya Lavrenov
0b678c2451 Mat::setTo(Scalar::all(0)) 2014-04-21 13:14:55 +04:00
Ilya Lavrenov
3bd8211a72 Mat::copyTo 2014-04-21 13:14:55 +04:00
Ilya Lavrenov
f7ec4a5c47 Mat::copyTo with mask 2014-04-21 13:14:55 +04:00
Ilya Lavrenov
8d24a83c9c cv::flip inplace 2014-04-21 13:14:55 +04:00
Ilya Lavrenov
5ca3d855a2 cv::transpose inplace 2014-04-21 13:14:55 +04:00
Ilya Lavrenov
8da0e2b707 cv::accumulate 2014-04-21 13:14:55 +04:00
Ilya Lavrenov
d453a598f8 cv::min/cv::max CV_64F 2014-04-21 13:14:55 +04:00
Ilya Lavrenov
3e173b701e cv::Laplacian 2014-04-21 13:14:54 +04:00
Ernest Galbrun
6a6f24b170 adding new ali's feature 2014-04-18 16:36:34 +02:00
Alessandro Trebbi
3d25d70627 fix for compiling 2.4 opencv with xcode 5.1 2014-04-18 13:42:47 +02:00
vbystricky
650762419c Add setIppErrorStatus() 2014-04-18 15:13:34 +04:00
vbystricky
d17f40dc1f Fix error in code 2014-04-18 15:04:46 +04:00
vbystricky
32394df42d Add constant border fix call ipp function 2014-04-18 15:04:46 +04:00
vbystricky
79384beb60 Fix warning 2014-04-18 15:04:45 +04:00
vbystricky
160c964e4b Fix error 2014-04-18 15:04:45 +04:00
vbystricky
baa6ab1967 Change Scharr filter to new ipp functions 2014-04-18 15:04:45 +04:00
Andrey Pavlenko
82c67abbfa Merge pull request #2622 from ilya-lavrenov:ipp_sort 2014-04-18 14:47:06 +04:00
Ilya Lavrenov
9a109440df cv::reduce sum/avg 2014-04-18 14:44:12 +04:00
Ilya Lavrenov
aa5767421a cv::reduce (min/max to single column) 2014-04-18 14:39:33 +04:00
Ilya Lavrenov
1f6b719776 added ippisFlip to cv::sort 2014-04-18 14:37:46 +04:00
Ilya Lavrenov
26e8c6216f cv:;sortIdx 2014-04-18 14:31:27 +04:00
Ilya Lavrenov
d5513f522b cv::sort 2014-04-18 14:31:27 +04:00
Andrey Pavlenko
cb8743f9aa Merge pull request #2628 from ilya-lavrenov:ipp_error_handling 2014-04-18 13:37:35 +04:00
Alexander Karsakov
4f4a95299a Added setIppErrorStatus 2014-04-18 09:04:25 +04:00
Alexander Karsakov
6202f54a18 Fixed sanity check for integer type 2014-04-17 19:02:56 +04:00
Ilya Lavrenov
05a47d9014 cmd option 2014-04-17 18:06:14 +04:00
Ilya Lavrenov
87eb1b8fcc fixes in imgproc 2014-04-17 14:51:59 +04:00
Ilya Lavrenov
6f9ca3d77c fixed some errors 2014-04-17 11:08:02 +04:00
Ilya Lavrenov
ce0941160e added status check 2014-04-17 11:08:02 +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
Istvan Sarandi
e18224110c Removed emptiness check from cv::hconcat and cv::vconcat. Sometimes you want to concatenate with an empty matrix. 2014-04-17 02:41:52 +02:00
Maks Naumov
3e5a69d8ba remove unused variables in OCL_PERF_TEST_P() 2014-04-17 00:19:04 +03:00
Maks Naumov
dba0f9fc8f remove unused variable in erGrouping() 2014-04-17 00:16:07 +03:00
Maks Naumov
9e10c09f2d remove unused variable in LineSegmentDetectorImpl::compareSegments() 2014-04-17 00:14:13 +03:00
Alexander Karsakov
a7d12aabab Added epsilon for tests with float data type 2014-04-16 18:07:24 +04:00
Alexander Karsakov
793e980876 Added IPP Pyramid API functions to cv::buildPyramid 2014-04-16 17:10:20 +04:00
Andrey Pavlenko
e11d998cfb Merge pull request #2623 from alalek:icv_fix_color 2014-04-16 15:56:09 +04:00
Alexander Karsakov
ef2f5999ed Added perf test for cv::buildPyramid 2014-04-16 13:01:49 +04:00
Alexander Karsakov
8230f1fd68 Added ippiPyrUp_Gauss5x5 to cv::pyrUp 2014-04-16 11:59:32 +04:00
Alexander Karsakov
f218dffce6 Added ippiPyrDown_Gauss5x5 to cv::pyrDown 2014-04-16 11:39:10 +04:00
Alexander Karsakov
10cb660240 Fixed condition 2014-04-16 10:28:24 +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
unknown
c2f540d090 White space fixes 2014-04-15 09:32:34 -07:00
Andrey Pavlenko
80ef1f6753 Merge pull request #2621 from arkunze:pullreq/140319-resize-b 2014-04-15 19:56:56 +04:00
Andrey Pavlenko
a26bed16e6 Merge pull request #2617 from ElenaGvozdeva:ipp_matchTemplate 2014-04-15 19:56:38 +04:00
Andrey Pavlenko
dab8e920b0 Merge pull request #2565 from apavlenko:tapi_stitching 2014-04-15 19:56:11 +04:00
Andrey Pavlenko
7ba4212529 Merge pull request #2544 from alalek:perf_report_regressions 2014-04-15 16:17:39 +04:00
Alexander Alekhin
3bb6db522d ICV: mark missed functions 2014-04-15 15:55:44 +04:00
GregoryMorse
aa3c36f545 Update cap_msmf.cpp 
Add support for WinRT in the MF capture framework by removing the disallowed calls to enumerate devices and create a sample grabber sink and adding framework for the MediaCapture interface and a custom sink which interfaces with the sample grabber callback interface. The change requires discussion for making it completely functional as redundancy is required given that if the source is a video file, the old code pathways must be used. Otherwise all IMFMediaSession, IMFMediaSource, and IMFActivate code must use a MediaCapture code path and all sink code must use the CMediaSink custom sink.

Support for the custom sink is extended to non-WinRT not for compatibility as Windows Vista client is a minimum regardless, but because it offers more flexibility, could be faster and is able to be used as an optionally different code path during sink creation based on a future configuration parameter.

My discussion and proposal to finish this change:
 Devices are so easily enumerated through WinRT Windows.Devices namespace that wrapping the calls in a library is quite a chore for little benefit though to get the various modes and formats could still be a worthwhile project. For now conditional compilation to remove videodevices and any offending non-video file related activity in videodevice. In my opinion, this is a different , far less fundamental and important change which can possibly be done as a future project and also much more easily implemented in C++/CX.

ImageGrabber has the IMFSampleGrabberSinkCallback replaced with a base class (SharedSampleGrabber) which also be is base class for ImageGrabberRT. This change is necessary as the custom sink does not require a thread to pump events which is done through MediaCapture already. IMFSampleGrabberSinkCallback is the common element between both models and that piece can be shared. Initializing the new ImageGrabberRT is as simple as passing an already initialized MediaCapture object and any video format/encoding parameters.

The concurrency event is necessary to wait for completion and is the way the underlying, IAsyncAction wrappers in the task library work as well. Native WIN32 event objects would be an option if HAVE_CONCURRENCY is not defined. I could even imagine doing it with sleep/thread yield and InterlockedCompareExchange yet I am not enthusiastic about that approach either. Since there is a specific compiler HAVE_ for concurrency, I do not like pulling it in though I think for WinRT it is safe to say we will always have it available though should probably conditionally compile with the Interlocked option as WIN32 events would require HAVE_WIN32.

It looks like C++/CX cannot be used for the IMediaExtension sink (which should not be a problem) as using COM objects requires WRL and though deriving from IMediaExtension can be done, there is little purpose without COM. Objects from C++/CX can be swapped to interact with objects from native C++ as Inspectable* can reinterpret_cast to the ref object IInspectable^ and vice-versa. A solution to the COM class with C++/CX would be great so we could have dual support. Also without #define for every WRL object in use, the code will get quite muddy given that the */^ would need to be ifdef'd everywhere.

Update cap_msmf.cpp

Fixed bugs and completed the change.  I believe the new classes need to be moved to a header file as the file has become to large and more classes need to be added for handling all the asynchronous problems (one wrapping IAsyncAction in a task and another for making a task out of IAsyncAction).  Unfortunately, blocking on the UI thread is not an option in WinRT so a synchronous architecture is considered "illegal" by Microsoft's standards even if implementable (C++/CX ppltasks library throws errors if you try it).  Worse, either by design or a bug in the MF MediaCapture class with Custom Sinks causes a crash if stop/start previewing without reinitializing (spPreferredPreviewMediaType is fatally nulled).  After decompiling Windows.Media.dll, I worked around this in my own projects by using an activate-able custom sink ID which strangely assigns 1 to this pointer allowing it to be reinitialized in what can only be described as a hack by Microsoft.  This would add additional overhead to the project to implement especially for static libraries as it requires IDL/DLL exporting followed by manifest declaration.  Better to document that it is not supported.

Furthermore, an additional class for IMFAttributes should be implemented to make clean architecture for passing around attributes as opposed to directly calling non-COM interface calls on the objects and making use of SetProperties which would also be a set up for an object that uses the RuntimeClass activation ID.

The remaining changes are not difficult and will be complete soon along with debug tracing messages.

Update and rename cap_msmf.h to cap_msmf.hpp

Update cap_msmf.cpp

Successful test - samples are grabbed

Update ppltasks_winrt.h

Library updated and cleaned up with comments, marshaling, exceptions and linker settings
Fixed trailing whitespace

Support VS 2013 and consistency cleanup and C++/CX object creation fixed
 2014-04-15 18:32:23 +08:00
Vadim Pisarevsky
6a5a0fe803 Merge pull request #2016 from pemmanuelviel:kmeansppSquareDist 2014-04-15 13:31:48 +04:00
Vadim Pisarevsky
7942494fb6 Merge pull request #2233 from palindromoroz:BGSubtract_KNN_new_code 2014-04-15 13:22:43 +04:00
Vadim Pisarevsky
20aaa8fe77 Merge pull request #2560 from akarsakov:gaussianblur_integer 2014-04-15 13:21:25 +04:00
Vadim Pisarevsky
92db6786a9 Merge pull request #2578 from akrynski:patch-1 2014-04-15 13:21:08 +04:00
Vadim Pisarevsky
9cdd15e141 Merge pull request #2615 from krodyush:pullreq/140319-PyrLKOpticalFlow-fix 2014-04-15 13:19:45 +04:00
Roman Donchenko
534f9623f2 Merge pull request #2616 from SpecLad:merge-2.4 2014-04-15 12:06:13 +04:00
Elena Gvozdeva
3553e9379b fixed 2014-04-15 11:41:33 +04:00
unknown
36d33dd6c2 Review comments 2014-04-14 16:10:11 -07:00
Aaron Kunze
ebbac3c66d Optimizes OpenCL resize and optical flow to use image extension. 2014-04-14 16:09:17 -07:00
Andrey Pavlenko
8176e893c0 Merge pull request #2609 from alalek:tests_fixes 2014-04-14 18:54:01 +04:00
Andrey Pavlenko
5ff59af09d Merge pull request #2610 from ilya-lavrenov:ipp_cvtcolor 2014-04-14 18:52:07 +04:00
Alexander Karsakov
53bc93730c Added suppressing deprecation for ippiMulC_32f_C1IR 2014-04-14 16:38:59 +04:00
Roman Donchenko
799d2dabd6 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/core/test/test_arithm.cpp
	modules/cuda/src/cascadeclassifier.cpp
	modules/imgproc/doc/geometric_transformations.rst
	modules/objdetect/src/hog.cpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/src/gftt.cpp
	modules/ocl/src/moments.cpp
 2014-04-14 16:08:02 +04:00
Ilya Lavrenov
884b706b3a fixed warning 2014-04-14 14:40:40 +04:00
Ilya Lavrenov
ad7f2311c0 cv::Laplacian 2014-04-14 14:34:28 +04:00
Ilya Lavrenov
2a051a124f cvtColor 2014-04-14 14:29:36 +04:00
Andrey Pavlenko
5522c14efc Merge pull request #2607 from ilya-lavrenov:warn_sup 2014-04-14 14:15:12 +04:00
krodyush
57992e0169 replace IPatchLocal[][] into *IPatchLocal to fix compilation error on some devices. 2014-04-14 13:23:12 +04:00
Tony
65f63421fa Change quotes around GTK headers for angle brackets 
The linux buildbots have started to fail compilation due to not
finding the gtk headers. The quotes have been changed to angle brackets
to indicate to the compiler that these are system includes.
 2014-04-13 11:07:38 +01:00
Tony
1638341270 Use GTK_VERSION_MAJOR to switch between GTK+ version two and three 
specific code. As a result of this, HAVE_GTK3 no longer needs to be
exposed.

The use of HAVE_GTK, and HAVE_ GTK3 have been changed to mirror the
method used by HAVE_QT and HAVE_QT5.
 On branch gtk3
 Changes to be committed:
        modified:   CMakeLists.txt
        modified:   cmake/OpenCVFindLibsGUI.cmake
        modified:   cmake/templates/cvconfig.h.in
        modified:   modules/highgui/src/window.cpp
        modified:   modules/highgui/src/window_gtk.cpp
 2014-04-13 11:04:56 +01:00
Tony
befdef9685 Merge remote-tracking branch 'upstream/master' 
Rebase to lates upstream
 2014-04-13 10:39:32 +01:00
unknown
d2b4ee1e9b More intendation fixes 2014-04-11 21:44:12 -07:00
unknown
06df383675 Indent fixes 2014-04-11 19:14:01 -07:00
Alexander Alekhin
3a1a3da782 fix tests 2014-04-11 16:11:05 +04:00
Andrey Pavlenko
f104d5be8c Merge pull request #2600 from ilya-lavrenov:ipp_calc_hist 2014-04-11 15:18:04 +04:00
Andrey Pavlenko
fd90efc9dd Merge pull request #2593 from arkunze:pullreq/140319-color 2014-04-11 15:16:33 +04:00
Roman Donchenko
df8e28283f Merge pull request #2571 from MartinChodakowski:fix-old-python-doc-typos 2014-04-11 14:15:26 +04:00
Roman Donchenko
4c2db3d6e7 Merge pull request #2579 from maksqwe:test_operations_fix 2014-04-11 14:14:33 +04:00
Roman Donchenko
8ab224746b Merge pull request #2603 from maksqwe:unused_fix_2.4 2014-04-11 14:14:04 +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
3578f0afe9 ocl: workaround for synchronization issue in ::map() 2014-04-11 13:09:18 +04:00
Alexander Alekhin
588658d1a3 tapi: stitching: fix documentation 2014-04-11 13:09:17 +04:00
Alexander Alekhin
026b13b3db TAPI: stitching: blender: fix OpenCL path & adjust test condition 2014-04-11 13:09:16 +04:00
Alexander Alekhin
e6cc1be7e8 stitching: allow to use dynamic DescriptorMatcher 2014-04-11 13:01:13 +04:00
Alexander Alekhin
06738468af TAPI: stiching: add custom OpenCL kernels for MultiBandBlender 2014-04-11 13:01:12 +04:00
Alexander Alekhin
c22d92c1cb stitching: extend logging 2014-04-11 13:01:11 +04:00
Alexander Alekhin
a7f69a37e3 stitching: use BORDER_CONSTANT in warp 2014-04-11 13:01:10 +04:00
Alexander Alekhin
c4a31a1ab1 TAPI: stitching: optimize compare operation 2014-04-11 13:01:10 +04:00
Alexander Alekhin
7a5c1babde TAPI: stitching: optimize exposure 2014-04-11 13:01:09 +04:00
Alexander Alekhin
2737e3c99b TAPI: stitching: workaround for problem getUMat() call 2014-04-11 13:01:08 +04:00
Alexander Alekhin
c1ea6f3c42 TAPI: stitching: improve warpers 2014-04-11 13:01:07 +04:00
Alexander Alekhin
89e3e448f5 features2d: workaround for 'utrainDescCollection' issue (PR #2142) 2014-04-11 13:01:07 +04:00
Alexander Alekhin
1d9808e5d5 TAPI: stitching, replaced Mat->UMat/_Array 2014-04-11 13:01:06 +04:00
Alexander Alekhin
8b6c5ade0e TAPI: added perf test for stitching 2014-04-11 13:01:05 +04:00
Andrey Pavlenko
6bfbcf02cb Merge pull request #2587 from ElenaGvozdeva:ipp_matchTemplate 2014-04-11 12:47:25 +04:00
Andrey Pavlenko
f7f4593936 Merge pull request #2581 from vbystricky:ipp_moments 2014-04-11 12:45:13 +04:00
Andrey Pavlenko
7ae547a208 Merge pull request #2597 from ilya-lavrenov:ipp_countnonzero 2014-04-11 12:43:24 +04:00
unknown
e032b5f5d5 Resolving conflicts after rebasing from public 2014-04-10 12:28:37 -07:00
Aaron Kunze
b59c517f98 Optimizations to OpenCL bilateral filter. 2014-04-10 12:15:13 -07:00
Ilya Lavrenov
b970ec7dae parallel version 2014-04-10 19:39:00 +04:00
Elena Gvozdeva
43c29a6751 fixed 2014-04-10 17:26:38 +04:00
Alexander Karsakov
7369cfd9ec Added perf test for cornerMinEigenVal 2014-04-10 16:09:48 +04:00
Vadim Pisarevsky
f417c79d16 Merge pull request #1932 from seth-planet:master 2014-04-10 13:36:14 +04:00
Vadim Pisarevsky
a0bf7f82ba Merge pull request #2067 from pemmanuelviel:groupWiseCenterChooser 2014-04-10 13:33:29 +04:00
Vadim Pisarevsky
dae04aacc3 Merge pull request #2575 from rold2007:Bugfix_1437 2014-04-10 13:31:33 +04:00
Vadim Pisarevsky
b66adc81a4 Merge pull request #2599 from maksqwe:test_calibration_2.4 2014-04-10 13:30:37 +04:00
Vadim Pisarevsky
b5755b1228 Merge pull request #2588 from vpisarev:fix_samples_n_unused 2014-04-10 13:30:20 +04:00
Ilya Lavrenov
b2379b51b5 cv::countNonZero 2014-04-10 13:21:52 +04:00
Tony
34984328fd Merge remote-tracking branch 'upstream/master' 
Conflicts:
	CMakeLists.txt
 2014-04-10 08:07:02 +01:00
Alexander Karsakov
d9556a998f Added ippiMinEigenVal_ to cv::cornerMinEigenVal 2014-04-10 11:00:08 +04:00
Maks Naumov
eb89f5207c remove unused variables in CV_KDTreeTest_CPP::findNeighbors() 2014-04-09 23:07:48 +03:00
Maks Naumov
29d1bce85f remove unused variable in TEST_P() 2014-04-09 23:06:06 +03:00
Maks Naumov
79eb3c5cde remove unused variable in OCL_PERF_TEST_P() 2014-04-09 23:04:29 +03:00
Maks Naumov
befbe89bdf remove unused variable in ocl_moments() 2014-04-09 23:01:49 +03:00
Maks Naumov
eb45cf0c93 remove unused variable in findCorners_caller() 2014-04-09 22:59:52 +03:00
Maks Naumov
9b52b61451 remove unused variable in HOGDescriptor::groupRectangles() 2014-04-09 22:56:19 +03:00
Maks Naumov
a01659825c remove unused variable in loadFromXML() 2014-04-09 22:53:36 +03:00
Ilya Lavrenov
18ef25ec30 cv::calcHist 2014-04-09 21:46:09 +04:00
Aaron Kunze
785acc1834 Fixes global size issue, adds #pragma unroll to loops 2014-04-09 08:42:55 -07:00
Andrey Pavlenko
7b366df822 Merge pull request #2589 from alalek:icv_update 2014-04-09 18:23:35 +04:00
Andrey Pavlenko
cd02a7002b Merge pull request #2596 from ilya-lavrenov:tapi_setto 2014-04-09 18:23:15 +04:00
Alexander Alekhin
ab691a4a24 ipp: some functions are not available in the ICV package #2 2014-04-09 18:20:49 +04:00
Alexander Alekhin
0d477ffea1 ipp: some functions are not available in the ICV package 2014-04-09 18:20:49 +04:00
Alexander Alekhin
1461ab41bc ipp: added support for updated ICV package 2014-04-09 18:20:49 +04:00
Maks Naumov
b033a63e63 fix typo in test_cameracalibration 2014-04-09 14:41:16 +03:00
vbystricky
b6d58d1d3b Fix ipp ifdef 2014-04-09 14:53:59 +04:00
vbystricky
d9013a85f1 Fix IPP version ifdef 2014-04-09 14:49:37 +04:00
vbystricky
8899ec1586 Add IPP version of Moments calculattion of image 2014-04-09 14:49:36 +04:00
Andrey Pavlenko
ced81b9121 Merge pull request #2594 from arkunze:pullreq/140319-dll-shutdown-fix-b 2014-04-09 14:25:12 +04:00
Andrey Pavlenko
e9bc737485 Merge pull request #2584 from akarsakov:ipp_threshold 2014-04-09 14:17:48 +04:00
Andrey Pavlenko
e6d6a3a85b Merge pull request #2586 from ilya-lavrenov:ipp_disable 2014-04-09 14:16:25 +04:00
Ilya Lavrenov
bcd7151867 added UMat::setTo accuracy test 2014-04-09 14:15:22 +04:00
Andrey Pavlenko
e013f04669 Merge pull request #2583 from ilya-lavrenov:ippicv 2014-04-09 14:14:14 +04:00
Ilya Lavrenov
4a63b3dd90 cv2cvtest part2 2014-04-09 13:08:51 +04:00
Alexander Karsakov
a66db67b83 Attempt to improve performance 2014-04-09 11:54:09 +04:00
Alexander Karsakov
35494f81ef Added ippiThreshold to cv::threshold 2014-04-09 11:41:35 +04:00
Elena Gvozdeva
6119ae0ea9 fixed 2014-04-09 11:09:51 +04:00
David Rolland
cb8ddb1179 Corrected bug #1437. Corrected the cast of two short values from an lParam. lParam contains two signed-short, the position can be negative when another mouse event happens with a mouse_move (mouse_click, etc.) 
The Microsoft documentation specifies NOT to use LOWORD and HIWORD macros to extract the x/y positions as it won't work correctly with multiple monitors. See http://msdn.microsoft.com/en-us/library/windows/desktop/ms645607(v=vs.85).aspx.
 2014-04-09 18:24:21 +12:00
Aaron Kunze
629ddf0bf8 Resolves bug #3450 (Improperly cleaning up resources in DllMain) 2014-04-08 16:21:33 -07:00
Aaron Kunze
bea2515f0e Optimizations for OpenCL color conversion. 2014-04-08 15:58:04 -07:00
Ilya Lavrenov
444ab0ef0d fixed (IppiSize&)sz 2014-04-09 00:19:56 +04:00
Ilya Lavrenov
c735594178 cv::scaleAdd 2014-04-09 00:12:48 +04:00
Ilya Lavrenov
fd3a6f0db7 cv::blur 2014-04-09 00:11:28 +04:00
Ilya Lavrenov
a624ec167d cv::Mat::convertTo 2014-04-09 00:11:28 +04:00
Ilya Lavrenov
b72b256fda cv::pow (added ippiSqr_32f_C1R for power=2) 2014-04-09 00:11:28 +04:00
Ilya Lavrenov
b56b9c43dc cv::updateMotionHistory 2014-04-09 00:11:28 +04:00
Ilya Lavrenov
77723db034 cv::flip 2014-04-09 00:11:28 +04:00
Ilya Lavrenov
f2a35d6388 cv::boxFilter 2014-04-09 00:11:28 +04:00
Ilya Lavrenov
c6f208e1c8 cv::medianBlur 2014-04-09 00:11:27 +04:00
Ilya Lavrenov
ed1ca00bf6 cv::magnitude 2014-04-09 00:11:27 +04:00
Ilya Lavrenov
bf860dbb31 cv::pow 2014-04-09 00:11:27 +04:00
Ilya Lavrenov
49d1691a3e cv::sqrt 2014-04-09 00:11:27 +04:00
Ilya Lavrenov
c224cfa628 cv::accumulateSquare && cv::acumulateProduct 2014-04-09 00:11:27 +04:00
Ilya Lavrenov
2c0c887f70 cv::accumulateWeighted 2014-04-09 00:11:27 +04:00
Ilya Lavrenov
5ddff235bb cv::polarToCart 2014-04-09 00:11:27 +04:00
Ilya Lavrenov
46cb4e0cbc cv::transpose 2014-04-09 00:11:26 +04:00
Ilya Lavrenov
f1b38c4198 cv::warpPerspective and cv::warpAffine 2014-04-09 00:11:26 +04:00
Ilya Lavrenov
e090aa07db disabled some IPP funcs 2014-04-08 22:30:18 +04:00
Tony
3cd50739ef Merge remote-tracking branch 'upstream/master' 2014-04-08 19:14:05 +01:00
Anatoly Baksheev
3f95818252 Added cloud shading support - additional normals array is used 2014-04-08 20:31:28 +04:00
Andrey Pavlenko
5600bc54f4 Merge pull request #2585 from ilya-lavrenov:norm 2014-04-08 18:01:24 +04:00
Andrey Pavlenko
ac92d4c701 Merge pull request #2566 from krodyush:pullreq/140319-PyrLKOpticalFlow 2014-04-08 17:58:16 +04:00
Vadim Pisarevsky
1b339eb0d4 fixed slow down in getRectSubPix (original patch by Markus JR Mueller); removed some unused variables and functions 2014-04-08 17:54:08 +04:00
Firat Kalaycilar
990295644e made a performance improvement. 
changed the way the mean value for each pixel is assigned in the output image.
 2014-04-08 16:10:32 +03:00
Elena Gvozdeva
42d45e0b02 Added ippiSqrDistanceNorm and ippiCrossCorrNorm to cv::matchTemplate 2014-04-08 16:51:15 +04:00
Firat Kalaycilar
9eb0e7d99b Merge branch '2.4' of git://github.com/Itseez/opencv into mog2_bgimg_gray 2014-04-08 14:58:32 +03:00
Ilya Lavrenov
aa5326c231 cv::norm -> cvtest::norm in tests 
Conflicts:

	modules/core/src/stat.cpp
 2014-04-08 14:49:20 +04:00
Andrey Pavlenko
a6ef45aa13 Merge pull request #2582 from vbystricky:ipp_fix 2014-04-08 14:30:48 +04:00
vbystricky
9828cd6086 Remove defined(HAVE_IPP) 2014-04-08 13:05:23 +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
Martin Chodakowski
267241b889 Fix typos in old python wrapper documentation(Bug #3628) 
Fixed spelling of CV_INTER_LINEAR flag in geometric_transformations.rst
 2014-04-08 00:55:08 -04:00
Elena Gvozdeva
f9c5289483 fixed 2014-04-07 18:53:07 +04:00
Roman Donchenko
6f055d7a76 Merge pull request #2580 from SpecLad:merge-2.4 2014-04-07 18:29:51 +04:00
krodyush
616ec74beb fix previous merge error 2014-04-07 17:32:39 +04:00
vbystricky
7badc85b60 Fix for pullrequest comment 2014-04-07 17:06:02 +04:00
vbystricky
2d54581971 Fix ifdef for IPP version greater 8.1 2014-04-07 16:45:35 +04:00
Roman Donchenko
4f2b126b7b Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/core/include/opencv2/core/version.hpp
	modules/core/src/out.cpp
	modules/cudaimgproc/test/test_hough.cpp
	modules/gpu/doc/introduction.rst
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/src/generalized_hough.cpp
	modules/nonfree/perf/perf_main.cpp
 2014-04-07 14:59:34 +04:00
vbystricky
dbdc476b79 Check results of ipp function 2014-04-07 14:31:34 +04:00
vbystricky
38913bf5f6 Change all 'ippStsNoErr==' to '0<=', and all 'ippStsNoErr!=' to '0>' 2014-04-07 14:31:34 +04:00
vbystricky
67484e027b Fix function names (log, exp) 2014-04-07 14:31:33 +04:00
vbystricky
566f783968 Fix errors 2014-04-07 14:31:33 +04:00
vbystricky
23e1b50837 Check 8.1 ipp version for color convertion functions, which not exists in versions before this. 2014-04-07 14:31:33 +04:00
vbystricky
06acb8b0ee Check 8.1 ipp version for gaussian functions, which not exists in versions before this. 2014-04-07 14:31:32 +04:00
vbystricky
be29d628d3 Check 8.1 ipp version for morphology functions, which not exists in versions before this. 2014-04-07 14:31:32 +04:00
vbystricky
4512d06484 Fix const src matrix in IPPresizeInvoker 2014-04-07 14:31:31 +04:00
vbystricky
824ed8a3ae Fix errors 2014-04-07 14:31:31 +04:00
vbystricky
1b3651d8ee Undo changes ipp to ippicv prefix of function names 2014-04-07 14:30:03 +04:00
vbystricky
eb8c531791 Add preprocessor check for IPP version greater 8.1 on some code 2014-04-07 14:26:51 +04:00
vbystricky
188c506237 Uncomment ippiNormDiff_Inf_16s_C3R, ippiNormDiff_Inf_16s_C4R 2014-04-07 14:26:51 +04:00
vbystricky
ec6f977783 Uncomment ippicviNorm_Inf_16s_C3R, ippicviNorm_Inf_16s_C4R functions 2014-04-07 14:26:50 +04:00
vbystricky
a9a0ea3706 Fix error not initialized IppStatus before ipp functions call 2014-04-07 14:26:50 +04:00
vbystricky
c321330777 Comment ipp version of CV_BGR2GRAY color convertion, by problems in BRIEF accuracy test and Path_Idx_Cn_NPoints_WSize perfomance test 2014-04-07 14:26:50 +04:00
vbystricky
ad23ef2a42 Remove unused #include "ippverdion.h" 2014-04-07 14:26:49 +04:00
vbystricky
9d138b2bbe Enable ipp MeanStdDev calculation for 32F_C1 images. Decrease accuracy sanity check of the perfomance test 2014-04-07 14:26:49 +04:00
vbystricky
c29583eacc Change Canny input image description, we can use multichannel image now 2014-04-07 14:26:48 +04:00
vbystricky
ee2df645f4 Canny uncommented, prefix of ipp function changed. Ipp version of Canny called only for images with one channels 2014-04-07 14:26:48 +04:00
vbystricky
9b6feee1a5 Change sanity check for perfomance test of dft 2014-04-07 14:26:47 +04:00
vbystricky
a6b53489e6 Change sanity check for perfomance test of bilateral filter 2014-04-07 14:26:47 +04:00
vbystricky
aece433b15 Check ippStsNoErr as result of ipp function instead >=0 2014-04-07 14:26:47 +04:00
vbystricky
c65e5a1e7b Fix error BGRA2RGBA color convertion by ipp. Uncomment ipp color converstion, which pass tests 2014-04-07 14:26:46 +04:00
vbystricky
b3db990daa Remove unused code 2014-04-07 14:26:46 +04:00
vbystricky
07e84c635a Remove unused code 2014-04-07 14:26:45 +04:00
vbystricky
06434bedfd Change deprecated function ippicviMulC_32f_C1IR to ippicviMulC_32f_C1R. Check results of ipp function, if error was return run opencv branch of code 2014-04-07 14:26:45 +04:00
vbystricky
3b03044047 Fix warning 2014-04-07 14:26:44 +04:00
vbystricky
58de8bc917 Change deprecated functions to valid 2014-04-07 14:24:06 +04:00
vbystricky
01a66a2938 Prepare codes for ippicv library 2014-04-07 14:24:05 +04:00
Andrey Pavlenko
c2f859569c Merge pull request #2563 from alalek:ipp_builds 2014-04-07 13:03:11 +04:00
Maks Naumov
8271bd5f14 fix condition in CV_OperationsTest::operations1() 2014-04-07 11:24:27 +03:00
Andrey Pavlenko
def4f5e2a3 Merge pull request #2499 from mlyashko:back_proj_fix1 2014-04-07 10:57:21 +04:00
Vladislav Vinogradov
d822d6f101 disable GeneralizedHough tests on gcc 4.7 2014-04-07 09:49:17 +04:00
akrynski
1dba47b77b Update crop_face.py 
I propose some changes, to automate file cropping
 2014-04-06 18:48:38 +02:00
Tony
572e4f5255 Merge remote-tracking branch 'upstream/master' 2014-04-06 11:49:23 +01:00
Ievgen Khvedchenia
5848e75168 Clean-up from unused utils.h/utils/cpp 2014-04-05 15:25:59 +03:00
Ievgen Khvedchenia
17f305140b Added unit-tests for KAZE and AKAZE features 2014-04-05 10:25:59 +03:00
Ievgen Khvedchenia
137ff7eccb Added KAZE and AKAZE wrappers 2014-04-05 10:25:46 +03:00
Ievgen Khvedchenia
703e012a5b Prepare KAZE and AKAZE sources for integration 2014-04-05 10:24:27 +03:00
Ievgen Khvedchenia
7a59435490 KAZE and AKAZE integration initial commit 2014-04-04 14:25:38 +03:00
Andrey Pavlenko
d1710a8547 Merge pull request #2562 from akarsakov:gftt_fix 2014-04-04 13:34:31 +04:00
krodyush
4ca695cab0 Merge remote-tracking branch 'github/master' into pullreq/140319-PyrLKOpticalFlow 
Conflicts:
	modules/video/src/opencl/pyrlk.cl
 2014-04-04 11:26:08 +04:00
Vladislav Vinogradov
f8d922ad3e disable gpu::GeneralizedHough compilation on gcc 4.7 2014-04-04 10:31:33 +04:00
Andrey Pavlenko
5a3200d513 Merge pull request #2567 from apavlenko:fix_compare_scalar 2014-04-03 22:08:18 +04:00
Andrey Pavlenko
9a3895d842 Merge pull request #2556 from DeanF:master 2014-04-03 17:07:06 +04:00
Alexander Karsakov
c747426fc1 Enabled integer arithmetic for filterSepSinglePass 2014-04-03 16:53:57 +04:00
Andrey Pavlenko
271f60ba7a fixing OCL run condition (build program failure for comparison 64F Mat with Scalar) 2014-04-03 16:21:04 +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
Alexander Karsakov
fc10ffefb8 Enabled integer arithmetic for row_filter_C1_D0 2014-04-03 13:31:06 +04:00
Alexander Karsakov
2cf3a6e26c Fixed error in case corners not found 2014-04-03 10:30:55 +04:00
Alexander Karsakov
a3825acee4 Small refactoring 2014-04-02 16:38:32 +04:00
Andrey Pavlenko
2aab7b2926 Merge pull request #2557 from ilya-lavrenov:tapi_fnlm_fix 2014-04-02 13:01:08 +04:00
Roman Donchenko
c165f07319 Merge pull request #2550 from SpecLad:merge-2.4 2014-04-02 12:00:01 +04:00
Ilya Lavrenov
2cd51c04e4 fixed condition in cv::FNLM 2014-04-01 23:18:07 +04:00
DeanF
48df67a9c5 Fixed trailing whitespace 2014-04-01 22:04:58 +03:00
DeanF
bdc91c66c9 Fixed problem with compilation without HAVE_OPENCL 
When compiling without OpenCL, some classes from its namespace are still used in code.
 2014-04-01 21:20:13 +03:00
Elena Gvozdeva
fa2d79a15b Added IPP Async converters, doc and sample 2014-04-01 16:47:29 +04:00
Andrey Pavlenko
6ef94b52ad Merge pull request #2536 from ilya-lavrenov:tapi_resize_linear 2014-04-01 12:54:07 +04:00
Roman Donchenko
a8cb5c3983 Merge pull request #2554 from asmorkalov:ocv_249_version 2014-04-01 12:16:25 +04:00
Alexander Smorkalov
e23f7303a6 OpenCV version++. OpenCV Manager version++. 2014-03-31 15:00:25 -07:00
Andrey Pavlenko
0d5ffec521 Merge pull request #2553 from ilya-lavrenov:typo 2014-03-31 23:21:07 +04:00
Andrey Pavlenko
aa3c4ae5d2 Merge pull request #2552 from ilya-lavrenov:tapi_compare 2014-03-31 21:22:00 +04:00
Andrey Pavlenko
97eac3f394 Merge pull request #2551 from ilya-lavrenov:ocl_nonfree 2014-03-31 21:21:27 +04:00
Ilya Lavrenov
31f864a22b integer cv::resize (INTER_LINEAR && CV_8UC(cn)) 2014-03-31 20:25:53 +04:00
Andrey Pavlenko
bb3c0c066c Merge pull request #2548 from jet47:gpu_mog2_test 2014-03-31 20:19:21 +04:00
Ilya Lavrenov
9b9769169f doc typos 2014-03-31 19:57:05 +04:00
Andrey Pavlenko
d170faeb5c Merge pull request #2549 from ilya-lavrenov:tapi_laplacian 2014-03-31 19:36:44 +04:00
Andrey Pavlenko
6c2d77079f Merge pull request #2487 from ilya-lavrenov:tapi_perf_orb 2014-03-31 18:17:50 +04:00
Ilya Lavrenov
322b15a459 compare with scalar (cn > 1) 2014-03-31 17:50:16 +04:00
Ilya Lavrenov
7df92bbb77 fixed C4505 2014-03-31 17:30:15 +04:00
Alexander Karsakov
10a52220f0 Added integer arithmetic to sepFilter2D 2014-03-31 16:45:15 +04:00
Alexander Alekhin
eeed9ce247 perf report: summary.py: added custom --regressions map 2014-03-31 16:04:18 +04:00
Andrey Pavlenko
1f4586f3dd Merge pull request #2541 from JinoBetti:2.4 2014-03-31 15:48:45 +04:00
Ilya Lavrenov
c53398a438 performance tests for FAST 2014-03-31 15:03:00 +04:00
mlyashko
5acd178790 copyright fix 2014-03-31 14:57:03 +04:00
Roman Donchenko
f77c68e0fa Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/imgproc/src/opencl/integral_sqrsum.cl
	modules/nonfree/doc/feature_detection.rst
	modules/nonfree/include/opencv2/nonfree/ocl.hpp
	modules/nonfree/src/surf_ocl.cpp
	modules/nonfree/test/test_features2d.cpp
	modules/ocl/doc/image_processing.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/match_template.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/ocl/src/opencl/haarobjectdetect_scaled2.cl
	modules/ocl/test/test_imgproc.cpp
 2014-03-31 14:42:00 +04:00
Ilya Lavrenov
e1efed1914 added support of ksize >= 5 to cv::Laplacian 2014-03-31 13:17:58 +04:00
mlyashko
4c5de04efb bug fix 2014-03-31 10:58:15 +04:00
Vladislav Vinogradov
6d368dc1e7 increase epsilon for MOG2::getBackgroundImage test: 
it uses float arithmetics
 2014-03-30 18:02:03 -07:00
Andrey Pavlenko
51530d4d8e Merge pull request #2543 from apavlenko:24_haar_revert 2014-03-28 23:17:08 +04:00
Alexander Karsakov
d17142b83d Prototype OCL version of gaussian blur with integer arithmetic 2014-03-28 21:46:03 +04:00
unknown
75534a4828 Python typdef fixed. Reverted the example to MOG2. Not time to make the command line switch for now. 2014-03-28 14:23:10 +01:00
Andrey Pavlenko
3747d2643f Revert pull request #1929 from @alalek "ocl: added workaround into Haar kernels" 
This reverts commit 3dcddad88a.

Conflicts:
	modules/ocl/src/opencl/haarobjectdetect.cl
 2014-03-28 16:08:11 +04:00
Andrey Pavlenko
7d82171af4 - fix test 2014-03-28 16:06:39 +04:00
Andrey Pavlenko
e6e817e613 Revert "Merge pull request #1779 from perping:integral_2.4" 
This reverts commit 54ea5bbac7, reversing
changes made to 28e0d3d771.
 2014-03-28 16:05:04 +04:00
Roman Donchenko
0469c18726 Merge pull request #2542 from asmorkalov:android_javacam_cvtcolor_fix 2014-03-28 12:45:39 +04:00
Roman Donchenko
d6b54ff9d1 Merge pull request #2476 from minkless:3.0-bugfix-core-filestorage 2014-03-28 12:17:16 +04:00
Roman Donchenko
e055b68ceb Merge pull request #2403 from hbristow:issue-3451 2014-03-28 12:13:14 +04:00
Roman Donchenko
0b4534d4c9 Merge pull request #2379 from ngryman:optimize_jpeg 2014-03-28 12:08:55 +04:00
Roman Donchenko
4382970739 Merge pull request #2540 from mjul:fixtypos_2.4 2014-03-28 11:58:11 +04:00
Koji Miyazato
1ab8060b62 corrected some style errors found by review. 2014-03-28 10:45:33 +09:00
Alexander Smorkalov
d17740ec87 Bug #3553 JavaCameraView frame format and cvtColor format inconsistency fixed. 2014-03-28 04:56:31 +04:00
Tony
41b8ab086b Merge remote-tracking branch 'upstream/master' 2014-03-27 19:32:05 +00:00
Nicolas Gryman
da34f1d58c added jpeg with optimized coding support. 2014-03-27 13:34:33 -04:00
JinoBetti
91511c1521 Update out.cpp 
Fixed a bug with the cv::format(cv::Mat, ...) method for matrices with only one row

see http://answers.opencv.org/question/21201/cvformat-does-not-format-the-way-it-should/?answer=23945#post-id-23945 for details
 2014-03-27 16:28:40 +01:00
Roman Donchenko
2e3e106676 Merge pull request #2537 from ilya-lavrenov:doc_fix 2014-03-27 17:43:02 +04:00
mlyashko
4b71921526 both tests by picture and rand mat 2014-03-27 17:08:05 +04:00
Martin Jul
a1798cb28e Fixed typo in BFMatcher in docs. 2014-03-27 13:52:49 +01:00
Ilya Lavrenov
80df44bd75 doc fix 2014-03-27 16:30:29 +04:00
Andrey Pavlenko
e34a7caabc Merge pull request #2535 from akarsakov:stereobm_fix 2014-03-27 15:22:45 +04:00
Alexander Karsakov
4ceaf44fa0 Fixed incorrect calculation of best_disp 2014-03-27 11:21:32 +04:00
Hilton Bristow
61c22d5899 removed experimental slots 2014-03-27 14:58:53 +10:00
Hilton Bristow
fc696a9ff3 Improved standalone importing behaviour and creation of nested directories 2014-03-27 14:52:23 +10:00
Hilton Bristow
6f190bb907 Generalized todict implementation 2014-03-27 14:51:17 +10:00
Hilton Bristow
068b1bc3d0 More generic todict 2014-03-27 11:34:20 +10:00
Alexander Alekhin
3488fdcb43 disable failed tests 2014-03-26 19:29:59 +04:00
Alexander Alekhin
569e1346f2 UMat: issue in OpenCLAllocator::unmap() 2014-03-26 19:29:41 +04:00
Andrey Pavlenko
04c857a4e8 Merge pull request #2505 from alalek:umat_unmap_synchronization_test 2014-03-26 19:08:15 +04:00
Andrey Pavlenko
a2f8a93bf5 Merge pull request #2529 from ilya-lavrenov:tapi_filter2D 2014-03-26 19:04:57 +04:00
Andrey Pavlenko
6c12f20395 Merge pull request #2528 from mlyashko:back_proj_fix 2014-03-26 19:04:39 +04:00
Andrey Pavlenko
a1d151924d Merge pull request #2527 from apavlenko:ocl_surf_24 2014-03-26 19:03:44 +04:00
Andrey Pavlenko
fa5705613d splitting plain and OCL tests for SURF. 2014-03-26 17:18:05 +04:00
Ilya Lavrenov
f7d6d3cff5 improved cv::filter2D 2014-03-26 14:19:59 +04:00
Roman Donchenko
491b84d463 Merge pull request #2478 from clemenscorny:master 2014-03-26 12:19:54 +04:00
Roman Donchenko
a7f9677378 Merge pull request #2404 from yashdv:old_basic_structures_doc_fix 2014-03-26 12:18:39 +04:00
Roman Donchenko
d67b450741 Merge pull request #2378 from ngryman:progressive_jpeg 2014-03-26 12:12:02 +04:00
Alexander Karsakov
8c39b4e8b6 Fixed stereoBM for Intel CPU. 2014-03-26 11:53:36 +04:00
Tony
46ba9d30b9 Merge remote-tracking branch 'upstream/master' 2014-03-25 20:44:06 +00:00
Nicolas Gryman
b211e1d989 added jpeg progressive support. 2014-03-25 15:27:24 -04:00
mlyashko
70fdfa0bdb changed type of sanity check 2014-03-25 16:43:20 +04:00
Andrey Pavlenko
d63a8ba018 Merge pull request #2523 from ilya-lavrenov:tapi_filters 2014-03-25 16:23:02 +04:00
Alexander Alekhin
6bd7a444bc UMat map-unmap synchronization test 2014-03-25 16:19:52 +04:00
Clemens Korner
f1c8b4b965 FEATURES2D: add DenseFeatureDetector Python wrapper 2014-03-25 12:07:01 +01:00
mlyashko
953aafbd3d Merge branch 'master' of https://github.com/Itseez/opencv into back_proj_fix 2014-03-25 14:52:39 +04:00
mlyashko
f38fe76025 added perf test for CalcBackProj 2014-03-25 14:50:37 +04:00
Roman Donchenko
da7a605224 Merge pull request #2123 from white-pony:vkysenko/fix-mertens 2014-03-25 14:37:56 +04:00
Andrey Pavlenko
c1acbb02bc disabling calls to SURF_OCL causing tests failures 2014-03-25 14:09:49 +04:00
Andrey Pavlenko
63a746c6ea fixing conditional compilation 2014-03-25 13:16:42 +04:00
Andrey Pavlenko
7e03a8b279 fixing check_docs2.py issue 2014-03-25 13:15:56 +04:00
Andrey Pavlenko
c6199fc3c1 Merge pull request #2526 from KonstantinMatskevich:ocl_morph_fix 2014-03-25 12:59:10 +04:00
Roman Donchenko
85cf2d9671 Merge pull request #2524 from SpecLad:merge-2.4 2014-03-25 12:13:04 +04:00
Konstantin Matskevich
67926fa028 ocl morphology fix 2014-03-25 10:39:50 +04:00
Aaron Kunze
ede6d4482b Optimizations to OpenCL bilateral filter. 2014-03-24 13:35:56 -07:00
Andrey Pavlenko
9e1124d24a Merge pull request #2525 from ilya-lavrenov:tapi_sep 2014-03-24 22:43:34 +04:00
Andrey Pavlenko
ba2eee9cbd Merge pull request #2522 from ilya-lavrenov:tapi_canny 2014-03-24 19:31:26 +04:00
Roman Donchenko
cc05493730 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	cmake/OpenCVDetectAndroidSDK.cmake
	cmake/OpenCVGenAndroidMK.cmake
	cmake/OpenCVModule.cmake
	cmake/templates/OpenCV.mk.in
	cmake/templates/OpenCVConfig.cmake.in
	doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.rst
	modules/cudabgsegm/src/cuda/mog.cu
	modules/imgproc/perf/opencl/perf_filters.cpp
	modules/imgproc/src/opencl/filterSep_singlePass.cl
	modules/nonfree/CMakeLists.txt
	modules/nonfree/perf/perf_precomp.hpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/opencl/bgfg_mog.cl
	modules/superres/CMakeLists.txt
	modules/superres/src/btv_l1_cuda.cpp
	modules/superres/src/cuda/btv_l1_gpu.cu
	modules/superres/src/frame_source.cpp
	modules/superres/src/input_array_utility.cpp
	modules/superres/src/optical_flow.cpp
	modules/superres/src/precomp.hpp
	samples/gpu/CMakeLists.txt
	samples/gpu/brox_optical_flow.cpp
	samples/gpu/super_resolution.cpp
 2014-03-24 19:02:16 +04:00
Roman Donchenko
8af175b81b Merge pull request #2521 from atrebbi:#3620 2014-03-24 18:54:00 +04:00
Andrey Pavlenko
9c5745383f Merge pull request #2512 from KonstantinMatskevich:ocl_gpu_type_parser 2014-03-24 18:46:01 +04:00
Ilya Lavrenov
061a25447e eliminated restriction delta == 0 from cv::sepFilter2D 2014-03-24 17:39:07 +04:00
Konstantin Matskevich
c2355d3a12 case-insensitivity 2014-03-24 15:20:00 +04:00
Ilya Lavrenov
e2c6ab0166 refactored filter2D; eliminated restrictions sdepth == ddepth, delta == 0 2014-03-24 14:42:51 +04:00
Ilya Lavrenov
b6833fdde7 added 3-channels support to cv::medianBlur 2014-03-24 14:32:31 +04:00
Ilya Lavrenov
a51ab99a79 added 3-channels support to cv::filter2D, cv::Laplacian 2014-03-24 14:32:31 +04:00
Ilya Lavrenov
e19c42dded added 3-channels support to cv::boxFilter, cv::blur, cv::sqrBoxFilter 2014-03-24 14:31:42 +04:00
Ilya Lavrenov
8f5fd44fb2 added 3 channels support to cv::bilateralFilter 
Conflicts:
	modules/imgproc/test/ocl/test_filters.cpp
 2014-03-24 14:31:41 +04:00
Roman Donchenko
f8a100f3e0 Merge pull request #2520 from vlkolesnikov:misprint_fix 2014-03-24 14:05:18 +04:00
Ilya Lavrenov
6ba60a1e22 added 3-channels support to cv::Canny 2014-03-24 13:02:54 +04:00
Roman Donchenko
9aa6528fd7 Merge pull request #2504 from asmorkalov:android_camera_locks_24 2014-03-24 12:06:51 +04:00
Roman Donchenko
623b1db8d1 Merge pull request #2515 from apavlenko:perf_default_strategy 2014-03-24 12:02:30 +04:00
Vladimir Kolesnikov
60803afe8f Misprint fixed in table formatter 2014-03-24 11:04:49 +04:00
Andrey Pavlenko
d8c018289a Merge pull request #2491 from ilya-lavrenov:tapi_sep_filter 2014-03-24 10:37:15 +04:00
Andrey Pavlenko
157f35ef29 Merge pull request #2503 from mlyashko:optflow_dualtvl1 2014-03-24 10:35:51 +04:00
Andrey Pavlenko
ae89787984 Merge pull request #2511 from apavlenko:2.4_fix_perf_nonfree 2014-03-24 10:25:47 +04:00
Andrey Pavlenko
cf3a2e30cd Merge pull request #2517 from ilya-lavrenov:fix 2014-03-24 10:25:04 +04:00
Andrey Pavlenko
259b9e093c disabling failing tests 2014-03-24 10:12:02 +04:00
Andrey Pavlenko
5421d741bc making OCL tests conform to the comon style 2014-03-24 10:08:44 +04:00
Alessandro Trebbi
c4a63f6a86 - 2014-03-23 22:00:16 +01:00
Ilya Lavrenov
20b6191842 doc fix 2014-03-23 16:20:00 +04:00
Koji Miyazato
0a5d6e10b9 Added test code for I/O of user-defined types. 2014-03-22 00:32:44 +09:00
Andrey Pavlenko
244f126ff6 Merge pull request #2454 from apavlenko:2.4_haar_extend 2014-03-21 18:45:58 +04:00
Andrey Pavlenko
f368b27f0a Merge pull request #2489 from vbystricky:iocl_pyrlk 2014-03-21 18:33:32 +04:00
Andrey Pavlenko
a3668f1369 changing default perf strategy from BASIC (old) to SIMPLE (new, faster) 2014-03-21 18:29:06 +04:00
Andrey Pavlenko
8ac93f9b6b Merge pull request #2508 from akarsakov:fix_erode_intel 2014-03-21 18:25:12 +04:00
Andrey Pavlenko
ef9669ba1a Merge pull request #2506 from apavlenko:lbp_ocl_use_any_device 2014-03-21 18:24:36 +04:00
Alexander Smorkalov
0dba5bdc4a Multiple fixes in camera. 
Fixed constant value for focus mode FOCUS_MODE_CONTINUES_PHOTO;
Add setters and getters for exposure lock and white balance lock flags;
Excluded camera restart for all setters except frame size.
 2014-03-21 17:26:05 +04:00
Konstantin Matskevich
79fc3a6203 added gpu type selection in OPENCV_OPENCL_DEVICE parser 2014-03-21 17:01:37 +04:00
Roman Donchenko
46d39aff68 Merge pull request #2501 from asmorkalov:android_native_camera_qualcomm 2014-03-21 16:28:48 +04:00
Andrey Pavlenko
7193762d2d Merge pull request #2495 from ilya-lavrenov:tapi_flip 2014-03-21 16:08:46 +04:00
Andrey Pavlenko
d18ebfa8e8 Merge pull request #2500 from akarsakov:hog_intel_fix 2014-03-21 16:02:49 +04:00
Ilya Lavrenov
2875ce60ea added 3-channels support to optimized version 2014-03-21 16:02:47 +04:00
Andrey Pavlenko
fe5eaae102 adding missing include (fixing 'no ocl implementation' error) 2014-03-21 14:30:49 +04:00
Alexander Smorkalov
846266fde4 Native camera fix for some deivices with Qualcomm SoC like Samsung Galaxy S4. 2014-03-21 14:16:03 +04:00
Firat Kalaycilar
c9f51d5eed modified BackgroundSubtractorMOG2::getBackgroundImage so that it can now work with gray-level images. 2014-03-21 09:44:11 +02:00
Alexander Karsakov
0bd4fd3a87 Workaround for Intel platform: replace min() with ternary operator 2014-03-21 09:33:00 +04:00
Andrey Pavlenko
b7198ccf1c dropping legacy modes testing 2014-03-20 22:30:16 +04:00
Andrey Pavlenko
640e180efe switching to CV_HAAR_SCALE_IMAGE mode, enabling test 2014-03-20 22:22:55 +04:00
Andrey Pavlenko
d060d30fa0 enabling OCL LBP branch for all devices 2014-03-20 21:57:34 +04:00
Andrey Pavlenko
bdfd29a0b8 Merge pull request #2496 from ilya-lavrenov:tapi_imgproc 2014-03-20 19:20:15 +04:00
mlyashko
80a40ae3d7 changed epsilon for test pass on Win32 2014-03-20 16:15:43 +04:00
Andrey Pavlenko
9c7ba6db90 Merge pull request #2490 from ilya-lavrenov:ocl_sep_filters 2014-03-20 13:54:27 +04:00
Andrey Pavlenko
2299e2ed1b Merge pull request #2494 from ilya-lavrenov:tapi_merge 2014-03-20 13:39:39 +04:00
Andrey Pavlenko
87ae0f9990 Merge pull request #2492 from KonstantinMatskevich:ocl_fix_wrongdevice 2014-03-20 13:39:17 +04:00
Ilya Lavrenov
63d8a61b9b enabled 3-channels support for cv::createSuperResolution_BTVL1 2014-03-20 13:31:20 +04:00
Alexander Karsakov
b14c314fc3 Fixed incorrect thread synchronizations 2014-03-20 13:03:03 +04:00
Roman Donchenko
68c57a1e82 Merge pull request #2473 from euphrat:mog2_weight_bugfix 2014-03-20 12:40:23 +04:00
Ilya Lavrenov
eb8b4c58c7 fixed bug in cv::ocl::predictOptimalVectorWidth 2014-03-20 00:28:21 +04:00
krodyush
65d64af2a8 ocl_calcOpticalFlowPyrLK optimizations 
1. decrease branch number in CL code by replacing them into weights
2. decrease local mem pressure in reduce operation by using private variables
3. decrease image sampler pressure by caching data into local memory
4. remove unnecessary sync point on the HOST side.
 2014-03-19 19:31:14 +04:00
Ilya Lavrenov
291458a859 generalized OpenCL version of cv::sepFilter2D; removed some restrictions and added 3-channels support 2014-03-19 18:56:16 +04:00
Alexander Karsakov
30a8308f8e Enabled Intel-specific optimizations for HOG detector. 2014-03-19 17:30:13 +04:00
Ilya Lavrenov
b449b0bf71 simplified cv::sepFilter2D OpenCL part 2014-03-19 15:59:00 +04:00
Roman Donchenko
a1e5bd71f1 Merge pull request #2446 from asmorkalov:ocv_implicit_cuda_control 2014-03-19 14:49:22 +04:00
Ilya Lavrenov
b73490f86c eliminated restriction src[i].channels() == 1 in cv::merge 2014-03-19 13:56:31 +04:00
Andrey Pavlenko
a2dec6c34e Merge pull request #2493 from ilya-lavrenov:tapi_fnlm 2014-03-19 12:56:11 +04:00
Konstantin Matskevich
f9f730c426 update error message 2014-03-19 12:14:48 +04:00
Ilya Lavrenov
04884ebf45 added 3-channels support to cv::setIdentity 2014-03-19 01:53:53 +04:00
Ilya Lavrenov
d1cfcfcafd added 3-channels support to morphology operations 2014-03-18 20:15:11 +04:00
Ilya Lavrenov
8d97d0d631 added 3-channels support to cv::flip 2014-03-18 19:31:37 +04:00
Firat Kalaycilar
0a16d93e1d Fixed an issue with weight assignment causing the resulting GMM weights to be unsorted in the CUDA and OCL versions of BackgroundSubtractorMOG2 2014-03-18 17:26:24 +02:00
Koji Miyazato
a43ef9a6cd WriteStructContext treats state of fs 2014-03-18 23:29:30 +09:00
Alexander Smorkalov
b4e4f13f9e Superres module enabled for Android. GPU samples build fixed for Android. 2014-03-18 17:07:19 +04:00
Roman Donchenko
b70332d806 Merge pull request #1986 from GregoryMorse:patch-3 2014-03-18 16:18:33 +04:00
Firat Kalaycilar
4d9698a4cf Merge branch '2.4' of git://github.com/Itseez/opencv into mog2_weight_bugfix 2014-03-18 14:00:30 +02:00
Andrey Pavlenko
6e44f05e6f Merge pull request #2464 from KonstantinMatskevich:ocl_stereobm_experiment 2014-03-18 15:53:09 +04:00
Konstantin Matskevich
eebf92ba58 fix for incorrect opencl device selection 2014-03-18 15:47:35 +04:00
Roman Donchenko
bff92da970 Merge pull request #2488 from Nerei:minor_doc 2014-03-18 15:41:20 +04:00
Roman Donchenko
d76226e21b Merge pull request #2456 from kurodash:pr_use_cvAlloc 2014-03-18 14:39:40 +04:00
Ilya Lavrenov
6fe71bd27c added 4 channels support to fnlm 2014-03-18 14:29:02 +04:00
Roman Donchenko
ae2b0b0098 Merge pull request #2486 from SpecLad:merge-2.4 2014-03-18 13:55:57 +04:00
Roman Donchenko
bfb1ba371c Merge pull request #2026 from pemmanuelviel:giveFurthestPoint 2014-03-18 13:40:44 +04:00
Ilya Lavrenov
82e6edfba2 optimized sep filter 2014-03-18 00:16:38 +04:00
Ilya Lavrenov
3940b6163b remove intel guard since the code is 2 times faster on AMD too 2014-03-17 19:11:21 +04:00
yash
51cb6998ea made the example consistent with the fuction definition and improved doc 
made the example consistent with the fuction definition and improved doc
 2014-03-17 18:44:02 +05:30
Anatoly Baksheev
0c02e5de25 minor doc fix 2014-03-17 17:02:49 +04:00
vbystricky
6890aa0033 Fix problems on Intel HD graphics 2014-03-17 16:03:15 +04:00
Roman Donchenko
40a740ff88 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/imgproc/src/opencl/precornerdetect.cl
	modules/nonfree/perf/perf_main.cpp
	modules/nonfree/perf/perf_surf.ocl.cpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/gftt.cpp
	modules/ocl/src/opencl/arithm_bitwise.cl
	modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
	modules/ocl/src/opencl/arithm_minMax.cl
	modules/ocl/src/opencl/arithm_nonzero.cl
	modules/ocl/src/opencl/arithm_sum.cl
	modules/ocl/test/test_arithm.cpp
	modules/viz/src/precomp.hpp
	modules/viz/src/vizcore.cpp
	modules/viz/src/vtk/vtkCloudMatSink.h
	modules/viz/src/vtk/vtkXYZReader.cpp
	modules/viz/src/vtk/vtkXYZReader.h
	modules/viz/test/test_precomp.hpp
 2014-03-17 14:14:07 +04:00
Andrey Pavlenko
dc28451b8a Merge pull request #2479 from alalek:ocl_compare_scalar 2014-03-17 14:04:22 +04:00
Andrey Pavlenko
2a1d5c6d43 Merge pull request #2428 from alalek:ocl_copyMakeBorder_3channels 2014-03-17 13:10:34 +04:00
Alexander Alekhin
af062b7c42 ocl: compare: remove useless perf tests 2014-03-17 12:33:12 +04:00
Roman Donchenko
882971151d Merge pull request #2485 from Nerei:viz_correct_viewer_pose 2014-03-17 11:59:14 +04:00
Roman Donchenko
136e5eb804 Merge pull request #2484 from berak:mat_doc_24 2014-03-17 11:57:10 +04:00
Konstantin Matskevich
1a43ed9893 finalizing 2014-03-17 10:42:19 +04:00
Anatoly Baksheev
24d8cbf940 Viz::setViewerPose() - changed up-vector to down (common for Computer Vision & Odometry) 2014-03-16 20:07:05 +04:00
berak
80708008a4 missing () on Mat::type() 2014-03-16 14:04:05 +01:00
Alexander Alekhin
7ce2ca2e0c ocl: workaround for Pow accuracy test failure 2014-03-14 19:51:19 +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
dd6cf15a39 Merge pull request #2481 from akarsakov:fix_hog_intel 2014-03-14 19:17:03 +04:00
Andrey Pavlenko
bcb938efbb Merge pull request #2483 from ilya-lavrenov:tapi_3_vs_4 2014-03-14 19:14:35 +04:00
Andrey Pavlenko
c72a0a1295 Merge pull request #2482 from ilya-lavrenov:tapi_fix 2014-03-14 19:08:07 +04:00
Andrey Pavlenko
6b434befc9 Merge pull request #2480 from vpisarev:ocl_orb 2014-03-14 19:04:19 +04:00
Konstantin Matskevich
af1084eb58 speedUp 2014-03-14 18:00:13 +04:00
Konstantin Matskevich
91e4334227 temp 2014-03-14 18:00:12 +04:00
Konstantin Matskevich
18a59b48ba fixes 2014-03-14 18:00:12 +04:00
Konstantin Matskevich
ddc235172e new approach 2014-03-14 18:00:11 +04:00
Konstantin Matskevich
a5d989f346 new attempt 2014-03-14 18:00:11 +04:00
Konstantin Matskevich
799d7e7a50 bad experiment =( 2014-03-14 18:00:10 +04:00
Konstantin Matskevich
0904f10ab5 optimizations 2014-03-14 18:00:10 +04:00
Konstantin Matskevich
bfc843a5f5 added optimization 2014-03-14 18:00:09 +04:00
Konstantin Matskevich
b5f717b6b3 stereoBM 2014-03-14 18:00:09 +04:00
Ilya Lavrenov
6f12f1b3b5 added 3 vs 4 channels performance tests 2014-03-14 17:30:14 +04:00
Ilya Lavrenov
6be7869ae8 fix for unsupported doubles 2014-03-14 16:54:52 +04:00
Roman Donchenko
4a4151ec97 Merge pull request #2474 from akarsakov:fix_getpolicy 2014-03-14 15:17:45 +04:00
Alexander Karsakov
4698d62125 Removed workaround for Intel platform. 2014-03-14 14:18:52 +04:00
Alexander Karsakov
8910508b83 Fixed getPolicy() method to make it thread-safe. 2014-03-14 13:50:33 +04:00
kuroda sho
f9484bae8a fix: use "cvAlloc" wrapper function for malloc. 2014-03-14 17:09:08 +09:00
Ilya Lavrenov
b47bec2ed0 performance tests for ORB 2014-03-13 23:30:02 +04:00
Vadim Pisarevsky
4fafab3786 fixed extra whitespace 2014-03-13 23:18:41 +04:00
Vadim Pisarevsky
42e604abea fixed bug in FAST 2014-03-13 23:17:28 +04:00
Vadim Pisarevsky
3e854fa6e5 finished OpenCL port of ORB 2014-03-13 22:56:53 +04:00
Ilya Lavrenov
61c347fb76 typos 2014-03-13 22:56:46 +04:00
Ilya Lavrenov
357a856cf6 nonfree perf tests 2014-03-13 22:35:08 +04:00
Ilya Lavrenov
6f76e7b42d improved performance of bitwise ops 2014-03-13 19:42:13 +04:00
Andrey Pavlenko
0ce8f1d5dd Merge pull request #2477 from alalek:ocl_cleanup_workarounds 2014-03-13 18:55:28 +04:00
Andrey Pavlenko
c5bf1c108c Merge pull request #2470 from ilya-lavrenov:tapi_reduction 2014-03-13 18:42:01 +04:00
Andrey Pavlenko
4233539617 Merge pull request #2469 from alalek:ocl_pyrUp_pyrDown_3channels 2014-03-13 18:37:05 +04:00
Ilya Lavrenov
adc15c2bba improved performance of cv::ocl::sum 2014-03-13 17:33:18 +04:00
Andrey Pavlenko
a6c40abfb2 Merge pull request #2466 from ilya-lavrenov:tapi_transpose_3cn 2014-03-13 16:56:01 +04:00
Andrey Pavlenko
0764a23eb2 Merge pull request #2459 from ilya-lavrenov:tapi_experiments 2014-03-13 16:49:57 +04:00
Andrey Pavlenko
6b6cfa893d Merge pull request #2382 from ilya-lavrenov:tapi_nlmeans 2014-03-13 16:48:38 +04:00
Alexander Alekhin
48196ad10b ocl: cleanup workarounds 2014-03-13 15:46:38 +04:00
Ilya Lavrenov
3ebfe60008 improved performance of cv::ocl::countNonZero 2014-03-13 15:35:53 +04:00
Ilya Lavrenov
8e79de35a8 changes for GFTT 2014-03-13 14:57:13 +04:00
Koji Miyazato
b96762a48f Fix for bug #3599: cv::FileStorage does not work for std::vector of user-defined struct. 2014-03-13 19:41:13 +09:00
Ilya Lavrenov
a5afcd9f11 improved performance of cv::ocl::minMax 2014-03-13 14:35:12 +04:00
Roman Donchenko
553673eeed Merge pull request #2468 from mlyashko:back_proj_fix 2014-03-13 13:42:20 +04:00
Roman Donchenko
fd8f2c8d23 Merge pull request #2463 from ziyangli:master 2014-03-12 18:51:41 +04:00
Firat Kalaycilar
a87607e3ef Fixed an issue with weight assignment causing the resulting GMM weights to be unsorted in BackgroundSubtractorMOG2 2014-03-12 16:14:59 +02:00
Roman Donchenko
836635d2d5 Merge pull request #2434 from Nerei:viz_continue 2014-03-12 16:53:42 +04:00
Anatoly Baksheev
4d7a593c25 minor cmake fix fo macos 2014-03-12 16:22:22 +04:00
Ilya Lavrenov
9932cf41a4 3-channel reduction operations 2014-03-12 15:07:39 +04:00
Alexander Alekhin
dca401d4cc ocl: pyrUp/pyrDown 3-channel 2014-03-12 14:39:55 +04:00
ziyangli
bbe8654c3d cleanup 2014-03-12 18:16:54 +08:00
Ziyang LI
4f5896493e remove a whitepace 2014-03-12 18:14:43 +08:00
Ilya Lavrenov
f138b613b7 cv::compare 2014-03-12 13:16:33 +04:00
mlyashko
5252aa8fdd added data type check for back projection fix 2014-03-12 11:30:28 +04:00
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
1bb0c5747c Merge pull request #2462 from ibtaylor:fix_deblurring_calcBlurriness_var_name_typo 2014-03-11 17:41:18 +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
5261fbe217 Merge pull request #2387 from alalek:ocl_remap_3cn 2014-03-11 15:59:12 +04:00
Andrey Pavlenko
90c5dde887 Merge pull request #2455 from ilya-lavrenov:tapi_fix 2014-03-11 15:58:32 +04:00
Ilya Lavrenov
9b31e6cd44 changes according to reviewer's suggestions 2014-03-11 15:40:31 +04:00
Andrey Pavlenko
0084dee05b Merge pull request #2448 from akarsakov:ocl_cxt_termination 2014-03-11 12:57:29 +04:00
Ilya Lavrenov
3eff05e3eb added performance tests for cv::ocl::calcHist 2014-03-11 12:34:27 +04:00
Alexander Alekhin
e7475bff68 TAPI: remap 3-channel 2014-03-10 20:35:10 +04:00
Alexander Alekhin
e4608229f0 ocl: copyMakeBorder 3-channel 2014-03-10 17:22:49 +04:00
Ziyang LI
786e3b9eee Moved x = 0 into the parenthesis 
Easier to understand
 2014-03-10 17:33:13 +08:00
Ian Taylor
45969bb3ae fix variable name typo in calcBlurriness 2014-03-10 03:02:06 -04:00
Ilya Lavrenov
208831eb5d optimized cv::calcHist 2014-03-08 12:24:31 +04:00
Vadim Pisarevsky
efdfca7a11 do not use the large "score" buffer; now without non-max suppression OpenCL FAST is pretty efficient 2014-03-07 18:55:45 +04:00
Roman Donchenko
70e22b682d Merge pull request #2397 from vbystricky:intelperc 2014-03-07 18:19:00 +04:00
Vadim Pisarevsky
06c138bd64 make the correctness test pass 2014-03-07 18:18:10 +04:00
vbystricky
193e97a34a Move declaration of IVideoCapture class into precomp.hpp, make some methods of IVideoCapture pure virtual 2014-03-07 16:25:15 +04:00
kurodash
0eaeff0641 fix: use "cvAlloc" wrapper function for malloc. 2014-03-07 19:02:37 +09:00
Andrey Pavlenko
2879ff2098 Merge pull request #2437 from ilya-lavrenov:tapi_morph 2014-03-07 14:00:09 +04: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
Andrey Pavlenko
451be9ed53 Merge pull request #2444 from ilya-lavrenov:tapi_gftt 2014-03-07 13:53:43 +04:00
Andrey Pavlenko
3cb49eac49 Merge pull request #2451 from ilya-lavrenov:tapi_fast_covar_data 2014-03-07 13:52:47 +04:00
Andrey Pavlenko
8f3492851e Merge pull request #2453 from ilya-lavrenov:tapi_sobel 2014-03-07 13:51:37 +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
sprice
75ed2f52f1 Merge branch 'master' of https://github.com/Itseez/opencv 
Conflicts:
	modules/features2d/include/opencv2/features2d.hpp
	modules/features2d/src/freak.cpp
	modules/features2d/src/stardetector.cpp
 2014-03-06 15:39:06 -08: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