Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

privData needs to padded with bytes not str #3129

Merged
merged 4 commits into from
May 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Lib/fontTools/ttLib/sfnt.py
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ def close(self):
self.file.seek(0, 2)
off = self.file.tell()
paddedOff = (off + 3) & ~3
self.file.write("\0" * (paddedOff - off))
self.file.write(b"\0" * (paddedOff - off))
self.privOffset = self.file.tell()
self.privLength = len(data.privData)
self.file.write(data.privData)
Expand Down
39 changes: 38 additions & 1 deletion Tests/ttLib/sfnt_test.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,25 @@
import io
import copy
import pickle
from fontTools.ttLib.sfnt import calcChecksum, SFNTReader
import tempfile
from fontTools.ttLib import TTFont
from fontTools.ttLib.sfnt import calcChecksum, SFNTReader, WOFFFlavorData
from pathlib import Path
import pytest

TEST_DATA = Path(__file__).parent / "data"


@pytest.fixture
def ttfont_path():
font = TTFont()
font.importXML(TEST_DATA / "TestTTF-Regular.ttx")
with tempfile.NamedTemporaryFile(suffix=".ttf", delete=False) as fp:
font_path = Path(fp.name)
font.save(font_path)
yield font_path
font_path.unlink()


def test_calcChecksum():
assert calcChecksum(b"abcd") == 1633837924
Expand Down Expand Up @@ -57,3 +73,24 @@ def test_pickle_protocol_BytesIO(self, deepcopy, tmp_path):
if k == "file":
continue
assert getattr(reader2, k) == v


def test_ttLib_sfnt_write_privData(tmp_path, ttfont_path):
output_path = tmp_path / "TestTTF-Regular.woff"
font = TTFont(ttfont_path)

privData = "Private Eyes".encode()

data = WOFFFlavorData()
head = font["head"]
data.majorVersion, data.minorVersion = map(
int, format(head.fontRevision, ".3f").split(".")
)

data.privData = privData
font.flavor = "woff"
font.flavorData = data
font.save(output_path)

assert output_path.exists()
assert TTFont(output_path).flavorData.privData == privData