[Gnash-commit] [SCM] Gnash branch, master, updated. 70ac0c45009a33fb7728fbb4a16d50a6ccb25dc1

[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  70ac0c45009a33fb7728fbb4a16d50a6ccb25dc1 (commit)
       via  ff18fc4e8d38ec7a23ffae92d2def2fd59f0ecc2 (commit)
       via  d994d3f751b3475fcf8c085a880ef28b460b7e04 (commit)
       via  81a9065180f63d814c55a6e085d3735ca992e71b (commit)
       via  c640f2ddea7091b13f288d6afaa451e2a8187fed (commit)
       via  75520e4d84e97c08622c173717a48d40f1676f16 (commit)
       via  b008b0fda4736745ba64d576e1d2b7453256d087 (commit)
       via  a3bfe004fd93f084ee426d500a4abcf3423884ae (commit)
       via  e315888a11ea63111c6e8d36398e31ab81f6caf4 (commit)
       via  049646fa5ca6850e5fd0c9fe231792be63acfe3c (commit)
      from  e53a4479e006b7dbcecffb70a01d1392b990c120 (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=70ac0c45009a33fb7728fbb4a16d50a6ccb25dc1


commit 70ac0c45009a33fb7728fbb4a16d50a6ccb25dc1
Author: Benjamin Wolsey <address@hidden>
Date:   Tue Sep 21 09:25:27 2010 +0200

    Date time isn't needed unless you build cygnal.

diff --git a/configure.ac b/configure.ac
index 278a734..63961a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2784,8 +2784,8 @@ AC_SUBST(HWACCEL_CONFIG)
 
 dnl check for missing libraries and disable them.
 if test x"$BOOST_LIBS" != x; then
-  if test x"${extra_missing_libs}" != x; then
-    for i in ${extra_missing_libs}; do
+  if test x"${cygnal_missing_libs}" != x; then
+    for i in ${cygnal_missing_libs}; do
       if test $i = serialization; then
         AC_DEFINE([BOOST_MULTI_INDEX_DISABLE_SERIALIZATION], ["1"], [if the 
library is missing, don't use it.])
       fi
@@ -3539,32 +3539,31 @@ if test x$build_agg = xyes; then # {
 fi # }
 
 if test x"$BOOST_LIBS" != x; then
-    dnl Only cygnal requires date_time at present, so it's OK if either
-    dnl you don't want cygnal or do have date_time installed.
-    dnl if test x"$cygnal" = xno; then
        echo "        BOOST flags are: $BOOST_CFLAGS"
        echo "        BOOST libs are: $BOOST_LIBS"
-       echo "        BOOST Extra libs are: $BOOST_EXTRA_LIBS"
+       echo "        BOOST libs for cygnal are: $BOOST_CYGNAL_LIBS"
     dnl fi
     if test x"${missing_headers}" != x; then
       for i in ${missing_headers}; do
-       # They have some boost libs but no date_time and want to compile cygnal.
        echo "        ERROR: The BOOST $i header file is needed!" >&3
        echo "               Install it from http://boost.org"; >&3
        echo "               or from a Boost development package" >&3
       done
     fi
-    if test x"${extra_missing_libs}" != x; then
-      for i in ${extra_missing_libs}; do
-       echo "        WARNING: The BOOST $i library is recommended!" >&4
-        echo "                 Install it from http://www.boost.org"; >&4
-        echo "                 or .deb users: apt-get install libboost-"`echo 
${i} | sed 's/_/-/g'`"-dev" >&4
-        echo "                 Gnash will compile anyway, but not all tests 
will work." >&4
-      done
+
+    if test x"${cygnal}" = x"yes"; then
+        if test x"${cygnal_missing_libs}" != x; then
+          for i in ${cygnal_missing_libs}; do
+            echo "          ERROR: The BOOST $i library is required for 
cygnal!" >&4
+            echo "                 Either configure with --disable-cygnal or" 
>&4
+            echo "                 install it from http://www.boost.org"; >&4
+            echo "                 or .deb users: apt-get install 
libboost-"`echo ${i} | sed 's/_/-/g'`"-dev" >&4
+          done
+        fi
     fi
+
     if test x"${missing_libs}" != x; then
       for i in ${missing_libs}; do
-       # They have some boost libs but no date_time and want to compile cygnal.
        echo "        ERROR: The BOOST $i library is needed!" >&3
        echo "               Install it from http://boost.org"; >&3
        echo "               or .deb users: apt-get install libboost-"`echo 
${i} | sed 's/_/-/g'`"-dev" >&3
diff --git a/macros/boost.m4 b/macros/boost.m4
index 2782055..970dd1f 100644
--- a/macros/boost.m4
+++ b/macros/boost.m4
@@ -27,7 +27,7 @@ AC_DEFUN([GNASH_PATH_BOOST],
   gnash_boost_libdir=""
   missing_headers=""
   missing_libs=""
-  extra_missing_libs=""
+  cygnal_missing_libs=""
   gcc_version=""
   dirname=""
   libname=""
@@ -36,12 +36,11 @@ AC_DEFUN([GNASH_PATH_BOOST],
   boost_headers="detail/lightweight_mutex.hpp thread/thread.hpp 
multi_index_container.hpp multi_index/key_extractors.hpp thread/mutex.hpp"
   dnl this is a list of *required* libraries. If any of these are missing, this
   dnl test will return a failure, and Gnash won't build.
-  boost_libs="thread date_time"
+  boost_libs="thread"
 
   dnl this is a list of *recommended* libraries. If any of these are missing, 
this
   dnl test will return a warning, and Gnash will build, but testing won't work.
-  extra_boost_libs="serialization"
-#  extra_boost_libs="unit_test_framework"
+  cygnal_boost_libs="serialization date_time"
 
   dnl this is the default list for paths to search. This gets
   dnl redefined if --with-boost-incl= is specified.
@@ -145,19 +144,19 @@ AC_DEFUN([GNASH_PATH_BOOST],
         fi
       done
     done
-    for j in ${extra_boost_libs}; do
+    for j in ${cygnal_boost_libs}; do
       dirs="`ls -dr ${dirname}/libboost_${j}*.${shlibext} 
${dirname}/libboost_${j}*.a 2>/dev/null`"
       if test -n "${dirs}"; then
           libname="`echo ${dirs} | sed -e 's:^.*/lib::' -e "s:\.${shlibext}::" 
-e "s:\.a::"`"
-        ac_cv_path_boost_extra_lib="${ac_cv_path_boost_extra_lib} -l${libname}"
+        ac_cv_path_boost_cygnal_lib="${ac_cv_path_boost_cygnal_lib} 
-l${libname}"
       else
-        extra_missing_libs="${extra_missing_libs} $j"
+        cygnal_missing_libs="${cygnal_missing_libs} $j"
       fi
     done
   fi
 
   if test x"${missing_libs}" != x ; then
-    AC_MSG_WARN([Libraries ${missing_libs} ${extra_missing_libs} aren't 
installed ])
+    AC_MSG_WARN([Libraries ${missing_libs} ${cygnal_missing_libs} aren't 
installed ])
   fi
   AC_MSG_RESULT(${ac_cv_path_boost_lib})
 
@@ -169,8 +168,8 @@ AC_DEFUN([GNASH_PATH_BOOST],
     BOOST_LIBS="$ac_cv_path_boost_lib"
   fi
 
-  if test x"${ac_cv_path_boost_extra_lib}" != x; then
-    BOOST_EXTRA_LIBS="$ac_cv_path_boost_extra_lib" 
+  if test x"${ac_cv_path_boost_cygnal_lib}" != x; then
+    BOOST_CYGNAL_LIBS="$ac_cv_path_boost_cygnal_lib" 
   fi
 
   dnl ------------------------------------------------------------------
@@ -179,7 +178,7 @@ AC_DEFUN([GNASH_PATH_BOOST],
 
   AC_SUBST(BOOST_CFLAGS)
   AC_SUBST(BOOST_LIBS)
-  AC_SUBST(BOOST_EXTRA_LIBS)
+  AC_SUBST(BOOST_CYGNAL_LIBS)
 
   dnl This isn't right: you don't need boot date-time installed unless u build
   dnl cygnal, and it is sometimes a separate package from Boost core and 
thread.

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


commit ff18fc4e8d38ec7a23ffae92d2def2fd59f0ecc2
Merge: d994d3f e53a447
Author: Benjamin Wolsey <address@hidden>
Date:   Tue Sep 21 08:56:39 2010 +0200

    Merge branch 'master' of git.sv.gnu.org:/srv/git/gnash


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


commit d994d3f751b3475fcf8c085a880ef28b460b7e04
Merge: 81a9065 64b7d98
Author: Benjamin Wolsey <address@hidden>
Date:   Sun Sep 19 15:51:09 2010 +0200

    Merge branch 'master' of git.sv.gnu.org:/srv/git/gnash


http://git.savannah.gnu.org/cgit//commit/?id=81a9065180f63d814c55a6e085d3735ca992e71b


commit 81a9065180f63d814c55a6e085d3735ca992e71b
Merge: c640f2d ccd126e
Author: Benjamin Wolsey <address@hidden>
Date:   Sun Sep 19 10:45:25 2010 +0200

    Merge branch 'master' of /home/benjamin/Downloads/gnash/trunk


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


commit c640f2ddea7091b13f288d6afaa451e2a8187fed
Merge: 75520e4 ddf8832
Author: Benjamin Wolsey <address@hidden>
Date:   Sun Sep 19 10:40:32 2010 +0200

    Merge branch 'master' of /home/benjamin/Downloads/gnash/trunk


http://git.savannah.gnu.org/cgit//commit/?id=75520e4d84e97c08622c173717a48d40f1676f16


commit 75520e4d84e97c08622c173717a48d40f1676f16
Merge: b008b0f 3a1604e
Author: Benjamin Wolsey <address@hidden>
Date:   Wed Sep 1 09:06:56 2010 +0200

    Merge branch 'master' of /home/benjamin/Downloads/gnash/trunk


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


commit b008b0fda4736745ba64d576e1d2b7453256d087
Merge: a3bfe00 2c748f4
Author: Benjamin Wolsey <address@hidden>
Date:   Mon Aug 30 11:43:53 2010 +0200

    Merge branch 'master' of /home/benjamin/Downloads/git/trunk


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


commit a3bfe004fd93f084ee426d500a4abcf3423884ae
Author: Benjamin Wolsey <address@hidden>
Date:   Fri Aug 27 13:10:04 2010 +0200

    Minor formatting cleanup.

diff --git a/libcore/swf/DefineFontTag.cpp b/libcore/swf/DefineFontTag.cpp
index e8b6fee..d6a4153 100644
--- a/libcore/swf/DefineFontTag.cpp
+++ b/libcore/swf/DefineFontTag.cpp
@@ -40,7 +40,7 @@ DefineFontTag::loader(SWFStream& in, TagType tag, 
movie_definition& m,
     assert(tag == DEFINEFONT || tag == DEFINEFONT2 || tag == DEFINEFONT3);
 
     in.ensureBytes(2);
-    boost::uint16_t fontID = in.read_u16();
+    const boost::uint16_t fontID = in.read_u16();
 
     std::auto_ptr<DefineFontTag> ft(new DefineFontTag(in, m, tag, r));
 
@@ -54,29 +54,25 @@ void
 DefineFontTag::readCodeTable(SWFStream& in, Font::CodeTable& table,
         bool wideCodes, size_t glyphCount)
 {
-    IF_VERBOSE_PARSE (
-    log_parse(_("reading code table at offset %lu"), in.tell());
+    IF_VERBOSE_PARSE(
+        log_parse(_("reading code table at offset %lu"), in.tell());
     );
 
     // Good. We can only do this once.
     assert(table.empty());
 
-    if (wideCodes)
-    {
+    if (wideCodes) {
         in.ensureBytes(2 * glyphCount);
         // Code table is made of boost::uint16_t's.
-        for (size_t i=0; i < glyphCount; ++i)
-        {
+        for (size_t i=0; i < glyphCount; ++i) {
             boost::uint16_t code = in.read_u16();
             table.insert(std::make_pair(code, i));
         }
     }
-    else
-    {
+    else {
         // Code table is made of bytes.
         in.ensureBytes(1 * glyphCount);
-        for (size_t i=0; i < glyphCount; ++i)
-        {
+        for (size_t i = 0; i < glyphCount; ++i) {
             boost::uint8_t code = in.read_u8();
             table.insert(std::make_pair(code, i));
         }
@@ -354,11 +350,10 @@ DefineFontInfoTag::loader(SWFStream& in, TagType tag, 
movie_definition& m,
     assert(tag == DEFINEFONTINFO || tag == DEFINEFONTINFO2); 
 
     in.ensureBytes(2);
-    boost::uint16_t fontID = in.read_u16();
+    const boost::uint16_t fontID = in.read_u16();
 
     Font* f = m.get_font(fontID);
-    if (!f)
-    {
+    if (!f) {
         IF_VERBOSE_MALFORMED_SWF(
             log_swferror(_("DefineFontInfo tag loader: "
                    "can't find font with id %d"), fontID);
@@ -366,8 +361,7 @@ DefineFontInfoTag::loader(SWFStream& in, TagType tag, 
movie_definition& m,
         return;
     }
 
-    if (tag == DEFINEFONTINFO2)
-    {
+    if (tag == DEFINEFONTINFO2) {
         // See: SWFalexref/SWFalexref.html#tag_definefont2
         LOG_ONCE(log_unimpl(_("DefineFontInfo2 partially implemented")));
     }
@@ -376,9 +370,9 @@ DefineFontInfoTag::loader(SWFStream& in, TagType tag, 
movie_definition& m,
     in.read_string_with_length(name);
 
     in.ensureBytes(1);
-    boost::uint8_t flags = in.read_u8();
+    const boost::uint8_t flags = in.read_u8();
 
-    bool wideCodes = flags & (1 << 0);
+    const bool wideCodes = flags & (1 << 0);
 
     std::auto_ptr<Font::CodeTable> table(new Font::CodeTable);
 

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


commit e315888a11ea63111c6e8d36398e31ab81f6caf4
Merge: c1848f9 049646f
Author: Benjamin Wolsey <address@hidden>
Date:   Fri Aug 27 12:42:50 2010 +0200

    Merge branch 'htmltext'


http://git.savannah.gnu.org/cgit//commit/?id=049646fa5ca6850e5fd0c9fe231792be63acfe3c


commit 049646fa5ca6850e5fd0c9fe231792be63acfe3c
Author: Benjamin Wolsey <address@hidden>
Date:   Wed Aug 25 16:40:31 2010 +0200

    Fix some odd assumptions about attributes.

diff --git a/libcore/TextField.cpp b/libcore/TextField.cpp
index 242c040..d06d962 100644
--- a/libcore/TextField.cpp
+++ b/libcore/TextField.cpp
@@ -2101,8 +2101,6 @@ TextField::parseHTML(std::wstring& tag,
         const std::wstring::const_iterator& e,
         bool& selfclosing) const
 {
-    std::string attname;
-    std::string attvalue;
     while (it != e && *it != ' ') {
         if (*it == '/') {
             ++it;
@@ -2152,6 +2150,10 @@ TextField::parseHTML(std::wstring& tag,
             return false;
         }
     }
+
+    std::string attname;
+    std::string attvalue;
+
     //attributes
     while (it != e && *it != '>') {
         while (it != e && *it != '=' && *it != ' ') {
@@ -2174,19 +2176,18 @@ TextField::parseHTML(std::wstring& tag,
         while (it != e && (*it == ' ' || *it == '=')) {
             ++it; //skip over spaces and '='
         }
-        if (it != e) {
-            if (*it != '"') { //make sure attribute value is opened with '"'
-                log_error("attribute value must be opened with \'\"\' "
-                        "(did you remember escape char?)");
-                while (it != e) {
-                    ++it;
-                }
-                return false;
-            } else {
-                ++it; //skip (")
-            }
+
+        if (it == e) return false;
+        const char q = *it;
+        if (q != '"' && q != '\'') { 
+            // This is not an attribute.
+            while (it != e) ++it;
+            return false;
         }
-        while (it != e && *it != '"') { //get attribute value
+
+        // Advance past attribute opener    
+        ++it; 
+        while (it != e && *it != q) {
 
             if (*it == 0) {
                 log_error("found NULL character in htmlText");
@@ -2196,21 +2197,21 @@ TextField::parseHTML(std::wstring& tag,
             attvalue.push_back(std::toupper(*it));
             ++it;
         }
-        if (it != e) {
-            if (*it != '"') { //make sure attribute value is closed with '"'
-                log_error("attribute value must be closed with \'\"\' "
-                        "(did you remember escape char?)");
-                while (it != e) {
-                    ++it;
-                }
-                return false;
-            } else {
-                ++it; //skip (")
-            }
-        }
+        
+        if (it == e) return false;
+    
+        if (*it != q) { 
+            while (it != e) ++it;
+            return false;
+        } 
+
+        // Skip attribute closer.
+        ++it;
+
         attributes.insert(std::make_pair(attname, attvalue));
-        attname = "";
-        attvalue = "";
+        attname.clear();
+        attvalue.clear();
+
         if ((*it != ' ') && (*it != '/') && (*it != '>')) {
             log_error("malformed HTML tag, invalid attribute value");
             while (it != e) {

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

Summary of changes:
 configure.ac                  |   29 ++++++++++-----------
 libcore/TextField.cpp         |   57 +++++++++++++++++++++--------------------
 libcore/swf/DefineFontTag.cpp |   30 ++++++++-------------
 macros/boost.m4               |   21 +++++++--------
 4 files changed, 65 insertions(+), 72 deletions(-)


hooks/post-receive
-- 
Gnash