Commit Graph

3283 Commits

Author SHA1 Message Date
Vladislav Vinogradov
5c19c6cb67 Merged revision(s) 8664 from trunk:
new implementation of gpu::PyrLKOpticalFlow::dense (1.5 - 2x faster)
........
2012-06-27 09:58:33 +00:00
Andrey Kamaev
f666bd221f Merged the trunk r8595:8668 (except iOS and new gpu functionality) 2012-06-15 13:21:26 +00:00
Andrey Kamaev
bd0e0b5800 Merged the trunk r8589:8653 - all changes related to build warnings 2012-06-15 13:04:17 +00:00
Andrey Kamaev
73c152abc4 Merged the trunk r8575:8583 (INTER_AREA interpolation for GPU resize) 2012-06-15 08:52:08 +00:00
Andrey Kamaev
ab20da0f53 Merged the trunk r8547:8574, r8587 2012-06-15 08:36:35 +00:00
Marina Kolpakova
4b1724aeb9 fix for ORB tests 2012-06-01 15:12:10 +00:00
Andrey Kamaev
059b79f7c2 Merged the trunk r8542:8544 2012-06-01 10:59:27 +00:00
Andrey Kamaev
8159ea3386 Merged the trunk r8537 (fixed pdf documentation build) 2012-06-01 08:46:54 +00:00
Philipp Wagner
0bd287a8f2 Fixed reconstruction, so that the mean is correctly added to the reconstructed image. 2012-05-31 20:27:46 +00:00
Andrey Kamaev
2ee917c646 Version of 2.4 branch is adjusted to 2.4.1 2012-05-31 11:26:23 +00:00
Andrey Kamaev
ca0962c738 Megred fix for pyrhon API generator regression r8528 2012-05-31 11:12:12 +00:00
Andrey Kamaev
daad7900e2 Merged the trunk r8517:8524 2012-05-31 10:53:28 +00:00
Andrey Kamaev
9ad470ba5c backported API for storing OpenCV data structures to text string and reading them back (r8481, r8516, r8518, r8522) 2012-05-31 10:25:29 +00:00
Vladislav Vinogradov
4e4b96e3d9 Merged revision(s) 8484 from trunk:
fixed some bugs in gpu module under Windows:
* convertTo alignment error
........
2012-05-30 17:06:39 +00:00
Andrey Kamaev
4ddcc31edc Fixed few errors in documentation backporting 2012-05-30 11:20:55 +00:00
Andrey Kamaev
81a5988015 Merged the trunk r8467:8507 (inclusive) (big bunch of documentation fixes) 2012-05-30 11:13:07 +00:00
Andrey Kamaev
052d2dc23a Merged the trunk r8459:8466 (inclusive) 2012-05-30 09:00:32 +00:00
Andrey Kamaev
949c4edf41 Merged the trunk r8408:8457 (inclusive) 2012-05-30 08:47:34 +00:00
Andrey Kamaev
7b5a45eac4 Merged the trunk r8384:8407 (inclusive) 2012-05-30 08:04:37 +00:00
Vladislav Vinogradov
72d2311edf Merged revision(s) 8495 from trunk:
Bug #1991 : fixed gpu interpolation (remap, resize, warp...)
........
2012-05-29 11:35:30 +00:00
Vladislav Vinogradov
d382fa56c7 Merged revision(s) 8474 from trunk:
fixed several problems with CUDA 5.0
* gpu::LUT, uses device memory instead of host memory
* gpu::multiply, round mod for CV_8U depth
........
2012-05-28 14:04:39 +00:00
Marina Kolpakova
00117d2a6e warp Affine tegra integration 2012-05-28 08:53:03 +00:00
Anatoly Baksheev
4ce8de5174 Merged revision(s) 8455 from trunk/opencv/modules/gpu/src:
compilation with CUDA5.0 (#1982, thanks to Rodrigo)
........
2012-05-25 09:45:42 +00:00
Andrey Kamaev
e1c4fd9e1f Merged the trunk r8345:8376 2012-05-18 13:18:37 +00:00
Andrey Kamaev
70166820ea Merged the trunk r8324:8345 2012-05-18 12:59:40 +00:00
Andrey Kamaev
aebed446b1 Partly merged the trunk r8322 2012-05-18 12:46:44 +00:00
Andrey Kamaev
c3577a288b Merged the trunk r8291:8321 2012-05-18 12:34:01 +00:00
Andrey Kamaev
50ad690993 Merged the trunk till r8291 2012-05-18 12:18:17 +00:00
Anatoly Baksheev
caddd398e6 Merged revision(s) 8368 from trunk/opencv/modules/gpu/src/imgproc.cpp:
fixed possible compilation error for macos
........
2012-05-17 15:00:36 +00:00
Anatoly Baksheev
01e93d57f0 Merged from trunk. 2012-05-05 09:25:37 +00:00
Anatoly Baksheev
70f74b70b7 fixed GPU compilation 2012-05-04 11:07:36 +00:00
Vadim Pisarevsky
3f5d722f34 fixed typo in mulSpectrums description (ticket #1868) 2012-05-03 15:14:53 +00:00
Anatoly Baksheev
ab4025f8de fixed for Kepler 2012-05-03 10:23:23 +00:00
Marina Kolpakova
ea3fe441df fix for brute-force matcher with CUDA 4.2. 2012-04-30 19:06:37 +00:00
Vadim Pisarevsky
2c88791600 get back to single-version ffmpeg wrapper (no more v2); make sure the library builds and the tests pass on Ubuntu 10.04 that includes pretty old version of ffmpeg 2012-04-30 12:39:22 +00:00
Vadim Pisarevsky
09ca294a76 avoid simultanous reading data from 2 videos Highgui_Video.regression, since earlier versions of ffmpeg (or the way our wrapper uses them) can not handle that properly 2012-04-30 12:07:04 +00:00
Vadim Pisarevsky
5e2df0d6b0 some more fixes in ffmpeg wrapper; now it handles big videos better. 2012-04-28 22:49:13 +00:00
Vadim Pisarevsky
7a3b351357 added documentation for ORB (ticket #1835). updated documentation on features2d (Feature2D class is still to be documented) (ticket #1819) 2012-04-28 17:32:02 +00:00
Vadim Pisarevsky
8bab09de07 temporary reverted av_free_packet() patch. 2012-04-28 16:18:39 +00:00
Alexander Shishkov
78ef76165e moved part of f2d docs to the legacy module 2012-04-28 15:13:59 +00:00
Vadim Pisarevsky
c9dacaa254 added description of Algorithm class (ticket #1818) 2012-04-28 14:59:30 +00:00
Vladislav Vinogradov
1566f85386 fixed PyrLKOpticalFlow.dense (final result size) 2012-04-28 13:18:05 +00:00
Vadim Pisarevsky
bffd77ed87 moved planar subdiv docs to legacy; added Input/OutputArray docs to core 2012-04-28 12:59:21 +00:00
Alexander Shishkov
ab15b5954e fixed #1824 2012-04-28 12:48:23 +00:00
Andrey Pavlenko
c3129190fc Java API: minor fix in javadoc 2012-04-28 12:46:50 +00:00
Andrey Kamaev
50009e1546 Improved javadoc generation scripts 2012-04-28 12:31:53 +00:00
Alexey Spizhevoy
6a9f934233 Fixed bug #1759 2012-04-28 11:45:29 +00:00
Vadim Pisarevsky
40d8d11f45 fixed RGBD capture with Asus Xtion (by Gary Bradski) 2012-04-28 11:33:01 +00:00
Vadim Pisarevsky
682f31a013 fixed 3-channel output tvecs support in calibrateCamera (patch #1807) 2012-04-28 11:10:30 +00:00
Vadim Pisarevsky
53104e6f43 decreased the number of tests in Core_Eigen, decreased the maximum matrix size in Core_SVD; now those tests take less time to complete 2012-04-28 11:00:34 +00:00
Andrey Pavlenko
4a6346961f Java API: updating OpenCV version, minor Core API improvements, enabling EM. 2012-04-28 09:27:05 +00:00
Vladislav Vinogradov
9e868272e9 reverted r8003 (CascadeClassifier_GPU didn't work) 2012-04-28 08:56:17 +00:00
Alexander Smorkalov
c1c1a376a1 bad changes reverted. 2012-04-28 05:25:31 +00:00
Alexander Smorkalov
a9d9eb1ab6 Loader classes for OpenCV with Android service added. Library loading in OpenCV API removed. 2012-04-28 05:14:24 +00:00
Alexander Reshetnikov
689c1814a5 Fixed VideoCapture memory leak (bug #1481) 2012-04-27 19:23:26 +00:00
Andrey Kamaev
95e657714f Minor improvements: reduced verbosity of positioning tests; run.py - filter out non-executables on windows 2012-04-27 19:13:58 +00:00
Vadim Pisarevsky
1a9758c0a2 fixed Linemod's Detector write method (removed nested sequence delimiters) 2012-04-27 18:09:57 +00:00
Vadim Pisarevsky
9b382d07f6 modified data matrix detection interface (that does not use any new data structures). Added Python sample for data matrix detection. Ticket #1664 2012-04-27 16:10:10 +00:00
Andrey Pavlenko
3a922a535c adding one more assertion to a Java test 2012-04-27 14:41:28 +00:00
Vadim Pisarevsky
7ac713405f put template Distance classes back to features2d, since they are used in GPU; fixed OpenCV build with Xcode 2.3 (which includes new libpng) 2012-04-27 14:11:44 +00:00
Alexander Shishkov
da0080dd15 fixed #1855 2012-04-27 14:08:10 +00:00
Alexander Shishkov
a07724aea2 fixed #1841 2012-04-27 13:37:48 +00:00
Vadim Pisarevsky
c78d056ef6 added BruteForceMatcher (the older variant of BFMatcher) to legacy (ticket #1796). added test for it. Renamed legacy tests to "Legacy_*" 2012-04-27 13:06:16 +00:00
Vadim Pisarevsky
d60caea559 added test to check #1737 2012-04-27 12:07:56 +00:00
Andrey Kamaev
2a39128268 Updated latentSVM tests and data 2012-04-27 11:32:40 +00:00
Andrey Kamaev
f14d80ab44 Minor documentation fix 2012-04-27 08:58:29 +00:00
Andrey Kamaev
33134ecb87 Increased test threshold for arm 2012-04-27 08:28:40 +00:00
Andrey Kamaev
09140c2fc6 Reenabled OpponentSIFT test;
Changed compiler flags for 32-bit MSVC;
Fixed handling of "d" suffix of debug binaries in run.py.
2012-04-26 21:37:27 +00:00
Vadim Pisarevsky
f87c2e49db added version number to opencv_ffmpeg dlls (it's added only when dll copied to the bin directory); it resolves #1827 2012-04-26 13:32:27 +00:00
Andrey Kamaev
b93d3d7a55 Fixed build warnings 2012-04-26 11:58:06 +00:00
Alexander Smorkalov
5c6de77fc8 Bug #1822 Native camera does not work on Samsung Galaxy SII with Android ICS 4.0.3 was fixed. All binary libs were rebuilt. 2012-04-26 11:38:07 +00:00
Andrey Kamaev
f208535bb6 run.py: Automatically enable color output in android tests (posix shell only) 2012-04-26 11:05:36 +00:00
Vadim Pisarevsky
fcbfc030ef avoid use of "AVFrame::best_effort_timestamp" 2012-04-26 07:38:35 +00:00
Vadim Pisarevsky
bc3c49518d ok, now positioning seem to work well, at least with ffmpeg 0.10.2 on MacOSX 10.7 2012-04-26 07:07:37 +00:00
Vadim Pisarevsky
c9e6efc263 propagated changes for retina filters from trunk to 2.4 2012-04-25 17:32:14 +00:00
Andrey Kamaev
db3f9b139b Fixed SURF behavior - from now it always returns keypoints in the same order 2012-04-25 16:03:01 +00:00
Vadim Pisarevsky
562e404224 fixed HighguiFramecount.regression test (and renamed it to Highgui_Video.framecount) 2012-04-25 14:48:15 +00:00
Vadim Pisarevsky
fb292b1b27 added PSNR function to imgproc; refactored highgui positioning test (which still fails) 2012-04-25 14:31:54 +00:00
Vadim Pisarevsky
c0fcfcc7d8 refactored highgui_specificvideo* tests; fixed repeated libswscale context creation in videocapture & videowriter (ticket #1541) 2012-04-25 12:56:09 +00:00
Andrey Kamaev
8d130ff10c Fixed most of the floating-point accuracy problems for x86 gcc 2012-04-25 11:33:11 +00:00
Vladislav Vinogradov
a6c261bebd merged bug fix from r8188 (PyrLKOpticalFlow patch size calculation) 2012-04-25 09:28:22 +00:00
Vladislav Vinogradov
e467ece19c merged bug fix from r8174 (GPU_NVidia/NCV.Visualization test) 2012-04-25 09:26:00 +00:00
Vladislav Vinogradov
916d07cf2c merged bug fix from r8179 (ORB_GPU) 2012-04-25 09:23:16 +00:00
Andrey Pavlenko
ea735a0475 Java API: fixing Mat::put() for non-continuous Mat-s, adding/improving tests 2012-04-25 09:00:50 +00:00
Vadim Pisarevsky
87888984a5 added Matx<4,4>*Scalar operator (ticket #1830) 2012-04-25 08:59:37 +00:00
Vadim Pisarevsky
ed1932dfa1 fixed python version in yet another place. 2012-04-25 08:41:57 +00:00
Vadim Pisarevsky
30f1ab059b make Mat::at<>(i) work with 2d matrices (to retrieve all elements in row-major order) (reported by Kurt) and fixed bug #1804 2012-04-25 08:39:21 +00:00
Vadim Pisarevsky
866d8c0cfa added special function to patch NaN's in image. call this function from bilateralfilter (should fix bug #1811) 2012-04-24 15:16:21 +00:00
Vadim Pisarevsky
47ee844df6 fixed formula in matchShapes, method=CV_CONTOUR_MATCH_I3 (ticket #1801) 2012-04-24 14:56:56 +00:00
Vadim Pisarevsky
a110dc14ca fixed bug in Python's calcEMD2 (ticket #1763) 2012-04-24 14:22:05 +00:00
Vadim Pisarevsky
ad8258f872 avoid infinite loop in CvLevMarq (thanks to João Lima for the patch; ticket #1839) 2012-04-24 13:08:56 +00:00
Vadim Pisarevsky
75b1788c6b added "Matx*Vec -> Vec" operator (ticket #1830) 2012-04-24 12:45:19 +00:00
Marina Kolpakova
476c453ef6 fixed bug #1821 2012-04-24 10:07:14 +00:00
Marina Kolpakova
99aed4713f minor tab fix 2012-04-24 09:30:21 +00:00
Marina Kolpakova
f1a0ab365d fixed duplicated paragraph 2012-04-24 09:26:34 +00:00
Andrey Kamaev
019122fba7 Fixed dependencies for cmake status embeeded into opencv core 2012-04-24 07:13:50 +00:00
Andrey Kamaev
b7aacb6a93 Fixed assertions in java tests for ORB 2012-04-24 06:51:21 +00:00
Alexander Reshetnikov
4b5b7bdb5a Fixed cvRetrieveFrame memory leak under AVFoundation (ticket #1837) 2012-04-23 16:12:24 +00:00
Andrey Kamaev
cddadc04b7 Fixed Android manifest install 2012-04-23 12:39:18 +00:00
Vadim Pisarevsky
b8e70ea6c9 NORM_L2SQR added too (ticket #1840) 2012-04-23 12:29:23 +00:00