Merge pull request #4193 from jklontz:master

ae71f0c0 · Alexander Alekhin · 00b72df6 · beed99db · ae71f0c0
Commit ae71f0c0 authored Jul 15, 2015 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

color.cpp modules/imgproc/src/color.cpp +4 -2

No files found.
--- 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 //////////////////////////////////////