src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cbdt-table.hh

@@ -214,11 +214,11 @@
                                                    offset, length, format);
   }
 
   USHORT firstGlyphIndex;
   USHORT lastGlyphIndex;
-  OffsetTo<IndexSubtable, ULONG> offsetToSubtable;
+  LOffsetTo<IndexSubtable> offsetToSubtable;
 
   DEFINE_SIZE_STATIC(8);
 };
 
 struct IndexSubtableArray

@@ -243,11 +243,11 @@
       unsigned int lastGlyphIndex = indexSubtablesZ[i].lastGlyphIndex;
       if (firstGlyphIndex <= glyph && glyph <= lastGlyphIndex) {
         return &indexSubtablesZ[i];
       }
     }
-    return NULL;
+    return nullptr;
   }
 
   protected:
   IndexSubtableRecord indexSubtablesZ[VAR];
 

@@ -273,11 +273,11 @@
   {
     return (base+indexSubtableArrayOffset).find_table (glyph, numberOfIndexSubtables);
   }
 
   protected:
-  OffsetTo<IndexSubtableArray, ULONG> indexSubtableArrayOffset;
+  LOffsetTo<IndexSubtableArray> indexSubtableArrayOffset;
   ULONG indexTablesSize;
   ULONG numberOfIndexSubtables;
   ULONG colorRef;
   SBitLineMetrics horizontal;
   SBitLineMetrics vertical;

@@ -342,16 +342,16 @@
         *y_ppem = sizeTables[i].ppemY;
         return sizeTables[i].find_table (glyph, this);
       }
     }
 
-    return NULL;
+    return nullptr;
   }
 
   protected:
-  FixedVersion<>version;
-  ArrayOf<BitmapSizeTable, ULONG> sizeTables;
+  FixedVersion<>                version;
+  LArrayOf<BitmapSizeTable>     sizeTables;
 
   public:
   DEFINE_SIZE_ARRAY(8, sizeTables);
 };