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

*** 214,224 ****
                                                     offset, length, format);
    }
  
    USHORT firstGlyphIndex;
    USHORT lastGlyphIndex;
!   OffsetTo<IndexSubtable, ULONG> offsetToSubtable;
  
    DEFINE_SIZE_STATIC(8);
  };
  
  struct IndexSubtableArray
--- 214,224 ----
                                                     offset, length, format);
    }
  
    USHORT firstGlyphIndex;
    USHORT lastGlyphIndex;
!   LOffsetTo<IndexSubtable> offsetToSubtable;
  
    DEFINE_SIZE_STATIC(8);
  };
  
  struct IndexSubtableArray
*** 243,253 ****
        unsigned int lastGlyphIndex = indexSubtablesZ[i].lastGlyphIndex;
        if (firstGlyphIndex <= glyph && glyph <= lastGlyphIndex) {
          return &indexSubtablesZ[i];
        }
      }
!     return NULL;
    }
  
    protected:
    IndexSubtableRecord indexSubtablesZ[VAR];
  
--- 243,253 ----
        unsigned int lastGlyphIndex = indexSubtablesZ[i].lastGlyphIndex;
        if (firstGlyphIndex <= glyph && glyph <= lastGlyphIndex) {
          return &indexSubtablesZ[i];
        }
      }
!     return nullptr;
    }
  
    protected:
    IndexSubtableRecord indexSubtablesZ[VAR];
  
*** 273,283 ****
    {
      return (base+indexSubtableArrayOffset).find_table (glyph, numberOfIndexSubtables);
    }
  
    protected:
!   OffsetTo<IndexSubtableArray, ULONG> indexSubtableArrayOffset;
    ULONG indexTablesSize;
    ULONG numberOfIndexSubtables;
    ULONG colorRef;
    SBitLineMetrics horizontal;
    SBitLineMetrics vertical;
--- 273,283 ----
    {
      return (base+indexSubtableArrayOffset).find_table (glyph, numberOfIndexSubtables);
    }
  
    protected:
!   LOffsetTo<IndexSubtableArray> indexSubtableArrayOffset;
    ULONG indexTablesSize;
    ULONG numberOfIndexSubtables;
    ULONG colorRef;
    SBitLineMetrics horizontal;
    SBitLineMetrics vertical;
*** 342,357 ****
          *y_ppem = sizeTables[i].ppemY;
          return sizeTables[i].find_table (glyph, this);
        }
      }
  
!     return NULL;
    }
  
    protected:
!   FixedVersion<>version;
!   ArrayOf<BitmapSizeTable, ULONG> sizeTables;
  
    public:
    DEFINE_SIZE_ARRAY(8, sizeTables);
  };
  
--- 342,357 ----
          *y_ppem = sizeTables[i].ppemY;
          return sizeTables[i].find_table (glyph, this);
        }
      }
  
!     return nullptr;
    }
  
    protected:
!   FixedVersion<>                version;
!   LArrayOf<BitmapSizeTable>     sizeTables;
  
    public:
    DEFINE_SIZE_ARRAY(8, sizeTables);
  };