Merge branch 'master' into gtk3

Beep6581 · Jul 12, 2016 · 2bfb0ac · 2bfb0ac
2 parents f22172c + 5127e94
commit 2bfb0ac
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/rtengine/median.h b/rtengine/median.h
@@ -6244,6 +6244,7 @@ inline std::array<T, 4> middle4of6(const std::array<T, 6>& array)
     return res;
 }
 
+#ifdef __SSE2__
 template<>
 inline std::array<vfloat, 4> middle4of6(const std::array<vfloat, 6>& array)
 {
@@ -6267,6 +6268,7 @@ inline std::array<vfloat, 4> middle4of6(const std::array<vfloat, 6>& array)
 
     return res;
 }
+#endif
 
 template<typename T>
 inline std::array<T, 4> middle4of6(T arg0, T arg1, T arg2, T arg3, T arg4, T arg5)