abratchik
78874c568e
fix java wrapper autotests
2016-10-31 10:06:32 +04:00
Alexander Alekhin
1ae27eb696
Merge pull request #7476 from abratchik:java.wrapper.fix.3.1
2016-10-15 09:21:45 +00:00
abratchik
4207ebbce7
fix for VideoCapture crash
2016-10-15 08:16:31 +04:00
Maksim Shabunin
699c25a4be
Merge pull request #7471 from alalek:fix_java_generator
2016-10-13 15:21:39 +00:00
abratchik
084c595855
fix for legacy FeatureDetector and DescriptorMatcher classes
2016-10-13 14:45:59 +04:00
Vadim Pisarevsky
4ed40fd694
Merge pull request #7432 from abratchik:java.wrapper.fix.3.1
2016-10-12 19:54:03 +00:00
Alexander Alekhin
c16c803fe9
java: integrate code from base modules
...
To resolve undefined "Mat_to_vector_KeyPoint" error
2016-10-12 18:01:51 +03:00
abratchik
789b35d813
improved fix for java wrapper generator (gen_java.py) to avoid generation of java methods with duplicate signatures(v3)
2016-10-11 02:47:02 +04:00
Alexander Alekhin
714db4cf0d
java: fix Ptr<> code generation
...
Before:
Ptr<Dictionary>((cv::aruco::Dictionary*)dictionary_nativeObj)
After:
Ptr<cv::aruco::Dictionary>((cv::aruco::Dictionary*)dictionary_nativeObj)
2016-10-08 02:19:43 +03:00
Alexander Alekhin
5da8d65371
eliminate compiler warnings
2016-10-08 02:19:43 +03:00
abratchik
be028d0774
fix for #7420 , #7421
2016-10-07 23:58:57 +04:00
Jcrist99
770c69a978
fix for feature2d java wrappers as described in this post: http://ans … ( #7372 )
...
* fix for feature2d java wrappers as described in this post: http://answers.opencv.org/question/101675/surfsift-java-wrapper-for-opencv-3xosx-1011/
* fix for feature2d java wrappers as described in this post: http://answers.opencv.org/question/101675/surfsift-java-wrapper-for-opencv-3xosx-1011/
* rollback of one change as requested (similar change already merged)
2016-10-06 15:48:26 +03:00
Vadim Pisarevsky
a799cc13d9
Merge pull request #6078 from PolarNick239:master
2016-10-05 17:27:23 +00:00
mshabunin
7a7a2749e0
Fixed java wrappers
2016-09-30 16:21:04 +03:00
Marek Smigielski
1aa14e4929
fix tab for gen_java.py
2016-08-10 12:03:28 +02:00
Marek Smigielski
723b42e0da
Add namespaces and proper support of the pointers
2016-08-05 15:34:57 +02:00
Maksim Shabunin
fc890bd941
Merge pull request #6815 from smigielski:fix_6605
2016-07-14 14:36:45 +00:00
Alexander Alekhin
f9ab93bf0f
Merge pull request #6876 from janstarzy:jni-as-template-redone
2016-07-11 13:06:00 +00:00
Jan Starzynski
479f933970
get/put: more type-safety and code unification using templates
2016-07-11 09:27:59 +02:00
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
Alexander Alekhin
67a734ce73
Merge branch '2.4' into master
...
Commits:
67fe57a
add fixed video
db0ae2c
Restore 2.4 source branch for bug fix 6317.
97ac59c
Fix a memory leak indirectly caused by cvDestroyWindow
eb40afa
Add a workaround for FFmpeg's color conversion accessing past the end of the buffer
421fcf9
Rearrange CvVideoWriter_FFMPEG::writeFrame for better readability
912592d
Remove "INSTALL_NAME_DIR lib" target property
bb1c2d7
fix bug on border at pyrUp
2016-04-21 20:15:08 +03:00
Philipp Hasper
cc7a1a2ab7
Deactivated two noisy camera-retrieval log messages in android
...
They were issued for every frame retrieved - even in a release build.
2016-04-13 09:17:33 +02:00
Alexander Alekhin
1f7fea9092
Merge pull request #6244 from dreifachstein:topic-cmake-install
2016-04-05 15:23:55 +00:00
Maksim Shabunin
f3127521f3
Merge pull request #6214 from vonnieda:java_features2d
2016-03-21 11:51:11 +00:00
Xiaolei Yu
40eb613bbf
Make install paths relative to CMAKE_INSTALL_PREFIX
2016-03-19 16:41:51 +08:00
Alexander Alekhin
cbd0ee21d5
revert: java bindings become CMake modules (loadable plugins)
...
This reverts part of commit 0db10a3052
2016-03-09 12:13:46 +03: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
Nikolay Polyarniy
46e08d34dd
T-API python support implemented:
...
- cv2.UMat implemented - python thin wrapper for UMat
- no implicit copy from GPU to Host done, resulting UMat can be passed to next function without overhead
- cv2.UMat.get() - to fetch data to Host
- new tests covers: ORB, BFMatcher, goodFeaturesToTrack, calcOpticalFlowPyrLK
2016-02-09 12:33:07 +03:00
Maksim Shabunin
92387b1ef8
Fix java version++
2015-12-18 18:02:16 +03:00
Maksim Shabunin
8d1f5b5490
Version++ for android
2015-12-18 17:57:07 +03:00
Alexander Alekhin
be23846c4e
update osx and ios build_framework.py
2015-12-17 16:17:31 +03:00
Maksim Shabunin
5ebc7f0b72
Simple Moments class for Java
2015-12-16 10:53:14 +03:00
Alexander Alekhin
0db10a3052
fixes #5019 : python and java bindings become CMake modules (loadable plugins)
2015-12-14 16:20:18 +03:00
Maksim Shabunin
eebd4cad66
Fix compilation problems with XCode 7.1.1 and cmake 3.3.2
2015-11-17 18:52:55 +03:00
Maksim Shabunin
e8bf4417ef
New variant of iOS framework building, fixed some warnings for XCode 7.1.1 and cmake 3.3.2
2015-11-17 15:30:01 +03:00
Maksim Shabunin
f49936a849
Fixed cmake and build issues when using Visual Studio 2015
2015-10-29 11:50:48 +03:00
Maksim Shabunin
6e9d0d9a0c
Visual Studio 2015 warning and test fixes
2015-10-20 12:48:37 +03:00
Alexander Alekhin
ddd91bcebf
android: add targetSdkVersion="21"
2015-10-12 18:12:34 +03:00
Alexander Alekhin
dbcc55a196
cleanup <build>/src|gen folders to remove stalled/unused Java files
2015-10-09 17:28:50 +03:00
Alexander Alekhin
441eeef319
Merge pull request #5470 from apavlenko:android_camera_gl_view
2015-10-08 13:31:51 +00:00
Andrey Pavlenko
23fea91e84
minor fixes
2015-10-08 12:37:59 +03:00
Andrey Pavlenko
15db8243ef
refactored; added Camera2, notify callbacks, front/back maxCamera sizes; disable new stuff if target API < 21
2015-10-07 15:01:32 +03:00
Alexander Alekhin
33f5ac5c15
Merge pull request #5429 from PhilLab:patch-6
2015-10-05 12:50:17 +00:00
Philipp Hasper
05846438e3
Typo in CameraBridgeViewBase.java
...
Corrected typo and unused imports
2015-10-01 15:09:14 +02:00
Alexander Alekhin
eb2e061e3f
fix Android camera datarace (mCameraFrameReady)
2015-09-22 17:03:09 +03:00
Andrey Pavlenko
8e088d38a5
draft implementation of alternative CameraBridge via GLES
...
a simple sample will look like:
```java
public class MainActivity extends Activity implements CameraGLSurfaceView.CameraTextureListener {
CameraGLSurfaceView mView;
ByteBuffer buf;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
requestWindowFeature(Window.FEATURE_NO_TITLE);
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
WindowManager.LayoutParams.FLAG_FULLSCREEN);
getWindow().setFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON,
WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
mView = new CameraGLSurfaceView(this, null);
mView.setCameraTextureListener(this);
setContentView(mView);
buf = ByteBuffer.allocateDirect(1920*1080*4);
}
@Override
protected void onPause() {
mView.onPause();
super.onPause();
}
@Override
protected void onResume() {
super.onResume();
mView.onResume();
}
@Override
public void onCameraViewStarted(int width, int height) {
// TODO Auto-generated method stub
}
@Override
public void onCameraViewStopped() {
// TODO Auto-generated method stub
}
@Override
public boolean onCameraFrame(int texIn, int texOut, int width, int height) {
Log.i("MAIN", "onCameraFrame");
int w=width, h=height;
/*
// option 1:
// just return 'false' to display texIn on screen
retutn false;
*/
/*
// option 2:
// fast copy texIn to texOut
GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, texOut);
GLES20.glCopyTexImage2D(GLES20.GL_TEXTURE_2D, 0, GLES20.GL_RGBA, 0, 0, w, h, 0);
return true;
*/
// option 3:
// read, modify and write back pixels
GLES20.glReadPixels(0, 0, w, h, GLES20.GL_RGBA, GLES20.GL_UNSIGNED_BYTE, buf);
buf.rewind();
// red line
for(int i=0; i<h; i++) {
buf.position(w*4*i+i*4);
buf.put((byte) -1);
buf.position(w*4*i+i*4+4);
buf.put((byte) -1);
}
buf.rewind();
GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, texOut);
GLES20.glTexSubImage2D(GLES20.GL_TEXTURE_2D, 0, 0, 0, w, h, GLES20.GL_RGBA, GLES20.GL_UNSIGNED_BYTE, buf);
return true;
}
}
```
2015-09-19 16:18:02 +03:00
Maksim Shabunin
31fbe8caeb
Merge pull request #5255 from berak:java_videowriter
2015-09-11 11:09:16 +00:00
Alexander Alekhin
b15a9d675e
cmake: use copy_if_different
2015-09-08 22:42:05 +03: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
Evgeny Talanin
9a3dccab20
Increase Android Manager version
2015-07-29 21:16:21 +03:00
Alexander Alekhin
bb556b8f55
Merge pull request #4124 from ruslo:android.fix
2015-06-25 17:16:04 +00:00
Maksim Shabunin
83b2621de4
Android: renamed default library name for static and dynamic fallback load; fixed libz import for 64-bit platforms
2015-06-19 18:53:45 +03:00
Maksim Shabunin
c79ad45fce
Added interface libraries for android opencv_java
2015-06-17 18:10:28 +03:00
Ruslan Baratov
0fcc5face3
Fix `cmake -E touch classes.jar' step
...
`-E touch` command doesn't create intermediate directories. We have to do it
manually using `file(MAKE_DIRECTORY ...)` command.
2015-06-17 12:11:11 +02:00
Maksim Shabunin
33ab9ea188
AndroidMgr: fixed typos and package name
2015-06-03 11:53:29 +03:00
Maksim Shabunin
caffbaafbe
Updated Manager for Android
2015-06-02 17:33:04 +03:00
Andrey Pavlenko
72ec9c159e
releasing native memory of temp Mat
objects in generated Java code
2015-05-26 13:58:54 +03:00
Andrey Pavlenko
5b00d9da49
releasing native memory in Java converters
2015-05-26 13:58:35 +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
6006790c18
releasing native memory in Java converters
2015-05-26 13:10:54 +03:00
aletheios
6a50a51b4e
Bugfix #3705 : params.setRecordingHint(true) breaks camera preview on Samsung Galaxy S2
2015-05-23 17:36:41 +02: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
Simon Heinen
6decc2596d
squashed #3729
...
Update android+AsyncServiceHelper.java
Update android+AsyncServiceHelper.java
changed tabs in last commit to spaces
Update android+AsyncServiceHelper.java
small formatting fixes
2015-04-24 23:02:10 +02:00
Maksim Shabunin
a362aca783
Rename manager package to OpenCV3 Manager
2015-04-17 16:59:52 +03:00
Maksim Shabunin
316d76bdb6
Rename OpenCV Engine to org.opencv.engine3 for release candidate
2015-04-17 16:00:33 +03:00
Maksim Shabunin
35b2139929
Basic HAL module
2015-04-07 18:16:22 +03:00
Vadim Pisarevsky
08c84e0c34
Merge pull request #3729 from bitstars:AsyncServiceHelper.java-Android-5-hotfix
2015-04-05 17:57:53 +00:00
Simon Heinen
d2dc7f4c27
Update android+AsyncServiceHelper.java
...
small formatting fixes
2015-04-02 09:05:56 +02:00
Simon Heinen
0df9dc8fb9
Update android+AsyncServiceHelper.java
...
changed tabs in last commit to spaces
2015-04-02 08:42:19 +02:00
Maksim Shabunin
231685133e
OpenCV Manager: support 3.0.0 library
2015-03-19 15:27:14 +03:00
Vadim Pisarevsky
903f10c237
Merge pull request #3804 from polarfuchs99:master
2015-03-17 11:12:49 +00:00
Maksim Shabunin
632afe6ae3
Fixed mangled install layout on unix machines
2015-03-13 14:18:37 +03:00
Prof. Dr. Rudolf Haussmann
5e3d986ad8
Merge remote-tracking branch 'upstream/master'
2015-03-07 13:10:41 +01: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
Vadim Pisarevsky
6820292256
Merge pull request #3700 from MSOpenTech:winrt-cmake-contrib
2015-03-03 12:52:03 +00:00
Maxim Kostin
cdd23440c9
Adding support for WinRT(WinPhone 8/8.1 and Win Store) via CMake 3.1
...
- Substituted HAVE_WINRT with WINRT
- Fixed compilation issues in ocl.cpp and parallel.cpp
- Fixed compiler issue for WP8: "C2678: binary '+' : no operator found which takes a left-hand - Fixed gitignore
- Added #ifdef HAVE_OPENCL to remove compiler warnings in ocl.cpp
- Used NO_GETENV similar to '3rdparty\libjpeg\jmemmgr.c;
- Added ole32.lib for core module (for WindowsStore 8.0 builds)
- Made OpenCV_ARCH aware of ARM
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-03-02 22:26:43 +03:00
Maksim Shabunin
37c74e38f4
Python support
2015-03-02 18:13:00 +03:00
Maksim Shabunin
457123027e
Modified java wrapping mechanism
2015-03-02 18:12:30 +03:00
Alexander Alekhin
52effe9e72
Android: fix JavaCameraView implementation
...
1) Fixed deadlock if camera is started and stopped immediately
2) Invalid pattern usage of Object.wait(). Refer to "spurious wakeup": http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html#wait
3) Fixed buffer usage:
a) fix eliminates processing of zero NV12 (green in RGB) first frame
b) latest ready frame is delivered for processing (not previous)
2015-02-24 18:52:54 +03:00
Andrey Pavlenko
c059f7ddcd
Merge pull request #3726 from asmorkalov:ocv_version_inc4
2015-02-20 16:11:58 +00:00
Alexander Smorkalov
96e5300fdd
OpenCV and OpenCV Manager version++
2015-02-20 15:17:11 +03:00
Simon Heinen
5d97dd0ea5
Update android+AsyncServiceHelper.java
2015-02-20 12:54:54 +01:00
Maksim Shabunin
553020c448
Enabled STL usage within the library
2015-02-18 12:36:50 +03:00
Alexander Alekhin
dc21a0a6b5
Android: fix JavaCameraView implementation
...
1) Fixed deadlock if camera is started and stopped immediately
2) Invalid pattern usage of Object.wait(). Refer to "spurious wakeup": http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html#wait
3) Fixed buffer usage:
a) fix eliminates processing of zero NV12 (green in RGB) first frame
b) latest ready frame is delivered for processing (not previous)
2015-02-17 01:28:43 +03:00
Maksim Shabunin
a5a510da4b
Support for compound modules, support for contrib_world
2015-02-10 18:30:05 +03:00
Maksim Shabunin
bebf6c47c6
Removed Sphinx generation commands from cmake scripts
2014-12-26 19:17:08 +03:00
StevenPuttemans
f151b1d277
fix wrong property name and corresponding documentation
2014-11-19 14:00:40 +01:00
Vadim Pisarevsky
4de9605b7b
Merge pull request #3344 from mshabunin:java_automation
2014-10-20 06:50:34 +00:00
Vadim Pisarevsky
d2b9dc5530
quickly corrected the previous refactoring of features2d: moved from set(SOME_PROP, val) to setSomeProp(val)
2014-10-18 20:44:26 +04:00
Maksim Shabunin
c5a1650ac0
Refactoring in gen_java.py script
2014-10-17 19:36:24 +04:00
Vadim Pisarevsky
1176d4ef84
fixed some more compile errors and test failures
2014-10-17 15:02:56 +04:00
Vadim Pisarevsky
9c9ecc22e2
fixed opencv_java build
2014-10-17 14:56:58 +04:00
Matthew Conway
92efe4534b
update gen_javadoc prints to python3 syntax fixed #3768
2014-10-04 14:48:03 -04:00
Alexander Smorkalov
a0431acb37
OpenCV Manager version++.
2014-09-30 12:05:46 +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
Maksim Shabunin
6337fd0650
Support of bioinspired contrib module wrapping
...
- added java wrapper
- disabled python wrapper
2014-09-22 11:43:29 +04:00
Maksim Shabunin
2992e3a1b6
Fixed android test detection and some spaces in CMakeLists.txt
2014-09-19 13:11:59 +04:00
Maksim Shabunin
cff5e3ee88
Changed java tests detection procedure
2014-09-19 12:34:42 +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
93c03ef05b
Fixed android java test build
2014-09-08 19:21:32 +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
Andrey Pavlenko
43714b9d03
disabling java bindings for xfeatures2d module due to build errors
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
StevenPuttemans
d27e440b2a
continue fixing nonfree elements
...
fixed dependency of stitching module on xfeatures2d module as optional
fixed the initModule_xfeatures2d function that was called in module stitching since it is in another namespace than the standard cv one.
2014-08-28 13:30:47 +02: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
Vadim Pisarevsky
27d2d3cbac
fixed doc builder complains and the test failures
2014-08-12 00:03:40 +04:00
Vadim Pisarevsky
31df47b6ea
moved nonfree and a part of features2d to opencv_contrib/xfeatures2d
2014-08-11 23:26:39 +04:00
arc
3d0a270a66
Merge branch 'master' into python2and3
2014-08-07 01:04:26 -04:00
Michael Pratt
218b12c557
Merge branch 'master' into python2and3
2014-08-06 01:45:07 -04:00
Alexander Alekhin
55188fe991
world fix
2014-08-05 20:12:35 +04:00
Vadim Pisarevsky
9cb79b9abb
temporarily disabled java bindings for ml; hopefully fixed warnings etc.
2014-08-03 04:28:31 +04:00
Vadim Pisarevsky
8e9d1d9fe6
temporarily disabled java bindings for ml; hopefully fixed warnings etc.
2014-08-03 04:28:20 +04:00
Michael Pratt
c9876c3cd8
Merge branch 'master' into python2and3
2014-07-31 01:13:16 -04:00
vbystricky
d58f736935
Split highgui module to videoio and highgui
2014-07-14 23:16:47 +04:00
vbystricky
4286f60387
Extract imgcodecs module from highgui
2014-07-07 16:28:08 +04:00
Michael Pratt
cac1218eef
Build both Python 2 and Python 3 bindings
...
If both Python 2 and Python 3 are found, then build bindings for both of
them during the build process. Currently, one version of Python is
detected automatically, and building for the other requires changes the
CMake config.
The largest chunk of this change generalizes OpenCVDetectPython.cmake to
find both a Python 2 and Python 3 version of Python. Secondly, the
opencv_python module is split into two modules, opencv_python2 and
opencv_python3. Both are built from the same source. but for different
versions of Python.
2014-06-29 20:08:13 -04:00
Muto Masayuki
518d0df201
Add AKAZE support for the Java wrapper
2014-06-03 18:41:58 +09:00
aletheios
1020a93fa3
Bugfix #3705 : params.setRecordingHint(true) breaks camera preview on Samsung Galaxy S2
2014-05-31 18:44:32 +02:00
Roman Donchenko
4f2b126b7b
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/version.hpp
modules/core/src/out.cpp
modules/cudaimgproc/test/test_hough.cpp
modules/gpu/doc/introduction.rst
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/src/generalized_hough.cpp
modules/nonfree/perf/perf_main.cpp
2014-04-07 14:59:34 +04:00
Alexander Smorkalov
e23f7303a6
OpenCV version++. OpenCV Manager version++.
2014-03-31 15:00:25 -07:00
Roman Donchenko
f77c68e0fa
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/imgproc/src/opencl/integral_sqrsum.cl
modules/nonfree/doc/feature_detection.rst
modules/nonfree/include/opencv2/nonfree/ocl.hpp
modules/nonfree/src/surf_ocl.cpp
modules/nonfree/test/test_features2d.cpp
modules/ocl/doc/image_processing.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/match_template.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/src/opencl/haarobjectdetect_scaled2.cl
modules/ocl/test/test_imgproc.cpp
2014-03-31 14:42:00 +04:00
Roman Donchenko
e055b68ceb
Merge pull request #2403 from hbristow:issue-3451
2014-03-28 12:13:14 +04:00
Alexander Smorkalov
d17740ec87
Bug #3553 JavaCameraView frame format and cvtColor format inconsistency fixed.
2014-03-28 04:56:31 +04:00
Roman Donchenko
cc05493730
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectAndroidSDK.cmake
cmake/OpenCVGenAndroidMK.cmake
cmake/OpenCVModule.cmake
cmake/templates/OpenCV.mk.in
cmake/templates/OpenCVConfig.cmake.in
doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.rst
modules/cudabgsegm/src/cuda/mog.cu
modules/imgproc/perf/opencl/perf_filters.cpp
modules/imgproc/src/opencl/filterSep_singlePass.cl
modules/nonfree/CMakeLists.txt
modules/nonfree/perf/perf_precomp.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/opencl/bgfg_mog.cl
modules/superres/CMakeLists.txt
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/cuda/btv_l1_gpu.cu
modules/superres/src/frame_source.cpp
modules/superres/src/input_array_utility.cpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
samples/gpu/CMakeLists.txt
samples/gpu/brox_optical_flow.cpp
samples/gpu/super_resolution.cpp
2014-03-24 19:02:16 +04:00
Alexander Smorkalov
846266fde4
Native camera fix for some deivices with Qualcomm SoC like Samsung Galaxy S4.
2014-03-21 14:16:03 +04:00
Hilton Bristow
72d5609a36
Merged upstream master
2014-03-04 11:14:03 +10:00
Roman Donchenko
db85c35e69
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/contrib/src/basicretinafilter.hpp
modules/contrib/src/magnoretinafilter.hpp
modules/contrib/src/parvoretinafilter.hpp
modules/contrib/src/retinacolor.hpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/highgui/src/cap_tyzx.cpp
modules/ocl/perf/perf_filters.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/test/test_filters.cpp
modules/ocl/test/test_objdetect.cpp
2014-03-03 13:45:22 +04:00
Alexander Smorkalov
c78142acb0
Bug #3391 org.opencv.android.NativeCameraView crashes after latest OpenCV Manager update fixed.
...
The crash was cased by massive Mat objects leak in NativeCameraView class.
2014-02-25 11:54:03 +04:00
Roman Donchenko
029ffb7c2d
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/src/gl_core_3_1.cpp
modules/core/src/opencl/convert.cl
modules/cudaimgproc/src/cuda/canny.cu
modules/cudastereo/perf/perf_stereo.cpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/test/test_denoising.cpp
modules/ocl/src/opencl/imgproc_resize.cl
samples/cpp/Qt_sample/main.cpp
2014-02-17 15:24:05 +04:00
Alexander Smorkalov
dbe7634286
Dead code removed as this cannot be null in Java.
2014-02-13 18:17:47 +04:00
Roman Donchenko
72aabb8a84
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
CMakeLists.txt
cmake/OpenCVGenAndroidMK.cmake
cmake/templates/OpenCV.mk.in
doc/tutorials/viz/creating_widgets/creating_widgets.rst
doc/tutorials/viz/launching_viz/launching_viz.rst
doc/tutorials/viz/table_of_content_viz/images/image_effects.png
doc/tutorials/viz/transformations/transformations.rst
doc/tutorials/viz/widget_pose/widget_pose.rst
modules/core/include/opencv2/core/affine.hpp
modules/core/include/opencv2/core/core.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/src/cuda/canny.cu
modules/gpu/src/cuda/generalized_hough.cu
modules/gpu/src/generalized_hough.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/test/test_color.cpp
modules/gpu/test/test_core.cpp
modules/gpu/test/test_gpumat.cpp
modules/gpu/test/test_hough.cpp
modules/nonfree/CMakeLists.txt
modules/nonfree/include/opencv2/nonfree/gpu.hpp
modules/nonfree/perf/perf_gpu.cpp
modules/nonfree/src/cuda/surf.cu
modules/nonfree/src/precomp.hpp
modules/nonfree/src/surf_gpu.cpp
modules/nonfree/test/test_gpu.cpp
modules/ocl/perf/perf_haar.cpp
modules/stitching/CMakeLists.txt
modules/stitching/include/opencv2/stitching/detail/matchers.hpp
modules/stitching/include/opencv2/stitching/detail/seam_finders.hpp
modules/stitching/include/opencv2/stitching/detail/warpers.hpp
modules/stitching/include/opencv2/stitching/warpers.hpp
modules/stitching/src/blenders.cpp
modules/stitching/src/matchers.cpp
modules/stitching/src/precomp.hpp
modules/stitching/src/seam_finders.cpp
modules/stitching/src/stitcher.cpp
modules/stitching/src/warpers.cpp
modules/viz/doc/widget.rst
modules/viz/include/opencv2/viz/types.hpp
modules/viz/include/opencv2/viz/viz3d.hpp
modules/viz/include/opencv2/viz/widget_accessor.hpp
modules/viz/src/precomp.hpp
modules/viz/src/shapes.cpp
modules/viz/src/vizcore.cpp
modules/viz/src/vtk/vtkCloudMatSink.h
modules/viz/src/vtk/vtkCloudMatSource.h
modules/viz/test/test_precomp.hpp
modules/viz/test/tests_simple.cpp
samples/android/tutorial-4-cuda/CMakeLists.txt
samples/android/tutorial-4-cuda/jni/Android.mk
samples/android/tutorial-4-cuda/src/org/opencv/samples/tutorial4/Tutorial4Activity.java
samples/cpp/stitching_detailed.cpp
samples/cpp/tutorial_code/viz/creating_widgets.cpp
samples/cpp/tutorial_code/viz/launching_viz.cpp
samples/cpp/tutorial_code/viz/transformations.cpp
samples/cpp/tutorial_code/viz/widget_pose.cpp
2014-02-11 12:05:01 +04:00
Alexander Smorkalov
6ae4a9b09b
Multiple improvements in OpenCV examples build.
...
EMBED_CUDA and FORCE_EMBED_OPENCV flags added to cmake macro add_android_project;
INSTALL_CUDA_LIBRARIES option added to OpenCV.mk
opencv_dynamicuda library installation with enabled OPENCV_INSTALL_MODULES flag fixed;
CUDA initialization apportunity added to OpenCVLoader.initDebug();
Tutorial-4-CUDA sample reimplemented with static OpenCV and CUDA initialization.
2014-02-06 15:32:57 +04:00
Roman Donchenko
652a0bd5ce
Merge pull request #2262 from SpecLad:merge-2.4
2014-02-03 15:33:41 +04:00
Roman Donchenko
2bbda9d225
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/cudaimgproc/test/test_color.cpp
modules/dynamicuda/include/opencv2/dynamicuda/dynamicuda.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/test/test_core.cpp
modules/gpu/test/test_imgproc.cpp
modules/java/generator/src/cpp/VideoCapture.cpp
samples/gpu/performance/CMakeLists.txt
samples/tapi/CMakeLists.txt
2014-02-03 13:23:59 +04:00
Ilya Lavrenov
66b2acc8ee
removed ocl from allmodules list
2014-02-01 20:55:50 +04:00
Roman Donchenko
0dad2876e2
Removed all use of the obsolete IMMEDIATE parameter to configure_file.
...
It's not documented, and it does nothing unless CMake 2.0 compatibility
is enabled (and it isn't):
https://github.com/Kitware/CMake/blob/v2.6.0/Source/cmConfigureFileCommand.cxx
2014-01-29 19:34:02 +04:00
Alexander Alekhin
5474935a81
fixes for defects from code coverity
2014-01-28 20:24:10 +04:00
Vladislav Vinogradov
c41e8006c7
fix #3477 :
...
CV_CAP_PROP_SUPPORTED_PREVIEW_SIZES_STRING property is not supported
by all VideoCapture backends. Some backends can return 0.0 or -1.0.
2014-01-28 10:28:00 +04:00
Roman Donchenko
bbc35d609d
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectPython.cmake
cmake/OpenCVModule.cmake
modules/core/src/gpumat.cpp
modules/cudaimgproc/test/test_hough.cpp
modules/gpu/CMakeLists.txt
modules/gpu/src/cuda/generalized_hough.cu
modules/gpu/src/generalized_hough.cpp
modules/python/CMakeLists.txt
2014-01-27 15:28:14 +04:00
Alexander Smorkalov
b75cbfde45
All installed files marked with component names for install customization.
2014-01-21 20:34:36 +04:00
Roman Donchenko
9b7e77ccda
Merge commit '83cdd43a' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/version.hpp
2013-12-30 16:36:35 +04:00
Hilton Bristow
2f45942adc
converted necessary files for python3 compatibility using 2to3
2013-12-29 17:10:44 +10:00
Alexander Smorkalov
e79c875fe2
Java wrappers for functions from cv::gpu namespace in core module added.
2013-12-26 12:13:23 +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
Roman Donchenko
83cdd43a4c
Merge pull request #2039 from asmorkalov:ocv_version_inc3
2013-12-23 15:53:11 +04:00
Roman Donchenko
f22d9a232d
Merge pull request #2022 from asmorkalov:ocv_dynamic_cuda
2013-12-23 12:45:49 +04:00
Alexander Smorkalov
4ec1930949
OpenCV version++; OpenCV Manager version++.
2013-12-23 12:35:06 +04:00
Alexander Smorkalov
5a5c82bb1d
Additional ENABLE_DYNAMIC_CUDA option implemented in cmake. Warning fixes and refactoring.
2013-12-19 17:41:04 +04:00
Alexander Smorkalov
037ffcdf99
Dynamic CUDA support library reimplemented as OpenCV module.
2013-12-19 16:42:11 +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
Ilya Lavrenov
3eaa8f149b
added cv::intergal to T-API
2013-12-06 13:18:25 +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
Roman Donchenko
4f1aed98de
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
modules/contrib/src/detection_based_tracker.cpp
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/src/gpumat.cpp
modules/core/src/opengl.cpp
modules/gpu/src/cuda/safe_call.hpp
modules/highgui/src/cap.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/ocl/doc/image_processing.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/kmeans.cpp
modules/ocl/src/svm.cpp
modules/ocl/test/test_objdetect.cpp
samples/ocl/adaptive_bilateral_filter.cpp
2013-11-11 16:55:36 +04:00
Roman Donchenko
641bb7ac6b
Merge pull request #1737 from vrabaud:2.4
2013-11-07 12:03:30 +04:00
Roman Donchenko
65389e41db
Revert commit 994e07db0
(PR #1715 ), because it's irrelevant for master.
...
Conflicts:
modules/java/generator/src/cpp/VideoCapture.cpp
2013-11-06 12:32:03 +04:00
Roman Donchenko
9c83f6c4fb
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectCUDA.cmake
modules/core/include/opencv2/core/version.hpp
modules/cudacodec/src/ffmpeg_video_source.cpp
modules/gpu/src/video_writer.cpp
modules/highgui/test/test_ffmpeg.cpp
modules/highgui/test/test_video_io.cpp
modules/highgui/test/test_video_pos.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/blend.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/cl_operations.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/kmeans.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/safe_call.hpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_moments.cpp
samples/ocl/squares.cpp
2013-11-05 16:38:23 +04:00
Vincent Rabaud
0b1df62215
add VERBATIM as advised by @SpecLad
2013-11-05 12:02:22 +01:00
Vincent Rabaud
3b0108e4c1
fix the crash as suggested by @SpecLad
2013-11-05 11:18:20 +01:00
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.
2013-11-01 19:30:58 +01:00
Alexander Smorkalov
f027cf80f7
OpenCV Version++. OpenCV Manager Version++.
2013-11-01 15:22:34 +04:00
Andrey Pavlenko
a88360bea6
minor refactoring of Android VideoCapture jni code to make it similar to generated one
2013-10-31 12:42:12 +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
78be4f66f7
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
CMakeLists.txt
modules/calib3d/src/calibration.cpp
modules/ocl/src/cl_programcache.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
samples/ocl/adaptive_bilateral_filter.cpp
samples/ocl/bgfg_segm.cpp
samples/ocl/clahe.cpp
samples/ocl/facedetect.cpp
samples/ocl/pyrlk_optical_flow.cpp
samples/ocl/squares.cpp
samples/ocl/surf_matcher.cpp
samples/ocl/tvl1_optical_flow.cpp
2013-10-28 13:38:25 +04:00
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").
2013-10-24 19:04:59 +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
d411041c53
Merge pull request #1637 from SpecLad:run-py-java-fix
2013-10-17 12:25:31 +04:00
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.
2013-10-16 19:22:01 +04:00
Alexander Alekhin
2a9d24323c
cmake: add opencv_java into list of exported targets (fix for android)
2013-10-16 17:23:44 +04:00
Alexander Alekhin
e845184843
Merge remote-tracking branch 'upstream/2.4' into merge-2.4
...
* #1538 from StevenPuttemans:bugfix_3283
* #1545 from alalek:ocl_test_fix_rng
* #1551 from alalek:cmake_install_win
* #1570 from ilya-lavrenov:ipp_warn_fix
* #1573 from alalek:perf_simple_strategy
* #1574 from alalek:svm_workaround
* #1576 from alalek:ocl_fix_cl_double
* #1577 from ilya-lavrenov:ocl_setto_opencl12
* #1578 from asmorkalov:android_fd_cp_fix
* #1579 from ilya-lavrenov:ocl_norm
* #1582 from sperrholz:ocl-arithm-additions
* #1586 from ilya-lavrenov:ocl_setto_win_fix
* #1589 from ilya-lavrenov:pr1582_fix
* #1591 from alalek:ocl_remove_cl_hpp_h
* #1592 from alalek:ocl_program_cache_update
* #1593 from ilya-lavrenov:ocl_war_on_double
* #1594 from ilya-lavrenov:ocl_perf
* #1595 from alalek:cl_code_cleanup
* #1596 from alalek:test_fix_run_py
* #1597 from alalek:ocl_fix_cleanup
* #1598 from alalek:ocl_fix_build_mac
* #1599 from ilya-lavrenov:ocl_mac_kernel_warnings
* #1601 from ilya-lavrenov:ocl_fix_tvl1_and_sparse
* #1602 from alalek:ocl_test_dump_info
* #1603 from ilya-lavrenov:ocl_disable_svm_noblas
* #1605 from alalek:ocl_fixes
* #1606 from ilya-lavrenov:ocl_imgproc
* #1607 from ilya-lavrenov:ocl_fft_cleanup
* #1608 from alalek:fix_warn_upd_haar
* #1609 from ilya-lavrenov:ocl_some_optimization
* #1610 from alalek:ocl_fix_perf_kalman
* #1612 from alalek:ocl_fix_string_info
* #1614 from ilya-lavrenov:ocl_svm_misprint
* #1616 from ilya-lavrenov:ocl_cvtColor
* #1617 from ilya-lavrenov:ocl_info
* #1622 from a0byte:2.4
* #1625 from ilya-lavrenov:to_string
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVDetectPython.cmake
cmake/OpenCVGenConfig.cmake
modules/core/CMakeLists.txt
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/cl_operations.cpp
modules/ocl/src/cl_programcache.cpp
modules/ocl/src/color.cpp
modules/ocl/src/fft.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/gemm.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/pyrlk.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/src/svm.cpp
modules/ocl/test/main.cpp
modules/ocl/test/test_fft.cpp
modules/ocl/test/test_moments.cpp
modules/ocl/test/test_objdetect.cpp
modules/ocl/test/test_optflow.cpp
modules/ocl/test/utility.hpp
modules/python/CMakeLists.txt
modules/ts/include/opencv2/ts.hpp
modules/ts/src/ts_perf.cpp
samples/android/face-detection/jni/DetectionBasedTracker_jni.cpp
2013-10-15 20:08:52 +04:00
Roman Donchenko
b420c0b160
Merge pull request #1630 from SpecLad:java-deprecated-assert
2013-10-15 18:36:15 +04:00
Roman Donchenko
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
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
Alexander Alekhin
bc089bb18c
cmake: update java module install rules
2013-10-09 17:49:11 +04:00
Roman Donchenko
81eb4bd8be
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
doc/tutorials/features2d/feature_detection/feature_detection.rst
modules/bioinspired/doc/retina/index.rst
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/mat.hpp
modules/core/include/opencv2/core/operations.hpp
modules/core/src/stat.cpp
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/imgproc/src/filter.cpp
modules/legacy/src/dpstereo.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/doc/image_processing.rst
modules/ocl/doc/object_detection.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/pyrdown.cpp
modules/ocl/src/pyrup.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_objdetect.cpp
modules/ocl/test/utility.hpp
2013-10-01 15:57:33 +04:00
Alexander Smorkalov
298a1d50d2
Merge pull request #1299 from jet47:gpu-cuda-rename
2013-09-23 10:31:51 +04:00
Roman Donchenko
b525c28244
Updated the Java bindings and docs to support the version status.
2013-09-12 16:39:14 +04:00
Vladislav Vinogradov
6bbac2a7d9
Merge branch 'master' into gpu-cuda-rename
2013-09-11 09:41:23 +04:00
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.
2013-09-10 18:05:45 +04:00
Roman Donchenko
95c2e8b51f
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst
modules/gpu/src/match_template.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_precomp.hpp
2013-09-10 11:30:19 +04:00
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
2013-09-06 15:44:44 +04:00
Roman Donchenko
2f942efdf7
Java: removed usages of Ptr<T>::addref().
...
Now the features2d class wrappers use composition instead of inheritance.
2013-09-05 19:03:00 +04:00
Roman Donchenko
6ebfa87181
Delete a bunch more trailing whitespace that slipped through the cracks.
2013-09-04 16:13:27 +04:00
Vladislav Vinogradov
a41006754e
fix documentation
2013-09-02 14:00:44 +04:00
Roman Donchenko
2c4bbb313c
Merge commit '43aec5ad' into merge-2.4
...
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVLegacyOptions.cmake
modules/contrib/src/retina.cpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/video.rst
modules/gpu/src/speckle_filtering.cpp
modules/python/src2/cv2.cv.hpp
modules/python/test/test2.py
samples/python/watershed.py
2013-08-27 13:26:44 +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
3c137f7a04
Converted tabs to spaces.
2013-08-21 18:59:26 +04:00
Roman Donchenko
e9a28f66ee
Normalized file endings.
2013-08-21 18:59:25 +04:00
Roman Donchenko
f55740da70
Deleted all trailing whitespace.
2013-08-21 18:59:24 +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
5a9bd3f080
restoring binary compatibility
2013-08-15 23:49:32 +04:00
Andrey Pavlenko
f3b1933a92
LinkedList -> ArrayList
2013-08-13 15:51:37 +04:00
Andrey Pavlenko
4902db1c42
also fixing JNI library name in JUnit tests
2013-08-13 13:18:01 +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
Roman Donchenko
48a6edbdfe
Fixed compilation errors.
2013-08-06 18:07:08 +04:00
Roman Donchenko
dcaf923517
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
3rdparty/ffmpeg/ffmpeg_version.cmake
cmake/OpenCVFindLibsGrfmt.cmake
cmake/templates/cvconfig.h.cmake
modules/bioinspired/doc/retina/index.rst
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/calib3d/src/precomp.hpp
modules/contrib/src/inputoutput.cpp
modules/contrib/src/precomp.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/types_c.h
modules/core/src/drawing.cpp
modules/core/src/precomp.hpp
modules/core/src/system.cpp
modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst
modules/features2d/doc/common_interfaces_of_feature_detectors.rst
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/src/precomp.hpp
modules/flann/src/precomp.hpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/perf4au/main.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/src/precomp.hpp
modules/gpu/test/test_imgproc.cpp
modules/highgui/CMakeLists.txt
modules/highgui/test/test_precomp.hpp
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/precomp.hpp
modules/java/generator/src/cpp/Mat.cpp
modules/legacy/src/precomp.hpp
modules/ml/doc/k_nearest_neighbors.rst
modules/ml/src/precomp.hpp
modules/nonfree/doc/feature_detection.rst
modules/nonfree/src/precomp.hpp
modules/objdetect/include/opencv2/objdetect/objdetect.hpp
modules/objdetect/src/cascadedetect.cpp
modules/objdetect/src/hog.cpp
modules/objdetect/src/precomp.hpp
modules/objdetect/test/test_latentsvmdetector.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/opencl/objdetect_hog.cl
modules/ocl/src/precomp.hpp
modules/photo/src/precomp.hpp
modules/stitching/src/precomp.hpp
modules/superres/perf/perf_precomp.hpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
modules/superres/test/test_precomp.hpp
modules/ts/include/opencv2/ts.hpp
modules/video/src/precomp.hpp
modules/videostab/src/precomp.hpp
modules/world/src/precomp.hpp
2013-08-06 13:56:49 +04:00
Roman Donchenko
b2d1d87ed1
Merge pull request #1225 from apavlenko:fix_format_security
2013-08-05 12:58:37 +04:00
Andrey Pavlenko
7b0734caf9
fixing java test after fix in OpenCV library
2013-08-05 11:45:17 +04:00
Andrey Pavlenko
a06891851d
fixing compilation with -Werror=format-security
enabled
2013-08-05 11:11:54 +04:00
Jan Starzynski
d6b86d43c9
removed declaration of throwJavaException
2013-07-25 14:53:22 +02:00
Jan Starzynski
70930a30a1
refactored throwJavaException() and removed useless returns
2013-07-25 13:36:27 +02:00
Jan Starzynski
925e4eec98
removed multiplied code for exception handling
2013-07-24 17:27:03 +02:00
Roman Donchenko
3939d78336
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/types_c.h
modules/gpu/src/cuda/imgproc.cu
modules/gpu/src/cuda/safe_call.hpp
modules/gpu/src/error.cpp
modules/gpu/src/imgproc.cpp
modules/imgproc/src/distransform.cpp
modules/imgproc/src/shapedescr.cpp
modules/python/src2/cv2.cpp
modules/python/src2/cv2.cv.hpp
2013-07-22 18:38:57 +04:00
Roman Donchenko
1b38d1e6b7
Merge pull request #1150 from janstarzy:spelling
2013-07-19 12:15:31 +04:00
Jan Starzynski
9bf216742f
fixed cpackage -> package
2013-07-18 15:33:25 +02:00
Jan Starzynski
ee42b65063
corrected some spelling errors
2013-07-18 13:24:55 +02:00
Jan Starzynski
12c42ac145
fixed strings in n1_dims(): n1_dcols() -> n1_dims()
2013-07-17 18:41:54 +02:00
Jan Starzynski
1ccfa62f4f
adding method dims() to core.Mat
2013-07-17 15:04:34 +02:00
Roman Donchenko
c05bfe9d6d
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/ocl/src/opencl/stereobp.cl
modules/ocl/src/stereobp.cpp
2013-07-08 18:47:38 +04:00
Roman Donchenko
4cf9990d4e
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
doc/tutorials/definitions/noContent.rst
doc/tutorials/gpu/gpu-basics-similarity/gpu-basics-similarity.rst
doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
doc/tutorials/introduction/how_to_write_a_tutorial/how_to_write_a_tutorial.rst
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/version.hpp
modules/gpu/CMakeLists.txt
modules/highgui/perf/perf_output.cpp
modules/highgui/test/test_video_io.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/opencl/moments.cl
modules/ocl/test/main.cpp
modules/ocl/test/test_moments.cpp
modules/python/test/test.py
modules/ts/include/opencv2/ts/ts_perf.hpp
modules/ts/src/precomp.hpp
modules/ts/src/ts_perf.cpp
2013-07-03 19:53:21 +04:00
Alexander Smorkalov
91b713b8c9
JavaCameraView delivers same frame twice (Bug #3123 ) fixed.
2013-07-02 12:58:59 +04:00
Roman Donchenko
43632bf973
Merge pull request #1065 from apavlenko:fix_eclipse_warning
2013-06-28 19:32:44 +04:00
Andrey Pavlenko
6069967109
removing unused import
2013-06-28 17:28:57 +04:00
Kirill Kornyakov
aef347e7b3
Removed references to opencv.itseez.com
2013-06-28 12:48:12 +04:00
Alexander Smorkalov
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
Roman Donchenko
f36f8067bc
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/cuda/limits.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/src/matrix.cpp
modules/nonfree/test/test_features2d.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/hog.cpp
modules/ocl/test/test_haar.cpp
modules/ocl/test/test_objdetect.cpp
modules/ocl/test/test_pyrup.cpp
modules/ts/src/precomp.hpp
samples/ocl/facedetect.cpp
samples/ocl/hog.cpp
samples/ocl/pyrlk_optical_flow.cpp
samples/ocl/surf_matcher.cpp
2013-06-25 15:55:52 +04:00
Roman Donchenko
b20c9ad2d1
Merge pull request #1015 from SpecLad:merge-2.4
2013-06-21 17:38:04 +04:00
Roman Donchenko
13cd0a0502
Merge remote-tracking branch 'origin/2.4'
...
Original pull requests:
#996 from jet47:gpu-nvcuvid-libraries
#995 from jet47:fix-bug-2985
#999 from snosov1:unreliable-results-fix
#1005 from alekcac:doc_fix
#1004 from jet47:fix-bug-3068
#987 from jet47:bug-3085-fix
#969 from pengx17:2.4_binary_cache
#929 from dominikrose:mingw-libdc1394-2-windows
#1000 from ivan-korolev:fix_sift_bug_2892
#1001 from ivan-korolev:fix_stitching_bug_2405
#998 from asmorkalov:android_cmake_mips_fix
#993 from ivan-korolev:fix_videostab_bug_3023
#988 from snosov1:3071-fix
#986 from pengx17:2.4_initiated_context
#982 from pengx17:2.4_fix_two_bugs
#981 from SeninAndrew:ximea_camera_support_fix
#991 from asmorkalov:android_javadoc_fix
#972 from jet47:mog2-params-bug-2168
#980 from SpecLad:include-config
#973 from pengx17:2.4_oclclahe
#903 from aks2:2.4
#968 from asmorkalov:android_na_cproj_fix
#971 from SpecLad:matchers-ctor
#970 from asmorkalov:dshow_valid_check_fix
#965 from apavlenko:fix_java_empty_mats
Conflicts:
cmake/OpenCVModule.cmake
modules/core/src/matmul.cpp
modules/gpu/CMakeLists.txt
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/stitching/src/matchers.cpp
modules/video/src/video_init.cpp
modules/videostab/src/global_motion.cpp
2013-06-19 15:25:37 +04:00
Roman Donchenko
748210e11b
Merge pull request #994 from asmorkalov:android_java_wrappers
2013-06-18 16:46:04 +04:00
Alexander Smorkalov
16c4aad36d
Java/Python bindings for computeCorrespondEpilines added.
...
Simle Java test for computeCorrespondEpilines added.
2013-06-18 16:44:23 +04:00
Andrey Pavlenko
01e9733155
fix for #3077
...
removing "-fvisibility=hidden" gcc option due to lack of `__attribute__ ((visibility("default")))` in jni_md.h/JNIEXPORT
2013-06-14 20:25:23 +04:00
Alexander Smorkalov
83e9b0a87a
Javadoc waring fix.
2013-06-13 12:40:14 +04:00
Roman Donchenko
e16af9bdc9
Merge pull request #958 from apavlenko:fix_java_mixchannels
2013-06-10 15:51:30 +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 Pavlenko
264d26e671
fixing empty Mat case
2013-06-08 12:41:57 +04:00
Roman Donchenko
aa7f70c31e
Merge pull request #951 from apavlenko:fix_java_test_randshuffle
2013-06-07 11:28:10 +04:00
Andrey Pavlenko
c2d3ce9ce5
fix failing test
...
small matrix becomes the same after shuffling
2013-06-05 12:41:09 +04:00
Andrey Pavlenko
c7873dd03d
fixing broken Mat::dump() in Java
2013-06-05 11:46:06 +04:00
Roman Donchenko
5ac3b8d5d8
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Pull requests:
#904 from ograycode:2.4
#905 from bitwangyaoyao:2.4_TVL1
#902 from apavlenko:fix_run_py
#882 from pengx17:2.4_rewrite_query_info
Conflicts:
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/src/hog.cpp
modules/ocl/src/pyrlk.cpp
modules/ocl/src/tvl1flow.cpp
2013-05-27 16:58:04 +04:00
Roman Donchenko
029fce10c9
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
3rdparty/libjasper/CMakeLists.txt
cmake/OpenCVDetectOpenCL.cmake
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/imgproc/src/floodfill.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/mcwutil.cpp
modules/ocl/src/opencl/arithm_bitwise_and_mask.cl
modules/ocl/src/opencl/arithm_bitwise_and_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_binary_mask.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_or.cl
modules/ocl/src/opencl/arithm_bitwise_or_scalar.cl
modules/ocl/src/opencl/arithm_bitwise_or_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_xor.cl
modules/ocl/src/opencl/arithm_bitwise_xor_mask.cl
modules/ocl/src/opencl/arithm_bitwise_xor_scalar.cl
modules/ocl/src/stereobm.cpp
modules/ocl/test/precomp.hpp
modules/python/src2/api
modules/ts/src/ts_func.cpp
samples/gpu/bgfg_segm.cpp
2013-05-21 17:19:23 +04:00
ograycode
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
Andrey Pavlenko
2faa2adae2
Merge pull request #846 from smart-mobile-software:tuto_crash
2013-05-07 15:15:16 +04:00
poiuytrez
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
Alexander Smorkalov
456c56fe90
NullPointerException in case of error on opening native camera fixed.
2013-04-29 11:00:52 +04:00
Andrey Pavlenko
5ce4e3c265
Merge pull request #800 from asmorkalov:android_cam_idx_semantic
2013-04-29 10:00:08 +04:00
Andrey Pavlenko
8c40f0ccf2
fixing build and lint warnings
2013-04-16 15:30:43 +04:00
Andrey Kamaev
8b294c6c90
Remove documentation for old python wrapper
2013-04-12 19:37:40 +04:00
Andrey Kamaev
3b364330ad
Merge branch '2.4'
2013-04-12 15:35:38 +04:00
Andrey Kamaev
e5a33723fc
Move C API of opencv_calib3d to separate file
2013-04-11 21:00:17 +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
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