[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-125-g0e8a12b

[Benjamin Wolsey]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  0e8a12b234be608a292a07355ce8f87a321e84a3 (commit)
      from  730ef5d2243875aac4f791c4cee83f5953a75ef8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=0e8a12b234be608a292a07355ce8f87a321e84a3


commit 0e8a12b234be608a292a07355ce8f87a321e84a3
Author: Benjamin Wolsey <address@hidden>
Date:   Thu Feb 24 10:02:43 2011 +0100

    Use existing fonts if they exist to avoid creating
    fonts for ever.

diff --git a/libcore/TextField.cpp b/libcore/TextField.cpp
index b4a2b2b..5177bbd 100644
--- a/libcore/TextField.cpp
+++ b/libcore/TextField.cpp
@@ -1426,7 +1426,8 @@ TextField::handleChar(std::wstring::const_iterator& it,
                         }
                         else if (s == "B") {
                             //bold
-                            boost::intrusive_ptr<Font> boldfont = new 
Font(rec.getFont()->name(),
+                            Font* boldfont =
+                                fontlib::get_font(rec.getFont()->name(),
                                     true, rec.getFont()->isItalic());
                             newrec.setFont(boldfont);
                             handleChar(it, e, x, y, newrec, last_code,
@@ -1462,8 +1463,10 @@ TextField::handleChar(std::wstring::const_iterator& it,
                                     );
                                 } else {
                                     //font FACE attribute
-                                    boost::intrusive_ptr<Font> newfont = new 
Font(attloc->second,
-                                        rec.getFont()->isBold(), 
rec.getFont()->isItalic());
+                                    Font* newfont = 
+                                        fontlib::get_font(attloc->second,
+                                        rec.getFont()->isBold(),
+                                        rec.getFont()->isItalic());
                                     newrec.setFont(newfont);
                                 }
                             }
@@ -1516,7 +1519,8 @@ TextField::handleChar(std::wstring::const_iterator& it,
                         }
                         else if (s == "I") {
                             //italic
-                            boost::intrusive_ptr<Font> italicfont = new 
Font(rec.getFont()->name(),
+                            Font* italicfont = 
+                                fontlib::get_font(rec.getFont()->name(),
                                     rec.getFont()->isBold(), true);
                             newrec.setFont(italicfont);
                             handleChar(it, e, x, y, newrec, last_code,

-----------------------------------------------------------------------

Summary of changes:
 libcore/TextField.cpp |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Gnash