Author: jeremias
Date: Mon Aug  3 07:25:00 2009
New Revision: 800229

URL: http://svn.apache.org/viewvc?rev=800229&view=rev
Log:
Fixed problem with raster font substitution when there's no smaller font 
available. This avoids an exception.

Modified:
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/RasterFont.java

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/RasterFont.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/RasterFont.java?rev=800229&r1=800228&r2=800229&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/RasterFont.java 
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/RasterFont.java Mon 
Aug  3 07:25:00 2009
@@ -99,9 +99,13 @@
             int largerSize = largerSizes.isEmpty() ? Integer.MAX_VALUE
                     : ((Integer)largerSizes.firstKey()).intValue();
 
-            Integer fontSize
-                    = (size - smallerSize) <= (largerSize - size)
-                        ? new Integer(smallerSize) : new Integer(largerSize);
+            Integer fontSize;
+            if (!smallerSizes.isEmpty()
+                            && (size - smallerSize) <= (largerSize - size)) {
+                fontSize = new Integer(smallerSize);
+            } else {
+                fontSize = new Integer(largerSize);
+            }
             csm = (CharacterSet) charSets.get(fontSize);
 
             if (csm != null) {



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to