Skip to content

Commit 89a1e80

Browse files
mshabuninmshabunin
committed
Merge pull request opencv#6628 from sovrasov:hal_samples_update
2 parents e1ba439 + 901e1e4 commit 89a1e80

File tree

6 files changed

+50
-32
lines changed

6 files changed

+50
-32
lines changed

‎samples/hal/c_hal/CMakeLists.txt

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
11
cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR)
22

3-
add_library(c_hal impl.c)
4-
set_target_properties(c_hal PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
3+
set(PROJECT_NAME "c_hal")
4+
set(HAL_LIB_NAME "c_hal")
5+
6+
add_library(${HAL_LIB_NAME} impl.c)
7+
set_target_properties(${HAL_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
58
set(OPENCV_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../..")
6-
target_include_directories(c_hal PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${OPENCV_SRC_DIR}/modules/core/include)
9+
target_include_directories(${HAL_LIB_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${OPENCV_SRC_DIR}/modules/core/include)
10+
11+
set(OpenCV_HAL_FOUND TRUE)
12+
set(OpenCV_HAL_VERSION 0.0.1)
13+
set(OpenCV_HAL_LIBRARIES ${CMAKE_CURRENT_BINARY_DIR}/lib${HAL_LIB_NAME}.a)
14+
set(OpenCV_HAL_HEADERS "impl.h")
15+
set(OpenCV_HAL_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR})
716

817
configure_file("impl.h" "${CMAKE_BINARY_DIR}/impl.h" COPYONLY)
9-
configure_file("config.cmake" "${CMAKE_BINARY_DIR}/OpenCV_HALConfig.cmake" COPYONLY)
18+
configure_file("config.cmake" "${CMAKE_BINARY_DIR}/OpenCV_HALConfig.cmake")

‎samples/hal/c_hal/config.cmake

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
set(OpenCV_HAL_FOUND TRUE)
2-
set(OpenCV_HAL_VERSION "0.0.1")
3-
set(OpenCV_HAL_LIBRARIES "${CMAKE_CURRENT_LIST_DIR}/libc_hal.a")
4-
set(OpenCV_HAL_HEADERS "impl.h")
5-
set(OpenCV_HAL_INCLUDE_DIRS "${CMAKE_CURRENT_LIST_DIR}")
1+
set(OpenCV_HAL_FOUND @OpenCV_HAL_FOUND@)
2+
set(OpenCV_HAL_VERSION @OpenCV_HAL_VERSION@)
3+
set(OpenCV_HAL_LIBRARIES @OpenCV_HAL_LIBRARIES@)
4+
set(OpenCV_HAL_HEADERS @OpenCV_HAL_HEADERS@)
5+
set(OpenCV_HAL_INCLUDE_DIRS @OpenCV_HAL_INCLUDE_DIRS@)

‎samples/hal/c_hal/impl.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -300,37 +300,37 @@ int wrong_div64f(const double* src1, size_t sz1, const double* src2, size_t sz2,
300300
return CV_HAL_ERROR_UNKNOWN; // to test how OpenCV handles errors from external HAL
301301
}
302302

303-
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)
303+
int wrong_recip8u(const uchar* src2, size_t sz2, uchar* dst, size_t sz, int w, int h, double scale)
304304
{
305305
return CV_HAL_ERROR_UNKNOWN; // to test how OpenCV handles errors from external HAL
306306
}
307307

308-
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)
308+
int wrong_recip8s(const schar* src2, size_t sz2, schar* dst, size_t sz, int w, int h, double scale)
309309
{
310310
return CV_HAL_ERROR_UNKNOWN; // to test how OpenCV handles errors from external HAL
311311
}
312312

313-
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)
313+
int wrong_recip16u(const ushort* src2, size_t sz2, ushort* dst, size_t sz, int w, int h, double scale)
314314
{
315315
return CV_HAL_ERROR_UNKNOWN; // to test how OpenCV handles errors from external HAL
316316
}
317317

318-
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)
318+
int wrong_recip16s(const short* src2, size_t sz2, short* dst, size_t sz, int w, int h, double scale)
319319
{
320320
return CV_HAL_ERROR_UNKNOWN; // to test how OpenCV handles errors from external HAL
321321
}
322322

323-
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)
323+
int wrong_recip32s(const int* src2, size_t sz2, int* dst, size_t sz, int w, int h, double scale)
324324
{
325325
return CV_HAL_ERROR_UNKNOWN; // to test how OpenCV handles errors from external HAL
326326
}
327327

328-
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)
328+
int wrong_recip32f(const float* src2, size_t sz2, float* dst, size_t sz, int w, int h, double scale)
329329
{
330330
return CV_HAL_ERROR_UNKNOWN; // to test how OpenCV handles errors from external HAL
331331
}
332332

333-
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)
333+
int wrong_recip64f(const double* src2, size_t sz2, double* dst, size_t sz, int w, int h, double scale)
334334
{
335335
return CV_HAL_ERROR_UNKNOWN; // to test how OpenCV handles errors from external HAL
336336
}

‎samples/hal/c_hal/impl.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -164,13 +164,13 @@ int wrong_div16s(const short* src1, size_t sz1, const short* src2, size_t sz2, s
164164
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);
165165
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);
166166
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);
167-
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);
168-
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);
169-
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);
170-
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);
171-
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);
172-
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);
173-
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);
167+
int wrong_recip8u(const uchar* src2, size_t sz2, uchar* dst, size_t sz, int w, int h, double scale);
168+
int wrong_recip8s(const schar* src2, size_t sz2, schar* dst, size_t sz, int w, int h, double scale);
169+
int wrong_recip16u(const ushort* src2, size_t sz2, ushort* dst, size_t sz, int w, int h, double scale);
170+
int wrong_recip16s(const short* src2, size_t sz2, short* dst, size_t sz, int w, int h, double scale);
171+
int wrong_recip32s(const int* src2, size_t sz2, int* dst, size_t sz, int w, int h, double scale);
172+
int wrong_recip32f(const float* src2, size_t sz2, float* dst, size_t sz, int w, int h, double scale);
173+
int wrong_recip64f(const double* src2, size_t sz2, double* dst, size_t sz, int w, int h, double scale);
174174

175175
#undef cv_hal_mul8u
176176
#define cv_hal_mul8u wrong_mul8u

‎samples/hal/slow_hal/CMakeLists.txt

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
11
cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR)
22

3-
add_library(slow_hal impl.cpp)
4-
set_target_properties(slow_hal PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
3+
set(PROJECT_NAME "slow_hal")
4+
set(HAL_LIB_NAME "slow_hal")
5+
6+
add_library(${HAL_LIB_NAME} impl.cpp)
7+
set_target_properties(${HAL_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
58
set(OPENCV_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../..")
6-
target_include_directories(slow_hal PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${OPENCV_SRC_DIR}/modules/core/include)
9+
target_include_directories(${HAL_LIB_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${OPENCV_SRC_DIR}/modules/core/include)
10+
11+
set(OpenCV_HAL_FOUND TRUE)
12+
set(OpenCV_HAL_VERSION 0.0.1)
13+
set(OpenCV_HAL_LIBRARIES ${CMAKE_CURRENT_BINARY_DIR}/lib${HAL_LIB_NAME}.a)
14+
set(OpenCV_HAL_HEADERS "impl.hpp")
15+
set(OpenCV_HAL_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR})
716

817
configure_file("impl.hpp" "${CMAKE_BINARY_DIR}/impl.hpp" COPYONLY)
9-
configure_file("config.cmake" "${CMAKE_BINARY_DIR}/OpenCV_HALConfig.cmake" COPYONLY)
18+
configure_file("config.cmake" "${CMAKE_BINARY_DIR}/OpenCV_HALConfig.cmake")

‎samples/hal/slow_hal/config.cmake

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
set(OpenCV_HAL_FOUND TRUE)
2-
set(OpenCV_HAL_VERSION "0.0.1")
3-
set(OpenCV_HAL_LIBRARIES "${CMAKE_CURRENT_LIST_DIR}/libslow_hal.a")
4-
set(OpenCV_HAL_HEADERS "impl.hpp")
5-
set(OpenCV_HAL_INCLUDE_DIRS "${CMAKE_CURRENT_LIST_DIR}")
1+
set(OpenCV_HAL_FOUND @OpenCV_HAL_FOUND@)
2+
set(OpenCV_HAL_VERSION @OpenCV_HAL_VERSION@)
3+
set(OpenCV_HAL_LIBRARIES @OpenCV_HAL_LIBRARIES@)
4+
set(OpenCV_HAL_HEADERS @OpenCV_HAL_HEADERS@)
5+
set(OpenCV_HAL_INCLUDE_DIRS @OpenCV_HAL_INCLUDE_DIRS@)

0 commit comments

Comments
 (0)