Commit Graph

506 Commits

Author SHA1 Message Date
Andrey Kamaev
f5cd20d80b Merge branch 2.4 2012-12-14 14:46:41 +04:00
Andrey Kamaev
817a4c0c30 Merge branch 2.4 into perf_verify_sanity 2012-12-12 20:14:25 +04:00
Andrey Kamaev
932204d197 Added thresholds to some sanity checks 2012-12-12 20:14:20 +04:00
Vadim Pisarevsky
eaeae4a1ba Merge pull request #184 from ilya-lavrenov:Demosaicing 2012-12-12 13:54:58 +04:00
Andrey Kamaev
67ce03d7dd Merge branch 2.4 2012-12-10 23:51:34 +04:00
Kirill Kornyakov
cdbbfc98e1 Ugly hack to make HoughLines sanity check pass on Wun32 2012-12-10 18:16:15 +04:00
Ilya Lavrenov
615e7b2747 added SIMD optimization of Edge-Aware Demosaicing in case of CV_8U 2012-12-10 13:29:08 +04:00
Ilya Lavrenov
07744ccf3d removed imshow call 2012-12-03 12:30:19 +04:00
Andrey Kamaev
e10ee89ec4 Merge branch 2.4 2012-11-30 19:54:24 +04:00
Ilya Lavrenov
c09a325d3e fixed error connected with incorrect range 2012-11-30 13:26:40 +04:00
Ilya Lavrenov
98031a4147 removed const modificators 2012-11-30 12:31:33 +04:00
Alexander Smorkalov
f6ff2b87fa Some perf tests on warping and resize disabled on Android
MatInfo_Size_Size.resizeDownLinear
MatInfo_Size_Size.resizeUpLinear
TestWarpPerspectiveNear_t.WarpPerspectiveNear
TestWarpPerspective.WarpPerspective
2012-11-29 18:21:22 +04:00
Anna Kogan
8877066846 increased time-limits 2012-11-28 18:17:33 +04:00
Ilya Lavrenov
b8b13ccd5c parallel version of Bayer2Gray 2012-11-27 15:27:58 +04:00
Ilya Lavrenov
ce5e9a71b5 fixed some warnings on Windows and added debug messages 2012-11-27 13:54:11 +04:00
Ilya Lavrenov
4116cbe2c0 Merge remote-tracking branch 'upstream/master' into Demosaicing 2012-11-27 12:46:49 +04:00
Andrey Pavlenko
c36dcbcada Increase accuracy interval for image filters on Android and other platforms when sensible 2012-11-26 22:29:05 +04:00
Ilya Lavrenov
3fa630639f fixed bayer2bgra in case when size.width <= 2 2012-11-26 19:45:56 +04:00
Ilya Lavrenov
5225672dc0 added edge-aware demosaicing and bayer to bgra conversion 2012-11-26 16:17:43 +04:00
Andrey Kamaev
9719ea93b6 Merge branch 2.4 2012-11-13 19:54:48 +04:00
Andrey Kamaev
a126532cb7 Fix OS X build warnings 2012-11-09 11:29:52 +04:00
Andrey Kamaev
4d059e9e5b Merge release 2.4.3 2012-11-02 17:58:02 +04:00
Andrey Kamaev
63ee26adda Merge pull request #127 from cuda-geek/apple2clang 2012-11-02 14:29:39 +04:00
marina.kolpakova
7a5b9a6b7f replase __APPLE__ marco with __clang__ 2012-11-01 19:34:05 +04:00
Andrey Kamaev
e3be5f138a Fixed sanity checks in several performance tests 2012-11-01 16:29:30 +04:00
Andrey Kamaev
b5ecb1d32d Merge pull request #111 from taka-no-me/algorithm/addParam-short 2012-10-31 16:57:06 +04:00
Andrey Kamaev
fcad269e53 Specify sanity threshold for WarpPerspective perf test 2012-10-26 17:00:31 +04:00
Andrey Kamaev
2b0072d823 Suppress more warnings in gtest on OS X 2012-10-24 20:36:30 +04:00
Andrey Kamaev
673aa91bac Fix remaining windows build warnings 2012-10-24 20:27:20 +04:00
Andrey Kamaev
6211f156e6 Merge 2.4.3-rc 2012-10-24 19:56:27 +04:00
Andrey Pavlenko
a94e80bea3 fixing typos in perf tests for warp funcs 2012-10-24 11:21:58 +04:00
Andrey Kamaev
8dbde3297e Merge branch '2.4' 2012-10-23 20:32:19 +04:00
Andrey Kamaev
afc79e2a02 Fix warnings from MSVC 9 64-bit 2012-10-23 18:20:07 +04:00
Daniil Osokin
e9ba5c225d extended perf test warpPerspectiveLarge 2012-10-23 16:06:03 +04:00
Andrey Kamaev
22e352d9cc Merge pull request #76 vpisarev/test_fixes_1 2012-10-22 21:13:26 +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
40030d2ca0 Fix windows build warnings 2012-10-22 19:13:18 +04:00
Andrey Kamaev
546ec2af65 Merge pull request #54 from taka-no-me:doc/fix-signatures 2012-10-19 15:02:30 +04:00
Andrey Kamaev
5bc104cef5 Merge branch '2.4' 2012-10-19 15:00:05 +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
Andrey Kamaev
0e7ca71dcc Normalize whitespace in documentation and text files 2012-10-17 21:42:09 +04:00
Andrey Kamaev
461b69f6ee Eliminate discrepancies between signatures in documentation and OpenCV headers
All errors were found by doc/check_docs2.py
2012-10-17 21:24:55 +04:00
OpenCV Buildbot
81f826db2b Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00
OpenCV Buildbot
04384a71e4 Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
Andrey Kamaev
ed51162568 Fix binary compatibility of Java wrappers 2012-10-17 02:09:37 +04:00
Andrey Kamaev
0442bca235 Revert "partially recovered binary compatibility (ticket #2415)"
This reverts commit 94b97b7a63.
2012-10-16 19:37:12 +04:00
Andrey Kamaev
64b56d7018 Revert "remaining C-style planar subdivisions data structures are moved to legacy"
This reverts commit 4aaaef5967.

Conflicts:
    modules/imgproc/include/opencv2/imgproc/types_c.h
    modules/legacy/include/opencv2/legacy/legacy.hpp
2012-10-16 15:13:00 +04:00