mirror of https://github.com/opencv/opencv.git
Andrey Kamaev
12 years ago
commit
f4e27bcbbc
105 changed files with 4859 additions and 2921 deletions
@ -1,17 +1,17 @@ |
||||
#ifndef __IPACKAGE_MANAGER__ |
||||
#define __IPACKAGE_MANAGER__ |
||||
|
||||
#include <set> |
||||
#include <vector> |
||||
#include <string> |
||||
|
||||
class IPackageManager |
||||
{ |
||||
public: |
||||
virtual std::set<std::string> GetInstalledVersions() = 0; |
||||
virtual bool CheckVersionInstalled(const std::string& version, int platform, int cpu_id) = 0; |
||||
virtual bool InstallVersion(const std::string&, int platform, int cpu_id) = 0; |
||||
virtual std::string GetPackagePathByVersion(const std::string&, int platform, int cpu_id) = 0; |
||||
virtual std::vector<int> GetInstalledVersions() = 0; |
||||
virtual bool CheckVersionInstalled(int version, int platform, int cpu_id) = 0; |
||||
virtual bool InstallVersion(int version, int platform, int cpu_id) = 0; |
||||
virtual std::string GetPackagePathByVersion(int version, int platform, int cpu_id) = 0; |
||||
virtual ~IPackageManager(){}; |
||||
}; |
||||
|
||||
#endif |
||||
#endif |
||||
|
||||
@ -1,78 +1,146 @@ |
||||
if(APPLE) |
||||
set(OPENCL_FOUND YES) |
||||
set(OPENCL_LIBRARIES "-framework OpenCL") |
||||
set(OPENCL_FOUND YES) |
||||
set(OPENCL_LIBRARIES "-framework OpenCL") |
||||
else() |
||||
#find_package(OpenCL QUIET) |
||||
if(WITH_OPENCLAMDFFT) |
||||
find_path(CLAMDFFT_INCLUDE_DIR |
||||
NAMES clAmdFft.h) |
||||
find_library(CLAMDFFT_LIBRARIES |
||||
NAMES clAmdFft.Runtime) |
||||
find_package(OpenCL QUIET) |
||||
if(WITH_OPENCLAMDFFT) |
||||
set(CLAMDFFT_SEARCH_PATH $ENV{CLAMDFFT_PATH}) |
||||
if(NOT CLAMDFFT_SEARCH_PATH) |
||||
if(WIN32) |
||||
set( CLAMDFFT_SEARCH_PATH "C:\\Program Files (x86)\\AMD\\clAmdFft" ) |
||||
endif() |
||||
endif() |
||||
if(WITH_OPENCLAMDBLAS) |
||||
find_path(CLAMDBLAS_INCLUDE_DIR |
||||
NAMES clAmdBlas.h) |
||||
find_library(CLAMDBLAS_LIBRARIES |
||||
NAMES clAmdBlas) |
||||
set( CLAMDFFT_INCLUDE_SEARCH_PATH ${CLAMDFFT_SEARCH_PATH}/include ) |
||||
if(UNIX) |
||||
if(CMAKE_SIZEOF_VOID_P EQUAL 4) |
||||
set(CLAMDFFT_LIB_SEARCH_PATH /usr/lib) |
||||
else() |
||||
set(CLAMDFFT_LIB_SEARCH_PATH /usr/lib64) |
||||
endif() |
||||
else() |
||||
if(CMAKE_SIZEOF_VOID_P EQUAL 4) |
||||
set(CLAMDFFT_LIB_SEARCH_PATH ${CLAMDFFT_SEARCH_PATH}\\lib32\\import) |
||||
else() |
||||
set(CLAMDFFT_LIB_SEARCH_PATH ${CLAMDFFT_SEARCH_PATH}\\lib64\\import) |
||||
endif() |
||||
endif() |
||||
find_path(CLAMDFFT_INCLUDE_DIR |
||||
NAMES clAmdFft.h |
||||
PATHS ${CLAMDFFT_INCLUDE_SEARCH_PATH} |
||||
PATH_SUFFIXES clAmdFft |
||||
NO_DEFAULT_PATH) |
||||
find_library(CLAMDFFT_LIBRARY |
||||
NAMES clAmdFft.Runtime |
||||
PATHS ${CLAMDFFT_LIB_SEARCH_PATH} |
||||
NO_DEFAULT_PATH) |
||||
if(CLAMDFFT_LIBRARY) |
||||
set(CLAMDFFT_LIBRARIES ${CLAMDFFT_LIBRARY}) |
||||
else() |
||||
set(CLAMDFFT_LIBRARIES "") |
||||
endif() |
||||
endif() |
||||
if(WITH_OPENCLAMDBLAS) |
||||
set(CLAMDBLAS_SEARCH_PATH $ENV{CLAMDBLAS_PATH}) |
||||
if(NOT CLAMDBLAS_SEARCH_PATH) |
||||
if(WIN32) |
||||
set( CLAMDBLAS_SEARCH_PATH "C:\\Program Files (x86)\\AMD\\clAmdBlas" ) |
||||
endif() |
||||
endif() |
||||
set( CLAMDBLAS_INCLUDE_SEARCH_PATH ${CLAMDBLAS_SEARCH_PATH}/include ) |
||||
if(UNIX) |
||||
if(CMAKE_SIZEOF_VOID_P EQUAL 4) |
||||
set(CLAMDBLAS_LIB_SEARCH_PATH /usr/lib) |
||||
else() |
||||
set(CLAMDBLAS_LIB_SEARCH_PATH /usr/lib64) |
||||
endif() |
||||
else() |
||||
if(CMAKE_SIZEOF_VOID_P EQUAL 4) |
||||
set(CLAMDBLAS_LIB_SEARCH_PATH ${CLAMDBLAS_SEARCH_PATH}\\lib32\\import) |
||||
else() |
||||
set(CLAMDBLAS_LIB_SEARCH_PATH ${CLAMDBLAS_SEARCH_PATH}\\lib64\\import) |
||||
endif() |
||||
endif() |
||||
find_path(CLAMDBLAS_INCLUDE_DIR |
||||
NAMES clAmdBlas.h |
||||
PATHS ${CLAMDBLAS_INCLUDE_SEARCH_PATH} |
||||
PATH_SUFFIXES clAmdBlas |
||||
NO_DEFAULT_PATH) |
||||
find_library(CLAMDBLAS_LIBRARY |
||||
NAMES clAmdBlas |
||||
PATHS ${CLAMDBLAS_LIB_SEARCH_PATH} |
||||
NO_DEFAULT_PATH) |
||||
if(CLAMDBLAS_LIBRARY) |
||||
set(CLAMDBLAS_LIBRARIES ${CLAMDBLAS_LIBRARY}) |
||||
else() |
||||
set(CLAMDBLAS_LIBRARIES "") |
||||
endif() |
||||
endif() |
||||
# Try AMD/ATI Stream SDK |
||||
if (NOT OPENCL_FOUND) |
||||
set(ENV_AMDSTREAMSDKROOT $ENV{AMDAPPSDKROOT}) |
||||
set(ENV_AMDAPPSDKROOT $ENV{AMDAPPSDKROOT}) |
||||
set(ENV_OPENCLROOT $ENV{OPENCLROOT}) |
||||
set(ENV_CUDA_PATH $ENV{CUDA_PATH}) |
||||
if(ENV_AMDSTREAMSDKROOT) |
||||
set(OPENCL_INCLUDE_SEARCH_PATH ${ENV_AMDAPPSDKROOT}/include) |
||||
if(CMAKE_SIZEOF_VOID_P EQUAL 4) |
||||
set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} ${ENV_AMDAPPSDKROOT}/lib/x86) |
||||
else() |
||||
set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} ${ENV_AMDAPPSDKROOT}/lib/x86_64) |
||||
endif() |
||||
elseif(ENV_AMDSTREAMSDKROOT) |
||||
set(OPENCL_INCLUDE_SEARCH_PATH ${ENV_AMDSTREAMSDKROOT}/include) |
||||
if(CMAKE_SIZEOF_VOID_P EQUAL 4) |
||||
set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} ${ENV_AMDSTREAMSDKROOT}/lib/x86) |
||||
else() |
||||
set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} ${ENV_AMDSTREAMSDKROOT}/lib/x86_64) |
||||
endif() |
||||
elseif(ENV_CUDA_PATH AND WIN32) |
||||
set(OPENCL_INCLUDE_SEARCH_PATH ${ENV_CUDA_PATH}/include) |
||||
if(CMAKE_SIZEOF_VOID_P EQUAL 4) |
||||
set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} ${ENV_CUDA_PATH}/lib/Win32) |
||||
else() |
||||
set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} ${ENV_CUDA_PATH}/lib/x64) |
||||
endif() |
||||
elseif(ENV_OPENCLROOT AND UNIX) |
||||
set(OPENCL_INCLUDE_SEARCH_PATH ${ENV_OPENCLROOT}/inc) |
||||
if(CMAKE_SIZEOF_VOID_P EQUAL 4) |
||||
set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} /usr/lib) |
||||
else() |
||||
set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} /usr/lib64) |
||||
endif() |
||||
endif() |
||||
# Try AMD/ATI Stream SDK |
||||
if (NOT OPENCL_FOUND) |
||||
set(ENV_AMDSTREAMSDKROOT $ENV{AMDAPPSDKROOT}) |
||||
set(ENV_OPENCLROOT $ENV{OPENCLROOT}) |
||||
set(ENV_CUDA_PATH $ENV{CUDA_PATH}) |
||||
if(ENV_AMDSTREAMSDKROOT) |
||||
set(OPENCL_INCLUDE_SEARCH_PATH ${ENV_AMDSTREAMSDKROOT}/include) |
||||
if(CMAKE_SIZEOF_VOID_P EQUAL 4) |
||||
set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} ${ENV_AMDSTREAMSDKROOT}/lib/x86) |
||||
else() |
||||
set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} ${ENV_AMDSTREAMSDKROOT}/lib/x86_64) |
||||
endif() |
||||
elseif(ENV_CUDA_PATH AND WIN32) |
||||
set(OPENCL_INCLUDE_SEARCH_PATH ${ENV_CUDA_PATH}/include) |
||||
if(CMAKE_SIZEOF_VOID_P EQUAL 4) |
||||
set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} ${ENV_CUDA_PATH}/lib/Win32) |
||||
else() |
||||
set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} ${ENV_CUDA_PATH}/lib/x64) |
||||
endif() |
||||
elseif(ENV_OPENCLROOT AND UNIX) |
||||
set(OPENCL_INCLUDE_SEARCH_PATH ${ENV_OPENCLROOT}/inc) |
||||
if(CMAKE_SIZEOF_VOID_P EQUAL 4) |
||||
set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} /usr/lib) |
||||
else() |
||||
set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} /usr/lib64) |
||||
endif() |
||||
endif() |
||||
|
||||
if(OPENCL_INCLUDE_SEARCH_PATH) |
||||
find_path(OPENCL_INCLUDE_DIR |
||||
NAMES CL/cl.h OpenCL/cl.h |
||||
PATHS ${OPENCL_INCLUDE_SEARCH_PATH} |
||||
NO_DEFAULT_PATH) |
||||
else() |
||||
find_path(OPENCL_INCLUDE_DIR |
||||
NAMES CL/cl.h OpenCL/cl.h) |
||||
endif() |
||||
if(OPENCL_INCLUDE_SEARCH_PATH) |
||||
find_path(OPENCL_INCLUDE_DIR |
||||
NAMES CL/cl.h OpenCL/cl.h |
||||
PATHS ${OPENCL_INCLUDE_SEARCH_PATH} |
||||
NO_DEFAULT_PATH) |
||||
else() |
||||
find_path(OPENCL_INCLUDE_DIR |
||||
NAMES CL/cl.h OpenCL/cl.h) |
||||
endif() |
||||
|
||||
if(OPENCL_LIB_SEARCH_PATH) |
||||
find_library(OPENCL_LIBRARY NAMES OpenCL PATHS ${OPENCL_LIB_SEARCH_PATH} NO_DEFAULT_PATH) |
||||
else() |
||||
find_library(OPENCL_LIBRARY NAMES OpenCL) |
||||
endif() |
||||
if(OPENCL_LIB_SEARCH_PATH) |
||||
find_library(OPENCL_LIBRARY NAMES OpenCL PATHS ${OPENCL_LIB_SEARCH_PATH} NO_DEFAULT_PATH) |
||||
else() |
||||
find_library(OPENCL_LIBRARY NAMES OpenCL) |
||||
endif() |
||||
|
||||
include(FindPackageHandleStandardArgs) |
||||
find_package_handle_standard_args( |
||||
OPENCL |
||||
DEFAULT_MSG |
||||
OPENCL_LIBRARY OPENCL_INCLUDE_DIR |
||||
) |
||||
include(FindPackageHandleStandardArgs) |
||||
find_package_handle_standard_args( |
||||
OPENCL |
||||
DEFAULT_MSG |
||||
OPENCL_LIBRARY OPENCL_INCLUDE_DIR |
||||
) |
||||
|
||||
if(OPENCL_FOUND) |
||||
set(OPENCL_LIBRARIES ${OPENCL_LIBRARY}) |
||||
set(HAVE_OPENCL 1) |
||||
else() |
||||
set(OPENCL_LIBRARIES) |
||||
endif() |
||||
if(OPENCL_FOUND) |
||||
set(OPENCL_LIBRARIES ${OPENCL_LIBRARY}) |
||||
set(HAVE_OPENCL 1) |
||||
else() |
||||
set(HAVE_OPENCL 1) |
||||
set(OPENCL_LIBRARIES) |
||||
endif() |
||||
else() |
||||
set(HAVE_OPENCL 1) |
||||
endif() |
||||
endif() |
||||
|
||||
@ -1,8 +1,8 @@ |
||||
<?xml version="1.0" encoding="utf-8"?> |
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" |
||||
package="org.opencv" |
||||
android:versionCode="@OPENCV_VERSION_MAJOR@@OPENCV_VERSION_MINOR@@OPENCV_VERSION_PATCH@" |
||||
android:versionName="@OPENCV_VERSION_MAJOR@.@OPENCV_VERSION_MINOR@.@OPENCV_VERSION_PATCH@"> |
||||
android:versionCode="@OPENCV_VERSION_MAJOR@@OPENCV_VERSION_MINOR@@OPENCV_VERSION_PATCH@@OPENCV_VERSION_TWEAK@" |
||||
android:versionName="@OPENCV_VERSION@"> |
||||
|
||||
<uses-sdk android:minSdkVersion="8" /> |
||||
</manifest> |
||||
|
||||
@ -0,0 +1,33 @@ |
||||
#ifndef __JAVA_COMMON_H__ |
||||
#define __JAVA_COMMON_H__ |
||||
|
||||
#if !defined(__ppc__) |
||||
// to suppress warning from jni.h on OS X
|
||||
# define TARGET_RT_MAC_CFM 0 |
||||
#endif |
||||
#include <jni.h> |
||||
|
||||
#ifdef __ANDROID__ |
||||
# include <android/log.h> |
||||
# define LOGE(...) ((void)__android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__)) |
||||
# ifdef DEBUG |
||||
# define LOGD(...) ((void)__android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)) |
||||
# else |
||||
# define LOGD(...) |
||||
# endif |
||||
#else |
||||
# define LOGE(...) |
||||
# define LOGD(...) |
||||
#endif |
||||
|
||||
#include "converters.h" |
||||
|
||||
#include "core_manual.hpp" |
||||
#include "features2d_manual.hpp" |
||||
|
||||
|
||||
#ifdef _MSC_VER |
||||
# pragma warning(disable:4800 4244) |
||||
#endif |
||||
|
||||
#endif //__JAVA_COMMON_H__
|
||||
@ -0,0 +1,15 @@ |
||||
#define LOG_TAG "org.opencv.core.Core" |
||||
#include "common.h" |
||||
|
||||
static int quietCallback( int, const char*, const char*, const char*, int, void* ) |
||||
{ |
||||
return 0; |
||||
} |
||||
|
||||
void cv::setErrorVerbosity(bool verbose) |
||||
{ |
||||
if(verbose) |
||||
cv::redirectError(0); |
||||
else |
||||
cv::redirectError((cv::ErrorCallback)quietCallback); |
||||
} |
||||
@ -1,80 +0,0 @@ |
||||
ocv_check_dependencies(opencv_java ${OPENCV_MODULE_opencv_java_OPT_DEPS} ${OPENCV_MODULE_opencv_java_REQ_DEPS}) |
||||
|
||||
if(NOT OCV_DEPENDENCIES_FOUND OR NOT ANT_EXECUTABLE) |
||||
return() |
||||
endif() |
||||
|
||||
# TODO: This has the same name as the Android test project. That project should |
||||
# probably be renamed. |
||||
project(opencv_test_java) |
||||
|
||||
set(opencv_test_java_bin_dir "${CMAKE_CURRENT_BINARY_DIR}/.build") |
||||
|
||||
set(android_source_dir "${CMAKE_CURRENT_SOURCE_DIR}/../android_test") |
||||
|
||||
set(java_source_dir ${CMAKE_CURRENT_SOURCE_DIR}) |
||||
|
||||
# get project sources |
||||
file(GLOB_RECURSE opencv_test_java_files RELATIVE "${android_source_dir}" "${android_source_dir}/res/*" "${android_source_dir}/src/*") |
||||
ocv_list_filterout(opencv_test_java_files ".svn") |
||||
ocv_list_filterout(opencv_test_java_files ".*#.*") |
||||
# These are the files that need to be updated for pure Java. |
||||
ocv_list_filterout(opencv_test_java_files ".*OpenCVTestCase.*") |
||||
ocv_list_filterout(opencv_test_java_files ".*OpenCVTestRunner.*") |
||||
# These files aren't for desktop Java. |
||||
ocv_list_filterout(opencv_test_java_files ".*android.*") |
||||
|
||||
# These are files updated for pure Java. |
||||
file(GLOB_RECURSE modified_files RELATIVE "${java_source_dir}" "${java_source_dir}/src/*") |
||||
ocv_list_filterout(modified_files ".svn") |
||||
ocv_list_filterout(modified_files ".*#.*") |
||||
|
||||
# These are extra jars needed to run the tests. |
||||
file(GLOB_RECURSE lib_files RELATIVE "${java_source_dir}" "${java_source_dir}/lib/*") |
||||
ocv_list_filterout(lib_files ".svn") |
||||
ocv_list_filterout(lib_files ".*#.*") |
||||
|
||||
# copy sources out from the build tree |
||||
set(opencv_test_java_file_deps "") |
||||
foreach(f ${opencv_test_java_files}) |
||||
add_custom_command( |
||||
OUTPUT "${opencv_test_java_bin_dir}/${f}" |
||||
COMMAND ${CMAKE_COMMAND} -E copy "${android_source_dir}/${f}" "${opencv_test_java_bin_dir}/${f}" |
||||
MAIN_DEPENDENCY "${android_source_dir}/${f}" |
||||
COMMENT "Copying ${f}") |
||||
list(APPEND opencv_test_java_file_deps "${android_source_dir}/${f}" "${opencv_test_java_bin_dir}/${f}") |
||||
endforeach() |
||||
|
||||
# Overwrite select Android sources with Java-specific sources. |
||||
# Also, copy over the libs we'll need for testing. |
||||
foreach(f ${modified_files} ${lib_files}) |
||||
add_custom_command( |
||||
OUTPUT "${opencv_test_java_bin_dir}/${f}" |
||||
COMMAND ${CMAKE_COMMAND} -E copy "${java_source_dir}/${f}" "${opencv_test_java_bin_dir}/${f}" |
||||
MAIN_DEPENDENCY "${java_source_dir}/${f}" |
||||
COMMENT "Copying ${f}") |
||||
list(APPEND opencv_test_java_file_deps "${java_source_dir}/${f}") |
||||
endforeach() |
||||
|
||||
# Copy the OpenCV jar after it has been generated. |
||||
add_custom_command( |
||||
OUTPUT "${opencv_test_java_bin_dir}/bin/${JAR_NAME}" |
||||
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_BINARY_DIR}/bin/${JAR_NAME}" "${opencv_test_java_bin_dir}/bin/${JAR_NAME}" |
||||
COMMENT "Copying the OpenCV jar") |
||||
add_custom_target(copy_opencv_jar ALL SOURCES "${opencv_test_java_bin_dir}/bin/${JAR_NAME}") |
||||
# ${the_module} is the target for the Java jar. |
||||
add_dependencies(copy_opencv_jar ${the_module}) |
||||
|
||||
# Copy the ant build file. |
||||
file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/build.xml" DESTINATION "${opencv_test_java_bin_dir}") |
||||
|
||||
# Create a script for running the Java tests and place it in build/bin. |
||||
if(WIN32) |
||||
file(WRITE "${CMAKE_BINARY_DIR}/bin/opencv_test_java.cmd" "cd ${opencv_test_java_bin_dir}\nset PATH=${EXECUTABLE_OUTPUT_PATH}/Release;%PATH%\nant -DjavaLibraryPath=${EXECUTABLE_OUTPUT_PATH}/Release buildAndTest") |
||||
file(WRITE "${CMAKE_BINARY_DIR}/bin/opencv_test_java_D.cmd" "cd ${opencv_test_java_bin_dir}\nset PATH=${EXECUTABLE_OUTPUT_PATH}/Debug;%PATH%\nant -DjavaLibraryPath=${EXECUTABLE_OUTPUT_PATH}/Debug buildAndTest") |
||||
else() |
||||
file(WRITE "${CMAKE_BINARY_DIR}/bin/opencv_test_java.sh" "cd ${opencv_test_java_bin_dir};\nant -DjavaLibraryPath=${LIBRARY_OUTPUT_PATH} buildAndTest;\ncd -") |
||||
endif() |
||||
|
||||
add_custom_target(${PROJECT_NAME} ALL SOURCES ${opencv_test_java_file_deps}) |
||||
add_dependencies(opencv_tests ${PROJECT_NAME}) |
||||
@ -0,0 +1,77 @@ |
||||
ocv_check_dependencies(opencv_java ${OPENCV_MODULE_opencv_java_OPT_DEPS} ${OPENCV_MODULE_opencv_java_REQ_DEPS}) |
||||
|
||||
if(NOT OCV_DEPENDENCIES_FOUND) |
||||
return() |
||||
endif() |
||||
|
||||
project(opencv_test_java) |
||||
|
||||
set(opencv_test_java_bin_dir "${CMAKE_CURRENT_BINARY_DIR}/.build") |
||||
set(android_source_dir "${CMAKE_CURRENT_SOURCE_DIR}/../android_test") |
||||
set(java_source_dir ${CMAKE_CURRENT_SOURCE_DIR}) |
||||
|
||||
# get project sources |
||||
file(GLOB_RECURSE opencv_test_java_files RELATIVE "${android_source_dir}" "${android_source_dir}/res/*" "${android_source_dir}/src/*.java") |
||||
# These are the files that need to be updated for pure Java. |
||||
ocv_list_filterout(opencv_test_java_files "OpenCVTest(Case|Runner).java") |
||||
# These files aren't for desktop Java. |
||||
ocv_list_filterout(opencv_test_java_files "/android/") |
||||
|
||||
# These are files updated for pure Java. |
||||
file(GLOB_RECURSE modified_files RELATIVE "${java_source_dir}" "${java_source_dir}/src/*") |
||||
|
||||
# These are extra jars needed to run the tests. |
||||
file(GLOB_RECURSE lib_files RELATIVE "${java_source_dir}" "${java_source_dir}/lib/*.jar") |
||||
|
||||
# copy sources out from the build tree |
||||
set(opencv_test_java_file_deps "") |
||||
foreach(f ${opencv_test_java_files}) |
||||
add_custom_command(OUTPUT "${opencv_test_java_bin_dir}/${f}" |
||||
COMMAND ${CMAKE_COMMAND} -E copy "${android_source_dir}/${f}" "${opencv_test_java_bin_dir}/${f}" |
||||
DEPENDS "${android_source_dir}/${f}" |
||||
COMMENT "Copying ${f}" |
||||
) |
||||
list(APPEND opencv_test_java_file_deps "${android_source_dir}/${f}" "${opencv_test_java_bin_dir}/${f}") |
||||
endforeach() |
||||
|
||||
# Overwrite select Android sources with Java-specific sources. |
||||
# Also, copy over the libs we'll need for testing. |
||||
foreach(f ${modified_files} ${lib_files}) |
||||
add_custom_command(OUTPUT "${opencv_test_java_bin_dir}/${f}" |
||||
COMMAND ${CMAKE_COMMAND} -E copy "${java_source_dir}/${f}" "${opencv_test_java_bin_dir}/${f}" |
||||
DEPENDS "${java_source_dir}/${f}" |
||||
COMMENT "Copying ${f}" |
||||
) |
||||
list(APPEND opencv_test_java_file_deps "${java_source_dir}/${f}" "${opencv_test_java_bin_dir}/${f}") |
||||
endforeach() |
||||
|
||||
# Copy the OpenCV jar after it has been generated. |
||||
add_custom_command(OUTPUT "${opencv_test_java_bin_dir}/bin/${JAR_NAME}" |
||||
COMMAND ${CMAKE_COMMAND} -E copy "${JAR_FILE}" "${opencv_test_java_bin_dir}/bin/${JAR_NAME}" |
||||
DEPENDS "${JAR_FILE}" |
||||
COMMENT "Copying the OpenCV jar" |
||||
) |
||||
|
||||
add_custom_command(OUTPUT "${opencv_test_java_bin_dir}/build.xml" |
||||
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/build.xml" "${opencv_test_java_bin_dir}/build.xml" |
||||
DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/build.xml" |
||||
COMMENT "Copying build.xml" |
||||
) |
||||
|
||||
# Create a script for running the Java tests and place it in build/bin. |
||||
#if(WIN32) |
||||
#file(WRITE "${CMAKE_BINARY_DIR}/bin/opencv_test_java.cmd" "cd ${opencv_test_java_bin_dir}\nset PATH=${EXECUTABLE_OUTPUT_PATH}/Release;%PATH%\nant -DjavaLibraryPath=${EXECUTABLE_OUTPUT_PATH}/Release buildAndTest") |
||||
#file(WRITE "${CMAKE_BINARY_DIR}/bin/opencv_test_java_D.cmd" "cd ${opencv_test_java_bin_dir}\nset PATH=${EXECUTABLE_OUTPUT_PATH}/Debug;%PATH%\nant -DjavaLibraryPath=${EXECUTABLE_OUTPUT_PATH}/Debug buildAndTest") |
||||
#else() |
||||
#file(WRITE "${CMAKE_BINARY_DIR}/bin/opencv_test_java.sh" "cd ${opencv_test_java_bin_dir};\nant -DjavaLibraryPath=${LIBRARY_OUTPUT_PATH} buildAndTest;\ncd -") |
||||
#endif() |
||||
|
||||
add_custom_command(OUTPUT "${opencv_test_java_bin_dir}/build/jar/opencv-test.jar" |
||||
COMMAND "${ANT_EXECUTABLE}" build |
||||
WORKING_DIRECTORY "${opencv_test_java_bin_dir}" |
||||
DEPENDS ${opencv_test_java_file_deps} "${opencv_test_java_bin_dir}/build.xml" "${CMAKE_CURRENT_SOURCE_DIR}/build.xml" "${JAR_FILE}" "${opencv_test_java_bin_dir}/bin/${JAR_NAME}" |
||||
COMMENT "Build Java tests" |
||||
) |
||||
|
||||
add_custom_target(${PROJECT_NAME} ALL SOURCES "${opencv_test_java_bin_dir}/build/jar/opencv-test.jar") |
||||
add_dependencies(${PROJECT_NAME} ${the_module}) |
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,764 @@ |
||||
/*M/////////////////////////////////////////////////////////////////////////////////////// |
||||
// |
||||
// IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING. |
||||
// |
||||
// By downloading, copying, installing or using the software you agree to this license. |
||||
// If you do not agree to this license, do not download, install, |
||||
// copy or use the software. |
||||
// |
||||
// |
||||
// License Agreement |
||||
// For Open Source Computer Vision Library |
||||
// |
||||
// Copyright (C) 2010-2012, Multicoreware, Inc., all rights reserved. |
||||
// Copyright (C) 2010-2012, Advanced Micro Devices, Inc., all rights reserved. |
||||
// Third party copyrights are property of their respective owners. |
||||
// |
||||
// @Authors |
||||
// Sen Liu, sen@multicorewareinc.com |
||||
// |
||||
// Redistribution and use in source and binary forms, with or without modification, |
||||
// are permitted provided that the following conditions are met: |
||||
// |
||||
// * Redistribution's of source code must retain the above copyright notice, |
||||
// this list of conditions and the following disclaimer. |
||||
// |
||||
// * Redistribution's in binary form must reproduce the above copyright notice, |
||||
// this list of conditions and the following disclaimer in the documentation |
||||
// and/or other oclMaterials provided with the distribution. |
||||
// |
||||
// * The name of the copyright holders may not be used to endorse or promote products |
||||
// derived from this software without specific prior written permission. |
||||
// |
||||
// This software is provided by the copyright holders and contributors as is and |
||||
// any express or implied warranties, including, but not limited to, the implied |
||||
// warranties of merchantability and fitness for a particular purpose are disclaimed. |
||||
// In no event shall the Intel Corporation or contributors be liable for any direct, |
||||
// indirect, incidental, special, exemplary, or consequential damages |
||||
// (including, but not limited to, procurement of substitute goods or services; |
||||
// loss of use, data, or profits; or business interruption) however caused |
||||
// and on any theory of liability, whether in contract, strict liability, |
||||
// or tort (including negligence or otherwise) arising in any way out of |
||||
// the use of this software, even if advised of the possibility of such damage. |
||||
// |
||||
//M*/ |
||||
|
||||
#define BUFFER 256 |
||||
void reduce3(float val1, float val2, float val3, __local float *smem1, __local float *smem2, __local float *smem3, int tid) |
||||
{ |
||||
smem1[tid] = val1; |
||||
smem2[tid] = val2; |
||||
smem3[tid] = val3; |
||||
barrier(CLK_LOCAL_MEM_FENCE); |
||||
|
||||
#if BUFFER > 128 |
||||
|
||||
if (tid < 128) |
||||
{ |
||||
smem1[tid] = val1 += smem1[tid + 128]; |
||||
smem2[tid] = val2 += smem2[tid + 128]; |
||||
smem3[tid] = val3 += smem3[tid + 128]; |
||||
} |
||||
|
||||
barrier(CLK_LOCAL_MEM_FENCE); |
||||
#endif |
||||
|
||||
#if BUFFER > 64 |
||||
|
||||
if (tid < 64) |
||||
{ |
||||
smem1[tid] = val1 += smem1[tid + 64]; |
||||
smem2[tid] = val2 += smem2[tid + 64]; |
||||
smem3[tid] = val3 += smem3[tid + 64]; |
||||
} |
||||
|
||||
barrier(CLK_LOCAL_MEM_FENCE); |
||||
#endif |
||||
|
||||
if (tid < 32) |
||||
{ |
||||
smem1[tid] = val1 += smem1[tid + 32]; |
||||
smem2[tid] = val2 += smem2[tid + 32]; |
||||
smem3[tid] = val3 += smem3[tid + 32]; |
||||
} |
||||
|
||||
barrier(CLK_LOCAL_MEM_FENCE); |
||||
|
||||
if (tid < 16) |
||||
{ |
||||
smem1[tid] = val1 += smem1[tid + 16]; |
||||
smem2[tid] = val2 += smem2[tid + 16]; |
||||
smem3[tid] = val3 += smem3[tid + 16]; |
||||
} |
||||
|
||||
barrier(CLK_LOCAL_MEM_FENCE); |
||||
|
||||
if (tid < 8) |
||||
{ |
||||
volatile __local float *vmem1 = smem1; |
||||
volatile __local float *vmem2 = smem2; |
||||
volatile __local float *vmem3 = smem3; |
||||
|
||||
vmem1[tid] = val1 += vmem1[tid + 8]; |
||||
vmem2[tid] = val2 += vmem2[tid + 8]; |
||||
vmem3[tid] = val3 += vmem3[tid + 8]; |
||||
|
||||
vmem1[tid] = val1 += vmem1[tid + 4]; |
||||
vmem2[tid] = val2 += vmem2[tid + 4]; |
||||
vmem3[tid] = val3 += vmem3[tid + 4]; |
||||
|
||||
vmem1[tid] = val1 += vmem1[tid + 2]; |
||||
vmem2[tid] = val2 += vmem2[tid + 2]; |
||||
vmem3[tid] = val3 += vmem3[tid + 2]; |
||||
|
||||
vmem1[tid] = val1 += vmem1[tid + 1]; |
||||
vmem2[tid] = val2 += vmem2[tid + 1]; |
||||
vmem3[tid] = val3 += vmem3[tid + 1]; |
||||
} |
||||
} |
||||
|
||||
void reduce2(float val1, float val2, __local float *smem1, __local float *smem2, int tid) |
||||
{ |
||||
smem1[tid] = val1; |
||||
smem2[tid] = val2; |
||||
barrier(CLK_LOCAL_MEM_FENCE); |
||||
|
||||
#if BUFFER > 128 |
||||
|
||||
if (tid < 128) |
||||
{ |
||||
smem1[tid] = val1 += smem1[tid + 128]; |
||||
smem2[tid] = val2 += smem2[tid + 128]; |
||||
} |
||||
|
||||
barrier(CLK_LOCAL_MEM_FENCE); |
||||
#endif |
||||
|
||||
#if BUFFER > 64 |
||||
|
||||
if (tid < 64) |
||||
{ |
||||
smem1[tid] = val1 += smem1[tid + 64]; |
||||
smem2[tid] = val2 += smem2[tid + 64]; |
||||
} |
||||
|
||||
barrier(CLK_LOCAL_MEM_FENCE); |
||||
#endif |
||||
|
||||
if (tid < 32) |
||||
{ |
||||
smem1[tid] = val1 += smem1[tid + 32]; |
||||
smem2[tid] = val2 += smem2[tid + 32]; |
||||
} |
||||
|
||||
barrier(CLK_LOCAL_MEM_FENCE); |
||||
|
||||
if (tid < 16) |
||||
{ |
||||
smem1[tid] = val1 += smem1[tid + 16]; |
||||
smem2[tid] = val2 += smem2[tid + 16]; |
||||
} |
||||
|
||||
barrier(CLK_LOCAL_MEM_FENCE); |
||||
|
||||
if (tid < 8) |
||||
{ |
||||
volatile __local float *vmem1 = smem1; |
||||
volatile __local float *vmem2 = smem2; |
||||
|
||||
vmem1[tid] = val1 += vmem1[tid + 8]; |
||||
vmem2[tid] = val2 += vmem2[tid + 8]; |
||||
|
||||
vmem1[tid] = val1 += vmem1[tid + 4]; |
||||
vmem2[tid] = val2 += vmem2[tid + 4]; |
||||
|
||||
vmem1[tid] = val1 += vmem1[tid + 2]; |
||||
vmem2[tid] = val2 += vmem2[tid + 2]; |
||||
|
||||
vmem1[tid] = val1 += vmem1[tid + 1]; |
||||
vmem2[tid] = val2 += vmem2[tid + 1]; |
||||
} |
||||
} |
||||
|
||||
void reduce1(float val1, __local float *smem1, int tid) |
||||
{ |
||||
smem1[tid] = val1; |
||||
barrier(CLK_LOCAL_MEM_FENCE); |
||||
|
||||
#if BUFFER > 128 |
||||
|
||||
if (tid < 128) |
||||
{ |
||||
smem1[tid] = val1 += smem1[tid + 128]; |
||||
} |
||||
|
||||
barrier(CLK_LOCAL_MEM_FENCE); |
||||
#endif |
||||
|
||||
#if BUFFER > 64 |
||||
|
||||
if (tid < 64) |
||||
{ |
||||
smem1[tid] = val1 += smem1[tid + 64]; |
||||
} |
||||
|
||||
barrier(CLK_LOCAL_MEM_FENCE); |
||||
#endif |
||||
|
||||
if (tid < 32) |
||||
{ |
||||
smem1[tid] = val1 += smem1[tid + 32]; |
||||
} |
||||
|
||||
barrier(CLK_LOCAL_MEM_FENCE); |
||||
|
||||
if (tid < 16) |
||||
{ |
||||
volatile __local float *vmem1 = smem1; |
||||
|
||||
vmem1[tid] = val1 += vmem1[tid + 16]; |
||||
} |
||||
|
||||
barrier(CLK_LOCAL_MEM_FENCE); |
||||
|
||||
if (tid < 8) |
||||
{ |
||||
volatile __local float *vmem1 = smem1; |
||||
|
||||
vmem1[tid] = val1 += vmem1[tid + 8]; |
||||
vmem1[tid] = val1 += vmem1[tid + 4]; |
||||
vmem1[tid] = val1 += vmem1[tid + 2]; |
||||
vmem1[tid] = val1 += vmem1[tid + 1]; |
||||
} |
||||
} |
||||
|
||||
#define SCALE (1.0f / (1 << 20)) |
||||
#define THRESHOLD 0.01f |
||||
#define DIMENSION 21 |
||||
|
||||
float readImage2Df_C1(__global const float *image, const float x, const float y, const int rows, const int cols, const int elemCntPerRow) |
||||
{ |
||||
float2 coor = (float2)(x, y); |
||||
|
||||
int i0 = clamp((int)floor(coor.x), 0, cols - 1); |
||||
int j0 = clamp((int)floor(coor.y), 0, rows - 1); |
||||
int i1 = clamp((int)floor(coor.x) + 1, 0, cols - 1); |
||||
int j1 = clamp((int)floor(coor.y) + 1, 0, rows - 1); |
||||
float a = coor.x - floor(coor.x); |
||||
float b = coor.y - floor(coor.y); |
||||
|
||||
return (1 - a) * (1 - b) * image[mad24(j0, elemCntPerRow, i0)] |
||||
+ a * (1 - b) * image[mad24(j0, elemCntPerRow, i1)] |
||||
+ (1 - a) * b * image[mad24(j1, elemCntPerRow, i0)] |
||||
+ a * b * image[mad24(j1, elemCntPerRow, i1)]; |
||||
} |
||||
|
||||
__kernel void lkSparse_C1_D5(__global const float *I, __global const float *J, |
||||
__global const float2 *prevPts, int prevPtsStep, __global float2 *nextPts, int nextPtsStep, __global uchar *status, __global float *err, |
||||
const int level, const int rows, const int cols, const int elemCntPerRow, |
||||
int PATCH_X, int PATCH_Y, int cn, int c_winSize_x, int c_winSize_y, int c_iters, char calcErr) |
||||
{ |
||||
__local float smem1[BUFFER]; |
||||
__local float smem2[BUFFER]; |
||||
__local float smem3[BUFFER]; |
||||
|
||||
float2 c_halfWin = (float2)((c_winSize_x - 1) >> 1, (c_winSize_y - 1) >> 1); |
||||
|
||||
const int tid = mad24(get_local_id(1), get_local_size(0), get_local_id(0)); |
||||
|
||||
float2 prevPt = prevPts[get_group_id(0)] * (1.0f / (1 << level)); |
||||
|
||||
if (prevPt.x < 0 || prevPt.x >= cols || prevPt.y < 0 || prevPt.y >= rows) |
||||
{ |
||||
if (tid == 0 && level == 0) |
||||
{ |
||||
status[get_group_id(0)] = 0; |
||||
} |
||||
|
||||
return; |
||||
} |
||||
|
||||
prevPt -= c_halfWin; |
||||
|
||||
// extract the patch from the first image, compute covariation matrix of derivatives |
||||
|
||||
float A11 = 0; |
||||
float A12 = 0; |
||||
float A22 = 0; |
||||
|
||||
float I_patch[1][3]; |
||||
float dIdx_patch[1][3]; |
||||
float dIdy_patch[1][3]; |
||||
|
||||
for (int yBase = get_local_id(1), i = 0; yBase < c_winSize_y; yBase += get_local_size(1), ++i) |
||||
{ |
||||
for (int xBase = get_local_id(0), j = 0; xBase < c_winSize_x; xBase += get_local_size(0), ++j) |
||||
{ |
||||
float x = (prevPt.x + xBase); |
||||
float y = (prevPt.y + yBase); |
||||
|
||||
I_patch[i][j] = readImage2Df_C1(I, x, y, rows, cols, elemCntPerRow); |
||||
float dIdx = 3.0f * readImage2Df_C1(I, x + 1, y - 1, rows, cols, elemCntPerRow) + 10.0f * readImage2Df_C1(I, x + 1, y, rows, cols, elemCntPerRow) + 3.0f * readImage2Df_C1(I, x + 1, y + 1, rows, cols, elemCntPerRow) - |
||||
(3.0f * readImage2Df_C1(I, x - 1, y - 1, rows, cols, elemCntPerRow) + 10.0f * readImage2Df_C1(I, x - 1, y, rows, cols, elemCntPerRow) + 3.0f * readImage2Df_C1(I, x - 1, y + 1, rows, cols, elemCntPerRow)); |
||||
|
||||
float dIdy = 3.0f * readImage2Df_C1(I, x - 1, y + 1, rows, cols, elemCntPerRow) + 10.0f * readImage2Df_C1(I, x, y + 1, rows, cols, elemCntPerRow) + 3.0f * readImage2Df_C1(I, x + 1, y + 1, rows, cols, elemCntPerRow) - |
||||
(3.0f * readImage2Df_C1(I, x - 1, y - 1, rows, cols, elemCntPerRow) + 10.0f * readImage2Df_C1(I, x, y - 1, rows, cols, elemCntPerRow) + 3.0f * readImage2Df_C1(I, x + 1, y - 1, rows, cols, elemCntPerRow)); |
||||
|
||||
dIdx_patch[i][j] = dIdx; |
||||
dIdy_patch[i][j] = dIdy; |
||||
|
||||
A11 += dIdx * dIdx; |
||||
A12 += dIdx * dIdy; |
||||
A22 += dIdy * dIdy; |
||||
} |
||||
} |
||||
|
||||
reduce3(A11, A12, A22, smem1, smem2, smem3, tid); |
||||
barrier(CLK_LOCAL_MEM_FENCE); |
||||
|
||||
A11 = smem1[0]; |
||||
A12 = smem2[0]; |
||||
A22 = smem3[0]; |
||||
|
||||
float D = A11 * A22 - A12 * A12; |
||||
|
||||
if (D < 1.192092896e-07f) |
||||
{ |
||||
if (tid == 0 && level == 0) |
||||
{ |
||||
status[get_group_id(0)] = 0; |
||||
} |
||||
|
||||
return; |
||||
} |
||||
|
||||
D = 1.f / D; |
||||
|
||||
A11 *= D; |
||||
A12 *= D; |
||||
A22 *= D; |
||||
|
||||
float2 nextPt = nextPts[get_group_id(0)]; |
||||
nextPt = nextPt * 2.0f - c_halfWin; |
||||
|
||||
for (int k = 0; k < c_iters; ++k) |
||||
{ |
||||
if (nextPt.x < -c_halfWin.x || nextPt.x >= cols || nextPt.y < -c_halfWin.y || nextPt.y >= rows) |
||||
{ |
||||
if (tid == 0 && level == 0) |
||||
{ |
||||
status[get_group_id(0)] = 0; |
||||
} |
||||
|
||||
return; |
||||
} |
||||
|
||||
float b1 = 0; |
||||
float b2 = 0; |
||||
|
||||
for (int y = get_local_id(1), i = 0; y < c_winSize_y; y += get_local_size(1), ++i) |
||||
{ |
||||
for (int x = get_local_id(0), j = 0; x < c_winSize_x; x += get_local_size(0), ++j) |
||||
{ |
||||
float diff = (readImage2Df_C1(J, nextPt.x + x, nextPt.y + y, rows, cols, elemCntPerRow) - I_patch[i][j]) * 32.0f; |
||||
|
||||
b1 += diff * dIdx_patch[i][j]; |
||||
b2 += diff * dIdy_patch[i][j]; |
||||
} |
||||
} |
||||
|
||||
reduce2(b1, b2, smem1, smem2, tid); |
||||
barrier(CLK_LOCAL_MEM_FENCE); |
||||
|
||||
b1 = smem1[0]; |
||||
b2 = smem2[0]; |
||||
|
||||
float2 delta; |
||||
delta.x = A12 * b2 - A22 * b1; |
||||
delta.y = A12 * b1 - A11 * b2; |
||||
|
||||
nextPt += delta; |
||||
|
||||
//if (fabs(delta.x) < THRESHOLD && fabs(delta.y) < THRESHOLD) |
||||
// break; |
||||
} |
||||
|
||||
float errval = 0.0f; |
||||
|
||||
if (calcErr) |
||||
{ |
||||
for (int y = get_local_id(1), i = 0; y < c_winSize_y; y += get_local_size(1), ++i) |
||||
{ |
||||
for (int x = get_local_id(0), j = 0; x < c_winSize_x; x += get_local_size(0), ++j) |
||||
{ |
||||
float diff = readImage2Df_C1(J, nextPt.x + x, nextPt.y + y, rows, cols, elemCntPerRow) - I_patch[i][j]; |
||||
|
||||
errval += fabs(diff); |
||||
} |
||||
} |
||||
|
||||
reduce1(errval, smem1, tid); |
||||
} |
||||
|
||||
if (tid == 0) |
||||
{ |
||||
nextPt += c_halfWin; |
||||
|
||||
nextPts[get_group_id(0)] = nextPt; |
||||
|
||||
if (calcErr) |
||||
{ |
||||
err[get_group_id(0)] = smem1[0] / (c_winSize_x * c_winSize_y); |
||||
} |
||||
} |
||||
} |
||||
|
||||
float4 readImage2Df_C4(__global const float4 *image, const float x, const float y, const int rows, const int cols, const int elemCntPerRow) |
||||
{ |
||||
float2 coor = (float2)(x, y); |
||||
|
||||
int i0 = clamp((int)floor(coor.x), 0, cols - 1); |
||||
int j0 = clamp((int)floor(coor.y), 0, rows - 1); |
||||
int i1 = clamp((int)floor(coor.x) + 1, 0, cols - 1); |
||||
int j1 = clamp((int)floor(coor.y) + 1, 0, rows - 1); |
||||
float a = coor.x - floor(coor.x); |
||||
float b = coor.y - floor(coor.y); |
||||
|
||||
return (1 - a) * (1 - b) * image[mad24(j0, elemCntPerRow, i0)] |
||||
+ a * (1 - b) * image[mad24(j0, elemCntPerRow, i1)] |
||||
+ (1 - a) * b * image[mad24(j1, elemCntPerRow, i0)] |
||||
+ a * b * image[mad24(j1, elemCntPerRow, i1)]; |
||||
} |
||||
|
||||
__kernel void lkSparse_C4_D5(__global const float *I, __global const float *J, |
||||
__global const float2 *prevPts, int prevPtsStep, __global float2 *nextPts, int nextPtsStep, __global uchar *status, __global float *err, |
||||
const int level, const int rows, const int cols, const int elemCntPerRow, |
||||
int PATCH_X, int PATCH_Y, int cn, int c_winSize_x, int c_winSize_y, int c_iters, char calcErr) |
||||
{ |
||||
__local float smem1[BUFFER]; |
||||
__local float smem2[BUFFER]; |
||||
__local float smem3[BUFFER]; |
||||
|
||||
float2 c_halfWin = (float2)((c_winSize_x - 1) >> 1, (c_winSize_y - 1) >> 1); |
||||
|
||||
const int tid = mad24(get_local_id(1), get_local_size(0), get_local_id(0)); |
||||
|
||||
float2 prevPt = prevPts[get_group_id(0)] * (1.0f / (1 << level)); |
||||
|
||||
if (prevPt.x < 0 || prevPt.x >= cols || prevPt.y < 0 || prevPt.y >= rows) |
||||
{ |
||||
if (tid == 0 && level == 0) |
||||
{ |
||||
status[get_group_id(0)] = 0; |
||||
} |
||||
|
||||
return; |
||||
} |
||||
|
||||
prevPt -= c_halfWin; |
||||
|
||||
// extract the patch from the first image, compute covariation matrix of derivatives |
||||
|
||||
float A11 = 0; |
||||
float A12 = 0; |
||||
float A22 = 0; |
||||
|
||||
float4 I_patch[1][3]; |
||||
float4 dIdx_patch[1][3]; |
||||
float4 dIdy_patch[1][3]; |
||||
|
||||
__global float4 *ptrI = (__global float4 *)I; |
||||
|
||||
for (int yBase = get_local_id(1), i = 0; yBase < c_winSize_y; yBase += get_local_size(1), ++i) |
||||
{ |
||||
for (int xBase = get_local_id(0), j = 0; xBase < c_winSize_x; xBase += get_local_size(0), ++j) |
||||
{ |
||||
float x = (prevPt.x + xBase); |
||||
float y = (prevPt.y + yBase); |
||||
|
||||
I_patch[i][j] = readImage2Df_C4(ptrI, x, y, rows, cols, elemCntPerRow); |
||||
|
||||
float4 dIdx = 3.0f * readImage2Df_C4(ptrI, x + 1, y - 1, rows, cols, elemCntPerRow) + 10.0f * readImage2Df_C4(ptrI, x + 1, y, rows, cols, elemCntPerRow) + 3.0f * readImage2Df_C4(ptrI, x + 1, y + 1, rows, cols, elemCntPerRow) - |
||||
(3.0f * readImage2Df_C4(ptrI, x - 1, y - 1, rows, cols, elemCntPerRow) + 10.0f * readImage2Df_C4(ptrI, x - 1, y, rows, cols, elemCntPerRow) + 3.0f * readImage2Df_C4(ptrI, x - 1, y + 1, rows, cols, elemCntPerRow)); |
||||
|
||||
float4 dIdy = 3.0f * readImage2Df_C4(ptrI, x - 1, y + 1, rows, cols, elemCntPerRow) + 10.0f * readImage2Df_C4(ptrI, x, y + 1, rows, cols, elemCntPerRow) + 3.0f * readImage2Df_C4(ptrI, x + 1, y + 1, rows, cols, elemCntPerRow) - |
||||
(3.0f * readImage2Df_C4(ptrI, x - 1, y - 1, rows, cols, elemCntPerRow) + 10.0f * readImage2Df_C4(ptrI, x, y - 1, rows, cols, elemCntPerRow) + 3.0f * readImage2Df_C4(ptrI, x + 1, y - 1, rows, cols, elemCntPerRow)); |
||||
|
||||
dIdx_patch[i][j] = dIdx; |
||||
dIdy_patch[i][j] = dIdy; |
||||
|
||||
A11 += (dIdx * dIdx).x + (dIdx * dIdx).y + (dIdx * dIdx).z; |
||||
A12 += (dIdx * dIdy).x + (dIdx * dIdy).y + (dIdx * dIdy).z; |
||||
A22 += (dIdy * dIdy).x + (dIdy * dIdy).y + (dIdy * dIdy).z; |
||||
} |
||||
} |
||||
|
||||
reduce3(A11, A12, A22, smem1, smem2, smem3, tid); |
||||
barrier(CLK_LOCAL_MEM_FENCE); |
||||
|
||||
A11 = smem1[0]; |
||||
A12 = smem2[0]; |
||||
A22 = smem3[0]; |
||||
|
||||
float D = A11 * A22 - A12 * A12; |
||||
//pD[get_group_id(0)] = D; |
||||
|
||||
if (D < 1.192092896e-07f) |
||||
{ |
||||
if (tid == 0 && level == 0) |
||||
{ |
||||
status[get_group_id(0)] = 0; |
||||
} |
||||
|
||||
return; |
||||
} |
||||
|
||||
D = 1.f / D; |
||||
|
||||
A11 *= D; |
||||
A12 *= D; |
||||
A22 *= D; |
||||
|
||||
float2 nextPt = nextPts[get_group_id(0)]; |
||||
|
||||
nextPt = nextPt * 2.0f - c_halfWin; |
||||
|
||||
__global float4 *ptrJ = (__global float4 *)J; |
||||
|
||||
for (int k = 0; k < c_iters; ++k) |
||||
{ |
||||
if (nextPt.x < -c_halfWin.x || nextPt.x >= cols || nextPt.y < -c_halfWin.y || nextPt.y >= rows) |
||||
{ |
||||
if (tid == 0 && level == 0) |
||||
{ |
||||
status[get_group_id(0)] = 0; |
||||
} |
||||
|
||||
return; |
||||
} |
||||
|
||||
float b1 = 0; |
||||
float b2 = 0; |
||||
|
||||
for (int y = get_local_id(1), i = 0; y < c_winSize_y; y += get_local_size(1), ++i) |
||||
{ |
||||
for (int x = get_local_id(0), j = 0; x < c_winSize_x; x += get_local_size(0), ++j) |
||||
{ |
||||
float4 diff = (readImage2Df_C4(ptrJ, nextPt.x + x, nextPt.y + y, rows, cols, elemCntPerRow) - I_patch[i][j]) * 32.0f; |
||||
|
||||
b1 += (diff * dIdx_patch[i][j]).x + (diff * dIdx_patch[i][j]).y + (diff * dIdx_patch[i][j]).z; |
||||
b2 += (diff * dIdy_patch[i][j]).x + (diff * dIdy_patch[i][j]).y + (diff * dIdy_patch[i][j]).z; |
||||
} |
||||
} |
||||
|
||||
reduce2(b1, b2, smem1, smem2, tid); |
||||
barrier(CLK_LOCAL_MEM_FENCE); |
||||
|
||||
b1 = smem1[0]; |
||||
b2 = smem2[0]; |
||||
|
||||
float2 delta; |
||||
delta.x = A12 * b2 - A22 * b1; |
||||
delta.y = A12 * b1 - A11 * b2; |
||||
|
||||
nextPt += delta; |
||||
|
||||
//if (fabs(delta.x) < THRESHOLD && fabs(delta.y) < THRESHOLD) |
||||
// break; |
||||
} |
||||
|
||||
float errval = 0.0f; |
||||
|
||||
if (calcErr) |
||||
{ |
||||
for (int y = get_local_id(1), i = 0; y < c_winSize_y; y += get_local_size(1), ++i) |
||||
{ |
||||
for (int x = get_local_id(0), j = 0; x < c_winSize_x; x += get_local_size(0), ++j) |
||||
{ |
||||
float4 diff = readImage2Df_C4(ptrJ, nextPt.x + x, nextPt.y + y, rows, cols, elemCntPerRow) - I_patch[i][j]; |
||||
|
||||
errval += fabs(diff.x) + fabs(diff.y) + fabs(diff.z); |
||||
} |
||||
} |
||||
|
||||
reduce1(errval, smem1, tid); |
||||
} |
||||
|
||||
if (tid == 0) |
||||
{ |
||||
nextPt += c_halfWin; |
||||
nextPts[get_group_id(0)] = nextPt; |
||||
|
||||
if (calcErr) |
||||
{ |
||||
err[get_group_id(0)] = smem1[0] / (3 * c_winSize_x * c_winSize_y); |
||||
} |
||||
} |
||||
} |
||||
|
||||
int readImage2Di_C1(__global const int *image, float2 coor, int2 size, const int elemCntPerRow) |
||||
{ |
||||
int i = clamp((int)floor(coor.x), 0, size.x - 1); |
||||
int j = clamp((int)floor(coor.y), 0, size.y - 1); |
||||
return image[mad24(j, elemCntPerRow, i)]; |
||||
} |
||||
|
||||
__kernel void lkDense_C1_D0(__global const int *I, __global const int *J, __global float *u, int uStep, __global float *v, int vStep, __global const float *prevU, int prevUStep, __global const float *prevV, int prevVStep, |
||||
const int rows, const int cols, /*__global float* err, int errStep, int cn,*/ |
||||
const int elemCntPerRow, int c_winSize_x, int c_winSize_y, int c_iters, char calcErr) |
||||
{ |
||||
int c_halfWin_x = (c_winSize_x - 1) / 2; |
||||
int c_halfWin_y = (c_winSize_y - 1) / 2; |
||||
|
||||
const int patchWidth = get_local_size(0) + 2 * c_halfWin_x; |
||||
const int patchHeight = get_local_size(1) + 2 * c_halfWin_y; |
||||
|
||||
__local int smem[8192]; |
||||
|
||||
__local int *I_patch = smem; |
||||
__local int *dIdx_patch = I_patch + patchWidth * patchHeight; |
||||
__local int *dIdy_patch = dIdx_patch + patchWidth * patchHeight; |
||||
|
||||
const int xBase = get_group_id(0) * get_local_size(0); |
||||
const int yBase = get_group_id(1) * get_local_size(1); |
||||
int2 size = (int2)(cols, rows); |
||||
|
||||
for (int i = get_local_id(1); i < patchHeight; i += get_local_size(1)) |
||||
{ |
||||
for (int j = get_local_id(0); j < patchWidth; j += get_local_size(0)) |
||||
{ |
||||
float x = xBase - c_halfWin_x + j + 0.5f; |
||||
float y = yBase - c_halfWin_y + i + 0.5f; |
||||
|
||||
I_patch[i * patchWidth + j] = readImage2Di_C1(I, (float2)(x, y), size, elemCntPerRow); |
||||
|
||||
// Sharr Deriv |
||||
|
||||
dIdx_patch[i * patchWidth + j] = 3 * readImage2Di_C1(I, (float2)(x + 1, y - 1), size, elemCntPerRow) + 10 * readImage2Di_C1(I, (float2)(x + 1, y), size, elemCntPerRow) + 3 * readImage2Di_C1(I, (float2)(x + 1, y + 1), size, elemCntPerRow) - |
||||
(3 * readImage2Di_C1(I, (float2)(x - 1, y - 1), size, elemCntPerRow) + 10 * readImage2Di_C1(I, (float2)(x - 1, y), size, elemCntPerRow) + 3 * readImage2Di_C1(I, (float2)(x - 1, y + 1), size, elemCntPerRow)); |
||||
|
||||
dIdy_patch[i * patchWidth + j] = 3 * readImage2Di_C1(I, (float2)(x - 1, y + 1), size, elemCntPerRow) + 10 * readImage2Di_C1(I, (float2)(x, y + 1), size, elemCntPerRow) + 3 * readImage2Di_C1(I, (float2)(x + 1, y + 1), size, elemCntPerRow) - |
||||
(3 * readImage2Di_C1(I, (float2)(x - 1, y - 1), size, elemCntPerRow) + 10 * readImage2Di_C1(I, (float2)(x, y - 1), size, elemCntPerRow) + 3 * readImage2Di_C1(I, (float2)(x + 1, y - 1), size, elemCntPerRow)); |
||||
} |
||||
} |
||||
|
||||
barrier(CLK_LOCAL_MEM_FENCE); |
||||
|
||||
// extract the patch from the first image, compute covariation matrix of derivatives |
||||
|
||||
const int x = get_global_id(0); |
||||
const int y = get_global_id(1); |
||||
|
||||
if (x >= cols || y >= rows) |
||||
{ |
||||
return; |
||||
} |
||||
|
||||
int A11i = 0; |
||||
int A12i = 0; |
||||
int A22i = 0; |
||||
|
||||
for (int i = 0; i < c_winSize_y; ++i) |
||||
{ |
||||
for (int j = 0; j < c_winSize_x; ++j) |
||||
{ |
||||
int dIdx = dIdx_patch[(get_local_id(1) + i) * patchWidth + (get_local_id(0) + j)]; |
||||
int dIdy = dIdy_patch[(get_local_id(1) + i) * patchWidth + (get_local_id(0) + j)]; |
||||
|
||||
A11i += dIdx * dIdx; |
||||
A12i += dIdx * dIdy; |
||||
A22i += dIdy * dIdy; |
||||
} |
||||
} |
||||
|
||||
float A11 = A11i; |
||||
float A12 = A12i; |
||||
float A22 = A22i; |
||||
|
||||
float D = A11 * A22 - A12 * A12; |
||||
|
||||
//if (calcErr && GET_MIN_EIGENVALS) |
||||
// (err + y * errStep)[x] = minEig; |
||||
|
||||
if (D < 1.192092896e-07f) |
||||
{ |
||||
//if (calcErr) |
||||
// err(y, x) = 3.402823466e+38f; |
||||
|
||||
return; |
||||
} |
||||
|
||||
D = 1.f / D; |
||||
|
||||
A11 *= D; |
||||
A12 *= D; |
||||
A22 *= D; |
||||
|
||||
float2 nextPt; |
||||
nextPt.x = x + prevU[y / 2 * prevUStep / 4 + x / 2] * 2.0f; |
||||
nextPt.y = y + prevV[y / 2 * prevVStep / 4 + x / 2] * 2.0f; |
||||
|
||||
for (int k = 0; k < c_iters; ++k) |
||||
{ |
||||
if (nextPt.x < 0 || nextPt.x >= cols || nextPt.y < 0 || nextPt.y >= rows) |
||||
{ |
||||
//if (calcErr) |
||||
// err(y, x) = 3.402823466e+38f; |
||||
|
||||
return; |
||||
} |
||||
|
||||
int b1 = 0; |
||||
int b2 = 0; |
||||
|
||||
for (int i = 0; i < c_winSize_y; ++i) |
||||
{ |
||||
for (int j = 0; j < c_winSize_x; ++j) |
||||
{ |
||||
int iI = I_patch[(get_local_id(1) + i) * patchWidth + get_local_id(0) + j]; |
||||
int iJ = readImage2Di_C1(J, (float2)(nextPt.x - c_halfWin_x + j + 0.5f, nextPt.y - c_halfWin_y + i + 0.5f), size, elemCntPerRow); |
||||
|
||||
int diff = (iJ - iI) * 32; |
||||
|
||||
int dIdx = dIdx_patch[(get_local_id(1) + i) * patchWidth + (get_local_id(0) + j)]; |
||||
int dIdy = dIdy_patch[(get_local_id(1) + i) * patchWidth + (get_local_id(0) + j)]; |
||||
|
||||
b1 += diff * dIdx; |
||||
b2 += diff * dIdy; |
||||
} |
||||
} |
||||
|
||||
float2 delta; |
||||
delta.x = A12 * b2 - A22 * b1; |
||||
delta.y = A12 * b1 - A11 * b2; |
||||
|
||||
nextPt.x += delta.x; |
||||
nextPt.y += delta.y; |
||||
|
||||
if (fabs(delta.x) < 0.01f && fabs(delta.y) < 0.01f) |
||||
{ |
||||
break; |
||||
} |
||||
} |
||||
|
||||
u[y * uStep / 4 + x] = nextPt.x - x; |
||||
v[y * vStep / 4 + x] = nextPt.y - y; |
||||
|
||||
if (calcErr) |
||||
{ |
||||
int errval = 0; |
||||
|
||||
for (int i = 0; i < c_winSize_y; ++i) |
||||
{ |
||||
for (int j = 0; j < c_winSize_x; ++j) |
||||
{ |
||||
int iI = I_patch[(get_local_id(1) + i) * patchWidth + get_local_id(0) + j]; |
||||
int iJ = readImage2Di_C1(J, (float2)(nextPt.x - c_halfWin_x + j + 0.5f, nextPt.y - c_halfWin_y + i + 0.5f), size, elemCntPerRow); |
||||
|
||||
errval += abs(iJ - iI); |
||||
} |
||||
} |
||||
|
||||
//err[y * errStep / 4 + x] = static_cast<float>(errval) / (c_winSize_x * c_winSize_y); |
||||
} |
||||
} |
||||
@ -0,0 +1,193 @@ |
||||
/*M///////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
|
||||
//
|
||||
// By downloading, copying, installing or using the software you agree to this license.
|
||||
// If you do not agree to this license, do not download, install,
|
||||
// copy or use the software.
|
||||
//
|
||||
//
|
||||
// License Agreement
|
||||
// For Open Source Computer Vision Library
|
||||
//
|
||||
// Copyright (C) 2010-2012, Multicoreware, Inc., all rights reserved.
|
||||
// Copyright (C) 2010-2012, Advanced Micro Devices, Inc., all rights reserved.
|
||||
// Third party copyrights are property of their respective owners.
|
||||
//
|
||||
// @Authors
|
||||
// Peng Xiao, pengxiao@multicorewareinc.com
|
||||
//
|
||||
// Redistribution and use in source and binary forms, with or without modification,
|
||||
// are permitted provided that the following conditions are met:
|
||||
//
|
||||
// * Redistribution's of source code must retain the above copyright notice,
|
||||
// this list of conditions and the following disclaimer.
|
||||
//
|
||||
// * Redistribution's in binary form must reproduce the above copyright notice,
|
||||
// this list of conditions and the following disclaimer in the documentation
|
||||
// and/or other oclMaterials provided with the distribution.
|
||||
//
|
||||
// * The name of the copyright holders may not be used to endorse or promote products
|
||||
// derived from this software without specific prior written permission.
|
||||
//
|
||||
// This software is provided by the copyright holders and contributors as is and
|
||||
// any express or implied warranties, including, but not limited to, the implied
|
||||
// warranties of merchantability and fitness for a particular purpose are disclaimed.
|
||||
// In no event shall the Intel Corporation or contributors be liable for any direct,
|
||||
// indirect, incidental, special, exemplary, or consequential damages
|
||||
// (including, but not limited to, procurement of substitute goods or services;
|
||||
// loss of use, data, or profits; or business interruption) however caused
|
||||
// and on any theory of liability, whether in contract, strict liability,
|
||||
// or tort (including negligence or otherwise) arising in any way out of
|
||||
// the use of this software, even if advised of the possibility of such damage.
|
||||
//
|
||||
//M*/
|
||||
|
||||
#include "precomp.hpp" |
||||
#ifdef HAVE_OPENCL |
||||
|
||||
//#define MAT_DEBUG
|
||||
#ifdef MAT_DEBUG |
||||
#define MAT_DIFF(mat, mat2)\ |
||||
{\
|
||||
for(int i = 0; i < mat.rows; i ++)\
|
||||
{\
|
||||
for(int j = 0; j < mat.cols; j ++)\
|
||||
{\
|
||||
cv::Vec4b s = mat.at<cv::Vec4b>(i, j);\
|
||||
cv::Vec4b s2 = mat2.at<cv::Vec4b>(i, j);\
|
||||
if(s != s2) printf("*");\
|
||||
else printf(".");\
|
||||
}\
|
||||
puts("\n");\
|
||||
}\
|
||||
} |
||||
#else |
||||
#define MAT_DIFF(mat, mat2) |
||||
#endif |
||||
|
||||
|
||||
namespace |
||||
{ |
||||
|
||||
///////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// cvtColor
|
||||
PARAM_TEST_CASE(CvtColor, cv::Size, MatDepth) |
||||
{ |
||||
cv::Size size; |
||||
int depth; |
||||
bool useRoi; |
||||
|
||||
cv::Mat img; |
||||
|
||||
virtual void SetUp() |
||||
{ |
||||
size = GET_PARAM(0); |
||||
depth = GET_PARAM(1); |
||||
|
||||
img = randomMat(size, CV_MAKE_TYPE(depth, 3), 0.0, depth == CV_32F ? 1.0 : 255.0); |
||||
} |
||||
}; |
||||
|
||||
#define CVTCODE(name) cv::COLOR_ ## name |
||||
#define TEST_P_CVTCOLOR(name) TEST_P(CvtColor, name)\ |
||||
{\
|
||||
cv::Mat src = img;\
|
||||
cv::ocl::oclMat ocl_img, dst;\
|
||||
ocl_img.upload(img);\
|
||||
cv::ocl::cvtColor(ocl_img, dst, CVTCODE(name));\
|
||||
cv::Mat dst_gold;\
|
||||
cv::cvtColor(src, dst_gold, CVTCODE(name));\
|
||||
cv::Mat dst_mat;\
|
||||
dst.download(dst_mat);\
|
||||
EXPECT_MAT_NEAR(dst_gold, dst_mat, 1e-5, "");\
|
||||
} |
||||
|
||||
//add new ones here using macro
|
||||
TEST_P_CVTCOLOR(RGB2GRAY) |
||||
TEST_P_CVTCOLOR(BGR2GRAY) |
||||
TEST_P_CVTCOLOR(RGBA2GRAY) |
||||
TEST_P_CVTCOLOR(BGRA2GRAY) |
||||
|
||||
TEST_P_CVTCOLOR(RGB2YUV) |
||||
TEST_P_CVTCOLOR(BGR2YUV) |
||||
TEST_P_CVTCOLOR(YUV2RGB) |
||||
TEST_P_CVTCOLOR(YUV2BGR) |
||||
TEST_P_CVTCOLOR(RGB2YCrCb) |
||||
TEST_P_CVTCOLOR(BGR2YCrCb) |
||||
|
||||
PARAM_TEST_CASE(CvtColor_Gray2RGB, cv::Size, MatDepth, int) |
||||
{ |
||||
cv::Size size; |
||||
int code; |
||||
int depth; |
||||
cv::Mat img; |
||||
|
||||
virtual void SetUp() |
||||
{ |
||||
size = GET_PARAM(0); |
||||
depth = GET_PARAM(1); |
||||
code = GET_PARAM(2); |
||||
img = randomMat(size, CV_MAKETYPE(depth, 1), 0.0, depth == CV_32F ? 1.0 : 255.0); |
||||
} |
||||
}; |
||||
TEST_P(CvtColor_Gray2RGB, Accuracy) |
||||
{ |
||||
cv::Mat src = img; |
||||
cv::ocl::oclMat ocl_img, dst; |
||||
ocl_img.upload(src); |
||||
cv::ocl::cvtColor(ocl_img, dst, code); |
||||
cv::Mat dst_gold; |
||||
cv::cvtColor(src, dst_gold, code); |
||||
cv::Mat dst_mat; |
||||
dst.download(dst_mat); |
||||
EXPECT_MAT_NEAR(dst_gold, dst_mat, 1e-5, ""); |
||||
} |
||||
|
||||
|
||||
PARAM_TEST_CASE(CvtColor_YUV420, cv::Size, int) |
||||
{ |
||||
cv::Size size; |
||||
int code; |
||||
|
||||
cv::Mat img; |
||||
|
||||
virtual void SetUp() |
||||
{ |
||||
size = GET_PARAM(0); |
||||
code = GET_PARAM(1); |
||||
img = randomMat(size, CV_8UC1, 0.0, 255.0); |
||||
} |
||||
}; |
||||
|
||||
TEST_P(CvtColor_YUV420, Accuracy) |
||||
{ |
||||
cv::Mat src = img; |
||||
cv::ocl::oclMat ocl_img, dst; |
||||
ocl_img.upload(src); |
||||
cv::ocl::cvtColor(ocl_img, dst, code); |
||||
cv::Mat dst_gold; |
||||
cv::cvtColor(src, dst_gold, code); |
||||
cv::Mat dst_mat; |
||||
dst.download(dst_mat); |
||||
MAT_DIFF(dst_mat, dst_gold); |
||||
EXPECT_MAT_NEAR(dst_gold, dst_mat, 1e-5, ""); |
||||
} |
||||
|
||||
INSTANTIATE_TEST_CASE_P(OCL_ImgProc, CvtColor, testing::Combine( |
||||
DIFFERENT_SIZES, |
||||
testing::Values(MatDepth(CV_8U), MatDepth(CV_16U), MatDepth(CV_32F)) |
||||
)); |
||||
|
||||
INSTANTIATE_TEST_CASE_P(OCL_ImgProc, CvtColor_YUV420, testing::Combine( |
||||
testing::Values(cv::Size(128, 45), cv::Size(46, 132), cv::Size(1024, 1023)), |
||||
testing::Values((int)CV_YUV2RGBA_NV12, (int)CV_YUV2BGRA_NV12, (int)CV_YUV2RGB_NV12, (int)CV_YUV2BGR_NV12) |
||||
)); |
||||
|
||||
INSTANTIATE_TEST_CASE_P(OCL_ImgProc, CvtColor_Gray2RGB, testing::Combine( |
||||
DIFFERENT_SIZES, |
||||
testing::Values(MatDepth(CV_8U), MatDepth(CV_16U), MatDepth(CV_32F)), |
||||
testing::Values((int)CV_GRAY2BGR, (int)CV_GRAY2BGRA, (int)CV_GRAY2RGB, (int)CV_GRAY2RGBA) |
||||
)); |
||||
} |
||||
#endif |
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue