harfbuzz-ng roll

third_party/harfbuzz-ng/src/hb-ot-layout-gdef-table.hh

 /*
  * Copyright © 2007,2008,2009  Red Hat, Inc.
  * Copyright © 2010,2011,2012  Google, Inc.
  *
  *  This is part of HarfBuzz, a text shaping library.
  *
  * Permission is hereby granted, without written agreement and without
  * license or royalty fees, to use, copy, modify, and distribute this
  * software and its documentation for any purpose, provided that the
  * above copyright notice and the following two paragraphs appear in
@@ skipping 16 matching lines @@
  */
 
 #ifndef HB_OT_LAYOUT_GDEF_TABLE_HH
 #define HB_OT_LAYOUT_GDEF_TABLE_HH
 
 #include "hb-ot-layout-common-private.hh"
 
 #include "hb-font-private.hh"
 
 
+namespace OT {
+
 
 /*
  * Attachment List Table
  */
 
 typedef ArrayOf<USHORT> AttachPoint;    /* Array of contour point indices--in
                                          * increasing numerical order */
 
 struct AttachList
 {
@@ skipping 20 matching lines @@
     }
 
     return points.len;
   }
 
   inline bool sanitize (hb_sanitize_context_t *c) {
     TRACE_SANITIZE ();
     return TRACE_RETURN (coverage.sanitize (c, this) && attachPoint.sanitize (c, this));
   }
 
-  private:
+  protected:
   OffsetTo<Coverage>
                 coverage;               /* Offset to Coverage table -- from
                                          * beginning of AttachList table */
   OffsetArrayOf<AttachPoint>
                 attachPoint;            /* Array of AttachPoint tables
                                          * in Coverage Index order */
   public:
   DEFINE_SIZE_ARRAY (4, attachPoint);
 };
 
 /*
  * Ligature Caret Table
  */
 
 struct CaretValueFormat1
 {
   friend struct CaretValue;
 
   private:
   inline hb_position_t get_caret_value (hb_font_t *font, hb_direction_t direction, hb_codepoint_t glyph_id HB_UNUSED) const
   {
     return HB_DIRECTION_IS_HORIZONTAL (direction) ? font->em_scale_x (coordinate) : font->em_scale_y (coordinate);
   }
 
   inline bool sanitize (hb_sanitize_context_t *c) {
     TRACE_SANITIZE ();
     return TRACE_RETURN (c->check_struct (this));
   }
 
-  private:
+  protected:
   USHORT        caretValueFormat;       /* Format identifier--format = 1 */
   SHORT         coordinate;             /* X or Y value, in design units */
   public:
   DEFINE_SIZE_STATIC (4);
 };
 
 struct CaretValueFormat2
 {
   friend struct CaretValue;
 
   private:
   inline hb_position_t get_caret_value (hb_font_t *font, hb_direction_t direction, hb_codepoint_t glyph_id) const
   {
     hb_position_t x, y;
-    if (hb_font_get_glyph_contour_point_for_origin (font, glyph_id, caretValuePoint, direction, &x, &y))
+    if (font->get_glyph_contour_point_for_origin (glyph_id, caretValuePoint, direction, &x, &y))
       return HB_DIRECTION_IS_HORIZONTAL (direction) ? x : y;
     else
       return 0;
   }
 
   inline bool sanitize (hb_sanitize_context_t *c) {
     TRACE_SANITIZE ();
     return TRACE_RETURN (c->check_struct (this));
   }
 
-  private:
+  protected:
   USHORT        caretValueFormat;       /* Format identifier--format = 2 */
   USHORT        caretValuePoint;        /* Contour point index on glyph */
   public:
   DEFINE_SIZE_STATIC (4);
 };
 
 struct CaretValueFormat3
 {
   friend struct CaretValue;
 
   inline hb_position_t get_caret_value (hb_font_t *font, hb_direction_t direction, hb_codepoint_t glyph_id HB_UNUSED) const
   {
     return HB_DIRECTION_IS_HORIZONTAL (direction) ?
            font->em_scale_x (coordinate) + (this+deviceTable).get_x_delta (font) :
            font->em_scale_y (coordinate) + (this+deviceTable).get_y_delta (font);
   }
 
   inline bool sanitize (hb_sanitize_context_t *c) {
     TRACE_SANITIZE ();
     return TRACE_RETURN (c->check_struct (this) && deviceTable.sanitize (c, this));
   }
 
-  private:
+  protected:
   USHORT        caretValueFormat;       /* Format identifier--format = 3 */
   SHORT         coordinate;             /* X or Y value, in design units */
   OffsetTo<Device>
                 deviceTable;            /* Offset to Device table for X or Y
                                          * value--from beginning of CaretValue
                                          * table */
   public:
   DEFINE_SIZE_STATIC (6);
 };
 
@@ skipping 13 matching lines @@
     TRACE_SANITIZE ();
     if (!u.format.sanitize (c)) return TRACE_RETURN (false);
     switch (u.format) {
     case 1: return TRACE_RETURN (u.format1.sanitize (c));
     case 2: return TRACE_RETURN (u.format2.sanitize (c));
     case 3: return TRACE_RETURN (u.format3.sanitize (c));
     default:return TRACE_RETURN (true);
     }
   }
 
-  private:
+  protected:
   union {
   USHORT                format;         /* Format identifier */
   CaretValueFormat1     format1;
   CaretValueFormat2     format2;
   CaretValueFormat3     format3;
   } u;
   public:
   DEFINE_SIZE_UNION (2, format);
 };
 
@@ skipping 14 matching lines @@
     }
 
     return carets.len;
   }
 
   inline bool sanitize (hb_sanitize_context_t *c) {
     TRACE_SANITIZE ();
     return TRACE_RETURN (carets.sanitize (c, this));
   }
 
-  private:
+  protected:
   OffsetArrayOf<CaretValue>
                 carets;                 /* Offset array of CaretValue tables
                                          * --from beginning of LigGlyph table
                                          * --in increasing coordinate order */
   public:
   DEFINE_SIZE_ARRAY (2, carets);
 };
 
 struct LigCaretList
 {
@@ skipping 13 matching lines @@
     }
     const LigGlyph &lig_glyph = this+ligGlyph[index];
     return lig_glyph.get_lig_carets (font, direction, glyph_id, start_offset, caret_count, caret_array);
   }
 
   inline bool sanitize (hb_sanitize_context_t *c) {
     TRACE_SANITIZE ();
     return TRACE_RETURN (coverage.sanitize (c, this) && ligGlyph.sanitize (c, this));
   }
 
-  private:
+  protected:
   OffsetTo<Coverage>
                 coverage;               /* Offset to Coverage table--from
                                          * beginning of LigCaretList table */
   OffsetArrayOf<LigGlyph>
                 ligGlyph;               /* Array of LigGlyph tables
                                          * in Coverage Index order */
   public:
   DEFINE_SIZE_ARRAY (4, ligGlyph);
 };
 
 
 struct MarkGlyphSetsFormat1
 {
   inline bool covers (unsigned int set_index, hb_codepoint_t glyph_id) const
   { return (this+coverage[set_index]).get_coverage (glyph_id) != NOT_COVERED; }
 
   inline bool sanitize (hb_sanitize_context_t *c) {
     TRACE_SANITIZE ();
     return TRACE_RETURN (coverage.sanitize (c, this));
   }
 
-  private:
+  protected:
   USHORT        format;                 /* Format identifier--format = 1 */
   LongOffsetArrayOf<Coverage>
                 coverage;               /* Array of long offsets to mark set
                                          * coverage tables */
   public:
   DEFINE_SIZE_ARRAY (4, coverage);
 };
 
 struct MarkGlyphSets
 {
   inline bool covers (unsigned int set_index, hb_codepoint_t glyph_id) const
   {
     switch (u.format) {
     case 1: return u.format1.covers (set_index, glyph_id);
     default:return false;
     }
   }
 
   inline bool sanitize (hb_sanitize_context_t *c) {
     TRACE_SANITIZE ();
     if (!u.format.sanitize (c)) return TRACE_RETURN (false);
     switch (u.format) {
     case 1: return TRACE_RETURN (u.format1.sanitize (c));
     default:return TRACE_RETURN (true);
     }
   }
 
-  private:
+  protected:
   union {
   USHORT                format;         /* Format identifier */
   MarkGlyphSetsFormat1  format1;
   } u;
   public:
   DEFINE_SIZE_UNION (2, format);
 };
 
 
 /*
@@ skipping 65 matching lines @@
     case BaseGlyph:             return HB_OT_LAYOUT_GLYPH_CLASS_BASE_GLYPH;
     case LigatureGlyph:         return HB_OT_LAYOUT_GLYPH_CLASS_LIGATURE;
     case ComponentGlyph:        return HB_OT_LAYOUT_GLYPH_CLASS_COMPONENT;
     case MarkGlyph:
           klass = get_mark_attachment_type (glyph);
           return HB_OT_LAYOUT_GLYPH_CLASS_MARK | (klass << 8);
     }
   }
 
 
-  private:
+  protected:
   FixedVersion  version;                /* Version of the GDEF table--currently
                                          * 0x00010002 */
   OffsetTo<ClassDef>
                 glyphClassDef;          /* Offset to class definition table
                                          * for glyph type--from beginning of
                                          * GDEF header (may be Null) */
   OffsetTo<AttachList>
                 attachList;             /* Offset to list of glyphs with
                                          * attachment points--from beginning
                                          * of GDEF header (may be Null) */
   OffsetTo<LigCaretList>
                 ligCaretList;           /* Offset to list of positioning points
                                          * for ligature carets--from beginning
                                          * of GDEF header (may be Null) */
   OffsetTo<ClassDef>
                 markAttachClassDef;     /* Offset to class definition table for
                                          * mark attachment type--from beginning
                                          * of GDEF header (may be Null) */
   OffsetTo<MarkGlyphSets>
                 markGlyphSetsDef[VAR];  /* Offset to the table of mark set
                                          * definitions--from beginning of GDEF
                                          * header (may be NULL).  Introduced
                                          * in version 00010002. */
   public:
   DEFINE_SIZE_ARRAY (12, markGlyphSetsDef);
 };
 
 
+} // namespace OT
+
 
 #endif /* HB_OT_LAYOUT_GDEF_TABLE_HH */