img: add _App1Marker.horz_dpi and .vert_dpi

Steve Canny · Steve Canny · commit 736bb5145277 · 2014-03-01T01:35:29.000-08:00
diff --git a/docx/image/jpeg.py b/docx/image/jpeg.py
@@ -399,6 +399,11 @@ class _App1Marker(_Marker):
     """
     Represents a JFIF APP1 (Exif) marker segment.
     """
+    def __init__(self, marker_code, offset, length, horz_dpi, vert_dpi):
+        super(_App1Marker, self).__init__(marker_code, offset, length)
+        self._horz_dpi = horz_dpi
+        self._vert_dpi = vert_dpi
+
     @classmethod
     def from_stream(cls, stream, marker_code, offset):
         """
@@ -421,6 +426,22 @@ def from_stream(cls, stream, marker_code, offset):
             marker_code, offset, segment_length, tiff.horz_dpi, tiff.vert_dpi
         )
 
+    @property
+    def horz_dpi(self):
+        """
+        Horizontal dots per inch specified in this marker, defaults to 72 if
+        not specified.
+        """
+        return self._horz_dpi
+
+    @property
+    def vert_dpi(self):
+        """
+        Vertical dots per inch specified in this marker, defaults to 72 if
+        not specified.
+        """
+        return self._vert_dpi
+
     @classmethod
     def _is_non_Exif_APP1_segment(cls, stream, offset):
         """
diff --git a/tests/image/test_jpeg.py b/tests/image/test_jpeg.py
@@ -383,6 +383,12 @@ def it_gets_a_tiff_from_its_Exif_segment_to_help_construct(
         Tiff_.from_stream.assert_called_once_with(substream_, None, None)
         assert tiff is tiff_
 
+    def it_knows_the_image_dpi(self):
+        horz_dpi, vert_dpi = 42, 24
+        app1 = _App1Marker(None, None, None, horz_dpi, vert_dpi)
+        assert app1.horz_dpi == horz_dpi
+        assert app1.vert_dpi == vert_dpi
+
     # fixtures -------------------------------------------------------
 
     @pytest.fixture
