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
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
dd74a851f3
Fix build errors
2013-04-08 17:10:31 +04:00
Andrey Kamaev
0738ea7d0f
Make highgui.hpp independent from C API
2013-04-08 15:47:29 +04:00
Andrey Kamaev
67073daf19
Merge branch '2.4'
2013-04-05 21:11:59 +04:00
Andrey Kamaev
3b6a82b57c
Merge pull request #769 from apavlenko:fix_2901
2013-04-05 12:59:02 +04:00
Andrey Pavlenko
4c31c26acf
fix for #2901 (en exception was raised when getting empty MatOfDMatch)
2013-04-05 08:50:37 +04:00
Andrey Pavlenko
09fe5cddf1
test for the issue #2901
2013-04-05 08:50:24 +04:00
Andrey Pavlenko
18b2d6bdbb
copying '.classpath' and '.project' to build dir, useful for opening in eclipse
2013-04-05 08:50:08 +04:00
Andrey Kamaev
6570215205
Merge pull request #767 from asmorkalov:version_increment
2013-04-04 18:00:44 +04:00
Andrey Kamaev
7c402d1e15
Merge pull request #759 from asmorkalov:android_common_fixes
2013-04-04 17:58:44 +04:00
Alexander Smorkalov
1e332d690f
OpenCV verison incremented
...
OpenCV Manager verison incremeneted;
Docs and tests updated accordingly;
COnstant for Manager initialization added.
2013-04-04 15:50:36 +04:00
Alexander Smorkalov
36367ec027
Several fixes android related fixes
...
Native activity build warning fixed;
Logcat messages for JavaCameraView updated (Bug #2876 );
Some fixes for feature #2893 done.
2013-04-04 12:18:13 +04:00
Andrey Kamaev
eeaa1e8751
Fix link of fat java wrapper on OS X
2013-04-03 20:02:13 +04:00
Andrey Kamaev
940eedfb27
Finalize core headers reorganization
2013-04-03 14:10:03 +04:00
Andrey Kamaev
2b1ef95415
Completely separate C and C++ API of OpenCV core
2013-04-01 15:24:34 +04:00
Andrey Kamaev
d2192c0759
Move cv::Matx and cv::Vec to separate header
2013-04-01 15:24:33 +04:00
Andrey Kamaev
f77a375354
Merge branch '2.4'
2013-03-29 19:38:35 +04:00
Andrey Kamaev
7d37625fc3
Merge pull request #718 from apavlenko:java_tests_fix
2013-03-29 18:21:14 +04:00
Andrey Kamaev
b5dd26e4c7
Merge pull request #704 from taka-no-me:folders
2013-03-29 18:20:27 +04:00
Alexander Bohn / FI$H2k
c66cf08ced
Fix for encoding errors when building Java source
...
The generated OpenCV Java source can contain characters outside of ASCII on some systems – this patch allows the ant task to compile them.
(cherry picked from commit f3ee55e042
)
2013-03-27 17:43:00 +04:00
Andrey Pavlenko
bbf43e8b16
fix for bug #2912 (DescriptorExtractor::compute Java wrapper loses native arg change)
2013-03-26 19:31:16 +04:00
Andrey Kamaev
49f6dad13f
Move cv::KeyPoint and cv::DMatch to core
2013-03-26 16:08:43 +04:00
Andrey Kamaev
f282498b1d
Drop outdated targets and fix solution folders
2013-03-25 21:57:53 +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
1ca8f33b4e
Merge branch '2.4'
2013-03-21 23:11:54 +04:00
Andrey Kamaev
89356ff16d
Move non-CV functionality from core.hpp to separate utility.hpp header
2013-03-20 17:56:06 +04:00
Vadim Pisarevsky
959a5c980d
Merge pull request #532 from jet47:super-resolution
2013-03-17 19:13:37 +04:00
Alexander Bohn / FI$H2k
f3ee55e042
Fix for encoding errors when building Java source
...
The generated OpenCV Java source can contain characters outside of ASCII on some systems – this patch allows the ant task to compile them.
2013-03-15 06:47:52 -03: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
9b7dfd677d
Merge branch '2.4'
2013-03-11 18:50:19 +04:00
Alexander Smorkalov
8942eaf0d7
Stetch support for Android View classes added (Feature #2840 )
2013-03-11 11:17:19 +04:00
Andrey Pavlenko
0e64baaec5
removing redundant code
2013-03-06 13:00:00 +04:00
Andrey Pavlenko
116d3be9c0
moving JNI library to 'build/lib' dir on non-Win
2013-03-05 18:41:44 +04:00
Andrey Kamaev
9e12b7c3c2
Merge release 2.4.4
2013-03-04 19:43:49 +04:00
Andrey Kamaev
79cf292d78
Merge pull request #590 from apavlenko:java_fixes
2013-02-28 18:07:33 +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
Andrey Pavlenko
5321da92cb
adding/fixing version suffix for desktop java library on all OSes
2013-02-28 16:12:44 +04:00
Andrey Kamaev
891d7da6ee
Merge branch '2.4'
2013-02-28 11:17:06 +04:00
Andrey Kamaev
7b79eaf5be
Merge pull request #511 from aritzlc:master
2013-02-27 19:33:01 +04:00
Vladislav Vinogradov
7a0d6f7733
Super Resolution module
2013-02-27 13:41:15 +04:00
Andrey Kamaev
e9307259d7
Merge pull request #564 from apavlenko:eclipse_import_fix
2013-02-27 00:05:02 +04:00
Andrey Pavlenko
1c1c3c29c3
fixing eclipse import errors
2013-02-26 19:52:59 +04:00
Alexander Smorkalov
8458f5c489
Android tutorial updated
...
OpenCV version incremented;
New CvCameraViewListener interface description added.
2013-02-26 16:35:02 +04:00
alegarda
0448f240a0
Added constants to gen_java.py
2013-02-26 11:21:43 +01:00
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.
2013-02-25 15:04:17 +04:00
Andrey Kamaev
0b8a6da817
Merge branch '2.4'
2013-02-22 17:33:30 +04:00
Alexander Smorkalov
9f39c8eaa1
OpenCV 2.4.4 preparation
...
Manager verison incremented;
Additional constatnt for library intialization added;
Documents updated.
2013-02-21 14:42:28 +04:00
Andrey Kamaev
9498856b22
Fix documentation problems found by check_docs2 script
2013-02-20 15:07:13 +04:00
Andrey Kamaev
956aa68fb5
Merge branch '2.4'
2013-02-12 20:30:17 +04:00
Andrey Kamaev
b44b920997
Merge branch '2.4'
2013-02-12 16:30:18 +04:00
Alexander Smorkalov
1751a963f2
Build info output for all android apps added.
...
OpenCV build information output to logcat added to OpenCV initialization code;
Documenation for cv::getBuildInformation() added.
2013-02-12 11:19:05 +04:00
Andrey Kamaev
b6e7aeabe0
Merge pull request #476 from apavlenko:eclipse_import_fix
2013-02-11 21:38:07 +04:00
Andrey Kamaev
059ea5bebe
Merge pull request #471 from apavlenko:jar_install
2013-02-11 20:46:48 +04:00
Andrey Pavlenko
54bcaa4934
fixing eclipse import errors that can also be fixed via 'Fix Project Properties' menu
2013-02-11 19:49:18 +04:00
Andrey Pavlenko
b337d84adf
configure desktop Java install, making JNI library name correct, and making it fat when possible
2013-02-11 16:28:19 +04:00
Andrey Kamaev
1869f77c0f
Merge pull request #457 from taka-no-me:fix_vars_expansion
2013-02-11 14:37:14 +04:00
Alexander Smorkalov
283b26e2db
Issue in NativeCameraView and JavaCameraView fixed.
...
In previous version getWidth() and getHeight() values were used instead method parameters.
2013-02-11 09:43:44 +04:00
Andrey Kamaev
571665b559
Fix CMake variables substitution in Android project files
2013-02-08 18:21:49 +04:00
Alexander Smorkalov
076941bb07
15-puzzle app reverted to usage of old CvCameraViewListener implementation;
...
super.onPause() call moved to begining of onPause method according Google recomandations.
2013-02-08 12:36:33 +04:00
Alexander Smorkalov
f8720ec60e
Code review issues fixed. Compatibility issues fixed.
2013-02-07 13:11:08 +04:00
Alexander Smorkalov
3ef588b877
onCameraFrame callback signature changed. CvCameraFame interface added.
...
New interface allows to get one RGBA or Gray frame from camera or both in the same time;
New interface fixes data rase in samples also.
2013-02-04 17:43:45 +04:00
Andrey Kamaev
c527340cb6
Merge branch 2.4
2013-02-04 17:15:55 +04:00
Andrey Kamaev
6f1961031c
Update regression checks in Java test
...
This follows SURF changes in 1f261c2
2013-02-01 17:16:28 +04:00
Andrey Kamaev
57d3152cd0
Merge branch '2.4'
2013-01-31 14:35:27 +04:00
Alexander Smorkalov
5bc6365ba5
TestCheckVector java test fixed. Warning fixed.
2013-01-30 17:28:22 +04:00
Andrey Kamaev
0734d9b877
Merge branch '2.4'
2013-01-29 14:16:07 +04:00
Alexander Smorkalov
ca98710640
Resolve warning in OpenCV Library project in Eclipse (Bug #2714 )
...
Warning in auto generated code was suppressed by project settings.
2013-01-28 19:44:58 +04:00
Andrey Kamaev
2e02654004
Fix build of Java tests
2013-01-25 17:08:36 +04:00
Andrey Kamaev
f4e27bcbbc
Merge branch '2.4'
2013-01-25 16:30:36 +04:00
Andrey Kamaev
a441980d68
Fix debug build of Java warppers
2013-01-24 13:25:12 +04:00
Andrey Kamaev
2c32536bf4
Enable Java bindings on all platforms by default
2013-01-23 18:08:09 +04:00
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
2013-01-23 18:08:09 +04:00
Andrey Kamaev
5eabcf8e4f
Java tests: print summary for tests run
2013-01-23 18:08:09 +04:00
Andrey Kamaev
4668a133f0
Java API: fix build warning on OS X
...
Common part of all source files is extracted to special header
2013-01-23 18:08:09 +04:00
Andrey Kamaev
3889b34ec3
Add option to run java tests with run.py
2013-01-23 18:08:08 +04:00
Andrey Kamaev
46c4390a2e
Hardly refactored CMake script for Java wrappers
2013-01-22 17:59:01 +04:00
Andrey Kamaev
c92743d124
Eliminate intermediate build target "opencv_java_api"
2013-01-22 17:59:00 +04:00
Andrey Kamaev
e3474878b6
Consistently use 4-digit library version
2013-01-18 14:57:55 +04:00
Andrey Kamaev
90ff4e6fc8
Convert test image to losless format
...
This fixes java tests failing with new jpeg versions
2013-01-17 20:43:57 +04:00
Andrey Kamaev
dc0788c864
Merge branch 2.4
2013-01-17 18:39:20 +04:00
Andrey Pavlenko
a8c0f1d962
fixing test failure on some systems
2013-01-16 18:33:35 +04:00
Andrey Kamaev
bf3c2b0bbb
Fix incorrect Mat address reconstruction on 64-bit platforms
...
This fixes random failures in Java wrappers.
2013-01-15 19:23:49 +04:00
Andrey Kamaev
c49b23d4dd
Merge pull request #240 from emchristiansen:javatest2.4
2013-01-14 11:06:44 +04:00
Andrey Kamaev
084b1c7969
Merge branch 2.4
2013-01-11 15:45:23 +04:00
Andrey Pavlenko
b0e1cb473a
more tests fixes
2013-01-11 09:13:25 +04:00
Andrey Kamaev
873aefae19
Merge pull request #279 from taka-no-me:mingw_java
2013-01-09 16:52:41 +04:00
Andrey Kamaev
da9089612a
Fix build of java bindings on mingw
2012-12-30 23:24:39 +04:00
Andrey Pavlenko
c49b1bc6d5
partial fix for failing tests; fix for Windows launcher script; more quiet output
2012-12-28 17:03:35 +04:00
Andrey Kamaev
aabbe11e64
Improve function arguments parsing and checking
...
* always use "argN" names for unnamed arguments
* honor space symbol between typename and "*", "&" symbols
* fix indent errors
2012-12-26 17:55:03 +04:00
Andrey Kamaev
132b5d6435
Merge release 2.4.3.2
2012-12-25 19:07:08 +04:00
Alexander Smorkalov
9ca65ceef8
OpenCV example-tutorial1 does not work on Android emulator (Bug #2656 )
...
Problems with Android 2.3.3 (API level 10) fixed;
Android 2.2 does not work due to unsupported camera frame format (known android-2.2 emulator issue).
2012-12-24 17:49:49 +04:00
Andrey Kamaev
962884cdec
Merge branch 2.4
2012-12-21 17:58:48 +04:00
Eric Christiansen
ad326cb0be
adds desktop java junit tests
2012-12-19 14:28:59 -08:00
Alexander Smorkalov
d7c89fc649
A lot of javadoc warnings duting javadoc build (Bug #2647 ) issue fixed
...
Black list of entities, that are not implemented in Java API added to javadoc generator
2012-12-19 12:53:44 +04:00
Andrey Kamaev
e10ee89ec4
Merge branch 2.4
2012-11-30 19:54:24 +04:00
Alexander Smorkalov
2e5a7284d2
Code review comments applied.
2012-11-27 14:55:49 +04:00
Alexander Smorkalov
0efc32fc21
Attribure loading from layout improved.
...
OpenCV namespace added;
Default values for camera_id added;
Aditional constructor with cameraId added.
Resolution added to FPS message.
2012-11-27 12:47:41 +04:00
Alexander Smorkalov
8266eab8b4
OpenCV app framework improved
...
FPS meter added;
Camera switching posibility added;
Attributes loading for layout filed implemented.
2012-11-27 12:47:41 +04:00
marina.kolpakova
285d6320be
add #/usr/bin/env python to all python files
2012-11-23 22:57:22 +04:00
Andrey Kamaev
7f542e391a
Merge branch 2.4
...
Conflicts:
android/service/engine/AndroidManifest.xml - use file from 2.4
modules/contrib/src/detection_based_tracker.cpp - move #include <pthread.h> as in 2.4
modules/java/android_test/src/org/opencv/test/OpenCVTestRunner.java - use file from 2.4
2012-11-20 19:12:00 +04:00
Andrey Kamaev
d559c18ee5
Merge pull request #161 from apavlenko:fix/sdk_r21
2012-11-20 19:07:08 +04:00
Andrey Pavlenko
cfd634ca3e
Improving compatibility with the latest Android SDK (r21) and NDK (r8c).
...
- Adding Android SDK/ADT r21 compatibility;
- fixing stl headers path for new ndk;
- fixing native API level for Android projects
2012-11-20 18:40:22 +04:00
Alexander Smorkalov
66a1ea7604
Test execution inside Eclipse fixed;
...
OpenCV testing via OpenCV Manager implemented.
2012-11-20 10:45:46 +04:00
Alexander Smorkalov
96e4eed018
Logcat message for disabled test cases added.
2012-11-13 11:41:08 +04:00
Alexander Smorkalov
9f5fcff3ea
More common way of test case disabling implemented.
2012-11-13 10:29:49 +04:00
Alexander Smorkalov
e06c5b6fd5
Code review comments applied.
2012-11-12 17:47:20 +04:00
Alexander Smorkalov
baef62b4d2
Java test fix. Eclipse test execution fix.
2012-11-09 11:46:14 +04:00
Andrey Kamaev
4d059e9e5b
Merge release 2.4.3
2012-11-02 17:58:02 +04:00
Kirill Kornyakov
2efd9b6ad7
Fixed a couple of minor issues in Javadocs
2012-11-01 22:28:46 +04:00
marina.kolpakova
358fcbd5b6
Merge pull request #115 from asmorkalov:java_test_data_update
2012-11-01 19:29:18 +04:00
Alexander Smorkalov
34896529d5
Review comments applied.
2012-11-01 16:19:11 +04:00
Alexander Smorkalov
a1a2cb0aeb
OpenCV Samples testing problems fixed:
...
Memory leak in color-blob-detection sample fixed;
Default face size in face-detection is set to 20%;
Error handling improved;
Some possible mat leak fixed;
Manager verison and engine interface version incremented to fix incompatibilities;
Docs updated;
2012-10-31 17:24:50 +04:00
Andrey Kamaev
468eefe0ce
Merge branch '2.4'
2012-10-30 15:10:17 +04:00
Alexander
b0106ca25e
Test data form features2d updated.
2012-10-30 15:05:09 +04:00
Alexander Smorkalov
83d8bc8c55
Tutorial 1 updated. Execution time camera switching implemented.
...
Some unification done to simplify camera switching.
2012-10-26 13:30:20 +04:00
Alexander Smorkalov
016b2cadb0
Issue 2473 Service connection leak in OpenCV Manager installation waiting fixed.
...
Some code refactoring done.
2012-10-26 13:30:20 +04:00
Alexander Smorkalov
9217095955
Issue 2472 Android samples crash on Camera.StartPreview on Android 4.1 fixed.
2012-10-26 13:30:20 +04:00
Andrey Kamaev
6211f156e6
Merge 2.4.3-rc
2012-10-24 19:56:27 +04:00
Alexander Smorkalov
4f0f6686d1
Undefind behavior in Async Service Helper fixed.
2012-10-24 12:28:31 +04:00
Alexander Smorkalov
76bcf72ded
2.4.3 version support added to OpenCV Manager. Docs updated. Samples updated.
2012-10-24 09:51:01 +04:00
Alexander Smorkalov
c1d42664bc
Refactring. Bug fix.
2012-10-23 20:06:58 +04:00
Alexander Smorkalov
a942747046
Code review coments fixed. Lint wornings fixed.
2012-10-23 20:06:58 +04:00
Alexander Smorkalov
641ee645ab
New sample framework integrated to Java part of SDK;
...
Frame format setter added to both views.
2012-10-23 20:06:33 +04:00
Alexander Smorkalov
9029acf6f0
openCV application framework moved to modules/java/... folder. Now it is part of OpenCV SDK.
2012-10-23 20:06:33 +04:00
Andrey Kamaev
5bc104cef5
Merge branch '2.4'
2012-10-19 15:00:05 +04:00
Andrey Kamaev
57d077b936
Fix Java API generation after normalization
...
The rst_parser.py was unintentionally corrupted by normalization.
This fix repairs the script and fixes Java API generation.
2012-10-17 18:20:46 +04:00
OpenCV Buildbot
81f826db2b
Normalize line endings and whitespace
2012-10-17 15:57:49 +04:00
OpenCV Buildbot
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
Andrey Kamaev
ed51162568
Fix binary compatibility of Java wrappers
2012-10-17 02:09:37 +04:00
Andrey Kamaev
dbd30d4fba
Revert "fixing Java test and sample after moving drawContours() from Imgproc to Core"
...
This reverts commit eb4ce67dac
.
Conflicts:
samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionView.java
2012-10-15 17:53:57 +04:00
Andrey Kamaev
a390c1e2e6
Merge pull request #40 from emchristiansen/manualBRISKFREAK
2012-10-12 12:31:11 +04:00
Eric Christiansen
594ce1c869
fixed indentation
2012-10-12 12:31:11 +04:00
Eric Christiansen
caebcdcb3d
Minor tweak to add BRISK and FREAK support for the Java wrapper
2012-10-12 12:31:11 +04:00
Alexander Smorkalov
5a524bdfd7
Issue #1861 Improve Javadoc documentation fixed. Multiline code segments added to Javadoc.
2012-10-11 19:21:40 +04:00
Andrey Kamaev
8f44f25f47
Fix AndroidManifest.xml generation for OpenCV Android library project (second attempt)
2012-10-11 17:09:57 +04:00
Andrey Kamaev
7cb525d63f
Fix AndroidManifest.xml generation for OpenCV Android library project
2012-10-11 15:47:57 +04:00
Alexander Smorkalov
9ad5fd709b
Fixed Javadoc problems with ">" and "<" symbols.
2012-10-10 13:31:03 +04:00
Alexander Smorkalov
306ed9801a
Issue #2284 BaseLoaderCallback requires use of Activity fixed.
2012-10-10 11:44:01 +04:00
Alexander Smorkalov
9a76573172
Auto expand of OpenCV version for Android Library prject and some documentation pages added.
2012-10-09 18:30:58 +04:00
Alexander Smorkalov
4b808b1199
RESTART_REQUIRED status removed from OpenCV Manager API;
...
OpenCV info library name fixed;
Minimum API level for OpenCV library project increased up to 3 for using message dialogs.
2012-10-09 10:34:40 +04:00
Alexander Smorkalov
febfdc9fa2
Wating for OpenCV library package installation added.
2012-10-08 14:37:59 +04:00
Alexander Smorkalov
11839e2cc9
Wating for OpenCV Manager installation added.
2012-10-08 14:37:59 +04:00
Vadim Pisarevsky
b2bf90e951
fixed build errors in java bindings on desktop in Debug mode
2012-10-02 10:49:19 +04:00
Andrey Pavlenko
8c1550a4ec
a new Java test to imencode() with params
2012-09-27 19:11:02 +04:00
Andrey Kamaev
cd05d9aaad
Fix build of Java API for Windows
2012-09-17 13:21:20 +04:00
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 ..)
2012-09-17 13:21:20 +04:00
Andrey Kamaev
0e9405e591
Honor resently added functionality in hdr_parser and rst_parser; minor fixes in documentation
2012-09-14 22:26:32 +04:00
Andrey Kamaev
e564a53ccd
Add gitignore for Android tests and samples
2012-09-10 15:48:57 +04:00
Andrey Kamaev
70234433d3
Reduce verbosity of Java API generators
2012-09-06 18:54:38 +04:00
Andrey Kamaev
af415085d8
Fix Android build with CMake 2.6.3-2.8.3
2012-09-04 16:21:44 +04:00
Vsevolod Glumov
4d6730dc68
Improved javadoc comments. Minor formatting fix.
2012-08-28 18:51:46 +04:00
Vsevolod Glumov
dc6fa94118
Improved javadoc comments.
2012-08-28 15:49:50 +04:00
Vsevolod Glumov
396e4517ff
Improved javadoc comments. Draft.
2012-08-28 15:01:46 +04:00
Andrey Kamaev
5c01d13f38
Pass list of modules to javadoc generator
...
Previously the generator always uses hardcoded list of modules.
This fix replaces hardcoded list with actual set of modules coming from cmake.
2012-08-27 16:48:09 +04:00
Alexander Smorkalov
14fa645026
Debug build for Android added. Stripping of debug build turned off.
2012-08-14 12:03:05 +04:00
Andrey Pavlenko
4e4db94b6b
removing warnings on deprecated api when targeting to android-15+
2012-07-14 19:07:27 +00:00
Andrey Kamaev
a5b60fa532
Fixed typo in Java wrapper for FetauresDetector class
2012-07-09 10:52:28 +00:00
Andrey Kamaev
620d122fc2
Contrib module is added to java wrappers; fixed algorithm initialisation for python bindings
2012-07-05 07:58:40 +00:00
Andrey Kamaev
b1eba01afb
Fixed several mistakes in documentation
2012-07-05 07:30:45 +00:00
Andrey Kamaev
5f8715c8b4
Fixed file globbing in documentation parsers
2012-07-05 05:11:15 +00:00
Andrey Kamaev
51f6127e0a
Merged the recent fixes from 2.4 branch
2012-07-04 08:04:31 +00:00
Andrey Pavlenko
e2e6838da3
adding CDT Builder (via ndk-build.cmd) for JNI part
2012-07-02 13:15:16 +00:00
Andrey Pavlenko
600ad799c7
restoring binary compatibility with 2.4.1
2012-07-02 11:54:24 +00:00
Alexander Smorkalov
c80d205ecf
OpenCV Library renamed.
2012-07-02 10:07:24 +00:00
Andrey Pavlenko
a72f4474b4
fixing bug #1987(android keeps RGBA in alpha pre-multiplied form, Mat <-> Bitmap should handle this correctly)
2012-06-29 15:38:10 +00:00
Andrey Kamaev
71729a5967
opencv_ts is removed for java API
2012-06-29 08:11:20 +00:00