Roman Donchenko
57d4c86b2b
Fixed the shebang lines on the Python scripts.
...
Also, removed the one from modules/python/src2/cv.py and cleared its
executable bit, since it's not a script.
2013-04-11 18:37:23 +04:00
Andrey Kamaev
e27f4da9c6
Merge pull request #795 from taka-no-me:move_imgproc_utils_to_core
2013-04-11 11:35:15 +04:00
Andrey Kamaev
c98c246fc2
Move border type constants and Moments class to core module
2013-04-10 19:14:24 +04:00
Alexander Smorkalov
6e8f5ae574
Front/back camera constants semantic for Android fixed (Bug #2839 ).
...
Front/Back camera constants' values changed;
Additional camera facing check added for JavaCameraView.
2013-04-10 16:57:34 +04:00
Andrey Kamaev
b0e6606b98
Cleanup core module API
...
* Drop some low level API
* Remove outdated overloads
* Utilize Input/OutputArray
2013-04-09 13:36:32 +04:00
Andrey Kamaev
dd74a851f3
Fix build errors
2013-04-08 17:10:31 +04:00
Andrey Kamaev
0738ea7d0f
Make highgui.hpp independent from C API
2013-04-08 15:47:29 +04:00
Andrey Kamaev
67073daf19
Merge branch '2.4'
2013-04-05 21:11:59 +04:00
Andrey Kamaev
3b6a82b57c
Merge pull request #769 from apavlenko:fix_2901
2013-04-05 12:59:02 +04:00
Andrey Pavlenko
4c31c26acf
fix for #2901 (en exception was raised when getting empty MatOfDMatch)
2013-04-05 08:50:37 +04:00
Andrey Pavlenko
09fe5cddf1
test for the issue #2901
2013-04-05 08:50:24 +04:00
Andrey Pavlenko
18b2d6bdbb
copying '.classpath' and '.project' to build dir, useful for opening in eclipse
2013-04-05 08:50:08 +04:00
Andrey Kamaev
6570215205
Merge pull request #767 from asmorkalov:version_increment
2013-04-04 18:00:44 +04:00
Andrey Kamaev
7c402d1e15
Merge pull request #759 from asmorkalov:android_common_fixes
2013-04-04 17:58:44 +04:00
Alexander Smorkalov
1e332d690f
OpenCV verison incremented
...
OpenCV Manager verison incremeneted;
Docs and tests updated accordingly;
COnstant for Manager initialization added.
2013-04-04 15:50:36 +04:00
Alexander Smorkalov
36367ec027
Several fixes android related fixes
...
Native activity build warning fixed;
Logcat messages for JavaCameraView updated (Bug #2876 );
Some fixes for feature #2893 done.
2013-04-04 12:18:13 +04:00
Andrey Kamaev
eeaa1e8751
Fix link of fat java wrapper on OS X
2013-04-03 20:02:13 +04:00
Andrey Kamaev
940eedfb27
Finalize core headers reorganization
2013-04-03 14:10:03 +04:00
Andrey Kamaev
2b1ef95415
Completely separate C and C++ API of OpenCV core
2013-04-01 15:24:34 +04:00
Andrey Kamaev
d2192c0759
Move cv::Matx and cv::Vec to separate header
2013-04-01 15:24:33 +04:00
Andrey Kamaev
f77a375354
Merge branch '2.4'
2013-03-29 19:38:35 +04:00
Andrey Kamaev
7d37625fc3
Merge pull request #718 from apavlenko:java_tests_fix
2013-03-29 18:21:14 +04:00
Andrey Kamaev
b5dd26e4c7
Merge pull request #704 from taka-no-me:folders
2013-03-29 18:20:27 +04:00
Alexander Bohn / FI$H2k
c66cf08ced
Fix for encoding errors when building Java source
...
The generated OpenCV Java source can contain characters outside of ASCII on some systems – this patch allows the ant task to compile them.
(cherry picked from commit f3ee55e042
)
2013-03-27 17:43:00 +04:00
Andrey Pavlenko
bbf43e8b16
fix for bug #2912 (DescriptorExtractor::compute Java wrapper loses native arg change)
2013-03-26 19:31:16 +04:00
Andrey Kamaev
49f6dad13f
Move cv::KeyPoint and cv::DMatch to core
2013-03-26 16:08:43 +04:00
Andrey Kamaev
f282498b1d
Drop outdated targets and fix solution folders
2013-03-25 21:57:53 +04:00
Andrey Kamaev
be7bbe3aa9
Drop cv:: prefix from cv::String used inside the cv namespace
2013-03-22 22:14:50 +04:00
Andrey Kamaev
688d170de7
Java wrapper is adapted for cv::String
2013-03-22 22:14:33 +04:00
Andrey Kamaev
1ca8f33b4e
Merge branch '2.4'
2013-03-21 23:11:54 +04:00
Andrey Kamaev
89356ff16d
Move non-CV functionality from core.hpp to separate utility.hpp header
2013-03-20 17:56:06 +04:00
Vadim Pisarevsky
959a5c980d
Merge pull request #532 from jet47:super-resolution
2013-03-17 19:13:37 +04:00
Alexander Bohn / FI$H2k
f3ee55e042
Fix for encoding errors when building Java source
...
The generated OpenCV Java source can contain characters outside of ASCII on some systems – this patch allows the ant task to compile them.
2013-03-15 06:47:52 -03:00
Andrey Kamaev
ad5cddc007
Main module headers are moved 1 level up
...
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
2013-03-13 17:26:56 +04:00
Andrey Kamaev
9b7dfd677d
Merge branch '2.4'
2013-03-11 18:50:19 +04:00
Alexander Smorkalov
8942eaf0d7
Stetch support for Android View classes added (Feature #2840 )
2013-03-11 11:17:19 +04:00
Andrey Pavlenko
0e64baaec5
removing redundant code
2013-03-06 13:00:00 +04:00
Andrey Pavlenko
116d3be9c0
moving JNI library to 'build/lib' dir on non-Win
2013-03-05 18:41:44 +04:00
Andrey Kamaev
9e12b7c3c2
Merge release 2.4.4
2013-03-04 19:43:49 +04:00
Andrey Kamaev
79cf292d78
Merge pull request #590 from apavlenko:java_fixes
2013-02-28 18:07:33 +04:00
Andrey Pavlenko
d18b2c2502
patch -> revision
2013-02-28 17:19:52 +04:00
Andrey Pavlenko
c24d7cc066
adding more version-related variables
2013-02-28 16:56:53 +04:00
Andrey Pavlenko
5321da92cb
adding/fixing version suffix for desktop java library on all OSes
2013-02-28 16:12:44 +04:00
Andrey Kamaev
891d7da6ee
Merge branch '2.4'
2013-02-28 11:17:06 +04:00
Andrey Kamaev
7b79eaf5be
Merge pull request #511 from aritzlc:master
2013-02-27 19:33:01 +04:00
Vladislav Vinogradov
7a0d6f7733
Super Resolution module
2013-02-27 13:41:15 +04:00
Andrey Kamaev
e9307259d7
Merge pull request #564 from apavlenko:eclipse_import_fix
2013-02-27 00:05:02 +04:00
Andrey Pavlenko
1c1c3c29c3
fixing eclipse import errors
2013-02-26 19:52:59 +04:00
Alexander Smorkalov
8458f5c489
Android tutorial updated
...
OpenCV version incremented;
New CvCameraViewListener interface description added.
2013-02-26 16:35:02 +04:00
alegarda
0448f240a0
Added constants to gen_java.py
2013-02-26 11:21:43 +01:00
Andrey Kamaev
2a6fb2867e
Remove all using directives for STL namespace and members
...
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
2013-02-25 15:04:17 +04:00
Andrey Kamaev
0b8a6da817
Merge branch '2.4'
2013-02-22 17:33:30 +04:00
Alexander Smorkalov
9f39c8eaa1
OpenCV 2.4.4 preparation
...
Manager verison incremented;
Additional constatnt for library intialization added;
Documents updated.
2013-02-21 14:42:28 +04:00
Andrey Kamaev
9498856b22
Fix documentation problems found by check_docs2 script
2013-02-20 15:07:13 +04:00
Andrey Kamaev
956aa68fb5
Merge branch '2.4'
2013-02-12 20:30:17 +04:00
Andrey Kamaev
b44b920997
Merge branch '2.4'
2013-02-12 16:30:18 +04:00
Alexander Smorkalov
1751a963f2
Build info output for all android apps added.
...
OpenCV build information output to logcat added to OpenCV initialization code;
Documenation for cv::getBuildInformation() added.
2013-02-12 11:19:05 +04:00
Andrey Kamaev
b6e7aeabe0
Merge pull request #476 from apavlenko:eclipse_import_fix
2013-02-11 21:38:07 +04:00
Andrey Kamaev
059ea5bebe
Merge pull request #471 from apavlenko:jar_install
2013-02-11 20:46:48 +04:00
Andrey Pavlenko
54bcaa4934
fixing eclipse import errors that can also be fixed via 'Fix Project Properties' menu
2013-02-11 19:49:18 +04:00
Andrey Pavlenko
b337d84adf
configure desktop Java install, making JNI library name correct, and making it fat when possible
2013-02-11 16:28:19 +04:00
Andrey Kamaev
1869f77c0f
Merge pull request #457 from taka-no-me:fix_vars_expansion
2013-02-11 14:37:14 +04:00
Alexander Smorkalov
283b26e2db
Issue in NativeCameraView and JavaCameraView fixed.
...
In previous version getWidth() and getHeight() values were used instead method parameters.
2013-02-11 09:43:44 +04:00
Andrey Kamaev
571665b559
Fix CMake variables substitution in Android project files
2013-02-08 18:21:49 +04:00
Alexander Smorkalov
076941bb07
15-puzzle app reverted to usage of old CvCameraViewListener implementation;
...
super.onPause() call moved to begining of onPause method according Google recomandations.
2013-02-08 12:36:33 +04:00
Alexander Smorkalov
f8720ec60e
Code review issues fixed. Compatibility issues fixed.
2013-02-07 13:11:08 +04:00
Alexander Smorkalov
3ef588b877
onCameraFrame callback signature changed. CvCameraFame interface added.
...
New interface allows to get one RGBA or Gray frame from camera or both in the same time;
New interface fixes data rase in samples also.
2013-02-04 17:43:45 +04:00
Andrey Kamaev
c527340cb6
Merge branch 2.4
2013-02-04 17:15:55 +04:00
Andrey Kamaev
6f1961031c
Update regression checks in Java test
...
This follows SURF changes in 1f261c2
2013-02-01 17:16:28 +04:00
Andrey Kamaev
57d3152cd0
Merge branch '2.4'
2013-01-31 14:35:27 +04:00
Alexander Smorkalov
5bc6365ba5
TestCheckVector java test fixed. Warning fixed.
2013-01-30 17:28:22 +04:00
Andrey Kamaev
0734d9b877
Merge branch '2.4'
2013-01-29 14:16:07 +04:00
Alexander Smorkalov
ca98710640
Resolve warning in OpenCV Library project in Eclipse (Bug #2714 )
...
Warning in auto generated code was suppressed by project settings.
2013-01-28 19:44:58 +04:00
Andrey Kamaev
2e02654004
Fix build of Java tests
2013-01-25 17:08:36 +04:00
Andrey Kamaev
f4e27bcbbc
Merge branch '2.4'
2013-01-25 16:30:36 +04:00
Andrey Kamaev
a441980d68
Fix debug build of Java warppers
2013-01-24 13:25:12 +04:00
Andrey Kamaev
2c32536bf4
Enable Java bindings on all platforms by default
2013-01-23 18:08:09 +04:00
Andrey Kamaev
caa2c06e50
Quiet output of cv::error in Java tests
...
Introduced new Java API
void org.opencv.core.Core.setErrorVerbosity(boolean verbose)
used to suppress output to stderr from OpenCV's asserts
2013-01-23 18:08:09 +04:00
Andrey Kamaev
5eabcf8e4f
Java tests: print summary for tests run
2013-01-23 18:08:09 +04:00
Andrey Kamaev
4668a133f0
Java API: fix build warning on OS X
...
Common part of all source files is extracted to special header
2013-01-23 18:08:09 +04:00
Andrey Kamaev
3889b34ec3
Add option to run java tests with run.py
2013-01-23 18:08:08 +04:00
Andrey Kamaev
46c4390a2e
Hardly refactored CMake script for Java wrappers
2013-01-22 17:59:01 +04:00
Andrey Kamaev
c92743d124
Eliminate intermediate build target "opencv_java_api"
2013-01-22 17:59:00 +04:00
Andrey Kamaev
e3474878b6
Consistently use 4-digit library version
2013-01-18 14:57:55 +04:00
Andrey Kamaev
90ff4e6fc8
Convert test image to losless format
...
This fixes java tests failing with new jpeg versions
2013-01-17 20:43:57 +04:00
Andrey Kamaev
dc0788c864
Merge branch 2.4
2013-01-17 18:39:20 +04:00
Andrey Pavlenko
a8c0f1d962
fixing test failure on some systems
2013-01-16 18:33:35 +04:00
Andrey Kamaev
bf3c2b0bbb
Fix incorrect Mat address reconstruction on 64-bit platforms
...
This fixes random failures in Java wrappers.
2013-01-15 19:23:49 +04:00
Andrey Kamaev
c49b23d4dd
Merge pull request #240 from emchristiansen:javatest2.4
2013-01-14 11:06:44 +04:00
Andrey Kamaev
084b1c7969
Merge branch 2.4
2013-01-11 15:45:23 +04:00
Andrey Pavlenko
b0e1cb473a
more tests fixes
2013-01-11 09:13:25 +04:00
Andrey Kamaev
873aefae19
Merge pull request #279 from taka-no-me:mingw_java
2013-01-09 16:52:41 +04:00
Andrey Kamaev
da9089612a
Fix build of java bindings on mingw
2012-12-30 23:24:39 +04:00
Andrey Pavlenko
c49b1bc6d5
partial fix for failing tests; fix for Windows launcher script; more quiet output
2012-12-28 17:03:35 +04:00
Andrey Kamaev
aabbe11e64
Improve function arguments parsing and checking
...
* always use "argN" names for unnamed arguments
* honor space symbol between typename and "*", "&" symbols
* fix indent errors
2012-12-26 17:55:03 +04:00
Andrey Kamaev
132b5d6435
Merge release 2.4.3.2
2012-12-25 19:07:08 +04:00
Alexander Smorkalov
9ca65ceef8
OpenCV example-tutorial1 does not work on Android emulator (Bug #2656 )
...
Problems with Android 2.3.3 (API level 10) fixed;
Android 2.2 does not work due to unsupported camera frame format (known android-2.2 emulator issue).
2012-12-24 17:49:49 +04:00
Andrey Kamaev
962884cdec
Merge branch 2.4
2012-12-21 17:58:48 +04:00
Eric Christiansen
ad326cb0be
adds desktop java junit tests
2012-12-19 14:28:59 -08:00
Alexander Smorkalov
d7c89fc649
A lot of javadoc warnings duting javadoc build (Bug #2647 ) issue fixed
...
Black list of entities, that are not implemented in Java API added to javadoc generator
2012-12-19 12:53:44 +04:00
Andrey Kamaev
e10ee89ec4
Merge branch 2.4
2012-11-30 19:54:24 +04:00
Alexander Smorkalov
2e5a7284d2
Code review comments applied.
2012-11-27 14:55:49 +04:00
Alexander Smorkalov
0efc32fc21
Attribure loading from layout improved.
...
OpenCV namespace added;
Default values for camera_id added;
Aditional constructor with cameraId added.
Resolution added to FPS message.
2012-11-27 12:47:41 +04:00
Alexander Smorkalov
8266eab8b4
OpenCV app framework improved
...
FPS meter added;
Camera switching posibility added;
Attributes loading for layout filed implemented.
2012-11-27 12:47:41 +04:00
marina.kolpakova
285d6320be
add #/usr/bin/env python to all python files
2012-11-23 22:57:22 +04:00
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
Kirill Kornyakov
2efd9b6ad7
Fixed a couple of minor issues in Javadocs
2012-11-01 22:28:46 +04:00
marina.kolpakova
358fcbd5b6
Merge pull request #115 from asmorkalov:java_test_data_update
2012-11-01 19:29:18 +04:00
Alexander Smorkalov
34896529d5
Review comments applied.
2012-11-01 16:19:11 +04:00
Alexander Smorkalov
a1a2cb0aeb
OpenCV Samples testing problems fixed:
...
Memory leak in color-blob-detection sample fixed;
Default face size in face-detection is set to 20%;
Error handling improved;
Some possible mat leak fixed;
Manager verison and engine interface version incremented to fix incompatibilities;
Docs updated;
2012-10-31 17:24:50 +04:00
Andrey Kamaev
468eefe0ce
Merge branch '2.4'
2012-10-30 15:10:17 +04:00
Alexander
b0106ca25e
Test data form features2d updated.
2012-10-30 15:05:09 +04:00
Alexander Smorkalov
83d8bc8c55
Tutorial 1 updated. Execution time camera switching implemented.
...
Some unification done to simplify camera switching.
2012-10-26 13:30:20 +04:00
Alexander Smorkalov
016b2cadb0
Issue 2473 Service connection leak in OpenCV Manager installation waiting fixed.
...
Some code refactoring done.
2012-10-26 13:30:20 +04:00
Alexander Smorkalov
9217095955
Issue 2472 Android samples crash on Camera.StartPreview on Android 4.1 fixed.
2012-10-26 13:30:20 +04:00
Andrey Kamaev
6211f156e6
Merge 2.4.3-rc
2012-10-24 19:56:27 +04:00
Alexander Smorkalov
4f0f6686d1
Undefind behavior in Async Service Helper fixed.
2012-10-24 12:28:31 +04:00
Alexander Smorkalov
76bcf72ded
2.4.3 version support added to OpenCV Manager. Docs updated. Samples updated.
2012-10-24 09:51:01 +04:00
Alexander Smorkalov
c1d42664bc
Refactring. Bug fix.
2012-10-23 20:06:58 +04:00
Alexander Smorkalov
a942747046
Code review coments fixed. Lint wornings fixed.
2012-10-23 20:06:58 +04:00
Alexander Smorkalov
641ee645ab
New sample framework integrated to Java part of SDK;
...
Frame format setter added to both views.
2012-10-23 20:06:33 +04:00
Alexander Smorkalov
9029acf6f0
openCV application framework moved to modules/java/... folder. Now it is part of OpenCV SDK.
2012-10-23 20:06:33 +04:00
Andrey Kamaev
5bc104cef5
Merge branch '2.4'
2012-10-19 15:00:05 +04:00
Andrey Kamaev
57d077b936
Fix Java API generation after normalization
...
The rst_parser.py was unintentionally corrupted by normalization.
This fix repairs the script and fixes Java API generation.
2012-10-17 18:20:46 +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
ed51162568
Fix binary compatibility of Java wrappers
2012-10-17 02:09:37 +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 Kamaev
a390c1e2e6
Merge pull request #40 from emchristiansen/manualBRISKFREAK
2012-10-12 12:31:11 +04:00
Eric Christiansen
594ce1c869
fixed indentation
2012-10-12 12:31:11 +04:00
Eric Christiansen
caebcdcb3d
Minor tweak to add BRISK and FREAK support for the Java wrapper
2012-10-12 12:31:11 +04:00
Alexander Smorkalov
5a524bdfd7
Issue #1861 Improve Javadoc documentation fixed. Multiline code segments added to Javadoc.
2012-10-11 19:21:40 +04:00
Andrey Kamaev
8f44f25f47
Fix AndroidManifest.xml generation for OpenCV Android library project (second attempt)
2012-10-11 17:09:57 +04:00
Andrey Kamaev
7cb525d63f
Fix AndroidManifest.xml generation for OpenCV Android library project
2012-10-11 15:47:57 +04:00
Alexander Smorkalov
9ad5fd709b
Fixed Javadoc problems with ">" and "<" symbols.
2012-10-10 13:31:03 +04:00
Alexander Smorkalov
306ed9801a
Issue #2284 BaseLoaderCallback requires use of Activity fixed.
2012-10-10 11:44:01 +04:00
Alexander Smorkalov
9a76573172
Auto expand of OpenCV version for Android Library prject and some documentation pages added.
2012-10-09 18:30:58 +04:00
Alexander Smorkalov
4b808b1199
RESTART_REQUIRED status removed from OpenCV Manager API;
...
OpenCV info library name fixed;
Minimum API level for OpenCV library project increased up to 3 for using message dialogs.
2012-10-09 10:34:40 +04:00
Alexander Smorkalov
febfdc9fa2
Wating for OpenCV library package installation added.
2012-10-08 14:37:59 +04:00
Alexander Smorkalov
11839e2cc9
Wating for OpenCV Manager installation added.
2012-10-08 14:37:59 +04:00
Vadim Pisarevsky
b2bf90e951
fixed build errors in java bindings on desktop in Debug mode
2012-10-02 10:49:19 +04:00
Andrey Pavlenko
8c1550a4ec
a new Java test to imencode() with params
2012-09-27 19:11:02 +04:00
Andrey Kamaev
cd05d9aaad
Fix build of Java API for Windows
2012-09-17 13:21:20 +04:00
Andrey Kamaev
fe0d07ae53
Add experimental support for desktop Java
...
Based on pull request #31 (thanks to Eric Christiansen)
Support for Java is turned off by default and can be enabled setting
BUILD_opencv_java to ON (e.g. cmake -DBUILD_opencv_java=ON ..)
2012-09-17 13:21:20 +04:00
Andrey Kamaev
0e9405e591
Honor resently added functionality in hdr_parser and rst_parser; minor fixes in documentation
2012-09-14 22:26:32 +04:00
Andrey Kamaev
e564a53ccd
Add gitignore for Android tests and samples
2012-09-10 15:48:57 +04:00
Andrey Kamaev
70234433d3
Reduce verbosity of Java API generators
2012-09-06 18:54:38 +04:00
Andrey Kamaev
af415085d8
Fix Android build with CMake 2.6.3-2.8.3
2012-09-04 16:21:44 +04:00
Vsevolod Glumov
4d6730dc68
Improved javadoc comments. Minor formatting fix.
2012-08-28 18:51:46 +04:00
Vsevolod Glumov
dc6fa94118
Improved javadoc comments.
2012-08-28 15:49:50 +04:00
Vsevolod Glumov
396e4517ff
Improved javadoc comments. Draft.
2012-08-28 15:01:46 +04:00
Andrey Kamaev
5c01d13f38
Pass list of modules to javadoc generator
...
Previously the generator always uses hardcoded list of modules.
This fix replaces hardcoded list with actual set of modules coming from cmake.
2012-08-27 16:48:09 +04:00
Alexander Smorkalov
14fa645026
Debug build for Android added. Stripping of debug build turned off.
2012-08-14 12:03:05 +04:00
Andrey Pavlenko
4e4db94b6b
removing warnings on deprecated api when targeting to android-15+
2012-07-14 19:07:27 +00:00
Andrey Kamaev
a5b60fa532
Fixed typo in Java wrapper for FetauresDetector class
2012-07-09 10:52:28 +00:00
Andrey Kamaev
620d122fc2
Contrib module is added to java wrappers; fixed algorithm initialisation for python bindings
2012-07-05 07:58:40 +00:00
Andrey Kamaev
b1eba01afb
Fixed several mistakes in documentation
2012-07-05 07:30:45 +00:00
Andrey Kamaev
5f8715c8b4
Fixed file globbing in documentation parsers
2012-07-05 05:11:15 +00:00
Andrey Kamaev
51f6127e0a
Merged the recent fixes from 2.4 branch
2012-07-04 08:04:31 +00:00
Andrey Pavlenko
e2e6838da3
adding CDT Builder (via ndk-build.cmd) for JNI part
2012-07-02 13:15:16 +00:00
Andrey Pavlenko
600ad799c7
restoring binary compatibility with 2.4.1
2012-07-02 11:54:24 +00:00
Alexander Smorkalov
c80d205ecf
OpenCV Library renamed.
2012-07-02 10:07:24 +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
71729a5967
opencv_ts is removed for java API
2012-06-29 08:11:20 +00:00
Andrey Kamaev
5a2ba94dd6
Fixing parallel build for Android
2012-06-28 19:30:39 +00:00
Andrey Kamaev
739da31add
Fixed Android build with SDK tools revision 20
2012-06-28 11:06:31 +00:00
Andrey Pavlenko
8b67adea98
workarounding missing native part in Java tests
2012-06-27 12:38:57 +00:00
Andrey Pavlenko
3804ca3e20
changing package layout after 'make install' for Android build
2012-06-27 06:22:26 +00:00
Andrey Pavlenko
9efc1a689b
fixing project properties
2012-06-26 15:25:00 +00:00
Andrey Pavlenko
ac6061ee8a
hiding extra build-time messages
2012-06-26 13:42:10 +00:00
Andrey Pavlenko
cc54226e12
updating version
2012-06-22 15:19:03 +00:00
Andrey Pavlenko
cf88b9d00c
workarounding service-related changes
2012-06-22 15:18:06 +00:00
Andrey Pavlenko
2984fa751e
adding OpenCV Manager
2012-06-21 14:50:05 +00:00
Andrey Pavlenko
952b25f86f
changing 'java' module layout
2012-06-21 11:44:31 +00:00
Andrey Pavlenko
3af92a9d92
fixing warnings
2012-06-21 09:14:14 +00:00
Andrey Kamaev
d48d7b2b46
Updated warning options for GCC; fixed new warnings.
2012-06-20 12:27:02 +00:00
Andrey Pavlenko
779f4e39de
adding JNI func-s declarations to eliminate build warnings inside Android tree
2012-06-20 08:58:30 +00:00
Andrey Pavlenko
2c786a47d0
fix for #2048 (artificial 'delete' method had wrong JNI signature)
2012-06-20 08:28:43 +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 Kamaev
2f40905548
Fixed Android build
2012-06-08 08:11:17 +00:00
Andrey Kamaev
ae3c754bb3
Fixed Java API build
2012-05-29 17:13:24 +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
40e8d08e8d
Added check for trailing semicolon to rst parser; fixed few documentation build warnings
2012-05-29 10:57:25 +00:00
Andrey Kamaev
05de6302fd
Fixed documentation: corrected parameter names
2012-05-29 10:36:19 +00:00
Andrey Kamaev
7e698726e4
Added new script for checking correctness of documentation
2012-05-28 07:34:49 +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
Andrey Pavlenko
b0dd192d52
fixing #1800
2012-04-17 15:33:18 +00:00
Vadim Pisarevsky
2fd1e2ea57
merged all the latest changes from 2.4 to trunk
2012-04-13 21:50:59 +00:00
Andrey Kamaev
b880bbcc18
Fixed Java API build
2012-04-01 10:19:54 +00:00
Andrey Kamaev
7e5726e251
Fixed several false-positive warnings in rst_parser.py. (Now it detects 553 undocumented parameters for #1205.)
2012-03-30 12:07:45 +00:00
Andrey Pavlenko
64355e88f1
fixing a typo
2012-03-29 15:40:21 +00:00
Andrey Kamaev
94c258cf15
#1205 fixed ~100 of ~700 parameters
2012-03-29 06:50:05 +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 Kamaev
9b2d7e19db
Added "fat" mode for Java wrapper
2012-03-23 17:03:05 +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
5cac6340e4
Java API: temp workaround for Java tests compilation, a better fix will be done with inheritance support
2012-03-11 12:40:51 +00:00
Andrey Pavlenko
53c1565514
Java API: replacing some manual port with auto-generated stuff (/Map-type classes)
2012-03-07 08:16:43 +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
60ddaa565e
fixin a bug in conversion Mat -> List<List<E>>
2012-02-29 12:40:31 +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 Kamaev
00db5a69a2
More granular build of Java API: it is now possible to build Java wrappers only for the subset of OpenCV modules
2012-02-20 11:50:43 +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
fe991052dc
#1283 , adding JavaDoc comments for Mat <->Bitmap converters.
2012-02-15 09:08:39 +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 Kamaev
c19d0b17de
Fixed typo
2012-02-06 12:45:11 +00:00
Andrey Kamaev
49933c798f
Fixed build for desktop
2012-02-06 11:48:15 +00:00
Andrey Kamaev
23af203e00
Better variant of OpenCVConfig.cmake generation; several smaller changes in the options section and Android build scripts
2012-02-06 11:30:59 +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
Andrey Pavlenko
bb33f8dd3c
fixing Java test compilation after API change (distanceTransform() -> distanceTransformWithLabels())
2012-01-26 08:51:16 +00:00
Andrey Kamaev
9d5c24cdc8
Updating opencv module definition in cmake (continued)
2012-01-25 09:04:49 +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
Andrey Kamaev
4525ce56c3
Fixed Android target setup for OpenCv library project
2011-12-01 12:27:03 +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
00be2cf17f
Fixed Android build problem
2011-11-21 13:07:17 +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 Kamaev
e8032fa8e9
Fixed Android build with SDK revision 14
2011-10-21 08:35:34 +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
Andrey Kamaev
1449dd1f02
fixed Java API build (not sure if features2d is wrapped correctly now)
2011-09-07 09:51:26 +00:00
Andrey Pavlenko
1bae6413c1
Java API: generator script whitespace cleanup, adding statistics gathering code
2011-08-26 15:15:15 +00:00
Andrey Pavlenko
3e323e6ff8
Java API: test for Highgui.imencode() is added
2011-08-26 14:39:04 +00:00
Andrey Kamaev
a69c591927
Fixed Android build.
2011-08-15 07:03:22 +00:00
Andrey Kamaev
6c767b281e
Java API: generated test stubs for 2 new functions
2011-08-12 08:14:51 +00:00
Andrey Kamaev
7c8a49b475
Java API: Removed meaningless tests
2011-08-11 07:21:28 +00:00
Andrey Kamaev
1863f58a67
Java API: generated test stubs for recently added functions/classes
2011-08-10 16:57:15 +00:00
Andrey Kamaev
ebb08bc015
Java API: Fixed bug in Mat port; fixed/implemented all java tests for core module
2011-08-10 15:56:47 +00:00
Andrey Kamaev
92afe9e40a
Java API: fixed input List<List<smth>> arguments
2011-08-10 14:09:22 +00:00
Andrey Kamaev
25261e6ebc
Added new tests written by Hussein Abdinoor; Added support for new classes in features2d and imgproc
2011-08-10 12:35:22 +00:00
Andrey Kamaev
1248775177
Java API: added JNI_OnLoad to eliminate jvm warnings
2011-08-09 14:58:24 +00:00
Andrey Kamaev
b319e7f403
Java API: added support for BruteforceMatcher-SL2
2011-08-09 12:52:47 +00:00
Andrey Kamaev
d9d74678a9
Java API: corrected names of methods in Utils class; fixed bug in DMatch (thank for Hussein Abdinoor); added new utility method loadResource
2011-08-09 11:46:27 +00:00
Andrey Kamaev
0a2c7803b6
Fixed mixChannels argument types
2011-08-08 07:08:58 +00:00
Andrey Kamaev
b486a96601
Java API: refactored Core tests
2011-08-08 05:16:31 +00:00
Andrey Kamaev
99e3b5a24e
Java API: cleaned imgproc tests; changed signatures of several java functions
2011-08-06 21:19:23 +00:00
Andrey Kamaev
6aa1eafc27
Java API: added ticket number to failed test
2011-08-06 12:17:00 +00:00
Andrey Kamaev
c16f018afd
mc
2011-08-06 10:03:24 +00:00
Andrey Kamaev
1991440cf7
Java API:
...
* fixed manually ported classes;
* added vector<vector<Point>> support;
* changed argument types for 3 functions;
* finished tests for org.opencv.core.Core class.
2011-08-06 09:22:07 +00:00
Andrey Kamaev
6d9075812f
Java tests: fixed 1 test in core and 1 disabled
2011-08-05 16:33:46 +00:00
Andrey Kamaev
cb2b28636f
Java tests: removed test_1
2011-08-05 15:49:08 +00:00
Andrey Kamaev
a46da86325
Java API: fixed script for coverage calculation
2011-08-05 13:04:14 +00:00
Andrey Kamaev
39c5eb2f66
Java API: new tests for Core and Imgproc from Hussein Abdinoor
2011-08-05 11:59:45 +00:00
Andrey Kamaev
a0590273e9
Java API: fixed problems in video and ml modules; generated test stubs for all exported functions (now we have 1701 tests).
2011-08-05 08:39:28 +00:00
Andrey Pavlenko
10444f4e50
Java API: vector_vector support for KeyPoint/DMatch/char
...
Testing: 1178/4/576
2011-08-04 14:24:30 +00:00
Andrey Kamaev
874196e384
Implemented read/write methods for FlannBasedMatcher; fixed features2d wrappers for java
2011-08-04 14:13:07 +00:00
Andrey Pavlenko
70caece001
Java API: fitEllipse arg type is changed to List<Point>, test is updated as well
...
Testing: 1176/4/580
2011-08-04 12:00:53 +00:00
Andrey Pavlenko
024482adac
Java API: (per code review) adding check (data.length % CvType.channels(t) != 0) for Mat:: put/get, adding 2 tests for them
...
Testing: 1176/4/580
2011-08-04 11:45:48 +00:00
Andrey Pavlenko
3f22bd6dff
Java API: fixed wrong JNI name for native delete()
2011-08-04 11:13:09 +00:00
Andrey Kamaev
13185ad8f7
Implemented read/write methods for BriefDescriptorExtractor class
2011-08-04 09:56:10 +00:00
Andrey Kamaev
28732d4300
Java API: added tests for SiftDescriptorExtractor and OrbDescriptorExtractor
2011-08-04 06:21:17 +00:00
Andrey Kamaev
6944c0dba4
JavaAPI: fixed typo; some constants are moved to private section; added tests for BruteForceMatcher-Hamming
2011-08-03 19:46:30 +00:00
Andrey Kamaev
cc6b7edf95
Java API: added wrapper for GenericDescriptorMatcher
2011-08-03 16:17:33 +00:00
Andrey Pavlenko
790ff8f42a
Java API: minEnclosingCircle() fixed (float& -> float[])
...
Testing: 1130/0/584
2011-08-03 15:23:33 +00:00
Andrey Kamaev
e1cd84bb25
Java API: added and fixed several tests
2011-08-03 15:14:55 +00:00
Kirill Kornyakov
19c3cf45cc
java tests: deleted image writing to sdcard
2011-08-03 14:59:30 +00:00
Kirill Kornyakov
66e79167ee
java tests: updated testFillConvexPolyMatMatScalarIntInt, testFitEllipse colorWhite added
2011-08-03 14:18:26 +00:00
Andrey Pavlenko
8b16dbe791
Java API: calcOpticalFlowPyrLK() args types are changed to vector<>
...
Testing: 1130/0/585
2011-08-03 13:31:51 +00:00
Andrey Kamaev
7d513a6671
Java API: added tests for FlannBased DescriptorMatcher
2011-08-03 13:20:01 +00:00
Kirill Kornyakov
2a47ab6e08
java tests: minor updates
2011-08-03 13:12:39 +00:00
Andrey Kamaev
2d820d2321
Java API: added tests for BruteForceMatcher (L1)
2011-08-03 12:57:19 +00:00
Andrey Kamaev
472820d889
Java API: added tests for BruteForceMatcher (L2)
2011-08-03 12:49:52 +00:00
Andrey Pavlenko
fa0daa4809
Java API: fixing converters (copyData=true) and samples compilation
...
Testing: 1079/0/592
2011-08-03 11:57:00 +00:00
Kirill Kornyakov
43628ab868
java: bugfix in RotatedRect, one test fixed
2011-08-03 09:43:36 +00:00
Andrey Kamaev
69588dfabf
Java API: fixed bugs; added tests for SURF and BRIEF descriptor extractors
2011-08-03 09:27:50 +00:00
Kirill Kornyakov
f81e6f82f5
Android.mk now automatically founds all cpp-files
2011-08-03 09:11:13 +00:00
Andrey Pavlenko
25db453812
Java API: (per code review) renaming and moving utility classes
...
Testing: 1079/0/584
2011-08-03 08:53:27 +00:00
Andrey Pavlenko
02d5d93c3a
Java API: code clean-up
...
Testing: total 1079, failures 584, errors 0.
2011-08-03 08:19:06 +00:00
Andrey Kamaev
1890a0ae9a
Java API: added new tests for SURF and STAR feature detectors
2011-08-02 16:10:58 +00:00
Andrey Kamaev
257c0bf413
Java API: Fixed typo
2011-08-02 15:14:13 +00:00
Andrey Pavlenko
f1d24e1868
Java API: adding missing class
2011-08-02 15:00:00 +00:00
Andrey Pavlenko
2c5e79507d
Java API: new types and converters are added, jni suffixes changed
2011-08-02 14:56:47 +00:00
Andrey Kamaev
99b8e2db14
Java API: added tests for FAST feature detector
2011-08-02 14:32:43 +00:00
Kirill Kornyakov
d87f513b4f
java tests: addede tests for Converter and core classes by Hussein Abdinoor
2011-08-02 13:47:40 +00:00
Andrey Pavlenko
f4e28f87d8
Java API: new converters, findFundamentalMat/cornerSubPix/findHomography/solvePnP/solvePnPRansac and their tests are updated
2011-08-02 13:10:23 +00:00
Andrey Kamaev
6be846aa52
Java API: string constants for features2d classes are converted to enums
2011-08-02 11:40:41 +00:00
Andrey Kamaev
d5d897b7cb
Java API: added support for read/write functions in features2d
2011-08-02 10:58:26 +00:00
Andrey Pavlenko
d86605f6a7
Java API: class KDTree is added to ignore list, JNI funcs names for renamed classes are fixed
2011-08-02 08:45:06 +00:00
Andrey Pavlenko
36a5b6e215
Java API: tests are updated after randu/randn args types changes
2011-08-02 07:57:09 +00:00
Andrey Pavlenko
96ca253a00
Java API: added class pointer ret type support, CV_EXPORTS_AS(x) support for classes, vector<T> as ret type support, randu/randn params type changed to double
2011-08-01 16:11:24 +00:00
Andrey Kamaev
d8b93b3569
Minor bugfix.
2011-08-01 15:06:11 +00:00
Andrey Kamaev
10ea580fa8
Java API: Added more classes from features2d.
2011-08-01 14:31:38 +00:00