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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/03/14 12:21:44

Modified files:
        .              : ChangeLog 
        server         : font.cpp 

Log message:
        (read_font_info): initialize the device font provider if a name was 
read.
        Fixes bug #22367.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5910&r2=1.5911
http://cvs.savannah.gnu.org/viewcvs/gnash/server/font.cpp?cvsroot=gnash&r1=1.59&r2=1.60

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5910
retrieving revision 1.5911
diff -u -b -r1.5910 -r1.5911
--- ChangeLog   14 Mar 2008 11:27:35 -0000      1.5910
+++ ChangeLog   14 Mar 2008 12:21:43 -0000      1.5911
@@ -1,5 +1,7 @@
 2008-03-14 Sandro Santilli <address@hidden>
 
+       * server/font.cpp (read_font_info): initialize the device font
+         provider if a name was read. Fixes bug #22367.
        * testsuite/swfdec/REALTIME: run netstream-status.swf in realtime.
        * server/movie_root.cpp (cleanDisplayList): make sure NO unloaded
          characters are in the live instances container after a call to

Index: server/font.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/font.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- server/font.cpp     5 Mar 2008 03:55:59 -0000       1.59
+++ server/font.cpp     14 Mar 2008 12:21:44 -0000      1.60
@@ -142,6 +142,7 @@
                                m_subpixel_font = true;
                }
 
+               // TODO: initialize the deviceFontProvider only when needed ?
                if ( ! m_name.empty() && ! initDeviceFontProvider() )
                {
                        log_error("Could not initialize device font face '%s'", 
m_name.c_str());
@@ -417,6 +418,11 @@
                }
 
                in->read_string_with_length(m_name);
+               // TODO: initialize the deviceFontProvider only when needed ?
+               if ( ! m_name.empty() && ! initDeviceFontProvider() )
+               {
+                       log_error(_("Could not initialize device font face 
'%s'"), m_name.c_str());
+               }
 
                in->ensureBytes(1);
                unsigned char   flags = in->read_u8();