[Gnash-commit] gnash ChangeLog server/FreetypeGlyphsProvider.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/07/02 23:20:14

Modified files:
        .              : ChangeLog 
        server         : FreetypeGlyphsProvider.cpp 

Log message:
                * server/FreetypeGlyphsProvider.cpp: protect debugging calls
                  by a GNASH_DEBUG_DEVICEFONTS, defaulting to undefined.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3642&r2=1.3643
http://cvs.savannah.gnu.org/viewcvs/gnash/server/FreetypeGlyphsProvider.cpp?cvsroot=gnash&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3642
retrieving revision 1.3643
diff -u -b -r1.3642 -r1.3643
--- ChangeLog   2 Jul 2007 22:48:20 -0000       1.3642
+++ ChangeLog   2 Jul 2007 23:20:14 -0000       1.3643
@@ -1,5 +1,7 @@
 2007-07-02 Sandro Santilli <address@hidden>
 
+       * server/FreetypeGlyphsProvider.cpp: protect debugging calls
+         by a GNASH_DEBUG_DEVICEFONTS, defaulting to undefined.
        * libbase/GC.{cpp,h}: Implement an heuristic to reduce
          the number of collector runs. It is based on the number
          of newly registered collectables since last run.

Index: server/FreetypeGlyphsProvider.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/FreetypeGlyphsProvider.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/FreetypeGlyphsProvider.cpp   1 Jul 2007 10:54:18 -0000       1.5
+++ server/FreetypeGlyphsProvider.cpp   2 Jul 2007 23:20:14 -0000       1.6
@@ -58,6 +58,9 @@
 // Define the following to make outline decomposition verbose
 //#define DEBUG_OUTLINE_DECOMPOSITION 1
 
+// Define the following to make device font handling verbose
+//#define GNASH_DEBUG_DEVICEFONTS 1
+
 namespace gnash {
 
 #ifdef HAVE_FREETYPE2 
@@ -266,14 +269,18 @@
 
        if ( fs )
        {
+#ifdef GNASH_DEBUG_DEVICEFONTS
                log_debug("Found %d fonts matching the family %s (using 
first)", fs->nfont, name.c_str());
+#endif
 
                for (int j = 0; j < fs->nfont; j++)
                {
                        FcChar8 *file;
                        if (FcPatternGetString (fs->fonts[j], FC_FILE, 0, 
&file) != FcResultMatch)
                        {
+#ifdef GNASH_DEBUG_DEVICEFONTS
                log_debug("Matching font %d has unknown filename, skipping", j);
+#endif
                continue;
                        }
 
@@ -371,7 +378,9 @@
        // we will scale 
        scale = 1024.0f/m_face->units_per_EM;
 
+#ifdef GNASH_DEBUG_DEVICEFONTS
        log_debug("EM square for font '%s' is %d, scale is thus %g", 
name.c_str(), m_face->units_per_EM, scale);
+#endif
 }
 #else // ndef(HAVE_FREETYPE2)
 FreetypeGlyphsProvider::FreetypeGlyphsProvider(const std::string&, bool, bool)