[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-316-g77da683

[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  77da6838eed4e2d01e732887fb2c6a1bded05c1b (commit)
       via  12f40f3fc4819e1fedb530ab34dfa8ba6438702d (commit)
      from  3f6cca586316c7e66e7552555392a054c9a79495 (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=77da6838eed4e2d01e732887fb2c6a1bded05c1b


commit 77da6838eed4e2d01e732887fb2c6a1bded05c1b
Author: Benjamin Wolsey <address@hidden>
Date:   Wed Apr 27 14:56:03 2011 +0200

    Fix libva conditional.
    
    Since the header search changed the conditional is wrong, so that
    HAVE_VAAPI isn't defined, which means that libvaapi isn't added to
    libmedia include flags and vaapi_util.h isn't found.
    
    A conditional depending on a variable set in a macro somewhere else
    seems like bad style.

diff --git a/configure.ac b/configure.ac
index f922e8a..99516b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1105,7 +1105,7 @@ if test x"${build_vaapi}" = x"yes" -a x"${have_ffmpeg}" 
!= x"yes"; then
   AC_MSG_ERROR(["Hardware acceleration currently not supported unless using 
FFmpeg."])
 fi
 
-AM_CONDITIONAL(HAVE_VAAPI, test x"${found_libva_incl}" = xyes)
+AM_CONDITIONAL(HAVE_VAAPI, test x"${found_va_incl}" = xyes)
 AM_CONDITIONAL(HAVE_VAAPI_GLX, test x"${found_libva_glx_incl}" = xyes)
 AM_CONDITIONAL(HAVE_VAAPI_X11, test x"${found_libva_x11_incl}" = xyes)
 

http://git.savannah.gnu.org/cgit//commit/?id=12f40f3fc4819e1fedb530ab34dfa8ba6438702d


commit 12f40f3fc4819e1fedb530ab34dfa8ba6438702d
Author: Benjamin Wolsey <address@hidden>
Date:   Wed Apr 27 13:04:44 2011 +0200

    Cleanups of fontlib.
    
    Remove unused function declarations and definitions.

diff --git a/libcore/fontlib.cpp b/libcore/fontlib.cpp
index 5455d5d..24e63dc 100644
--- a/libcore/fontlib.cpp
+++ b/libcore/fontlib.cpp
@@ -32,11 +32,11 @@ namespace {
        //
 
 
-       void    clear()
-       // Release all the fonts we know about.
-       {
-               s_fonts.clear();
-       }
+void
+clear()
+{
+    s_fonts.clear();
+}
 
 boost::intrusive_ptr<Font>
 get_default_font()
@@ -46,57 +46,38 @@ get_default_font()
        return _defaultFont;
 }
 
-       int     get_font_count()
-       // Return the number of fonts in our library.
-       {
-               return s_fonts.size();
-       }
-
-
-       Font*   get_font(int index)
-       // Retrieve one of our fonts, by index.
-       {
-               if (index < 0 || index >= (int) s_fonts.size())
-               {
-                       return NULL;
-               }
-
-               return s_fonts[index].get();
-       }
-
-
-       Font*   get_font(const std::string& name, bool bold, bool italic)
-       {
-               // Dumb linear search.
-               for (unsigned int i = 0; i < s_fonts.size(); i++)
-               {
-                       Font*   f = s_fonts[i].get();
-                       assert(f);
-                       if ( f->matches(name, bold, italic) )
-                       {
-                               return f;
-                       }
-               }
-               Font* f = new Font(name, bold, italic);
-               s_fonts.push_back(f);
-               return f;
-       }
-
-       void    add_font(Font* f)
-       // Add the given font to our library.
-       {
-               assert(f);
+Font*
+get_font(const std::string& name, bool bold, bool italic)
+{
+    // Dumb linear search.
+    for (unsigned int i = 0; i < s_fonts.size(); i++)
+    {
+        Font*  f = s_fonts[i].get();
+        assert(f);
+        if ( f->matches(name, bold, italic) )
+        {
+            return f;
+        }
+    }
+    Font* f = new Font(name, bold, italic);
+    s_fonts.push_back(f);
+    return f;
+}
 
+void
+add_font(Font* f)
+{
+    assert(f);
 #ifndef NDEBUG
-               // Make sure font isn't already in the list.
-               for (unsigned int i = 0; i < s_fonts.size(); i++)
-               {
-                       assert(s_fonts[i] != f);
-               }
+    // Make sure font isn't already in the list.
+    for (unsigned int i = 0; i < s_fonts.size(); i++)
+    {
+        assert(s_fonts[i] != f);
+    }
 #endif // not NDEBUG
 
-               s_fonts.push_back(f);
-       }
+    s_fonts.push_back(f);
+}
 
 
 
diff --git a/libcore/fontlib.h b/libcore/fontlib.h
index 4a87cdb..ba38904 100644
--- a/libcore/fontlib.h
+++ b/libcore/fontlib.h
@@ -21,6 +21,8 @@
 #ifndef GNASH_FONTLIB_H
 #define GNASH_FONTLIB_H
 
+#include <boost/intrusive_ptr.hpp>
+
 // Forward declarations
 namespace gnash {
        class Font;
@@ -47,17 +49,10 @@ namespace fontlib {
        /// Clean up the font library
        void clear();
 
-       int     get_font_count();
-
-       Font* get_font(int index);
-
        Font* get_font(const std::string& name, bool bold, bool italic);
 
        /// Return a default device font.
        boost::intrusive_ptr<Font> get_default_font();
-
-       const char*     get_font_name(const Font* f);
-
        
 }      // end namespace fontlib
 }      // end namespace gnash

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

Summary of changes:
 configure.ac        |    2 +-
 libcore/fontlib.cpp |   85 ++++++++++++++++++++-------------------------------
 libcore/fontlib.h   |    9 +----
 3 files changed, 36 insertions(+), 60 deletions(-)


hooks/post-receive
-- 
Gnash