Skip to content

O
opencv
Commit 48aeaf62 authored by Alexander Smorkalov's avatar Alexander Smorkalov Committed by Andrey Kamaev
Browse files
Options

Tegra detector fixed; 

Some aditional logs added;
AndroidManifest version incremented.
parent b1811a8b
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 6 deletions
android/service/engine/AndroidManifest.xml
View file @ 48aeaf62
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.opencv.engine" package="org.opencv.engine"
android:versionCode="13" android:versionCode="12"
android:versionName="1.3" > android:versionName="1.2" >
<uses-sdk android:minSdkVersion="8" /> <uses-sdk android:minSdkVersion="8" />
<uses-feature android:name="android.hardware.touchscreen" android:required="false"/> <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
......
android/service/engine/jni/BinderComponent/HardwareDetector.cpp
View file @ 48aeaf62
...@@ -156,7 +156,6 @@ int GetProcessorCount() ...@@ -156,7 +156,6 @@ int GetProcessorCount()
int DetectKnownPlatforms() int DetectKnownPlatforms()
{ {
#ifdef __SUPPORT_TEGRA3
int tegra_status = DetectTegra(); int tegra_status = DetectTegra();
if (3 == tegra_status) if (3 == tegra_status)
...@@ -167,9 +166,6 @@ int DetectKnownPlatforms() ...@@ -167,9 +166,6 @@ int DetectKnownPlatforms()
{ {
return PLATFORM_UNKNOWN; return PLATFORM_UNKNOWN;
} }
#else
return PLATFORM_UNKNOWN;
#endif
// NOTE: Uncomment when all Tegras will be supported // NOTE: Uncomment when all Tegras will be supported
/*if (tegra_status > 0) /*if (tegra_status > 0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment