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 2016/02/12 19:48:28 UTC
svn commit: r1730090 - in
/pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight:
content/ContentStreamWrapper.java font/container/FontContainer.java
Author: tilman
Date: Fri Feb 12 18:48:28 2016
New Revision: 1730090
URL: http://svn.apache.org/viewvc?rev=1730090&view=rev
Log:
PDFBOX-3024: reassign font; cleanup javadoc
Modified:
pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/content/ContentStreamWrapper.java
pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/font/container/FontContainer.java
Modified: pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/content/ContentStreamWrapper.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/content/ContentStreamWrapper.java?rev=1730090&r1=1730089&r2=1730090&view=diff
==============================================================================
--- pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/content/ContentStreamWrapper.java (original)
+++ pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/content/ContentStreamWrapper.java Fri Feb 12 18:48:28 2016
@@ -62,8 +62,7 @@ public class ContentStreamWrapper extend
/**
* Process the validation of a PageContent (The page is initialized by the constructor)
*
- * @return A list of validation error. This list is empty if the validation succeed.
- * @throws ValidationException.
+ * @throws ValidationException
*/
public void validPageContentStream() throws ValidationException
{
@@ -89,7 +88,6 @@ public class ContentStreamWrapper extend
* Process the validation of a XObject Form
*
* @param xobj
- * @return A list of validation error. This list is empty if the validation succeed.
* @throws ValidationException
*/
public void validXObjContentStream(PDXObjectForm xobj) throws ValidationException
@@ -118,7 +116,6 @@ public class ContentStreamWrapper extend
* Process the validation of a Tiling Pattern
*
* @param pattern
- * @return A list of validation error. This list is empty if the validation succeed.
* @throws ValidationException
*/
public void validPatternContentStream(COSStream pattern) throws ValidationException
@@ -160,7 +157,7 @@ public class ContentStreamWrapper extend
* exception)
*/
String operation = operator.getOperation();
- OperatorProcessor processor = (OperatorProcessor) contentStreamEngineOperators.get(operation);
+ OperatorProcessor processor = contentStreamEngineOperators.get(operation);
if (processor != null)
{
processor.setContext(this);
@@ -357,6 +354,9 @@ public class ContentStreamWrapper extend
// font already computed
return;
}
+
+ // font may already have been cleared, so we have to reassign it
+ fontContainer.setFont(font);
int codeLength = 1;
for (int i = 0; i < string.length; i += codeLength)
Modified: pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/font/container/FontContainer.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/font/container/FontContainer.java?rev=1730090&r1=1730089&r2=1730090&view=diff
==============================================================================
--- pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/font/container/FontContainer.java (original)
+++ pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/font/container/FontContainer.java Fri Feb 12 18:48:28 2016
@@ -59,6 +59,11 @@ public abstract class FontContainer
this.font = font;
}
+ public void setFont(PDFont font)
+ {
+ this.font = font;
+ }
+
public void push(ValidationError error)
{
this.errorBuffer.add(error);