Merge commit 'b94963d3' into merge-2.4

Conflicts:
	cmake/OpenCVGenAndroidMK.cmake

platforms/android/service/engine/jni/BinderComponent/StringUtils.cpp

@@ -34,13 +34,13 @@ bool ParseString(const string& src, string& key, string& value)
     if (src.empty())
         return false;
 
-    // find seporator ":"
-    size_t seporator_pos = src.find(":");
-    if (string::npos != seporator_pos)
+    // find separator ":"
+    size_t separator_pos = src.find(":");
+    if (string::npos != separator_pos)
     {
-        key = src.substr(0, seporator_pos);
+        key = src.substr(0, separator_pos);
         StripString(key);
-        value = src.substr(seporator_pos+1);
+        value = src.substr(separator_pos+1);
         StripString(value);
         return true;
     }
@@ -50,42 +50,42 @@ bool ParseString(const string& src, string& key, string& value)
     }
 }
 
-set<string> SplitString(const string& src, const char seporator)
+set<string> SplitString(const string& src, const char separator)
 {
     set<string> result;
 
     if (!src.empty())
     {
-        size_t seporator_pos;
+        size_t separator_pos;
         size_t prev_pos = 0;
         do
         {
-            seporator_pos = src.find(seporator, prev_pos);
-            result.insert(src.substr(prev_pos, seporator_pos - prev_pos));
-            prev_pos = seporator_pos + 1;
+            separator_pos = src.find(separator, prev_pos);
+            result.insert(src.substr(prev_pos, separator_pos - prev_pos));
+            prev_pos = separator_pos + 1;
         }
-        while (string::npos != seporator_pos);
+        while (string::npos != separator_pos);
     }
 
     return result;
 }
 
-vector<string> SplitStringVector(const string& src, const char seporator)
+vector<string> SplitStringVector(const string& src, const char separator)
 {
     vector<string> result;
 
     if (!src.empty())
     {
-        size_t seporator_pos;
+        size_t separator_pos;
         size_t prev_pos = 0;
         do
         {
-            seporator_pos = src.find(seporator, prev_pos);
-            string tmp = src.substr(prev_pos, seporator_pos - prev_pos);
+            separator_pos = src.find(separator, prev_pos);
+            string tmp = src.substr(prev_pos, separator_pos - prev_pos);
             result.push_back(tmp);
-            prev_pos = seporator_pos + 1;
+            prev_pos = separator_pos + 1;
         }
-        while (string::npos != seporator_pos);
+        while (string::npos != separator_pos);
     }
 
     return result;

platforms/android/service/engine/jni/BinderComponent/StringUtils.h

@@ -6,8 +6,8 @@
 #include <vector>
 
 bool StripString(std::string& src);
-std::set<std::string> SplitString(const std::string& src, const char seporator);
+std::set<std::string> SplitString(const std::string& src, const char separator);
 bool ParseString(const std::string& src, std::string& key, std::string& value);
-std::vector<std::string> SplitStringVector(const std::string& src, const char seporator);
+std::vector<std::string> SplitStringVector(const std::string& src, const char separator);
 
 #endif

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

@@ -203,7 +203,7 @@ inline int SplitPlatform(const vector<string>& features)
 }
 
 /* Package naming convention
- * All parts of package name seporated by "_" symbol
+ * All parts of package name separated by "_" symbol
  * First part is base namespace.
  * Second part is version. Version starts from "v" symbol. After "v" symbol version nomber without dot symbol added.
  * If platform is known third part is platform name

platforms/android/service/engine/jni/Tests/PackageManagmentTest.cpp

@@ -144,7 +144,7 @@ TEST(PackageManager, GetPackagePathForMips)
 }
 #endif
 
-// TODO: Enable tests if seporate package will be exists
+// TODO: Enable tests if separate package will be exists
 // TEST(PackageManager, GetPackagePathForTegra2)
 // {
 //     PackageManagerStub pm;

platforms/android/service/engine/src/org/opencv/engine/OpenCVEngineInterface.aidl

@@ -25,9 +25,9 @@ interface OpenCVEngineInterface
     boolean installVersion(String version);
 
     /**
-    * Return list of libraries in loading order seporated by ";" symbol
+    * Return list of libraries in loading order separated by ";" symbol
     * @param OpenCV version
-    * @return Returns OpenCV libraries names seporated by symbol ";" in loading order
+    * @return Returns OpenCV libraries names separated by symbol ";" in loading order
     */
     String getLibraryList(String version);
 }