BF: Earlier changes broke support for GiftiImage objects

pyfeeds/__init__.py

@@ -5,7 +5,7 @@
 # Author: Paul McCarthy <pauldmccarthy@gmail.com>
 #
 
-__version__ = '0.12.0'
+__version__ = '0.12.1'
 """The pyfeeds version number. """
 
 

pyfeeds/evaluate.py

@@ -597,8 +597,8 @@ def evalGiftiVertices(pyf, testfile, benchmark):
     function.
     """
 
-    surf1 = pyf.imageCache[testfile][1]
-    surf2 = pyf.imageCache[benchmark][1]
+    surf1 = pyf.imageCache[testfile][0]
+    surf2 = pyf.imageCache[benchmark][0]
 
     # NIFTI_INTENT_POINTSET == 1008
     verts1 = [d for d in surf1.darrays if d.intent == 1008][0].data

pyfeeds/imagecache.py

@@ -88,9 +88,8 @@ class ImageCache:
             return image
 
         image           = nib.load(imagefile)
-        data            = np.asanyarray(image.dataobj)
-        self[imagefile] = image, data
-        return image, data
+        self[imagefile] = image
+        return self[imagefile]
 
 
     def __setitem__(self, imagefile, image):
@@ -98,12 +97,10 @@ class ImageCache:
         storing derived, in-memory-only images.
         """
 
-        # assignments through __getitem__ will
-        # be an (image, ndarray) tuple
         if isinstance(image, nib.Nifti1Image):
             data = np.asanyarray(image.dataobj)
         else:
-            image, data = image
+            data = None
 
         # imagefile may not be a valid
         # file system path, but we transform