summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Kling <andreas.kling@nokia.com>2010-06-15 09:44:51 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2010-06-15 14:58:03 +0200
commit40fb1998d0a47f2577855a9b076c0fbe2f676fcf (patch)
tree45040879a949602a0fbad8e75d8258ca1f9b0d61
parent85ad0ddd092522b4cff251f324128662f100991f (diff)
Shrink twelve HB_UShorts that only need to contain HB_Bytes.
Signed-off-by: Simon Hausmann <simon.hausmann@nokia.com> Signed-off-by: Lars Knoll <lars.knoll@nokia.com>
-rw-r--r--src/harfbuzz-gdef-private.h2
-rw-r--r--src/harfbuzz-gpos-private.h10
-rw-r--r--src/harfbuzz-gsub-private.h6
-rw-r--r--src/harfbuzz-open.h6
4 files changed, 12 insertions, 12 deletions
diff --git a/src/harfbuzz-gdef-private.h b/src/harfbuzz-gdef-private.h
index da06b6f..31d68f7 100644
--- a/src/harfbuzz-gdef-private.h
+++ b/src/harfbuzz-gdef-private.h
@@ -79,7 +79,7 @@ typedef struct HB_CaretValueFormat4_ HB_CaretValueFormat4;
struct HB_CaretValue_
{
- HB_UShort CaretValueFormat; /* 1, 2, 3, or 4 */
+ HB_Byte CaretValueFormat; /* 1, 2, 3, or 4 */
union
{
diff --git a/src/harfbuzz-gpos-private.h b/src/harfbuzz-gpos-private.h
index 4110700..54bbe01 100644
--- a/src/harfbuzz-gpos-private.h
+++ b/src/harfbuzz-gpos-private.h
@@ -120,7 +120,7 @@ typedef struct HB_AnchorFormat4_ HB_AnchorFormat4;
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
@@ -175,7 +175,7 @@ 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 */
@@ -255,7 +255,7 @@ 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 */
@@ -507,7 +507,7 @@ typedef struct HB_ContextPosFormat3_ HB_ContextPosFormat3;
struct HB_ContextPos_
{
- HB_UShort PosFormat; /* 1, 2, or 3 */
+ HB_Byte PosFormat; /* 1, 2, or 3 */
union
{
@@ -656,7 +656,7 @@ typedef struct HB_ChainContextPosFormat3_ HB_ChainContextPosFormat3;
struct HB_ChainContextPos_
{
- HB_UShort PosFormat; /* 1, 2, or 3 */
+ HB_Byte PosFormat; /* 1, 2, or 3 */
union
{
diff --git a/src/harfbuzz-gsub-private.h b/src/harfbuzz-gsub-private.h
index dd5ffdf..4e08839 100644
--- a/src/harfbuzz-gsub-private.h
+++ b/src/harfbuzz-gsub-private.h
@@ -58,7 +58,7 @@ typedef struct HB_SingleSubstFormat2_ HB_SingleSubstFormat2;
struct HB_SingleSubst_
{
- HB_UShort SubstFormat; /* 1 or 2 */
+ HB_Byte SubstFormat; /* 1 or 2 */
HB_Coverage Coverage; /* Coverage table */
union
@@ -255,7 +255,7 @@ typedef struct HB_ContextSubstFormat3_ HB_ContextSubstFormat3;
struct HB_ContextSubst_
{
- HB_UShort SubstFormat; /* 1, 2, or 3 */
+ HB_Byte SubstFormat; /* 1, 2, or 3 */
union
{
@@ -404,7 +404,7 @@ typedef struct HB_ChainContextSubstFormat3_ HB_ChainContextSubstFormat3;
struct HB_ChainContextSubst_
{
- HB_UShort SubstFormat; /* 1, 2, or 3 */
+ HB_Byte SubstFormat; /* 1, 2, or 3 */
union
{
diff --git a/src/harfbuzz-open.h b/src/harfbuzz-open.h
index bdc6358..7d3bc1b 100644
--- a/src/harfbuzz-open.h
+++ b/src/harfbuzz-open.h
@@ -196,7 +196,7 @@ typedef struct HB_CoverageFormat2_ HB_CoverageFormat2;
struct HB_Coverage_
{
- HB_UShort CoverageFormat; /* 1 or 2 */
+ HB_Byte CoverageFormat; /* 1 or 2 */
union
{
@@ -244,7 +244,7 @@ struct HB_ClassDefinition_
{
HB_Bool loaded;
- HB_UShort ClassFormat; /* 1 or 2 */
+ HB_Byte ClassFormat; /* 1 or 2 */
union
{
@@ -260,7 +260,7 @@ struct HB_Device_
{
HB_UShort StartSize; /* smallest size to correct */
HB_UShort EndSize; /* largest size to correct */
- HB_UShort DeltaFormat; /* DeltaValue array data format:
+ HB_Byte DeltaFormat; /* DeltaValue array data format:
1, 2, or 3 */
HB_UShort* DeltaValue; /* array of compressed data */
};