Andy Maloney
bc68dfb4e8
Remove unused vars
2013-02-01 18:09:58 -05:00
Andrey Kamaev
61079547f0
Merge branch '2.4'
2013-02-01 14:59:40 +04:00
Anna Kogan
ed4c687d45
Increased time limits, eliminated extra params
2013-01-31 16:18:52 +04:00
Andrey Kamaev
57d3152cd0
Merge branch '2.4'
2013-01-31 14:35:27 +04:00
Ivan Korolev
9908ff33de
Added regression test for HoughLines algorithm
2013-01-30 11:27:19 +04:00
Andrey Kamaev
0734d9b877
Merge branch '2.4'
2013-01-29 14:16:07 +04:00
Daniil Osokin
4c9c27b244
Fixed formula of YCrCb to RGB conversion (bug #2725 )
2013-01-28 18:29:01 +04:00
Andrey Kamaev
f4e27bcbbc
Merge branch '2.4'
2013-01-25 16:30:36 +04:00
Vadim Pisarevsky
efd00238e2
fixed warnings; restored fixed_size parameter in AutoBuffer
2013-01-23 21:47:58 +04:00
Andrey Pavlenko
81721d0dce
enabling sanity checks for warp and resize functions on Android
...
- add syntetic images generation function to ts
- use generated syntetic images
2013-01-23 17:25:30 +04:00
Vadim Pisarevsky
dc4d0398f3
converted few more comp. geometry functions to C++
2013-01-22 16:54:31 +04:00
Vadim Pisarevsky
c2241dccc5
converted fitline to C++, fixed Mat::checkVector().
2013-01-21 01:07:47 +04:00
Vadim Pisarevsky
c197a46e7e
removed rarely used fixed_size parameter from AutoBuffer type, added optional AutoBuffer* but to cvarrToMat in order to speedup CvSeq->Mat conversion; finished conversion of convex hull and related functions to C++
2013-01-20 00:58:51 +04:00
Vadim Pisarevsky
457fa52111
convex hull converted to C++; other 2 functions in convhull.cpp are yet to be finished.
2013-01-19 00:26:01 +04:00
Vadim Pisarevsky
e3941d0965
refactored approxpoly
2013-01-17 00:11:08 +04:00
Andrey Kamaev
084b1c7969
Merge branch 2.4
2013-01-11 15:45:23 +04:00
Vadim Pisarevsky
b68df415a9
Merge pull request #135 from nevion:master
2013-01-10 16:43:45 +04:00
Andrey Kamaev
6131a847a2
Fix histogram calculation in equalizeHist
...
issue #2678
2013-01-10 14:48:31 +04:00
Vadim Pisarevsky
e383d39598
fixed bug #2679
2013-01-09 17:53:19 +04:00
Ilya Lavrenov
1bc76813f3
fixed bug connected with SSE2 version of resize with AREA interpolation
2012-12-31 15:35:40 +04:00
Kirill Kornyakov
5023afffc7
Removed hack from perf test on HoughLines, since I hope it is fixed by pr263
2012-12-26 10:33:02 +04:00
Andrey Kamaev
132b5d6435
Merge release 2.4.3.2
2012-12-25 19:07:08 +04:00
Andrey Kamaev
16687a2655
Explicitly use double precision sin & cos in hough implementation
...
On some platforms sin and cos are calculated in single precision resulting in
diversity of results.
2012-12-25 18:05:05 +04:00
Andrey Kamaev
962884cdec
Merge branch 2.4
2012-12-21 17:58:48 +04:00
Jason Newton
4cb25e9584
update documentation to latest connected components interface
2012-12-19 14:55:46 -08:00
Andrey Kamaev
b35fa6c4ff
Merge pull request #202 from Daniil-Osokin:calcHist
2012-12-19 15:07:40 +04:00
Andrey Kamaev
2c56a09bee
Merge pull request #226 from taka-no-me/equalizeHist
...
Fix equalization formula in equalizeHist function & rewrite in C++
2012-12-18 15:53:13 -08:00
Vadim Pisarevsky
31857082f4
probably fixed build problems on Android
2012-12-18 14:12:07 -08:00
Daniil Osokin
98d7d99244
Add threaded version of equalizeHist
2012-12-18 23:59:50 +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
743dce6a4b
Merge remote-tracking branch 'upstream/master' into SIMDFastAreaResize-2
2012-12-17 15:27:32 +04:00
Ilya Lavrenov
aa0dafcc1f
replaced _mm_packs_epi32 to _mm_packus_epi32
2012-12-17 14:09:25 +04:00
Daniil-Osokin
cd501d947c
perf tests for calcHist 2-3D case
2012-12-17 12:35:32 +04:00
Daniil-Osokin
7d94236c14
TBB version of calcHist
2012-12-17 11:01:31 +04:00
Jason Newton
e1b60aa4e3
drop usage of macros... the type is already there!
2012-12-16 22:44:36 -08:00
Jason Newton
5f86eb8d63
proper dimensions from cv::Size in output stats/centroid
2012-12-16 18:33:50 -08:00
Vadim Pisarevsky
1eae455acb
fixed build warnings from VS; hopefully, fixes Android build too
2012-12-15 23:14:50 +04:00
Vadim Pisarevsky
2a42960ff2
Merge branch 'master' of https://github.com/nevion/opencv into cc
2012-12-15 21:45:55 +04:00
Jason Newton
ad0bfdfb25
disable windows build warning for connectedcomponents template argument comparisons
2012-12-15 05:56:18 -08:00
Jason Newton
68e77ac051
use opencv's integer type convension
2012-12-15 04:25:55 -08:00
Andrey Kamaev
3de6846d12
Merge pull request #224 from wswld:2.4
2012-12-15 16:06:32 +04:00
Andrey Kamaev
0bbba847a4
Fix equalization formula in equalizeHist function & rewrite in C++
...
Old implementation did
lut[i] = 255 * (count(Y <= i)) / (width * height)
which actually shifts uniform histograms.
From now histogram is equalized as
C = count(Y == min(Y))
lut[i] = 255 * (count(Y <= i) - C) / (width * height - C)
2012-12-15 15:29:15 +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
Andrey Kamaev
f5cd20d80b
Merge branch 2.4
2012-12-14 14:46:41 +04:00
Ilya Lavrenov
16f9b6f5e4
reproducing C++ version of resize area fast
2012-12-14 14:32:00 +04:00
Vsevolod Glumov
3f417f1ec3
Fixes for issues #2570 , #2492 , #2559 , #2489 , #2592 .
2012-12-14 10:49:51 +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
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
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
Jason Newton
63debf5032
connectedcomponents test case
2012-12-10 02:21:45 -08:00
Ilya Lavrenov
615e7b2747
added SIMD optimization of Edge-Aware Demosaicing in case of CV_8U
2012-12-10 13:29:08 +04:00
Jason Newton
d094e4bdbe
drop support for 8bit output for size cost relative to utility
2012-12-08 23:09:17 -08:00
Jason Newton
e70b3ef598
use a ltype parameter to determine result Label image type; export stats with differening types over different outputarrays
2012-12-08 23:09:14 -08: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
Jason Newton
00bdca7684
A few changes to comply with upstream requirements for merge.
...
-Change input/output order from (out Labeled, in Image) -> (in Image, Out Labeled) and convert
to Input/OutputArrays in the process.
-Adopt OutputArray for statistics export so that the algorithm is "wrapper friendly" and not requiring a new struct in
language bindings at the expense of using doubles for everything and slowing statistics computation down..
2012-11-27 02:31:38 -08: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
Jason Newton
d5aa679d3f
adjust output type to return int32... it should at least be unsigned but this breaks python bindings;
...
remove non-8bit input type support, not worth the binary size
2012-11-22 21:26:52 -08: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
Jason Newton
85880397c4
connectedcomponents: use opencv integral types, add to docs, fix up things for a python export
2012-11-05 12:02:53 -08:00
Jason Newton
4c0cb2576d
connectedComponents: peep-hole optimizations, mostly surrouding the fact that cv::Mat::at is expensive in a tight-loop -also added a "blobstats" version
2012-11-05 08:10:35 -08:00
Jason Newton
45b4f4f32b
connectedComponents: warning free version
2012-11-05 08:10:29 -08: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