Fcalva/fxsdk
1
0
Fork 0
mirror of https://git.planet-casio.com/Lephenixnoir/fxsdk.git synced 2025-04-04 09:37:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fxconv: minor fixes

Browse source 
* Explicitly convert to RGB to avoid errors with exotic formats.
* Don't pollute the user's /tmp directory for debugging purposes.
This commit is contained in:
Lephe 2019-06-16 00:16:47 -04:00
parent 25db504c22
commit 86a9350a17
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fxconv/fxconv.py
View file

@ -258,8 +258,8 @@ def _convert_font(input, output, params):
if charset is None: if charset is None:
raise FxconvError(f"unknown character set '{charset}'") raise FxconvError(f"unknown character set '{charset}'")
if charset.count > grid.size(img): if charset.count > grid.size(img):
raise FxconvError(f"not enough elements in grid (got {grid.size()}, "+ raise FxconvError(f"not enough elements in grid (got {grid.size(img)}, "+
f"need {charset.count} for '{charset.name}'") f"need {charset.count} for '{charset.name}')")
#-- #--
# Proportionality and metadata # Proportionality and metadata
@ -310,7 +310,6 @@ def _convert_font(input, output, params):
# Get glyph area # Get glyph area
glyph = img.crop(region) glyph = img.crop(region)
glyph.save(f"/tmp/img{number}.png")
if proportional: if proportional:
glyph = _trim(glyph) glyph = _trim(glyph)
data_widths.append(glyph.width) data_widths.append(glyph.width)
@ -380,7 +379,6 @@ def quantize(img, dither=False):
for (i, c) in enumerate(colors): for (i, c) in enumerate(colors):
palette.putpixel((i, 0), c) palette.putpixel((i, 0), c)
palette = palette.convert("P") palette = palette.convert("P")
palette.save("/tmp/palette.png")
# Save the alpha channel, and make it either full transparent or opaque # Save the alpha channel, and make it either full transparent or opaque
try: try:
@ -397,7 +395,7 @@ def quantize(img, dither=False):
img.load() img.load()
palette.load() palette.load()
im = img.im.convert("P", int(dither), palette.im) im = img.im.convert("P", int(dither), palette.im)
img = img._new(im) img = img._new(im).convert("RGB")
# Put back the alpha channel # Put back the alpha channel
img.putalpha(alpha_channel) img.putalpha(alpha_channel)