diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index c8ee7630e6..ef579fb97c 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -42,6 +42,7 @@ if(BUILD_DOCS AND DOXYGEN_FOUND) set(paths_bib) set(paths_sample) set(paths_tutorial) + set(paths_hal_interface) set(refs_main) set(refs_extra) set(deps) @@ -87,6 +88,11 @@ if(BUILD_DOCS AND DOXYGEN_FOUND) file(APPEND "${tutorial_contrib_root}" "- ${m}. @subpage ${tutorial_id}\n") endforeach() endif() + # HAL replacement file + set(replacement_header "${OPENCV_MODULE_opencv_${m}_LOCATION}/src/hal_replacement.hpp") + if(EXISTS "${replacement_header}") + list(APPEND paths_hal_interface "${replacement_header}") + endif() # BiBTeX file set(bib_file "${docs_dir}/${m}.bib") @@ -131,7 +137,7 @@ if(BUILD_DOCS AND DOXYGEN_FOUND) set(example_path "${CMAKE_SOURCE_DIR}/samples") # set export variables - string(REPLACE ";" " \\\n" CMAKE_DOXYGEN_INPUT_LIST "${rootfile} ; ${faqfile} ; ${paths_include} ; ${paths_doc} ; ${tutorial_path} ; ${tutorial_py_path} ; ${paths_tutorial} ; ${tutorial_contrib_root}") + string(REPLACE ";" " \\\n" CMAKE_DOXYGEN_INPUT_LIST "${rootfile} ; ${faqfile} ; ${paths_include} ; ${paths_hal_interface} ; ${paths_doc} ; ${tutorial_path} ; ${tutorial_py_path} ; ${paths_tutorial} ; ${tutorial_contrib_root}") string(REPLACE ";" " \\\n" CMAKE_DOXYGEN_IMAGE_PATH "${paths_doc} ; ${tutorial_path} ; ${tutorial_py_path} ; ${paths_tutorial}") # TODO: remove paths_doc from EXAMPLE_PATH after face module tutorials/samples moved to separate folders string(REPLACE ";" " \\\n" CMAKE_DOXYGEN_EXAMPLE_PATH "${example_path} ; ${paths_doc} ; ${paths_sample}") diff --git a/modules/core/include/opencv2/core/cvdef.h b/modules/core/include/opencv2/core/cvdef.h index af2abfbb28..c005914190 100644 --- a/modules/core/include/opencv2/core/cvdef.h +++ b/modules/core/include/opencv2/core/cvdef.h @@ -357,67 +357,6 @@ Cv64suf; * Matrix type (Mat) * \****************************************************************************************/ -#define CV_CN_MAX 512 -#define CV_CN_SHIFT 3 -#define CV_DEPTH_MAX (1 << CV_CN_SHIFT) - -#define CV_8U 0 -#define CV_8S 1 -#define CV_16U 2 -#define CV_16S 3 -#define CV_32S 4 -#define CV_32F 5 -#define CV_64F 6 -#define CV_USRTYPE1 7 - -#define CV_MAT_DEPTH_MASK (CV_DEPTH_MAX - 1) -#define CV_MAT_DEPTH(flags) ((flags) & CV_MAT_DEPTH_MASK) - -#define CV_MAKETYPE(depth,cn) (CV_MAT_DEPTH(depth) + (((cn)-1) << CV_CN_SHIFT)) -#define CV_MAKE_TYPE CV_MAKETYPE - -#define CV_8UC1 CV_MAKETYPE(CV_8U,1) -#define CV_8UC2 CV_MAKETYPE(CV_8U,2) -#define CV_8UC3 CV_MAKETYPE(CV_8U,3) -#define CV_8UC4 CV_MAKETYPE(CV_8U,4) -#define CV_8UC(n) CV_MAKETYPE(CV_8U,(n)) - -#define CV_8SC1 CV_MAKETYPE(CV_8S,1) -#define CV_8SC2 CV_MAKETYPE(CV_8S,2) -#define CV_8SC3 CV_MAKETYPE(CV_8S,3) -#define CV_8SC4 CV_MAKETYPE(CV_8S,4) -#define CV_8SC(n) CV_MAKETYPE(CV_8S,(n)) - -#define CV_16UC1 CV_MAKETYPE(CV_16U,1) -#define CV_16UC2 CV_MAKETYPE(CV_16U,2) -#define CV_16UC3 CV_MAKETYPE(CV_16U,3) -#define CV_16UC4 CV_MAKETYPE(CV_16U,4) -#define CV_16UC(n) CV_MAKETYPE(CV_16U,(n)) - -#define CV_16SC1 CV_MAKETYPE(CV_16S,1) -#define CV_16SC2 CV_MAKETYPE(CV_16S,2) -#define CV_16SC3 CV_MAKETYPE(CV_16S,3) -#define CV_16SC4 CV_MAKETYPE(CV_16S,4) -#define CV_16SC(n) CV_MAKETYPE(CV_16S,(n)) - -#define CV_32SC1 CV_MAKETYPE(CV_32S,1) -#define CV_32SC2 CV_MAKETYPE(CV_32S,2) -#define CV_32SC3 CV_MAKETYPE(CV_32S,3) -#define CV_32SC4 CV_MAKETYPE(CV_32S,4) -#define CV_32SC(n) CV_MAKETYPE(CV_32S,(n)) - -#define CV_32FC1 CV_MAKETYPE(CV_32F,1) -#define CV_32FC2 CV_MAKETYPE(CV_32F,2) -#define CV_32FC3 CV_MAKETYPE(CV_32F,3) -#define CV_32FC4 CV_MAKETYPE(CV_32F,4) -#define CV_32FC(n) CV_MAKETYPE(CV_32F,(n)) - -#define CV_64FC1 CV_MAKETYPE(CV_64F,1) -#define CV_64FC2 CV_MAKETYPE(CV_64F,2) -#define CV_64FC3 CV_MAKETYPE(CV_64F,3) -#define CV_64FC4 CV_MAKETYPE(CV_64F,4) -#define CV_64FC(n) CV_MAKETYPE(CV_64F,(n)) - #define CV_MAT_CN_MASK ((CV_CN_MAX - 1) << CV_CN_SHIFT) #define CV_MAT_CN(flags) ((((flags) & CV_MAT_CN_MASK) >> CV_CN_SHIFT) + 1) #define CV_MAT_TYPE_MASK (CV_DEPTH_MAX*CV_CN_MAX - 1) diff --git a/modules/core/include/opencv2/core/hal/hal.hpp b/modules/core/include/opencv2/core/hal/hal.hpp index 118913eb7d..64af09ab80 100644 --- a/modules/core/include/opencv2/core/hal/hal.hpp +++ b/modules/core/include/opencv2/core/hal/hal.hpp @@ -171,13 +171,13 @@ CV_EXPORTS void div32s( const int* src1, size_t step1, const int* src2, size_t s CV_EXPORTS void div32f( const float* src1, size_t step1, const float* src2, size_t step2, float* dst, size_t step, int width, int height, void* scale); CV_EXPORTS void div64f( const double* src1, size_t step1, const double* src2, size_t step2, double* dst, size_t step, int width, int height, void* scale); -CV_EXPORTS void recip8u( const uchar* src1, size_t step1, const uchar* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* scale); -CV_EXPORTS void recip8s( const schar* src1, size_t step1, const schar* src2, size_t step2, schar* dst, size_t step, int width, int height, void* scale); -CV_EXPORTS void recip16u( const ushort* src1, size_t step1, const ushort* src2, size_t step2, ushort* dst, size_t step, int width, int height, void* scale); -CV_EXPORTS void recip16s( const short* src1, size_t step1, const short* src2, size_t step2, short* dst, size_t step, int width, int height, void* scale); -CV_EXPORTS void recip32s( const int* src1, size_t step1, const int* src2, size_t step2, int* dst, size_t step, int width, int height, void* scale); -CV_EXPORTS void recip32f( const float* src1, size_t step1, const float* src2, size_t step2, float* dst, size_t step, int width, int height, void* scale); -CV_EXPORTS void recip64f( const double* src1, size_t step1, const double* src2, size_t step2, double* dst, size_t step, int width, int height, void* scale); +CV_EXPORTS void recip8u( const uchar *, size_t, const uchar * src2, size_t step2, uchar* dst, size_t step, int width, int height, void* scale); +CV_EXPORTS void recip8s( const schar *, size_t, const schar * src2, size_t step2, schar* dst, size_t step, int width, int height, void* scale); +CV_EXPORTS void recip16u( const ushort *, size_t, const ushort * src2, size_t step2, ushort* dst, size_t step, int width, int height, void* scale); +CV_EXPORTS void recip16s( const short *, size_t, const short * src2, size_t step2, short* dst, size_t step, int width, int height, void* scale); +CV_EXPORTS void recip32s( const int *, size_t, const int * src2, size_t step2, int* dst, size_t step, int width, int height, void* scale); +CV_EXPORTS void recip32f( const float *, size_t, const float * src2, size_t step2, float* dst, size_t step, int width, int height, void* scale); +CV_EXPORTS void recip64f( const double *, size_t, const double * src2, size_t step2, double* dst, size_t step, int width, int height, void* scale); CV_EXPORTS void addWeighted8u( const uchar* src1, size_t step1, const uchar* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* _scalars ); CV_EXPORTS void addWeighted8s( const schar* src1, size_t step1, const schar* src2, size_t step2, schar* dst, size_t step, int width, int height, void* scalars ); diff --git a/modules/core/include/opencv2/core/hal/interface.h b/modules/core/include/opencv2/core/hal/interface.h index 51f7606108..ba3f55c335 100644 --- a/modules/core/include/opencv2/core/hal/interface.h +++ b/modules/core/include/opencv2/core/hal/interface.h @@ -1,19 +1,16 @@ -#ifndef _HAL_INTERFACE_HPP_INCLUDED_ -#define _HAL_INTERFACE_HPP_INCLUDED_ +#ifndef OPENCV_CORE_HAL_INTERFACE_H +#define OPENCV_CORE_HAL_INTERFACE_H //! @addtogroup core_hal_interface //! @{ +//! @name Return codes +//! @{ #define CV_HAL_ERROR_OK 0 #define CV_HAL_ERROR_NOT_IMPLEMENTED 1 #define CV_HAL_ERROR_UNKNOWN -1 +//! @} -#define CV_HAL_CMP_EQ 0 -#define CV_HAL_CMP_GT 1 -#define CV_HAL_CMP_GE 2 -#define CV_HAL_CMP_LT 3 -#define CV_HAL_CMP_LE 4 -#define CV_HAL_CMP_NE 5 #ifdef __cplusplus #include @@ -21,18 +18,17 @@ #include #endif -/* primitive types */ -/* - schar - signed 1 byte integer - uchar - unsigned 1 byte integer - short - signed 2 byte integer - ushort - unsigned 2 byte integer - int - signed 4 byte integer - uint - unsigned 4 byte integer - int64 - signed 8 byte integer - uint64 - unsigned 8 byte integer -*/ - +//! @name Data types +//! primitive types +//! - schar - signed 1 byte integer +//! - uchar - unsigned 1 byte integer +//! - short - signed 2 byte integer +//! - ushort - unsigned 2 byte integer +//! - int - signed 4 byte integer +//! - uint - unsigned 4 byte integer +//! - int64 - signed 8 byte integer +//! - uint64 - unsigned 8 byte integer +//! @{ #if !defined _MSC_VER && !defined __BORLANDC__ # if defined __cplusplus && __cplusplus >= 201103L && !defined __APPLE__ # include @@ -64,6 +60,91 @@ typedef signed char schar; # define CV_BIG_UINT(n) n##ULL #endif +#define CV_CN_MAX 512 +#define CV_CN_SHIFT 3 +#define CV_DEPTH_MAX (1 << CV_CN_SHIFT) + +#define CV_8U 0 +#define CV_8S 1 +#define CV_16U 2 +#define CV_16S 3 +#define CV_32S 4 +#define CV_32F 5 +#define CV_64F 6 +#define CV_USRTYPE1 7 + +#define CV_MAT_DEPTH_MASK (CV_DEPTH_MAX - 1) +#define CV_MAT_DEPTH(flags) ((flags) & CV_MAT_DEPTH_MASK) + +#define CV_MAKETYPE(depth,cn) (CV_MAT_DEPTH(depth) + (((cn)-1) << CV_CN_SHIFT)) +#define CV_MAKE_TYPE CV_MAKETYPE + +#define CV_8UC1 CV_MAKETYPE(CV_8U,1) +#define CV_8UC2 CV_MAKETYPE(CV_8U,2) +#define CV_8UC3 CV_MAKETYPE(CV_8U,3) +#define CV_8UC4 CV_MAKETYPE(CV_8U,4) +#define CV_8UC(n) CV_MAKETYPE(CV_8U,(n)) + +#define CV_8SC1 CV_MAKETYPE(CV_8S,1) +#define CV_8SC2 CV_MAKETYPE(CV_8S,2) +#define CV_8SC3 CV_MAKETYPE(CV_8S,3) +#define CV_8SC4 CV_MAKETYPE(CV_8S,4) +#define CV_8SC(n) CV_MAKETYPE(CV_8S,(n)) + +#define CV_16UC1 CV_MAKETYPE(CV_16U,1) +#define CV_16UC2 CV_MAKETYPE(CV_16U,2) +#define CV_16UC3 CV_MAKETYPE(CV_16U,3) +#define CV_16UC4 CV_MAKETYPE(CV_16U,4) +#define CV_16UC(n) CV_MAKETYPE(CV_16U,(n)) + +#define CV_16SC1 CV_MAKETYPE(CV_16S,1) +#define CV_16SC2 CV_MAKETYPE(CV_16S,2) +#define CV_16SC3 CV_MAKETYPE(CV_16S,3) +#define CV_16SC4 CV_MAKETYPE(CV_16S,4) +#define CV_16SC(n) CV_MAKETYPE(CV_16S,(n)) + +#define CV_32SC1 CV_MAKETYPE(CV_32S,1) +#define CV_32SC2 CV_MAKETYPE(CV_32S,2) +#define CV_32SC3 CV_MAKETYPE(CV_32S,3) +#define CV_32SC4 CV_MAKETYPE(CV_32S,4) +#define CV_32SC(n) CV_MAKETYPE(CV_32S,(n)) + +#define CV_32FC1 CV_MAKETYPE(CV_32F,1) +#define CV_32FC2 CV_MAKETYPE(CV_32F,2) +#define CV_32FC3 CV_MAKETYPE(CV_32F,3) +#define CV_32FC4 CV_MAKETYPE(CV_32F,4) +#define CV_32FC(n) CV_MAKETYPE(CV_32F,(n)) + +#define CV_64FC1 CV_MAKETYPE(CV_64F,1) +#define CV_64FC2 CV_MAKETYPE(CV_64F,2) +#define CV_64FC3 CV_MAKETYPE(CV_64F,3) +#define CV_64FC4 CV_MAKETYPE(CV_64F,4) +#define CV_64FC(n) CV_MAKETYPE(CV_64F,(n)) +//! @} + +//! @name Comparison operation +//! @sa cv::CmpTypes +//! @{ +#define CV_HAL_CMP_EQ 0 +#define CV_HAL_CMP_GT 1 +#define CV_HAL_CMP_GE 2 +#define CV_HAL_CMP_LT 3 +#define CV_HAL_CMP_LE 4 +#define CV_HAL_CMP_NE 5 +//! @} + +//! @name Border processing modes +//! @sa cv::BorderTypes +//! @{ +#define CV_HAL_BORDER_CONSTANT 0 +#define CV_HAL_BORDER_REPLICATE 1 +#define CV_HAL_BORDER_REFLECT 2 +#define CV_HAL_BORDER_WRAP 3 +#define CV_HAL_BORDER_REFLECT_101 4 +#define CV_HAL_BORDER_TRANSPARENT 5 +#define CV_HAL_BORDER_ISOLATED 16 +//! @} + //! @} #endif diff --git a/modules/core/src/arithm.cpp b/modules/core/src/arithm.cpp index c3acca054d..8ef3370bde 100644 --- a/modules/core/src/arithm.cpp +++ b/modules/core/src/arithm.cpp @@ -3123,7 +3123,7 @@ void div8u( const uchar* src1, size_t step1, const uchar* src2, size_t step2, if( src1 ) div_i(src1, step1, src2, step2, dst, step, width, height, *(const double*)scale); else - recip_i(src1, step1, src2, step2, dst, step, width, height, *(const double*)scale); + recip_i(src2, step2, dst, step, width, height, *(const double*)scale); } void div8s( const schar* src1, size_t step1, const schar* src2, size_t step2, @@ -3172,53 +3172,53 @@ void div64f( const double* src1, size_t step1, const double* src2, size_t step2, // Reciprocial //======================================= -void recip8u( const uchar* src1, size_t step1, const uchar* src2, size_t step2, +void recip8u( const uchar*, size_t, const uchar* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* scale) { - CALL_HAL(recip8u, cv_hal_recip8u, src1, step1, src2, step2, dst, step, width, height, *(const double*)scale) - recip_i(src1, step1, src2, step2, dst, step, width, height, *(const double*)scale); + CALL_HAL(recip8u, cv_hal_recip8u, src2, step2, dst, step, width, height, *(const double*)scale) + recip_i(src2, step2, dst, step, width, height, *(const double*)scale); } -void recip8s( const schar* src1, size_t step1, const schar* src2, size_t step2, +void recip8s( const schar*, size_t, const schar* src2, size_t step2, schar* dst, size_t step, int width, int height, void* scale) { - CALL_HAL(recip8s, cv_hal_recip8s, src1, step1, src2, step2, dst, step, width, height, *(const double*)scale) - recip_i(src1, step1, src2, step2, dst, step, width, height, *(const double*)scale); + CALL_HAL(recip8s, cv_hal_recip8s, src2, step2, dst, step, width, height, *(const double*)scale) + recip_i(src2, step2, dst, step, width, height, *(const double*)scale); } -void recip16u( const ushort* src1, size_t step1, const ushort* src2, size_t step2, +void recip16u( const ushort*, size_t, const ushort* src2, size_t step2, ushort* dst, size_t step, int width, int height, void* scale) { - CALL_HAL(recip16u, cv_hal_recip16u, src1, step1, src2, step2, dst, step, width, height, *(const double*)scale) - recip_i(src1, step1, src2, step2, dst, step, width, height, *(const double*)scale); + CALL_HAL(recip16u, cv_hal_recip16u, src2, step2, dst, step, width, height, *(const double*)scale) + recip_i(src2, step2, dst, step, width, height, *(const double*)scale); } -void recip16s( const short* src1, size_t step1, const short* src2, size_t step2, +void recip16s( const short*, size_t, const short* src2, size_t step2, short* dst, size_t step, int width, int height, void* scale) { - CALL_HAL(recip16s, cv_hal_recip16s, src1, step1, src2, step2, dst, step, width, height, *(const double*)scale) - recip_i(src1, step1, src2, step2, dst, step, width, height, *(const double*)scale); + CALL_HAL(recip16s, cv_hal_recip16s, src2, step2, dst, step, width, height, *(const double*)scale) + recip_i(src2, step2, dst, step, width, height, *(const double*)scale); } -void recip32s( const int* src1, size_t step1, const int* src2, size_t step2, +void recip32s( const int*, size_t, const int* src2, size_t step2, int* dst, size_t step, int width, int height, void* scale) { - CALL_HAL(recip32s, cv_hal_recip32s, src1, step1, src2, step2, dst, step, width, height, *(const double*)scale) - recip_i(src1, step1, src2, step2, dst, step, width, height, *(const double*)scale); + CALL_HAL(recip32s, cv_hal_recip32s, src2, step2, dst, step, width, height, *(const double*)scale) + recip_i(src2, step2, dst, step, width, height, *(const double*)scale); } -void recip32f( const float* src1, size_t step1, const float* src2, size_t step2, +void recip32f( const float*, size_t, const float* src2, size_t step2, float* dst, size_t step, int width, int height, void* scale) { - CALL_HAL(recip32f, cv_hal_recip32f, src1, step1, src2, step2, dst, step, width, height, *(const double*)scale) - recip_f(src1, step1, src2, step2, dst, step, width, height, *(const double*)scale); + CALL_HAL(recip32f, cv_hal_recip32f, src2, step2, dst, step, width, height, *(const double*)scale) + recip_f(src2, step2, dst, step, width, height, *(const double*)scale); } -void recip64f( const double* src1, size_t step1, const double* src2, size_t step2, +void recip64f( const double*, size_t, const double* src2, size_t step2, double* dst, size_t step, int width, int height, void* scale) { - CALL_HAL(recip64f, cv_hal_recip64f, src1, step1, src2, step2, dst, step, width, height, *(const double*)scale) - recip_f(src1, step1, src2, step2, dst, step, width, height, *(const double*)scale); + CALL_HAL(recip64f, cv_hal_recip64f, src2, step2, dst, step, width, height, *(const double*)scale) + recip_f(src2, step2, dst, step, width, height, *(const double*)scale); } //======================================= diff --git a/modules/core/src/arithm_core.hpp b/modules/core/src/arithm_core.hpp index 4790586ebf..b92d47a817 100644 --- a/modules/core/src/arithm_core.hpp +++ b/modules/core/src/arithm_core.hpp @@ -528,7 +528,7 @@ div_f( const T* src1, size_t step1, const T* src2, size_t step2, } template static void -recip_i( const T*, size_t, const T* src2, size_t step2, +recip_i( const T* src2, size_t step2, T* dst, size_t step, int width, int height, double scale ) { step2 /= sizeof(src2[0]); @@ -549,7 +549,7 @@ recip_i( const T*, size_t, const T* src2, size_t step2, } template static void -recip_f( const T*, size_t, const T* src2, size_t step2, +recip_f( const T* src2, size_t step2, T* dst, size_t step, int width, int height, double scale ) { T scale_f = (T)scale; diff --git a/modules/core/src/hal_replacement.hpp b/modules/core/src/hal_replacement.hpp index 65866f8bfe..69345ca4af 100644 --- a/modules/core/src/hal_replacement.hpp +++ b/modules/core/src/hal_replacement.hpp @@ -42,51 +42,119 @@ // //M*/ -#ifndef __OPENCV_CORE_HAL_REPLACEMENT_HPP__ -#define __OPENCV_CORE_HAL_REPLACEMENT_HPP__ +#ifndef OPENCV_CORE_HAL_REPLACEMENT_HPP +#define OPENCV_CORE_HAL_REPLACEMENT_HPP #include "opencv2/core/hal/interface.h" -inline int hal_ni_add8u(const uchar*, size_t, const uchar*, size_t, uchar*, size_t, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_add8s(const schar*, size_t, const schar*, size_t, schar*, size_t, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_add16u(const ushort*, size_t, const ushort*, size_t, ushort*, size_t, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_add16s(const short*, size_t, const short*, size_t, short*, size_t, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_add32s(const int*, size_t, const int*, size_t, int*, size_t, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_add32f(const float*, size_t, const float*, size_t, float*, size_t, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_add64f(const double*, size_t, const double*, size_t, double*, size_t, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_sub8u(const uchar*, size_t, const uchar*, size_t, uchar*, size_t, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_sub8s(const schar*, size_t, const schar*, size_t, schar*, size_t, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_sub16u(const ushort*, size_t, const ushort*, size_t, ushort*, size_t, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_sub16s(const short*, size_t, const short*, size_t, short*, size_t, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_sub32s(const int*, size_t, const int*, size_t, int*, size_t, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_sub32f(const float*, size_t, const float*, size_t, float*, size_t, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_sub64f(const double*, size_t, const double*, size_t, double*, size_t, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_max8u(const uchar*, size_t, const uchar*, size_t, uchar*, size_t, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_max8s(const schar*, size_t, const schar*, size_t, schar*, size_t, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_max16u(const ushort*, size_t, const ushort*, size_t, ushort*, size_t, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_max16s(const short*, size_t, const short*, size_t, short*, size_t, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_max32s(const int*, size_t, const int*, size_t, int*, size_t, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_max32f(const float*, size_t, const float*, size_t, float*, size_t, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_max64f(const double*, size_t, const double*, size_t, double*, size_t, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_min8u(const uchar*, size_t, const uchar*, size_t, uchar*, size_t, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_min8s(const schar*, size_t, const schar*, size_t, schar*, size_t, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_min16u(const ushort*, size_t, const ushort*, size_t, ushort*, size_t, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_min16s(const short*, size_t, const short*, size_t, short*, size_t, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_min32s(const int*, size_t, const int*, size_t, int*, size_t, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_min32f(const float*, size_t, const float*, size_t, float*, size_t, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_min64f(const double*, size_t, const double*, size_t, double*, size_t, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_absdiff8u(const uchar*, size_t, const uchar*, size_t, uchar*, size_t, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_absdiff8s(const schar*, size_t, const schar*, size_t, schar*, size_t, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_absdiff16u(const ushort*, size_t, const ushort*, size_t, ushort*, size_t, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_absdiff16s(const short*, size_t, const short*, size_t, short*, size_t, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_absdiff32s(const int*, size_t, const int*, size_t, int*, size_t, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_absdiff32f(const float*, size_t, const float*, size_t, float*, size_t, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_absdiff64f(const double*, size_t, const double*, size_t, double*, size_t, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_and8u(const uchar*, size_t, const uchar*, size_t, uchar*, size_t, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_or8u(const uchar*, size_t, const uchar*, size_t, uchar*, size_t, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_xor8u(const uchar*, size_t, const uchar*, size_t, uchar*, size_t, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_not8u(const uchar*, size_t, uchar*, size_t, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +#if defined __GNUC__ +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wunused-parameter" +#elif defined _MSC_VER +# pragma warning( push ) +# pragma warning( disable: 4100 ) +#endif +//! @addtogroup core_hal_interface +//! @note Define your functions to override default implementations: +//! @code +//! #undef hal_add8u +//! #define hal_add8u my_add8u +//! @endcode +//! @{ + +/** +Add: _dst[i] = src1[i] + src2[i]_ @n +Sub: _dst[i] = src1[i] - src2[i]_ +@param src1_data,src1_step first source image data and step +@param src2_data,src2_step second source image data and step +@param dst_data,dst_step destination image data and step +@param width,height dimensions of the images +*/ +//! @addtogroup core_hal_interface_addsub Element-wise add and subtract +//! @{ +inline int hal_ni_add8u(const uchar *src1_data, size_t src1_step, const uchar *src2_data, size_t src2_step, uchar *dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_add8s(const schar *src1_data, size_t src1_step, const schar *src2_data, size_t src2_step, schar *dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_add16u(const ushort *src1_data, size_t src1_step, const ushort *src2_data, size_t src2_step, ushort *dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_add16s(const short *src1_data, size_t src1_step, const short *src2_data, size_t src2_step, short *dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_add32s(const int *src1_data, size_t src1_step, const int *src2_data, size_t src2_step, int *dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_add32f(const float *src1_data, size_t src1_step, const float *src2_data, size_t src2_step, float *dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_add64f(const double *src1_data, size_t src1_step, const double *src2_data, size_t src2_step, double *dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } + +inline int hal_ni_sub8u(const uchar *src1_data, size_t src1_step, const uchar *src2_data, size_t src2_step, uchar *dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_sub8s(const schar *src1_data, size_t src1_step, const schar *src2_data, size_t src2_step, schar *dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_sub16u(const ushort *src1_data, size_t src1_step, const ushort *src2_data, size_t src2_step, ushort *dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_sub16s(const short *src1_data, size_t src1_step, const short *src2_data, size_t src2_step, short *dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_sub32s(const int *src1_data, size_t src1_step, const int *src2_data, size_t src2_step, int *dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_sub32f(const float *src1_data, size_t src1_step, const float *src2_data, size_t src2_step, float *dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_sub64f(const double *src1_data, size_t src1_step, const double *src2_data, size_t src2_step, double *dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +//! @} + +/** +Minimum: _dst[i] = min(src1[i], src2[i])_ @n +Maximum: _dst[i] = max(src1[i], src2[i])_ +@param src1_data,src1_step first source image data and step +@param src2_data,src2_step second source image data and step +@param dst_data,dst_step destination image data and step +@param width,height dimensions of the images +*/ +//! @addtogroup core_hal_interface_minmax Element-wise minimum or maximum +//! @{ +inline int hal_ni_max8u(const uchar *src1_data, size_t src1_step, const uchar *src2_data, size_t src2_step, uchar *dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_max8s(const schar *src1_data, size_t src1_step, const schar *src2_data, size_t src2_step, schar *dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_max16u(const ushort *src1_data, size_t src1_step, const ushort *src2_data, size_t src2_step, ushort *dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_max16s(const short *src1_data, size_t src1_step, const short *src2_data, size_t src2_step, short *dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_max32s(const int *src1_data, size_t src1_step, const int *src2_data, size_t src2_step, int *dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_max32f(const float *src1_data, size_t src1_step, const float *src2_data, size_t src2_step, float *dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_max64f(const double *src1_data, size_t src1_step, const double *src2_data, size_t src2_step, double *dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } + +inline int hal_ni_min8u(const uchar *src1_data, size_t src1_step, const uchar *src2_data, size_t src2_step, uchar *dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_min8s(const schar *src1_data, size_t src1_step, const schar *src2_data, size_t src2_step, schar *dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_min16u(const ushort *src1_data, size_t src1_step, const ushort *src2_data, size_t src2_step, ushort *dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_min16s(const short *src1_data, size_t src1_step, const short *src2_data, size_t src2_step, short *dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_min32s(const int *src1_data, size_t src1_step, const int *src2_data, size_t src2_step, int *dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_min32f(const float *src1_data, size_t src1_step, const float *src2_data, size_t src2_step, float *dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_min64f(const double *src1_data, size_t src1_step, const double *src2_data, size_t src2_step, double *dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +//! @} + +/** +Absolute difference: _dst[i] = | src1[i] - src2[i] |_ +@param src1_data,src1_step first source image data and step +@param src2_data,src2_step second source image data and step +@param dst_data,dst_step destination image data and step +@param width,height dimensions of the images +@param scale additional multiplier +*/ +//! @addtogroup core_hal_interface_absdiff Element-wise absolute difference +//! @{ +inline int hal_ni_absdiff8u(const uchar *src1_data, size_t src1_step, const uchar *src2_data, size_t src2_step, uchar *dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_absdiff8s(const schar *src1_data, size_t src1_step, const schar *src2_data, size_t src2_step, schar *dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_absdiff16u(const ushort *src1_data, size_t src1_step, const ushort *src2_data, size_t src2_step, ushort *dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_absdiff16s(const short *src1_data, size_t src1_step, const short *src2_data, size_t src2_step, short *dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_absdiff32s(const int *src1_data, size_t src1_step, const int *src2_data, size_t src2_step, int *dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_absdiff32f(const float *src1_data, size_t src1_step, const float *src2_data, size_t src2_step, float *dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_absdiff64f(const double *src1_data, size_t src1_step, const double *src2_data, size_t src2_step, double *dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +//! @} + +/** +Bitwise AND: _dst[i] = src1[i] & src2[i]_ @n +Bitwise OR: _dst[i] = src1[i] | src2[i]_ @n +Bitwise XOR: _dst[i] = src1[i] ^ src2[i]_ @n +Bitwise NOT: _dst[i] = !src[i]_ +@param src1_data,src1_step first source image data and step +@param src2_data,src2_step second source image data and step +@param dst_data,dst_step destination image data and step +@param width,height dimensions of the images + */ +//! @addtogroup core_hal_interface_logical Bitwise logical operations +//! @{ +inline int hal_ni_and8u(const uchar *src1_data, size_t src1_step, const uchar *src2_data, size_t src2_step, uchar *dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_or8u(const uchar *src1_data, size_t src1_step, const uchar *src2_data, size_t src2_step, uchar *dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_xor8u(const uchar *src1_data, size_t src1_step, const uchar *src2_data, size_t src2_step, uchar *dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_not8u(const uchar *src_data, size_t src_step, uchar *dst_data, size_t dst_step, int width, int height) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +//! @} + +//! @cond IGNORED #define cv_hal_add8u hal_ni_add8u #define cv_hal_add8s hal_ni_add8s #define cv_hal_add16u hal_ni_add16u @@ -126,15 +194,28 @@ inline int hal_ni_not8u(const uchar*, size_t, uchar*, size_t, int, int) { return #define cv_hal_or8u hal_ni_or8u #define cv_hal_xor8u hal_ni_xor8u #define cv_hal_not8u hal_ni_not8u +//! @endcond -inline int hal_ni_cmp8u(const uchar*, size_t, const uchar*, size_t, uchar*, size_t, int, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_cmp8s(const schar*, size_t, const schar*, size_t, uchar*, size_t, int, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_cmp16u(const ushort*, size_t, const ushort*, size_t, uchar*, size_t, int, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_cmp16s(const short*, size_t, const short*, size_t, uchar*, size_t, int, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_cmp32s(const int*, size_t, const int*, size_t, uchar*, size_t, int, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_cmp32f(const float*, size_t, const float*, size_t, uchar*, size_t, int, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_cmp64f(const double*, size_t, const double*, size_t, uchar*, size_t, int, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +/** +Compare: _dst[i] = src1[i] op src2[i]_ +@param src1_data,src1_step first source image data and step +@param src2_data,src2_step second source image data and step +@param dst_data,dst_step destination image data and step +@param width,height dimensions of the images +@param operation one of (CV_HAL_CMP_EQ, CV_HAL_CMP_GT, ...) +*/ +//! @addtogroup core_hal_interface_compare Element-wise compare +//! @{ +inline int hal_ni_cmp8u(const uchar *src1_data, size_t src1_step, const uchar *src2_data, size_t src2_step, uchar *dst_data, size_t dst_step, int width, int height, int operation) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_cmp8s(const schar *src1_data, size_t src1_step, const schar *src2_data, size_t src2_step, uchar *dst_data, size_t dst_step, int width, int height, int operation) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_cmp16u(const ushort *src1_data, size_t src1_step, const ushort *src2_data, size_t src2_step, uchar *dst_data, size_t dst_step, int width, int height, int operation) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_cmp16s(const short *src1_data, size_t src1_step, const short *src2_data, size_t src2_step, uchar *dst_data, size_t dst_step, int width, int height, int operation) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_cmp32s(const int *src1_data, size_t src1_step, const int *src2_data, size_t src2_step, uchar *dst_data, size_t dst_step, int width, int height, int operation) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_cmp32f(const float *src1_data, size_t src1_step, const float *src2_data, size_t src2_step, uchar *dst_data, size_t dst_step, int width, int height, int operation) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_cmp64f(const double *src1_data, size_t src1_step, const double *src2_data, size_t src2_step, uchar *dst_data, size_t dst_step, int width, int height, int operation) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +//! @} +//! @cond IGNORED #define cv_hal_cmp8u hal_ni_cmp8u #define cv_hal_cmp8s hal_ni_cmp8s #define cv_hal_cmp16u hal_ni_cmp16u @@ -142,29 +223,65 @@ inline int hal_ni_cmp64f(const double*, size_t, const double*, size_t, uchar*, s #define cv_hal_cmp32s hal_ni_cmp32s #define cv_hal_cmp32f hal_ni_cmp32f #define cv_hal_cmp64f hal_ni_cmp64f +//! @endcond -inline int hal_ni_mul8u(const uchar*, size_t, const uchar*, size_t, uchar*, size_t, int, int, double) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_mul8s(const schar*, size_t, const schar*, size_t, schar*, size_t, int, int, double) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_mul16u(const ushort*, size_t, const ushort*, size_t, ushort*, size_t, int, int, double) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_mul16s(const short*, size_t, const short*, size_t, short*, size_t, int, int, double) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_mul32s(const int*, size_t, const int*, size_t, int*, size_t, int, int, double) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_mul32f(const float*, size_t, const float*, size_t, float*, size_t, int, int, double) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_mul64f(const double*, size_t, const double*, size_t, double*, size_t, int, int, double) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_div8u(const uchar*, size_t, const uchar*, size_t, uchar*, size_t, int, int, double) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_div8s(const schar*, size_t, const schar*, size_t, schar*, size_t, int, int, double) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_div16u(const ushort*, size_t, const ushort*, size_t, ushort*, size_t, int, int, double) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_div16s(const short*, size_t, const short*, size_t, short*, size_t, int, int, double) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_div32s(const int*, size_t, const int*, size_t, int*, size_t, int, int, double) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_div32f(const float*, size_t, const float*, size_t, float*, size_t, int, int, double) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_div64f(const double*, size_t, const double*, size_t, double*, size_t, int, int, double) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_recip8u(const uchar*, size_t, const uchar*, size_t, uchar*, size_t, int, int, double) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_recip8s(const schar*, size_t, const schar*, size_t, schar*, size_t, int, int, double) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_recip16u(const ushort*, size_t, const ushort*, size_t, ushort*, size_t, int, int, double) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_recip16s(const short*, size_t, const short*, size_t, short*, size_t, int, int, double) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_recip32s(const int*, size_t, const int*, size_t, int*, size_t, int, int, double) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_recip32f(const float*, size_t, const float*, size_t, float*, size_t, int, int, double) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_recip64f(const double*, size_t, const double*, size_t, double*, size_t, int, int, double) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +/** +Multiply: _dst[i] = scale * src1[i] * src2[i]_ +@param src1_data,src1_step first source image data and step +@param src2_data,src2_step second source image data and step +@param dst_data,dst_step destination image data and step +@param width,height dimensions of the images +@param scale additional multiplier +*/ +//! @addtogroup core_hal_interface_multiply Element-wise multiply +//! @{ +inline int hal_ni_mul8u(const uchar *src1_data, size_t src1_step, const uchar *src2_data, size_t src2_step, uchar *dst_data, size_t dst_step, int width, int height, double scale) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_mul8s(const schar *src1_data, size_t src1_step, const schar *src2_data, size_t src2_step, schar *dst_data, size_t dst_step, int width, int height, double scale) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_mul16u(const ushort *src1_data, size_t src1_step, const ushort *src2_data, size_t src2_step, ushort *dst_data, size_t dst_step, int width, int height, double scale) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_mul16s(const short *src1_data, size_t src1_step, const short *src2_data, size_t src2_step, short *dst_data, size_t dst_step, int width, int height, double scale) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_mul32s(const int *src1_data, size_t src1_step, const int *src2_data, size_t src2_step, int *dst_data, size_t dst_step, int width, int height, double scale) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_mul32f(const float *src1_data, size_t src1_step, const float *src2_data, size_t src2_step, float *dst_data, size_t dst_step, int width, int height, double scale) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_mul64f(const double *src1_data, size_t src1_step, const double *src2_data, size_t src2_step, double *dst_data, size_t dst_step, int width, int height, double scale) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +//! @} +/** +Divide: _dst[i] = scale * src1[i] / src2[i]_ +@param src1_data,src1_step first source image data and step +@param src2_data,src2_step second source image data and step +@param dst_data,dst_step destination image data and step +@param width,height dimensions of the images +@param scale additional multiplier +*/ +//! @addtogroup core_hal_interface_divide Element-wise divide +//! @{ +inline int hal_ni_div8u(const uchar *src1_data, size_t src1_step, const uchar *src2_data, size_t src2_step, uchar *dst_data, size_t dst_step, int width, int height, double scale) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_div8s(const schar *src1_data, size_t src1_step, const schar *src2_data, size_t src2_step, schar *dst_data, size_t dst_step, int width, int height, double scale) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_div16u(const ushort *src1_data, size_t src1_step, const ushort *src2_data, size_t src2_step, ushort *dst_data, size_t dst_step, int width, int height, double scale) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_div16s(const short *src1_data, size_t src1_step, const short *src2_data, size_t src2_step, short *dst_data, size_t dst_step, int width, int height, double scale) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_div32s(const int *src1_data, size_t src1_step, const int *src2_data, size_t src2_step, int *dst_data, size_t dst_step, int width, int height, double scale) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_div32f(const float *src1_data, size_t src1_step, const float *src2_data, size_t src2_step, float *dst_data, size_t dst_step, int width, int height, double scale) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_div64f(const double *src1_data, size_t src1_step, const double *src2_data, size_t src2_step, double *dst_data, size_t dst_step, int width, int height, double scale) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +//! @} + +/** +Computes reciprocial: _dst[i] = scale / src[i]_ +@param src_data,src_step source image data and step +@param dst_data,dst_step destination image data and step +@param width,height dimensions of the images +@param scale additional multiplier + */ +//! @addtogroup core_hal_interface_reciprocial Element-wise reciprocial +//! @{ +inline int hal_ni_recip8u(const uchar *src_data, size_t src_step, uchar *dst_data, size_t dst_step, int width, int height, double scale) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_recip8s(const schar *src_data, size_t src_step, schar *dst_data, size_t dst_step, int width, int height, double scale) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_recip16u(const ushort *src_data, size_t src_step, ushort *dst_data, size_t dst_step, int width, int height, double scale) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_recip16s(const short *src_data, size_t src_step, short *dst_data, size_t dst_step, int width, int height, double scale) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_recip32s(const int *src_data, size_t src_step, int *dst_data, size_t dst_step, int width, int height, double scale) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_recip32f(const float *src_data, size_t src_step, float *dst_data, size_t dst_step, int width, int height, double scale) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_recip64f(const double *src_data, size_t src_step, double *dst_data, size_t dst_step, int width, int height, double scale) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +//! @} + +//! @cond IGNORED #define cv_hal_mul8u hal_ni_mul8u #define cv_hal_mul8s hal_ni_mul8s #define cv_hal_mul16u hal_ni_mul16u @@ -186,15 +303,28 @@ inline int hal_ni_recip64f(const double*, size_t, const double*, size_t, double* #define cv_hal_recip32s hal_ni_recip32s #define cv_hal_recip32f hal_ni_recip32f #define cv_hal_recip64f hal_ni_recip64f +//! @endcond -inline int hal_ni_addWeighted8u(const uchar*, size_t, const uchar*, size_t, uchar*, size_t, int, int, const double*) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_addWeighted8s(const schar*, size_t, const schar*, size_t, schar*, size_t, int, int, const double*) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_addWeighted16u(const ushort*, size_t, const ushort*, size_t, ushort*, size_t, int, int, const double*) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_addWeighted16s(const short*, size_t, const short*, size_t, short*, size_t, int, int, const double*) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_addWeighted32s(const int*, size_t, const int*, size_t, int*, size_t, int, int, const double*) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_addWeighted32f(const float*, size_t, const float*, size_t, float*, size_t, int, int, const double*) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_addWeighted64f(const double*, size_t, const double*, size_t, double*, size_t, int, int, const double*) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +/** +Computes weighted sum of two arrays using formula: _dst[i] = a * src1[i] + b * src2[i] + c_ +@param src1_data,src1_step first source image data and step +@param src2_data,src2_step second source image data and step +@param dst_data,dst_step destination image data and step +@param width,height dimensions of the images +@param scalars numbers _a_, _b_, and _c_ + */ +//! @addtogroup core_hal_interface_addWeighted Element-wise weighted sum +//! @{ +inline int hal_ni_addWeighted8u(const uchar *src1_data, size_t src1_step, const uchar *src2_data, size_t src2_step, uchar *dst_data, size_t dst_step, int width, int height, const double scalars[3]) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_addWeighted8s(const schar *src1_data, size_t src1_step, const schar *src2_data, size_t src2_step, schar *dst_data, size_t dst_step, int width, int height, const double scalars[3]) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_addWeighted16u(const ushort *src1_data, size_t src1_step, const ushort *src2_data, size_t src2_step, ushort *dst_data, size_t dst_step, int width, int height, const double scalars[3]) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_addWeighted16s(const short *src1_data, size_t src1_step, const short *src2_data, size_t src2_step, short *dst_data, size_t dst_step, int width, int height, const double scalars[3]) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_addWeighted32s(const int *src1_data, size_t src1_step, const int *src2_data, size_t src2_step, int *dst_data, size_t dst_step, int width, int height, const double scalars[3]) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_addWeighted32f(const float *src1_data, size_t src1_step, const float *src2_data, size_t src2_step, float *dst_data, size_t dst_step, int width, int height, const double scalars[3]) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_addWeighted64f(const double *src1_data, size_t src1_step, const double *src2_data, size_t src2_step, double *dst_data, size_t dst_step, int width, int height, const double scalars[3]) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +//! @} +//! @cond IGNORED #define cv_hal_addWeighted8u hal_ni_addWeighted8u #define cv_hal_addWeighted8s hal_ni_addWeighted8s #define cv_hal_addWeighted16u hal_ni_addWeighted16u @@ -202,26 +332,57 @@ inline int hal_ni_addWeighted64f(const double*, size_t, const double*, size_t, d #define cv_hal_addWeighted32s hal_ni_addWeighted32s #define cv_hal_addWeighted32f hal_ni_addWeighted32f #define cv_hal_addWeighted64f hal_ni_addWeighted64f +//! @endcond -inline int hal_ni_split8u(const uchar*, uchar**, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_split16u(const ushort*, ushort**, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_split32s(const int*, int**, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_split64s(const int64*, int64**, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +/** +@param src_data array of interleaved values (__len__ x __cn__ items) [ B, G, R, B, G, R, ...] +@param dst_data array of pointers to destination arrays (__cn__ items x __len__ items) [ [B, B, ...], [G, G, ...], [R, R, ...] ] +@param len number of elements +@param cn number of channels + */ +//! @addtogroup core_hal_interface_split Channel split +//! @{ +inline int hal_ni_split8u(const uchar *src_data, uchar **dst_data, int len, int cn) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_split16u(const ushort *src_data, ushort **dst_data, int len, int cn) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_split32s(const int *src_data, int **dst_data, int len, int cn) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_split64s(const int64 *src_data, int64 **dst_data, int len, int cn) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +//! @} +//! @cond IGNORED #define cv_hal_split8u hal_ni_split8u #define cv_hal_split16u hal_ni_split16u #define cv_hal_split32s hal_ni_split32s #define cv_hal_split64s hal_ni_split64s +//! @endcond -inline int hal_ni_merge8u(const uchar**, uchar*, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_merge16u(const ushort**, ushort*, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_merge32s(const int**, int*, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_merge64s(const int64**, int64*, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +/** +@param src_data array of pointers to source arrays (__cn__ items x __len__ items) [ [B, B, ...], [G, G, ...], [R, R, ...] ] +@param dst_data destination array of interleaved values (__len__ x __cn__ items) [ B, G, R, B, G, R, ...] +@param len number of elements +@param cn number of channels + */ +//! @addtogroup core_hal_interface_merge Channel merge +//! @{ +inline int hal_ni_merge8u(const uchar **src_data, uchar *dst_data, int len, int cn) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_merge16u(const ushort **src_data, ushort *dst_data, int len, int cn) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_merge32s(const int **src_data, int *dst_data, int len, int cn) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +inline int hal_ni_merge64s(const int64 **src_data, int64 *dst_data, int len, int cn) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +//! @} +//! @cond IGNORED #define cv_hal_merge8u hal_ni_merge8u #define cv_hal_merge16u hal_ni_merge16u #define cv_hal_merge32s hal_ni_merge32s #define cv_hal_merge64s hal_ni_merge64s +//! @endcond + +//! @} + +#if defined __GNUC__ +# pragma GCC diagnostic pop +#elif defined _MSC_VER +# pragma warning( pop ) +#endif #include "custom_hal.hpp" diff --git a/modules/imgproc/include/opencv2/imgproc.hpp b/modules/imgproc/include/opencv2/imgproc.hpp index e1f9348b19..6d9ffb4908 100644 --- a/modules/imgproc/include/opencv2/imgproc.hpp +++ b/modules/imgproc/include/opencv2/imgproc.hpp @@ -213,6 +213,11 @@ location of points on the plane, building special graphs (such as NNG,RNG), and @defgroup imgproc_feature Feature Detection @defgroup imgproc_object Object Detection @defgroup imgproc_c C API + @defgroup imgproc_hal Hardware Acceleration Layer + @{ + @defgroup imgproc_hal_functions Functions + @defgroup imgproc_hal_interface Interface + @} @} */ diff --git a/modules/imgproc/include/opencv2/imgproc/hal/hal.hpp b/modules/imgproc/include/opencv2/imgproc/hal/hal.hpp index eca34e7e73..6ed492bcb6 100644 --- a/modules/imgproc/include/opencv2/imgproc/hal/hal.hpp +++ b/modules/imgproc/include/opencv2/imgproc/hal/hal.hpp @@ -7,7 +7,7 @@ namespace cv { namespace hal { -//! @addtogroup core_hal_functions +//! @addtogroup imgproc_hal_functions //! @{ struct CV_EXPORTS Filter2D @@ -45,9 +45,9 @@ struct CV_EXPORTS SepFilter2D }; -struct CV_EXPORTS MorphContext +struct CV_EXPORTS Morph { - static Ptr create(int op, int src_type, int dst_type, int max_width, int max_height, + static Ptr create(int op, int src_type, int dst_type, int max_width, int max_height, int kernel_type, uchar * kernel_data, size_t kernel_step, int kernel_width, int kernel_height, int anchor_x, int anchor_y, @@ -56,10 +56,25 @@ struct CV_EXPORTS MorphContext virtual void apply(uchar * src_data, size_t src_step, uchar * dst_data, size_t dst_step, int width, int height, int roi_width, int roi_height, int roi_x, int roi_y, int roi_width2, int roi_height2, int roi_x2, int roi_y2) = 0; - virtual ~MorphContext() {} + virtual ~Morph() {} }; +CV_EXPORTS void resize(int src_type, + const uchar * src_data, size_t src_step, int src_width, int src_height, + uchar * dst_data, size_t dst_step, int dst_width, int dst_height, + double inv_scale_x, double inv_scale_y, int interpolation); + +CV_EXPORTS void warpAffine(int src_type, + const uchar * src_data, size_t src_step, int src_width, int src_height, + uchar * dst_data, size_t dst_step, int dst_width, int dst_height, + const double M[6], int interpolation, int borderType, const double borderValue[4]); + +CV_EXPORTS void warpPerspectve(int src_type, + const uchar * src_data, size_t src_step, int src_width, int src_height, + uchar * dst_data, size_t dst_step, int dst_width, int dst_height, + const double M[9], int interpolation, int borderType, const double borderValue[4]); + //! @} }} diff --git a/modules/imgproc/include/opencv2/imgproc/hal/interface.h b/modules/imgproc/include/opencv2/imgproc/hal/interface.h new file mode 100644 index 0000000000..9d2a3e5d5a --- /dev/null +++ b/modules/imgproc/include/opencv2/imgproc/hal/interface.h @@ -0,0 +1,26 @@ +#ifndef OPENCV_IMGPROC_HAL_INTERFACE_H +#define OPENCV_IMGPROC_HAL_INTERFACE_H + +//! @addtogroup imgproc_hal_interface +//! @{ + +//! @name Interpolation modes +//! @sa cv::InterpolationFlags +//! @{ +#define CV_HAL_INTER_NEAREST 0 +#define CV_HAL_INTER_LINEAR 1 +#define CV_HAL_INTER_CUBIC 2 +#define CV_HAL_INTER_AREA 3 +#define CV_HAL_INTER_LANCZOS4 4 +//! @} + +//! @name Morphology operations +//! @sa cv::MorphTypes +//! @{ +#define MORPH_ERODE 0 +#define MORPH_DILATE 1 +//! @} + +//! @} + +#endif diff --git a/modules/imgproc/src/hal_replacement.hpp b/modules/imgproc/src/hal_replacement.hpp index e043c4027b..2b681f6cf7 100644 --- a/modules/imgproc/src/hal_replacement.hpp +++ b/modules/imgproc/src/hal_replacement.hpp @@ -1,34 +1,312 @@ +/*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) 2000-2008, Intel Corporation, all rights reserved. +// Copyright (C) 2009, Willow Garage Inc., all rights reserved. +// Copyright (C) 2013, OpenCV Foundation, all rights reserved. +// Copyright (C) 2015, Itseez Inc., all rights reserved. +// Third party copyrights are property of their respective owners. +// +// 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 materials 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*/ + #ifndef OPENCV_IMGPROC_HAL_REPLACEMENT_HPP #define OPENCV_IMGPROC_HAL_REPLACEMENT_HPP #include "opencv2/core/hal/interface.h" +#if defined __GNUC__ +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wunused-parameter" +#elif defined _MSC_VER +# pragma warning( push ) +# pragma warning( disable: 4100 ) +#endif + +//! @addtogroup imgproc_hal_interface +//! @note Define your functions to override default implementations: +//! @code +//! #undef hal_add8u +//! #define hal_add8u my_add8u +//! @endcode +//! @{ + +/** +@brief Dummy structure storing filtering context + +Users can convert this pointer to any type they want. Initialisation and destruction should be made in Init and Free function implementations correspondingly. +Example: +@code{.cpp} +int my_hal_filterInit(cvhalFilter2D **context, ...) { + context = static_cast(new MyFilterData()); + //... init +} + +int my_hal_filterFree(cvhalFilter2D *context) { + MyFilterData *c = static_cast(context); + delete c; +} +@endcode + */ struct cvhalFilter2D {}; -inline int hal_ni_filterInit(cvhalFilter2D **, uchar *, size_t, int, int, int, int, int, int, int, int, double, int, int, bool, bool) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_filter(cvhalFilter2D *, uchar *, size_t, uchar *, size_t, int, int, int, int, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_filterFree(cvhalFilter2D *) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +/** + @brief hal_filterInit + @param context double pointer to user-defined context + @param kernel_data pointer to kernel data + @param kernel_step kernel step + @param kernel_type kernel type (CV_8U, ...) + @param kernel_width kernel width + @param kernel_height kernel height + @param max_width max possible image width, can be used to allocate working buffers + @param max_height max possible image height + @param src_type source image type + @param dst_type destination image type + @param borderType border processing mode (CV_HAL_BORDER_REFLECT, ...) + @param delta added to pixel values + @param anchor_x relative X position of center point within the kernel + @param anchor_y relative Y position of center point within the kernel + @param allowSubmatrix indicates whether the submatrices will be allowed as source image + @param allowInplace indicates whether the inplace operation will be possible + @sa cv::filter2D, cv::hal::Filter2D + */ +inline int hal_ni_filterInit(cvhalFilter2D **context, uchar *kernel_data, size_t kernel_step, int kernel_type, int kernel_width, int kernel_height, int max_width, int max_height, int src_type, int dst_type, int borderType, double delta, int anchor_x, int anchor_y, bool allowSubmatrix, bool allowInplace) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +/** + @brief hal_filter + @param context pointer to user-defined context + @param src_data source image data + @param src_step source image step + @param dst_data destination image data + @param dst_step destination image step + @param width images width + @param height images height + @param full_width full width of source image (outside the ROI) + @param full_height full height of source image (outside the ROI) + @param offset_x source image ROI offset X + @param offset_y source image ROI offset Y + @sa cv::filter2D, cv::hal::Filter2D + */ +inline int hal_ni_filter(cvhalFilter2D *context, uchar *src_data, size_t src_step, uchar *dst_data, size_t dst_step, int width, int height, int full_width, int full_height, int offset_x, int offset_y) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +/** + @brief hal_filterFree + @param context pointer to user-defined context + @sa cv::filter2D, cv::hal::Filter2D + */ +inline int hal_ni_filterFree(cvhalFilter2D *context) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +//! @cond IGNORED #define cv_hal_filterInit hal_ni_filterInit #define cv_hal_filter hal_ni_filter #define cv_hal_filterFree hal_ni_filterFree +//! @endcond -inline int hal_ni_sepFilterInit(cvhalFilter2D **, int, int, int, uchar *, size_t, int, int, uchar *, size_t, int, int, int, int, double, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_sepFilter(cvhalFilter2D *, uchar *, size_t, uchar*, size_t, int, int, int, int, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_sepFilterFree(cvhalFilter2D *) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +/** + @brief hal_sepFilterInit + @param context double pointer to user-defined context + @param src_type source image type + @param dst_type destination image type + @param kernel_type kernels type + @param kernelx_data pointer to x-kernel data + @param kernelx_step x-kernel step + @param kernelx_width x-kernel width + @param kernelx_height x-kernel height + @param kernely_data pointer to y-kernel data + @param kernely_step y-kernel step + @param kernely_width y-kernel width + @param kernely_height y-kernel height + @param anchor_x relative X position of center point within the kernel + @param anchor_y relative Y position of center point within the kernel + @param delta added to pixel values + @param borderType border processing mode (CV_HAL_BORDER_REFLECT, ...) + @sa cv::sepFilter2D, cv::hal::SepFilter2D + */ +inline int hal_ni_sepFilterInit(cvhalFilter2D **context, int src_type, int dst_type, int kernel_type, uchar *kernelx_data, size_t kernelx_step, int kernelx_width, int kernelx_height, uchar *kernely_data, size_t kernely_step, int kernely_width, int kernely_height, int anchor_x, int anchor_y, double delta, int borderType) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +/** + @brief hal_sepFilter + @param context pointer to user-defined context + @param src_data source image data + @param src_step source image step + @param dst_data destination image data + @param dst_step destination image step + @param width images width + @param height images height + @param full_width full width of source image (outside the ROI) + @param full_height full height of source image (outside the ROI) + @param offset_x source image ROI offset X + @param offset_y source image ROI offset Y + @sa cv::sepFilter2D, cv::hal::SepFilter2D + */ +inline int hal_ni_sepFilter(cvhalFilter2D *context, uchar *src_data, size_t src_step, uchar* dst_data, size_t dst_step, int width, int height, int full_width, int full_height, int offset_x, int offset_y) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +/** + @brief hal_sepFilterFree + @param context pointer to user-defined context + @sa cv::sepFilter2D, cv::hal::SepFilter2D + */ +inline int hal_ni_sepFilterFree(cvhalFilter2D *context) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +//! @cond IGNORED #define cv_hal_sepFilterInit hal_ni_sepFilterInit #define cv_hal_sepFilter hal_ni_sepFilter #define cv_hal_sepFilterFree hal_ni_sepFilterFree +//! @endcond -inline int hal_ni_morphInit(cvhalFilter2D **, int, int, int, int, int, int, uchar *, size_t, int, int, int, int, int, const double[4], int, bool, bool) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_morph(cvhalFilter2D *, uchar *, size_t, uchar *, size_t, int, int, int, int, int, int, int, int, int, int) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } -inline int hal_ni_morphFree(cvhalFilter2D *) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +/** + @brief hal_morphInit + @param context double pointer to user-defined context + @param operation morphology operation CV_HAL_MORPH_ERODE or CV_HAL_MORPH_DILATE + @param src_type source image type + @param dst_type destination image type + @param max_width max possible image width, can be used to allocate working buffers + @param max_height max possible image height + @param kernel_type kernel type (CV_8U, ...) + @param kernel_data pointer to kernel data + @param kernel_step kernel step + @param kernel_width kernel width + @param kernel_height kernel height + @param anchor_x relative X position of center point within the kernel + @param anchor_y relative Y position of center point within the kernel + @param borderType border processing mode (CV_HAL_BORDER_REFLECT, ...) + @param borderValue values to use for CV_HAL_BORDER_CONSTANT mode + @param iterations number of iterations + @param allowSubmatrix indicates whether the submatrices will be allowed as source image + @param allowInplace indicates whether the inplace operation will be possible + @sa cv::erode, cv::dilate, cv::morphologyEx, cv::hal::Morph + */ +inline int hal_ni_morphInit(cvhalFilter2D **context, int operation, int src_type, int dst_type, int max_width, int max_height, int kernel_type, uchar *kernel_data, size_t kernel_step, int kernel_width, int kernel_height, int anchor_x, int anchor_y, int borderType, const double borderValue[4], int iterations, bool allowSubmatrix, bool allowInplace) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +/** + @brief hal_morph + @param context pointer to user-defined context + @param src_data source image data + @param src_step source image step + @param dst_data destination image data + @param dst_step destination image step + @param width images width + @param height images height + @param src_full_width full width of source image (outside the ROI) + @param src_full_height full height of source image (outside the ROI) + @param src_roi_x source image ROI X offset + @param src_roi_y source image ROI Y offset + @param dst_full_width full width of destination image + @param dst_full_height full height of destination image + @param dst_roi_x destination image ROI X offset + @param dst_roi_y destination image ROI Y offset + @sa cv::erode, cv::dilate, cv::morphologyEx, cv::hal::Morph + */ +inline int hal_ni_morph(cvhalFilter2D *context, uchar *src_data, size_t src_step, uchar *dst_data, size_t dst_step, int width, int height, int src_full_width, int src_full_height, int src_roi_x, int src_roi_y, int dst_full_width, int dst_full_height, int dst_roi_x, int dst_roi_y) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +/** + @brief hal_morphFree + @param context pointer to user-defined context + @sa cv::erode, cv::dilate, cv::morphologyEx, cv::hal::Morph + */ +inline int hal_ni_morphFree(cvhalFilter2D *context) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +//! @cond IGNORED #define cv_hal_morphInit hal_ni_morphInit #define cv_hal_morph hal_ni_morph #define cv_hal_morphFree hal_ni_morphFree +//! @endcond + +/** + @brief hal_resize + @param src_type source and destination image type + @param src_data source image data + @param src_step source image step + @param src_width source image width + @param src_height source image height + @param dst_data destination image data + @param dst_step destination image step + @param dst_width destination image width + @param dst_height destination image height + @param inv_scale_x inversed scale X coefficient + @param inv_scale_y inversed scale Y coefficient + @param interpolation interpolation mode (CV_HAL_INTER_NEAREST, ...) + @sa cv::resize, cv::hal::resize + */ +inline int hal_ni_resize(int src_type, const uchar *src_data, size_t src_step, int src_width, int src_height, uchar *dst_data, size_t dst_step, int dst_width, int dst_height, double inv_scale_x, double inv_scale_y, int interpolation) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +/** + @brief hal_warpAffine + @param src_type source and destination image type + @param src_data source image data + @param src_step source image step + @param src_width source image width + @param src_height source image height + @param dst_data destination image data + @param dst_step destination image step + @param dst_width destination image width + @param dst_height destination image height + @param M 3x2 matrix with transform coefficients + @param interpolation interpolation mode (CV_HAL_INTER_NEAREST, ...) + @param borderType border processing mode (CV_HAL_BORDER_REFLECT, ...) + @param borderValue values to use for CV_HAL_BORDER_CONSTANT mode + @sa cv::warpAffine, cv::hal::warpAffine + */ +inline int hal_ni_warpAffine(int src_type, const uchar *src_data, size_t src_step, int src_width, int src_height, uchar *dst_data, size_t dst_step, int dst_width, int dst_height, const double M[6], int interpolation, int borderType, const double borderValue[4]) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } +/** + @brief hal_warpPerspectve + @param src_type source and destination image type + @param src_data source image data + @param src_step source image step + @param src_width source image width + @param src_height source image height + @param dst_data destination image data + @param dst_step destination image step + @param dst_width destination image width + @param dst_height destination image height + @param M 3x3 matrix with transform coefficients + @param interpolation interpolation mode (CV_HAL_INTER_NEAREST, ...) + @param borderType border processing mode (CV_HAL_BORDER_REFLECT, ...) + @param borderValue values to use for CV_HAL_BORDER_CONSTANT mode + @sa cv::warpPerspective, cv::hal::warpPerspective + */ +inline int hal_ni_warpPerspectve(int src_type, const uchar *src_data, size_t src_step, int src_width, int src_height, uchar *dst_data, size_t dst_step, int dst_width, int dst_height, const double M[9], int interpolation, int borderType, const double borderValue[4]) { return CV_HAL_ERROR_NOT_IMPLEMENTED; } + +//! @cond IGNORED +#define cv_hal_resize hal_ni_resize +#define cv_hal_warpAffine hal_ni_warpAffine +#define cv_hal_warpPerspective hal_ni_warpPerspectve +//! @endcond + +//! @} + +#if defined __GNUC__ +# pragma GCC diagnostic pop +#elif defined _MSC_VER +# pragma warning( pop ) +#endif + #include "custom_hal.hpp" -#endif // OPENCV_IMGPROC_HAL_REPLACEMENT_HPP +#endif diff --git a/modules/imgproc/src/imgwarp.cpp b/modules/imgproc/src/imgwarp.cpp index a7f8eee449..d346965ed9 100644 --- a/modules/imgproc/src/imgwarp.cpp +++ b/modules/imgproc/src/imgwarp.cpp @@ -49,6 +49,7 @@ #include "precomp.hpp" #include "opencl_kernels_imgproc.hpp" +#include "hal_replacement.hpp" using namespace cv; @@ -3091,8 +3092,8 @@ static bool ocl_resize( InputArray _src, OutputArray _dst, Size dsize, #endif #if IPP_VERSION_X100 >= 710 -static bool ipp_resize_mt( Mat src, Mat dst, - double inv_scale_x, double inv_scale_y, int interpolation) +static bool ipp_resize_mt(Mat & src, Mat & dst, + double inv_scale_x, double inv_scale_y, int interpolation) { int mode = -1; if (interpolation == INTER_LINEAR && src.rows >= 2 && src.cols >= 2) @@ -3113,15 +3114,24 @@ static bool ipp_resize_mt( Mat src, Mat dst, } #endif -} +//================================================================================================== +namespace hal { - -////////////////////////////////////////////////////////////////////////////////////////// - -void cv::resize( InputArray _src, OutputArray _dst, Size dsize, - double inv_scale_x, double inv_scale_y, int interpolation ) +void resize(int src_type, + const uchar * src_data, size_t src_step, int src_width, int src_height, + uchar * dst_data, size_t dst_step, int dst_width, int dst_height, + double inv_scale_x, double inv_scale_y, int interpolation) { + CV_Assert((dst_width * dst_height > 0) || (inv_scale_x > 0 && inv_scale_y > 0)); + if (inv_scale_x < DBL_EPSILON || inv_scale_y < DBL_EPSILON) + { + inv_scale_x = static_cast(dst_width) / src_width; + inv_scale_y = static_cast(dst_height) / src_height; + } + + CALL_HAL(resize, cv_hal_resize, src_type, src_data, src_step, src_width, src_height, dst_data, dst_step, dst_width, dst_height, inv_scale_x, inv_scale_y, interpolation); + static ResizeFunc linear_tab[] = { resizeGeneric_< @@ -3226,24 +3236,7 @@ void cv::resize( InputArray _src, OutputArray _dst, Size dsize, resizeArea_, 0 }; - Size ssize = _src.size(); - - CV_Assert( ssize.area() > 0 ); - CV_Assert( dsize.area() > 0 || (inv_scale_x > 0 && inv_scale_y > 0) ); - if( dsize.area() == 0 ) - { - dsize = Size(saturate_cast(ssize.width*inv_scale_x), - saturate_cast(ssize.height*inv_scale_y)); - CV_Assert( dsize.area() > 0 ); - } - else - { - inv_scale_x = (double)dsize.width/ssize.width; - inv_scale_y = (double)dsize.height/ssize.height; - } - - - int type = _src.type(), depth = CV_MAT_DEPTH(type), cn = CV_MAT_CN(type); + int depth = CV_MAT_DEPTH(src_type), cn = CV_MAT_CN(src_type); double scale_x = 1./inv_scale_x, scale_y = 1./inv_scale_y; int iscale_x = saturate_cast(scale_x); @@ -3252,42 +3245,30 @@ void cv::resize( InputArray _src, OutputArray _dst, Size dsize, bool is_area_fast = std::abs(scale_x - iscale_x) < DBL_EPSILON && std::abs(scale_y - iscale_y) < DBL_EPSILON; + Size dsize = Size(saturate_cast(src_width*inv_scale_x), + saturate_cast(src_height*inv_scale_y)); + CV_Assert( dsize.area() > 0 ); - CV_OCL_RUN(_src.dims() <= 2 && _dst.isUMat() && _src.cols() > 10 && _src.rows() > 10, - ocl_resize(_src, _dst, dsize, inv_scale_x, inv_scale_y, interpolation)) - - Mat src = _src.getMat(); - _dst.create(dsize, src.type()); - Mat dst = _dst.getMat(); - - if (dsize == ssize) { - // Source and destination are of same size. Use simple copy. - src.copyTo(dst); - return; - } - -#ifdef HAVE_TEGRA_OPTIMIZATION - if (tegra::useTegra() && tegra::resize(src, dst, (float)inv_scale_x, (float)inv_scale_y, interpolation)) - return; -#endif + Mat src(Size(src_width, src_height), src_type, const_cast(src_data), src_step); + Mat dst(dsize, src_type, dst_data, dst_step); #ifdef HAVE_IPP int mode = -1; - if (interpolation == INTER_LINEAR && _src.rows() >= 2 && _src.cols() >= 2) + if (interpolation == INTER_LINEAR && src_height >= 2 && src_width >= 2) mode = INTER_LINEAR; - else if (interpolation == INTER_CUBIC && _src.rows() >= 4 && _src.cols() >= 4) + else if (interpolation == INTER_CUBIC && src_height >= 4 && src_width >= 4) mode = INTER_CUBIC; const double IPP_RESIZE_EPS = 1e-10; - double ex = fabs((double)dsize.width / _src.cols() - inv_scale_x) / inv_scale_x; - double ey = fabs((double)dsize.height / _src.rows() - inv_scale_y) / inv_scale_y; + double ex = fabs((double)dsize.width / src_width - inv_scale_x) / inv_scale_x; + double ey = fabs((double)dsize.height / src_height - inv_scale_y) / inv_scale_y; #endif CV_IPP_RUN(IPP_VERSION_X100 >= 710 && ((ex < IPP_RESIZE_EPS && ey < IPP_RESIZE_EPS && depth != CV_64F) || (ex == 0 && ey == 0 && depth == CV_64F)) && (interpolation == INTER_LINEAR || interpolation == INTER_CUBIC) && !(interpolation == INTER_LINEAR && is_area_fast && iscale_x == 2 && iscale_y == 2 && depth == CV_8U) && mode >= 0 && (cn == 1 || cn == 3 || cn == 4) && (depth == CV_16U || depth == CV_16S || depth == CV_32F || - (depth == CV_64F && mode == INTER_LINEAR)), ipp_resize_mt(src, dst, inv_scale_x, inv_scale_y, interpolation)) - + (depth == CV_64F && mode == INTER_LINEAR)), + ipp_resize_mt(src, dst, inv_scale_x, inv_scale_y, interpolation)) if( interpolation == INTER_NEAREST ) { @@ -3311,7 +3292,7 @@ void cv::resize( InputArray _src, OutputArray _dst, Size dsize, if( is_area_fast ) { int area = iscale_x*iscale_y; - size_t srcstep = src.step / src.elemSize1(); + size_t srcstep = src_step / src.elemSize1(); AutoBuffer _ofs(area + dsize.width*cn); int* ofs = _ofs; int* xofs = ofs + area; @@ -3337,11 +3318,11 @@ void cv::resize( InputArray _src, OutputArray _dst, Size dsize, ResizeAreaFunc func = area_tab[depth]; CV_Assert( func != 0 && cn <= 4 ); - AutoBuffer _xytab((ssize.width + ssize.height)*2); - DecimateAlpha* xtab = _xytab, *ytab = xtab + ssize.width*2; + AutoBuffer _xytab((src_width + src_height)*2); + DecimateAlpha* xtab = _xytab, *ytab = xtab + src_width*2; - int xtab_size = computeResizeAreaTab(ssize.width, dsize.width, cn, scale_x, xtab); - int ytab_size = computeResizeAreaTab(ssize.height, dsize.height, 1, scale_y, ytab); + int xtab_size = computeResizeAreaTab(src_width, dsize.width, cn, scale_x, xtab); + int ytab_size = computeResizeAreaTab(src_height, dsize.height, 1, scale_y, ytab); AutoBuffer _tabofs(dsize.height + 1); int* tabofs = _tabofs; @@ -3409,11 +3390,11 @@ void cv::resize( InputArray _src, OutputArray _dst, Size dsize, fx = 0, sx = 0; } - if( sx + ksize2 >= ssize.width ) + if( sx + ksize2 >= src_width ) { xmax = std::min( xmax, dx ); - if( sx >= ssize.width-1 && (interpolation != INTER_CUBIC && interpolation != INTER_LANCZOS4)) - fx = 0, sx = ssize.width-1; + if( sx >= src_width-1 && (interpolation != INTER_CUBIC && interpolation != INTER_LANCZOS4)) + fx = 0, sx = src_width-1; } for( k = 0, sx *= cn; k < cn; k++ ) @@ -3486,6 +3467,46 @@ void cv::resize( InputArray _src, OutputArray _dst, Size dsize, fixpt ? (void*)ibeta : (void*)beta, xmin, xmax, ksize ); } +} // cv::hal:: +} // cv:: + +//================================================================================================== + +void cv::resize( InputArray _src, OutputArray _dst, Size dsize, + double inv_scale_x, double inv_scale_y, int interpolation ) +{ + Size ssize = _src.size(); + + CV_Assert( ssize.area() > 0 ); + CV_Assert( dsize.area() > 0 || (inv_scale_x > 0 && inv_scale_y > 0) ); + if( dsize.area() == 0 ) + { + dsize = Size(saturate_cast(ssize.width*inv_scale_x), + saturate_cast(ssize.height*inv_scale_y)); + CV_Assert( dsize.area() > 0 ); + } + else + { + inv_scale_x = (double)dsize.width/ssize.width; + inv_scale_y = (double)dsize.height/ssize.height; + } + + CV_OCL_RUN(_src.dims() <= 2 && _dst.isUMat() && _src.cols() > 10 && _src.rows() > 10, + ocl_resize(_src, _dst, dsize, inv_scale_x, inv_scale_y, interpolation)) + + Mat src = _src.getMat(); + _dst.create(dsize, src.type()); + Mat dst = _dst.getMat(); + + if (dsize == ssize) { + // Source and destination are of same size. Use simple copy. + src.copyTo(dst); + return; + } + + hal::resize(src.type(), src.data, src.step, src.cols, src.rows, dst.data, dst.step, dst.cols, dst.rows, inv_scale_x, inv_scale_y, interpolation); +} + /****************************************************************************************\ * General warping (affine, perspective, remap) * @@ -5232,7 +5253,7 @@ class WarpAffineInvoker : { public: WarpAffineInvoker(const Mat &_src, Mat &_dst, int _interpolation, int _borderType, - const Scalar &_borderValue, int *_adelta, int *_bdelta, double *_M) : + const Scalar &_borderValue, int *_adelta, int *_bdelta, const double *_M) : ParallelLoopBody(), src(_src), dst(_dst), interpolation(_interpolation), borderType(_borderType), borderValue(_borderValue), adelta(_adelta), bdelta(_bdelta), M(_M) @@ -5410,7 +5431,7 @@ private: int interpolation, borderType; Scalar borderValue; int *adelta, *bdelta; - double *M; + const double *M; }; @@ -5569,8 +5590,40 @@ static bool ocl_warpTransform(InputArray _src, OutputArray _dst, InputArray _M0, #endif +namespace hal { + +void warpAffine(int src_type, + const uchar * src_data, size_t src_step, int src_width, int src_height, + uchar * dst_data, size_t dst_step, int dst_width, int dst_height, + const double M[6], int interpolation, int borderType, const double borderValue[4]) +{ + CALL_HAL(warpAffine, cv_hal_warpAffine, src_type, src_data, src_step, src_width, src_height, dst_data, dst_step, dst_width, dst_height, M, interpolation, borderType, borderValue); + + Mat src(Size(src_width, src_height), src_type, const_cast(src_data), src_step); + Mat dst(Size(dst_width, dst_height), src_type, dst_data, dst_step); + + int x; + AutoBuffer _abdelta(dst.cols*2); + int* adelta = &_abdelta[0], *bdelta = adelta + dst.cols; + const int AB_BITS = MAX(10, (int)INTER_BITS); + const int AB_SCALE = 1 << AB_BITS; + + for( x = 0; x < dst.cols; x++ ) + { + adelta[x] = saturate_cast(M[0]*x*AB_SCALE); + bdelta[x] = saturate_cast(M[3]*x*AB_SCALE); + } + + Range range(0, dst.rows); + WarpAffineInvoker invoker(src, dst, interpolation, borderType, + Scalar(borderValue[0], borderValue[1], borderValue[2], borderValue[3]), + adelta, bdelta, M); + parallel_for_(range, invoker, dst.total()/(double)(1<<16)); } +} // hal:: +} // cv:: + void cv::warpAffine( InputArray _src, OutputArray _dst, InputArray _M0, Size dsize, @@ -5596,11 +5649,6 @@ void cv::warpAffine( InputArray _src, OutputArray _dst, CV_Assert( (M0.type() == CV_32F || M0.type() == CV_64F) && M0.rows == 2 && M0.cols == 3 ); M0.convertTo(matM, matM.type()); -#ifdef HAVE_TEGRA_OPTIMIZATION - if( tegra::useTegra() && tegra::warpAffine(src, dst, M, flags, borderType, borderValue) ) - return; -#endif - if( !(flags & WARP_INVERSE_MAP) ) { double D = M[0]*M[4] - M[1]*M[3]; @@ -5613,12 +5661,6 @@ void cv::warpAffine( InputArray _src, OutputArray _dst, M[2] = b1; M[5] = b2; } - int x; - AutoBuffer _abdelta(dst.cols*2); - int* adelta = &_abdelta[0], *bdelta = adelta + dst.cols; - const int AB_BITS = MAX(10, (int)INTER_BITS); - const int AB_SCALE = 1 << AB_BITS; - #if defined (HAVE_IPP) && IPP_VERSION_X100 >= 810 && IPP_DISABLE_BLOCK CV_IPP_CHECK() { @@ -5683,16 +5725,8 @@ void cv::warpAffine( InputArray _src, OutputArray _dst, } #endif - for( x = 0; x < dst.cols; x++ ) - { - adelta[x] = saturate_cast(M[0]*x*AB_SCALE); - bdelta[x] = saturate_cast(M[3]*x*AB_SCALE); - } - - Range range(0, dst.rows); - WarpAffineInvoker invoker(src, dst, interpolation, borderType, - borderValue, adelta, bdelta, M); - parallel_for_(range, invoker, dst.total()/(double)(1<<16)); + hal::warpAffine(src.type(), src.data, src.step, src.cols, src.rows, dst.data, dst.step, dst.cols, dst.rows, + M, interpolation, borderType, borderValue.val); } @@ -5703,7 +5737,7 @@ class WarpPerspectiveInvoker : public ParallelLoopBody { public: - WarpPerspectiveInvoker(const Mat &_src, Mat &_dst, double *_M, int _interpolation, + WarpPerspectiveInvoker(const Mat &_src, Mat &_dst, const double *_M, int _interpolation, int _borderType, const Scalar &_borderValue) : ParallelLoopBody(), src(_src), dst(_dst), M(_M), interpolation(_interpolation), borderType(_borderType), borderValue(_borderValue) @@ -6037,12 +6071,11 @@ public: private: Mat src; Mat dst; - double* M; + const double* M; int interpolation, borderType; Scalar borderValue; }; - #if defined (HAVE_IPP) && IPP_VERSION_X100 >= 810 && IPP_DISABLE_BLOCK class IPPWarpPerspectiveInvoker : public ParallelLoopBody @@ -6095,8 +6128,26 @@ private: const IPPWarpPerspectiveInvoker& operator= (const IPPWarpPerspectiveInvoker&); }; #endif + +namespace hal { + +void warpPerspectve(int src_type, + const uchar * src_data, size_t src_step, int src_width, int src_height, + uchar * dst_data, size_t dst_step, int dst_width, int dst_height, + const double M[9], int interpolation, int borderType, const double borderValue[4]) +{ + CALL_HAL(warpPerspective, cv_hal_warpPerspective, src_type, src_data, src_step, src_width, src_height, dst_data, dst_step, dst_width, dst_height, M, interpolation, borderType, borderValue); + Mat src(Size(src_width, src_height), src_type, const_cast(src_data), src_step); + Mat dst(Size(dst_width, dst_height), src_type, dst_data, dst_step); + + Range range(0, dst.rows); + WarpPerspectiveInvoker invoker(src, dst, M, interpolation, borderType, Scalar(borderValue[0], borderValue[1], borderValue[2], borderValue[3])); + parallel_for_(range, invoker, dst.total()/(double)(1<<16)); } +} // hal:: +} // cv:: + void cv::warpPerspective( InputArray _src, OutputArray _dst, InputArray _M0, Size dsize, int flags, int borderType, const Scalar& borderValue ) { @@ -6122,12 +6173,6 @@ void cv::warpPerspective( InputArray _src, OutputArray _dst, InputArray _M0, CV_Assert( (M0.type() == CV_32F || M0.type() == CV_64F) && M0.rows == 3 && M0.cols == 3 ); M0.convertTo(matM, matM.type()); -#ifdef HAVE_TEGRA_OPTIMIZATION - if( tegra::useTegra() && tegra::warpPerspective(src, dst, M, flags, borderType, borderValue) ) - return; -#endif - - #if defined (HAVE_IPP) && IPP_VERSION_X100 >= 810 && IPP_DISABLE_BLOCK CV_IPP_CHECK() { @@ -6190,9 +6235,8 @@ void cv::warpPerspective( InputArray _src, OutputArray _dst, InputArray _M0, if( !(flags & WARP_INVERSE_MAP) ) invert(matM, matM); - Range range(0, dst.rows); - WarpPerspectiveInvoker invoker(src, dst, M, interpolation, borderType, borderValue); - parallel_for_(range, invoker, dst.total()/(double)(1<<16)); + hal::warpPerspectve(src.type(), src.data, src.step, src.cols, src.rows, dst.data, dst.step, dst.cols, dst.rows, + matM.ptr(), interpolation, borderType, borderValue.val); } diff --git a/modules/imgproc/src/morph.cpp b/modules/imgproc/src/morph.cpp index d70edd0715..3b799803c3 100644 --- a/modules/imgproc/src/morph.cpp +++ b/modules/imgproc/src/morph.cpp @@ -1079,7 +1079,7 @@ namespace cv // ===== 1. replacement implementation -struct ReplacementMorphImpl : public hal::MorphContext +struct ReplacementMorphImpl : public hal::Morph { cvhalFilter2D * ctx; bool isInitialized; @@ -1184,7 +1184,7 @@ INIT_TRAIT(CV_32FC4, 32f, 32f_C4R, 4, zero[4] = {0}) //-------------------------------------- -struct IppMorphBaseImpl : public hal::MorphContext +struct IppMorphBaseImpl : public hal::Morph { virtual bool init(int _op, int _src_type, int dst_type, int max_width, int max_height, int kernel_type, uchar * kernel_data, size_t kernel_step, int kernel_width, int kernel_height, @@ -1379,7 +1379,7 @@ static IppMorphBaseImpl * createIppImpl(int type) // ===== 3. Fallback implementation -struct OcvMorphImpl : public hal::MorphContext +struct OcvMorphImpl : public hal::Morph { Ptr f; int iterations; @@ -1425,7 +1425,7 @@ struct OcvMorphImpl : public hal::MorphContext namespace hal { -Ptr MorphContext ::create(int op, int src_type, int dst_type, int max_width, int max_height, +Ptr Morph ::create(int op, int src_type, int dst_type, int max_width, int max_height, int kernel_type, uchar * kernel_data, size_t kernel_step, int kernel_width, int kernel_height, int anchor_x, int anchor_y, int borderType, const double borderValue[4], @@ -1438,7 +1438,7 @@ Ptr MorphContext ::create(int op, int src_type, int dst_type, int anchor_x, anchor_y, borderType, borderValue, iterations, isSubmatrix, allowInplace)) { - return Ptr(impl); + return Ptr(impl); } delete impl; } @@ -1453,7 +1453,7 @@ Ptr MorphContext ::create(int op, int src_type, int dst_type, int anchor_x, anchor_y, borderType, borderValue, iterations, isSubmatrix, allowInplace)) { - return Ptr(impl); + return Ptr(impl); } delete impl; } @@ -1465,7 +1465,7 @@ Ptr MorphContext ::create(int op, int src_type, int dst_type, int kernel_type, kernel_data, kernel_step, kernel_width, kernel_height, anchor_x, anchor_y, borderType, borderValue, iterations, isSubmatrix, allowInplace); - return Ptr(impl); + return Ptr(impl); } } @@ -1858,7 +1858,7 @@ static void morphOp( int op, InputArray _src, OutputArray _dst, Size d_wsz(dst.cols, dst.rows); dst.locateROI(d_wsz, d_ofs); - Ptr ctx = hal::MorphContext::create(op, src.type(), dst.type(), src.cols, src.rows, + Ptr ctx = hal::Morph::create(op, src.type(), dst.type(), src.cols, src.rows, kernel.type(), kernel.data, kernel.step, kernel.cols, kernel.rows, anchor.x, anchor.y, borderType, borderValue.val, iterations, src.isSubmatrix(), src.data == dst.data);