Author: gadams
Date: Fri Mar 9 16:50:06 2012
New Revision: 1298912
URL: http://svn.apache.org/viewvc?rev=1298912&view=rev
Log:
prevent assert due to skipped out of order or duplicate glyph indices
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphCoverageTable.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphCoverageTable.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphCoverageTable.java?rev=1298912&r1=1298911&r2=1298912&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphCoverageTable.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphCoverageTable.java
Fri Mar 9 16:50:06 2012
@@ -176,6 +176,7 @@ public final class GlyphCoverageTable ex
}
private void populate ( List entries ) {
int i = 0;
+ int skipped = 0;
int n = entries.size();
int gidMax = -1;
int[] map = new int [ n ];
@@ -188,6 +189,7 @@ public final class GlyphCoverageTable ex
map [ i++ ] = gidMax = gid;
} else {
log.info ( "ignoring out of order or duplicate
glyph index: " + gid );
+ skipped++;
}
} else {
throw new AdvancedTypographicTableFormatException (
"illegal glyph index: " + gid );
@@ -196,7 +198,7 @@ public final class GlyphCoverageTable ex
throw new AdvancedTypographicTableFormatException (
"illegal coverage entry, must be Integer: " + o );
}
}
- assert i == n;
+ assert ( i + skipped ) == n;
assert this.map == null;
this.map = map;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
