Merge pull request #1919 from SpecLad:platfrom

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.

platforms/android/service/engine/jni/NativeService/PackageInfo.cpp

@@ -170,7 +170,7 @@ inline string JoinPlatform(int platform)
     return result;
 }
 
-inline int SplitPlatfrom(const vector<string>& features)
+inline int SplitPlatform(const vector<string>& features)
 {
     int result = 0;
 
@@ -419,7 +419,7 @@ InstallPath(install_path)
             return;
         }
 
-        Platform = SplitPlatfrom(features);
+        Platform = SplitPlatform(features);
         if (PLATFORM_UNKNOWN != Platform)
         {
             switch (Platform)

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());
 }

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");
             }