Add warning about duplicated glyph name

in CFFType1FontProgram
veraPDF · Dec 22, 2023 · 7938f8f · 7938f8f
1 parent 631c3f1
commit 7938f8f
Showing 1 changed file with 18 additions and 6 deletions.
diff --git a/src/main/java/org/verapdf/pd/font/cff/CFFType1FontProgram.java b/src/main/java/org/verapdf/pd/font/cff/CFFType1FontProgram.java
@@ -26,6 +26,8 @@
 
 import java.io.IOException;
 import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * Instance of this class represent a Type1 font from FontSet of
@@ -35,6 +37,10 @@
  */
 public class CFFType1FontProgram extends CFFFontBaseParser implements FontProgram {
 
+    private static final Logger LOGGER = Logger.getLogger(CFFType1FontProgram.class.getCanonicalName());
+
+    private static final String DUPLICATED_GLYPH_NAME_MESSAGE = "CFF Type1 FontProgram contains duplicated glyph name %s";
+
     private static final String NOTDEF_STRING = ".notdef";
 
     private final CMap externalCMap;  // in case if font is embedded into Type0 font
@@ -181,8 +187,12 @@ private void readCharSet() throws IOException {
                 case 0:
                     for (int i = 1; i < nGlyphs; ++i) {
                         int sid = this.readCard16();
-                        this.charSet.put(this.getStringBySID(sid), i);
-                        this.inverseCharSet.put(i, this.getStringBySID(sid));
+                        String stringBySID = this.getStringBySID(sid);
+                        if (charSet.containsKey(stringBySID)) {
+                            LOGGER.log(Level.WARNING, String.format(DUPLICATED_GLYPH_NAME_MESSAGE, stringBySID));
+                        }
+                        this.charSet.put(stringBySID, i);
+                        this.inverseCharSet.put(i, stringBySID);
                     }
                     break;
                 case 1:
@@ -198,10 +208,12 @@ private void readCharSet() throws IOException {
                                 nLeft = this.readCard16();
                             }
                             for (int i = 0; i <= nLeft; ++i) {
-                                this.charSet.put(this.getStringBySID(first + i),
-                                        charSetPointer);
-                                this.inverseCharSet.put(charSetPointer++,
-                                        this.getStringBySID(first + i));
+                                String stringBySID = this.getStringBySID(first + i);
+                                if (charSet.containsKey(stringBySID)) {
+                                    LOGGER.log(Level.WARNING, String.format(DUPLICATED_GLYPH_NAME_MESSAGE, stringBySID));
+                                }
+                                this.charSet.put(stringBySID, charSetPointer);
+                                this.inverseCharSet.put(charSetPointer++, stringBySID);
                             }
                         }
                     } catch (ArrayIndexOutOfBoundsException e) {