86 Commits

Author SHA1 Message Date
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