Roman Donchenko
615d6c22d1
Switched OpenCV to a 3-component version number.
...
Epoch is gone; now the version component names in C++ and CMake
are consistent (except REVISION corresponds to PATCH).
11 years ago
Roman Donchenko
65389e41db
Revert commit 994e07db0
(PR #1715 ), because it's irrelevant for master.
...
Conflicts:
modules/java/generator/src/cpp/VideoCapture.cpp
11 years ago
Vincent Rabaud
0b1df62215
add VERBATIM as advised by @SpecLad
11 years ago
Vincent Rabaud
3b0108e4c1
fix the crash as suggested by @SpecLad
11 years ago
Vincent Rabaud
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.
11 years ago
Alexander Smorkalov
f027cf80f7
OpenCV Version++. OpenCV Manager Version++.
11 years ago
Andrey Pavlenko
a88360bea6
minor refactoring of Android VideoCapture jni code to make it similar to generated one
11 years ago
Alexander Smorkalov
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.
11 years ago
Alexander Alekhin
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").
11 years ago
Roman Donchenko
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.
11 years ago
Alexander Alekhin
2a9d24323c
cmake: add opencv_java into list of exported targets (fix for android)
11 years ago
Roman Donchenko
a61d1e6494
Delete an import of junit.framework.Assert, which is deprecated in JUnit 4.x.
...
We don't use it, anyway.
11 years ago
Roman Donchenko
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.
11 years ago
Alexander Alekhin
bc089bb18c
cmake: update java module install rules
11 years ago
Roman Donchenko
b525c28244
Updated the Java bindings and docs to support the version status.
11 years ago
Alexander Smorkalov
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.
11 years ago
Vladislav Vinogradov
0c7663eb3b
Merge branch 'master' into gpu-cuda-rename
...
Conflicts:
modules/core/include/opencv2/core/cuda.hpp
modules/cudacodec/src/thread.cpp
modules/cudacodec/src/thread.hpp
modules/superres/perf/perf_superres.cpp
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/optical_flow.cpp
modules/videostab/src/global_motion.cpp
modules/videostab/src/inpainting.cpp
samples/cpp/stitching_detailed.cpp
samples/cpp/videostab.cpp
samples/gpu/stereo_multi.cpp
11 years ago
Roman Donchenko
2f942efdf7
Java: removed usages of Ptr<T>::addref().
...
Now the features2d class wrappers use composition instead of inheritance.
11 years ago
Roman Donchenko
6ebfa87181
Delete a bunch more trailing whitespace that slipped through the cracks.
11 years ago
Vladislav Vinogradov
a41006754e
fix documentation
11 years ago
Roman Donchenko
3c137f7a04
Converted tabs to spaces.
11 years ago
Roman Donchenko
e9a28f66ee
Normalized file endings.
11 years ago
Roman Donchenko
f55740da70
Deleted all trailing whitespace.
11 years ago
Alexander Smorkalov
e37f7a4c73
Typo in Java generator fixed.
...
Typo breaks debug build for Android platform.
11 years ago
Andrey Pavlenko
5a9bd3f080
restoring binary compatibility
11 years ago
Andrey Pavlenko
f3b1933a92
LinkedList -> ArrayList
11 years ago
Andrey Pavlenko
4902db1c42
also fixing JNI library name in JUnit tests
11 years ago
Andrey Pavlenko
d4e098f401
enabling of VideoCapture(String) [fixing issue #3207 ]
...
- enable auto-wrap of VideoCapture;
- minor refactoring of generated code templates.
11 years ago
Roman Donchenko
48a6edbdfe
Fixed compilation errors.
11 years ago
Andrey Pavlenko
7b0734caf9
fixing java test after fix in OpenCV library
11 years ago
Andrey Pavlenko
a06891851d
fixing compilation with `-Werror=format-security` enabled
11 years ago
Jan Starzynski
d6b86d43c9
removed declaration of throwJavaException
12 years ago
Jan Starzynski
70930a30a1
refactored throwJavaException() and removed useless returns
12 years ago
Jan Starzynski
925e4eec98
removed multiplied code for exception handling
12 years ago
Jan Starzynski
9bf216742f
fixed cpackage -> package
12 years ago
Jan Starzynski
ee42b65063
corrected some spelling errors
12 years ago
Jan Starzynski
12c42ac145
fixed strings in n1_dims(): n1_dcols() -> n1_dims()
12 years ago
Jan Starzynski
1ccfa62f4f
adding method dims() to core.Mat
12 years ago
Alexander Smorkalov
91b713b8c9
JavaCameraView delivers same frame twice (Bug #3123 ) fixed.
12 years ago
Andrey Pavlenko
6069967109
removing unused import
12 years ago
Kirill Kornyakov
aef347e7b3
Removed references to opencv.itseez.com
12 years ago
Alexander Smorkalov
e241c14b94
OpenCV Library and Manager version incremented.
...
OpenCV Version 2.4.6;
OpenCV Manager Version 2.8;
Doc fixes.
12 years ago
Alexander Smorkalov
16c4aad36d
Java/Python bindings for computeCorrespondEpilines added.
...
Simle Java test for computeCorrespondEpilines added.
12 years ago
Andrey Pavlenko
01e9733155
fix for #3077
...
removing "-fvisibility=hidden" gcc option due to lack of `__attribute__ ((visibility("default")))` in jni_md.h/JNIEXPORT
12 years ago
Alexander Smorkalov
83e9b0a87a
Javadoc waring fix.
12 years ago
Andrey Pavlenko
438649ffee
fixing Java wrapper for mixChannels
...
'dst' should be treated as an input arg (epilog not needed)
12 years ago
Andrey Pavlenko
264d26e671
fixing empty Mat case
12 years ago
Andrey Pavlenko
c2d3ce9ce5
fix failing test
...
small matrix becomes the same after shuffling
12 years ago
Andrey Pavlenko
c7873dd03d
fixing broken Mat::dump() in Java
12 years ago
ograycode
97e9368e75
Simple set of the camera index to allow the user to change it after the object has been initialized.
12 years ago