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
c65e5a1e
Commit
c65e5a1e
authored
Mar 28, 2014
by
vbystricky
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix error BGRA2RGBA color convertion by ipp. Uncomment ipp color converstion, which pass tests
parent
b3db990d
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
color.cpp
modules/imgproc/src/color.cpp
+5
-4
No files found.
modules/imgproc/src/color.cpp
View file @
c65e5a1e
...
@@ -252,6 +252,7 @@ bool CvtColorIPPLoopCopy(Mat& src, Mat& dst, const Cvt& cvt)
...
@@ -252,6 +252,7 @@ bool CvtColorIPPLoopCopy(Mat& src, Mat& dst, const Cvt& cvt)
}
}
bool
ok
;
bool
ok
;
parallel_for_
(
Range
(
0
,
source
.
rows
),
CvtColorIPPLoop_Invoker
<
Cvt
>
(
source
,
dst
,
cvt
,
&
ok
),
source
.
total
()
/
(
double
)(
1
<<
16
)
);
parallel_for_
(
Range
(
0
,
source
.
rows
),
CvtColorIPPLoop_Invoker
<
Cvt
>
(
source
,
dst
,
cvt
,
&
ok
),
source
.
total
()
/
(
double
)(
1
<<
16
)
);
//ok = cvt(src.ptr<uchar>(0), (int)src.step[0], dst.ptr<uchar>(0), (int)dst.step[0], src.cols, src.rows);
return
ok
;
return
ok
;
}
}
...
@@ -299,8 +300,8 @@ static ippicviReorderFunc ippicviSwapChannelsC3RTab[] =
...
@@ -299,8 +300,8 @@ static ippicviReorderFunc ippicviSwapChannelsC3RTab[] =
static
ippicviReorderFunc
ippicviSwapChannelsC4RTab
[]
=
static
ippicviReorderFunc
ippicviSwapChannelsC4RTab
[]
=
{
{
(
ippicviReorderFunc
)
ippicviSwapChannels_8u_
AC4R
,
0
,
(
ippicviReorderFunc
)
ippicviSwapChannels_16u_A
C4R
,
0
,
(
ippicviReorderFunc
)
ippicviSwapChannels_8u_
C4R
,
0
,
(
ippicviReorderFunc
)
ippicviSwapChannels_16u_
C4R
,
0
,
0
,
(
ippicviReorderFunc
)
ippicviSwapChannels_32f_
A
C4R
,
0
,
0
0
,
(
ippicviReorderFunc
)
ippicviSwapChannels_32f_C4R
,
0
,
0
};
};
static
ippicviColor2GrayFunc
ippicviColor2GrayC3Tab
[]
=
static
ippicviColor2GrayFunc
ippicviColor2GrayC3Tab
[]
=
...
@@ -3310,7 +3311,7 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
...
@@ -3310,7 +3311,7 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
CV_Assert
(
scn
==
3
||
scn
==
4
);
CV_Assert
(
scn
==
3
||
scn
==
4
);
_dst
.
create
(
sz
,
CV_MAKETYPE
(
depth
,
1
));
_dst
.
create
(
sz
,
CV_MAKETYPE
(
depth
,
1
));
dst
=
_dst
.
getMat
();
dst
=
_dst
.
getMat
();
/*
/*
*/
#if defined (HAVE_IPP) && (IPP_VERSION_MAJOR >= 7)
#if defined (HAVE_IPP) && (IPP_VERSION_MAJOR >= 7)
if
(
code
==
CV_BGR2GRAY
)
if
(
code
==
CV_BGR2GRAY
)
{
{
...
@@ -3333,7 +3334,7 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
...
@@ -3333,7 +3334,7 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
return
;
return
;
}
}
#endif
#endif
*/
/*
*/
bidx
=
code
==
CV_BGR2GRAY
||
code
==
CV_BGRA2GRAY
?
0
:
2
;
bidx
=
code
==
CV_BGR2GRAY
||
code
==
CV_BGRA2GRAY
?
0
:
2
;
if
(
depth
==
CV_8U
)
if
(
depth
==
CV_8U
)
...
...
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