Author: lehmi
Date: Wed Mar 10 17:18:19 2010
New Revision: 921457
URL: http://svn.apache.org/viewvc?rev=921457&view=rev
Log:
PDFBOX-655: using the default font width instead of 0. Patch by Atsuo Ishimoto
(ishimoto at gembook dot org)
Modified:
pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFont.java
Modified:
pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFont.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFont.java?rev=921457&r1=921456&r2=921457&view=diff
==============================================================================
--- pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFont.java
(original)
+++ pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFont.java
Wed Mar 10 17:18:19 2010
@@ -27,7 +27,6 @@ import java.util.Map;
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSDictionary;
-import org.apache.pdfbox.cos.COSInteger;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.cos.COSNumber;
import org.apache.pdfbox.pdmodel.common.PDRectangle;
@@ -40,7 +39,7 @@ import org.apache.pdfbox.pdmodel.common.
*/
public abstract class PDCIDFont extends PDFont
{
- private Map widthCache = new HashMap();
+ private Map<Integer,Float> widthCache = new HashMap<Integer,Float>();
/**
* Constructor.
@@ -146,10 +145,10 @@ public abstract class PDCIDFont extends
public float getFontWidth( byte[] c, int offset, int length ) throws
IOException
{
- float retval = 0.0f;
+ float retval = getDefaultWidth();
int code = getCodeFromArray( c, offset, length );
- Float widthFloat = (Float)widthCache.get( new Integer( code ) );
+ Float widthFloat = widthCache.get( code );
if( widthFloat == null )
{
COSArray widths = (COSArray)font.getDictionaryObject( COSName.W );
@@ -186,7 +185,7 @@ public abstract class PDCIDFont extends
}
}
}
- widthCache.put( new Integer( code ), new Float( retval ) );
+ widthCache.put( code, retval );
}
}
else
