diff options
author | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-11-21 02:02:25 +0000 |
---|---|---|
committer | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-11-21 02:02:25 +0000 |
commit | b0a327e9390da5865d4c56db5e5259adc3380d37 (patch) | |
tree | d0992f9729c714bbc536956cf21d8ca4752725f3 /src/sfnt/SkOTTable_glyf.h | |
parent | 158c59524ce57a0e124cb02db2b72302f6200932 (diff) |
Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@6521 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/sfnt/SkOTTable_glyf.h')
-rw-r--r-- | src/sfnt/SkOTTable_glyf.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/sfnt/SkOTTable_glyf.h b/src/sfnt/SkOTTable_glyf.h index c6741a2e9e..a52fd06fe6 100644 --- a/src/sfnt/SkOTTable_glyf.h +++ b/src/sfnt/SkOTTable_glyf.h @@ -26,7 +26,7 @@ struct SkOTTableGlyph { static const SK_OT_CHAR TAG2 = 'y'; static const SK_OT_CHAR TAG3 = 'f'; static const SK_OT_ULONG TAG = SkOTTableTAG<SkOTTableGlyph>::value; - + class Iterator { public: Iterator(const SkOTTableGlyph& glyf, @@ -36,7 +36,7 @@ struct SkOTTableGlyph { , fLocaFormat(SkOTTableHead::IndexToLocFormat::ShortOffsets == locaFormat.value ? 0 : 1) , fCurrentGlyphOffset(0) { fLocaPtr.shortOffset = reinterpret_cast<const SK_OT_USHORT*>(&loca); } - + void advance(uint16_t num) { fLocaPtr.shortOffset += num << fLocaFormat; fCurrentGlyphOffset = fLocaFormat ? SkEndian_SwapBE32(*fLocaPtr.longOffset) @@ -70,15 +70,15 @@ struct SkOTTableGlyphData { SK_OT_FWORD yMin; SK_OT_FWORD xMax; SK_OT_FWORD yMax; - + struct Simple { SK_OT_USHORT endPtsOfContours[1/*numberOfContours*/]; - + struct Instructions { SK_OT_USHORT length; SK_OT_BYTE data[1/*length*/]; }; - + union Flags { struct Field { SK_OT_BYTE_BITFIELD( @@ -101,11 +101,11 @@ struct SkOTTableGlyphData { SK_OT_BYTE value; } raw; }; - + //xCoordinates //yCoordinates }; - + struct Composite { struct Component { union Flags { @@ -140,7 +140,7 @@ struct SkOTTableGlyphData { static const SK_OT_USHORT MORE_COMPONENTS_Mask = SkTEndian_SwapBE16(1 << 5); static const SK_OT_USHORT WE_HAVE_AN_X_AND_Y_SCALE_Mask = SkTEndian_SwapBE16(1 << 6); static const SK_OT_USHORT WE_HAVE_A_TWO_BY_TWO_Mask = SkTEndian_SwapBE16(1 << 7); - + static const SK_OT_USHORT WE_HAVE_INSTRUCTIONS_Mask = SkTEndian_SwapBE16(1 << 8); static const SK_OT_USHORT USE_MY_METRICS_Mask = SkTEndian_SwapBE16(1 << 9); static const SK_OT_USHORT OVERLAP_COMPOUND_Mask = SkTEndian_SwapBE16(1 << 10); @@ -200,7 +200,7 @@ struct SkOTTableGlyphData { } byteIndex; } transform; } component;//[] last element does not set MORE_COMPONENTS - + /** Comes after the last Component if the last component has WE_HAVE_INSTR. */ struct Instructions { SK_OT_USHORT length; |