commit 9dc3399279c08a1263ed9e052ab5d86c3967a41c
author Simon Steiner <ssteiner@apache.org> Tue Jun 30 12:59:45 2020 +0000
committer Simon Steiner <ssteiner@apache.org> Tue Jun 30 12:59:45 2020 +0000
tree 61c8ac68d5f0ad0032dbe48f090ef9028ed645d1
parent 3d663ed0b220dce1f3b3434d56caa39701eba2ce

FOP-2951: Fix findbugs

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop-pdf-images/trunk@1879366 13f79535-47bb-0310-9956-ffa450edef68

src/java/org/apache/fop/render/pdf/pdfbox/PDFBoxAdapter.java

diff --git a/src/java/org/apache/fop/render/pdf/pdfbox/PDFBoxAdapter.java b/src/java/org/apache/fop/render/pdf/pdfbox/PDFBoxAdapter.java
index e6d11f5..d380267 100644
--- a/src/java/org/apache/fop/render/pdf/pdfbox/PDFBoxAdapter.java
+++ b/src/java/org/apache/fop/render/pdf/pdfbox/PDFBoxAdapter.java
@@ -210,20 +210,7 @@
         mergeXObj(sourcePageResources, fontinfo, uniqueName);
         PDFDictionary pageResources = (PDFDictionary)cloneForNewDocument(sourcePageResources);
 
-        PDFDictionary fontDict = (PDFDictionary)pageResources.get("Font");
-        if (fontDict != null && pdfDoc.isMergeFontsEnabled()) {
-            for (Map.Entry<String, Typeface> fontEntry : fontinfo.getUsedFonts().entrySet()) {
-                Typeface font = fontEntry.getValue();
-                if (font instanceof FOPPDFFont) {
-                    FOPPDFFont pdfFont = (FOPPDFFont)font;
-                    if (pdfFont.getRef() == null) {
-                        pdfFont.setRef(new PDFDictionary());
-                        pdfDoc.assignObjectNumber(pdfFont.getRef());
-                    }
-                    fontDict.put(fontEntry.getKey(), pdfFont.getRef());
-                }
-            }
-        }
+        updateMergeFontInfo(pageResources, fontinfo);
         updateXObj(sourcePageResources, pageResources);
         if (fontsBackup != null) {
             sourcePageResources.setItem(COSName.FONT, fontsBackup);