You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2020/05/10 07:40:36 UTC

svn commit: r1877545 - in /pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font: FileSystemFontProvider.java FontMapperImpl.java

Author: tilman
Date: Sun May 10 07:40:36 2020
New Revision: 1877545

URL: http://svn.apache.org/viewvc?rev=1877545&view=rev
Log:
PDFBOX-4824: more temporary logging

Modified:
    pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java
    pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontMapperImpl.java

Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java?rev=1877545&r1=1877544&r2=1877545&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java Sun May 10 07:40:36 2020
@@ -650,6 +650,11 @@ final class FileSystemFontProvider exten
                     fontInfoList.add(new FSIgnored(file, FontFormat.TTF, ttf.getName()));
                     return;
                 }
+                if (ttf.getUnicodeCmapLookup(false) == null)
+                {
+                    fontInfoList.add(new FSIgnored(file, FontFormat.TTF, "*skipnocmap*"));
+                    LOG.warn("Skipping font " + ttf.getName() + " with no cmap, in file " + file);
+                }
                 int macStyle = ttf.getHeader().getMacStyle();
 
                 int sFamilyClass = -1;

Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontMapperImpl.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontMapperImpl.java?rev=1877545&r1=1877544&r2=1877545&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontMapperImpl.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontMapperImpl.java Sun May 10 07:40:36 2020
@@ -520,8 +520,17 @@ final class FontMapperImpl implements Fo
                 {
                     LOG.info("bestMatch for '" + baseFont + "': " + bestMatch.info);
                     FontBoxFont font = bestMatch.info.getFont();
+                    LOG.info("bestMatch2: " + font);
                     if (font instanceof OpenTypeFont)
                     {
+                        try
+                        {
+                            LOG.info("bestMatch3: " + ((OpenTypeFont) font).getCmap());
+                        }
+                        catch (IOException ex)
+                        {
+                            LOG.info(ex.getMessage(), ex);
+                        }
                         return new CIDFontMapping((OpenTypeFont)font, null, true);
                     }
                     else if (font != null)