Fixed bug:

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=19764
PFBParser reports "Could not load the whole segment"
Submitted by: Matthias Germann <germannm@post.ch>

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

diff --git a/src/java/org/apache/fop/fonts/type1/PFBParser.java b/src/java/org/apache/fop/fonts/type1/PFBParser.java
index f02fb5a15c0e67bf98cca1697c26753846cdef6c..e59bc94b209962c3462495468258ec8631ef3186 100644 (file)
--- a/src/java/org/apache/fop/fonts/type1/PFBParser.java
+++ b/src/java/org/apache/fop/fonts/type1/PFBParser.java
@@ -55,8 +55,8 @@ import java.io.InputStream;
 import java.io.DataInputStream;
 import java.io.BufferedInputStream;
 
-//FOP
-import org.apache.fop.util.StreamUtilities;
+//Commons
+import org.apache.commons.io.IOUtil;
 
 /**
  * This class represents a parser for Adobe Type 1 PFB files.
@@ -155,10 +155,7 @@ public class PFBParser {
         segmentType = din.readUnsignedByte(); //Read
         int len1 = swapInteger(din.readInt());
         byte[] headerSegment = new byte[len1];
-        bytesRead = din.read(headerSegment);
-        if (bytesRead != len1) {
-            throw new IOException("Could not load the whole segment");
-        }
+        din.readFully(headerSegment);
         pfb.setHeaderSegment(headerSegment);
 
         //Read second segment
@@ -169,10 +166,7 @@ public class PFBParser {
         segmentType = din.readUnsignedByte();
         int len2 = swapInteger(din.readInt());
         byte[] encryptedSegment = new byte[len2];
-        bytesRead = din.read(encryptedSegment);
-        if (bytesRead != len2) {
-            throw new IOException("Could not load the whole segment");
-        }
+        din.readFully(encryptedSegment);
         pfb.setEncryptedSegment(encryptedSegment);
 
         //Read third segment
@@ -183,10 +177,7 @@ public class PFBParser {
         segmentType = din.readUnsignedByte();
         int len3 = swapInteger(din.readInt());
         byte[] trailerSegment = new byte[len3];
-        bytesRead = din.read(trailerSegment);
-        if (bytesRead != len3) {
-            throw new IOException("Could not load the whole segment");
-        }
+        din.readFully(trailerSegment);
         pfb.setTrailerSegment(trailerSegment);
 
         //Read EOF indicator
@@ -270,7 +261,7 @@ public class PFBParser {
 
     private void parseRAWFormat(PFBData pfb, BufferedInputStream bin)
             throws IOException {
-        calcLengths(pfb, StreamUtilities.toByteArray(bin, 32768));
+        calcLengths(pfb, IOUtil.toByteArray(bin));
     }
 
 }
\ No newline at end of file