Merge pull request #4563 from radarhere/faster_error

Throw image loading error faster

Author: radarhere

src/PIL/ImageFile.py

@@ -150,10 +150,10 @@ def verify(self):
     def load(self):
         """Load image data based on tile list"""
 
-        pixel = Image.Image.load(self)
-
         if self.tile is None:
             raise OSError("cannot load this image")
+
+        pixel = Image.Image.load(self)
         if not self.tile:
             return pixel
 

src/PIL/TiffImagePlugin.py

@@ -1094,10 +1094,10 @@ def _load_libtiff(self):
         """ Overload method triggered when we detect a compressed tiff
             Calls out to libtiff """
 
-        pixel = Image.Image.load(self)
-
         if self.tile is None:
             raise OSError("cannot load this image")
+
+        pixel = Image.Image.load(self)
         if not self.tile:
             return pixel