Commit 76fdbeee authored by Alexander Smorkalov's avatar Alexander Smorkalov

Tegra detector fixed;

Some aditional logs added;
AndroidManifest version incremented.
parent 69296c33
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.opencv.engine"
android:versionCode="11"
android:versionName="1.1" >
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)
......
......@@ -91,10 +91,11 @@ string CommonPackageManager::GetPackagePathByVersion(const std::string& version,
group = CommonPackageManager::IntelRating;
int HardwareRating = GetHardwareRating(platform, cpu_id, group);
LOGD("Current hardware platform %d, %d", platform, cpu_id);
if (-1 == HardwareRating)
{
LOGE("Cannot calculate rating for current hardware platfrom!");
LOGE("Cannot calculate rating for current hardware platform!");
}
else
{
......@@ -115,6 +116,10 @@ string CommonPackageManager::GetPackagePathByVersion(const std::string& version,
{
result = found->GetInstalationPath();
}
else
{
LOGI("Found package is incompatible with current hardware platform");
}
}
}
}
......@@ -162,8 +167,10 @@ std::vector<std::pair<int, int> > CommonPackageManager::InitArmRating()
result.push_back(std::pair<int, int>(PLATFORM_UNKNOWN, ARCH_ARMv6));
result.push_back(std::pair<int, int>(PLATFORM_UNKNOWN, ARCH_ARMv6 | FEATURES_HAS_VFPv3d16));
result.push_back(std::pair<int, int>(PLATFORM_UNKNOWN, ARCH_ARMv6 | FEATURES_HAS_VFPv3));
result.push_back(std::pair<int, int>(PLATFORM_UNKNOWN, ARCH_ARMv6 | FEATURES_HAS_VFPv3 | FEATURES_HAS_VFPv3d16));
result.push_back(std::pair<int, int>(PLATFORM_UNKNOWN, ARCH_ARMv7));
result.push_back(std::pair<int, int>(PLATFORM_UNKNOWN, ARCH_ARMv7 | FEATURES_HAS_VFPv3));
result.push_back(std::pair<int, int>(PLATFORM_UNKNOWN, ARCH_ARMv7 | FEATURES_HAS_NEON));
result.push_back(std::pair<int, int>(PLATFORM_UNKNOWN, ARCH_ARMv7 | FEATURES_HAS_VFPv3 | FEATURES_HAS_NEON));
result.push_back(std::pair<int, int>(PLATFORM_TEGRA2, ARCH_ARMv7 | FEATURES_HAS_VFPv3));
result.push_back(std::pair<int, int>(PLATFORM_TEGRA3, ARCH_ARMv7 | FEATURES_HAS_VFPv3 | FEATURES_HAS_NEON));
......
......@@ -3,7 +3,7 @@
// Global tag for Logcat output
#undef LOG_TAG
#define LOG_TAG "OpenCVEngine"
#define LOG_TAG "OpenCVEngine"
#ifndef OPEN_CV_ENGINE_VERSION
#define OPEN_CV_ENGINE_VERSION 1
......
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