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

Normalized file endings.

Browse Source
This commit is contained in:
Roman Donchenko
2013-08-21 17:26:54 +04:00
parent f55740da70
commit e9a28f66ee
486 changed files with 166 additions and 606 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platforms/android/package/CMakeLists.txt
View File

@@ -91,4 +91,4 @@ add_custom_command(
install(FILES "${APK_NAME}" DESTINATION "apk/" COMPONENT main)
add_custom_target(android_package ALL SOURCES "${APK_NAME}" )
add_dependencies(android_package opencv_java)
add_dependencies(android_package opencv_java)

2
platforms/android/refman.rst
View File

@@ -6,4 +6,4 @@ OpenCV4Android Reference
:maxdepth: 2
service/doc/index.rst
java.rst
java.rst

2
platforms/android/service/all.py
View File

@@ -40,4 +40,4 @@ if (__name__ == "__main__"):
os.system(PushCommand)
print("Testing on device \"%s\"" % Name)
TestCommand = "%s \"%s\" \"%s\" 2>&1" % (os.path.join(HomeDir, "test_native.py"), Arch, Name)
os.system(TestCommand)
os.system(TestCommand)

2
platforms/android/service/device.conf
View File

@@ -1,3 +1,3 @@
armeabi;15c000000581404;
x86;0123456789ABCDEF;
mips;Novo7 Basic;
mips;Novo7 Basic;

2
platforms/android/service/doc/Intro.rst
View File

@@ -41,4 +41,4 @@ Subsequent launches of OpenCV apps\:
Architecture of OpenCV Manager
------------------------------
.. image:: img/Structure.png
.. image:: img/Structure.png

2
platforms/android/service/doc/LoaderCallbackInterface.rst
View File

@@ -46,4 +46,4 @@ Initialization status constants
.. data:: INIT_FAILED
OpenCV library initialization failed
OpenCV library initialization failed

2
platforms/android/service/doc/UseCases.rst
View File

@@ -29,4 +29,4 @@ Regular application start
OpenCV Manager and OpenCV library has been already installed.
.. image:: img/LibInstalled.png
.. image:: img/LibInstalled.png

2
platforms/android/service/doc/build_uml.py
View File

@@ -20,4 +20,4 @@ if (not os.path.exists(TARGET_PATH)):
for filename in os.listdir("."):
if ("dia" == filename[-3:]):
os.system("%s --export %s %s" % (DiaPath, os.path.join(TARGET_PATH, filename[0:len(filename)-4] + ".png"), filename))
os.system("%s --export %s %s" % (DiaPath, os.path.join(TARGET_PATH, filename[0:len(filename)-4] + ".png"), filename))

2
platforms/android/service/engine/jni/Android.mk
View File

@@ -83,4 +83,4 @@ include $(BUILD_SHARED_LIBRARY)
# Native test application
#---------------------------------------------------------------------
#include $(LOCAL_PATH)/Tests/Tests.mk
#include $(LOCAL_PATH)/Tests/Tests.mk

2
platforms/android/service/engine/jni/Application.mk
View File

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

2
platforms/android/service/engine/jni/BinderComponent/BnOpenCVEngine.cpp
View File

@@ -69,4 +69,4 @@ status_t BnOpenCVEngine::onTransact(uint32_t code, const Parcel& data, android::
}
return android::NO_ERROR;
}
}

2
platforms/android/service/engine/jni/BinderComponent/BnOpenCVEngine.h
View File

@@ -18,4 +18,4 @@ public:
};
#endif
#endif

2
platforms/android/service/engine/jni/BinderComponent/BpOpenCVEngine.cpp
View File

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

2
platforms/android/service/engine/jni/BinderComponent/BpOpenCVEngine.h
View File

@@ -17,4 +17,4 @@ public:
virtual bool InstallVersion(android::String16 version);
};
#endif
#endif

2
platforms/android/service/engine/jni/BinderComponent/HardwareDetector.cpp
View File

@@ -172,4 +172,4 @@ int DetectKnownPlatforms()
{
return PLATFORM_UNKNOWN;
}
}
}

2
platforms/android/service/engine/jni/BinderComponent/HardwareDetector.h
View File

@@ -34,4 +34,4 @@ int GetProcessorCount();
std::string GetPlatformName();
int GetCpuID();
#endif
#endif

2
platforms/android/service/engine/jni/BinderComponent/ProcReader.h
View File

@@ -26,4 +26,4 @@
// public part
std::map<std::string, std::string> GetCpuInfo();
#endif
#endif

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

@@ -89,4 +89,4 @@ vector<string> SplitStringVector(const string& src, const char seporator)
}
return result;
}
}

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

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

2
platforms/android/service/engine/jni/BinderComponent/TegraDetector.cpp
View File

@@ -58,4 +58,4 @@ int DetectTegra()
}
return result;
}
}

2
platforms/android/service/engine/jni/BinderComponent/TegraDetector.h
View File

@@ -6,4 +6,4 @@
int DetectTegra();
#endif
#endif

2
platforms/android/service/engine/jni/JNIWrapper/HardwareDetector_jni.cpp
View File

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

2
platforms/android/service/engine/jni/NativeClient/ClientMain.cpp
View File

@@ -39,4 +39,4 @@ int main(int argc, char *argv[])
printf("OpenCVEngine version %d started", EngineVersion);
return 0;
}
}

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

@@ -16,4 +16,4 @@ vector<PackageInfo> NativePackageManager::GetInstalledPackages()
NativePackageManager::~NativePackageManager()
{
}
}

2
platforms/android/service/engine/jni/NativeService/NativePackageManager.h
View File

@@ -13,4 +13,4 @@ protected:
virtual std::vector<PackageInfo> GetInstalledPackages();
};
#endif
#endif

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

@@ -29,4 +29,4 @@ int main(int argc, char *argv[])
delete PackageManager;
return 0;
}
}

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

@@ -15,4 +15,4 @@ vector<PackageInfo> PackageManagerStub::GetInstalledPackages()
PackageManagerStub::~PackageManagerStub()
{
}
}

2
platforms/android/service/engine/jni/Tests/PackageManagerStub.h
View File

@@ -14,4 +14,4 @@ protected:
virtual std::vector<PackageInfo> GetInstalledPackages();
};
#endif
#endif

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

@@ -4,4 +4,4 @@ int main(int argc, char **argv)
{
::testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS();
}
}

2
platforms/android/service/engine/jni/Tests/Tests.mk
View File

@@ -44,4 +44,4 @@ LOCAL_LDLIBS += -lz -lbinder -llog -lutils
LOCAL_SHARED_LIBRARIES += libOpenCVEngine
include $(BUILD_EXECUTABLE)
include $(BUILD_EXECUTABLE)

2
platforms/android/service/engine/jni/include/EngineCommon.h
View File

@@ -19,4 +19,4 @@
typedef const char* (*InfoFunctionType)();
#endif
#endif

2
platforms/android/service/engine/jni/include/IOpenCVEngine.h
View File

@@ -29,4 +29,4 @@ public:
virtual bool InstallVersion(android::String16 version) = 0;
};
#endif
#endif

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

@@ -30,4 +30,4 @@ interface OpenCVEngineInterface
* @return Returns OpenCV libraries names seporated by symbol ";" in loading order
*/
String getLibraryList(String version);
}
}

2
platforms/android/service/push_native.py
View File

@@ -24,4 +24,4 @@ if (__name__ == "__main__"):
os.system("adb %s push ./engine/libs/%s/OpenCVEngineNativeService %s" % (DEVICE_STR, DEVICE_ARCH, TARGET_DEVICE_PATH))
os.system("adb %s push ./engine/libs/%s/OpenCVEngineTest %s" % (DEVICE_STR, DEVICE_ARCH, TARGET_DEVICE_PATH))
os.system("adb %s push ./engine/libs/%s/OpenCVEngineTestApp %s" % (DEVICE_STR, DEVICE_ARCH, TARGET_DEVICE_PATH))
os.system("adb %s push ./engine/libs/%s/libOpenCVEngine_jni.so %s" % (DEVICE_STR, DEVICE_ARCH, TARGET_DEVICE_PATH))
os.system("adb %s push ./engine/libs/%s/libOpenCVEngine_jni.so %s" % (DEVICE_STR, DEVICE_ARCH, TARGET_DEVICE_PATH))

2
platforms/ios/build_framework.py
View File

@@ -122,4 +122,4 @@ if __name__ == "__main__":
print "Usage:\n\t./build_framework.py <outputdir>\n\n"
sys.exit(0)
build_framework(os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), "../..")), os.path.abspath(sys.argv[1]))
build_framework(os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), "../..")), os.path.abspath(sys.argv[1]))

2
platforms/ios/cmake/Modules/Platform/iOS.cmake
View File

@@ -160,4 +160,4 @@ list (APPEND CMAKE_SYSTEM_PREFIX_PATH
# Project install destination.
"${CMAKE_INSTALL_PREFIX}"
)
)

2
platforms/ios/cmake/Toolchains/Toolchain-iPhoneOS_Xcode.cmake
View File

@@ -28,4 +28,4 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY)
SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
message (STATUS "iPhoneOS toolchain loaded")
message (STATUS "iPhoneOS toolchain loaded")

2
platforms/ios/cmake/Toolchains/Toolchain-iPhoneSimulator_Xcode.cmake
View File

@@ -28,4 +28,4 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY)
SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
message (STATUS "iPhoneSimulator toolchain loaded")
message (STATUS "iPhoneSimulator toolchain loaded")

2
platforms/ios/readme.txt
View File

@@ -4,4 +4,4 @@ Building OpenCV from Source, using CMake and Command Line
cd ~/<my_working_directory>
python opencv/platforms/ios/build_framework.py ios
If everything's fine, a few minutes later you will get ~/<my_working_directory>/ios/opencv2.framework. You can add this framework to your Xcode projects.
If everything's fine, a few minutes later you will get ~/<my_working_directory>/ios/opencv2.framework. You can add this framework to your Xcode projects.

2
platforms/readme.txt
View File

@@ -1,3 +1,3 @@
This folder contains toolchains and additional files that are needed for cross compilation.
For more information see introduction tutorials for target platform in documentation:
http://docs.opencv.org/doc/tutorials/introduction/table_of_content_introduction/table_of_content_introduction.html#table-of-content-introduction
http://docs.opencv.org/doc/tutorials/introduction/table_of_content_introduction/table_of_content_introduction.html#table-of-content-introduction

2
platforms/scripts/cmake_winrt.cmd
View File

@@ -6,4 +6,4 @@ set msvc_path=C:\Program Files\Microsoft Visual Studio 11.0
call "%msvc_path%\Common7\Tools\VsDevCmd.bat"
call "%msvc_path%\VC\bin\x86_arm\vcvarsx86_arm.bat"
cmake.exe -GNinja -DCMAKE_BUILD_TYPE=Release -DENABLE_WINRT_MODE=ON -DWITH_FFMPEG=OFF -DWITH_MSMF=OFF -DWITH_DSHOW=OFF -DWITH_VFW=OFF -DWITH_TIFF=OFF -DWITH_OPENEXR=OFF -DWITH_CUDA=OFF -DBUILD_opencv_gpu=OFF -DBUILD_opencv_python=OFF -DBUILD_opencv_java=OFF -DCMAKE_TOOLCHAIN_FILE=..\winrt\arm.winrt.toolchain.cmake %* ..\..
cmake.exe -GNinja -DCMAKE_BUILD_TYPE=Release -DENABLE_WINRT_MODE=ON -DWITH_FFMPEG=OFF -DWITH_MSMF=OFF -DWITH_DSHOW=OFF -DWITH_VFW=OFF -DWITH_TIFF=OFF -DWITH_OPENEXR=OFF -DWITH_CUDA=OFF -DBUILD_opencv_gpu=OFF -DBUILD_opencv_python=OFF -DBUILD_opencv_java=OFF -DCMAKE_TOOLCHAIN_FILE=..\winrt\arm.winrt.toolchain.cmake %* ..\..

2
platforms/winrt/arm.winrt.toolchain.cmake
View File

@@ -3,4 +3,4 @@ set(CMAKE_SYSTEM_PROCESSOR "arm-v7a")
set(CMAKE_FIND_ROOT_PATH "${CMAKE_SOURCE_DIR}/platforms/winrt")
set(CMAKE_REQUIRED_DEFINITIONS -D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE)
add_definitions(-D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE)
add_definitions(-D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE)