Merge pull request #4193 from jklontz:master

9 years ago · ae71f0c086
parent 00b72df6c5 beed99dbc1
commit ae71f0c086
1 changed files with 4 additions and 2 deletions
--- a/modules/imgproc/src/color.cpp
+++ b/modules/imgproc/src/color.cpp
@ -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 //////////////////////////////////////