projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ad23ef2
)
Comment ipp version of CV_BGR2GRAY color convertion, by problems in BRIEF accuracy...
author
vbystricky
<user@user-pc.(none)>
Thu, 3 Apr 2014 06:47:06 +0000
(10:47 +0400)
committer
vbystricky
<user@user-pc.(none)>
Mon, 7 Apr 2014 10:26:50 +0000
(14:26 +0400)
modules/imgproc/src/color.cpp
patch
|
blob
|
history
diff --git
a/modules/imgproc/src/color.cpp
b/modules/imgproc/src/color.cpp
index
4cc2382
..
b105ee3
100644
(file)
--- a/
modules/imgproc/src/color.cpp
+++ b/
modules/imgproc/src/color.cpp
@@
-3313,12
+3313,15
@@
void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
dst = _dst.getMat();
/**/
#if defined (HAVE_IPP) && (IPP_VERSION_MAJOR >= 7)
+/*
if( code == CV_BGR2GRAY )
{
if( CvtColorIPPLoop(src, dst, IPPColor2GrayFunctor(ippicviColor2GrayC3Tab[depth])) )
return;
}
- else if( code == CV_RGB2GRAY )
+ else
+*/
+ if( code == CV_RGB2GRAY )
{
if( CvtColorIPPLoop(src, dst, IPPGeneralFunctor(ippicviRGB2GrayC3Tab[depth])) )
return;