mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-30 06:10:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
9,537 Commits 6 Branches 126 Tags 3 GiB
f2fd0ad153
Commit Graph

745 Commits

Author SHA1 Message Date
Andrey Kamaev
02131ffb62 Merge pull request #828 from tim36272:patch-1 2013-04-17 22:30:39 +04:00
Andrey Kamaev
8fdab9f631 Merge branch '2.4' 2013-04-17 12:07:17 +04:00
tim36272
5ef3ef9c4a Clarified floodfill documentation 
Clarified what value floodfill sets pixels in the mask to when FOODFILL_MASK_ONLY is set.
 2013-04-17 00:34:20 -07:00
Andrey Kamaev
8f32902ce6 Minimize usages of legacy C API inside the library 2013-04-16 12:00:02 +04:00
Andrey Kamaev
96b008cd29 Eliminate the need of ::testsing::ValuesIn() for CV_ENUM 
Also cv::, cv::gpu:: and cv::ocl:: namespace prefixes can be safely omitted
inside CV_ENUM and CV_FLAGS
 2013-04-15 19:39:49 +04:00
Andrey Kamaev
8b294c6c90 Remove documentation for old python wrapper 2013-04-12 19:37:40 +04:00
Andrey Kamaev
e5a33723fc Move C API of opencv_calib3d to separate file 2013-04-11 21:00:17 +04:00
Andrey Kamaev
4846dcdfeb Move borderInterpolate and copyMakeBorder documentation 2013-04-10 19:14:25 +04:00
Andrey Kamaev
c98c246fc2 Move border type constants and Moments class to core module 2013-04-10 19:14:24 +04:00
Andrey Kamaev
befd696720 Update documentation 2013-04-08 15:47:29 +04:00
Andrey Kamaev
0738ea7d0f Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
Andrey Kamaev
288a0634c2 Make imgproc.hpp independent from C API 2013-04-08 15:47:28 +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
Andrey Kamaev
517062039e Make core/internal.hpp a private header 2013-04-01 17:29:10 +04:00
Andrey Kamaev
d62bc8cfbf Remove more old definitions from internal.hpp 2013-04-01 16:32:08 +04:00
Andrey Kamaev
3890a74565 Drop outdated definitions from internal.hpp 
This also fixes few clang build errors
 2013-04-01 15:24:35 +04:00
Andrey Kamaev
605382562d Fix stack corruption in cvConvexHull2 and heap corruption in OutputArray::create 2013-04-01 15:24:35 +04:00
Andrey Kamaev
2b1ef95415 Completely separate C and C++ API of OpenCV core 2013-04-01 15:24:34 +04:00
Andrey Kamaev
715fa3303e Move cv::Mat out of core.hpp 2013-04-01 15:24:34 +04:00
Andrey Kamaev
969a7133a9 Implementation of cv::Matx and cv::Vec is almost moved to matx.hpp 2013-04-01 15:24:33 +04:00
Andrey Kamaev
5e7ab8baf3 Move cv::Scalar_ to types.hpp 2013-04-01 15:24:33 +04:00
Andrey Kamaev
62adc01980 Move cv::Rect_ 2013-04-01 15:24:33 +04:00
Andrey Kamaev
13b31b0804 Move C++ basic structures to separate header and inverse dependency from C API 
cv::Complex, cv::Point_ and cv::Point3_ are moved.
 2013-04-01 15:24:32 +04:00
Andrey Kamaev
db45e04d58 Merge pull request #720 from taka-no-me:drop_sort 2013-04-01 15:14:45 +04:00
Vladislav Vinogradov
5a4fa4607b fixed misprint in imgwarp.cpp 2013-04-01 11:26:49 +04:00
Andrey Kamaev
f77a375354 Merge branch '2.4' 2013-03-29 19:38:35 +04:00
Andrey Kamaev
cc6bdfb045 Remove inline sorting algorithms from core headers 2013-03-28 17:22:50 +04:00
Vladislav Vinogradov
5810a73d30 CPU implementation of CLAHE 2013-03-25 17:44:31 +04:00
Andrey Kamaev
1ca8f33b4e Merge branch '2.4' 2013-03-21 23:11:54 +04:00
Andrey Kamaev
89356ff16d Move non-CV functionality from core.hpp to separate utility.hpp header 2013-03-20 17:56:06 +04:00
Daniil Osokin
e153f0631c Added missing enums for cvtColor RGB to YUV420p 2013-03-18 10:33:44 +04:00
Andrey Kamaev
e75df56317 Unified handling of InputOutputArrays in Python wrapper generator 
This makes arguments of type InputOutputArray required in python unless they
have a default value in C++.

As result following python functions changes signatures in non-trivial way:

* calcOpticalFlowFarneback
* calcOpticalFlowPyrLK
* calibrateCamera
* findContours
* findTransformECC
* floodFill
* kmeans
* PCACompute
* stereoCalibrate

And the following functions become return their modified inputs as a return
value:

* accumulate
* accumulateProduct
* accumulateSquare
* accumulateWeighted
* circle
* completeSymm
* cornerSubPix
* drawChessboardCorners
* drawContours
* drawDataMatrixCodes
* ellipse
* fillConvexPoly
* fillPoly
* filterSpeckles
* grabCut
* insertChannel
* line
* patchNaNs
* polylines
* randn
* randShuffle
* randu
* rectangle
* setIdentity
* updateMotionHistory
* validateDisparity
* watershed
 2013-03-15 17:44:49 +04:00
Andrey Kamaev
a1c456b7c3 Extract common base header for C and C++ APIs 2013-03-15 10:38:38 +04:00
Andrey Kamaev
d9cd753835 Merge pull request #645 from taka-no-me:bump_headers 2013-03-14 11:42:23 +04:00
Andrey Kamaev
a42a0f5fca Added compatibility headers 2013-03-13 17:26:56 +04:00
Andrey Kamaev
ad5cddc007 Main module headers are moved 1 level up 
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>

Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
 2013-03-13 17:26:56 +04:00
Andrey Kamaev
7e50d3e571 Fixed MSVC warnings 2013-03-13 11:34:04 +04:00
Andrey Kamaev
9b7dfd677d Merge branch '2.4' 2013-03-11 18:50:19 +04:00
Andrey Kamaev
bbac4bc4cf Merge pull request #491 from Daniil-Osokin:cvtRGB2YUV420p 2013-03-05 15:26:16 +04:00
Andrey Kamaev
d620ef0d55 Merge pull request #577 from ilya-lavrenov:BilateralFilter 2013-02-27 19:44:56 +04:00
Andrey Kamaev
7b79eaf5be Merge pull request #511 from aritzlc:master 2013-02-27 19:33:01 +04:00
Ilya Lavrenov
3eed5d8c72 additional improvements for 32f 2013-02-27 17:54:22 +04:00
Ilya Lavrenov
efad6942e2 some improvements of existing sse3 optimization of bilateral filter in case of 8uc3. Now perf tests take 6120ms instead of previous 7250ms (1.18x speed-up) 2013-02-27 16:53:09 +04:00
Andrey Kamaev
242a6de719 Merge pull request #566 from FabricioS:master 2013-02-27 11:37:31 +04:00
Fabrice Silva
eca114ae95 Fix definition of the covariance matrix of derivatives. 2013-02-26 18:50:20 +01:00
Daniil Osokin
cf5e272878 Added multithreaded implementation for RGB to YUV420p color conversion 2013-02-25 17:01:07 +04:00
Daniil Osokin
d8f538d67b Added tests for RGB to YUV420p color conversion 2013-02-25 17:01:07 +04:00
Andrey Kamaev
d586f4a103 Fix x64 build warnings 2013-02-25 15:04:19 +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
Daniil Osokin
7255ede3af Added implementation for RGB to YUV420p color conversion 2013-02-24 23:07:05 +04:00
Andrey Kamaev
0b8a6da817 Merge branch '2.4' 2013-02-22 17:33:30 +04:00
alegarda
62655b05f4 Indentation ok 2013-02-21 15:25:22 +01:00
alegarda
8a2b50dca6 Fixed undistort.cpp 2013-02-21 10:00:28 +01:00
alegarda
76d03fccb9 Added Thin Prism Distortion Model 
Only the code.
 2013-02-20 15:11:47 +01:00
Anna Kogan
f6e0d327b0 Increased time limits 2013-02-20 17:34:00 +04:00
Anna Kogan
a567c03fdf Switched to TEST_CYCLE_MULTIRUN for fast tests 2013-02-20 17:05:54 +04:00
Andrey Kamaev
262fc929aa Merge branch '2.4' 2013-02-18 15:35:42 +04:00
Andrey Kamaev
4cc3dfe27c Merge pull request #482 from vpisarev:c2cpp_imgproc_part2 2013-02-14 20:13:45 +04:00
Vadim Pisarevsky
3c25ddd9ff restored 8u->32f cvGetQuadrangleSubPix() mode (need better test for it) 2013-02-14 18:14:55 +04:00
Vadim Pisarevsky
78402bf596 made several minor fixes as pointed out by Andrey 2013-02-14 15:36:20 +04:00
Amro
42a2cb0a38 add description of ddepth param of cv::boxFilter 
bug #2709
 2013-02-13 15:16:17 +03:00
Vadim Pisarevsky
77d647b675 2 more warnings on Windows fixed 2013-02-13 02:32:10 +04:00
Vadim Pisarevsky
bd063e47d7 fixed the remaining warning in houghlines 2013-02-13 01:47:17 +04:00
Vadim Pisarevsky
8f33e80515 fixed bug in the new version of cornerSubPix 2013-02-13 01:46:02 +04:00
Vadim Pisarevsky
16d825adbc fixed compile warnings and opencv_perf_imgproc failures 2013-02-13 01:23:57 +04:00
Vadim Pisarevsky
944588e732 converted houghlines to C++ 2013-02-12 23:16:06 +04:00
Vadim Pisarevsky
7f8c925319 finished distance transform; fixed warnings 2013-02-12 21:35:37 +04:00
Vadim Pisarevsky
05ea571b08 almost finished distance transform conversion (discrete voronoi diagram mode is not ready yet) 2013-02-12 18:56:22 +04:00
Vadim Pisarevsky
9124a76ae7 converted moments function to C++ 2013-02-12 18:07:22 +04:00
Vadim Pisarevsky
59a5ba8938 converted watershed + pyrmeanshiftfilter to C++ 2013-02-12 17:08:42 +04:00
Andrey Kamaev
b44b920997 Merge branch '2.4' 2013-02-12 16:30:18 +04:00
Vadim Pisarevsky
06f4a56469 converted flood fill, getrectsubpix & cornersubpix to C++ 2013-02-11 23:49:10 +04:00
Vadim Pisarevsky
43d61d961e fixed problem with Nx2 numpy arrays in geometrical functions (#2783) 2013-02-08 18:11:56 +04:00
Andrey Kamaev
afe85e7e51 Fix some warnings from -O0 build 2013-02-06 20:57:36 +04:00
Andrey Kamaev
53e77ed468 Merge pull request #431 from snosov1:matchTemplate-tegra 2013-02-05 14:50:15 +04:00
Andrey Kamaev
c527340cb6 Merge branch 2.4 2013-02-04 17:15:55 +04:00
Sergei Nosov
c0e3d48ebc stricter eps for normed methods 2013-02-04 16:02:01 +04:00
Sergei Nosov
15d0484485 matchTemplate perf tests added 2013-02-04 12:57:22 +04:00
Sergei Nosov
c768731e89 enable Tegra optimizations 2013-02-04 12:57:03 +04:00
Andrey Kamaev
2a669555de Merge pull request #414 from asmaloney:remove-unused-vars2 2013-02-02 14:34:47 +04:00
Andy Maloney
3154cdf8ac Fix subtle bug when src & dst agree on sparsity but have different dimensions 
Remove unused var "total"
Declare vars as locally as possible
 2013-02-01 22:57:22 -05:00
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