commit b57ce60745478b8a58ad4482c908e76d4cc7983a
author Victor Chang <vichang@google.com> Tue Nov 27 11:27:36 2018 +0000
committer Victor Chang <vichang@google.com> Thu Nov 29 16:42:06 2018 +0000
tree 987b5cb27bf6094e9006d828cda90b94b35617a1
parent b20ee793e0ad903b8be344178c97b3ffc4d880f6

Cherry-pick: Replace @Deprecated ICU API - USCRIPT_CODE_LIMIT

Cherry-pick from upstream:
https://github.com/harfbuzz/harfbuzz/pull/1418/

The API has been replaced by u_getIntPropertyMaxValue(UCHAR_SCRIPT)

Bug: 117094880
Test: m
Change-Id: Ic549ab231f572f75e6d3ccb41609917957496dc0

src/hb-icu.cc

diff --git a/src/hb-icu.cc b/src/hb-icu.cc
index e012314..68220bc 100644
--- a/src/hb-icu.cc
+++ b/src/hb-icu.cc
@@ -55,7 +55,8 @@
   if (unlikely (script == HB_SCRIPT_INVALID))
     return USCRIPT_INVALID_CODE;
 
-  for (unsigned int i = 0; i < USCRIPT_CODE_LIMIT; i++)
+  unsigned int maxScriptCode = u_getIntPropertyMaxValue(UCHAR_SCRIPT);
+  for (unsigned int i = 0; i <= maxScriptCode; i++)
     if (unlikely (hb_icu_script_to_script ((UScriptCode) i) == script))
       return (UScriptCode) i;