From beed99dbc18205760dc9a7c8721abd6e7b8a1026 Mon Sep 17 00:00:00 2001
From: Josh Klontz <josh@rankone.io>
Date: Tue, 14 Jul 2015 20:56:43 -0400
Subject: [PATCH] fixed conditional compilation of RGB2Gray<ushort> template
 specialization

---
 modules/imgproc/src/color.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/imgproc/src/color.cpp b/modules/imgproc/src/color.cpp
index 5d4a943daf..33ab41f4f8 100644
--- 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 //////////////////////////////////////