You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ja...@apache.org on 2015/05/09 01:27:22 UTC
svn commit: r1678458 - in
/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/type1:
Type1Font.java Type1Parser.java
Author: jahewson
Date: Fri May 8 23:27:21 2015
New Revision: 1678458
URL: http://svn.apache.org/r1678458
Log:
PDFBOX-2791: Provide access to Type 1 font segments
Modified:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/type1/Type1Font.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/type1/Type1Parser.java
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/type1/Type1Font.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/type1/Type1Font.java?rev=1678458&r1=1678457&r2=1678458&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/type1/Type1Font.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/type1/Type1Font.java Fri May 8 23:27:21 2015
@@ -128,12 +128,17 @@ public final class Type1Font implements
// private caches
private final Map<String, Type1CharString> charStringCache =
new ConcurrentHashMap<String, Type1CharString>();
+
+ // raw data
+ final private byte[] segment1, segment2;
/**
* Constructs a new Type1Font, called by Type1Parser.
*/
- Type1Font()
+ Type1Font(byte[] segment1, byte[] segment2)
{
+ this.segment1 = segment1;
+ this.segment2 = segment2;
}
/**
@@ -517,6 +522,26 @@ public final class Type1Font implements
}
/**
+ * Returns the ASCII segment.
+ *
+ * @return the ASCII segment.
+ */
+ public byte[] getASCIISegment()
+ {
+ return segment1;
+ }
+
+ /**
+ * Returns the binary segment.
+ *
+ * @return the binary segment.
+ */
+ public byte[] getBinarySegment()
+ {
+ return segment2;
+ }
+
+ /**
* {@inheritDoc}
*/
@Override
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/type1/Type1Parser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/type1/Type1Parser.java?rev=1678458&r1=1678457&r2=1678458&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/type1/Type1Parser.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/type1/Type1Parser.java Fri May 8 23:27:21 2015
@@ -57,7 +57,7 @@ final class Type1Parser
*/
public Type1Font parse(byte[] segment1, byte[] segment2) throws IOException
{
- font = new Type1Font();
+ font = new Type1Font(segment1, segment2);
parseASCII(segment1);
if (segment2.length > 0)
{