Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
5473dbeb
Commit
5473dbeb
authored
Dec 03, 2015
by
Maksim Shabunin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed some build issues
parent
98f5fcd8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
11 deletions
+1
-11
hal.hpp
modules/hal/include/opencv2/hal.hpp
+1
-9
CMakeLists.txt
modules/hal/samples/simple_hal/CMakeLists.txt
+0
-1
simple.cpp
modules/hal/samples/simple_hal/simple.cpp
+0
-1
No files found.
modules/hal/include/opencv2/hal.hpp
View file @
5473dbeb
...
@@ -247,15 +247,7 @@ template<typename T> struct OpAbsDiff
...
@@ -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
...
...
modules/hal/samples/simple_hal/CMakeLists.txt
View file @
5473dbeb
...
@@ -9,4 +9,3 @@ endif()
...
@@ -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
)
modules/hal/samples/simple_hal/simple.cpp
View file @
5473dbeb
...
@@ -31,4 +31,3 @@ int slow_not8u(const uchar* src1, size_t step1, const uchar* src2, size_t step2,
...
@@ -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
;
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment