svn commit: r628804 - in /xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype: TTFFile.java TTFFontLoader.java

[jeremias]

Author: jeremias
Date: Mon Feb 18 08:45:18 2008
New Revision: 628804

URL: http://svn.apache.org/viewvc?rev=628804&view=rev
Log:
Reducing noise. Better messages.

Modified:
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFFile.java
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFFontLoader.java

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFFile.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFFile.java?rev=628804&r1=628803&r2=628804&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFFile.java 
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFFile.java 
Mon Feb 18 08:45:18 2008
@@ -222,7 +222,9 @@
             int cmapEID = in.readTTFUShort();
             long cmapOffset = in.readTTFULong();
 
-            log.debug("Platform ID: " + cmapPID + " Encoding: " + cmapEID);
+            if (log.isDebugEnabled()) {
+                log.debug("Platform ID: " + cmapPID + " Encoding: " + cmapEID);
+            }
 
             if (cmapPID == 3 && cmapEID == 1) {
                 cmapUniOffset = cmapOffset;
@@ -230,8 +232,7 @@
         }
 
         if (cmapUniOffset <= 0) {
-            log.fatal("Unicode cmap table not present");
-            log.fatal("Unsupported format: Aborting");
+            log.fatal("Unsupported TrueType font: Unicode cmap table not 
present. Aborting");
             return false;
         }
 
@@ -1333,9 +1334,11 @@
                         if (iObj == null) {
                             // happens for many fonts (Ubuntu font set),
                             // stray entries in the kerning table?? 
-                            log.warn("Unicode index (1) not found for glyph " 
+ i);
+                            log.debug("Ignoring kerning pair because no 
Unicode index was"
+                                    + " found for the first glyph " + i);
                         } else if (u2 == null) {
-                            log.warn("Unicode index (2) not found for glyph " 
+ i);
+                            log.debug("Ignoring kerning pair because Unicode 
index was"
+                                    + " found for the second glyph " + i);
                         } else {
                             Map adjTab = (Map)kerningTab.get(iObj);
                             if (adjTab == null) {

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFFontLoader.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFFontLoader.java?rev=628804&r1=628803&r2=628804&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFFontLoader.java 
(original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFFontLoader.java 
Mon Feb 18 08:45:18 2008
@@ -57,7 +57,7 @@
             FontFileReader reader = new FontFileReader(in);
             boolean supported = ttf.readFont(reader, null);
             if (!supported) {
-                throw new IOException("Could not load TrueType font: " + 
fontFileURI);
+                throw new IOException("TrueType font is not supported: " + 
fontFileURI);
             }
             buildFont(ttf);
             loaded = true;



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]