Merge pull request #514 from SSteve:master

6f64ad68 · Alexander Alekhin · 87267227 · 7869b5f0 · 6f64ad68
Commit 6f64ad68 authored Jan 19, 2016 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 4 deletions

matching.hpp modules/stereo/include/opencv2/stereo/matching.hpp +9 -4

No files found.
--- a/modules/stereo/include/opencv2/stereo/matching.hpp
+++ b/modules/stereo/include/opencv2/stereo/matching.hpp
@@ -170,11 +170,16 @@ namespace cv
                            {
                                j2 = (0 > j - d) ? (0) : (j - d);
                                xorul = left[(iwj)] ^ right[(iw + j2)];
-#if CV_SSE4_1
+#if CV_POPCNT
-                                c[(iwj)* (v + 1) + d] = (short)_mm_popcnt_u32(xorul);
+                                if (checkHardwareSupport(CV_CPU_POPCNT))
-#else
+                                {
-                                c[(iwj)* (v + 1) + d] = (short)(hammLut[xorul & MASK] + hammLut[(xorul >> 16) & MASK]);
+                                    c[(iwj)* (v + 1) + d] = (short)_mm_popcnt_u32(xorul);
+                                }
+                                else
 #endif
+                                {
+                                    c[(iwj)* (v + 1) + d] = (short)(hammLut[xorul & MASK] + hammLut[(xorul >> 16) & MASK]);
+                                }
                            }
                        }
                    }