You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2021/04/01 06:16:56 UTC
svn commit: r1888261 - in
/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff: CFFCIDFont.java
CFFFont.java CFFParser.java CFFType1Font.java
Author: lehmi
Date: Thu Apr 1 06:16:55 2021
New Revision: 1888261
URL: http://svn.apache.org/viewvc?rev=1888261&view=rev
Log:
PDFBOX-5143: make members private, remove duplicate overrides
Modified:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFCIDFont.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFFont.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFType1Font.java
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFCIDFont.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFCIDFont.java?rev=1888261&r1=1888260&r2=1888261&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFCIDFont.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFCIDFont.java Thu Apr 1 06:16:55 2021
@@ -225,16 +225,16 @@ public class CFFCIDFont extends CFFFont
CIDKeyedType2CharString type2 = charStringCache.get(cid);
if (type2 == null)
{
- int gid = charset.getGIDForCID(cid);
+ int gid = getCharset().getGIDForCID(cid);
byte[] bytes = charStrings[gid];
if (bytes == null)
{
bytes = charStrings[0]; // .notdef
}
- Type2CharStringParser parser = new Type2CharStringParser(fontName, cid);
+ Type2CharStringParser parser = new Type2CharStringParser(getName(), cid);
List<Object> type2seq = parser.parse(bytes, globalSubrIndex, getLocalSubrIndex(gid));
- type2 = new CIDKeyedType2CharString(reader, fontName, cid, gid, type2seq,
+ type2 = new CIDKeyedType2CharString(reader, getName(), cid, gid, type2seq,
getDefaultWidthX(gid), getNominalWidthX(gid));
charStringCache.put(cid, type2);
}
@@ -242,13 +242,6 @@ public class CFFCIDFont extends CFFFont
}
@Override
- public List<Number> getFontMatrix()
- {
- // our parser guarantees that FontMatrix will be present and correct in the Top DICT
- return (List<Number>)topDict.get("FontMatrix");
- }
-
- @Override
public GeneralPath getPath(String selector) throws IOException
{
int cid = selectorToCID(selector);
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFFont.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFFont.java?rev=1888261&r1=1888260&r2=1888261&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFFont.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFFont.java Thu Apr 1 06:16:55 2021
@@ -33,12 +33,12 @@ import org.apache.fontbox.util.BoundingB
*/
public abstract class CFFFont implements FontBoxFont
{
- protected String fontName;
+ private String fontName;
+ private CFFCharset charset;
+ private CFFParser.ByteSource source;
protected final Map<String, Object> topDict = new LinkedHashMap<>();
- protected CFFCharset charset;
protected byte[][] charStrings;
protected byte[][] globalSubrIndex;
- private CFFParser.ByteSource source;
/**
* The name of the font.
@@ -89,7 +89,10 @@ public abstract class CFFFont implements
* Returns the FontMatrix.
*/
@Override
- public abstract List<Number> getFontMatrix();
+ public List<Number> getFontMatrix()
+ {
+ return (List<Number>) topDict.get("FontMatrix");
+ }
/**
* Returns the FontBBox.
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java?rev=1888261&r1=1888260&r2=1888261&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java Thu Apr 1 06:16:55 2021
@@ -748,7 +748,7 @@ public class CFFParser
DictData.Entry privateEntry = topDict.getEntry("Private");
if (privateEntry == null)
{
- throw new IOException("Private dictionary entry missing for font " + font.fontName);
+ throw new IOException("Private dictionary entry missing for font " + font.getName());
}
int privateOffset = privateEntry.getNumber(1).intValue();
input.setPosition(privateOffset);
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFType1Font.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFType1Font.java?rev=1888261&r1=1888260&r2=1888261&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFType1Font.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFType1Font.java Thu Apr 1 06:16:55 2021
@@ -73,17 +73,11 @@ public class CFFType1Font extends CFFFon
@Override
public boolean hasGlyph(String name)
{
- int sid = charset.getSID(name);
- int gid = charset.getGIDForSID(sid);
+ int sid = getCharset().getSID(name);
+ int gid = getCharset().getGIDForSID(sid);
return gid != 0;
}
- @Override
- public List<Number> getFontMatrix()
- {
- return (List<Number>)topDict.get("FontMatrix");
- }
-
/**
* Returns the Type 1 charstring for the given PostScript glyph name.
*
@@ -108,8 +102,8 @@ public class CFFType1Font extends CFFFon
public int nameToGID(String name)
{
// some fonts have glyphs beyond their encoding, so we look up by charset SID
- int sid = charset.getSID(name);
- return charset.getGIDForSID(sid);
+ int sid = getCharset().getSID(name);
+ return getCharset().getGIDForSID(sid);
}
/**
@@ -141,9 +135,9 @@ public class CFFType1Font extends CFFFon
// .notdef
bytes = charStrings[0];
}
- Type2CharStringParser parser = new Type2CharStringParser(fontName, name);
+ Type2CharStringParser parser = new Type2CharStringParser(getName(), name);
List<Object> type2seq = parser.parse(bytes, globalSubrIndex, getLocalSubrIndex());
- type2 = new Type2CharString(reader, fontName, name, gid, type2seq, getDefaultWidthX(),
+ type2 = new Type2CharString(reader, getName(), name, gid, type2seq, getDefaultWidthX(),
getNominalWidthX());
charStringCache.put(gid, type2);
}