From 7c9930447404e33ea92f0b76324247d7796ae5f6 Mon Sep 17 00:00:00 2001 From: Jens Kutilek Date: Fri, 19 Sep 2014 17:51:13 +0200 Subject: [PATCH] Change unknown header fields to version, flags --- Lib/fontTools/ttLib/tables/_s_b_i_x.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Lib/fontTools/ttLib/tables/_s_b_i_x.py b/Lib/fontTools/ttLib/tables/_s_b_i_x.py index 1f65eaa52..2f38ffb4c 100644 --- a/Lib/fontTools/ttLib/tables/_s_b_i_x.py +++ b/Lib/fontTools/ttLib/tables/_s_b_i_x.py @@ -44,8 +44,8 @@ char[4] format data type, e.g. "png " sbixHeaderFormat = """ > - usVal1: H # 00 01 - usVal2: H # 00 01 + version: H # 00 01 + flags: H # 00 01 numSets: L # 00 00 00 02 # number of bitmap sets """ sbixHeaderFormatSize = sstruct.calcsize(sbixHeaderFormat) @@ -61,8 +61,8 @@ sbixBitmapSetOffsetFormatSize = sstruct.calcsize(sbixBitmapSetOffsetFormat) class table__s_b_i_x(DefaultTable.DefaultTable): def __init__(self, tag): self.tableTag = tag - self.usVal1 = 1 - self.usVal2 = 1 + self.version = 1 + self.flags = 1 self.numSets = 0 self.bitmapSets = {} self.bitmapSetOffsets = [] @@ -114,15 +114,15 @@ class table__s_b_i_x(DefaultTable.DefaultTable): return sbixHeader + sbixData def toXML(self, xmlWriter, ttFont): - xmlWriter.simpletag("usVal1", value=self.usVal1) + xmlWriter.simpletag("version", value=self.version) xmlWriter.newline() - xmlWriter.simpletag("usVal2", value=self.usVal2) + xmlWriter.simpletag("flags", value=self.flags) xmlWriter.newline() for i in sorted(self.bitmapSets.keys()): self.bitmapSets[i].toXML(xmlWriter, ttFont) def fromXML(self, name, attrs, content, ttFont): - if name in ["usVal1", "usVal2"]: + if name in ["version", "flags"]: setattr(self, name, int(attrs["value"])) elif name == "bitmapSet": myBitmapSet = BitmapSet()