From 2b3105591446cabbf13a1bc7ac26b1f6ca397af9 Mon Sep 17 00:00:00 2001 From: Roman Donchenko Date: Tue, 3 Dec 2013 17:33:28 +0400 Subject: [PATCH] Fixed the "platfrom" typo everywhere. --- .../arm_crosscompile_with_cmake.rst | 2 +- .../engine/jni/NativeService/PackageInfo.cpp | 4 ++-- .../engine/jni/Tests/HardwareDetectionTest.cpp | 2 +- .../org/opencv/engine/manager/ManagerActivity.java | 14 +++++++------- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/tutorials/introduction/crosscompilation/arm_crosscompile_with_cmake.rst b/doc/tutorials/introduction/crosscompilation/arm_crosscompile_with_cmake.rst index c40b86c974..0b2253acea 100644 --- a/doc/tutorials/introduction/crosscompilation/arm_crosscompile_with_cmake.rst +++ b/doc/tutorials/introduction/crosscompilation/arm_crosscompile_with_cmake.rst @@ -105,7 +105,7 @@ Building OpenCV Enable hardware optimizations ----------------------------- -Depending on target platfrom architecture different instruction sets can be used. By default +Depending on target platform architecture different instruction sets can be used. By default compiler generates code for armv5l without VFPv3 and NEON extensions. Add ``-DUSE_VFPV3=ON`` to cmake command line to enable code generation for VFPv3 and ``-DUSE_NEON=ON`` for using NEON SIMD extensions. diff --git a/platforms/android/service/engine/jni/NativeService/PackageInfo.cpp b/platforms/android/service/engine/jni/NativeService/PackageInfo.cpp index 64ea70dae8..98ea828747 100644 --- a/platforms/android/service/engine/jni/NativeService/PackageInfo.cpp +++ b/platforms/android/service/engine/jni/NativeService/PackageInfo.cpp @@ -170,7 +170,7 @@ inline string JoinPlatform(int platform) return result; } -inline int SplitPlatfrom(const vector& features) +inline int SplitPlatform(const vector& features) { int result = 0; @@ -419,7 +419,7 @@ InstallPath(install_path) return; } - Platform = SplitPlatfrom(features); + Platform = SplitPlatform(features); if (PLATFORM_UNKNOWN != Platform) { switch (Platform) diff --git a/platforms/android/service/engine/jni/Tests/HardwareDetectionTest.cpp b/platforms/android/service/engine/jni/Tests/HardwareDetectionTest.cpp index 8637dfee30..83dd9c27e1 100644 --- a/platforms/android/service/engine/jni/Tests/HardwareDetectionTest.cpp +++ b/platforms/android/service/engine/jni/Tests/HardwareDetectionTest.cpp @@ -170,7 +170,7 @@ TEST(CpuID, CheckVFPv3) EXPECT_TRUE(cpu_id & FEATURES_HAS_VFPv3); } -TEST(PlatfromDetector, CheckTegra) +TEST(PlatformDetector, CheckTegra) { EXPECT_NE(PLATFORM_UNKNOWN, DetectKnownPlatforms()); } diff --git a/platforms/android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java b/platforms/android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java index 4e9050fa4d..8e8389dcc7 100644 --- a/platforms/android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java +++ b/platforms/android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java @@ -90,28 +90,28 @@ public class ManagerActivity extends Activity mInstalledPackageView.setAdapter(mInstalledPacksAdapter); TextView HardwarePlatformView = (TextView)findViewById(R.id.HardwareValue); - int Platfrom = HardwareDetector.DetectKnownPlatforms(); + int Platform = HardwareDetector.DetectKnownPlatforms(); int CpuId = HardwareDetector.GetCpuID(); - if (HardwareDetector.PLATFORM_UNKNOWN != Platfrom) + if (HardwareDetector.PLATFORM_UNKNOWN != Platform) { - if (HardwareDetector.PLATFORM_TEGRA == Platfrom) + if (HardwareDetector.PLATFORM_TEGRA == Platform) { HardwarePlatformView.setText("Tegra"); } - else if (HardwareDetector.PLATFORM_TEGRA2 == Platfrom) + else if (HardwareDetector.PLATFORM_TEGRA2 == Platform) { HardwarePlatformView.setText("Tegra 2"); } - else if (HardwareDetector.PLATFORM_TEGRA3 == Platfrom) + else if (HardwareDetector.PLATFORM_TEGRA3 == Platform) { HardwarePlatformView.setText("Tegra 3"); } - else if (HardwareDetector.PLATFORM_TEGRA4i == Platfrom) + else if (HardwareDetector.PLATFORM_TEGRA4i == Platform) { HardwarePlatformView.setText("Tegra 4i"); } - else if (HardwareDetector.PLATFORM_TEGRA4 == Platfrom) + else if (HardwareDetector.PLATFORM_TEGRA4 == Platform) { HardwarePlatformView.setText("Tegra 4"); }