Andrey Kamaev
7f542e391a
Merge branch 2.4
...
Conflicts:
android/service/engine/AndroidManifest.xml - use file from 2.4
modules/contrib/src/detection_based_tracker.cpp - move #include <pthread.h> as in 2.4
modules/java/android_test/src/org/opencv/test/OpenCVTestRunner.java - use file from 2.4
2012-11-20 19:12:00 +04:00
Andrey Kamaev
d559c18ee5
Merge pull request #161 from apavlenko:fix/sdk_r21
2012-11-20 19:07:08 +04:00
Andrey Pavlenko
cfd634ca3e
Improving compatibility with the latest Android SDK (r21) and NDK (r8c).
...
- Adding Android SDK/ADT r21 compatibility;
- fixing stl headers path for new ndk;
- fixing native API level for Android projects
2012-11-20 18:40:22 +04:00
Alexander Smorkalov
66a1ea7604
Test execution inside Eclipse fixed;
...
OpenCV testing via OpenCV Manager implemented.
2012-11-20 10:45:46 +04:00
Alexander Smorkalov
96e4eed018
Logcat message for disabled test cases added.
2012-11-13 11:41:08 +04:00
Alexander Smorkalov
9f5fcff3ea
More common way of test case disabling implemented.
2012-11-13 10:29:49 +04:00
Alexander Smorkalov
e06c5b6fd5
Code review comments applied.
2012-11-12 17:47:20 +04:00
Alexander Smorkalov
baef62b4d2
Java test fix. Eclipse test execution fix.
2012-11-09 11:46:14 +04:00
Andrey Kamaev
4d059e9e5b
Merge release 2.4.3
2012-11-02 17:58:02 +04:00
Alexander Smorkalov
34896529d5
Review comments applied.
2012-11-01 16:19:11 +04:00
Alexander
b0106ca25e
Test data form features2d updated.
2012-10-30 15:05:09 +04:00
OpenCV Buildbot
81f826db2b
Normalize line endings and whitespace
2012-10-17 15:57:49 +04:00
OpenCV Buildbot
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
Andrey Kamaev
dbd30d4fba
Revert "fixing Java test and sample after moving drawContours() from Imgproc to Core"
...
This reverts commit eb4ce67dac
.
Conflicts:
samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionView.java
2012-10-15 17:53:57 +04:00
Andrey Pavlenko
8c1550a4ec
a new Java test to imencode() with params
2012-09-27 19:11:02 +04:00
Andrey Kamaev
e564a53ccd
Add gitignore for Android tests and samples
2012-09-10 15:48:57 +04:00
Andrey Kamaev
af415085d8
Fix Android build with CMake 2.6.3-2.8.3
2012-09-04 16:21:44 +04:00
Andrey Kamaev
51f6127e0a
Merged the recent fixes from 2.4 branch
2012-07-04 08:04:31 +00:00
Andrey Pavlenko
a72f4474b4
fixing bug #1987(android keeps RGBA in alpha pre-multiplied form, Mat <-> Bitmap should handle this correctly)
2012-06-29 15:38:10 +00:00
Andrey Kamaev
5a2ba94dd6
Fixing parallel build for Android
2012-06-28 19:30:39 +00:00
Andrey Pavlenko
8b67adea98
workarounding missing native part in Java tests
2012-06-27 12:38:57 +00:00
Andrey Pavlenko
cf88b9d00c
workarounding service-related changes
2012-06-22 15:18:06 +00:00
Andrey Pavlenko
dc93c21962
fix for #2063 ( Mat(Mat m, Rect roi) returns wrong sub-mat)
2012-06-20 07:43:01 +00:00
Andrey Pavlenko
eb4ce67dac
fixing Java test and sample after moving drawContours() from Imgproc to Core
2012-05-29 11:04:04 +00:00
Andrey Kamaev
3a1f85d4e8
Remerged the 2.4.0 branch
2012-05-02 20:20:14 +00:00
Vadim Pisarevsky
d5a0088bbe
merged 2.4 into trunk
2012-04-30 14:33:52 +00:00
Vadim Pisarevsky
2fd1e2ea57
merged all the latest changes from 2.4 to trunk
2012-04-13 21:50:59 +00:00
Andrey Pavlenko
64355e88f1
fixing a typo
2012-03-29 15:40:21 +00:00
Andrey Kamaev
3ac1f31126
Fixed Android tests and samples status in cmake report; restored java tests "coverage calculation".
2012-03-27 21:27:27 +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
8991d323ea
Refactored Java wrapper build scripts.
...
Improved Android SDK search, fixed some bugs.
2012-03-25 19:57:58 +00:00
Andrey Pavlenko
1b2525703e
Java API minor fixes
2012-03-23 15:18:05 +00:00
Andrey Pavlenko
f13e54dd72
#921 less signatures for func-s with default arg val-s (aka smart overloads);
...
moving inpaintTest() to 'photo';
hiding 'Point*' arg in Java signature of Core.checkRange().
2012-03-21 15:07:54 +00:00
Andrey Pavlenko
20cceb8fdf
moving the rest of inpaint() to the 'photo' module, temporary disabling Java test for it, adding 'photo' to Java API
2012-03-16 15:11:56 +00:00
Andrey Pavlenko
32d4d7929e
Java API: adding C++ classes inheritance support
2012-03-15 09:11:04 +00:00
Andrey Pavlenko
36890cc959
( #1636 ) Java API: adding undistortPoints() support and smoke test; minor improvements in Java stuff
2012-03-14 07:37:48 +00:00
Alexander Shishkov
be63ce723f
#1672
...
updated links in cheatsheet
renamed directory for Mat tutorial
changed links from willow docs to opencv.itseez.com, from Trac to current Redmine
2012-03-11 14:35:46 +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
f59d96cd7f
updating inaccurate test (Mat step can be more than width)
2012-02-17 14:51:19 +00:00
Andrey Pavlenko
0588e6261b
#1283 , Mat <->Bitmap converters Java tests.
2012-02-15 08:19:49 +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 Pavlenko
bb33f8dd3c
fixing Java test compilation after API change (distanceTransform() -> distanceTransformWithLabels())
2012-01-26 08:51:16 +00:00
Andrey Kamaev
ef4ce6232a
Fixed FAST feature detector Java tests
2011-12-21 12:47:25 +00:00
Andrey Kamaev
3d61f5bdd0
Fixed 2 more tests for Java API
2011-12-21 12:12:58 +00:00
Andrey Kamaev
e9dffe1394
Fixed failed Java API tests for core module
2011-12-21 10:41: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
7172c8cea9
Android cmake toolchain: fixed some compatibility problems with cmake 2.6.x; improved file header.
...
Fixed small problem in chart.py.
2011-11-19 18:02:00 +00:00
Andrey Pavlenko
d51a5262b3
Java API: adding test for HoughLinesP()
2011-11-16 08:36:57 +00:00
Andrey Pavlenko
823b6567a3
Java API: fix for Subdiv2D::getTriangleList() and Subdiv2D::getEdgeList(); test for getTriangleList() is added.
2011-09-22 11:22:15 +00:00