1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-28 23:03:03 +04:00
Commit Graph

229 Commits

Author SHA1 Message Date
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
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 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 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 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 dc0788c864 Merge branch 2.4 2013-01-17 18:39:20 +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 084b1c7969 Merge branch 2.4 2013-01-11 15:45:23 +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 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
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 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
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 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 a390c1e2e6 Merge pull request #40 from emchristiansen/manualBRISKFREAK 2012-10-12 12:31:11 +04:00