Normalized file endings.
This commit is contained in:
@@ -83,4 +83,4 @@ include $(BUILD_SHARED_LIBRARY)
|
||||
# Native test application
|
||||
#---------------------------------------------------------------------
|
||||
|
||||
#include $(LOCAL_PATH)/Tests/Tests.mk
|
||||
#include $(LOCAL_PATH)/Tests/Tests.mk
|
||||
|
@@ -3,4 +3,4 @@ APP_PLATFORM := android-8
|
||||
APP_STL := stlport_static
|
||||
APP_CPPFLAGS := -fno-rtti -fno-exceptions
|
||||
NDK_TOOLCHAIN_VERSION=4.4.3
|
||||
#APP_OPTIM := debug
|
||||
#APP_OPTIM := debug
|
||||
|
@@ -69,4 +69,4 @@ status_t BnOpenCVEngine::onTransact(uint32_t code, const Parcel& data, android::
|
||||
}
|
||||
|
||||
return android::NO_ERROR;
|
||||
}
|
||||
}
|
||||
|
@@ -18,4 +18,4 @@ public:
|
||||
|
||||
};
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
@@ -68,4 +68,4 @@ bool BpOpenCVEngine::InstallVersion(String16 version)
|
||||
return static_cast<bool>(reply.readInt32());
|
||||
}
|
||||
|
||||
IMPLEMENT_META_INTERFACE(OpenCVEngine, OPECV_ENGINE_CLASSNAME)
|
||||
IMPLEMENT_META_INTERFACE(OpenCVEngine, OPECV_ENGINE_CLASSNAME)
|
||||
|
@@ -17,4 +17,4 @@ public:
|
||||
virtual bool InstallVersion(android::String16 version);
|
||||
};
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
@@ -172,4 +172,4 @@ int DetectKnownPlatforms()
|
||||
{
|
||||
return PLATFORM_UNKNOWN;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -34,4 +34,4 @@ int GetProcessorCount();
|
||||
std::string GetPlatformName();
|
||||
int GetCpuID();
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
@@ -26,4 +26,4 @@
|
||||
// public part
|
||||
std::map<std::string, std::string> GetCpuInfo();
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
@@ -89,4 +89,4 @@ vector<string> SplitStringVector(const string& src, const char seporator)
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
@@ -10,4 +10,4 @@ std::set<std::string> SplitString(const std::string& src, const char seporator);
|
||||
bool ParseString(const std::string& src, std::string& key, std::string& value);
|
||||
std::vector<std::string> SplitStringVector(const std::string& src, const char seporator);
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
@@ -58,4 +58,4 @@ int DetectTegra()
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
@@ -6,4 +6,4 @@
|
||||
|
||||
int DetectTegra();
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
@@ -22,4 +22,4 @@ JNIEXPORT jint JNICALL Java_org_opencv_engine_HardwareDetector_GetProcessorCount
|
||||
JNIEXPORT jint JNICALL Java_org_opencv_engine_HardwareDetector_DetectKnownPlatforms(JNIEnv* , jclass)
|
||||
{
|
||||
return DetectKnownPlatforms();
|
||||
}
|
||||
}
|
||||
|
@@ -39,4 +39,4 @@ int main(int argc, char *argv[])
|
||||
printf("OpenCVEngine version %d started", EngineVersion);
|
||||
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
@@ -16,4 +16,4 @@ vector<PackageInfo> NativePackageManager::GetInstalledPackages()
|
||||
|
||||
NativePackageManager::~NativePackageManager()
|
||||
{
|
||||
}
|
||||
}
|
||||
|
@@ -13,4 +13,4 @@ protected:
|
||||
virtual std::vector<PackageInfo> GetInstalledPackages();
|
||||
};
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
@@ -29,4 +29,4 @@ int main(int argc, char *argv[])
|
||||
delete PackageManager;
|
||||
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
@@ -15,4 +15,4 @@ vector<PackageInfo> PackageManagerStub::GetInstalledPackages()
|
||||
|
||||
PackageManagerStub::~PackageManagerStub()
|
||||
{
|
||||
}
|
||||
}
|
||||
|
@@ -14,4 +14,4 @@ protected:
|
||||
virtual std::vector<PackageInfo> GetInstalledPackages();
|
||||
};
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
@@ -4,4 +4,4 @@ int main(int argc, char **argv)
|
||||
{
|
||||
::testing::InitGoogleTest(&argc, argv);
|
||||
return RUN_ALL_TESTS();
|
||||
}
|
||||
}
|
||||
|
@@ -44,4 +44,4 @@ LOCAL_LDLIBS += -lz -lbinder -llog -lutils
|
||||
|
||||
LOCAL_SHARED_LIBRARIES += libOpenCVEngine
|
||||
|
||||
include $(BUILD_EXECUTABLE)
|
||||
include $(BUILD_EXECUTABLE)
|
||||
|
@@ -19,4 +19,4 @@
|
||||
|
||||
typedef const char* (*InfoFunctionType)();
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
@@ -29,4 +29,4 @@ public:
|
||||
virtual bool InstallVersion(android::String16 version) = 0;
|
||||
};
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
@@ -30,4 +30,4 @@ interface OpenCVEngineInterface
|
||||
* @return Returns OpenCV libraries names seporated by symbol ";" in loading order
|
||||
*/
|
||||
String getLibraryList(String version);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user