Apple-2-SW
/
ii-pix
mirror of https://github.com/KrisKennaway/ii-pix.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove cython checks and obsolete TODO

This commit is contained in:
kris 2021-11-18 17:24:12 +00:00
parent e53c085a91
commit d7969f50ba
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
convert.py
View File

@ -109,12 +109,6 @@ class ClusterPalette:
int(p_lower * (200 / 16)) * 320:int(p_upper * (
200 / 16)) * 320, :]
# TODO: clustering should be aware of the fact that we will
# quantize to a 4-bit RGB value afterwards. i.e. we should
# not pick multiple centroids that will quantize to the same RGB
# value since we'll "waste" a palette entry. This doesn't seem to
# be a major issue in practise though, and fixing it would require
# implementing our own (optimized) k-means.
# TODO: tune tolerance
# clusters = cluster.MiniBatchKMeans(
# n_clusters=16, max_iter=10000,
@ -242,7 +236,7 @@ def main():
# TODO: flags
penalty = 1e9
iterations = 10 # 50
iterations = 50
pygame.init()
# TODO: for some reason I need to execute this twice - the first time

14
dither.pyx
View File

@ -157,7 +157,7 @@ cdef int dither_lookahead(Dither* dither, float[:, :, ::1] palette_cam16, float[
return best
@cython.boundscheck(True)
@cython.boundscheck(False)
@cython.wraparound(False)
cdef inline float[::1] convert_rgb_to_cam16ucs(float[:, ::1] rgb_to_cam16ucs, float r, float g, float b) nogil:
cdef unsigned int rgb_24bit = (<unsigned int>(r*255) << 16) + (<unsigned int>(g*255) << 8) + <unsigned int>(b*255)
@ -489,8 +489,8 @@ cdef int best_palette_for_line(float [:, ::1] line_cam, float[:, :, ::1] palette
best_palette_idx = palette_idx
return best_palette_idx
@cython.boundscheck(True)
@cython.wraparound(True)
@cython.boundscheck(False)
@cython.wraparound(False)
def convert_rgb12_iigs_to_cam(float [:, ::1] rgb12_iigs_to_cam16ucs, (unsigned char)[::1] point_rgb12) -> float[::1]:
cdef int rgb12 = (point_rgb12[0] << 8) | (point_rgb12[1] << 4) | point_rgb12[2]
return rgb12_iigs_to_cam16ucs[rgb12]
@ -507,8 +507,8 @@ cdef float[::1] linear_to_srgb_array(float[::1] a, float gamma=2.4):
res[i] = 1.055 * a[i] ** (1.0 / gamma) - 0.055
return res
@cython.boundscheck(True)
@cython.wraparound(True)
@cython.boundscheck(False)
@cython.wraparound(False)
def convert_cam16ucs_to_rgb12_iigs(float[::1] point_cam) -> int[::1]: # XXX return type
cdef float[::1] rgb, rgb12_iigs
cdef int i
@ -531,8 +531,8 @@ def convert_cam16ucs_to_rgb12_iigs(float[::1] point_cam) -> int[::1]: # XXX ret
return np.round(rgb12_iigs).astype(np.uint8)
@cython.boundscheck(True)
@cython.wraparound(True)
@cython.boundscheck(False)
@cython.wraparound(False)
def k_means_with_fixed_centroids(
int n_clusters, int n_fixed, float[:, ::1] samples, (unsigned char)[:, ::1] initial_centroids, int max_iterations,
float tolerance, float [:, ::1] rgb12_iigs_to_cam16ucs):