Merge pull request #514 from SSteve:master

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
-                                c[(iwj)* (v + 1) + d] = (short)_mm_popcnt_u32(xorul);
-#else
-                                c[(iwj)* (v + 1) + d] = (short)(hammLut[xorul & MASK] + hammLut[(xorul >> 16) & MASK]);
+#if CV_POPCNT
+                                if (checkHardwareSupport(CV_CPU_POPCNT))
+                                {
+                                    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]);
+                                }
                             }
                         }
                     }