img: wire up Png and Image initializers

Steve Canny · Steve Canny · commit e4934e8863ac · 2014-02-27T12:08:34.000-08:00
diff --git a/docx/image/image.py b/docx/image/image.py
@@ -17,6 +17,14 @@ class Image(object):
     Graphical image stream such as JPEG, PNG, or GIF with properties and
     methods required by ImagePart.
     """
+    def __init__(self, blob, filename, px_width, px_height, attrs):
+        super(Image, self).__init__()
+        self._blob = blob
+        self._filename = filename
+        self._px_width = px_width
+        self._px_height = px_height
+        self._attrs = attrs
+
     @classmethod
     def from_file(cls, image_descriptor):
         """
diff --git a/docx/image/png.py b/docx/image/png.py
@@ -17,6 +17,9 @@ class Png(Image):
     """
     Image header parser for PNG images
     """
+    def __init__(self, blob, filename, cx, cy, attrs):
+        super(Png, self).__init__(blob, filename, cx, cy, attrs)
+
     @classmethod
     def from_stream(cls, stream, blob, filename):
         """
@@ -79,13 +82,15 @@ def _parse_chunks(cls, stream, chunk_offsets):
         """
         attrs = {}
 
+        # IHDR chunk -------------------
         if _CHUNK_TYPE_IHDR not in chunk_offsets:
             # IHDR chunk is mandatory, invalid if not present
             raise InvalidImageStreamError('no IHDR chunk in PNG image')
         ihdr_offset = chunk_offsets[_CHUNK_TYPE_IHDR]
         ihdr_attrs = cls._parse_IHDR(stream, ihdr_offset)
         attrs.update(ihdr_attrs)
 
+        # pHYs chunk -------------------
         if _CHUNK_TYPE_pHYs in chunk_offsets:
             phys_offset = chunk_offsets[_CHUNK_TYPE_pHYs]
             phys_attrs = cls._parse_pHYs(stream, phys_offset)
