Commit Graph

23 Commits

Author SHA1 Message Date
Elena Gvozdeva
2c0765b4d1 fixed trailing whitespace 2014-01-23 14:50:29 +04:00
Elena Gvozdeva
7e2bdb590f fixed 2014-01-23 14:50:29 +04:00
Elena Gvozdeva
4da1ba56b3 fixed 2014-01-23 14:50:29 +04:00
Elena Gvozdeva
47b572f99f fixed 2014-01-23 14:50:28 +04:00
Elena Gvozdeva
9de70c9a00 Fixed trailing whitespace 2014-01-23 14:50:28 +04:00
Elena Gvozdeva
ba5d480f80 Fixed warnings 2014-01-23 14:50:28 +04:00
Elena Gvozdeva
86636dc265 Added ocl_matchTemplate( without dft) 2014-01-23 14:50:28 +04:00
Roman Donchenko
feaa12a274 Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/core/include/opencv2/core/version.hpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/initialization.cpp
	modules/ocl/test/main.cpp
	modules/superres/CMakeLists.txt
	modules/superres/src/input_array_utility.cpp
	modules/superres/src/input_array_utility.hpp
	modules/superres/src/optical_flow.cpp
2013-07-16 11:52:41 +04:00
Heinz Hofbauer
a26c4fa2a2 Bugfix for an overlapping size of image and template for matchTemplate.
Example: img of size 10x10 and templ of size 11x9.
In subsequent code this will results in either width or height of
corrSize to be zero (0).
Line 261 will call crossCorr which will then have a zero size of either
blocksize.width or blocksize.height resulting in a division by zero
crach in lines 137 or 138.
2013-07-03 14:58:40 +02:00
Andrey Kamaev
3890a74565 Drop outdated definitions from internal.hpp
This also fixes few clang build errors
2013-04-01 15:24:35 +04:00
Andrey Kamaev
2a6fb2867e Remove all using directives for STL namespace and members
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
2013-02-25 15:04:17 +04:00
Sergei Nosov
c768731e89 enable Tegra optimizations 2013-02-04 12:57:03 +04:00
Vadim Pisarevsky
e383d39598 fixed bug #2679 2013-01-09 17:53:19 +04:00
OpenCV Buildbot
04384a71e4 Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
Vadim Pisarevsky
1371c96935 extended morphological operations to handle arbitrary number of channels and CV_64F type; extended filter2D to handle CV_16S type. added test to check the supported formats; added description of supported formats in various filtering operations. 2012-04-12 12:34:55 +00:00
Vadim Pisarevsky
18ce0dff24 fixed bug #1552 2012-01-25 12:43:47 +00:00
Andrey Kamaev
320bee3bfe Fixed border interpolation problem in filter2D 2011-12-26 08:05:33 +00:00
Vadim Pisarevsky
0c877f62e9 replaced "const InputArray&" => "InputArray"; made InputArray and OutputArray references. added "None()" constant (no array()). 2011-06-06 14:51:27 +00:00
Vadim Pisarevsky
0556c5ede2 make sure filter2D does not use uninitialized buffers (thanks to flkleber for the patch) 2011-04-26 12:33:25 +00:00
Vadim Pisarevsky
abeeb40d46 a big patch; use special proxy types (Input/OutputArray, Input/OutputArrayOfArrays) for passing in vectors, matrices etc. 2011-04-17 13:14:45 +00:00
Vadim Pisarevsky
1286c1db45 fixed multiple warnings from VS2010. 2010-11-25 16:55:46 +00:00
Vadim Pisarevsky
957cff2493 rewrote matchTemplate in C++; added border awareness to crossCorr (ticket #557) 2010-11-12 20:57:01 +00:00
Vadim Pisarevsky
127d6649a1 "atomic bomb" commit. Reorganized OpenCV directory structure 2010-05-11 17:44:00 +00:00