Changeset 1397 for trunk/GSASII.py

Timestamp:

Jun 26, 2014 1:23:03 PM (11 years ago)

Author:

toby

Message:

Allow use of Image from pillow in place of PIL

File:

• trunk/GSASII.py (modified) (1 diff)

trunk/GSASII.py ¶

@@ -3389 +3389 @@
         print "Image (PIL):",Image.VERSION
     except ImportError:
-        print "Image module not present; Note that PIL (Python Imaging Library) is needed for some image formats."
+        try:
+            from PIL import Image
+            print "pillow:     ",Image.VERSION
+        except ImportError:
+            print "Image module not present; Note that PIL (Python Imaging Library) or pillow is needed for some image operations"
     try:
         import mkl