mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 11:40:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #477 from asmorkalov:android_version_info

Browse Source
This commit is contained in:
Andrey Kamaev 2013-02-12 17:06:27 +04:00 committed by OpenCV Buildbot
commit 8b7a28a7e4
3 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modules/core/doc/utility_and_system_functions_and_macros.rst
View File

@ -255,7 +255,7 @@ The function allocates the buffer of the specified size and returns it. When the
fastFree
------------
--------
Deallocates a memory buffer.
.. ocv:function:: void fastFree(void* ptr)
@ -280,6 +280,14 @@ The function acts like ``sprintf`` but forms and returns an STL string. It can
:ocv:class:`Exception` constructor.
getBuildInformation
-------------------
Returns full configuration time cmake output.
.. ocv:function:: const std::string& getBuildInformation()
Returned value is raw cmake output including version control system revision, compiler version, compiler flags, enabled modules and third party libraries, etc. Output format depends on target architecture.
checkHardwareSupport
--------------------
@ -304,7 +312,7 @@ Returns true if the specified feature is supported by the host hardware.
The function returns true if the host hardware supports the specified feature. When user calls ``setUseOptimized(false)``, the subsequent calls to ``checkHardwareSupport()`` will return false until ``setUseOptimized(true)`` is called. This way user can dynamically switch on and off the optimized code in OpenCV.
getNumThreads
-----------------
-------------
Returns the number of threads used by OpenCV.
.. ocv:function:: int getNumThreads()
@ -318,7 +326,7 @@ The function returns the number of threads that is used by OpenCV.
getThreadNum
----------------
------------
Returns the index of the currently executed thread.
.. ocv:function:: int getThreadNum()
@ -332,7 +340,7 @@ The function returns a 0-based index of the currently executed thread. The funct
getTickCount
----------------
------------
Returns the number of ticks.
.. ocv:function:: int64 getTickCount()
@ -346,7 +354,7 @@ It can be used to initialize
getTickFrequency
--------------------
----------------
Returns the number of ticks per second.
.. ocv:function:: double getTickFrequency()
@ -363,7 +371,7 @@ That is, the following code computes the execution time in seconds: ::
getCPUTickCount
----------------
---------------
Returns the number of CPU ticks.
.. ocv:function:: int64 getCPUTickCount()
@ -417,7 +425,7 @@ The function sets the number of threads used by OpenCV in parallel OpenMP region
setUseOptimized
-----------------
---------------
Enables or disables the optimized code.
.. ocv:function:: int cvUseOptimized( int on_off )
@ -433,7 +441,7 @@ The function can be used to dynamically turn on and off optimized code (code tha
By default, the optimized code is enabled unless you disable it in CMake. The current status can be retrieved using ``useOptimized``.
useOptimized
-----------------
------------
Returns the status of optimized code usage.
.. ocv:function:: bool useOptimized()

6
modules/java/generator/src/java/android+AsyncServiceHelper.java
View File

@ -3,6 +3,7 @@ package org.opencv.android;
import java.io.File;
import java.util.StringTokenizer;
import org.opencv.core.Core;
import org.opencv.engine.OpenCVEngineInterface;
import android.content.ComponentName;
@ -85,7 +86,6 @@ class AsyncServiceHelper
{
mServiceInstallationProgress = true;
Log.d(TAG, "Package installation started");
}
else
{
@ -299,6 +299,10 @@ class AsyncServiceHelper
if (initOpenCVLibs(path, libs))
{
Log.d(TAG, "First attempt to load libs is OK");
String eol = System.getProperty("line.separator");
for (String str : Core.getBuildInformation().split(eol))
Log.i(TAG, str);
status = LoaderCallbackInterface.SUCCESS;
}
else

7
modules/java/generator/src/java/android+StaticHelper.java
View File

@ -1,7 +1,8 @@
package org.opencv.android;
import java.util.StringTokenizer;
import org.opencv.core.Core;
import java.util.StringTokenizer;
import android.util.Log;
class StaticHelper {
@ -28,6 +29,10 @@ class StaticHelper {
if (initOpenCVLibs(libs))
{
Log.d(TAG, "First attempt to load libs is OK");
String eol = System.getProperty("line.separator");
for (String str : Core.getBuildInformation().split(eol))
Log.i(TAG, str);
result = true;
}
else