mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-19 06:53:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4193 from jklontz:master

Browse Source
This commit is contained in:
Alexander Alekhin 2015-07-15 10:12:07 +00:00
commit ae71f0c086
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/imgproc/src/color.cpp
View File

@ -1674,7 +1674,9 @@ struct RGB2Gray<float>
bool haveSIMD;
};
#else
#endif // CV_SSE2
#if !CV_NEON && !CV_SSE4_1
template<> struct RGB2Gray<ushort>
{
@ -1698,7 +1700,7 @@ template<> struct RGB2Gray<ushort>
int coeffs[3];
};
#endif
#endif // !CV_NEON && !CV_SSE4_1
///////////////////////////////////// RGB <-> YCrCb //////////////////////////////////////