You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2014/12/26 10:14:53 UTC

svn commit: r1647945 - in /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser: BaseParser.java ConformingPDFParser.java

Author: tilman
Date: Fri Dec 26 09:14:52 2014
New Revision: 1647945

URL: http://svn.apache.org/r1647945
Log:
PDFBOX-2576: isEndOfName() contains isClosing()

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/ConformingPDFParser.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java?rev=1647945&r1=1647944&r2=1647945&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java Fri Dec 26 09:14:52 2014
@@ -1323,7 +1323,7 @@ public abstract class BaseParser
         skipSpaces();
         StringBuilder buffer = new StringBuilder();
         int c = pdfSource.read();
-        while( !isEndOfName((char)c) && !isClosing(c) && c != -1 )
+        while( !isEndOfName((char)c) && c != -1 )
         {
             buffer.append( (char)c );
             c = pdfSource.read();

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/ConformingPDFParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/ConformingPDFParser.java?rev=1647945&r1=1647944&r2=1647945&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/ConformingPDFParser.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/ConformingPDFParser.java Fri Dec 26 09:14:52 2014
@@ -531,11 +531,13 @@ public class ConformingPDFParser extends
         consumeWhitespace();
         StringBuilder buffer = new StringBuilder();
         int c = pdfSource.read();
-        while(!isEndOfName((char)c) && !isClosing(c) && c != -1) {
+        while (!isEndOfName((char) c) && c != -1)
+        {
             buffer.append( (char)c );
             c = pdfSource.read();
         }
-        if (c != -1) {
+        if (c != -1)
+        {
             pdfSource.unread(c);
         }
         return buffer.toString();