Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2026-07-30 15:53:03 +04:00 · 2018-11-26 15:37:45 +03:00
parent f07856eab9 223893ea5a
commit 8f4e5c2fb8
20 changed files with 596 additions and 535 deletions
@@ -462,10 +462,9 @@ struct Hamming
            }
        }
 #else // NO NEON and NOT GNUC
-        typedef unsigned long long pop_t;
        HammingLUT lut;
        result = lut(reinterpret_cast<const unsigned char*> (a),
-                     reinterpret_cast<const unsigned char*> (b), size * sizeof(pop_t));
+                     reinterpret_cast<const unsigned char*> (b), size);
 #endif
        return result;
    }