Browse Source

Checkstyle only.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@541628 13f79535-47bb-0310-9956-ffa450edef68
tags/fop-0_94
Jeremias Maerki 17 years ago
parent
commit
c58159b0eb
1 changed files with 9 additions and 7 deletions
  1. 9
    7
      src/java/org/apache/fop/fonts/apps/TTFReader.java

+ 9
- 7
src/java/org/apache/fop/fonts/apps/TTFReader.java View File

@@ -44,6 +44,7 @@ public class TTFReader extends AbstractFontReader {

/** Used to detect incompatible versions of the generated XML files */
public static final String METRICS_VERSION_ATTR = "metrics-version";
/** Current version number for the metrics file */
public static final int METRICS_VERSION = 2;
/**
@@ -243,7 +244,7 @@ public class TTFReader extends AbstractFontReader {
}
Element root = doc.createElement("font-metrics");
doc.appendChild(root);
root.setAttribute(METRICS_VERSION_ATTR,String.valueOf(METRICS_VERSION));
root.setAttribute(METRICS_VERSION_ATTR, String.valueOf(METRICS_VERSION));
if (isCid) {
root.setAttribute("type", "TYPE0");
} else {
@@ -465,33 +466,34 @@ public class TTFReader extends AbstractFontReader {
return stb.toString();
}
/** Bugzilla 40739, check that attr has a metrics-version attribute
* compatible with ours.
/**
* Bugzilla 40739, check that attr has a metrics-version attribute
* compatible with ours.
* @param attr attributes read from the root element of a metrics XML file
* @throws SAXException if incompatible
*/
public static void checkMetricsVersion(Attributes attr) throws SAXException {
String err = null;
final String str = attr.getValue(METRICS_VERSION_ATTR);
if(str==null) {
if (str == null) {
err = "Missing " + METRICS_VERSION_ATTR + " attribute";
} else {
int version = 0;
try {
version = Integer.parseInt(str);
if(version < METRICS_VERSION) {
if (version < METRICS_VERSION) {
err = "Incompatible " + METRICS_VERSION_ATTR
+ " value (" + version + ", should be " + METRICS_VERSION
+ ")"
;
}
} catch(NumberFormatException e) {
} catch (NumberFormatException e) {
err = "Invalid " + METRICS_VERSION_ATTR
+ " attribute value (" + str + ")";
}
}
if(err!=null) {
if (err != null) {
throw new SAXException(
err
+ " - please regenerate the font metrics file with "

Loading…
Cancel
Save