mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-27 15:01:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
18,315 Commits 6 Branches 128 Tags 3.2 GiB
a921761d18
Commit Graph

121 Commits

Author SHA1 Message Date
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
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
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
Alexander Smorkalov
83e9b0a87a Javadoc waring fix. 2013-06-13 12:40:14 +04:00
Andrey Pavlenko
264d26e671 fixing empty Mat case 2013-06-08 12:41:57 +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
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
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 Kamaev
6570215205 Merge pull request #767 from asmorkalov:version_increment 2013-04-04 18:00: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
49f6dad13f Move cv::KeyPoint and cv::DMatch to core 2013-03-26 16:08:43 +04:00
Alexander Smorkalov
8942eaf0d7 Stetch support for Android View classes added (Feature #2840) 2013-03-11 11:17:19 +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
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
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
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
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
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
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
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
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
Kirill Kornyakov
2efd9b6ad7 Fixed a couple of minor issues in Javadocs 2012-11-01 22:28:46 +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
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
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
OpenCV Buildbot
04384a71e4 Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
Alexander Smorkalov
306ed9801a Issue #2284 BaseLoaderCallback requires use of Activity fixed. 2012-10-10 11:44:01 +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
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 Pavlenko
4e4db94b6b removing warnings on deprecated api when targeting to android-15+ 2012-07-14 19:07:27 +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
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 Pavlenko
2984fa751e adding OpenCV Manager 2012-06-21 14:50:05 +00:00
Andrey Pavlenko
952b25f86f changing 'java' module layout 2012-06-21 11:44:31 +00:00