Merge pull request #1791 from girder/multiframe-pil

Better detect multiframe images in PIL

CHANGELOG.md

@@ -17,6 +17,7 @@
 - Add a general channelNames property to tile sources ([#1783](../../pull/1783))
 - Speed up compositing styles ([#1784](../../pull/1784))
 - Better repr of large_image classes ([#1787](../../pull/1787))
+- Better detect multiframe images in PIL ([#1791](../../pull/1791))
 
 ### Changes
 

sources/pil/large_image_source_pil/__init__.py

@@ -101,6 +101,7 @@ class PILFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
         'jpg': SourcePriority.LOW,
         'jpeg': SourcePriority.LOW,
         'jpe': SourcePriority.LOW,
+        'nef': SourcePriority.LOW,
     }
     mimeTypes = {
         None: SourcePriority.FALLBACK_HIGH,
@@ -222,7 +223,14 @@ def _fromRawpy(self, largeImagePath):
         """
         Try to use rawpy to read an image.
         """
-        # if rawpy is present, try reading via that library first
+        # if rawpy is present, try reading via that library first, but only
+        # if PIL reports a single frame
+        try:
+            img = PIL.Image.open(largeImagePath)
+            if len(list(PIL.ImageSequence.Iterator(img))) > 1:
+                return
+        except Exception:
+            pass
         try:
             import builtins
 

test/lisource_compare.py

@@ -568,6 +568,7 @@ def command():
     if not large_image.tilesource.AvailableTileSources:
         large_image.tilesource.loadTileSources()
     if opts.all:
+        large_image.config.setConfig('max_small_image_size', 16384)
         for key in list(large_image.config.ConfigValues):
             if '_ignored_names' in key:
                 del large_image.config.ConfigValues[key]