You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2012/04/17 23:03:17 UTC
svn commit: r1327278 - in /pdfbox/trunk/preflight/src:
main/java/org/apache/padaf/preflight/font/Type1MetricHelper.java
test/java/org/apache/padaf/preflight/TestValidDirectory.java
test/java/org/apache/padaf/preflight/font/TestType1MetricHelper.java
Author: leleueri
Date: Tue Apr 17 21:03:17 2012
New Revision: 1327278
URL: http://svn.apache.org/viewvc?rev=1327278&view=rev
Log:
Fix Type1MetricHelper test case : use of the notdef character
Modified:
pdfbox/trunk/preflight/src/main/java/org/apache/padaf/preflight/font/Type1MetricHelper.java
pdfbox/trunk/preflight/src/test/java/org/apache/padaf/preflight/TestValidDirectory.java
pdfbox/trunk/preflight/src/test/java/org/apache/padaf/preflight/font/TestType1MetricHelper.java
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/padaf/preflight/font/Type1MetricHelper.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/padaf/preflight/font/Type1MetricHelper.java?rev=1327278&r1=1327277&r2=1327278&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/padaf/preflight/font/Type1MetricHelper.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/padaf/preflight/font/Type1MetricHelper.java Tue Apr 17 21:03:17 2012
@@ -1019,6 +1019,11 @@ public class Type1MetricHelper {
Type1GlyphDescription glyph = this.labelToMetric.get(label);
if (glyph != null) {
return glyph.getWidth();
+ } else {
+ glyph = this.labelToMetric.get(NOTDEF);
+ if (glyph != null) {
+ return glyph.getWidth();
+ }
}
return 0;
Modified: pdfbox/trunk/preflight/src/test/java/org/apache/padaf/preflight/TestValidDirectory.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/padaf/preflight/TestValidDirectory.java?rev=1327278&r1=1327277&r2=1327278&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/test/java/org/apache/padaf/preflight/TestValidDirectory.java (original)
+++ pdfbox/trunk/preflight/src/test/java/org/apache/padaf/preflight/TestValidDirectory.java Tue Apr 17 21:03:17 2012
@@ -64,6 +64,7 @@ public class TestValidDirectory {
public void validate () throws Exception {
ValidationResult result = null;
try {
+ System.out.println(target);
result = validator.validate(new FileDataSource(target));
Assert.assertTrue("Validation of " + target ,result.isValid());
} finally {
Modified: pdfbox/trunk/preflight/src/test/java/org/apache/padaf/preflight/font/TestType1MetricHelper.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/padaf/preflight/font/TestType1MetricHelper.java?rev=1327278&r1=1327277&r2=1327278&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/test/java/org/apache/padaf/preflight/font/TestType1MetricHelper.java (original)
+++ pdfbox/trunk/preflight/src/test/java/org/apache/padaf/preflight/font/TestType1MetricHelper.java Tue Apr 17 21:03:17 2012
@@ -85,7 +85,8 @@ public class TestType1MetricHelper {
fail();
}
- @Test
+ @SuppressWarnings("deprecation")
+@Test
/**
* A Missing character code shouldn't cause Exception but return a Width of 0.
*/
@@ -106,17 +107,18 @@ public class TestType1MetricHelper {
InputStream font = this.getClass().getResourceAsStream(
"subset_type1_valid.font");
- Type1MetricHelper helper = new Type1MetricHelper(font, length1, length2,
+ Type1MetricHelper helper = new Type1MetricHelper(font, length1, length2,
FONT_DICTIONARY_VALUE_ENCODING_WIN);
helper.parse();
for (int i = 0; i < (last - first + 1); ++i) {
if (widths[i] != 0) {
+ System.out.println(widths[i] + " " + helper.getWidth(first + i));
assertTrue(widths[i] == helper.getWidth(first + i));
}
}
- // ---- Missing Glyph returns 0
- assertTrue(helper.getWidth(200) == 0);
+ // ---- Missing Glyph returns notdef width 278 in the tested font
+ assertTrue(helper.getWidth(200) == 278);
}
}