X-Git-Url: https://vcs.fsf.org/?p=rainbowstream.git;a=blobdiff_plain;f=rainbowstream%2Fc_image.py;h=94299ecbe2b01d6e293bdd8c4a9741b9191bb06f;hp=8bd93288812662f2ac19b074d8cce8071d050362;hb=37d1047f8c5e064eba4ef1cbae46d735568f0a9b;hpb=531f568231af56035b61bb196b0e43fa79ff223e diff --git a/rainbowstream/c_image.py b/rainbowstream/c_image.py index 8bd9328..94299ec 100644 --- a/rainbowstream/c_image.py +++ b/rainbowstream/c_image.py @@ -1,6 +1,7 @@ from PIL import Image from os.path import join, dirname, getmtime, exists, expanduser from .config import * +from .py3patch import * import ctypes import sys @@ -14,7 +15,7 @@ def call_c(): library = expanduser('~/.image.so') sauce = join(dirname(__file__), 'image.c') if not exists(library) or getmtime(sauce) > getmtime(library): - build = "gcc -fPIC -shared -o %s %s" % (library, sauce) + build = "cc -fPIC -shared -o %s %s" % (library, sauce) assert os.system(build + " >/dev/null 2>&1") == 0 image_c = ctypes.cdll.LoadLibrary(library) image_c.init() @@ -49,9 +50,9 @@ def image_to_display(path, start=None, length=None): i = i.resize((width, height), Image.ANTIALIAS) height = min(height, c['IMAGE_MAX_HEIGHT']) - for y in range(height): + for y in xrange(height): sys.stdout.write(' ' * start) - for x in range(width): + for x in xrange(width): p = i.getpixel((x, y)) r, g, b = p[:3] pixel_print(rgb2short(r, g, b))