X-Git-Url: https://vcs.fsf.org/?p=rainbowstream.git;a=blobdiff_plain;f=rainbowstream%2Fc_image.py;h=94299ecbe2b01d6e293bdd8c4a9741b9191bb06f;hp=59e64b0c67c75e5ff75a579252d67a6f25bd8862;hb=37d1047f8c5e064eba4ef1cbae46d735568f0a9b;hpb=816e305ff47ca527c3629861b73068136bbfd6f0

diff --git a/rainbowstream/c_image.py b/rainbowstream/c_image.py
index 59e64b0..94299ec 100644
--- a/rainbowstream/c_image.py
+++ b/rainbowstream/c_image.py
@@ -1,7 +1,7 @@
 from PIL import Image
-from functools import partial
 from os.path import join, dirname, getmtime, exists, expanduser
 from .config import *
+from .py3patch import *
 
 import ctypes
 import sys
@@ -9,10 +9,13 @@ import os
 
 
 def call_c():
+    """
+    Call the C program for converting RGB to Ansi colors
+    """
     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()
@@ -22,28 +25,42 @@ rgb2short = call_c()
 
 
 def pixel_print(ansicolor):
+    """
+    Print a pixel with given Ansi color
+    """
     sys.stdout.write('\033[48;5;%sm \033[0m' % (ansicolor))
 
 
-def image_to_display(path):
+def image_to_display(path, start=None, length=None):
+    """
+    Display an image
+    """
+    rows, columns = os.popen('stty size', 'r').read().split()
+    if not start:
+        start = c['IMAGE_SHIFT']
+    if not length:
+        length = int(columns) - 2 * start
     i = Image.open(path)
     i = i.convert('RGBA')
     w, h = i.size
     i.load()
-    rows, columns = os.popen('stty size', 'r').read().split()
-    width = min(w, int(columns) - 2 * IMAGE_SHIFT)
+    width = min(w, length)
     height = int(float(h) * (float(width) / float(w)))
     height //= 2
-    i = i.resize((width, height), Image.BICUBIC)
-    height = min(height, IMAGE_MAX_HEIGHT)
+    i = i.resize((width, height), Image.ANTIALIAS)
+    height = min(height, c['IMAGE_MAX_HEIGHT'])
 
     for y in xrange(height):
-        print ' ' * IMAGE_SHIFT,
+        sys.stdout.write(' ' * start)
         for x in xrange(width):
             p = i.getpixel((x, y))
             r, g, b = p[:3]
             pixel_print(rgb2short(r, g, b))
-        print ''
+        sys.stdout.write('\n')
+
 
+"""
+For direct using purpose
+"""
 if __name__ == '__main__':
     image_to_display(sys.argv[1])