erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-10-07 14:37:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

Merge pull request #9245 from keymanapp/refactor/linux/refactor

Browse source 
refactor(linux): Refactor image loading
This commit is contained in:
Eberhard Beilharz 2023-07-13 12:32:07 +02:00 • committed by GitHub
commit 8624ebcfb0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
linux/keyman-config/keyman_config/convertico.py
View file

@ -8,7 +8,6 @@ import sys
import numpy as np
from PIL import Image, ImageFile
Image.LOAD_TRUNCATED_IMAGES = True
ImageFile.LOAD_TRUNCATED_IMAGES = True
@ -20,8 +19,7 @@ def changeblacktowhite(im):
white_areas = (red == 0) & (blue == 0) & (green == 0)
data[..., :-1][white_areas.T] = (255, 255, 255) # Transpose back needed
im2 = Image.fromarray(data)
return im2
return Image.fromarray(data)
def checkandsaveico(icofile):
@ -35,32 +33,34 @@ def checkandsaveico(icofile):
icofile (str): path to ico file
"""
name, ext = os.path.splitext(icofile)
bmpfile = name + ".bmp"
bmpfile = f"{name}.bmp"
if ext == '.ico':
im = Image.open(icofile)
im = im.convert('RGBA')
im2 = im
num, colour = max(im.getcolors(im.size[0] * im.size[1]))
logging.debug("checkandsaveico maxcolour: num {0}: colour {1}".format(num, colour))
if num > 160 and colour == (0, 0, 0, 0):
logging.info("checkandsaveico:" + icofile + " mostly black so changing black to white")
im2 = changeblacktowhite(im)
im2.save(bmpfile)
_convert_ico_to_bmp(icofile, bmpfile)
try:
im3 = Image.open(bmpfile)
im4 = im3.resize([64, 64], Image.ANTIALIAS)
# Using .bmp.png file extension so it won't conflict if the package already contains .png
im4.save(bmpfile + '.png', 'png')
with Image.open(bmpfile) as im3:
with im3.resize((64, 64), Image.LANCZOS) as im4:
# Using .bmp.png file extension so it won't conflict if the package already contains .png
im4.save(f'{bmpfile}.png', 'png')
except (IOError, OSError):
logging.error("Cannot convert %s to png", icofile)
pass
finally:
# Clean up intermediary .bmp file if it was generated
if ext == '.ico':
os.remove(bmpfile)
def _convert_ico_to_bmp(icofile, bmpfile):
with Image.open(icofile) as im:
with im.convert('RGBA') as im2:
num, colour = max(im.getcolors(im2.size[0] * im2.size[1]))
logging.debug(f"checkandsaveico maxcolour: num {num}: colour {colour}")
if num > 160 and colour == (0, 0, 0, 0):
logging.info(f"checkandsaveico:{icofile} mostly black so changing black to white")
im2.close()
im2 = changeblacktowhite(im)
im2.save(bmpfile)
def extractico(kmxfile):
"""
Extract icon file from compiled kmx keyboard
@ -95,9 +95,9 @@ def extractico(kmxfile):
# Read first two bytes to determine if icon is .bmp or .ico
if bitmap.startswith(b'BM'):
imagefilename = imagefilename + ".bmp"
imagefilename = f"{imagefilename}.bmp"
else:
imagefilename = imagefilename + ".ico"
imagefilename = f"{imagefilename}.ico"
try:
with open(imagefilename, mode='wb') as imagefile: