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
509de3fa
Commit
509de3fa
authored
Aug 08, 2018
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #12178 from alalek:ipp_cvtColor_12176
parents
9f2edc11
b00758ba
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
0 deletions
+8
-0
color_rgb.cpp
modules/imgproc/src/color_rgb.cpp
+8
-0
No files found.
modules/imgproc/src/color_rgb.cpp
View file @
509de3fa
...
@@ -5,6 +5,8 @@
...
@@ -5,6 +5,8 @@
#include "precomp.hpp"
#include "precomp.hpp"
#include "color.hpp"
#include "color.hpp"
#define IPP_DISABLE_CVTCOLOR_GRAY2BGR_8UC3 1
namespace
cv
namespace
cv
{
{
...
@@ -1228,10 +1230,12 @@ static ippiGeneralFunc ippiRGB2GrayC4Tab[] =
...
@@ -1228,10 +1230,12 @@ static ippiGeneralFunc ippiRGB2GrayC4Tab[] =
};
};
#if !IPP_DISABLE_CVTCOLOR_GRAY2BGR_8UC3
static
IppStatus
ippiGrayToRGB_C1C3R
(
const
Ipp8u
*
pSrc
,
int
srcStep
,
Ipp8u
*
pDst
,
int
dstStep
,
IppiSize
roiSize
)
static
IppStatus
ippiGrayToRGB_C1C3R
(
const
Ipp8u
*
pSrc
,
int
srcStep
,
Ipp8u
*
pDst
,
int
dstStep
,
IppiSize
roiSize
)
{
{
return
CV_INSTRUMENT_FUN_IPP
(
ippiGrayToRGB_8u_C1C3R
,
pSrc
,
srcStep
,
pDst
,
dstStep
,
roiSize
);
return
CV_INSTRUMENT_FUN_IPP
(
ippiGrayToRGB_8u_C1C3R
,
pSrc
,
srcStep
,
pDst
,
dstStep
,
roiSize
);
}
}
#endif
static
IppStatus
ippiGrayToRGB_C1C3R
(
const
Ipp16u
*
pSrc
,
int
srcStep
,
Ipp16u
*
pDst
,
int
dstStep
,
IppiSize
roiSize
)
static
IppStatus
ippiGrayToRGB_C1C3R
(
const
Ipp16u
*
pSrc
,
int
srcStep
,
Ipp16u
*
pDst
,
int
dstStep
,
IppiSize
roiSize
)
{
{
return
CV_INSTRUMENT_FUN_IPP
(
ippiGrayToRGB_16u_C1C3R
,
pSrc
,
srcStep
,
pDst
,
dstStep
,
roiSize
);
return
CV_INSTRUMENT_FUN_IPP
(
ippiGrayToRGB_16u_C1C3R
,
pSrc
,
srcStep
,
pDst
,
dstStep
,
roiSize
);
...
@@ -1516,7 +1520,11 @@ void cvtGraytoBGR(const uchar * src_data, size_t src_step,
...
@@ -1516,7 +1520,11 @@ void cvtGraytoBGR(const uchar * src_data, size_t src_step,
if
(
dcn
==
3
)
if
(
dcn
==
3
)
{
{
if
(
depth
==
CV_8U
)
if
(
depth
==
CV_8U
)
{
#if !IPP_DISABLE_CVTCOLOR_GRAY2BGR_8UC3
ippres
=
CvtColorIPPLoop
(
src_data
,
src_step
,
dst_data
,
dst_step
,
width
,
height
,
IPPGray2BGRFunctor
<
Ipp8u
>
());
ippres
=
CvtColorIPPLoop
(
src_data
,
src_step
,
dst_data
,
dst_step
,
width
,
height
,
IPPGray2BGRFunctor
<
Ipp8u
>
());
#endif
}
else
if
(
depth
==
CV_16U
)
else
if
(
depth
==
CV_16U
)
ippres
=
CvtColorIPPLoop
(
src_data
,
src_step
,
dst_data
,
dst_step
,
width
,
height
,
IPPGray2BGRFunctor
<
Ipp16u
>
());
ippres
=
CvtColorIPPLoop
(
src_data
,
src_step
,
dst_data
,
dst_step
,
width
,
height
,
IPPGray2BGRFunctor
<
Ipp16u
>
());
else
else
...
...
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