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
5e919228
Commit
5e919228
authored
9 years ago
by
Maksim Shabunin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added HAL cvtColor interface
parent
96937bac
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
114 additions
and
2 deletions
+114
-2
hal_replacement.hpp
modules/core/src/hal_replacement.hpp
+6
-2
stat.cpp
modules/core/src/stat.cpp
+6
-0
hal.hpp
modules/imgproc/include/opencv2/imgproc/hal/hal.hpp
+102
-0
color.cpp
modules/imgproc/src/color.cpp
+0
-0
hal_replacement.hpp
modules/imgproc/src/hal_replacement.hpp
+0
-0
No files found.
modules/core/src/hal_replacement.hpp
View file @
5e919228
...
@@ -703,21 +703,25 @@ inline int hal_ni_gemm64fc(const double* src1, size_t src1_step, const double* s
...
@@ -703,21 +703,25 @@ inline int hal_ni_gemm64fc(const double* src1, size_t src1_step, const double* s
//! @cond IGNORED
//! @cond IGNORED
#define CALL_HAL_RET(name, fun, retval, ...) \
#define CALL_HAL_RET(name, fun, retval, ...) \
{ \
int res = fun(__VA_ARGS__, &retval); \
int res = fun(__VA_ARGS__, &retval); \
if (res == CV_HAL_ERROR_OK) \
if (res == CV_HAL_ERROR_OK) \
return retval; \
return retval; \
else if (res != CV_HAL_ERROR_NOT_IMPLEMENTED) \
else if (res != CV_HAL_ERROR_NOT_IMPLEMENTED) \
CV_Error_(cv::Error::StsInternal, \
CV_Error_(cv::Error::StsInternal, \
("HAL implementation " CVAUX_STR(name) " ==> " CVAUX_STR(fun) " returned %d (0x%08x)", res, res));
("HAL implementation " CVAUX_STR(name) " ==> " CVAUX_STR(fun) " returned %d (0x%08x)", res, res)); \
}
#define CALL_HAL(name, fun, ...) \
#define CALL_HAL(name, fun, ...) \
{ \
int res = fun(__VA_ARGS__); \
int res = fun(__VA_ARGS__); \
if (res == CV_HAL_ERROR_OK) \
if (res == CV_HAL_ERROR_OK) \
return; \
return; \
else if (res != CV_HAL_ERROR_NOT_IMPLEMENTED) \
else if (res != CV_HAL_ERROR_NOT_IMPLEMENTED) \
CV_Error_(cv::Error::StsInternal, \
CV_Error_(cv::Error::StsInternal, \
("HAL implementation " CVAUX_STR(name) " ==> " CVAUX_STR(fun) " returned %d (0x%08x)", res, res));
("HAL implementation " CVAUX_STR(name) " ==> " CVAUX_STR(fun) " returned %d (0x%08x)", res, res)); \
}
//! @endcond
//! @endcond
#endif
#endif
This diff is collapsed.
Click to expand it.
modules/core/src/stat.cpp
View file @
5e919228
...
@@ -2718,19 +2718,25 @@ static bool ipp_norm(Mat &src, int normType, Mat &mask, double &result)
...
@@ -2718,19 +2718,25 @@ static bool ipp_norm(Mat &src, int normType, Mat &mask, double &result)
ippiMaskNormFuncC3
ippFuncC3
=
ippiMaskNormFuncC3
ippFuncC3
=
normType
==
NORM_INF
?
normType
==
NORM_INF
?
(
type
==
CV_8UC3
?
(
ippiMaskNormFuncC3
)
ippiNorm_Inf_8u_C3CMR
:
(
type
==
CV_8UC3
?
(
ippiMaskNormFuncC3
)
ippiNorm_Inf_8u_C3CMR
:
#if IPP_VERSION_X100 < 900
type
==
CV_8SC3
?
(
ippiMaskNormFuncC3
)
ippiNorm_Inf_8s_C3CMR
:
type
==
CV_8SC3
?
(
ippiMaskNormFuncC3
)
ippiNorm_Inf_8s_C3CMR
:
#endif
type
==
CV_16UC3
?
(
ippiMaskNormFuncC3
)
ippiNorm_Inf_16u_C3CMR
:
type
==
CV_16UC3
?
(
ippiMaskNormFuncC3
)
ippiNorm_Inf_16u_C3CMR
:
type
==
CV_32FC3
?
(
ippiMaskNormFuncC3
)
ippiNorm_Inf_32f_C3CMR
:
type
==
CV_32FC3
?
(
ippiMaskNormFuncC3
)
ippiNorm_Inf_32f_C3CMR
:
0
)
:
0
)
:
normType
==
NORM_L1
?
normType
==
NORM_L1
?
(
type
==
CV_8UC3
?
(
ippiMaskNormFuncC3
)
ippiNorm_L1_8u_C3CMR
:
(
type
==
CV_8UC3
?
(
ippiMaskNormFuncC3
)
ippiNorm_L1_8u_C3CMR
:
#if IPP_VERSION_X100 < 900
type
==
CV_8SC3
?
(
ippiMaskNormFuncC3
)
ippiNorm_L1_8s_C3CMR
:
type
==
CV_8SC3
?
(
ippiMaskNormFuncC3
)
ippiNorm_L1_8s_C3CMR
:
#endif
type
==
CV_16UC3
?
(
ippiMaskNormFuncC3
)
ippiNorm_L1_16u_C3CMR
:
type
==
CV_16UC3
?
(
ippiMaskNormFuncC3
)
ippiNorm_L1_16u_C3CMR
:
type
==
CV_32FC3
?
(
ippiMaskNormFuncC3
)
ippiNorm_L1_32f_C3CMR
:
type
==
CV_32FC3
?
(
ippiMaskNormFuncC3
)
ippiNorm_L1_32f_C3CMR
:
0
)
:
0
)
:
normType
==
NORM_L2
||
normType
==
NORM_L2SQR
?
normType
==
NORM_L2
||
normType
==
NORM_L2SQR
?
(
type
==
CV_8UC3
?
(
ippiMaskNormFuncC3
)
ippiNorm_L2_8u_C3CMR
:
(
type
==
CV_8UC3
?
(
ippiMaskNormFuncC3
)
ippiNorm_L2_8u_C3CMR
:
#if IPP_VERSION_X100 < 900
type
==
CV_8SC3
?
(
ippiMaskNormFuncC3
)
ippiNorm_L2_8s_C3CMR
:
type
==
CV_8SC3
?
(
ippiMaskNormFuncC3
)
ippiNorm_L2_8s_C3CMR
:
#endif
type
==
CV_16UC3
?
(
ippiMaskNormFuncC3
)
ippiNorm_L2_16u_C3CMR
:
type
==
CV_16UC3
?
(
ippiMaskNormFuncC3
)
ippiNorm_L2_16u_C3CMR
:
type
==
CV_32FC3
?
(
ippiMaskNormFuncC3
)
ippiNorm_L2_32f_C3CMR
:
type
==
CV_32FC3
?
(
ippiMaskNormFuncC3
)
ippiNorm_L2_32f_C3CMR
:
0
)
:
0
;
0
)
:
0
;
...
...
This diff is collapsed.
Click to expand it.
modules/imgproc/include/opencv2/imgproc/hal/hal.hpp
View file @
5e919228
...
@@ -75,6 +75,108 @@ CV_EXPORTS void warpPerspectve(int src_type,
...
@@ -75,6 +75,108 @@ CV_EXPORTS void warpPerspectve(int src_type,
uchar
*
dst_data
,
size_t
dst_step
,
int
dst_width
,
int
dst_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
]);
const
double
M
[
9
],
int
interpolation
,
int
borderType
,
const
double
borderValue
[
4
]);
CV_EXPORTS
void
cvtBGRtoBGR
(
const
uchar
*
src_data
,
size_t
src_step
,
uchar
*
dst_data
,
size_t
dst_step
,
int
width
,
int
height
,
int
depth
,
int
scn
,
int
dcn
,
bool
swapBlue
);
CV_EXPORTS
void
cvtBGRtoBGR5x5
(
const
uchar
*
src_data
,
size_t
src_step
,
uchar
*
dst_data
,
size_t
dst_step
,
int
width
,
int
height
,
int
scn
,
bool
swapBlue
,
int
greenBits
);
CV_EXPORTS
void
cvtBGR5x5toBGR
(
const
uchar
*
src_data
,
size_t
src_step
,
uchar
*
dst_data
,
size_t
dst_step
,
int
width
,
int
height
,
int
dcn
,
bool
swapBlue
,
int
greenBits
);
CV_EXPORTS
void
cvtBGRtoGray
(
const
uchar
*
src_data
,
size_t
src_step
,
uchar
*
dst_data
,
size_t
dst_step
,
int
width
,
int
height
,
int
depth
,
int
scn
,
bool
swapBlue
);
CV_EXPORTS
void
cvtGraytoBGR
(
const
uchar
*
src_data
,
size_t
src_step
,
uchar
*
dst_data
,
size_t
dst_step
,
int
width
,
int
height
,
int
depth
,
int
dcn
);
CV_EXPORTS
void
cvtBGR5x5toGray
(
const
uchar
*
src_data
,
size_t
src_step
,
uchar
*
dst_data
,
size_t
dst_step
,
int
width
,
int
height
,
int
greenBits
);
CV_EXPORTS
void
cvtGraytoBGR5x5
(
const
uchar
*
src_data
,
size_t
src_step
,
uchar
*
dst_data
,
size_t
dst_step
,
int
width
,
int
height
,
int
greenBits
);
CV_EXPORTS
void
cvtBGRtoYUV
(
const
uchar
*
src_data
,
size_t
src_step
,
uchar
*
dst_data
,
size_t
dst_step
,
int
width
,
int
height
,
int
depth
,
int
scn
,
bool
swapBlue
,
bool
isCbCr
);
CV_EXPORTS
void
cvtYUVtoBGR
(
const
uchar
*
src_data
,
size_t
src_step
,
uchar
*
dst_data
,
size_t
dst_step
,
int
width
,
int
height
,
int
depth
,
int
dcn
,
bool
swapBlue
,
bool
isCbCr
);
CV_EXPORTS
void
cvtBGRtoXYZ
(
const
uchar
*
src_data
,
size_t
src_step
,
uchar
*
dst_data
,
size_t
dst_step
,
int
width
,
int
height
,
int
depth
,
int
scn
,
bool
swapBlue
);
CV_EXPORTS
void
cvtXYZtoBGR
(
const
uchar
*
src_data
,
size_t
src_step
,
uchar
*
dst_data
,
size_t
dst_step
,
int
width
,
int
height
,
int
depth
,
int
dcn
,
bool
swapBlue
);
CV_EXPORTS
void
cvtBGRtoHSV
(
const
uchar
*
src_data
,
size_t
src_step
,
uchar
*
dst_data
,
size_t
dst_step
,
int
width
,
int
height
,
int
depth
,
int
scn
,
bool
swapBlue
,
bool
isFullRange
,
bool
isHSV
);
CV_EXPORTS
void
cvtHSVtoBGR
(
const
uchar
*
src_data
,
size_t
src_step
,
uchar
*
dst_data
,
size_t
dst_step
,
int
width
,
int
height
,
int
depth
,
int
dcn
,
bool
swapBlue
,
bool
isFullRange
,
bool
isHSV
);
CV_EXPORTS
void
cvtBGRtoLab
(
const
uchar
*
src_data
,
size_t
src_step
,
uchar
*
dst_data
,
size_t
dst_step
,
int
width
,
int
height
,
int
depth
,
int
scn
,
bool
swapBlue
,
bool
isLab
,
bool
srgb
);
CV_EXPORTS
void
cvtLabtoBGR
(
const
uchar
*
src_data
,
size_t
src_step
,
uchar
*
dst_data
,
size_t
dst_step
,
int
width
,
int
height
,
int
depth
,
int
dcn
,
bool
swapBlue
,
bool
isLab
,
bool
srgb
);
CV_EXPORTS
void
cvtTwoPlaneYUVtoBGR
(
const
uchar
*
src_data
,
size_t
src_step
,
uchar
*
dst_data
,
size_t
dst_step
,
int
dst_width
,
int
dst_height
,
int
dcn
,
bool
swapBlue
,
int
uIdx
);
CV_EXPORTS
void
cvtThreePlaneYUVtoBGR
(
const
uchar
*
src_data
,
size_t
src_step
,
uchar
*
dst_data
,
size_t
dst_step
,
int
dst_width
,
int
dst_height
,
int
dcn
,
bool
swapBlue
,
int
uIdx
);
CV_EXPORTS
void
cvtBGRtoThreePlaneYUV
(
const
uchar
*
src_data
,
size_t
src_step
,
uchar
*
dst_data
,
size_t
dst_step
,
int
width
,
int
height
,
int
scn
,
bool
swapBlue
,
int
uIdx
);
CV_EXPORTS
void
cvtOnePlaneYUVtoBGR
(
const
uchar
*
src_data
,
size_t
src_step
,
uchar
*
dst_data
,
size_t
dst_step
,
int
width
,
int
height
,
int
dcn
,
bool
swapBlue
,
int
uIdx
,
int
ycn
);
CV_EXPORTS
void
cvtRGBAtoMultipliedRGBA
(
const
uchar
*
src_data
,
size_t
src_step
,
uchar
*
dst_data
,
size_t
dst_step
,
int
width
,
int
height
);
CV_EXPORTS
void
cvtMultipliedRGBAtoRGBA
(
const
uchar
*
src_data
,
size_t
src_step
,
uchar
*
dst_data
,
size_t
dst_step
,
int
width
,
int
height
);
//! @}
//! @}
}}
}}
...
...
This diff is collapsed.
Click to expand it.
modules/imgproc/src/color.cpp
View file @
5e919228
This source diff could not be displayed because it is too large. You can
view the blob
instead.
This diff is collapsed.
Click to expand it.
modules/imgproc/src/hal_replacement.hpp
View file @
5e919228
This diff is collapsed.
Click to expand it.
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