Fix precision issue occured while image processing. Add a test.

DEVSIX-1817

Author: ars18wrw

layout/src/main/java/com/itextpdf/layout/renderer/ImageRenderer.java

@@ -492,14 +492,20 @@ private float adjustPositionAfterRotation(float angle, float maxWidth, float max
         // So let's find scaling coefficient
         float scaleCoeff = 1;
         if (Boolean.TRUE.equals(getPropertyAsBoolean(Property.AUTO_SCALE))) {
-            scaleCoeff = Math.min(maxWidth / (float) width, maxHeight / (float) height);
-            height *= scaleCoeff;
-            width *= scaleCoeff;
-        } else if (null != getPropertyAsBoolean(Property.AUTO_SCALE_WIDTH) && (boolean) getPropertyAsBoolean(Property.AUTO_SCALE_WIDTH)) {
+            if (maxWidth / (float) width <  maxHeight / (float) height) {
+                scaleCoeff = maxWidth / (float) width;
+                height *= maxWidth / (float) width;
+                width = maxWidth;
+            } else {
+                scaleCoeff = maxHeight / (float) height;
+                width *= maxHeight / (float) height;
+                height = maxHeight;
+            }
+        } else if (Boolean.TRUE.equals(getPropertyAsBoolean(Property.AUTO_SCALE_WIDTH))) {
             scaleCoeff = maxWidth / (float) width;
             height *= scaleCoeff;
             width = maxWidth;
-        } else if (null != getPropertyAsBoolean(Property.AUTO_SCALE_HEIGHT) && (boolean) getPropertyAsBoolean(Property.AUTO_SCALE_HEIGHT)) {
+        } else if (Boolean.TRUE.equals(getPropertyAsBoolean(Property.AUTO_SCALE_HEIGHT))) {
             scaleCoeff = maxHeight / (float) height;
             height = maxHeight;
             width *= scaleCoeff;

layout/src/test/java/com/itextpdf/layout/ImageTest.java

@@ -47,22 +47,33 @@ This file is part of the iText (R) project.
 import com.itextpdf.io.util.UrlUtil;
 import com.itextpdf.kernel.color.ColorConstants;
 import com.itextpdf.kernel.geom.PageSize;
+import com.itextpdf.kernel.geom.Rectangle;
 import com.itextpdf.kernel.pdf.PdfDocument;
+import com.itextpdf.kernel.pdf.PdfPage;
 import com.itextpdf.kernel.pdf.PdfWriter;
+import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
 import com.itextpdf.kernel.pdf.xobject.PdfImageXObject;
 import com.itextpdf.kernel.utils.CompareTool;
 import com.itextpdf.layout.border.SolidBorder;
-import com.itextpdf.layout.element.*;
+import com.itextpdf.layout.element.AreaBreak;
+import com.itextpdf.layout.element.Cell;
+import com.itextpdf.layout.element.Div;
+import com.itextpdf.layout.element.Image;
+import com.itextpdf.layout.element.List;
+import com.itextpdf.layout.element.Paragraph;
+import com.itextpdf.layout.element.Table;
+import com.itextpdf.layout.element.Text;
 import com.itextpdf.layout.property.HorizontalAlignment;
 import com.itextpdf.layout.property.Property;
+import com.itextpdf.layout.property.TextAlignment;
 import com.itextpdf.layout.property.UnitValue;
+import com.itextpdf.layout.property.VerticalAlignment;
 import com.itextpdf.test.ExtendedITextTest;
 import com.itextpdf.test.annotations.LogMessage;
 import com.itextpdf.test.annotations.LogMessages;
 import com.itextpdf.test.annotations.type.IntegrationTest;
 import org.junit.Assert;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -556,13 +567,13 @@ public void imageTest21() throws IOException, InterruptedException {
 
         Image image = new Image(ImageDataFactory.create(sourceFolder + "Desert.jpg"));
         image.setAutoScaleHeight(true);
-        float[] colWidths = {1f,1f};
+        float[] colWidths = {1f, 1f};
 
         Table container = new Table(UnitValue.createPercentArray(colWidths));
         container.addCell("Text");
         container.addCell("autoscaling image, height only");
 
-        int textIterations =50;
+        int textIterations = 50;
         Paragraph p = new Paragraph();
         for (int i = 0; i < textIterations; i++) {
             p.add("Text will wrap");
@@ -841,4 +852,35 @@ public void imageWithMinMaxHeightTest01() throws IOException, InterruptedExcepti
 
         Assert.assertNull(new CompareTool().compareByContent(outFileName, cmpFileName, destinationFolder, "diff"));
     }
+
+    @Test
+    public void precisionTest01() throws IOException, InterruptedException {
+        String outFileName = destinationFolder + "precisionTest01.pdf";
+        String cmpFileName = sourceFolder + "cmp_precisionTest01.pdf";
+        String imageFileName = sourceFolder + "LOGO_PDF_77.jpg";
+
+        PdfDocument pdfDoc = new PdfDocument(new PdfWriter(outFileName));
+        PdfPage page = pdfDoc.addNewPage();
+        PdfCanvas currentPdfCanvas = new PdfCanvas(page);
+
+        Rectangle rc = new Rectangle(56.6929131f, 649.13385f, 481.889771f, 136.062988f);
+        Canvas canvas = new Canvas(currentPdfCanvas, pdfDoc, rc);
+
+        Table table = new Table(UnitValue.createPointArray(new float[]{158f}));
+        table.setTextAlignment(TextAlignment.LEFT);
+
+        Image logoImage = new Image(ImageDataFactory.create(imageFileName));
+        Paragraph p = new Paragraph().add(logoImage.setAutoScale(true));
+
+        Cell cell = new Cell();
+        cell.setKeepTogether(true);
+        cell.add(p);
+
+        table.addCell(cell.setHeight(85.03937f).setVerticalAlignment(VerticalAlignment.TOP).setPadding(0));
+        canvas.add(table);
+
+        pdfDoc.close();
+
+        Assert.assertNull(new CompareTool().compareByContent(outFileName, cmpFileName, destinationFolder, "diff"));
+    }
 }