generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2052 from SpecLad:seporate

Browse Source
This commit is contained in:
Roman Donchenko 2013-12-26 12:22:45 +04:00 committed by OpenCV Buildbot
commit b94963d381
6 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/OpenCVGenAndroidMK.cmake
View File

@ -54,7 +54,7 @@ if(ANDROID)
endforeach()
# remove CUDA runtime and NPP from regular deps
# it can be added seporately if needed.
# it can be added separately if needed.
ocv_list_filterout(OPENCV_EXTRA_COMPONENTS_CONFIGMAKE "libcu")
ocv_list_filterout(OPENCV_EXTRA_COMPONENTS_CONFIGMAKE "libnpp")

34
platforms/android/service/engine/jni/BinderComponent/StringUtils.cpp
View File

@ -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;

4
platforms/android/service/engine/jni/BinderComponent/StringUtils.h
View File

@ -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

2
platforms/android/service/engine/jni/NativeService/PackageInfo.cpp
View File

@ -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

2
platforms/android/service/engine/jni/Tests/PackageManagmentTest.cpp
View File

@ -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;

4
platforms/android/service/engine/src/org/opencv/engine/OpenCVEngineInterface.aidl
View File

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