Imported Upstream version 2.6.7

[platform/upstream/harfbuzz.git] / src / hb-ucd.cc

diff --git a/src/hb-ucd.cc b/src/hb-ucd.cc
index b29f2a9..ad72a26 100644 (file)
--- a/src/hb-ucd.cc
+++ b/src/hb-ucd.cc
@@ -136,20 +136,22 @@ hb_ucd_compose (hb_unicode_funcs_t *ufuncs HB_UNUSED,
   if ((a & 0xFFFFF800u) == 0x0000u && (b & 0xFFFFFF80) == 0x0300u)
   {
     uint32_t k = HB_CODEPOINT_ENCODE3_11_7_14 (a, b, 0);
-    uint32_t *v = (uint32_t*) hb_bsearch (&k, _hb_ucd_dm2_u32_map,
-                                         ARRAY_LENGTH (_hb_ucd_dm2_u32_map),
-                                         sizeof (*_hb_ucd_dm2_u32_map),
-                                         _cmp_pair_11_7_14);
+    const uint32_t *v = hb_bsearch (k,
+                                   _hb_ucd_dm2_u32_map,
+                                   ARRAY_LENGTH (_hb_ucd_dm2_u32_map),
+                                   sizeof (*_hb_ucd_dm2_u32_map),
+                                   _cmp_pair_11_7_14);
     if (likely (!v)) return false;
     u = HB_CODEPOINT_DECODE3_11_7_14_3 (*v);
   }
   else
   {
     uint64_t k = HB_CODEPOINT_ENCODE3 (a, b, 0);
-    uint64_t *v = (uint64_t*) hb_bsearch (&k, _hb_ucd_dm2_u64_map,
-                                         ARRAY_LENGTH (_hb_ucd_dm2_u64_map),
-                                         sizeof (*_hb_ucd_dm2_u64_map),
-                                         _cmp_pair);
+    const uint64_t *v = hb_bsearch (k,
+                                   _hb_ucd_dm2_u64_map,
+                                   ARRAY_LENGTH (_hb_ucd_dm2_u64_map),
+                                   sizeof (*_hb_ucd_dm2_u64_map),
+                                   _cmp_pair);
     if (likely (!v)) return false;
     u = HB_CODEPOINT_DECODE3_3 (*v);
   }