Author: jeremias
Date: Tue Oct 9 09:13:18 2012
New Revision: 1395925
URL: http://svn.apache.org/viewvc?rev=1395925&view=rev
Log:
Merge revision 1356456 from trunk:
Fix for regression introduced by revision 1352986: NPE when auto-detecting
TrueType Collections.
Modified:
xmlgraphics/fop/branches/fop-1_1/ (props changed)
xmlgraphics/fop/branches/fop-1_1/src/java/org/apache/fop/fonts/truetype/TTFFile.java
Propchange: xmlgraphics/fop/branches/fop-1_1/
------------------------------------------------------------------------------
Merged /xmlgraphics/fop/trunk:r1356456
Modified:
xmlgraphics/fop/branches/fop-1_1/src/java/org/apache/fop/fonts/truetype/TTFFile.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1/src/java/org/apache/fop/fonts/truetype/TTFFile.java?rev=1395925&r1=1395924&r2=1395925&view=diff
==============================================================================
---
xmlgraphics/fop/branches/fop-1_1/src/java/org/apache/fop/fonts/truetype/TTFFile.java
(original)
+++
xmlgraphics/fop/branches/fop-1_1/src/java/org/apache/fop/fonts/truetype/TTFFile.java
Tue Oct 9 09:13:18 2012
@@ -1672,7 +1672,7 @@ public class TTFFile {
for (Integer unicodeKey2 : ckpx.keySet()) {
Integer cidKey2 = unicodeToGlyph(unicodeKey2.intValue());
- Integer kern = (Integer)ckpx.get(unicodeKey2);
+ Integer kern = ckpx.get(unicodeKey2);
Iterator uniMap =
mtxTab[cidKey2.intValue()].getUnicodeIndex().listIterator();
while (uniMap.hasNext()) {
@@ -1838,6 +1838,8 @@ public class TTFFile {
* @throws IOException In case of an I/O problem
*/
public final List<String> getTTCnames(FontFileReader in) throws
IOException {
+ this.fontFile = in;
+
List<String> fontNames = new ArrayList<String>();
String tag = in.readTTFString(4);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
