corrected vertical positioning of images

W0dan · Mar 9, 2013 · 3800793 · 3800793
1 parent 410f343
commit 3800793
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/PdfCraft/API/GraphicsCanvas.cs b/PdfCraft/API/GraphicsCanvas.cs
@@ -124,20 +124,13 @@ internal override string Content
                             break;
                         case Command.DrawImage:
                             var imageDefinition = (ImageDefinition)command.Data;
-
-                            //XObject xObject;
-                            //if (imageDefinition.SourceFile != null)
-                            //    xObject = _owner.AddXObject(imageDefinition.ImageType, imageDefinition.SourceFile);
-                            //else
-                            //    xObject = _owner.AddXObject(imageDefinition.ImageType, imageDefinition.SourceStream);
-
                             var xObject = imageDefinition.XObject;
 
                             var imageReference = string.Format("{0} {1} 0 R ", xObject.XObjectname, xObject.Number);
                             _xObjectReferences.Add(imageReference);
 
                             const string imageFormat = "q {0} 0 0 {1} {2} {3} cm {4} Do Q ";
-                            var yPosition = Size.Height - imageDefinition.TopLeft.Y;
+                            var yPosition = Size.Height - imageDefinition.TopLeft.Y - imageDefinition.Size.Height;
                             sb.Append(string.Format(imageFormat,
                                 imageDefinition.Size.Width,
                                 imageDefinition.Size.Height,

diff --git a/Tests/Concerning_the_API/Given_a_GraphicsCanvas/When_DrawImage_is_called.cs b/Tests/Concerning_the_API/Given_a_GraphicsCanvas/When_DrawImage_is_called.cs
@@ -23,7 +23,10 @@ public override void Arrange()
 
         public override void Act()
         {
-            _sut.DrawImage(new Point(50, 50), new Size(100, 100), ImageType.Jpg, @"c:\temp\image.jpg");
+            _sut.DrawImage(new Point(75, 50), new Size(25, 75), ImageType.Jpg, @"c:\temp\image.jpg");
+            _sut.DrawImage(new Point(50, 75), new Size(75, 25), ImageType.Jpg, @"c:\temp\image.jpg");
+
+            _sut.DrawImage(new Point(50, 175), new Size(75, 25), ImageType.Jpg, @"c:\temp\image1.jpg");
         }
 
         [Test]