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 2014/10/09 09:51:18 UTC
svn commit: r1630308 - in /pdfbox/trunk:
pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/
preflight/src/main/java/org/apache/pdfbox/preflight/font/
preflight/src/main/java/org/apache/pdfbox/preflight/font/container/
preflight/src/main/java/org/apac...
Author: jahewson
Date: Thu Oct 9 07:51:16 2014
New Revision: 1630308
URL: http://svn.apache.org/r1630308
Log:
PDFBOX-2414: Make PDType1Equivalent explicitly extend PDFontLike, fixes Preflight bug
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Equivalent.java
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/Type1FontValidator.java
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/container/Type1Container.java
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/Type1DescriptorHelper.java
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/FontValidationProcess.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Equivalent.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Equivalent.java?rev=1630308&r1=1630307&r2=1630308&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Equivalent.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Equivalent.java Thu Oct 9 07:51:16 2014
@@ -26,7 +26,7 @@ import org.apache.fontbox.ttf.Type1Equiv
*
* @author John Hewson
*/
-public interface PDType1Equivalent
+public interface PDType1Equivalent extends PDFontLike
{
/**
* Returns the name of this font.
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/Type1FontValidator.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/Type1FontValidator.java?rev=1630308&r1=1630307&r2=1630308&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/Type1FontValidator.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/Type1FontValidator.java Thu Oct 9 07:51:16 2014
@@ -33,6 +33,7 @@ import org.apache.pdfbox.cos.COSDictiona
import org.apache.pdfbox.cos.COSDocument;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.font.PDSimpleFont;
+import org.apache.pdfbox.pdmodel.font.PDType1Equivalent;
import org.apache.pdfbox.pdmodel.font.PDType1Font;
import org.apache.pdfbox.preflight.PreflightContext;
import org.apache.pdfbox.preflight.ValidationResult.ValidationError;
@@ -42,16 +43,15 @@ import org.apache.pdfbox.preflight.utils
public class Type1FontValidator extends SimpleFontValidator<Type1Container>
{
-
- public Type1FontValidator(PreflightContext context, PDType1Font font)
+ public Type1FontValidator(PreflightContext context, PDSimpleFont font)
{
- super(context, font, font.getCOSObject(), new Type1Container(font));
+ super(context, font, font.getCOSObject(), new Type1Container((PDType1Equivalent)font));
}
@Override
protected void createFontDescriptorHelper()
{
- this.descriptorHelper = new Type1DescriptorHelper(context, (PDType1Font) font, fontContainer);
+ this.descriptorHelper = new Type1DescriptorHelper(context, (PDType1Equivalent)font, fontContainer);
}
@Override
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/container/Type1Container.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/container/Type1Container.java?rev=1630308&r1=1630307&r2=1630308&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/container/Type1Container.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/container/Type1Container.java Thu Oct 9 07:51:16 2014
@@ -22,11 +22,11 @@
package org.apache.pdfbox.preflight.font.container;
import java.io.IOException;
-import org.apache.pdfbox.pdmodel.font.PDType1Font;
+import org.apache.pdfbox.pdmodel.font.PDType1Equivalent;
-public class Type1Container extends FontContainer<PDType1Font>
+public class Type1Container extends FontContainer<PDType1Equivalent>
{
- public Type1Container(PDType1Font font)
+ public Type1Container(PDType1Equivalent font)
{
super(font);
}
@@ -37,7 +37,7 @@ public class Type1Container extends Font
if (font.isEmbedded())
{
String name = font.codeToName(code);
- return font.getType1Font().hasGlyph(name);
+ return font.getType1Equivalent().hasGlyph(name);
}
return false;
}
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/Type1DescriptorHelper.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/Type1DescriptorHelper.java?rev=1630308&r1=1630307&r2=1630308&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/Type1DescriptorHelper.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/Type1DescriptorHelper.java Thu Oct 9 07:51:16 2014
@@ -35,6 +35,8 @@ import org.apache.pdfbox.cos.COSStream;
import org.apache.pdfbox.pdmodel.common.PDStream;
import org.apache.pdfbox.pdmodel.font.PDFont;
import org.apache.pdfbox.pdmodel.font.PDFontDescriptor;
+import org.apache.pdfbox.pdmodel.font.PDSimpleFont;
+import org.apache.pdfbox.pdmodel.font.PDType1Equivalent;
import org.apache.pdfbox.pdmodel.font.PDType1Font;
import org.apache.pdfbox.preflight.PreflightContext;
import org.apache.pdfbox.preflight.ValidationResult.ValidationError;
@@ -42,7 +44,7 @@ import org.apache.pdfbox.preflight.font.
public class Type1DescriptorHelper extends FontDescriptorHelper<Type1Container>
{
- public Type1DescriptorHelper(PreflightContext context, PDType1Font font, Type1Container fontContainer)
+ public Type1DescriptorHelper(PreflightContext context, PDType1Equivalent font, Type1Container fontContainer)
{
super(context, font, fontContainer);
}
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/FontValidationProcess.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/FontValidationProcess.java?rev=1630308&r1=1630307&r2=1630308&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/FontValidationProcess.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/FontValidationProcess.java Thu Oct 9 07:51:16 2014
@@ -90,7 +90,7 @@ public class FontValidationProcess exten
}
else if (FONT_DICTIONARY_VALUE_MMTYPE.equals(subtype) || FONT_DICTIONARY_VALUE_TYPE1.equals(subtype))
{
- return new Type1FontValidator(context, (PDType1Font)font);
+ return new Type1FontValidator(context, (PDSimpleFont)font);
}
else if (FONT_DICTIONARY_VALUE_TYPE3.equals(subtype))
{