Alexander Smorkalov [Tue, 3 Jul 2012 08:12:27 +0000 (08:12 +0000)]
Typo fix.
Alexander Smorkalov [Tue, 3 Jul 2012 07:58:48 +0000 (07:58 +0000)]
OpenCV 2.4.0 constant version removed. All docs and samples updated for 2.4.2.
Andrey Kamaev [Mon, 2 Jul 2012 21:39:17 +0000 (21:39 +0000)]
Documentation: fixed duplicated appendix reference
Andrey Kamaev [Mon, 2 Jul 2012 21:12:45 +0000 (21:12 +0000)]
Merged the trunk r8917:8919
Andrey Kamaev [Mon, 2 Jul 2012 15:40:18 +0000 (15:40 +0000)]
Fixed several opencv version references
Andrey Kamaev [Mon, 2 Jul 2012 15:15:40 +0000 (15:15 +0000)]
Merged the trunk r8913
Andrey Kamaev [Mon, 2 Jul 2012 14:21:51 +0000 (14:21 +0000)]
Merged the trunk r8911
Alexander Smorkalov [Mon, 2 Jul 2012 14:19:14 +0000 (14:19 +0000)]
Application start without service fixed.
Andrey Kamaev [Mon, 2 Jul 2012 14:12:34 +0000 (14:12 +0000)]
Merged the trunk r8907, r8908
Andrey Kamaev [Mon, 2 Jul 2012 13:46:47 +0000 (13:46 +0000)]
Merged the trunk r8901:8904
Alexander Smorkalov [Mon, 2 Jul 2012 13:39:55 +0000 (13:39 +0000)]
Typo fix. Name of native library was inconsists with java loadLibrary
Andrey Kamaev [Mon, 2 Jul 2012 13:06:28 +0000 (13:06 +0000)]
Merged the trunk 8892,8894,8898
Alexander Shishkov [Mon, 2 Jul 2012 12:57:52 +0000 (12:57 +0000)]
update FFMPEG wrapper binaries
Andrey Kamaev [Mon, 2 Jul 2012 12:33:37 +0000 (12:33 +0000)]
Merged the trunk r8887, r8891, r8314
Andrey Kamaev [Mon, 2 Jul 2012 12:10:13 +0000 (12:10 +0000)]
Version number is adjusted to 2.4.2
Andrey Kamaev [Mon, 2 Jul 2012 12:05:06 +0000 (12:05 +0000)]
Merged the trunk 8855,8885,8886
Andrey Kamaev [Mon, 2 Jul 2012 11:48:16 +0000 (11:48 +0000)]
Merged facerec from the trunk
Andrey Kamaev [Mon, 2 Jul 2012 11:04:43 +0000 (11:04 +0000)]
Merged the trunk r8852:8880
Marina Kolpakova [Sat, 30 Jun 2012 09:37:40 +0000 (09:37 +0000)]
fixed #2113
Andrey Kamaev [Fri, 29 Jun 2012 07:52:34 +0000 (07:52 +0000)]
Merged recent changes from trunk - 8833,8848,8850
Andrey Kamaev [Thu, 28 Jun 2012 19:32:32 +0000 (19:32 +0000)]
Merged Android build fix
Andrey Kamaev [Thu, 28 Jun 2012 18:11:54 +0000 (18:11 +0000)]
Fixed few warnings
Marina Kolpakova [Thu, 28 Jun 2012 17:54:08 +0000 (17:54 +0000)]
fixed merge problem
Andrey Kamaev [Thu, 28 Jun 2012 17:48:53 +0000 (17:48 +0000)]
Reverted some changes in videostab module
Andrey Kamaev [Thu, 28 Jun 2012 17:41:03 +0000 (17:41 +0000)]
Removed incorrectly merged test
Marina Kolpakova [Thu, 28 Jun 2012 17:33:11 +0000 (17:33 +0000)]
merged python samles
Marina Kolpakova [Thu, 28 Jun 2012 17:28:27 +0000 (17:28 +0000)]
merged trunk r8815:8827
Marina Kolpakova [Thu, 28 Jun 2012 17:23:50 +0000 (17:23 +0000)]
changing package layout after 'make install' for Android build
Marina Kolpakova [Thu, 28 Jun 2012 17:14:29 +0000 (17:14 +0000)]
merged Android samples
Marina Kolpakova [Thu, 28 Jun 2012 17:07:17 +0000 (17:07 +0000)]
merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811
Marina Kolpakova [Thu, 28 Jun 2012 16:46:29 +0000 (16:46 +0000)]
added FREAK (by Kirell Benzi, Raphael Ortiz, Alexandre Alahi and Pierre Vandergheynst)
Marina Kolpakova [Thu, 28 Jun 2012 16:39:53 +0000 (16:39 +0000)]
merged the trunk r8719:8731 and 8807
Marina Kolpakova [Thu, 28 Jun 2012 16:23:19 +0000 (16:23 +0000)]
merged Android Manager and new java layout
Marina Kolpakova [Thu, 28 Jun 2012 16:13:29 +0000 (16:13 +0000)]
merged the trunk r8704:8716
Marina Kolpakova [Thu, 28 Jun 2012 16:00:38 +0000 (16:00 +0000)]
merged GPU scan
Marina Kolpakova [Thu, 28 Jun 2012 15:41:27 +0000 (15:41 +0000)]
merged the trunk r8669:8702
Marina Kolpakova [Thu, 28 Jun 2012 15:13:57 +0000 (15:13 +0000)]
merged iOS framework from the trunk
Vladislav Vinogradov [Wed, 27 Jun 2012 10:53:35 +0000 (10:53 +0000)]
Merged revision(s) 8679 from trunk:
new implementation of gpu::PyrLKOpticalFlow::sparse (1.5 - 2x faster)
........
Vladislav Vinogradov [Wed, 27 Jun 2012 09:58:33 +0000 (09:58 +0000)]
Merged revision(s) 8664 from trunk:
new implementation of gpu::PyrLKOpticalFlow::dense (1.5 - 2x faster)
........
Andrey Kamaev [Fri, 15 Jun 2012 13:21:26 +0000 (13:21 +0000)]
Merged the trunk r8595:8668 (except iOS and new gpu functionality)
Andrey Kamaev [Fri, 15 Jun 2012 13:04:17 +0000 (13:04 +0000)]
Merged the trunk r8589:8653 - all changes related to build warnings
Andrey Kamaev [Fri, 15 Jun 2012 08:52:08 +0000 (08:52 +0000)]
Merged the trunk r8575:8583 (INTER_AREA interpolation for GPU resize)
Andrey Kamaev [Fri, 15 Jun 2012 08:36:35 +0000 (08:36 +0000)]
Merged the trunk r8547:8574, r8587
Marina Kolpakova [Fri, 1 Jun 2012 15:12:10 +0000 (15:12 +0000)]
fix for ORB tests
Alexander Shishkov [Fri, 1 Jun 2012 13:44:23 +0000 (13:44 +0000)]
updated pdf's to 2.4.1
Alexander Shishkov [Fri, 1 Jun 2012 11:00:59 +0000 (11:00 +0000)]
update FFMPEG wrapper binaries
Andrey Kamaev [Fri, 1 Jun 2012 10:59:27 +0000 (10:59 +0000)]
Merged the trunk r8542:8544
Andrey Kamaev [Fri, 1 Jun 2012 08:46:54 +0000 (08:46 +0000)]
Merged the trunk r8537 (fixed pdf documentation build)
Andrey Kamaev [Fri, 1 Jun 2012 08:45:45 +0000 (08:45 +0000)]
Merged Android samples from trunk r8423 r8533
Philipp Wagner [Thu, 31 May 2012 20:27:46 +0000 (20:27 +0000)]
Fixed reconstruction, so that the mean is correctly added to the reconstructed image.
Andrey Kamaev [Thu, 31 May 2012 11:26:23 +0000 (11:26 +0000)]
Version of 2.4 branch is adjusted to 2.4.1
Andrey Kamaev [Thu, 31 May 2012 11:12:12 +0000 (11:12 +0000)]
Megred fix for pyrhon API generator regression r8528
Andrey Kamaev [Thu, 31 May 2012 10:53:28 +0000 (10:53 +0000)]
Merged the trunk r8517:8524
Andrey Kamaev [Thu, 31 May 2012 10:25:29 +0000 (10:25 +0000)]
backported API for storing OpenCV data structures to text string and reading them back (r8481, r8516, r8518, r8522)
Vladislav Vinogradov [Wed, 30 May 2012 17:06:39 +0000 (17:06 +0000)]
Merged revision(s) 8484 from trunk:
fixed some bugs in gpu module under Windows:
* convertTo alignment error
........
Andrey Kamaev [Wed, 30 May 2012 11:20:55 +0000 (11:20 +0000)]
Fixed few errors in documentation backporting
Andrey Kamaev [Wed, 30 May 2012 11:13:07 +0000 (11:13 +0000)]
Merged the trunk r8467:8507 (inclusive) (big bunch of documentation fixes)
Andrey Kamaev [Wed, 30 May 2012 09:00:32 +0000 (09:00 +0000)]
Merged the trunk r8459:8466 (inclusive)
Andrey Kamaev [Wed, 30 May 2012 08:47:34 +0000 (08:47 +0000)]
Merged the trunk r8408:8457 (inclusive)
Andrey Kamaev [Wed, 30 May 2012 08:04:37 +0000 (08:04 +0000)]
Merged the trunk r8384:8407 (inclusive)
Vladislav Vinogradov [Tue, 29 May 2012 11:35:30 +0000 (11:35 +0000)]
Merged revision(s) 8495 from trunk:
Bug #1991 : fixed gpu interpolation (remap, resize, warp...)
........
Vladislav Vinogradov [Mon, 28 May 2012 14:04:39 +0000 (14:04 +0000)]
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
........
Marina Kolpakova [Mon, 28 May 2012 08:53:03 +0000 (08:53 +0000)]
warp Affine tegra integration
Anatoly Baksheev [Fri, 25 May 2012 09:45:42 +0000 (09:45 +0000)]
Merged revision(s) 8455 from trunk/opencv/modules/gpu/src:
compilation with CUDA5.0 (#1982, thanks to Rodrigo)
........
Andrey Kamaev [Fri, 18 May 2012 13:18:37 +0000 (13:18 +0000)]
Merged the trunk r8345:8376
Andrey Kamaev [Fri, 18 May 2012 12:59:40 +0000 (12:59 +0000)]
Merged the trunk r8324:8345
Andrey Kamaev [Fri, 18 May 2012 12:46:44 +0000 (12:46 +0000)]
Partly merged the trunk r8322
Andrey Kamaev [Fri, 18 May 2012 12:34:01 +0000 (12:34 +0000)]
Merged the trunk r8291:8321
Andrey Kamaev [Fri, 18 May 2012 12:18:17 +0000 (12:18 +0000)]
Merged the trunk till r8291
Anatoly Baksheev [Thu, 17 May 2012 15:00:36 +0000 (15:00 +0000)]
Merged revision(s) 8368 from trunk/opencv/modules/gpu/src/imgproc.cpp:
fixed possible compilation error for macos
........
Alexander Smorkalov [Sat, 12 May 2012 06:15:32 +0000 (06:15 +0000)]
ColorBlobDetection example. Bug fix. Refactring.
Alexander Smorkalov [Sat, 12 May 2012 05:19:17 +0000 (05:19 +0000)]
ColorBlobDetection example. Pyrdown added. Contour area filtering added.
Andrey Kamaev [Mon, 7 May 2012 14:05:06 +0000 (14:05 +0000)]
Fix for #1902 is merged from trunk
Anatoly Baksheev [Sat, 5 May 2012 09:25:37 +0000 (09:25 +0000)]
Merged from trunk.
Philipp Wagner [Sat, 5 May 2012 09:16:21 +0000 (09:16 +0000)]
Fixed facerec_demo.cpp.
Anatoly Baksheev [Fri, 4 May 2012 11:07:36 +0000 (11:07 +0000)]
fixed GPU compilation
Anatoly Baksheev [Fri, 4 May 2012 10:34:57 +0000 (10:34 +0000)]
Added check for CUDA toolkit version ( older can't compile Kepler )
Anatoly Baksheev [Fri, 4 May 2012 10:24:23 +0000 (10:24 +0000)]
Merged revision(s) 8304 from trunk/opencv/cmake/OpenCVDetectCUDA.cmake:
Added check for CUDA toolkit version ( older can't compile Kepler )
........
Marina Kolpakova [Fri, 4 May 2012 10:09:17 +0000 (10:09 +0000)]
update for kepler arch support
Vadim Pisarevsky [Thu, 3 May 2012 15:14:53 +0000 (15:14 +0000)]
fixed typo in mulSpectrums description (ticket #1868)
Anatoly Baksheev [Thu, 3 May 2012 10:23:23 +0000 (10:23 +0000)]
fixed for Kepler
Marina Kolpakova [Mon, 30 Apr 2012 19:06:37 +0000 (19:06 +0000)]
fix for brute-force matcher with CUDA 4.2.
Alexander Shishkov [Mon, 30 Apr 2012 19:05:05 +0000 (19:05 +0000)]
update FFMPEG wrapper binaries
Vadim Pisarevsky [Mon, 30 Apr 2012 12:39:49 +0000 (12:39 +0000)]
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
Vadim Pisarevsky [Mon, 30 Apr 2012 12:39:22 +0000 (12:39 +0000)]
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
Vadim Pisarevsky [Mon, 30 Apr 2012 12:07:04 +0000 (12:07 +0000)]
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
Vadim Pisarevsky [Sat, 28 Apr 2012 22:54:14 +0000 (22:54 +0000)]
force BUILD_PNG/JPEG/TIFF/ZLIB on MacOSX, because sometimes the found lib<...> is different from the one used in build.
Alexander Shishkov [Sat, 28 Apr 2012 22:50:25 +0000 (22:50 +0000)]
update FFMPEG wrapper binaries
Vadim Pisarevsky [Sat, 28 Apr 2012 22:49:13 +0000 (22:49 +0000)]
some more fixes in ffmpeg wrapper; now it handles big videos better.
Alexander Shishkov [Sat, 28 Apr 2012 20:41:32 +0000 (20:41 +0000)]
updated pdfs
Alexander Shishkov [Sat, 28 Apr 2012 20:10:16 +0000 (20:10 +0000)]
change docs version
Vadim Pisarevsky [Sat, 28 Apr 2012 17:32:02 +0000 (17:32 +0000)]
added documentation for ORB (ticket #1835). updated documentation on features2d (Feature2D class is still to be documented) (ticket #1819)
Alexander Shishkov [Sat, 28 Apr 2012 16:23:36 +0000 (16:23 +0000)]
update FFMPEG wrapper binaries
Vadim Pisarevsky [Sat, 28 Apr 2012 16:18:39 +0000 (16:18 +0000)]
temporary reverted av_free_packet() patch.
Alexander Shishkov [Sat, 28 Apr 2012 15:13:59 +0000 (15:13 +0000)]
moved part of f2d docs to the legacy module
Vadim Pisarevsky [Sat, 28 Apr 2012 14:59:30 +0000 (14:59 +0000)]
added description of Algorithm class (ticket #1818)
Vladislav Vinogradov [Sat, 28 Apr 2012 13:18:05 +0000 (13:18 +0000)]
fixed PyrLKOpticalFlow.dense (final result size)
Vadim Pisarevsky [Sat, 28 Apr 2012 12:59:21 +0000 (12:59 +0000)]
moved planar subdiv docs to legacy; added Input/OutputArray docs to core
Alexander Shishkov [Sat, 28 Apr 2012 12:48:23 +0000 (12:48 +0000)]
fixed #1824
Andrey Pavlenko [Sat, 28 Apr 2012 12:46:50 +0000 (12:46 +0000)]
Java API: minor fix in javadoc