shp: fix #94 picture prints at wrong size

Steve Canny · Steve Canny · commit e7bdc57108dc · 2015-02-14T00:34:59.000-08:00
Change the dimensions in both `wp:inline/wp:extent` and
`pic:pic/pic:spPr/a:xfrm` when setting width or height of a picture.
diff --git a/docx/api.py b/docx/api.py
@@ -84,8 +84,7 @@ def add_picture(self, image_path_or_stream, width=None, height=None):
         is often the case.
         """
         run = self.add_paragraph().add_run()
-        picture = run.add_picture(image_path_or_stream, width, height)
-        return picture
+        return run.add_picture(image_path_or_stream, width, height)
 
     def add_section(self, start_type=WD_SECTION.NEW_PAGE):
         """
diff --git a/docx/shape.py b/docx/shape.py
@@ -33,9 +33,8 @@ def height(self):
 
     @height.setter
     def height(self, cy):
-        assert isinstance(cy, int)
-        assert 0 < cy
         self._inline.extent.cy = cy
+        self._inline.graphic.graphicData.pic.spPr.cy = cy
 
     @classmethod
     def new_picture(cls, r, image_part, rId, shape_id):
@@ -83,6 +82,5 @@ def width(self):
 
     @width.setter
     def width(self, cx):
-        assert isinstance(cx, int)
-        assert 0 < cx
         self._inline.extent.cx = cx
+        self._inline.graphic.graphicData.pic.spPr.cx = cx
diff --git a/tests/test_shape.py b/tests/test_shape.py
@@ -68,8 +68,11 @@ def dimensions_get_fixture(self):
     @pytest.fixture
     def dimensions_set_fixture(self):
         inline_cxml, new_cx, new_cy, expected_cxml = (
-            'wp:inline/wp:extent{cx=333, cy=666}', 444, 888,
-            'wp:inline/wp:extent{cx=444, cy=888}'
+            'wp:inline/(wp:extent{cx=333,cy=666},a:graphic/a:graphicData/'
+            'pic:pic/pic:spPr/a:xfrm/a:ext{cx=333,cy=666})',
+            444, 888,
+            'wp:inline/(wp:extent{cx=444,cy=888},a:graphic/a:graphicData/'
+            'pic:pic/pic:spPr/a:xfrm/a:ext{cx=444,cy=888})'
         )
         inline_shape = InlineShape(element(inline_cxml))
         expected_xml = xml(expected_cxml)
