Merge pull request #4193 from jklontz:master

pull/4196/head
Alexander Alekhin 9 years ago
commit ae71f0c086
  1. 6
      modules/imgproc/src/color.cpp

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

Loading…
Cancel
Save