Merge pull request #444 from arokem/dft-fromstring

MRG: Use newer call to frombytes, replacing fromstring

Use `frombytes` method available in newer PIL == Pillow, falling back to older `fromstring` if necessary.

This closes #443

Author: matthew-brett

.travis.yml

@@ -20,7 +20,7 @@ addons:
       - libatlas-base-dev
 env:
     global:
-        - DEPENDS="numpy scipy matplotlib h5py"
+        - DEPENDS="numpy scipy matplotlib h5py pillow"
         - PYDICOM=1
         - INSTALL_TYPE="setup"
 python:
@@ -44,7 +44,7 @@ matrix:
     # Minimum pydicom dependency
     - python: 2.7
       env:
-        - DEPENDS="numpy==1.5.1 pydicom==0.9.7"
+        - DEPENDS="numpy==1.5.1 pydicom==0.9.7 pillow==2.6"
     # test against numpy 1.7
     - python: 2.7
       env:

nibabel/dft.py

@@ -124,6 +124,13 @@ def __getattribute__(self, name):
 
     def as_png(self, index=None, scale_to_slice=True):
         import PIL.Image
+        # For compatibility with older versions of PIL that did not
+        # have `frombytes`:
+        if hasattr(PIL.Image, 'frombytes'):
+            frombytes = PIL.Image.frombytes
+        else:
+            frombytes = PIL.Image.fromstring
+
         if index is None:
             index = len(self.storage_instances) // 2
         d = self.storage_instances[index].dicom()
@@ -138,8 +145,9 @@ def as_png(self, index=None, scale_to_slice=True):
             max = data.max()
             data = data * 255 / (max - min)
         data = data.astype(numpy.uint8)
-        im = PIL.Image.fromstring('L', (self.rows, self.columns),
-                                  data.tostring())
+        im = frombytes('L', (self.rows, self.columns),
+                       data.tostring())
+
         s = BytesIO()
         im.save(s, 'PNG')
         return s.getvalue()