From 9483da145d6da1bdfa3224fe13a5b4e9b449d19f Mon Sep 17 00:00:00 2001
From: Michiharu Ariza <ariza@adobe.com>
Date: Fri, 30 Nov 2018 16:59:41 -0800
Subject: [PATCH] redo fixes

---
 src/hb-cff2-interp-cs.hh    | 2 +-
 src/hb-ot-cff1-table.hh     | 4 ++--
 src/hb-subset-cff-common.hh | 6 +++---
 src/hb-subset-cff1.cc       | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/hb-cff2-interp-cs.hh b/src/hb-cff2-interp-cs.hh
index 0d8a7043a..64e273204 100644
--- a/src/hb-cff2-interp-cs.hh
+++ b/src/hb-cff2-interp-cs.hh
@@ -136,7 +136,7 @@ struct CFF2CSInterpEnv : CSInterpEnv<BlendArg, CFF2Subrs>
         scalars.resize (region_count);
         varStore->varStore.get_scalars (get_ivs (),
                                         (int *)coords, num_coords,
-                                        &scalars[static_cast<unsigned int>(0)], region_count);
+                                        &scalars[0u], region_count);
       }
       seen_blend = true;
     }
diff --git a/src/hb-ot-cff1-table.hh b/src/hb-ot-cff1-table.hh
index 4e76c4217..2264e699d 100644
--- a/src/hb-ot-cff1-table.hh
+++ b/src/hb-ot-cff1-table.hh
@@ -1028,7 +1028,7 @@ struct cff1
       { fini (); return; }
 
       { /* parse top dict */
-        const ByteStr topDictStr = (*topDictIndex)[static_cast<unsigned int>(0)];
+        const ByteStr topDictStr = (*topDictIndex)[0u];
         if (unlikely (!topDictStr.sanitize (&sc))) { fini (); return; }
         CFF1TopDict_Interpreter top_interp;
         top_interp.env.init (topDictStr);
@@ -1112,7 +1112,7 @@ struct cff1
       else  /* non-CID */
       {
         CFF1TopDictValues  *font = &topDict;
-        PRIVDICTVAL  *priv = &privateDicts[static_cast<unsigned int>(0)];
+        PRIVDICTVAL  *priv = &privateDicts[0u];
         
         const ByteStr privDictStr (StructAtOffset<UnsizedByteStr> (cff, font->privateDictInfo.offset), font->privateDictInfo.size);
         if (unlikely (!privDictStr.sanitize (&sc))) { fini (); return; }
diff --git a/src/hb-subset-cff-common.hh b/src/hb-subset-cff-common.hh
index 6113f9e60..4113423c7 100644
--- a/src/hb-subset-cff-common.hh
+++ b/src/hb-subset-cff-common.hh
@@ -120,7 +120,7 @@ struct StrEncoder
       set_error ();
       return;
     }
-    memcpy (&buff[offset], &str.str[static_cast<unsigned int>(0)], str.len);
+    memcpy (&buff[offset], &str.str[0u], str.len);
   }
 
   inline bool is_error (void) const { return error; }
@@ -226,7 +226,7 @@ struct CFFFontDict_OpSerializer : OpSerializer
     {
       HBUINT8 *d = c->allocate_size<HBUINT8> (opstr.str.len);
       if (unlikely (d == nullptr)) return_trace (false);
-      memcpy (d, &opstr.str.str[static_cast<unsigned int>(0)], opstr.str.len);
+      memcpy (d, &opstr.str.str[0u], opstr.str.len);
     }
     return_trace (true);
   }
@@ -869,7 +869,7 @@ struct SubrSubsetter
       {
         for (int i = pos - 1; i >= 0; i--)
         {
-          ParsedCSOp  &csop = str.values[static_cast<unsigned int>(i)];
+          ParsedCSOp  &csop = str.values[(unsigned)i];
           if (csop.for_drop ())
             break;
           csop.set_drop ();
diff --git a/src/hb-subset-cff1.cc b/src/hb-subset-cff1.cc
index 89df106a7..9d34c348e 100644
--- a/src/hb-subset-cff1.cc
+++ b/src/hb-subset-cff1.cc
@@ -599,7 +599,7 @@ struct cff_subset_plan {
                       hb_subset_plan_t *plan)
   {
      /* make sure notdef is first */
-    if ((plan->glyphs.len == 0) || (plan->glyphs[static_cast<unsigned int>(0)] != 0)) return false;
+    if ((plan->glyphs.len == 0) || (plan->glyphs[0u] != 0)) return false;
 
     final_size = 0;
     num_glyphs = plan->glyphs.len;
@@ -813,7 +813,7 @@ struct cff_subset_plan {
     }
 
     if (!acc.is_CID ())
-      offsets.privateDictInfo = fontdicts_mod[static_cast<unsigned int>(0)].privateDictInfo;
+      offsets.privateDictInfo = fontdicts_mod[0u].privateDictInfo;
 
     return ((subset_charstrings.len == plan->glyphs.len)
            && (fontdicts_mod.len == subset_fdcount));