Commit Graph

98 Commits

Author SHA1 Message Date
Andrey Pavlenko
9f4c5afbbb merging r9039-9040,9044 from trunk (warnings and message in Java) 2012-07-15 13:20:38 +00:00
Marina Kolpakova
fb3d6ecb98 merged documentation and android service from trunk 2012-07-13 14:27:09 +00:00
Andrey Pavlenko
94f05241c5 removing windows-specific path from includes 2012-07-03 12:50:36 +00:00
Alexander Smorkalov
e5067bff41 Typo fix. 2012-07-03 08:12:27 +00:00
Alexander Smorkalov
65b53f96d0 OpenCV 2.4.0 constant version removed. All docs and samples updated for 2.4.2. 2012-07-03 07:58:48 +00:00
Alexander Smorkalov
139cc61001 Application start without service fixed. 2012-07-02 14:19:14 +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
b368f99d03 Merged the trunk r8852:8880 2012-07-02 11:04:43 +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
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
6cca6a4548 merged the trunk r8669:8702 2012-06-28 15:41:27 +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
ab20da0f53 Merged the trunk r8547:8574, r8587 2012-06-15 08:36:35 +00:00
Andrey Kamaev
50c2443691 Merged Android samples from trunk r8423 r8533 2012-06-01 08:45:45 +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
949c4edf41 Merged the trunk r8408:8457 (inclusive) 2012-05-30 08:47:34 +00:00
Andrey Kamaev
e1c4fd9e1f Merged the trunk r8345:8376 2012-05-18 13:18:37 +00:00
Alexander Smorkalov
e62f147edc ColorBlobDetection example. Bug fix. Refactring. 2012-05-12 06:15:32 +00:00
Alexander Smorkalov
b7c1fd34b9 ColorBlobDetection example. Pyrdown added. Contour area filtering added. 2012-05-12 05:19:17 +00:00
Alexander Smorkalov
b165997e22 Bug #1853 15-puzzles example does not work on Samsung gt-i9100 with Android ICS 4.0.3 fixed. 2012-04-28 12:10:53 +00:00
Andrey Pavlenko
2efa446e81 updating Posterize in 'image manipulation' Java sample 2012-04-28 09:25:07 +00:00
Andrey Kamaev
1046f50acb CMake for new Android example 2012-04-27 15:39:46 +00:00
Andrey Pavlenko
52f5009a4c adding Histogram and Posterize, removing Blur from 'image manipulation' Java sample 2012-04-27 14:40:25 +00:00
Alexander Smorkalov
d015a50d51 Base classes for sample added. 2012-04-27 13:37:45 +00:00
Alexander Smorkalov
211dfd68fd Base code for new sample added. 2012-04-27 12:49:21 +00:00
Andrey Pavlenko
fc44b3175e adding VIEW_MODE_PIXELIZE to the 'image manipulations' sample 2012-04-26 15:56:01 +00:00
Alexander Smorkalov
54001572d5 Setting camera parameters on Android 2.2.2 fixed. Old Android does not support continuous-video focus mode. 2012-04-10 09:02:50 +00:00
Andrey Pavlenko
d03d54f8c1 updating Eclipse projects settings 2012-04-09 14:14:41 +00:00
Alexander Smorkalov
be20370a3d Autofocus issues on Android ICS fixed. Continuous-video focus mode is set.
Performance problems fixed. Shared camera buffer is used.
2012-04-09 07:36:54 +00:00
Andrey Pavlenko
2291faedd8 Java API: changing CvVectorXxx to MatOfXxx 2012-04-06 09:32:00 +00:00
Andrey Pavlenko
0c45a5add2 Java API: minor bug-fixes and improvements in CvVector-s and tests 2012-04-05 08:41:03 +00:00
Andrey Pavlenko
78d92584c3 Java API: changing C++ vector<T> handling;
Java tests fixes are expected shortly
2012-04-04 12:59:53 +00:00
Andrey Pavlenko
6d49b075d9 updating screen resolutions support settings 2012-03-29 15:41:38 +00:00
Andrey Pavlenko
74749fccbf fix for #1724: making Java samples compatible with Android 3.1+ targets 2012-03-28 15:32:01 +00:00
Andrey Kamaev
e72a23243b Reworked build scripts for Android Java API, tests and examples 2012-03-27 16:05:52 +00:00
Andrey Kamaev
9b2d7e19db Added "fat" mode for Java wrapper 2012-03-23 17:03:05 +00:00
Andrey Pavlenko
6708869425 updating Java samples to meet Java API changes 2012-03-22 07:25:29 +00:00
Andrey Kamaev
18dbe6b3e5 cmake scripts are updated to prefer includes from the OpenCV source tree 2012-03-03 15:49:23 +00:00
Andrey Pavlenko
5bea651e81 Java samples updated to be compatible with both old (2.2+) and new (3.0+) Android versions 2012-02-24 08:43:11 +00:00
Andrey Pavlenko
62591a1d5a #1283, Mat <->Bitmap converters are updated to support CV_8UC(1,3,4) & non-continuous Mat-s and RGBA_8888 & RGB_565 Bitmaps; Android samples project files are updated according to the latest SDK req-s. 2012-02-14 14:40:41 +00:00
Andrey Kamaev
984eb99428 Global CMake reorganization:
[~] Automatically tracked dependencies between modules
 [+] Support for optional module dependencies
 [+] Options to choose modules to build
 [~] Removed hardcoded modules lists from OpenCVConfig.cmake, opencv.pc and OpenCV.mk
 [+] Added COMPONENTS support for FIND_PACKAGE(OpenCV)
 [~] haartraining and traincascade are moved outside of modules folder since they aren't the modules
2012-02-03 11:26:49 +00:00
Kirill Kornyakov
7d8f487b03 reverted occasional commit 2011-11-24 12:20:45 +00:00
Kirill Kornyakov
913811836a workaround for the case when perf system is used in external app without TBB 2011-11-24 12:06:38 +00:00
Andrey Kamaev
3bdb53e484 Android cmake toolchain is reworked for NDK r7; added experimental Android x86 support. 2011-11-16 14:32:10 +00:00
Andrey Kamaev
e8032fa8e9 Fixed Android build with SDK revision 14 2011-10-21 08:35:34 +00:00