Fix issue with Noto font

Author: ars18wrw

io/src/main/java/com/itextpdf/io/font/CFFFontSubset.java

@@ -651,15 +651,18 @@ protected void ReadASubr(int begin,int end,int GBias,int LBias,Map<Integer, int[
                 break;
                 case "hintmask":
                 case "cntrmask":
+                    // if stack is not empty the reason is vstem implicit definition
+                    // See Adobe Technical Note #5177, page 25, hintmask usage example.
+                    NumOfHints += NumOfArgs/2;
                     // Compute the size of the mask
                     int SizeOfMask = NumOfHints/8;
                     if (NumOfHints%8 != 0 || SizeOfMask == 0)
                         SizeOfMask++;
                     // Continue the pointer in SizeOfMask steps
-                for (int i=0;i<SizeOfMask;i++) {
-                    getCard8();
-                }
-                break;
+                    for (int i=0;i<SizeOfMask;i++) {
+                        getCard8();
+                    }
+                    break;
             }
         }
     }

kernel/src/test/java/com/itextpdf/kernel/pdf/canvas/PdfFontTest.java

@@ -1,15 +1,14 @@
 package com.itextpdf.kernel.pdf.canvas;
 
 import com.itextpdf.io.LogMessageConstant;
-import com.itextpdf.io.font.otf.Glyph;
-import com.itextpdf.io.util.Utilities;
 import com.itextpdf.io.font.CidFont;
 import com.itextpdf.io.font.FontConstants;
 import com.itextpdf.io.font.FontFactory;
 import com.itextpdf.io.font.TrueTypeCollection;
 import com.itextpdf.io.font.TrueTypeFont;
 import com.itextpdf.io.font.Type1Font;
 import com.itextpdf.io.source.ByteArrayOutputStream;
+import com.itextpdf.io.util.Utilities;
 import com.itextpdf.kernel.color.DeviceRgb;
 import com.itextpdf.kernel.font.PdfFont;
 import com.itextpdf.kernel.font.PdfFontFactory;
@@ -25,10 +24,10 @@
 import com.itextpdf.kernel.pdf.PdfReader;
 import com.itextpdf.kernel.pdf.PdfWriter;
 import com.itextpdf.kernel.utils.CompareTool;
-import com.itextpdf.test.annotations.type.IntegrationTest;
 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 java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -1232,6 +1231,32 @@ public void testWriteTTC() throws IOException, InterruptedException {
 
     }
 
+    @Test
+    public void testNotoFont() throws IOException, InterruptedException {
+        String filename = destinationFolder + "testNotoFont.pdf";
+        String cmpFilename = sourceFolder + "cmp_testNotoFont.pdf";
+
+        String japanese = "\u713C";
+
+        PdfDocument doc = new PdfDocument(new PdfWriter(filename));
+        PdfPage page = doc.addNewPage();
+
+        PdfFont font = PdfFontFactory.createFont(fontsFolder + "NotoSansCJKjp-Bold.otf", "Identity-H", true);
+
+        PdfCanvas canvas = new PdfCanvas(page);
+        canvas.saveState()
+                .beginText()
+                .moveText(36, 680)
+                .setFontAndSize(font, 12)
+                .showText(japanese)
+                .endText()
+                .restoreState();
+
+        doc.close();
+        Assert.assertNull(new CompareTool().compareByContent(filename, cmpFilename, destinationFolder, "diff_"));
+    }
+
+
     @Test
     @Ignore("Invalid subset")
     public void NotoSansCJKjpTest() throws IOException, InterruptedException {
@@ -1242,8 +1267,8 @@ public void NotoSansCJKjpTest() throws IOException, InterruptedException {
         PdfDocument doc = new PdfDocument(writer);
         PdfPage page = doc.addNewPage();
         // Identity-H must be embedded
-        PdfFont font = PdfFontFactory.createFont(sourceFolder + "NotoSansCJKjp-Bold.otf", "Identity-H");
-        //font.setSubset(false);
+        PdfFont font = PdfFontFactory.createFont(fontsFolder + "NotoSansCJKjp-Bold.otf"/*"san.otf"*/, "Identity-H");
+        // font.setSubset(false);
         PdfCanvas canvas = new PdfCanvas(page);
         canvas.saveState()
                 .setFillColor(DeviceRgb.GREEN)