ICU update to 58 part 2

source/i18n/scriptset.cpp

 // Copyright (C) 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html
 /*
 **********************************************************************
 *   Copyright (C) 2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *
 * scriptset.cpp
 *
@@ skipping 240 matching lines @@
 
 void ScriptSet::setScriptExtensions(UChar32 codePoint, UErrorCode& status) {
     if (U_FAILURE(status)) { return; }
     static const int32_t FIRST_GUESS_SCRIPT_CAPACITY = 5;
     MaybeStackArray<UScriptCode,FIRST_GUESS_SCRIPT_CAPACITY> scripts;
     UErrorCode internalStatus = U_ZERO_ERROR;
     int32_t script_count = -1;
 
     while (TRUE) {
         script_count = uscript_getScriptExtensions(
-            codePoint, scripts.getAlias(), FIRST_GUESS_SCRIPT_CAPACITY, &internalStatus);
+            codePoint, scripts.getAlias(), scripts.getCapacity(), &internalStatus);
         if (internalStatus == U_BUFFER_OVERFLOW_ERROR) {
             // Need to allocate more space
             if (scripts.resize(script_count) == NULL) {
                 status = U_MEMORY_ALLOCATION_ERROR;
                 return;
             }
             internalStatus = U_ZERO_ERROR;
         } else {
             break;
         }
@@ skipping 40 matching lines @@
 uhash_hashScriptSet(const UElement key) {
     icu::ScriptSet *s = static_cast<icu::ScriptSet *>(key.pointer);
     return s->hashCode();
 }
 
 U_CAPI void U_EXPORT2
 uhash_deleteScriptSet(void *obj) {
     icu::ScriptSet *s = static_cast<icu::ScriptSet *>(obj);
     delete s;
 }