aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan J. Martinez <jjm@usebox.net>2022-09-15 08:31:43 +0100
committerJuan J. Martinez <jjm@usebox.net>2022-09-15 08:31:43 +0100
commit16d6f8e322311eff51b23425218b2d6c383170d6 (patch)
treee8f4c0d9c4f64a17bba628481befd521671df6ab
parent495b06cc5e3ffb2d5448a98ced49d2637105b119 (diff)
downloadubox-msx-lib-16d6f8e322311eff51b23425218b2d6c383170d6.tar.gz
ubox-msx-lib-16d6f8e322311eff51b23425218b2d6c383170d6.zip
The order of elements on a set is undefined
This could lead to change in order, for example, when changing version of Python. This change ensures the colours are always in the same order.
-rwxr-xr-xtools/png2sprites.py2
-rwxr-xr-xtools/png2tiles.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/png2sprites.py b/tools/png2sprites.py
index 7528fae..95e6492 100755
--- a/tools/png2sprites.py
+++ b/tools/png2sprites.py
@@ -109,7 +109,7 @@ def main():
tile = [
data[x + i + ((y + j) * w)] for j in range(DEF_H) for i in range(DEF_W)
]
- cols = set([c for c in tile if c != TRANS])
+ cols = sorted(set([c for c in tile if c != TRANS]))
if not cols:
continue
diff --git a/tools/png2tiles.py b/tools/png2tiles.py
index 43eb1e0..55e7c53 100755
--- a/tools/png2tiles.py
+++ b/tools/png2tiles.py
@@ -97,7 +97,7 @@ def read_image(image_name, out, color):
# get the attibutes of the tile
# FIXME: this may not be right
for i in range(0, len(tile), DEF_W):
- cols = list(set(tile[i : i + DEF_W]))
+ cols = list(sorted(set(tile[i : i + DEF_W])))
if len(cols) > 2:
raise Exception(