X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=scripts%2Fmaketex.py;h=2e1069486585a252584993f0bc3217fcf8131fc3;hb=7de9a53a36fd4cc2bb08739b25695d3054f0d22a;hp=4da7866e7593b2f3abdfae7eaaa8e4254cd193f1;hpb=5a93cc603eef43617a10b76bc9c19a3272ac1d49;p=libs%2Fgl.git

diff --git a/scripts/maketex.py b/scripts/maketex.py
index 4da7866e..2e106948 100755
--- a/scripts/maketex.py
+++ b/scripts/maketex.py
@@ -14,7 +14,7 @@ def escape(str):
 	return result;
 
 def make_tex(fn, filter="LINEAR", anisotropy=0, wrap=None, srgb=False):
-	import Image
+	from PIL import Image
 
 	img = Image.open(fn)
 
@@ -39,7 +39,10 @@ def make_tex(fn, filter="LINEAR", anisotropy=0, wrap=None, srgb=False):
 	data = list(img.getdata())
 	for y in range(img.size[1]):
 		i = (img.size[1]-1-y)*img.size[0]
-		result += escape("".join(["".join([chr(v) for v in p]) for p in data[i:i+img.size[0]]]))
+		if fmt=="LUMINANCE" or fmt=="SLUMINANCE":
+			result += escape("".join([chr(v) for v in data[i:i+img.size[0]]]))
+		else:
+			result += escape("".join(["".join([chr(v) for v in p]) for p in data[i:i+img.size[0]]]))
 	result += "\";\n"
 
 	return result