Andrey Kamaev
|
57fb5f0981
|
Merged Android build fix
|
2012-06-28 19:32:32 +00:00 |
|
Andrey Kamaev
|
35a31e1c35
|
Fixed few warnings
|
2012-06-28 18:11:54 +00:00 |
|
Marina Kolpakova
|
37a63523e7
|
fixed merge problem
|
2012-06-28 17:54:08 +00:00 |
|
Andrey Kamaev
|
a71797c0c4
|
Reverted some changes in videostab module
|
2012-06-28 17:48:53 +00:00 |
|
Andrey Kamaev
|
5715d9ef42
|
Removed incorrectly merged test
|
2012-06-28 17:41:03 +00:00 |
|
Marina Kolpakova
|
ab69f5e091
|
merged python samles
|
2012-06-28 17:33:11 +00:00 |
|
Marina Kolpakova
|
54ee92e3b0
|
merged trunk r8815:8827
|
2012-06-28 17:28:27 +00:00 |
|
Marina Kolpakova
|
b28b2428f6
|
changing package layout after 'make install' for Android build
|
2012-06-28 17:23:50 +00:00 |
|
Marina Kolpakova
|
2dcb091d94
|
merged Android samples
|
2012-06-28 17:14:29 +00:00 |
|
Marina Kolpakova
|
162f9fd7ea
|
merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811
|
2012-06-28 17:07:17 +00:00 |
|
Marina Kolpakova
|
b156e2f7ed
|
added FREAK (by Kirell Benzi, Raphael Ortiz, Alexandre Alahi and Pierre Vandergheynst)
|
2012-06-28 16:46:29 +00:00 |
|
Marina Kolpakova
|
3def843652
|
merged the trunk r8719:8731 and 8807
|
2012-06-28 16:39:53 +00:00 |
|
Marina Kolpakova
|
01570fa800
|
merged Android Manager and new java layout
|
2012-06-28 16:23:19 +00:00 |
|
Marina Kolpakova
|
680a44189c
|
merged the trunk r8704:8716
|
2012-06-28 16:13:29 +00:00 |
|
Marina Kolpakova
|
2777ebb8a0
|
merged GPU scan
|
2012-06-28 16:00:38 +00:00 |
|
Marina Kolpakova
|
6cca6a4548
|
merged the trunk r8669:8702
|
2012-06-28 15:41:27 +00:00 |
|
Marina Kolpakova
|
150aeee58f
|
merged iOS framework from the trunk
|
2012-06-28 15:13:57 +00:00 |
|
Vladislav Vinogradov
|
59ce0a9f81
|
Merged revision(s) 8679 from trunk:
new implementation of gpu::PyrLKOpticalFlow::sparse (1.5 - 2x faster)
........
|
2012-06-27 10:53:35 +00:00 |
|
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 |
|
Alexander Shishkov
|
a3c4d1b679
|
updated pdf's to 2.4.1
|
2012-06-01 13:44:23 +00:00 |
|
Alexander Shishkov
|
e0b1697cc9
|
update FFMPEG wrapper binaries
|
2012-06-01 11:00:59 +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 |
|
Andrey Kamaev
|
50c2443691
|
Merged Android samples from trunk r8423 r8533
|
2012-06-01 08:45:45 +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 |
|