Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions Tests/test_font_pcf.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,16 @@ def test_draw(request: pytest.FixtureRequest, tmp_path: Path) -> None:
assert_image_equal_tofile(im, "Tests/images/test_draw_pbm_target.png")


def test_to_imagefont(request: pytest.FixtureRequest, tmp_path: Path) -> None:
with open(fontname, "rb") as test_file:
pcffont = PcfFontFile.PcfFontFile(test_file)
imgfont = pcffont.to_imagefont()
im = Image.new("L", (130, 30), "white")
draw = ImageDraw.Draw(im)
draw.text((0, 0), message, "black", font=imgfont)
assert_image_equal_tofile(im, "Tests/images/test_draw_pbm_target.png")


def test_textsize(request: pytest.FixtureRequest, tmp_path: Path) -> None:
tempname = save_font(request, tmp_path)
font = ImageFont.load(tempname)
Expand Down
42 changes: 32 additions & 10 deletions src/PIL/FontFile.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@
#
from __future__ import annotations

import io
import os
from typing import BinaryIO

from . import Image, _binary
from . import Image, ImageFont, _binary

WIDTH = 800

Expand Down Expand Up @@ -123,12 +124,33 @@ def save(self, filename: str) -> None:

# font metrics
with open(os.path.splitext(filename)[0] + ".pil", "wb") as fp:
fp.write(b"PILfont\n")
fp.write(f";;;;;;{self.ysize};\n".encode("ascii")) # HACK!!!
fp.write(b"DATA\n")
for id in range(256):
m = self.metrics[id]
if not m:
puti16(fp, (0,) * 10)
else:
puti16(fp, m[0] + m[1] + m[2])
self.save_metrics(fp)

def save_metrics(self, fp: BinaryIO) -> None:
"""Save font metrics to a file-like object"""
fp.write(b"PILfont\n")
fp.write(f";;;;;;{self.ysize};\n".encode("ascii")) # HACK!!!
fp.write(b"DATA\n")
for id in range(256):
m = self.metrics[id]
if not m:
puti16(fp, (0,) * 10)
else:
puti16(fp, m[0] + m[1] + m[2])

def to_imagefont(self) -> ImageFont.ImageFont:
"""Convert to ImageFont"""

self.compile()

# font data
if not self.bitmap:
msg = "No bitmap created"
raise ValueError(msg)

buf = io.BytesIO()
self.save_metrics(buf)
buf.seek(0)
imgfont = ImageFont.ImageFont()
imgfont._load_pilfont_data(buf, self.bitmap)
return imgfont
Loading