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

Fixed some build issues

Browse Source
This commit is contained in:
Maksim Shabunin 2015-12-03 15:25:42 +03:00
parent 98f5fcd86e
commit 5473dbebed
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/hal/include/opencv2/hal.hpp
View File

@ -247,15 +247,7 @@ template<typename T> struct OpAbsDiff
typedef T type1; typedef T type1;
typedef T type2; typedef T type2;
typedef T rtype; typedef T rtype;
T operator()(T a, T b) const { return (T)std::abs(a - b); } T operator()(T a, T b) const { return a > b ? a - b : b - a; }
};
template<typename T, typename WT=T> struct OpAbsDiffS
{
typedef T type1;
typedef WT type2;
typedef T rtype;
T operator()(T a, WT b) const { return saturate_cast<T>(std::abs(a - b)); }
}; };
template<typename T> struct OpAnd template<typename T> struct OpAnd

1
modules/hal/samples/simple_hal/CMakeLists.txt
View File

@ -9,4 +9,3 @@ endif()
add_library(simple_hal simple.cpp) add_library(simple_hal simple.cpp)
set(OPENCV_HAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../..") set(OPENCV_HAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../..")
target_include_directories(simple_hal PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${OPENCV_HAL_DIR}/include) target_include_directories(simple_hal PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${OPENCV_HAL_DIR}/include)

1
modules/hal/samples/simple_hal/simple.cpp
View File

@ -31,4 +31,3 @@ int slow_not8u(const uchar* src1, size_t step1, const uchar* src2, size_t step2,
dst[x] = ~src1[x]; dst[x] = ~src1[x];
return cv::hal::Error::Ok; return cv::hal::Error::Ok;
} }