X-Git-Url: https://vcs.fsf.org/?p=rainbowstream.git;a=blobdiff_plain;f=rainbowstream%2Fc_image.py;h=7b334894530f801bfb4c99023e95595e0acb29bf;hp=59e64b0c67c75e5ff75a579252d67a6f25bd8862;hb=f75930c6e0b0ec505732b758d414162a8bebdece;hpb=816e305ff47ca527c3629861b73068136bbfd6f0;ds=sidebyside

diff --git a/rainbowstream/c_image.py b/rainbowstream/c_image.py
index 59e64b0..7b33489 100644
--- a/rainbowstream/c_image.py
+++ b/rainbowstream/c_image.py
@@ -1,5 +1,4 @@
 from PIL import Image
-from functools import partial
 from os.path import join, dirname, getmtime, exists, expanduser
 from .config import *
 
@@ -25,20 +24,24 @@ def pixel_print(ansicolor):
     sys.stdout.write('\033[48;5;%sm \033[0m' % (ansicolor))
 
 
-def image_to_display(path):
+def image_to_display(path,start=None,length=None):
+    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,
+        print ' ' * start,
         for x in xrange(width):
             p = i.getpixel((x, y))
             r, g, b = p[:3]