Roman Donchenko
65389e41db
Revert commit 994e07db0
(PR #1715 ), because it's irrelevant for master.
...
Conflicts:
modules/java/generator/src/cpp/VideoCapture.cpp
12 years ago
Andrey Pavlenko
a88360bea6
minor refactoring of Android VideoCapture jni code to make it similar to generated one
12 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.
12 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
12 years ago
Roman Donchenko
2f942efdf7
Java: removed usages of Ptr<T>::addref().
...
Now the features2d class wrappers use composition instead of inheritance.
12 years ago
Roman Donchenko
e9a28f66ee
Normalized file endings.
12 years ago
Roman Donchenko
f55740da70
Deleted all trailing whitespace.
12 years ago
Andrey Pavlenko
5a9bd3f080
restoring binary compatibility
12 years ago
Andrey Pavlenko
d4e098f401
enabling of VideoCapture(String) [fixing issue #3207 ]
...
- enable auto-wrap of VideoCapture;
- minor refactoring of generated code templates.
12 years ago
Roman Donchenko
48a6edbdfe
Fixed compilation errors.
12 years ago
Andrey Pavlenko
a06891851d
fixing compilation with `-Werror=format-security` enabled
12 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
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
Andrey Pavlenko
c7873dd03d
fixing broken Mat::dump() in Java
12 years ago
Andrey Kamaev
dd74a851f3
Fix build errors
12 years ago
Andrey Kamaev
0738ea7d0f
Make highgui.hpp independent from C API
12 years ago
Andrey Kamaev
940eedfb27
Finalize core headers reorganization
12 years ago
Andrey Kamaev
2b1ef95415
Completely separate C and C++ API of OpenCV core
12 years ago
Andrey Pavlenko
bbf43e8b16
fix for bug #2912 (DescriptorExtractor::compute Java wrapper loses native arg change)
12 years ago
Andrey Kamaev
be7bbe3aa9
Drop cv:: prefix from cv::String used inside the cv namespace
12 years ago
Andrey Kamaev
688d170de7
Java wrapper is adapted for cv::String
12 years ago
Andrey Kamaev
89356ff16d
Move non-CV functionality from core.hpp to separate utility.hpp header
12 years ago
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>
12 years ago
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.
12 years ago
Andrey Kamaev
a441980d68
Fix debug build of Java warppers
12 years ago
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
12 years ago
Andrey Kamaev
4668a133f0
Java API: fix build warning on OS X
...
Common part of all source files is extracted to special header
12 years ago
Andrey Kamaev
bf3c2b0bbb
Fix incorrect Mat address reconstruction on 64-bit platforms
...
This fixes random failures in Java wrappers.
12 years ago
OpenCV Buildbot
81f826db2b
Normalize line endings and whitespace
13 years ago
OpenCV Buildbot
04384a71e4
Normalize line endings and whitespace
13 years ago
Andrey Kamaev
ed51162568
Fix binary compatibility of Java wrappers
13 years ago
Eric Christiansen
594ce1c869
fixed indentation
13 years ago
Eric Christiansen
caebcdcb3d
Minor tweak to add BRISK and FREAK support for the Java wrapper
13 years ago
Vadim Pisarevsky
b2bf90e951
fixed build errors in java bindings on desktop in Debug mode
13 years ago
Andrey Kamaev
cd05d9aaad
Fix build of Java API for Windows
13 years ago
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 ..)
13 years ago
Andrey Kamaev
a5b60fa532
Fixed typo in Java wrapper for FetauresDetector class
13 years ago
Andrey Kamaev
620d122fc2
Contrib module is added to java wrappers; fixed algorithm initialisation for python bindings
13 years ago
Andrey Kamaev
088a6597bc
Merged the trunk 8855,8885,8886
13 years ago
Andrey Pavlenko
600ad799c7
restoring binary compatibility with 2.4.1
13 years ago
Andrey Pavlenko
a72f4474b4
fixing bug #1987(android keeps RGBA in alpha pre-multiplied form, Mat <-> Bitmap should handle this correctly)
13 years ago
Marina Kolpakova
01570fa800
merged Android Manager and new java layout
13 years ago
Andrey Pavlenko
952b25f86f
changing 'java' module layout
13 years ago