img: add TIFF formats to recognizer

Steve Canny · Steve Canny · commit 23ef66e34f65 · 2014-02-27T12:08:33.000-08:00
diff --git a/docx/image/__init__.py b/docx/image/__init__.py
@@ -22,6 +22,7 @@
 from docx.image.gif import Gif
 from docx.image.jpeg import Exif, Jfif
 from docx.image.png import Png
+from docx.image.tiff import Tiff
 from docx.opc.constants import CONTENT_TYPE as CT
 from docx.shared import lazyproperty
 
@@ -33,6 +34,8 @@
     (Exif, 6, b'Exif'),
     (Gif,  0, b'GIF87a'),
     (Gif,  0, b'GIF89a'),
+    (Tiff, 0, b'MM\x00*'),  # big-endian (Motorola) TIFF
+    (Tiff, 0, b'II*\x00'),  # little-endian (Intel) TIFF
 )
 
 
diff --git a/docx/image/tiff.py b/docx/image/tiff.py
@@ -0,0 +1,12 @@
+# encoding: utf-8
+
+from __future__ import absolute_import, division, print_function
+
+from .image import Image
+
+
+class Tiff(Image):
+    """
+    Image header parser for TIFF images. Handles both big and little endian
+    byte ordering.
+    """
diff --git a/tests/image/test_image.py b/tests/image/test_image.py
@@ -15,6 +15,7 @@
 from docx.image.image import Image
 from docx.image.jpeg import Exif, Jfif
 from docx.image.png import Png
+from docx.image.tiff import Tiff
 from docx.opc.constants import CONTENT_TYPE as CT
 
 from ..unitutil import (
@@ -38,10 +39,12 @@ def it_raises_on_unrecognized_image_stream(self):
     # fixtures -------------------------------------------------------
 
     @pytest.fixture(params=[
-        ('python-icon.png',  Png),
-        ('python-icon.jpeg', Jfif),
-        ('exif-420-dpi.jpg', Exif),
-        ('sonic.gif',        Gif),
+        ('python-icon.png',   Png),
+        ('python-icon.jpeg',  Jfif),
+        ('exif-420-dpi.jpg',  Exif),
+        ('sonic.gif',         Gif),
+        ('72-dpi.tiff',       Tiff),
+        ('little-endian.tif', Tiff),
     ])
     def image_cls_lookup_fixture(self, request):
         image_filename, expected_class = request.param
diff --git a/tests/test_files/little-endian.tif b/tests/test_files/little-endian.tif
