rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[truetype] Some GX structure renames for generalization. 

We need this later on for MVAR also.

* src/truetype/ttgxvar.h (GX_HVarData): Renamed to...
(GX_ItemVarData): ...this.
(GX_HVarRegion): Renamed to...
(GX_VarRegion): ...this.
(GX_HVStore): Renamed to...
(GX_ItemVarStore): ...this.
(GX_WidthMap): Renamed to...
(GX_DeltaSetIdxMap): ...this.

(GX_HVarTable): Updated.

* src/truetype/ttgxvar.c: Updated.
This commit is contained in:
Werner Lemberg 2017-01-06 21:32:49 +01:00
parent 9c814704c0
commit 0bd0112f4e
3 changed files with 45 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ChangeLog
View File

@ -1,3 +1,22 @@
2017-01-06 Werner Lemberg <wl@gnu.org>
[truetype] Some GX structure renames for generalization.
We need this later on for MVAR also.
* src/truetype/ttgxvar.h (GX_HVarData): Renamed to...
(GX_ItemVarData): ...this.
(GX_HVarRegion): Renamed to...
(GX_VarRegion): ...this.
(GX_HVStore): Renamed to...
(GX_ItemVarStore): ...this.
(GX_WidthMap): Renamed to...
(GX_DeltaSetIdxMap): ...this.
(GX_HVarTable): Updated.
* src/truetype/ttgxvar.c: Updated.
2017-01-06 Werner Lemberg <wl@gnu.org>
[truetype] Code shuffling.

14
src/truetype/ttgxvar.c
View File

@ -417,10 +417,10 @@
FT_UInt i, j, k;
FT_UInt shortDeltaCount;
GX_Blend blend = face->blend;
GX_HVStore itemStore;
GX_HVarTable hvarTable;
GX_HVarData hvarData;
GX_Blend blend = face->blend;
GX_ItemVarStore itemStore;
GX_HVarTable hvarTable;
GX_ItemVarData hvarData;
FT_ULong* dataOffsetArray = NULL;
@ -617,8 +617,8 @@
FT_Error error;
GX_Blend blend = face->blend;
GX_WidthMap widthMap;
GX_Blend blend = face->blend;
GX_DeltaSetIdxMap widthMap;
FT_UShort format;
FT_UInt entrySize;
@ -822,7 +822,7 @@
{
FT_Error error = FT_Err_Ok;
GX_HVarData varData;
GX_ItemVarData varData;
FT_UInt master, j;
FT_Fixed netAdjustment = 0; /* accumulated adjustment */

38
src/truetype/ttgxvar.h
View File

@ -61,7 +61,7 @@ FT_BEGIN_HEADER
} GX_AVarSegmentRec, *GX_AVarSegment;
typedef struct GX_HVarDataRec_
typedef struct GX_ItemVarDataRec_
{
FT_UInt itemCount; /* number of delta sets per item */
FT_UInt regionIdxCount; /* number of region indices in this data */
@ -70,7 +70,7 @@ FT_BEGIN_HEADER
FT_Short* deltaSet; /* array of `itemCount' deltas */
/* use `innerIndex' for this array */
} GX_HVarDataRec, *GX_HVarData;
} GX_ItemVarDataRec, *GX_ItemVarData;
/* contribution of one axis to a region */
@ -83,33 +83,33 @@ FT_BEGIN_HEADER
} GX_AxisCoordsRec, *GX_AxisCoords;
typedef struct GX_HVarRegionRec_
typedef struct GX_VarRegionRec_
{
GX_AxisCoords axisList; /* array of axisCount records */
} GX_HVarRegionRec, *GX_HVarRegion;
} GX_VarRegionRec, *GX_VarRegion;
/* HVAR item variation store */
typedef struct GX_HVStoreRec_
/* item variation store */
typedef struct GX_ItemVarStoreRec_
{
FT_UInt dataCount;
GX_HVarData varData; /* array of dataCount records; */
/* use `outerIndex' for this array */
FT_UShort axisCount;
FT_UInt regionCount; /* total number of regions defined */
GX_HVarRegion varRegionList;
FT_UInt dataCount;
GX_ItemVarData varData; /* array of dataCount records; */
/* use `outerIndex' for this array */
FT_UShort axisCount;
FT_UInt regionCount; /* total number of regions defined */
GX_VarRegion varRegionList;
} GX_HVStoreRec, *GX_HVStore;
} GX_ItemVarStoreRec, *GX_ItemVarStore;
typedef struct GX_WidthMapRec_
typedef struct GX_DeltaSetIdxMapRec_
{
FT_UInt mapCount;
FT_UInt* outerIndex; /* indices to item var data */
FT_UInt* innerIndex; /* indices to delta set */
} GX_WidthMapRec, *GX_WidthMap;
} GX_DeltaSetIdxMapRec, *GX_DeltaSetIdxMap;
/*************************************************************************/
@ -122,11 +122,11 @@ FT_BEGIN_HEADER
/* */
typedef struct GX_HVarTableRec_
{
GX_HVStoreRec itemStore; /* Item Variation Store */
GX_WidthMapRec widthMap; /* Advance Width Mapping */
GX_ItemVarStoreRec itemStore; /* Item Variation Store */
GX_DeltaSetIdxMapRec widthMap; /* Advance Width Mapping */
#if 0
GX_LSBMap lsbMap; /* not implemented */
GX_RSBMap rsbMap; /* not implemented */
GX_DeltaSetIdxMapRec lsbMap; /* not implemented */
GX_DeltaSetIdxMapRec rsbMap; /* not implemented */
#endif
} GX_HVarTableRec, *GX_HVarTable;