[Gnash-commit] gnash ChangeLog gui/gtk.cpp server/FreetypeRast...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/06/13 02:49:33

Modified files:
        .              : ChangeLog 
        gui            : gtk.cpp 
        server         : FreetypeRasterizer.cpp fontlib.cpp 
                         movie_root.cpp text.cpp 

Log message:
                * gui/gtk.cpp, server/FreetypeRasterizer.cpp,
                  server/fontlib.cpp, server/movie_root.cpp,
                  server/text.cpp: Reduced verbosity.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3516&r2=1.3517
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.92&r2=1.93
http://cvs.savannah.gnu.org/viewcvs/gnash/server/FreetypeRasterizer.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/fontlib.cpp?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.64&r2=1.65
http://cvs.savannah.gnu.org/viewcvs/gnash/server/text.cpp?cvsroot=gnash&r1=1.30&r2=1.31

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3516
retrieving revision 1.3517
diff -u -b -r1.3516 -r1.3517
--- ChangeLog   13 Jun 2007 02:24:42 -0000      1.3516
+++ ChangeLog   13 Jun 2007 02:49:32 -0000      1.3517
@@ -1,5 +1,11 @@
 2007-06-13 Sandro Santilli <address@hidden>
 
+       * gui/gtk.cpp, server/FreetypeRasterizer.cpp,
+         server/fontlib.cpp, server/movie_root.cpp,
+         server/text.cpp: Reduced verbosity.
+
+2007-06-13 Sandro Santilli <address@hidden>
+
        * server/FreetypeRasterizer.{cpp,h}: Implement shape_character_def
          output using DynamicShape; changed getGlyph method to also take
          an 'advance' output parameter (toward deprecation of bitmap output).

Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- gui/gtk.cpp 1 Jun 2007 11:02:17 -0000       1.92
+++ gui/gtk.cpp 13 Jun 2007 02:49:32 -0000      1.93
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: gtk.cpp,v 1.92 2007/06/01 11:02:17 strk Exp $ */
+/* $Id: gtk.cpp,v 1.93 2007/06/13 02:49:32 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -65,7 +65,7 @@
 bool
 GtkGui::init(int argc, char **argv[])
 {
-    GNASH_REPORT_FUNCTION;
+    //GNASH_REPORT_FUNCTION;
 
 
     gtk_init (&argc, argv);
@@ -223,7 +223,7 @@
 bool
 GtkGui::createWindow(int width, int height)
 {
-       GNASH_REPORT_FUNCTION;
+       //GNASH_REPORT_FUNCTION;
 
        assert(_width>0);
        assert(_height>0);
@@ -320,7 +320,7 @@
 bool
 GtkGui::run()
 {
-    GNASH_REPORT_FUNCTION;
+    //GNASH_REPORT_FUNCTION;
     gtk_main();
     return true;
 }
@@ -328,7 +328,7 @@
 bool
 GtkGui::createMenu()
 {
-    GNASH_REPORT_FUNCTION;
+    //GNASH_REPORT_FUNCTION;
 
     _popup_menu = GTK_MENU(gtk_menu_new());
 //    GtkAccelGroup *accel_group = gtk_accel_group_new();;
@@ -785,7 +785,7 @@
 bool
 GtkGui::setupEvents()
 {
-  GNASH_REPORT_FUNCTION;
+  //GNASH_REPORT_FUNCTION;
 
   g_signal_connect(G_OBJECT(_window), "delete_event",
                    G_CALLBACK(delete_event), this);
@@ -1071,7 +1071,7 @@
 GtkGui::realize_event(GtkWidget* /*widget*/, GdkEvent* /*event*/,
                gpointer /*data*/)
 {
-    GNASH_REPORT_FUNCTION;
+    //GNASH_REPORT_FUNCTION;
 
     return TRUE;
 }

Index: server/FreetypeRasterizer.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/FreetypeRasterizer.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/FreetypeRasterizer.cpp       13 Jun 2007 02:24:42 -0000      1.7
+++ server/FreetypeRasterizer.cpp       13 Jun 2007 02:49:32 -0000      1.8
@@ -31,6 +31,9 @@
 // Define the following to make outline decomposition verbose
 //#define DEBUG_OUTLINE_DECOMPOSITION 1
 
+// Define the following to make glyph rendering verbose
+//#define DEBUG_GLYPH_RENDERING 1
+
 // TODO: drop this ?
 #define FREETYPE_MAX_FONTSIZE 96
 
@@ -264,10 +267,12 @@
 
        std::auto_ptr<image::alpha> im ( draw_bitmap(bitmap) );
 
+#ifdef DEBUG_GLYPH_RENDERING
        log_debug("image::alpha drawn for character glyph '%c' bitmap has size 
%dx%d", code, im->m_width, im->m_height);
        log_debug("ttf bitmap glyph width:%d, rows:%d", bitmap.width, 
bitmap.rows);
        log_debug("ttf glyph metrics width:%ld, height:%ld", metrics.width, 
metrics.height);
        log_debug("ttf glyph metrics X bearing:%ld, Y bearing:%ld", 
metrics.horiBearingX, metrics.horiBearingY);
+#endif
 
        bi = render::create_bitmap_info_alpha(im->m_width, im->m_height, 
im->m_data);
 
@@ -295,7 +300,9 @@
        static float s_advance_scale = 0.16666666f; //vv hack
        advance = (float) m_face->glyph->metrics.horiAdvance * s_advance_scale;
 
+#ifdef DEBUG_GLYPH_RENDERING
        log_debug(" box: %s, advance: %g", box.toString().c_str(), advance);
+#endif
 
 
        return bi;
@@ -328,10 +335,10 @@
 
        FT_Outline* outline = &(m_face->glyph->outline);
 
-       FT_BBox glyphBox;
-       FT_Outline_Get_BBox(outline, &glyphBox);
-       rect r(glyphBox.xMin, glyphBox.yMin, glyphBox.xMax, glyphBox.yMax);
-       log_msg("Glyph for character '%c' has computed bounds %s", code, 
r.toString().c_str());
+       //FT_BBox       glyphBox;
+       //FT_Outline_Get_BBox(outline, &glyphBox);
+       //rect r(glyphBox.xMin, glyphBox.yMin, glyphBox.xMax, glyphBox.yMax);
+       //log_msg("Glyph for character '%c' has computed bounds %s", code, 
r.toString().c_str());
 
        sh = new DynamicShape();
        sh->beginFill(rgba(255, 255, 255, 255));

Index: server/fontlib.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/fontlib.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/fontlib.cpp  13 Jun 2007 00:17:45 -0000      1.27
+++ server/fontlib.cpp  13 Jun 2007 02:49:32 -0000      1.28
@@ -5,7 +5,7 @@
 
 // A module to take care of all of gnash's loaded fonts.
 
-/* $Id: fontlib.cpp,v 1.27 2007/06/13 00:17:45 strk Exp $ */
+/* $Id: fontlib.cpp,v 1.28 2007/06/13 02:49:32 strk Exp $ */
 
 #include "container.h"
 #include "tu_file.h"
@@ -1311,7 +1311,7 @@
                rect    bounds = tg.m_uv_bounds;
                if ( bounds.is_null() )
                {
-                       log_debug("Textured glyph rendering skipped, since it's 
bounds are null");
+                       //log_debug("Textured glyph rendering skipped, since 
it's bounds are null");
                        return;
                }
 
@@ -1322,7 +1322,7 @@
                // @@ need to factor this out!
                static float    s_scale = GLYPH_CACHE_TEXTURE_SIZE * 
s_rendering_box / nominal_glyph_height;
 
-               log_msg("Scaling bounds %s by factor %g (nominal_glyph_height: 
%d)", bounds.toString().c_str(), s_scale, nominal_glyph_height);
+               //log_msg("Scaling bounds %s by factor %g 
(nominal_glyph_height: %d)", bounds.toString().c_str(), s_scale, 
nominal_glyph_height);
 
                bounds.scale_x(s_scale);
                bounds.scale_y(s_scale);

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- server/movie_root.cpp       8 Jun 2007 14:57:41 -0000       1.64
+++ server/movie_root.cpp       13 Jun 2007 02:49:33 -0000      1.65
@@ -713,7 +713,7 @@
 
 void movie_root::notify_key_listeners(key::code k, bool down)
 {
-       log_msg("Notifying " SIZET_FMT " keypress listeners", 
_keyListners.size());
+       //log_msg("Notifying " SIZET_FMT " keypress listeners", 
_keyListners.size());
 
        for (std::vector<KeyListener>::iterator iter = _keyListners.begin();
                iter != _keyListners.end(); ++iter)

Index: server/text.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/text.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- server/text.cpp     13 Jun 2007 00:17:45 -0000      1.30
+++ server/text.cpp     13 Jun 2007 02:49:33 -0000      1.31
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: text.cpp,v 1.30 2007/06/13 00:17:45 strk Exp $ */
+/* $Id: text.cpp,v 1.31 2007/06/13 02:49:33 strk Exp $ */
 
 // Based on the public domain work of Thatcher Ulrich <address@hidden> 2003
 
@@ -36,7 +36,7 @@
 
 // Define the following macro to get debugging messages
 // for text rendering
-#define GNASH_DEBUG_TEXT_RENDERING 1
+//#define GNASH_DEBUG_TEXT_RENDERING 1
 
 namespace gnash {