generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
19,407 Commits 3 Branches 47 Tags
a2921fdede34fb0a586fdea59318fbeb47d03174
Commit Graph

65 Commits

Author SHA1 Message Date
Marek Smigielski
ef45005056 Adding support for pointer generation. Fixes #6605 2016-05-31 08:35:50 +02:00
dharezlak
308b47ce58 Improved Java wrapper generation 
While generating Java JNI wrappers package names with an underscore (`_`) character where not properly escaped according to https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/design.html#resolving_native_method_names (see also: https://github.com/Itseez/opencv_contrib/issues/652).

This fix replaces all the occurrences of `_` with `_1` resulting in proper JNI method names.
 2016-05-23 11:13:18 +02:00
Jason von Nieda
f4b502dd03 Adds supports for the majority of features2d to the Java wrappers: 
* Adds the main features2d header to the parse list for the generator.
* Removes the manual definition of drawKeypoints and drawMatches since these are now included in the main header.
* Updates the generator to ignore SimpleBlobDetector, FlannBasedMatcher and DescriptorMatcher as these cause conflicts with the generator. This is okay since these were not previously included in the distribution anyway, so no harm is done.
 2016-03-07 00:14:53 -08:00
Maksim Shabunin
5ebc7f0b72 Simple Moments class for Java 2015-12-16 10:53:14 +03:00
Maksim Shabunin
6e9d0d9a0c Visual Studio 2015 warning and test fixes 2015-10-20 12:48:37 +03:00
Maksim Shabunin
31fbe8caeb Merge pull request #5255 from berak:java_videowriter 2015-09-11 11:09:16 +00:00
berak
a11ff876d4 enable VideoWriter class for java 
fixing fourcc
 2015-08-27 08:04:58 +02:00
Alexander Alekhin
bbff288447 fix build with python3 only 2015-08-26 13:08:06 +03:00
Maksim Shabunin
caffbaafbe Updated Manager for Android 2015-06-02 17:33:04 +03:00
Andrey Pavlenko
c1c03e16f4 releasing native memory of temp Mat objects in generated Java code 2015-05-26 13:50:56 +03:00
Andrey Pavlenko
ab8afc3bcc Revert of "Merge pull request #4006 from sgjava:opencv-steve" (reverted from commit 4743184078) 2015-05-19 18:55:57 +03:00
Andrey Pavlenko
d67d32af48 Revert of "Merge pull request #4014 from sgjava:opencv-sgjava" (reverted from commit 52fa55a770) 2015-05-19 13:30:18 +03:00
sgjava
fe0ce9282a Changed delete() modifier to public from protected 2015-05-13 13:44:53 -04:00
sgjava
0f53526598 Added VideoWriter and changed finalize to delete 2015-05-12 14:18:39 -04:00
Prof. Dr. Rudolf Haussmann
9f1eb70dbc Changes to be committed: 
(use "git reset HEAD <file>..." to unstage)

	modified:   modules/java/generator/gen_java.py
	modified:   modules/videoio/include/opencv2/videoio.hpp
	modified:   modules/videoio/include/opencv2/videoio/videoio_c.h
	modified:   modules/videoio/src/cap_dshow.cpp
	modified:   modules/videoio/src/cap_pvapi.cpp

Following changes have been made:
1. Some minor bugs have been removed.
2. In the PvAPI module the option CAP_PROP_MONOCROME has been removed because
   this option does not make sense and causes an error if a color camera is used.
3. Instead the new option CAP_PROP_PVAPI_PIXELFORMAT has been added which allows
   to activate the different pixel formats (color modes) of an AVT camera.
4. Since there were two identical defines
   CAP_PROP_MONOCROME = 19
   CAP_PROP_MONOCHROME = 19
   which were also used in the other module DSHOW, the first one with an orthographic
   error has been removed in favor of the second one.
 2015-03-07 12:53:32 +01:00
Maksim Shabunin
457123027e Modified java wrapping mechanism 2015-03-02 18:12:30 +03:00
Maksim Shabunin
c5a1650ac0 Refactoring in gen_java.py script 2014-10-17 19:36:24 +04:00
Maksim Shabunin
0d7b44db50 Java wrappers now support nested namespaces and classes 
- wrapper support python3
- added wrapper log
- generating full name for nested namespaces and classes
 2014-09-22 11:47:03 +04:00
Vadim Pisarevsky
458bde5e24 Merge pull request #3180 from mshabunin:java_ptr_support 2014-09-17 12:07:43 +00:00
Maksim Shabunin
39874ef742 Fixed some failing java tests 
- fixed lena.png extension
- fixed getTextSize wrapper
- added junit html report generation
 2014-09-11 11:56:05 +04:00
Maksim Shabunin
b3bae170ed Fixed java tests build 
- disabled xfeature2d dependency for java wrappers
- fixed java wrappers build after cmake rerun
- disabled opencv_ml tests temporarily
- fixed Imgproc usage in java tests
 2014-09-08 18:30:03 +04:00
Maksim Shabunin
66ed9ddbe3 Added Ptr<T> support to Java wrappers 2014-09-01 11:24:44 +04:00
Vadim Pisarevsky
75487d43f5 fixed trailing whitespaces 2014-08-14 14:53:02 +04:00
Vadim Pisarevsky
00b2124876 fixing more compile problems with Java bindings etc 2014-08-14 13:48:52 +04:00
vbystricky
d58f736935 Split highgui module to videoio and highgui 2014-07-14 23:16:47 +04:00
Alexander Alekhin
5474935a81 fixes for defects from code coverity 2014-01-28 20:24:10 +04:00
Roman Donchenko
3c4b24d531 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	CMakeLists.txt
	modules/highgui/src/cap.cpp
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/color.cpp
	modules/ocl/src/gftt.cpp
	modules/ocl/src/imgproc.cpp
	samples/ocl/facedetect.cpp
 2013-12-23 18:50:17 +04:00
Vladimir Bystricky
66145ea06c Add CV_CAP_INTELPERC and CV_CAP_PROP_INTELPERC_ prefixes to const_ignore_list 2013-12-18 10:55:09 +04:00
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).
 2013-11-15 19:41:53 +04:00
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.
 2013-10-30 12:51:49 +04:00
Roman Donchenko
4036f6a3d0 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	apps/CMakeLists.txt
	modules/contrib/CMakeLists.txt
	modules/core/include/opencv2/core/version.hpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/java/generator/gen_java.py
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/cl_runtime/cl_runtime.cpp
	modules/ocl/src/columnsum.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/test/main.cpp
	modules/ocl/test/test_color.cpp
	modules/ocl/test/test_imgproc.cpp
	samples/gpu/CMakeLists.txt
 2013-10-22 14:28:00 +04:00
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.
 2013-10-15 15:44:26 +04:00
Roman Donchenko
b525c28244 Updated the Java bindings and docs to support the version status. 2013-09-12 16:39:14 +04:00
Roman Donchenko
4d06c4c7b6 Merge commit '43aec5ad^' into merge-2.4 
Conflicts:
	modules/contrib/src/inputoutput.cpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpuarithm/perf/perf_element_operations.cpp
	modules/gpuarithm/src/element_operations.cpp
	modules/ts/src/precomp.hpp
 2013-08-27 13:23:26 +04:00
Roman Donchenko
e9a28f66ee Normalized file endings. 2013-08-21 18:59:25 +04:00
Roman Donchenko
f76dd99299 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	cmake/OpenCVModule.cmake
	doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
	doc/tutorials/features2d/feature_detection/feature_detection.rst
	doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
	doc/tutorials/features2d/feature_homography/feature_homography.rst
	modules/core/include/opencv2/core/operations.hpp
	modules/core/src/arithm.cpp
	modules/gpu/perf/perf_video.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/java/generator/gen_java.py
	modules/java/generator/src/cpp/VideoCapture.cpp
	modules/nonfree/src/opencl/surf.cl
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_precomp.hpp
	modules/ocl/src/color.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/test/test_color.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/python/src2/cv2.cpp
	samples/gpu/CMakeLists.txt
	samples/gpu/super_resolution.cpp
 2013-08-19 19:02:36 +04:00
Alexander Smorkalov
e37f7a4c73 Typo in Java generator fixed. 
Typo breaks debug build for Android platform.
 2013-08-19 16:27:06 +04:00
Andrey Pavlenko
f3b1933a92 LinkedList -> ArrayList 2013-08-13 15:51:37 +04:00
Andrey Pavlenko
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
Andrey Pavlenko
438649ffee fixing Java wrapper for mixChannels 
'dst' should be treated as an input arg (epilog not needed)
 2013-06-10 14:37:01 +04:00
Andrey Kamaev
3b364330ad Merge branch '2.4' 2013-04-12 15:35:38 +04:00
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
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
49f6dad13f Move cv::KeyPoint and cv::DMatch to core 2013-03-26 16:08:43 +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
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
9e12b7c3c2 Merge release 2.4.4 2013-03-04 19:43:49 +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