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
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
Andrey Kamaev
58f31819cc
Return drawContours back to imgproc
...
This partly reverts commit 6ca618277c
.
2012-10-15 18:12:33 +04:00
Vadim Pisarevsky
78a0b9787c
fixed build errors on Mac; moved test for #2332 from imgproc to highgui
2012-10-15 13:55:32 +04:00
Ilya Lavrenov
2cda65a782
fixed cvtColor (RGB <-> Lab) tests and created another one
2012-10-15 12:22:36 +04:00
Ilya Lavrenov
5f9aedbe01
fixed bug in cvtColor RGB(BGR) <-> Lab conversion
2012-10-15 12:21:16 +04:00
Evgeny Talanin
cfe28e3b73
Added test inspired by #2332
2012-10-12 18:43:00 +04:00
Kirill Kornyakov
e770691522
deleted wrong line
2012-10-12 17:31:26 +04:00
Kirill Kornyakov
de98da42f7
commented wrong line
2012-10-12 17:30:23 +04:00
Kirill Kornyakov
84176fa027
Added perf test for warpPerpsective with large resolutions
2012-10-12 17:14:23 +04:00
Vadim Pisarevsky
5474b4d4bc
finally, a proper fix for VNG (both SSE2 and C version)
2012-10-12 16:28:26 +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
Andrey Kamaev
dc4a649513
Fix OS X build
2012-10-11 15:36:47 +04:00
Andrey Kamaev
be98693aaf
Enable parallel CvtColorLoop for all platforms
2012-10-11 15:05:43 +04:00
Andrey Kamaev
df94591336
Fix instability of Luv/Lab color conversions
2012-10-11 15:05:43 +04:00
Daniil Osokin
e435674a90
added perf test for gabor filter
2012-10-11 14:52:35 +04:00
Daniil Osokin
f1e025dc68
delete normalization in gabor kernel #1995
2012-10-11 14:40:15 +04:00
Evgeny Talanin
8528b0abcd
#1941 fix
2012-10-11 13:45:21 +04:00
Vadim Pisarevsky
e625d86485
added C= support; modified threading logic in threshold
2012-10-10 15:36:32 +04:00
Vadim Pisarevsky
044d38a051
expanded cv::threshold parallelization to other threading frameworks; fixed potential bug with unprocessed bottom of the image; fixed build problem in stitching
2012-10-09 22:38:04 +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
Evgeny Talanin
7c71c8fa52
#2258 fix
2012-10-09 14:52:47 +04:00
Andrey Kamaev
13bfcd643e
Fix sanity checks in improc perf tests
2012-10-08 21:37:58 +04:00
Vadim Pisarevsky
94b97b7a63
partially recovered binary compatibility (ticket #2415 )
2012-10-08 17:06:05 +04:00
Andrey Kamaev
c0f2a8e0cc
Fix build without SSE
2012-10-08 16:08:16 +04:00
Vadim Pisarevsky
925d0cc769
added test for box filter 16u, fixed bug #2416
2012-10-08 14:11:39 +04:00
Ilya Lavrenov
280ecb68bf
changed file path
2012-10-08 13:27:28 +04:00
Ilya Lavrenov
2759f026e9
fixed Bug #2074
2012-10-08 12:59:15 +04:00
Ilya Lavrenov
a703df5456
parallel cvtColor for MSVS and Apple
2012-10-05 13:11:24 +04:00
Vadim Pisarevsky
06a13d9ba0
replaced jpegs with png's. Accuracy tests pass; performance tests were not tried yet
2012-10-02 23:07:46 +04:00
Ilya Lavrenov
c560a78c65
stable cvtColor
2012-10-01 18:52:27 +04:00
Ilya Lavrenov
45593030ab
fixed TestRemap_Remap
2012-10-01 17:29:56 +04:00
Vadim Pisarevsky
57d9699058
added the note about 1-pixel border in findContours (relates to ticket #2362 )
2012-10-01 16:43:07 +04:00
Ilya Lavrenov
9ee87bd04b
added parallel version of CvtColorLoop - main inner function of cvtColor
2012-09-28 17:42:48 +04:00
Ilya Lavrenov
b8c185de9f
changed map indexes in test_remap
2012-09-24 20:36:25 +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
Anatoly Baksheev
3b075a50e9
fixed warnings under windows
2012-09-21 13:41:56 +04:00
Vadim Pisarevsky
d2613dd9f6
added patches by Bram Bolder
2012-09-18 14:11:08 +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
Ilya Lavrenov
5ab3fe489f
changed resize_area test
2012-09-17 17:38:23 +04:00
Ilya Lavrenov
a65cb5d2de
added extra debug parameters in resize test
2012-09-17 17:08:06 +04:00
Ilya Lavrenov
03daf44848
added recalculating scale coefficients
2012-09-17 16:31:30 +04:00
Andrey Kamaev
e73089bdb5
Fix windows build warnings
2012-09-17 13:30:28 +04:00
Vladislav Vinogradov
538847e8a3
fixed compilation under VS2012 (Bug #2352 , #2355 )
2012-09-14 09:34:56 +04:00
Vladislav Vinogradov
e975259c06
several fixes in gpu module
...
fixed iterations>1 case in morphological operations
fixed possible access violation in HSV2RGB
fixed the case learningRate==0 in BackgroundSubtractorMOG2
2012-09-11 15:00:59 +04:00
Vadim Pisarevsky
9956c42804
fixed iterations>1 case in morphological operations (bug #2348 ; thanks to Andrei Zaharescu for the fix)
2012-09-11 14:49:56 +04:00
Vadim Pisarevsky
9ea5b6bb44
fixed possible access violation in HSV2RGB (patch #2020 )
2012-09-11 14:25:34 +04:00
Vadim Pisarevsky
b3408a9b3a
fixed bug #2186 (thanks to Joao Soares for the patch)
2012-09-11 13:56:25 +04:00
Ilya Lavrenov
fbd9bfba47
fixed some warnings and errors on windows
2012-09-10 21:37:44 +04:00
Andrey Kamaev
b1b5e392e6
Fix Android build warnings in new imgproc tests
2012-09-10 20:33:35 +04:00
Ilya Lavrenov
dd1091bbe1
a reference function for remap was stabilized
2012-09-10 19:55:03 +04:00