Fix font size calculation

DEVSIX-7182

Author: vitali-pr

pdfocr-api/src/main/java/com/itextpdf/pdfocr/OcrPdfCreator.java

@@ -591,8 +591,7 @@ private void addTextToCanvas(
                             .setHorizontalScaling(bboxWidthPt / lineWidth);
 
                     Paragraph paragraph = new Paragraph(text)
-                            .setMargin(0)
-                            .setMultipliedLeading(1.2f);
+                            .setMargin(0);
                     paragraph.setFontFamily(fontFamily)
                             .setFontSize(fontSize);
                     paragraph.setWidth(bboxWidthPt * 1.5f);

pdfocr-api/src/main/java/com/itextpdf/pdfocr/PdfCreatorUtil.java

@@ -96,6 +96,7 @@ static float calculateFontSize(final Document document, final String line,
 
         try {
             Paragraph paragraph = new Paragraph(line);
+            paragraph.setMargin(0);
             paragraph.setWidth(bbox.getWidth());
             paragraph.setFontFamily(fontFamily);
 

pdfocr-tesseract4/src/test/java/com/itextpdf/pdfocr/tessdata/TessDataIntegrationLibTest.java

@@ -101,9 +101,9 @@ public void compareInvoiceFrontThaiImage() throws InterruptedException, java.io.
                 TEST_IMAGES_DIRECTORY + filename + ".jpg", resultPdfPath,
                 Arrays.<String>asList("tha", "eng"), Arrays.<String>asList(NOTO_SANS_THAI_FONT_PATH, NOTO_SANS_FONT_PATH), DeviceRgb.RED);
         boolean javaTest = new CompareTool().compareByContent(resultPdfPath, expectedPdfPathJava,
-                TEST_DOCUMENTS_DIRECTORY, "diff_") == null;
+                getTargetDirectory(), "diff_") == null;
         boolean dotNetTest = new CompareTool().compareByContent(resultPdfPath, expectedPdfPathDotNet,
-                TEST_DOCUMENTS_DIRECTORY, "diff_") == null;
+                getTargetDirectory(), "diff_") == null;
 
         Assert.assertTrue(javaTest || dotNetTest);
     }
@@ -134,9 +134,9 @@ public void compareThaiTextImage() throws InterruptedException, java.io.IOExcept
                 TEST_IMAGES_DIRECTORY + filename + ".jpg", resultPdfPath,
                 Arrays.<String>asList("tha"), Arrays.<String>asList(NOTO_SANS_THAI_FONT_PATH), DeviceRgb.RED);
         boolean javaTest = new CompareTool().compareByContent(resultPdfPath, expectedPdfPathJava,
-                TEST_DOCUMENTS_DIRECTORY, "diff_") == null;
+                getTargetDirectory(), "diff_") == null;
         boolean dotNetTest = new CompareTool().compareByContent(resultPdfPath, expectedPdfPathDotNet,
-                TEST_DOCUMENTS_DIRECTORY, "diff_") == null;
+                getTargetDirectory(), "diff_") == null;
 
         Assert.assertTrue(javaTest || dotNetTest);
     }

pdfocr-tesseract4/src/test/java/com/itextpdf/pdfocr/tessdata/TessDataIntegrationTest.java

@@ -350,7 +350,7 @@ public void compareMultiLangImage() throws InterruptedException, IOException {
                     Arrays.<String>asList("eng", "deu", "spa"), DeviceCmyk.BLACK);
 
             Assert.assertNull(new CompareTool().compareByContent(resultPdfPath, expectedPdfPath,
-                    TEST_DOCUMENTS_DIRECTORY, "diff_"));
+                    getTargetDirectory(), "diff_"));
         } finally {
             Assert.assertEquals(TextPositioning.BY_WORDS,
                     tesseractReader.getTesseract4OcrEngineProperties().getTextPositioning());

pdfocr-tesseract4/src/test/java/com/itextpdf/pdfocr/tesseract4/ImageIntegrationTest.java

@@ -118,9 +118,9 @@ public void compareRotatedImage() throws InterruptedException, IOException {
         // So the goal of this test is to make text invisible and check if image is rotated.
         // Proper text recognition is compared in testHocrRotatedImage test by checking HOCR file.
         boolean javaTest = new CompareTool().compareVisually(resultPdfPath, expectedPdfPathJava,
-                    TEST_DOCUMENTS_DIRECTORY, "diff_") == null;
+                getTargetDirectory(), "diff_") == null;
         boolean dotNetTest = new CompareTool().compareVisually(resultPdfPath, expectedPdfPathDotNet,
-                    TEST_DOCUMENTS_DIRECTORY, "diff_") == null;
+                getTargetDirectory(), "diff_") == null;
         Assert.assertTrue(javaTest || dotNetTest);
 
         filename = "180_degrees_rotated";
@@ -134,9 +134,9 @@ public void compareRotatedImage() throws InterruptedException, IOException {
 
 
         javaTest = new CompareTool().compareVisually(resultPdfPath, expectedPdfPathJava,
-                    TEST_DOCUMENTS_DIRECTORY, "diff_") == null;
+                getTargetDirectory(), "diff_") == null;
         dotNetTest = new CompareTool().compareVisually(resultPdfPath, expectedPdfPathDotNet,
-                    TEST_DOCUMENTS_DIRECTORY, "diff_") == null;
+                getTargetDirectory(), "diff_") == null;
 
         Assert.assertTrue(javaTest || dotNetTest);
 
@@ -151,9 +151,9 @@ public void compareRotatedImage() throws InterruptedException, IOException {
 
 
         javaTest = new CompareTool().compareVisually(resultPdfPath, expectedPdfPathJava,
-                    TEST_DOCUMENTS_DIRECTORY, "diff_") == null;
+                getTargetDirectory(), "diff_") == null;
         dotNetTest = new CompareTool().compareVisually(resultPdfPath, expectedPdfPathDotNet,
-                    TEST_DOCUMENTS_DIRECTORY, "diff_") == null;
+                getTargetDirectory(), "diff_") == null;
 
         Assert.assertTrue(javaTest || dotNetTest);
     }