Commit Graph

250 Commits

Author SHA1 Message Date
Ilya Lavrenov
c7fe162829 renamed **2 -> ** 2014-02-04 19:55:11 +04:00
Ilya Lavrenov
78c2b3ca2a refactored imgproc 2014-01-27 18:47:16 +04:00
Ilya Lavrenov
6b8bee6e0b fixed kernel compilation warnings 2014-01-18 22:37:47 +04:00
Roman Donchenko
fee2ed37fc Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/contrib/src/retina.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/core/src/algorithm.cpp
	modules/core/src/arithm.cpp
	modules/features2d/src/features2d_init.cpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/imgproc/src/generalized_hough.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/video/src/tvl1flow.cpp
	modules/video/src/video_init.cpp
2014-01-14 11:53:59 +04:00
Ilya Lavrenov
5db1754d49 SSE2 optimization of cv::remap doesn't work with big images 2013-12-30 17:13:40 +04:00
Roman Donchenko
9dfb96389c Merge commit '4b885e206' into merge-2.4 2013-12-30 16:48:45 +04:00
Alexander Karsakov
6ef0253fb7 Disabled some IPP implementation since it breaks tests 2013-12-26 19:53:53 +04:00
Roman Donchenko
3c4b24d531 Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	CMakeLists.txt
	modules/highgui/src/cap.cpp
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/color.cpp
	modules/ocl/src/gftt.cpp
	modules/ocl/src/imgproc.cpp
	samples/ocl/facedetect.cpp
2013-12-23 18:50:17 +04:00
Ilya Lavrenov
eb7ff99f80 fixed cv::remap and cv::convertMaps for map types CV_16SC2 && CV_16UC1 2013-12-04 22:04:31 +04:00
Ilya Lavrenov
803672feea added cv::remap to T-API 2013-12-04 00:43:43 +04:00
Ilya Lavrenov
dcce9d7088 added cv::warpAffine to T-API 2013-12-04 00:43:43 +04:00
Ilya Lavrenov
55af7857b9 added cv::warpPerspective to T-API 2013-12-04 00:43:42 +04:00
Ilya Lavrenov
09795e3265 added cv::resize INTER_AREA to T-API 2013-11-29 17:57:37 +04:00
Ilya Lavrenov
6679aed61e fixed ocl::resize (INTER_LINEAR) and added an accuracy test 2013-11-27 02:52:02 +04:00
Vadim Pisarevsky
677c7f27cb fixed failure in Tonemap test 2013-11-19 19:20:24 -05:00
Vadim Pisarevsky
d914f20a4c updated patch to bring in the first functions with "transparent API" 2013-11-18 11:48:00 -05:00
Roman Donchenko
b5777efee6 Merge pull request #1716 from ilya-lavrenov:resize_area_sse2_fix 2013-11-06 13:59:44 +04:00
Ilya Lavrenov
e9b54ab844 fixed cv::resize (area fast mode) - it writes outside of array boundary in SSE2 version 2013-11-06 13:53:44 +04:00
Roman Donchenko
9c83f6c4fb Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	cmake/OpenCVDetectCUDA.cmake
	modules/core/include/opencv2/core/version.hpp
	modules/cudacodec/src/ffmpeg_video_source.cpp
	modules/gpu/src/video_writer.cpp
	modules/highgui/test/test_ffmpeg.cpp
	modules/highgui/test/test_video_io.cpp
	modules/highgui/test/test_video_pos.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/blend.cpp
	modules/ocl/src/canny.cpp
	modules/ocl/src/cl_operations.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/kmeans.cpp
	modules/ocl/src/moments.cpp
	modules/ocl/src/safe_call.hpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/test/test_moments.cpp
	samples/ocl/squares.cpp
2013-11-05 16:38:23 +04:00
Ilya Lavrenov
5546f4d77f consistency SSE2 and plain versions of convertMaps and remap 2013-11-01 14:50:41 +04:00
Roman Donchenko
03bbee327b Merge pull request #1486 from nzjrs:cv2-logpolar 2013-10-29 16:15:57 +04:00
Roman Donchenko
81eb4bd8be Merge remote-tracking branch 'origin/2.4'
Conflicts:
	doc/tutorials/features2d/feature_detection/feature_detection.rst
	modules/bioinspired/doc/retina/index.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/mat.hpp
	modules/core/include/opencv2/core/operations.hpp
	modules/core/src/stat.cpp
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/imgproc/src/filter.cpp
	modules/legacy/src/dpstereo.cpp
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/doc/image_processing.rst
	modules/ocl/doc/object_detection.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/canny.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/ocl/src/matrix_operations.cpp
	modules/ocl/src/pyrdown.cpp
	modules/ocl/src/pyrup.cpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/ocl/test/utility.hpp
2013-10-01 15:57:33 +04:00
John Stowers
51341738ba Add cv::logPolar, cv::linearPolar, and a python example 2013-09-30 22:31:19 +02:00
Roman Donchenko
95c2e8b51f Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	.gitignore
	doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst
	modules/gpu/src/match_template.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_precomp.hpp
2013-09-10 11:30:19 +04:00
Vadim Pisarevsky
61f2107829 added IPP optimization of separable 32f filters; fixed IPP version check in DFT; fixed conditions in IPP optimization of norm functions. 2013-09-09 16:13:39 +04:00
Roman Donchenko
254d4ae429 Boring changes - imgproc. 2013-09-05 18:26:43 +04:00
Vadim Pisarevsky
e85e4d3ab9 fixed bug in IPP-accelerated morphology; added several IPP imgwarp functions (by Klim) 2013-09-02 18:34:50 +04:00
kdrobnyh
e6ec3dd17f Add IPP support in resize, warpAffine, warpPerspective functions 2013-09-02 18:04:06 +04:00
Roman Donchenko
029fce10c9 Merge remote-tracking branch 'origin/2.4'
Conflicts:
	3rdparty/libjasper/CMakeLists.txt
	cmake/OpenCVDetectOpenCL.cmake
	modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
	modules/imgproc/src/floodfill.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/ocl/src/matrix_operations.cpp
	modules/ocl/src/mcwutil.cpp
	modules/ocl/src/opencl/arithm_bitwise_and_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_and_scalar_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_binary_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_binary_scalar.cl
	modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_or.cl
	modules/ocl/src/opencl/arithm_bitwise_or_scalar.cl
	modules/ocl/src/opencl/arithm_bitwise_or_scalar_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_xor.cl
	modules/ocl/src/opencl/arithm_bitwise_xor_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_xor_scalar.cl
	modules/ocl/src/stereobm.cpp
	modules/ocl/test/precomp.hpp
	modules/python/src2/api
	modules/ts/src/ts_func.cpp
	samples/gpu/bgfg_segm.cpp
2013-05-21 17:19:23 +04:00
Andrey Kamaev
2665c39a0d Fix build warnings from gcc 4.8 2013-05-13 17:07:30 +04:00
Andrey Kamaev
67073daf19 Merge branch '2.4' 2013-04-05 21:11:59 +04:00
Alexander Smorkalov
a914088f29 Build warning fixes. 2013-04-04 07:29:53 -07:00
Vladislav Vinogradov
5a4fa4607b fixed misprint in imgwarp.cpp 2013-04-01 11:26:49 +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
Vadim Pisarevsky
06f4a56469 converted flood fill, getrectsubpix & cornersubpix to C++ 2013-02-11 23:49:10 +04:00
Ilya Lavrenov
1bc76813f3 fixed bug connected with SSE2 version of resize with AREA interpolation 2012-12-31 15:35:40 +04:00
Ilya Lavrenov
a319bae6e2 added #undef _mm_packus_epi32 2012-12-17 16:56:37 +04:00
Ilya Lavrenov
d246b41573 changed loop condition 2012-12-17 15:50:01 +04:00
Ilya Lavrenov
c2f2e33a5e removed debug messages 2012-12-17 15:45:20 +04:00
Ilya Lavrenov
aa0dafcc1f replaced _mm_packs_epi32 to _mm_packus_epi32 2012-12-17 14:09:25 +04:00
Ilya Lavrenov
6059a6875a fixed bug with s1 calculating 2012-12-14 17:54:07 +04:00
Ilya Lavrenov
4ccb5a30d9 fixed bug with s1 calculating 2012-12-14 17:41:42 +04:00
Ilya Lavrenov
16f9b6f5e4 reproducing C++ version of resize area fast 2012-12-14 14:32:00 +04:00
Ilya Lavrenov
d1ca934115 sse2 version of resize area fast for types CV_(8, 16)UC(1, 3, 4) 2012-12-11 15:14:50 +04:00
Vadim Pisarevsky
fbe0d6963c disabled several tests on Mac when no FFMPEG is used; disabled automatic table initialization in imgwarp in the case of MinGW 2012-10-22 21:13:26 +04:00
Andrey Kamaev
9a97c74ef3 Merge pull request #61 from vpisarev/bug_2509 2012-10-19 11:17:25 +04:00
Andrey Kamaev
e1c3ffb23f Fix weight calculation for the last pixel in generic area resize.
Also removed assigned only variable.
2012-10-18 19:41:45 +04:00
Vadim Pisarevsky
80f9bd864f fixed bug #2429
[edit: cleaned whitespace]
2012-10-18 19:39:22 +04:00
Vadim Pisarevsky
c40718ab61 fixed bug #2059 2012-10-18 14:41:26 +04:00
OpenCV Buildbot
04384a71e4 Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
Vadim Pisarevsky
354a5f2686 added recommended number of stripes to parallel_for_, modified some of the functions to use larger stripes (for better performance) 2012-10-11 22:37:14 +04:00
Vadim Pisarevsky
b0ad424087 fixed several warnings from VS2010 2012-10-09 17:24:37 +04:00
Vadim Pisarevsky
a8c5e35619 some more fixes towards binary compatibility 2012-10-09 15:56:16 +04:00
Ilya Lavrenov
6a3d5a1355 reorganized the resize algorithm 2012-09-24 17:07:08 +04:00
Ilya Lavrenov
33983bcbb7 edited misprint 2012-09-24 14:18:54 +04:00
Ilya Lavrenov
9c89947433 edited misprint 2012-09-24 13:46:09 +04:00
Ilya Lavrenov
2627c91c5e added platform specific definitions in resize algorithm 2012-09-24 12:57:39 +04:00
Ilya Lavrenov
bb589a590e debug 2012-09-24 11:35:46 +04:00
Ilya Lavrenov
b7b32e74a5 some restructuring of resize algorithm code 2012-09-21 18:17:54 +04:00
Ilya Lavrenov
222303f24b attempt 2012-09-21 17:25:42 +04:00
Ilya Lavrenov
fffd263ce4 attempt 2012-09-17 19:39:49 +04:00
Ilya Lavrenov
f58c5646b0 fixed wrong condition with interpolation types 2012-09-17 18:30:55 +04:00
Vadim Pisarevsky
dea52eb730 fixed 4-channel resizeAreaFast x2 decimation case 2012-09-04 14:51:31 +04:00
Vadim Pisarevsky
014106783d fixed building BRISK on Windows 2012-08-30 17:32:47 +04:00
Anatoly Baksheev
70204a8e68 Removed PtrElemStep, Marked DevMem1D as deprecated, now should use PtrStepSz now 2012-08-24 02:02:42 +04:00
Ilya Lavrenov
92795ba476 parallel version of remap, resize, warpaffine, warpPerspective. Some optimization for 2x decimation in resize algorithm 2012-08-22 11:49:21 +04:00
Vadim Pisarevsky
793e8b546d fixed build on Ubuntu 2012-08-21 23:11:49 +04:00
Vadim Pisarevsky
64661ea9cd added SSE2-optimized resizeAreaFast for 8-bit images by Grigoriy Frolov 2012-08-21 23:00:50 +04:00
Andrey Kamaev
bd394012e8 Eliminated discrepancy between SSE and non-SSE versions of bilinear resize 2012-07-03 11:30:17 +00:00
Andrey Kamaev
913d4541a5 Reduced some tegra stubs 2012-06-14 14:09:04 +00:00
Andrey Kamaev
c5aba337e9 Fixed number of warnings. Fixed mingw64 build. 2012-06-12 14:46:12 +00:00
Andrey Kamaev
f2d3b9b4a1 Warning fixes continued 2012-06-09 15:00:04 +00:00
Marina Kolpakova
9aa3f754b7 fixed accuracy test 2012-06-06 15:29:24 +00:00
Marina Kolpakova
aa8fbc26da fix for down rounded output sizes 2012-06-06 13:25:36 +00:00
Marina Kolpakova
8231d0d11d fixed for resize with INTER AREA. Since now we divide by convolved area 2012-06-06 12:12:21 +00:00
Marina Kolpakova
d192117e86 GPU resize with INTER_AREA 2012-06-06 10:39:42 +00:00
Marina Kolpakova
3c16c9c92d fixed #2019 2012-06-05 10:58:53 +00:00
Marina Kolpakova
6d498495d3 tegra integration 2012-05-30 15:56:53 +00:00
Vadim Pisarevsky
2fd1e2ea57 merged all the latest changes from 2.4 to trunk 2012-04-13 21:50:59 +00:00
Vadim Pisarevsky
22a0d6b7d1 possible fix for #1396 2012-03-30 13:51:15 +00:00
Vadim Pisarevsky
098fc1a62e fixed nearest-neighbor remap with constant border, ticket #1681 (thanks to Vlad for the patch) 2012-03-26 09:12:27 +00:00
Victoria Zhislina
0630e7010e CV_USE_UNROLLED for imgproc 2012-02-21 11:31:23 +00:00
Andrey Pavlenko
07d157591a Tegra optimization for warpPerspective() and 2 new perf tests 2012-01-11 14:18:10 +00:00
Andrey Pavlenko
185680c7c5 Tegra optimization for some color conversion and warpAffine calls 2012-01-06 16:31:23 +00:00
Andrey Kamaev
c1277b6147 reenabled Tegra optimized resize 2011-10-11 15:00:00 +00:00
Leonid Beynenson
3c9979cd6a Disabled some unfinished optimizations. 2011-09-29 08:51:03 +00:00
Kirill Kornyakov
b0535e0456 Neon Optimized Resize added 2011-09-07 15:06:51 +00:00
Vadim Pisarevsky
1badec0b2d eliminated opencv_extra_api.hpp (all the functionality is moved to the regular OpenCV headers) 2011-07-18 16:31:30 +00:00
Kirill Kornyakov
b138dbde3f bugfix in warpAffine, correct buffer size should be used 2011-06-16 06:08:27 +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
922fc58201 added CV_64F support to cv::remap (ticket #650) 2011-06-03 17:06:08 +00:00
Vadim Pisarevsky
6be2a79fb9 fixed incorrect output of resize(...scalex, scaley, INTER_NEAREST) when scalex and scaley are even integers (ticket #1013) 2011-06-03 13:25:44 +00:00
Vadim Pisarevsky
573c637ea5 fixed artifacts in warpPerspective (ticket #1024) 2011-05-03 17:28:17 +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
3dc7a67f59 fixed the fast branch of INTER_AREA resize (ticket #921) 2011-02-27 19:04:48 +00:00
Vadim Pisarevsky
cf0d9da643 added 64f support in cv::resize 2010-11-22 17:37:29 +00:00
Vadim Pisarevsky
8217b34f60 fixed transparent border handling one more time (tickets #572 & #575) 2010-11-12 14:40:29 +00:00
Vadim Pisarevsky
e15a2ea95a fixed remap with transparent border (ticket #582) 2010-11-10 21:14:57 +00:00
Vadim Pisarevsky
f78a3b4cc1 updated 3rd party libs: CLapack 3.1.1.1 => 3.2.1, zlib 1.2.3 => 1.2.5, libpng 1.2.x => 1.4.3, libtiff 3.7.x => 3.9.4. fixed many 64-bit related VS2010 warnings 2010-07-16 12:54:53 +00:00
Vadim Pisarevsky
127d6649a1 "atomic bomb" commit. Reorganized OpenCV directory structure 2010-05-11 17:44:00 +00:00