mirror of
https://github.com/opencv/opencv.git
synced 2024-12-02 16:00:17 +08:00
Tegra detector fixed;
Some aditional logs added; AndroidManifest version incremented.
This commit is contained in:
parent
b1811a8bf6
commit
48aeaf6239
@ -1,8 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.opencv.engine"
|
||||
android:versionCode="13"
|
||||
android:versionName="1.3" >
|
||||
android:versionCode="12"
|
||||
android:versionName="1.2" >
|
||||
|
||||
<uses-sdk android:minSdkVersion="8" />
|
||||
<uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
|
||||
|
@ -156,7 +156,6 @@ int GetProcessorCount()
|
||||
|
||||
int DetectKnownPlatforms()
|
||||
{
|
||||
#ifdef __SUPPORT_TEGRA3
|
||||
int tegra_status = DetectTegra();
|
||||
|
||||
if (3 == tegra_status)
|
||||
@ -167,9 +166,6 @@ int DetectKnownPlatforms()
|
||||
{
|
||||
return PLATFORM_UNKNOWN;
|
||||
}
|
||||
#else
|
||||
return PLATFORM_UNKNOWN;
|
||||
#endif
|
||||
|
||||
// NOTE: Uncomment when all Tegras will be supported
|
||||
/*if (tegra_status > 0)
|
||||
|
Loading…
Reference in New Issue
Block a user