r20027 by avox - less alarming warnings for post table diagnostics

[scribus-commit]

Author: avox
Date: Sun Apr 26 14:53:54 2015
New Revision: 20027

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20027
Log:
less alarming warnings for post table diagnostics

Modified:
    trunk/Scribus/scribus/fonts/scface_ttf.cpp
    trunk/Scribus/scribus/fonts/sfnt.cpp

Modified: trunk/Scribus/scribus/fonts/scface_ttf.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=20027&path=/trunk/Scribus/scribus/fonts/scface_ttf.cpp
==============================================================================
--- trunk/Scribus/scribus/fonts/scface_ttf.cpp (original)
+++ trunk/Scribus/scribus/fonts/scface_ttf.cpp Sun Apr 26 14:53:54 2015
@@ -527,9 +527,9 @@
        FT_Face face = ftFace();
        checkPost.readFrom(face);
        if (!checkPost.usable)
-               qDebug() << "unusable post table for " << face->family_name << 
face->style_name << ":" << checkPost.errorMsg;
+               qDebug() << "can't use post table from " << face->family_name 
<< face->style_name << ":" << checkPost.errorMsg;
        else
-               qDebug() << "posttable has names for" << 
checkPost.numberOfGlyphs() << "glyphs from" << maxGlyph;
+               qDebug() << "posttable from" << face->family_name << 
face->style_name << "has names for" << checkPost.numberOfGlyphs() << "glyphs 
and" << maxGlyph << "glyphs in charmap";
        const_cast<bool&>(hasGlyphNames) = checkPost.usable && 
checkPost.numberOfGlyphs() >= maxGlyph;
 }
 

Modified: trunk/Scribus/scribus/fonts/sfnt.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=20027&path=/trunk/Scribus/scribus/fonts/sfnt.cpp
==============================================================================
--- trunk/Scribus/scribus/fonts/sfnt.cpp (original)
+++ trunk/Scribus/scribus/fonts/sfnt.cpp Sun Apr 26 14:53:54 2015
@@ -340,8 +340,12 @@
             return;
         case sfnt::post_format20:
             break;
+        case sfnt::post_format30:
+            errorMsg = QString("post table has no glyph names");
+            usable = false;
+            return;
+            
         case sfnt::post_format25:
-        case sfnt::post_format30:
         case sfnt::post_format40:
         default:
             errorMsg = QString("unsupported post format 
%1").arg(QString::number(sfnt::word(postData,0),16));


_______________________________________________
scribus-commit mailing list
scribus-commit@lists.scribus.net
http://lists.scribus.net/mailman/listinfo/scribus-commit