641bb7ac6b
Merge pull request #1737 from vrabaud:2.4
2013-11-07 12:03:30 +04:00
0b1df62215
add VERBATIM as advised by @SpecLad
2013-11-05 12:02:22 +01:00
3b0108e4c1
fix the crash as suggested by @SpecLad
2013-11-05 11:18:20 +01:00
e1b2f593d6
fix crash when path has spaces
...
The paths are defined properly with an escape "\ " but you cannot have an escape and
quotes when piping (otherwise, escapes are understood as 2 characters).
So just remove the quotes.
2013-11-01 19:30:58 +01:00
f027cf80f7
OpenCV Version++. OpenCV Manager Version++.
2013-11-01 15:22:34 +04:00
a88360bea6
minor refactoring of Android VideoCapture jni code to make it similar to generated one
2013-10-31 12:42:12 +04:00
994e07db07
Bug #3276 Java bindings binary compatibility is broken in branch 2.4 fixed.
...
New version of Java wrappers' generator uses different wrappers for VideoCapture
on Android and desktop to prevent binary compatibility issues.
2013-10-30 12:51:49 +04:00
4b17d073c0
cmake: fix linker dependencies for opencv_java
...
Linker dependencies to all OpenCV modules are invalid.
We should not include other bindings in this list (like "opencv_python").
2013-10-24 19:04:59 +04:00
d411041c53
Merge pull request #1637 from SpecLad:run-py-java-fix
2013-10-17 12:25:31 +04:00
5bb6949bd6
Fix running Java tests with run.py on everything other than Windows.
...
Previously, run.py would assume that the opencv_java library is in the
same directory as the tests, which is only true on Windows.
The library path depends on the build configuration, which may not be
known until the actual build (e.g. with the Visual Studio generators),
so it can't be stored in the CMake cache for run.py to read. I didn't
want to hardcode into run.py where the library is on each platform,
either. So that's why I used the current scheme with the properties
file. It also makes running the tests without run.py a little easier.
2013-10-16 19:22:01 +04:00
2a9d24323c
cmake: add opencv_java into list of exported targets (fix for android)
2013-10-16 17:23:44 +04:00
b420c0b160
Merge pull request #1630 from SpecLad:java-deprecated-assert
2013-10-15 18:36:15 +04:00
a61d1e6494
Delete an import of junit.framework.Assert, which is deprecated in JUnit 4.x.
...
We don't use it, anyway.
2013-10-15 17:10:12 +04:00
7ff91665cf
In Java bindings, wrap version constants into functions to prevent inlining.
...
Java inlines static finals if they're defined with a constant expression. In
case of version constants we don't want that to happen, since they obviously
change from version to version. If the user substitutes a different OpenCV
jar without recompiling, we want user code to still have relevant values for
the version constants.
This arranges that by turning constant values into function calls, which no
longer count as a constant expression.
2013-10-15 15:44:26 +04:00
bc089bb18c
cmake: update java module install rules
2013-10-09 17:49:11 +04:00
98cb1dcc9a
MediaRecorder hint enabled for all Android devices with API level 14 and above.
...
It increases performance on some devices like Nexus4.
Target Android SDK version increased up to 14.
2013-09-10 18:05:45 +04:00
6ebfa87181
Delete a bunch more trailing whitespace that slipped through the cracks.
2013-09-04 16:13:27 +04:00
3c137f7a04
Converted tabs to spaces.
2013-08-21 18:59:26 +04:00
e9a28f66ee
Normalized file endings.
2013-08-21 18:59:25 +04:00
f55740da70
Deleted all trailing whitespace.
2013-08-21 18:59:24 +04:00
e37f7a4c73
Typo in Java generator fixed.
...
Typo breaks debug build for Android platform.
2013-08-19 16:27:06 +04:00
5a9bd3f080
restoring binary compatibility
2013-08-15 23:49:32 +04:00
f3b1933a92
LinkedList -> ArrayList
2013-08-13 15:51:37 +04:00
4902db1c42
also fixing JNI library name in JUnit tests
2013-08-13 13:18:01 +04:00
d4e098f401
enabling of VideoCapture(String) [fixing issue #3207 ]
...
- enable auto-wrap of VideoCapture;
- minor refactoring of generated code templates.
2013-08-13 12:04:36 +04:00
b2d1d87ed1
Merge pull request #1225 from apavlenko:fix_format_security
2013-08-05 12:58:37 +04:00
7b0734caf9
fixing java test after fix in OpenCV library
2013-08-05 11:45:17 +04:00
a06891851d
fixing compilation with -Werror=format-security enabled
2013-08-05 11:11:54 +04:00
d6b86d43c9
removed declaration of throwJavaException
2013-07-25 14:53:22 +02:00
70930a30a1
refactored throwJavaException() and removed useless returns
2013-07-25 13:36:27 +02:00
925e4eec98
removed multiplied code for exception handling
2013-07-24 17:27:03 +02:00
1b38d1e6b7
Merge pull request #1150 from janstarzy:spelling
2013-07-19 12:15:31 +04:00
9bf216742f
fixed cpackage -> package
2013-07-18 15:33:25 +02:00
ee42b65063
corrected some spelling errors
2013-07-18 13:24:55 +02:00
12c42ac145
fixed strings in n1_dims(): n1_dcols() -> n1_dims()
2013-07-17 18:41:54 +02:00
1ccfa62f4f
adding method dims() to core.Mat
2013-07-17 15:04:34 +02:00
91b713b8c9
JavaCameraView delivers same frame twice (Bug #3123 ) fixed.
2013-07-02 12:58:59 +04:00
43632bf973
Merge pull request #1065 from apavlenko:fix_eclipse_warning
2013-06-28 19:32:44 +04:00
6069967109
removing unused import
2013-06-28 17:28:57 +04:00
aef347e7b3
Removed references to opencv.itseez.com
2013-06-28 12:48:12 +04:00
e241c14b94
OpenCV Library and Manager version incremented.
...
OpenCV Version 2.4.6;
OpenCV Manager Version 2.8;
Doc fixes.
2013-06-27 12:05:25 +04:00
748210e11b
Merge pull request #994 from asmorkalov:android_java_wrappers
2013-06-18 16:46:04 +04:00
16c4aad36d
Java/Python bindings for computeCorrespondEpilines added.
...
Simle Java test for computeCorrespondEpilines added.
2013-06-18 16:44:23 +04:00
83e9b0a87a
Javadoc waring fix.
2013-06-13 12:40:14 +04:00
264d26e671
fixing empty Mat case
2013-06-08 12:41:57 +04:00
97e9368e75
Simple set of the camera index to allow the user to change it after the object has been initialized.
2013-05-19 22:04:56 -04:00
2faa2adae2
Merge pull request #846 from smart-mobile-software:tuto_crash
2013-05-07 15:15:16 +04:00
bef6de9025
Fix tuto3 picture taken crash on all devices
...
A modification of the JavaCameraView is needed to avoid a crash when the
app is exited. It is a good practice to remove the callback after the
stopPreview method.
2013-05-01 16:58:15 +02:00
456c56fe90
NullPointerException in case of error on opening native camera fixed.
2013-04-29 11:00:52 +04:00
5ce4e3c265
Merge pull request #800 from asmorkalov:android_cam_idx_semantic
2013-04-29 10:00:08 +04:00
Roman Donchenko