Apple-2-SW/ii-pix
1
0
Fork 0
mirror of https://github.com/KrisKennaway/ii-pix.git synced 2024-06-03 05:29:32 +00:00
Code Issues Projects Releases Wiki Activity

Try cam16UCS instead

Browse Source
This commit is contained in:
kris 2021-07-15 14:25:32 +01:00
parent 4fcda908bd
commit 7a3adea025
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
convert.py
View File

@ -4,7 +4,7 @@ import argparse
import os.path import os.path
import time import time
import colorspacious import colour
from PIL import Image from PIL import Image
import numpy as np import numpy as np
@ -91,13 +91,13 @@ def main():
screen.Y_RES)).astype(np.float32) screen.Y_RES)).astype(np.float32)
# convert from sRGB1-linear to CAM02UCS perceptually uniform colour space # convert from sRGB1-linear to CAM02UCS perceptually uniform colour space
cam02ucs = colorspacious.cspace_convert( cam16ucs = colour.convert(
resized/255, "sRGB1-linear", colorspacious.CAM02UCS).astype(np.float32) resized / 255, "RGB", "CAM16UCS").astype(np.float32)
# print(cam02ucs) # print(cam02ucs)
dither = dither_pattern.PATTERNS[args.dither]() dither = dither_pattern.PATTERNS[args.dither]()
output_nbit, _ = dither_pyx.dither_image( output_nbit, _ = dither_pyx.dither_image(
screen, cam02ucs, dither, lookahead, args.verbose) screen, cam16ucs, dither, lookahead, args.verbose)
bitmap = screen.pack(output_nbit) bitmap = screen.pack(output_nbit)
# Show output image by rendering in target palette # Show output image by rendering in target palette

7
palette.py
View File

@ -1,6 +1,6 @@
"""RGB colour palettes to target for Apple II image conversions.""" """RGB colour palettes to target for Apple II image conversions."""
import colorspacious import colour
import numpy as np import numpy as np
import image import image
@ -29,9 +29,8 @@ class Palette:
for k, v in self.SRGB.items(): for k, v in self.SRGB.items():
self.RGB[k] = (np.clip(image.srgb_to_linear_array(v / 255), 0.0, self.RGB[k] = (np.clip(image.srgb_to_linear_array(v / 255), 0.0,
1.0) * 255).astype(np.uint8) 1.0) * 255).astype(np.uint8)
self.CAM02UCS[k] = colour.convert(
self.CAM02UCS[k] = colorspacious.cspace_convert( v / 255, "sRGB", "CAM16UCS").astype(np.float32)
v, "sRGB255", colorspacious.CAM02UCS)
# print(self.CAM02UCS) # print(self.CAM02UCS)