Update HAL samples

diff --git a/samples/hal/c_hal/CMakeLists.txt b/samples/hal/c_hal/CMakeLists.txt
index b8996bb..8502779 100644 (file)
--- a/samples/hal/c_hal/CMakeLists.txt
+++ b/samples/hal/c_hal/CMakeLists.txt
@@ -1,9 +1,18 @@
 cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR)
 
-add_library(c_hal impl.c)
-set_target_properties(c_hal PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
+set(PROJECT_NAME "c_hal")
+set(HAL_LIB_NAME "c_hal")
+
+add_library(${HAL_LIB_NAME} impl.c)
+set_target_properties(${HAL_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
 set(OPENCV_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../..")
-target_include_directories(c_hal PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${OPENCV_SRC_DIR}/modules/core/include)
+target_include_directories(${HAL_LIB_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${OPENCV_SRC_DIR}/modules/core/include)
+
+set(OpenCV_HAL_FOUND TRUE)
+set(OpenCV_HAL_VERSION 0.0.1)
+set(OpenCV_HAL_LIBRARIES ${CMAKE_CURRENT_BINARY_DIR}/lib${HAL_LIB_NAME}.a)
+set(OpenCV_HAL_HEADERS "impl.h")
+set(OpenCV_HAL_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR})
 
 configure_file("impl.h" "${CMAKE_BINARY_DIR}/impl.h" COPYONLY)
-configure_file("config.cmake" "${CMAKE_BINARY_DIR}/OpenCV_HALConfig.cmake" COPYONLY)
+configure_file("config.cmake" "${CMAKE_BINARY_DIR}/OpenCV_HALConfig.cmake")

diff --git a/samples/hal/c_hal/config.cmake b/samples/hal/c_hal/config.cmake
index 11fe9f2..d57b7ef 100644 (file)
--- a/samples/hal/c_hal/config.cmake
+++ b/samples/hal/c_hal/config.cmake
@@ -1,5 +1,5 @@
-set(OpenCV_HAL_FOUND TRUE)
-set(OpenCV_HAL_VERSION "0.0.1")
-set(OpenCV_HAL_LIBRARIES "${CMAKE_CURRENT_LIST_DIR}/libc_hal.a")
-set(OpenCV_HAL_HEADERS "impl.h")
-set(OpenCV_HAL_INCLUDE_DIRS "${CMAKE_CURRENT_LIST_DIR}")
+set(OpenCV_HAL_FOUND @OpenCV_HAL_FOUND@)
+set(OpenCV_HAL_VERSION @OpenCV_HAL_VERSION@)
+set(OpenCV_HAL_LIBRARIES @OpenCV_HAL_LIBRARIES@)
+set(OpenCV_HAL_HEADERS @OpenCV_HAL_HEADERS@)
+set(OpenCV_HAL_INCLUDE_DIRS @OpenCV_HAL_INCLUDE_DIRS@)

diff --git a/samples/hal/c_hal/impl.c b/samples/hal/c_hal/impl.c
index d2fcc5a..7bf34ae 100644 (file)
--- a/samples/hal/c_hal/impl.c
+++ b/samples/hal/c_hal/impl.c
@@ -300,37 +300,37 @@ int wrong_div64f(const double* src1, size_t sz1, const double* src2, size_t sz2,
     return CV_HAL_ERROR_UNKNOWN; // to test how OpenCV handles errors from external HAL
 }
 
-int wrong_recip8u(const uchar* src1, size_t sz1, const uchar* src2, size_t sz2, uchar* dst, size_t sz, int w, int h, double scale)
+int wrong_recip8u(const uchar* src2, size_t sz2, uchar* dst, size_t sz, int w, int h, double scale)
 {
     return CV_HAL_ERROR_UNKNOWN; // to test how OpenCV handles errors from external HAL
 }
 
-int wrong_recip8s(const schar* src1, size_t sz1, const schar* src2, size_t sz2, schar* dst, size_t sz, int w, int h, double scale)
+int wrong_recip8s(const schar* src2, size_t sz2, schar* dst, size_t sz, int w, int h, double scale)
 {
     return CV_HAL_ERROR_UNKNOWN; // to test how OpenCV handles errors from external HAL
 }
 
-int wrong_recip16u(const ushort* src1, size_t sz1, const ushort* src2, size_t sz2, ushort* dst, size_t sz, int w, int h, double scale)
+int wrong_recip16u(const ushort* src2, size_t sz2, ushort* dst, size_t sz, int w, int h, double scale)
 {
     return CV_HAL_ERROR_UNKNOWN; // to test how OpenCV handles errors from external HAL
 }
 
-int wrong_recip16s(const short* src1, size_t sz1, const short* src2, size_t sz2, short* dst, size_t sz, int w, int h, double scale)
+int wrong_recip16s(const short* src2, size_t sz2, short* dst, size_t sz, int w, int h, double scale)
 {
     return CV_HAL_ERROR_UNKNOWN; // to test how OpenCV handles errors from external HAL
 }
 
-int wrong_recip32s(const int* src1, size_t sz1, const int* src2, size_t sz2, int* dst, size_t sz, int w, int h, double scale)
+int wrong_recip32s(const int* src2, size_t sz2, int* dst, size_t sz, int w, int h, double scale)
 {
     return CV_HAL_ERROR_UNKNOWN; // to test how OpenCV handles errors from external HAL
 }
 
-int wrong_recip32f(const float* src1, size_t sz1, const float* src2, size_t sz2, float* dst, size_t sz, int w, int h, double scale)
+int wrong_recip32f(const float* src2, size_t sz2, float* dst, size_t sz, int w, int h, double scale)
 {
     return CV_HAL_ERROR_UNKNOWN; // to test how OpenCV handles errors from external HAL
 }
 
-int wrong_recip64f(const double* src1, size_t sz1, const double* src2, size_t sz2, double* dst, size_t sz, int w, int h, double scale)
+int wrong_recip64f(const double* src2, size_t sz2, double* dst, size_t sz, int w, int h, double scale)
 {
     return CV_HAL_ERROR_UNKNOWN; // to test how OpenCV handles errors from external HAL
 }

diff --git a/samples/hal/c_hal/impl.h b/samples/hal/c_hal/impl.h
index 9fc4f19..91d7e82 100644 (file)
--- a/samples/hal/c_hal/impl.h
+++ b/samples/hal/c_hal/impl.h
@@ -164,13 +164,13 @@ int wrong_div16s(const short* src1, size_t sz1, const short* src2, size_t sz2, s
 int wrong_div32s(const int* src1, size_t sz1, const int* src2, size_t sz2, int* dst, size_t sz, int w, int h, double scale);
 int wrong_div32f(const float* src1, size_t sz1, const float* src2, size_t sz2, float* dst, size_t sz, int w, int h, double scale);
 int wrong_div64f(const double* src1, size_t sz1, const double* src2, size_t sz2, double* dst, size_t sz, int w, int h, double scale);
-int wrong_recip8u(const uchar* src1, size_t sz1, const uchar* src2, size_t sz2, uchar* dst, size_t sz, int w, int h, double scale);
-int wrong_recip8s(const schar* src1, size_t sz1, const schar* src2, size_t sz2, schar* dst, size_t sz, int w, int h, double scale);
-int wrong_recip16u(const ushort* src1, size_t sz1, const ushort* src2, size_t sz2, ushort* dst, size_t sz, int w, int h, double scale);
-int wrong_recip16s(const short* src1, size_t sz1, const short* src2, size_t sz2, short* dst, size_t sz, int w, int h, double scale);
-int wrong_recip32s(const int* src1, size_t sz1, const int* src2, size_t sz2, int* dst, size_t sz, int w, int h, double scale);
-int wrong_recip32f(const float* src1, size_t sz1, const float* src2, size_t sz2, float* dst, size_t sz, int w, int h, double scale);
-int wrong_recip64f(const double* src1, size_t sz1, const double* src2, size_t sz2, double* dst, size_t sz, int w, int h, double scale);
+int wrong_recip8u(const uchar* src2, size_t sz2, uchar* dst, size_t sz, int w, int h, double scale);
+int wrong_recip8s(const schar* src2, size_t sz2, schar* dst, size_t sz, int w, int h, double scale);
+int wrong_recip16u(const ushort* src2, size_t sz2, ushort* dst, size_t sz, int w, int h, double scale);
+int wrong_recip16s(const short* src2, size_t sz2, short* dst, size_t sz, int w, int h, double scale);
+int wrong_recip32s(const int* src2, size_t sz2, int* dst, size_t sz, int w, int h, double scale);
+int wrong_recip32f(const float* src2, size_t sz2, float* dst, size_t sz, int w, int h, double scale);
+int wrong_recip64f(const double* src2, size_t sz2, double* dst, size_t sz, int w, int h, double scale);
 
 #undef cv_hal_mul8u
 #define cv_hal_mul8u wrong_mul8u

diff --git a/samples/hal/slow_hal/CMakeLists.txt b/samples/hal/slow_hal/CMakeLists.txt
index 51aa70e..d42fb0b 100644 (file)
--- a/samples/hal/slow_hal/CMakeLists.txt
+++ b/samples/hal/slow_hal/CMakeLists.txt
@@ -1,9 +1,18 @@
 cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR)
 
-add_library(slow_hal impl.cpp)
-set_target_properties(slow_hal PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
+set(PROJECT_NAME "slow_hal")
+set(HAL_LIB_NAME "slow_hal")
+
+add_library(${HAL_LIB_NAME} impl.cpp)
+set_target_properties(${HAL_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
 set(OPENCV_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../..")
-target_include_directories(slow_hal PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${OPENCV_SRC_DIR}/modules/core/include)
+target_include_directories(${HAL_LIB_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${OPENCV_SRC_DIR}/modules/core/include)
+
+set(OpenCV_HAL_FOUND TRUE)
+set(OpenCV_HAL_VERSION 0.0.1)
+set(OpenCV_HAL_LIBRARIES ${CMAKE_CURRENT_BINARY_DIR}/lib${HAL_LIB_NAME}.a)
+set(OpenCV_HAL_HEADERS "impl.hpp")
+set(OpenCV_HAL_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR})
 
 configure_file("impl.hpp" "${CMAKE_BINARY_DIR}/impl.hpp" COPYONLY)
-configure_file("config.cmake" "${CMAKE_BINARY_DIR}/OpenCV_HALConfig.cmake" COPYONLY)
+configure_file("config.cmake" "${CMAKE_BINARY_DIR}/OpenCV_HALConfig.cmake")

diff --git a/samples/hal/slow_hal/config.cmake b/samples/hal/slow_hal/config.cmake
index e901a7d..d57b7ef 100644 (file)
--- a/samples/hal/slow_hal/config.cmake
+++ b/samples/hal/slow_hal/config.cmake
@@ -1,5 +1,5 @@
-set(OpenCV_HAL_FOUND TRUE)
-set(OpenCV_HAL_VERSION "0.0.1")
-set(OpenCV_HAL_LIBRARIES "${CMAKE_CURRENT_LIST_DIR}/libslow_hal.a")
-set(OpenCV_HAL_HEADERS "impl.hpp")
-set(OpenCV_HAL_INCLUDE_DIRS "${CMAKE_CURRENT_LIST_DIR}")
+set(OpenCV_HAL_FOUND @OpenCV_HAL_FOUND@)
+set(OpenCV_HAL_VERSION @OpenCV_HAL_VERSION@)
+set(OpenCV_HAL_LIBRARIES @OpenCV_HAL_LIBRARIES@)
+set(OpenCV_HAL_HEADERS @OpenCV_HAL_HEADERS@)
+set(OpenCV_HAL_INCLUDE_DIRS @OpenCV_HAL_INCLUDE_DIRS@)