X-Git-Url: https://vcs.fsf.org/?p=rainbowstream.git;a=blobdiff_plain;f=rainbowstream%2Fc_image.py;h=b26142d8227dd8865ee77cd14277f545baa72f87;hp=75787532890f68f5165e580177805e71cb4244cf;hb=276a34aa36ef7712914719318a3ab77512904897;hpb=685c4aa01ec277d8a81c1baa3a1585e3ba8ca684

diff --git a/rainbowstream/c_image.py b/rainbowstream/c_image.py
index 7578753..b26142d 100644
--- a/rainbowstream/c_image.py
+++ b/rainbowstream/c_image.py
@@ -71,6 +71,17 @@ def image_to_display(path, start=None, length=None):
     i.load()
     width = min(w, length)
     height = int(float(h) * (float(width) / float(w)))
+
+    if c['IMAGE_RESIZE_TO_FIT'] is True:
+        # If it image won't fit in the terminal without scrolling shrink it
+        # Subtract 3 from rows so the tweet message fits in too.
+        h = 2 * (int(rows) - 3)
+        if height >= h:
+            width = int(float(width) * (float(h) / float(height)))
+            height = h
+    if (height <= 0) or (width <= 0):
+        raise ValueError("image has negative dimensions")
+
     i = i.resize((width, height), Image.ANTIALIAS)
     height = min(height, c['IMAGE_MAX_HEIGHT'])
 
@@ -79,7 +90,7 @@ def image_to_display(path, start=None, length=None):
         for x in xrange(width):
             y = real_y * 2
             p0 = i.getpixel((x, y))
-            p1 = i.getpixel((x, y+1))
+            p1 = i.getpixel((x, y + 1))
             block_print(p1, p0)
         sys.stdout.write('\n')