commit ebbb81acc639745e9a4fa847a58b6ac73e6dd221
author Tilman Hausherr <tilman@apache.org> Mon Jul 15 16:30:13 2019 +0000
committer Tilman Hausherr <tilman@apache.org> Mon Jul 15 16:30:13 2019 +0000
tree cf796f0bd757de31850f0221e2e7a6c14a234dc9
parent efcefed0191a4284dfc06d46d855fb9f299c83fe

PDFBOX-4071: SonarQube fix / refactor

git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1863095 13f79535-47bb-0310-9956-ffa450edef68

fontbox/src/main/java/org/apache/fontbox/ttf/CFFTable.java

diff --git a/fontbox/src/main/java/org/apache/fontbox/ttf/CFFTable.java b/fontbox/src/main/java/org/apache/fontbox/ttf/CFFTable.java
index e846788..f955e87 100644
--- a/fontbox/src/main/java/org/apache/fontbox/ttf/CFFTable.java
+++ b/fontbox/src/main/java/org/apache/fontbox/ttf/CFFTable.java
@@ -50,7 +50,7 @@
         byte[] bytes = data.read((int)getLength());
 
         CFFParser parser = new CFFParser();
-        cffFont = parser.parse(bytes, new ByteSource(font)).get(0);
+        cffFont = parser.parse(bytes, new CFFBytesource(font)).get(0);
 
         initialized = true;
     }
@@ -66,11 +66,11 @@
     /**
      * Allows bytes to be re-read later by CFFParser.
      */
-    private static class ByteSource implements CFFParser.ByteSource
+    private static class CFFBytesource implements CFFParser.ByteSource
     {
         private final TrueTypeFont ttf;
         
-        ByteSource(TrueTypeFont ttf)
+        CFFBytesource(TrueTypeFont ttf)
         {
            this.ttf = ttf; 
         }

pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java

diff --git a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java
index 309d843..a7fca24 100644
--- a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java
+++ b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java
@@ -97,7 +97,7 @@
             CFFParser cffParser = new CFFParser();
             try
             {
-                cffFont = cffParser.parse(bytes, new ByteSource()).get(0);
+                cffFont = cffParser.parse(bytes, new FF3ByteSource()).get(0);
             }
             catch (IOException e)
             {
@@ -478,13 +478,12 @@
         return 500;
     }
 
-    private class ByteSource implements CFFParser.ByteSource
+    private class FF3ByteSource implements CFFParser.ByteSource
     {
         @Override
         public byte[] getBytes() throws IOException
         {
-            PDStream ff3Stream = getFontDescriptor().getFontFile3();
-            return IOUtils.toByteArray(ff3Stream.createInputStream());
+            return getFontDescriptor().getFontFile3().toByteArray();
         }
     }
 }

pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java

diff --git a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java
index 091e7c3..5409288 100644
--- a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java
+++ b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java
@@ -99,7 +99,7 @@
             {
                 // note: this could be an OpenType file, fortunately CFFParser can handle that
                 CFFParser cffParser = new CFFParser();
-                cffEmbedded = (CFFType1Font)cffParser.parse(bytes, new ByteSource()).get(0);
+                cffEmbedded = (CFFType1Font)cffParser.parse(bytes, new FF3ByteSource()).get(0);
             }
         }
         catch (IOException e)
@@ -422,13 +422,12 @@
         return ".notdef";
     }
     
-    private class ByteSource implements CFFParser.ByteSource
+    private class FF3ByteSource implements CFFParser.ByteSource
     {
         @Override
         public byte[] getBytes() throws IOException
         {
-            PDStream ff3Stream = getFontDescriptor().getFontFile3();
-            return IOUtils.toByteArray(ff3Stream.createInputStream());
+            return getFontDescriptor().getFontFile3().toByteArray();
         }
     }
 }