mirror of
https://github.com/python-pillow/Pillow.git
synced 2024-12-26 01:46:18 +03:00
a7e3b2e47b
There are two main issues fixed with this commit: * bytes vs. str: All file, image, and palette data are now handled as bytes. A new _binary module consolidates the hacks needed to do this across Python versions. tostring/fromstring methods have been renamed to tobytes/frombytes, but the Python 2.6/2.7 versions alias them to the old names for compatibility. Users should move to tobytes/frombytes. One other potentially-breaking change is that text data in image files (such as tags, comments) are now explicitly handled with a specific character encoding in mind. This works well with the Unicode str in Python 3, but may trip up old code expecting a straight byte-for-byte translation to a Python string. This also required a change to Gohlke's tags tests (in Tests/test_file_png.py) to expect Unicode strings from the code. * True div vs. floor div: Many division operations used the "/" operator to do floor division, which is now the "//" operator in Python 3. These were fixed. As of this commit, on the first pass, I have one failing test (improper handling of a slice object in a C module, test_imagepath.py) in Python 3, and three that that I haven't tried running yet (test_imagegl, test_imagegrab, and test_imageqt). I also haven't tested anything on Windows. All but the three skipped tests run flawlessly against Pythons 2.6 and 2.7.
147 lines
3.3 KiB
Python
147 lines
3.3 KiB
Python
#
|
|
# The Python Imaging Library
|
|
# $Id$
|
|
#
|
|
# base class for raster font file parsers
|
|
#
|
|
# history:
|
|
# 1997-06-05 fl created
|
|
# 1997-08-19 fl restrict image width
|
|
#
|
|
# Copyright (c) 1997-1998 by Secret Labs AB
|
|
# Copyright (c) 1997-1998 by Fredrik Lundh
|
|
#
|
|
# See the README file for information on usage and redistribution.
|
|
#
|
|
|
|
import os
|
|
from . import Image, _binary
|
|
|
|
import marshal
|
|
|
|
try:
|
|
import zlib
|
|
except ImportError:
|
|
zlib = None
|
|
|
|
WIDTH = 800
|
|
|
|
def puti16(fp, values):
|
|
# write network order (big-endian) 16-bit sequence
|
|
for v in values:
|
|
if v < 0:
|
|
v = v + 65536
|
|
fp.write(_binary.o16be(v))
|
|
|
|
##
|
|
# Base class for raster font file handlers.
|
|
|
|
class FontFile:
|
|
|
|
bitmap = None
|
|
|
|
def __init__(self):
|
|
|
|
self.info = {}
|
|
self.glyph = [None] * 256
|
|
|
|
def __getitem__(self, ix):
|
|
return self.glyph[ix]
|
|
|
|
def compile(self):
|
|
"Create metrics and bitmap"
|
|
|
|
if self.bitmap:
|
|
return
|
|
|
|
# create bitmap large enough to hold all data
|
|
h = w = maxwidth = 0
|
|
lines = 1
|
|
for glyph in self:
|
|
if glyph:
|
|
d, dst, src, im = glyph
|
|
h = max(h, src[3] - src[1])
|
|
w = w + (src[2] - src[0])
|
|
if w > WIDTH:
|
|
lines = lines + 1
|
|
w = (src[2] - src[0])
|
|
maxwidth = max(maxwidth, w)
|
|
|
|
xsize = maxwidth
|
|
ysize = lines * h
|
|
|
|
if xsize == 0 and ysize == 0:
|
|
return ""
|
|
|
|
self.ysize = h
|
|
|
|
# paste glyphs into bitmap
|
|
self.bitmap = Image.new("1", (xsize, ysize))
|
|
self.metrics = [None] * 256
|
|
x = y = 0
|
|
for i in range(256):
|
|
glyph = self[i]
|
|
if glyph:
|
|
d, dst, src, im = glyph
|
|
xx, yy = src[2] - src[0], src[3] - src[1]
|
|
x0, y0 = x, y
|
|
x = x + xx
|
|
if x > WIDTH:
|
|
x, y = 0, y + h
|
|
x0, y0 = x, y
|
|
x = xx
|
|
s = src[0] + x0, src[1] + y0, src[2] + x0, src[3] + y0
|
|
self.bitmap.paste(im.crop(src), s)
|
|
# print chr(i), dst, s
|
|
self.metrics[i] = d, dst, s
|
|
|
|
|
|
def save1(self, filename):
|
|
"Save font in version 1 format"
|
|
|
|
self.compile()
|
|
|
|
# font data
|
|
self.bitmap.save(os.path.splitext(filename)[0] + ".pbm", "PNG")
|
|
|
|
# font metrics
|
|
fp = open(os.path.splitext(filename)[0] + ".pil", "wb")
|
|
fp.write(b"PILfont\n")
|
|
fp.write((";;;;;;%d;\n" % self.ysize).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])
|
|
fp.close()
|
|
|
|
|
|
def save2(self, filename):
|
|
"Save font in version 2 format"
|
|
|
|
# THIS IS WORK IN PROGRESS
|
|
|
|
self.compile()
|
|
|
|
data = marshal.dumps((self.metrics, self.info))
|
|
|
|
if zlib:
|
|
data = b"z" + zlib.compress(data, 9)
|
|
else:
|
|
data = b"u" + data
|
|
|
|
fp = open(os.path.splitext(filename)[0] + ".pil", "wb")
|
|
|
|
fp.write(b"PILfont2\n" + self.name + "\n" + "DATA\n")
|
|
|
|
fp.write(data)
|
|
|
|
self.bitmap.save(fp, "PNG")
|
|
|
|
fp.close()
|
|
|
|
|
|
save = save1 # for now
|