Update (old) harfbuzz to ToT

third_party/harfbuzz/src/harfbuzz-gpos-private.h

 /*
  * Copyright (C) 1998-2004  David Turner and Werner Lemberg
  * Copyright (C) 2006  Behdad Esfahbod
  *
  * This is part of HarfBuzz, an OpenType Layout engine 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 14 matching lines @@
 
 #ifndef HARFBUZZ_GPOS_PRIVATE_H
 #define HARFBUZZ_GPOS_PRIVATE_H
 
 #include "harfbuzz-impl.h"
 #include "harfbuzz-stream-private.h"
 #include "harfbuzz-gpos.h"
 
 HB_BEGIN_HEADER
 
+#ifdef HB_USE_PACKED_STRUCTS
+#pragma pack(push, 1)
+#endif
 
 /* shared tables */
 
+#define VR_X_PLACEMENT_DEVICE 0
+#define VR_Y_PLACEMENT_DEVICE 1
+#define VR_X_ADVANCE_DEVICE   2
+#define VR_Y_ADVANCE_DEVICE   3
+
 struct  HB_ValueRecord_
 {
   HB_Short    XPlacement;             /* horizontal adjustment for
                                          placement                      */
   HB_Short    YPlacement;             /* vertical adjustment for
                                          placement                      */
   HB_Short    XAdvance;               /* horizontal adjustment for
                                          advance                        */
   HB_Short    YAdvance;               /* vertical adjustment for
                                          advance                        */
-  HB_Device  XPlacementDevice;       /* device table for horizontal
-                                         placement                      */
-  HB_Device  YPlacementDevice;       /* device table for vertical
-                                         placement                      */
-  HB_Device  XAdvanceDevice;         /* device table for horizontal
-                                         advance                        */
-  HB_Device  YAdvanceDevice;         /* device table for vertical
-                                         advance                        */
+
+  HB_Device** DeviceTables;           /* device tables for placement
+                                         and advance                    */
+
+#ifdef HB_SUPPORT_MULTIPLE_MASTER
   HB_UShort   XIdPlacement;           /* horizontal placement metric ID */
   HB_UShort   YIdPlacement;           /* vertical placement metric ID   */
   HB_UShort   XIdAdvance;             /* horizontal advance metric ID   */
   HB_UShort   YIdAdvance;             /* vertical advance metric ID     */
+#endif
 };
 
 typedef struct HB_ValueRecord_  HB_ValueRecord;
 
 
 /* Mask values to scan the value format of the ValueRecord structure.
  We always expand compressed ValueRecords of the font.              */
 
+#define HB_GPOS_FORMAT_HAVE_DEVICE_TABLES       0x00F0
+
 #define HB_GPOS_FORMAT_HAVE_X_PLACEMENT         0x0001
 #define HB_GPOS_FORMAT_HAVE_Y_PLACEMENT         0x0002
 #define HB_GPOS_FORMAT_HAVE_X_ADVANCE           0x0004
 #define HB_GPOS_FORMAT_HAVE_Y_ADVANCE           0x0008
 #define HB_GPOS_FORMAT_HAVE_X_PLACEMENT_DEVICE  0x0010
 #define HB_GPOS_FORMAT_HAVE_Y_PLACEMENT_DEVICE  0x0020
 #define HB_GPOS_FORMAT_HAVE_X_ADVANCE_DEVICE    0x0040
 #define HB_GPOS_FORMAT_HAVE_Y_ADVANCE_DEVICE    0x0080
 #define HB_GPOS_FORMAT_HAVE_X_ID_PLACEMENT      0x0100
 #define HB_GPOS_FORMAT_HAVE_Y_ID_PLACEMENT      0x0200
@@ skipping 12 matching lines @@
 
 struct  HB_AnchorFormat2_
 {
   HB_Short   XCoordinate;             /* horizontal value             */
   HB_Short   YCoordinate;             /* vertical value               */
   HB_UShort  AnchorPoint;             /* index to glyph contour point */
 };
 
 typedef struct HB_AnchorFormat2_  HB_AnchorFormat2;
 
+#define AF3_X_DEVICE_TABLE 0
+#define AF3_Y_DEVICE_TABLE 1
 
 struct  HB_AnchorFormat3_
 {
   HB_Short    XCoordinate;            /* horizontal value              */
   HB_Short    YCoordinate;            /* vertical value                */
-  HB_Device  XDeviceTable;           /* device table for X coordinate */
-  HB_Device  YDeviceTable;           /* device table for Y coordinate */
+  HB_Device** DeviceTables;           /* device tables for coordinates */
 };
 
 typedef struct HB_AnchorFormat3_  HB_AnchorFormat3;
 
 
+#ifdef HB_SUPPORT_MULTIPLE_MASTER
 struct  HB_AnchorFormat4_
 {
   HB_UShort  XIdAnchor;               /* horizontal metric ID */
   HB_UShort  YIdAnchor;               /* vertical metric ID   */
 };
 
 typedef struct HB_AnchorFormat4_  HB_AnchorFormat4;
+#endif
 
 
 struct  HB_Anchor_
 {
-  HB_UShort  PosFormat;               /* 1, 2, 3, or 4 -- 0 indicates
+  HB_Byte  PosFormat;                 /* 1, 2, 3, or 4 -- 0 indicates
                                          that there is no Anchor table */
 
   union
   {
     HB_AnchorFormat1  af1;
     HB_AnchorFormat2  af2;
     HB_AnchorFormat3  af3;
+#ifdef HB_SUPPORT_MULTIPLE_MASTER
     HB_AnchorFormat4  af4;
+#endif
   } af;
 };
 
 typedef struct HB_Anchor_  HB_Anchor;
 
 
 struct  HB_MarkRecord_
 {
   HB_UShort   Class;                  /* mark class   */
   HB_Anchor  MarkAnchor;             /* anchor table */
@@ skipping 26 matching lines @@
 {
   HB_UShort         ValueCount;       /* number of ValueRecord tables */
   HB_ValueRecord*  Value;            /* array of ValueRecord tables  */
 };
 
 typedef struct HB_SinglePosFormat2_  HB_SinglePosFormat2;
 
 
 struct  HB_SinglePos_
 {
-  HB_UShort     PosFormat;            /* 1 or 2         */
+  HB_Byte       PosFormat;            /* 1 or 2         */
   HB_Coverage  Coverage;             /* Coverage table */
 
   HB_UShort     ValueFormat;          /* format of ValueRecord table */
 
   union
   {
     HB_SinglePosFormat1  spf1;
     HB_SinglePosFormat2  spf2;
   } spf;
 };
@@ skipping 59 matching lines @@
   HB_UShort            Class2Count;   /* number of classes in ClassDef2
                                          table                          */
   HB_Class1Record*    Class1Record;  /* array of Class1Record tables   */
 };
 
 typedef struct HB_PairPosFormat2_  HB_PairPosFormat2;
 
 
 struct  HB_PairPos_
 {
-  HB_UShort     PosFormat;            /* 1 or 2         */
+  HB_Byte       PosFormat;            /* 1 or 2         */
   HB_Coverage  Coverage;             /* Coverage table */
   HB_UShort     ValueFormat1;         /* format of ValueRecord table
                                          for first glyph             */
   HB_UShort     ValueFormat2;         /* format of ValueRecord table
                                          for second glyph            */
 
   union
   {
     HB_PairPosFormat1  ppf1;
     HB_PairPosFormat2  ppf2;
@@ skipping 231 matching lines @@
   HB_Coverage*         Coverage;     /* array of Coverage tables         */
   HB_PosLookupRecord*  PosLookupRecord;
                                       /* array of PosLookupRecord tables  */
 };
 
 typedef struct HB_ContextPosFormat3_  HB_ContextPosFormat3;
 
 
 struct  HB_ContextPos_
 {
-  HB_UShort  PosFormat;               /* 1, 2, or 3     */
+  HB_Byte  PosFormat;                 /* 1, 2, or 3     */
 
   union
   {
     HB_ContextPosFormat1  cpf1;
     HB_ContextPosFormat2  cpf2;
     HB_ContextPosFormat3  cpf3;
   } cpf;
 };
 
 typedef struct HB_ContextPos_  HB_ContextPos;
 
 
 /* LookupType 8 */
 
 struct  HB_ChainPosRule_
 {
+  HB_UShort*            Backtrack;    /* array of backtrack glyph IDs     */
+  HB_UShort*            Input;        /* array of input glyph IDs         */
+  HB_UShort*            Lookahead;    /* array of lookahead glyph IDs     */
+  HB_PosLookupRecord*  PosLookupRecord;
+                                      /* array of PosLookupRecords       */
   HB_UShort             BacktrackGlyphCount;
                                       /* total number of backtrack glyphs */
-  HB_UShort*            Backtrack;    /* array of backtrack glyph IDs     */
   HB_UShort             InputGlyphCount;
                                       /* total number of input glyphs     */
-  HB_UShort*            Input;        /* array of input glyph IDs         */
   HB_UShort             LookaheadGlyphCount;
                                       /* total number of lookahead glyphs */
-  HB_UShort*            Lookahead;    /* array of lookahead glyph IDs     */
   HB_UShort             PosCount;     /* number of PosLookupRecords       */
-  HB_PosLookupRecord*  PosLookupRecord;
-                                      /* array of PosLookupRecords       */
 };
 
 typedef struct HB_ChainPosRule_  HB_ChainPosRule;
 
 
 struct  HB_ChainPosRuleSet_
 {
   HB_UShort          ChainPosRuleCount;
                                       /* number of ChainPosRule tables */
   HB_ChainPosRule*  ChainPosRule;    /* array of ChainPosRule tables  */
 };
 
 typedef struct HB_ChainPosRuleSet_  HB_ChainPosRuleSet;
 
 
 struct  HB_ChainContextPosFormat1_
 {
   HB_Coverage          Coverage;     /* Coverage table                   */
   HB_UShort             ChainPosRuleSetCount;
                                       /* number of ChainPosRuleSet tables */
   HB_ChainPosRuleSet*  ChainPosRuleSet;
                                       /* array of ChainPosRuleSet tables  */
 };
 
 typedef struct HB_ChainContextPosFormat1_  HB_ChainContextPosFormat1;
 
 
 struct  HB_ChainPosClassRule_
 {
+  HB_UShort*            Backtrack;    /* array of backtrack classes      */
+  HB_UShort*            Input;        /* array of context classes        */
+  HB_UShort*            Lookahead;    /* array of lookahead classes      */
+  HB_PosLookupRecord*  PosLookupRecord;
+                                      /* array of substitution lookups   */
   HB_UShort             BacktrackGlyphCount;
                                       /* total number of backtrack
                                          classes                         */
-  HB_UShort*            Backtrack;    /* array of backtrack classes      */
   HB_UShort             InputGlyphCount;
                                       /* total number of context classes */
-  HB_UShort*            Input;        /* array of context classes        */
   HB_UShort             LookaheadGlyphCount;
                                       /* total number of lookahead
                                          classes                         */
-  HB_UShort*            Lookahead;    /* array of lookahead classes      */
   HB_UShort             PosCount;     /* number of PosLookupRecords      */
-  HB_PosLookupRecord*  PosLookupRecord;
-                                      /* array of substitution lookups   */
 };
 
 typedef struct HB_ChainPosClassRule_  HB_ChainPosClassRule;
 
 
 struct  HB_ChainPosClassSet_
 {
   HB_UShort               ChainPosClassRuleCount;
                                       /* number of ChainPosClassRule
                                          tables                      */
@@ skipping 57 matching lines @@
   HB_UShort             PosCount;     /* number of PosLookupRecords    */
   HB_PosLookupRecord*  PosLookupRecord;
                                       /* array of substitution lookups */
 };
 
 typedef struct HB_ChainContextPosFormat3_  HB_ChainContextPosFormat3;
 
 
 struct  HB_ChainContextPos_
 {
-  HB_UShort  PosFormat;             /* 1, 2, or 3 */
+  HB_Byte  PosFormat;               /* 1, 2, or 3 */
 
   union
   {
     HB_ChainContextPosFormat1  ccpf1;
     HB_ChainContextPosFormat2  ccpf2;
     HB_ChainContextPosFormat3  ccpf3;
   } ccpf;
 };
 
 typedef struct HB_ChainContextPos_  HB_ChainContextPos;
@@ skipping 30 matching lines @@
 
 HB_INTERNAL HB_Error
 _HB_GPOS_Load_SubTable( HB_GPOS_SubTable* st,
                                   HB_Stream     stream,
                                   HB_UShort     lookup_type );
 
 HB_INTERNAL void
 _HB_GPOS_Free_SubTable( HB_GPOS_SubTable* st,
                               HB_UShort     lookup_type );
 
+#ifdef HB_USE_PACKED_STRUCTS
+#pragma pack(pop)
+#endif
+
 HB_END_HEADER
 
 #endif /* HARFBUZZ_GPOS_PRIVATE_H */