Commit Graph

68 Commits

Author SHA1 Message Date
Alexander Karsakov
febe528363 Added ocl::pyrUp to T-API 2013-12-19 17:21:50 +04:00
Alexander Karsakov
ac230cd2ae Added ocl::pyrDown to T-API 2013-12-19 13:56:42 +04:00
Roman Donchenko
9b92545ce6 War on Whitespace, master edition: trailing spaces. 2013-08-27 13:57:24 +04:00
Roman Donchenko
f76dd99299 Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	cmake/OpenCVModule.cmake
	doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
	doc/tutorials/features2d/feature_detection/feature_detection.rst
	doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
	doc/tutorials/features2d/feature_homography/feature_homography.rst
	modules/core/include/opencv2/core/operations.hpp
	modules/core/src/arithm.cpp
	modules/gpu/perf/perf_video.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/java/generator/gen_java.py
	modules/java/generator/src/cpp/VideoCapture.cpp
	modules/nonfree/src/opencl/surf.cl
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_precomp.hpp
	modules/ocl/src/color.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/test/test_color.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/python/src2/cv2.cpp
	samples/gpu/CMakeLists.txt
	samples/gpu/super_resolution.cpp
2013-08-19 19:02:36 +04:00
Dmitry Retinskiy
4eb85189e5 bug #3094: added CV_Assert to PyrDown_ to check if source matrix is not empty 2013-08-14 15:30:35 +04:00
berak
03c4a6299b expanded the CV_Assert in pyrdown_ to check for empty mats 2013-07-30 17:32:48 +02:00
Andy Maloney
bc68dfb4e8 Remove unused vars 2013-02-01 18:09:58 -05:00
OpenCV Buildbot
04384a71e4 Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
Andrey Kamaev
7cc7a3f37d Suppressed hundreds of useless MSVC warnings (can be reenabled setting cmake variable ENABLE_NOISY_WARNINGS to ON). Fixed some of remaining warnings. 2012-04-08 21:49:19 +00:00
Vadim Pisarevsky
7fb8e9d328 added borderType to pyrDown, pyrUp & buildPyramid (patch #925) 2012-03-30 16:58:24 +00:00
Andrey Kamaev
5cbec286fc Tegra-optimized pyrUp 2011-11-28 16:38:36 +00:00
Andrey Kamaev
fb2fad52a2 Fixed bug in cv::pyrUp. Reenabled accuracy test. 2011-11-27 11:55:59 +00:00
Andrey Kamaev
f05259f28f Tegra-optmized pyrDown 2011-11-25 13:18:40 +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
Alexey Spizhevoy
f44632ee6f switched float with short in blending step (opencv_stitching) 2011-05-23 13:08:31 +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
061b49e0b2 reworked nearly all of the OpenCV tests (except for opencv_gpu tests) - they now use the Google Test engine. 2011-02-09 20:55:11 +00:00
Vadim Pisarevsky
127d6649a1 "atomic bomb" commit. Reorganized OpenCV directory structure 2010-05-11 17:44:00 +00:00