Alexander Smorkalov
|
139cc61001
|
Application start without service fixed.
|
2012-07-02 14:19:14 +00:00 |
|
Andrey Kamaev
|
aa911275c3
|
Merged the trunk r8907, r8908
|
2012-07-02 14:12:34 +00:00 |
|
Andrey Kamaev
|
af912f4843
|
Merged the trunk r8901:8904
|
2012-07-02 13:46:47 +00:00 |
|
Alexander Smorkalov
|
721c24bc1f
|
Typo fix. Name of native library was inconsists with java loadLibrary
|
2012-07-02 13:39:55 +00:00 |
|
Andrey Kamaev
|
a66cd5698a
|
Merged the trunk 8892,8894,8898
|
2012-07-02 13:06:28 +00:00 |
|
Alexander Shishkov
|
cf97209f95
|
update FFMPEG wrapper binaries
|
2012-07-02 12:57:52 +00:00 |
|
Andrey Kamaev
|
d4df1e0b5c
|
Merged the trunk r8887, r8891, r8314
|
2012-07-02 12:33:37 +00:00 |
|
Andrey Kamaev
|
5a7804d958
|
Version number is adjusted to 2.4.2
|
2012-07-02 12:10:13 +00:00 |
|
Andrey Kamaev
|
088a6597bc
|
Merged the trunk 8855,8885,8886
|
2012-07-02 12:05:06 +00:00 |
|
Andrey Kamaev
|
3a40f27655
|
Merged facerec from the trunk
|
2012-07-02 11:48:16 +00:00 |
|
Andrey Kamaev
|
b368f99d03
|
Merged the trunk r8852:8880
|
2012-07-02 11:04:43 +00:00 |
|
Marina Kolpakova
|
304dac7f00
|
fixed #2113
|
2012-06-30 09:37:40 +00:00 |
|
Andrey Kamaev
|
17fd1c7c61
|
Merged recent changes from trunk - 8833,8848,8850
|
2012-06-29 07:52:34 +00:00 |
|
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 |
|