From MAILER-DAEMON Wed Aug 01 00:02:18 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IG5Pe-0003ME-Ev
	for mharc-gnash-commit@gnu.org; Wed, 01 Aug 2007 00:02:18 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IG5Pd-0003L3-5a
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 00:02:17 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IG5Pc-0003Kd-Cy
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 00:02:16 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IG5Pc-0003Ka-6M
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 00:02:16 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IG5Pb-0000xq-Oc
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 00:02:15 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IG5Pa-0000YA-Do
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 04:02:14 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IG5Pa-0000Xk-3D
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 04:02:14 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IG5Pa-0000Xk-3D@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 01 Aug 2007 04:02:14 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog plugin/plugin.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Aug 2007 04:02:17 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/01 04:02:13

Modified files:
	.              : ChangeLog 
	plugin         : plugin.cpp 

Log message:
	        * plugin/plugin.cpp: run 'gtk-gnash' by default.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3892&r2=1.3893
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/plugin.cpp?cvsroot=gnash&r1=1.79&r2=1.80

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3892
retrieving revision 1.3893
diff -u -b -r1.3892 -r1.3893
--- ChangeLog	31 Jul 2007 21:59:49 -0000	1.3892
+++ ChangeLog	1 Aug 2007 04:02:13 -0000	1.3893
@@ -1,3 +1,7 @@
+2007-08-01 Sandro Santilli <strk@keybit.net>
+
+	* plugin/plugin.cpp: run 'gtk-gnash' by default.
+
 2007-07-31 Sandro Santilli <strk@keybit.net>
 
 	* configure.ac, gui/Makefile.am: comment out --enable-dynamic-gui

Index: plugin/plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/plugin.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- plugin/plugin.cpp	1 Jul 2007 10:54:14 -0000	1.79
+++ plugin/plugin.cpp	1 Aug 2007 04:02:13 -0000	1.80
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: plugin.cpp,v 1.79 2007/07/01 10:54:14 bjacques Exp $ */
+/* $Id: plugin.cpp,v 1.80 2007/08/01 04:02:13 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -473,7 +473,7 @@
     char *gnash_env = getenv("GNASH_PLAYER");
     if (!gnash_env) {
       procname = GNASHBINDIR;
-      procname += "/gnash";
+      procname += "/gtk-gnash";
     } else {
       procname = gnash_env;
     }



From MAILER-DAEMON Wed Aug 01 00:53:31 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IG6DD-0001Lo-66
	for mharc-gnash-commit@gnu.org; Wed, 01 Aug 2007 00:53:31 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IG6DB-0001JA-6U
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 00:53:29 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IG6DA-0001HJ-9u
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 00:53:28 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IG6DA-0001H4-5g
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 00:53:28 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mgoldin@lulu.com>) id 1IG6D9-0007PK-Mz
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 00:53:27 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <mgoldin@lulu.com>) id 1IG6D9-0004lZ-1z
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 04:53:27 +0000
Received: from mushi by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <mushi@savannah.gnu.org>) id 1IG6D8-0004lW-Pc
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 04:53:26 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IG6D8-0004lW-Pc@cvs.savannah.gnu.org>
From: Melissa Goldin <mgoldin@lulu.com>
Date: Wed, 01 Aug 2007 04:53:26 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/doc/C gnash.xml
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Aug 2007 04:53:29 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Melissa Goldin <mushi>	07/08/01 04:53:26

Modified files:
	doc/C          : gnash.xml 

Log message:
	Big changes here:
	
	Moved this from an article to a book - it seems more appropriate, especially as this document grows with time.
	
	I made a lot of small tagging corrections throughout the files (to be committed shortly) so that gnash.xml validates correctly now.  There are a few more changes on the way, such as using a proper glossary rather than a section titled glossary.  I'll also expand the glossary at that time.
	
	I also still need to do some indexing, and to refresh my memory on how indexes are auto-created with DocBook.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/gnash.xml?cvsroot=gnash&r1=1.45&r2=1.46

Patches:
Index: gnash.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/gnash.xml,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- gnash.xml	8 Jun 2007 18:46:45 -0000	1.45
+++ gnash.xml	1 Aug 2007 04:53:26 -0000	1.46
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
     <!ENTITY legal SYSTEM "legal.xml">
     <!ENTITY fdl-app SYSTEM "fdl-appendix.xml">
@@ -36,12 +36,12 @@
 
 
 <!-- TRANSLATOR NOTE: do not change the id, just the lang -->
-<article id="index" lang="en">
+<book id="index" lang="en">
 
 <!-- =============Document Header ============================ -->
 
-  <articleinfo>
-      <title>&app; Manual version &manrevision;</title>
+  <bookinfo>
+      <title>&app; Developer's Guide version &manrevision;</title>
       <copyright>
          <year>2005, 2006, 2007</year>
          <holder>Free Software Foundation</holder>
@@ -64,19 +64,19 @@
         This manual describes version &appversion; of &appname;.
     </releaseinfo>
 
-  </articleinfo>
-
-  <indexterm zone="index"> 
-      <primary>Gnash</primary> 
-  </indexterm>
+  </bookinfo>
 
 
 <!-- ============= Introduction ============================== -->
   &introduction;
 
 <!-- ============= Document Body ============================= -->
-  &usage;
+
+<!-- Logically, you must install Gnash 
+     before you can use it. -->
+
   &installation;
+  &usage;
   &bugreport;
   &glossary;
 
@@ -86,4 +86,4 @@
 <!-- ============= Application License ======================= -->
   &fdl-app;
 
-</article>
+</book>



From MAILER-DAEMON Wed Aug 01 00:54:34 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IG6EE-0002gQ-DL
	for mharc-gnash-commit@gnu.org; Wed, 01 Aug 2007 00:54:34 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IG6ED-0002fI-Kk
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 00:54:33 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IG6EC-0002eC-Of
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 00:54:32 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IG6EC-0002dm-GJ
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 00:54:32 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mgoldin@lulu.com>) id 1IG6EB-0007l3-U0
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 00:54:32 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <mgoldin@lulu.com>) id 1IG6EB-0004mZ-Ch
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 04:54:31 +0000
Received: from mushi by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <mushi@savannah.gnu.org>) id 1IG6EB-0004mW-98
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 04:54:31 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IG6EB-0004mW-98@cvs.savannah.gnu.org>
From: Melissa Goldin <mgoldin@lulu.com>
Date: Wed, 01 Aug 2007 04:54:31 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/doc/C app_authors.xml
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Aug 2007 04:54:33 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Melissa Goldin <mushi>	07/08/01 04:54:31

Modified files:
	doc/C          : app_authors.xml 

Log message:
	This is a small change, moving a sect1 to a chapter.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/app_authors.xml?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: app_authors.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/app_authors.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- app_authors.xml	22 May 2007 13:56:33 -0000	1.1
+++ app_authors.xml	1 Aug 2007 04:54:31 -0000	1.2
@@ -1,4 +1,4 @@
-<sect1 id="authors">
+<chapter id="authors">
     <title>Authors</title>
 
     <para>
@@ -26,4 +26,4 @@
         and Rob Savoye.
     </para>
 
-</sect1>
+</chapter>



From MAILER-DAEMON Wed Aug 01 00:55:34 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IG6FC-0003AI-4g
	for mharc-gnash-commit@gnu.org; Wed, 01 Aug 2007 00:55:34 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IG6FA-00038q-2i
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 00:55:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IG6F9-00038J-4b
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 00:55:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IG6F8-00038C-VD
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 00:55:30 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mgoldin@lulu.com>) id 1IG6F8-000858-HX
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 00:55:30 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <mgoldin@lulu.com>) id 1IG6F8-0004pv-28
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 04:55:30 +0000
Received: from mushi by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <mushi@savannah.gnu.org>) id 1IG6F7-0004ps-TH
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 04:55:29 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IG6F7-0004ps-TH@cvs.savannah.gnu.org>
From: Melissa Goldin <mgoldin@lulu.com>
Date: Wed, 01 Aug 2007 04:55:29 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/doc/C/usermanual bugreport.xml
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Aug 2007 04:55:32 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Melissa Goldin <mushi>	07/08/01 04:55:29

Modified files:
	doc/C/usermanual: bugreport.xml 

Log message:
	Moved this from a section to a chapter.  Also made various tagging error corrections to allow gnash.xml to validate correctly.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/bugreport.xml?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: bugreport.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/usermanual/bugreport.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- bugreport.xml	7 Jun 2007 14:12:20 -0000	1.2
+++ bugreport.xml	1 Aug 2007 04:55:29 -0000	1.3
@@ -1,4 +1,4 @@
-<sect1 id="bugreport">
+<chapter id="bugreport">
   <title>Reporting Bugs</title>
 
   <para>
@@ -22,13 +22,13 @@
     </orderedlist>
   </para>
 
-  <sect2 id="bugstep_newcheckout">
+  <sect1 id="bugstep_newcheckout">
     <title>Compile the latest &app; build</title>
     <para>
       Obtain a copy of the latest <link linkend="sourcerepo">development
       checkout</link> or <link linkend="sourcesnapshot">development
       snapshot</link>.  Put the source in an empty directory, then
-      <link linkend="configure">configure</link> and 
+      <link linkend="pre-configuration">configure</link> and 
       <link linkend="compile">compile</link> &app;.
     </para>
     <para>
@@ -48,9 +48,9 @@
       your environment.  Try to determine the source of the conflict
       so that you can include this information in your bug report.
     </para>
-  </sect2>
+  </sect1>
 
-  <sect2 id="bugstep_search">
+  <sect1 id="bugstep_search">
     <title>Determine if the bug was previously reported</title>
     <para>
       Search the <ulink type="https"
@@ -66,48 +66,64 @@
       your stacktrace would be useful.  Conversely, adding a "me too"
       note to a feature request is not helpful.
     </para>
-  </sect2>
+  </sect1>
 
-  <sect2 id="bugstep_guidelines">
+  <sect1 id="bugstep_guidelines">
     <title>Review the bug writing guidelines</title>
     <para>
       A good bug report should be precise, explicit, and discrete.
       This means that there should be just one bug per ticket, and
       that a ticket should contain the following information:
+</para>
       <itemizedlist mark="opencircle">
         <listitem>
+<para>
           An overview of the problem;
+</para>
         </listitem> 
         <listitem>
+<para>
           Instructions on how to replicate the bug;
+</para>
         </listitem> 
         <listitem>
+<para>
           A description of what happened when you performed the steps
           to replicate the bug, and what you expected to happen;
+</para>
         </listitem> 
         <listitem>
+<para>
           Your system information: operating system name and version, as
           well as the versions of major <link 
           linkend="codedepend">dependencies</link>;
+</para>
         </listitem> 
         <listitem>
+<para>
           The release number or checkout timestamp for the version of &app;
           where you observe the problem;
+</para>
         </listitem> 
         <listitem>
+<para>
           The file <filename>config.log</filename>, which should be
           attached as a file; and
+</para>
         </listitem> 
         <listitem>
+<para>
           A descriptive title.
+</para>
         </listitem> 
       </itemizedlist>
+<para>
       Include any additional information that you feel might be useful
       to the developers.
     </para>
-  </sect2>
+  </sect1>
 
-  <sect2 id="bugstep_file">
+  <sect1 id="bugstep_file">
     <title>Filing a bug report</title>
     <para>
       After following the steps described above, you can
@@ -115,7 +131,7 @@
       url="https://savannah.gnu.org/bugs/?group=gnash">file a
       bug report</ulink>.
     </para>
-  </sect2>
+  </sect1>
 
-</sect1>
+</chapter>
     



From MAILER-DAEMON Wed Aug 01 00:55:57 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IG6FY-0003PK-Q9
	for mharc-gnash-commit@gnu.org; Wed, 01 Aug 2007 00:55:56 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IG6FX-0003Nh-CS
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 00:55:55 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IG6FX-0003NV-1P
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 00:55:55 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IG6FW-0003NS-TB
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 00:55:54 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mgoldin@lulu.com>) id 1IG6FW-0008BU-G5
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 00:55:54 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <mgoldin@lulu.com>) id 1IG6FV-0004rN-W1
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 04:55:54 +0000
Received: from mushi by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <mushi@savannah.gnu.org>) id 1IG6FV-0004rJ-RT
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 04:55:53 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IG6FV-0004rJ-RT@cvs.savannah.gnu.org>
From: Melissa Goldin <mgoldin@lulu.com>
Date: Wed, 01 Aug 2007 04:55:53 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/doc/C/usermanual doc_authors.xml
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Aug 2007 04:55:55 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Melissa Goldin <mushi>	07/08/01 04:55:53

Modified files:
	doc/C/usermanual: doc_authors.xml 

Log message:
	Small change; added myself as maintainer of the docs.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/doc_authors.xml?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: doc_authors.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/usermanual/doc_authors.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- doc_authors.xml	5 Jun 2007 12:09:29 -0000	1.2
+++ doc_authors.xml	1 Aug 2007 04:55:53 -0000	1.3
@@ -10,11 +10,11 @@
       </author> 
 
       <othercredit role="maintainer">
-        <firstname>Ann</firstname>
-        <surname>Barcomb</surname>
+        <firstname>Melissa</firstname>
+        <surname>Goldin</surname>
         <affiliation>
           <address> 
-              <email>kudra@domaintje.com</email>
+              <email>mgoldin@lulu.com</email>
           </address>
         </affiliation>
         <contrib>Document maintainer</contrib>



From MAILER-DAEMON Wed Aug 01 00:56:30 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IG6G6-0003dG-2Y
	for mharc-gnash-commit@gnu.org; Wed, 01 Aug 2007 00:56:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IG6G4-0003co-78
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 00:56:28 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IG6G3-0003cX-Ro
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 00:56:27 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IG6G3-0003cT-IA
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 00:56:27 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mgoldin@lulu.com>) id 1IG6G2-0008Ni-VK
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 00:56:27 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <mgoldin@lulu.com>) id 1IG6G2-0004sD-Cp
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 04:56:26 +0000
Received: from mushi by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <mushi@savannah.gnu.org>) id 1IG6G2-0004sA-8o
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 04:56:26 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IG6G2-0004sA-8o@cvs.savannah.gnu.org>
From: Melissa Goldin <mgoldin@lulu.com>
Date: Wed, 01 Aug 2007 04:56:26 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/doc/C/usermanual glossary.xml
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Aug 2007 04:56:28 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Melissa Goldin <mushi>	07/08/01 04:56:26

Modified files:
	doc/C/usermanual: glossary.xml 

Log message:
	Small changes; fixed tagging errors, moved from section to a chapter.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/glossary.xml?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: glossary.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/usermanual/glossary.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- glossary.xml	7 Jun 2007 14:12:20 -0000	1.2
+++ glossary.xml	1 Aug 2007 04:56:26 -0000	1.3
@@ -1,7 +1,7 @@
-<sect1 id="glossary">
+<chapter id="glossary">
   <title>Glossary</title>
 
-  <para><variablelist mark="opencircle">
+  <variablelist>
     <varlistentry>
       <term>
         ActionScript
@@ -97,7 +97,7 @@
           library provides a wrapper for mouse and keyboard events, 
           menus, windowing (where available) and a drawing area. 
           You must choose a GUI library during the
-          <link linkend="configure">configuration</link> stage.
+          <link linkend="pre-configuration">configuration</link> stage.
         </para>
       </listitem>
     </varlistentry>
@@ -167,7 +167,7 @@
         <para>
           The <emphasis>renderer</emphasis> is the subsystem of &app;
           which renders content.  Only one renderer may be used; it is
-          chosen during <link linkend="configure">configuration</link>.
+          chosen during <link linkend="pre-configuration">configuration</link>.
         </para>
         <para>
           Available renderers are: AGG, OpenGL, and Cairo. In terms of 
@@ -190,7 +190,7 @@
           which handles both event sounds and streaming sound.  Audio
           from external sources are also handled through the sound handler
           when SDL is used.  The sound handler must be selected during
-          <link linkend="configure">configuration</link>.
+          <link linkend="pre-configuration">configuration</link>.
         </para>
         <para>
           There are currently two sound handlers available in &app;:
@@ -216,6 +216,6 @@
       </listitem>
     </varlistentry>
 
-  </variablelist></para>
-</sect1>
+  </variablelist>
+</chapter>
     



From MAILER-DAEMON Wed Aug 01 00:58:25 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IG6Hx-0005ox-NK
	for mharc-gnash-commit@gnu.org; Wed, 01 Aug 2007 00:58:25 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IG6Hv-0005lm-T4
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 00:58:23 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IG6Hv-0005kr-DF
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 00:58:23 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IG6Hv-0005ki-7Z
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 00:58:23 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mgoldin@lulu.com>) id 1IG6Hu-0000et-R0
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 00:58:22 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <mgoldin@lulu.com>) id 1IG6Hu-0004uL-6I
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 04:58:22 +0000
Received: from mushi by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <mushi@savannah.gnu.org>) id 1IG6Hu-0004uI-1B
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 04:58:22 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IG6Hu-0004uI-1B@cvs.savannah.gnu.org>
From: Melissa Goldin <mgoldin@lulu.com>
Date: Wed, 01 Aug 2007 04:58:22 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/doc/C/usermanual installation.xml
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Aug 2007 04:58:24 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Melissa Goldin <mushi>	07/08/01 04:58:21

Modified files:
	doc/C/usermanual: installation.xml 

Log message:
	Big changes here:
	
	Added a requirements section; although they aren't well defined at the moment,it's important to pass that along to users (Look! We're flexible!).  Also, moved the dependency information to the front of the installation process.  It's much easier to proceed with the rest of the installation if your target system is already prepared for the Gnash software.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/installation.xml?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: installation.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/usermanual/installation.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- installation.xml	7 Jun 2007 14:11:26 -0000	1.3
+++ installation.xml	1 Aug 2007 04:58:21 -0000	1.4
@@ -1,44 +1,165 @@
-<sect1 id="build">
+<chapter id="build">
   <title>Installing and Configuring &app;</title>
 
   <para>
     There are two ways of installing &app;:
     <link linkend="packagemanager">using a package manager</link>
-    or <link linkend="building_overview">installing from source</link>.
+    or <link linkend="gettingsource">installing from source</link>.
   </para>
 
-  <sect2 id="packagemanager">
-    &pkgmanager;
-  </sect2>
+<sect1 id="requirements">
+<title>Requirements</title>
 
-  <sect2 id="building_overview">
-    &sources;
+<para>
+Before downloading and installing &app;, check that your hardware and software meet the following requirements.
+</para>
+
+<sect2 id="software">
+<title>Software Requirements</title>
+
+<para>
+The 0.8.0 release of &app; has been designed to run on UNIX/Linux variants, and has been run on most of the free ones.  However, &app; hassucessfully run on Windows, Darwin (Mac OS X), Iris, Solaris, BeOs, OS/2, and Haiku.  &app; has also run on the following 64-bit systems: PowerPC, Itanium, UltraSparc, and AMD64.   For now, it is important to be sure that the following code, testing, and documentation dependencies are met before installing &app;.  If you will be downloading &app; with a package manager, these dependencies may be solved by the pacakge manager.  Otherwise, you must first verify that each of these dependencies are installed on the target system.
+</para>
         
     <sect3 id="codedepend">
        &codedependencies;
     </sect3>
         
-    <sect3 id="docdepend">
-       &docdependencies;
-    </sect3>
-
     <sect3 id="testdepend">
        &testdependencies;
     </sect3>
 
+<sect3 id="docdepend">
+       &docdependencies;
+    </sect3>
+</sect2>
+
+<sect2 id="hardware">
+<title>Hardware Requirements</title>
+
+<para>
+One of the goals of &app; is to make it portable enough to install on small devices.  As a result, the hardware requirements are minimal. &app; has even run on an ARM9 at 200 MHz with 64 MB of RAM ! (It ran without video support in this case.)   While firm minimums have not been established, &app; has been shown to run successfully with the following:
+</para>
+
+<itemizedlist>
+<listitem>
+<para>
+336 MHz processor
+</para>
+</listitem>
+<listitem>
+<para>
+256 MB RAM
+</para>
+</listitem>
+<listitem>
+<para>
+Video &mdash; &app; will run on anything from a raw frame buffer up to an OpenGL-supporting graphics card.
+</para>
+</listitem>
+</itemizedlist>
+</sect2>
+
+</sect1>
+
+<sect1 id="downloading">
+<title>Downloading &app;</title>
+
+<para>
+There are two ways to download &app;: using a package manager or by downloading the source code and building it on your system.  If a package exists for your operating system and you do not need the very latest version of &app;, it is advisable to use a package manager, which can resolve dependencies.  However, if you want the very latest features, or a &app; package is not available for your operating system, it is better to download the source code and build &app; locally.
+</para>
+
+  <sect2 id="packagemanager">
+    &pkgmanager;
+  </sect2>
+
+ <sect2 id="gettingsource">
+  <title>Getting the Source</title>
+
+  <para>
+    &app; is available as a <link linkend="sourcereleases">release
+    tarball</link>, a <link linkend="sourcerepo">development 
+    checkout</link>, or a <link linkend="sourcesnapshot">development
+    snapshot</link>.
+  </para>
+
+  <sect3 id="sourcereleases">
+    <title>Releases</title>
         
-    <sect3 id="configure">
-      &configuration;
+    <para>
+      The source can be acquired from a
+      <ulink type="http" 
+      url="http://www.gnu.org/prep/ftp.html">GNU FTP
+      Mirror</ulink>.  The release version is intended to be
+      stable, and is probably your best choice if the release took
+      place recently.  If you need features or fixes which were
+      introduced after the release, consider a 
+      <link linkend="sourcerepo">CVS checkout</link> or the
+      <link linkend="sourcesnapshot">daily snapshot</link>.
+    </para>
+    <para>
+      To download, select a mirror near you, then choose the
+      <filename>gnash</filename> directory.
+    </para>
     </sect3>
     
-    <sect3 id="building">
-      &building; 
+  <sect3 id="sourcerepo">
+    <title>Repository</title>
+
+    <para>
+      The latest development sources are available via
+      anonymous CVS (leave the password blank).  This is recommended
+      if you need features or bug fixes which were introduced after
+      the <link linkend="sourcereleases">last release</link>.  Look at
+      the <link linkend="sourcesnapshot">daily snapshot</link> if you
+      experience difficulty accessing the repository.
+    </para>
+    <para>
+      First set the
+      environment variable <emphasis>CVS_RSH</emphasis> to 'ssh', as shown
+      in this example, which uses the GNU Bourne-Again shell (bash):
+      <programlisting>
+  export CVS_RSH="ssh"
+  cvs -z3 -d:pserver:anonymous@cvs.sv.gnu.org:/sources/gnash co gnash
+      </programlisting>
+      It is also possible to
+      <ulink url="http://cvs.savannah.gnu.org/viewcvs/gnash/?root=gnash"
+      type="http">browse the repository</ulink> on the web.
+    </para>
     </sect3>
     
-    <sect3 id="install">
-      &install; 
+  <sect3 id="sourcesnapshot">
+    <title>Snapshot</title>
+
+    <para>
+      The daily development snapshot can be downloaded from
+      <ulink url="http://www.gnashdev.org/dev_snapshots/"
+      type="http">http://www.gnashdev.org/dev_snapshots/</ulink>.
+      This is the best option if you need changes which were introduced
+      after the <link linkend="sourcereleases">last release</link> of
+      &app;, but are unable to <link linkend="sourcerepo">download
+      directly from the repository.</link>
+    </para>
     </sect3>
 
-  </sect2>
+</sect2>
+   
+</sect1>
+
+<sect1 id="pre-configuration">
+<title>Pre-Compile Configuration</title>
+
+&configuration;
+
 </sect1>
 
+    <sect1 id="compiling">
+      &building; 
+    </sect1>
+    
+    <sect1 id="install">
+      &install; 
+    </sect1>
+
+</chapter>
+



From MAILER-DAEMON Wed Aug 01 00:59:39 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IG6J9-0007gu-H8
	for mharc-gnash-commit@gnu.org; Wed, 01 Aug 2007 00:59:39 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IG6J7-0007dz-Lo
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 00:59:37 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IG6J7-0007dL-2b
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 00:59:37 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IG6J6-0007dI-V9
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 00:59:36 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mgoldin@lulu.com>) id 1IG6J6-000123-Fp
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 00:59:36 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <mgoldin@lulu.com>) id 1IG6J5-0004w5-VO
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 04:59:36 +0000
Received: from mushi by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <mushi@savannah.gnu.org>) id 1IG6J5-0004w2-Qs
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 04:59:35 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IG6J5-0004w2-Qs@cvs.savannah.gnu.org>
From: Melissa Goldin <mgoldin@lulu.com>
Date: Wed, 01 Aug 2007 04:59:35 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/doc/C/usermanual introduction.xml
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Aug 2007 04:59:37 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Melissa Goldin <mushi>	07/08/01 04:59:35

Modified files:
	doc/C/usermanual: introduction.xml 

Log message:
	Expanded this section.
	
	I've added some standard front matter meant to help a user understand what Gnash is about and how to read the manual - typefaces, that sort of thing.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/introduction.xml?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: introduction.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/usermanual/introduction.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- introduction.xml	22 May 2007 13:48:08 -0000	1.1
+++ introduction.xml	1 Aug 2007 04:59:35 -0000	1.2
@@ -1,34 +1,56 @@
-<sect1 id="intro">
+<chapter id="intro">
     <title>Introduction</title>
 
     <para>
-      &app; is a free Flash movie player, which can be used as a
-      stand-alone application or as a browser plugin.
-    </para>
-
-
-    <sect2 id="gnashoverview">
-        <title>&app; Overview</title>
+      &app; is a free Flash movie player.  It is available as a stand-alone application or as a plugin for several popular browsers.
+</para>
 
-        <para>
-          &app; started life as <application>GameSWF</application>,
-          a free Flash movie player with fairly good Flash format v7
-          compliance.  In December 2005, &app; was forked from
-          <application>GameSWF</application> and repackaged in the
-          GNU project style.  The objective of &app; is to create an
-          industrial strength Flash movie player which can be widely
-          deployed.
-        </para>
+<para>
+&app; is based on the excellent work done on the public domain program <application>GameSWF</application>, which is a graphics library for games that contains the heart of a Flash interpreter.  In December 2005, &app; was forked from <application>GameSWF</application> and repackaged in the GNU project style.  The objective of &app; is to create an enterprise-quality Flash movie player that can be widely deployed.
+</para>
+
+<sect1 id="runs-on">
+<title>What does &app; run on?</title>
+
+<para>
+The list of successful &app; deployments grows every day.  At this time, &app; has been found to run on several different UNIX and Linux distributions.  The plugin currently works with any browser that uses the NSAPI. This includes:
+</para>
+
+<itemizedlist>
+<listitem>
+<para>Mozilla <ulink url="http://www.mozilla.org" />
+</para>
+</listitem>
+<listitem>
+<para>Firefox <ulink url="http://www.mozilla.com/en-US/firefox" />
+</para>
+</listitem>
+<listitem>
+<para>Galeon <ulink url="galeon.sourceforge.net" />
+</para>
+</listitem>
+<listitem>
+<para>Epiphany <ulink url="gnome.org/projects/epiphany" />
+</para>
+</listitem>
+<listitem>
+<para>Konqueror <ulink url="http://www.konqueror.org" />
+</para>
+</listitem>
+<listitem>
+<para>Opera <ulink url="http://www.opera.com" />
+</para>
+</listitem>
+<listitem>
+<para>OLPC Web Activity <ulink url="http://www.laptop.org" />
+</para>
+</listitem>
+</itemizedlist>
       
-        <para>
-          &app; can be used as a stand-alone player, as a Mozilla
-          Firefox plugin, or as a Konqueror plugin ('Kpart').  
-          The plugin works by creating a new window in the stand-alone
-          player which is connected to the browser window. 
-       </para>
+</sect1>
 
-       <sect3 id="flashsupport">
-         <title>Flash Support</title>
+       <sect1 id="flashsupport">
+         <title>What Versions of Flash are Supported?</title>
 
          <para>
            &app; supports the majority of Flash opcodes up to SWF version
@@ -36,8 +58,156 @@
            7.   There are plans to work towards greater support for SWF
            8 and beyond.  AMF support is minimal.
          </para>
-      </sect3>
+      </sect1>
+<sect1 id="audience">
+<title>Audience</title>
+
+<para>
+This manual is primarily focused on developers interested in contributing to or building from the &app; project.  IT serves as a detailed reference guide, including a catalog and explanation of all options and features.  This level of detail may make this guide cumbersome for the average user, although advanced users may find it helpful.
+</para>
+
+<para>
+Those who are new to &app; will find the <citetitle>&app; User's Guide</citetitle>, currently under development, to be more useful when learning to use &app;.
+</para>
+</sect1>
+
+<sect1 id="Organization">
+<title>Organization of This Guide</title>
+
+<para>
+Written Last
+</para>
+
+</sect1>
+
+<sect1 id="guide-conventions">
+<title>Guide Conventions</title>
+
+<para>
+This guide makes use of the following fairly standard typefaces, highlighting, and language usage:
+</para>
+
+<variablelist>
+<varlistentry>
+<term><application>application</application></term>
+<listitem>
+<para>
+The typeface above will be used whenever an application, such as <application>Firefox</application> or <application>OpenOffice.org</application>, is mentioned.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term><command>command</command></term>
+<listitem>
+<para>
+The typeface above will be used whenever the text instructs a user to enter a command at a shell prompt in UNIX/Linux, such as <command>ls</command>.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term><computeroutput>computeroutput</computeroutput></term>
+<listitem>
+<para>
+This is the typeface used to indicate information produced on <computeroutput>stdout</computeroutput> by the computer.  This include error messages and prompts.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term><filename>filename</filename></term>
+<listitem>
+<para>
+This typeface indicates that the text is the name (and possibly the path) of a specific file on the system in question.  For example, <filename>/etc/hosts</filename> would appear in this typeface.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term><guibutton>guibutton</guibutton></term>
+<listitem>
+<para>
+This formatting indicates a button on a Graphical User Interface (GUI).  If this formatting appears, look for a button with the same text on the GUI of the &app; player; the button itself may look slightly different.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term><guimenu>guimenu</guimenu></term>
+<listitem>
+<para>
+This typeface indicates the topmost menu item in a GUI.  For example, in many applications the <guimenu>File</guimenu> menu item is a top=level menu item.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term><guimenuitem>guimenuitem</guimenuitem></term>
+<listitem>
+<para>
+This typeface indicates a sub-menu item in a GUI.  For example, in many applications the <guimenuitem>Save As</guimenuitem> menu item is a sub-menu item.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term><guilabel>guitext</guilabel></term>
+<listitem>
+<para>
+This typeface indicates a text string on the GUI.  This is generally a text string that appears on the GUI that is not a button or menuitem.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term><keycap>key</keycap></term>
+<listitem>
+<para>
+This typeface indicates a specific key on the keyboard.  For example, the <keycap>Ctrl</keycap> key appears in this typeface.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term><keycombo><keycap>key</keycap><keycap>combination</keycap></keycombo></term>
+<listitem>
+<para>
+This formatting indicates a set of keys to be pressed at the same time.  A familiar key combination is <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Delete</keycap></keycombo>.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term><replaceable>[replaceable]</replaceable></term>
+<listitem>
+<para>
+Whenever a general term is included in an example as a placeholder, it will be signaled by this formatting.  This formatting will usually appear inside other formatting.  For example, <filename>/home/<replaceable>[username]</replaceable></filename> indicates the home directory of a user, whose actual username would be substituted in for <replaceable>[username]</replaceable>.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term><userinput>User input</userinput></term>
+<listitem>
+<para>
+This typeface indicates anything that the user must enter, whether that is at a shell prompt or in response to a GUI prompt. 
+</para>
+</listitem>
+</varlistentry>
+</variablelist>
 
-    </sect2>
 </sect1>
     
+<sect1 id="Acknowledgements">
+<title>Acknowledgements</title>
+
+<para>
+The first version of this guide was written by Rob Savoye.  If not for his tireless efforst, this book - and this project - would never have come this far.
+</para>
+
+<para>
+John Gilmore has also been dedicated to the project from the beginning. I have shamelessly plagiarized one of his early announcement emails in the early part of this chapter.
+</para>
+
+<para>
+Ann Barcomb was instrumental in taking this guide from the 0.3.0 to the 0.4.0 version, incorporating the many changes that came wth &app; version 0.8.0.
+</para>
+
+<para>
+Finally, thanks to all of the &app; developers I haven't mentioned for all their hard work, and for answering my unending questions.
+</para>
+</sect1>
+
+
+</chapter>
+    



From MAILER-DAEMON Wed Aug 01 01:00:20 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IG6Jn-0008JV-QW
	for mharc-gnash-commit@gnu.org; Wed, 01 Aug 2007 01:00:19 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IG6Jl-0008Ik-Ab
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 01:00:17 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IG6Jk-0008I0-8l
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 01:00:16 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IG6Jk-0008Hr-2k
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 01:00:16 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mgoldin@lulu.com>) id 1IG6Jj-0001Cb-Mw
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 01:00:15 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <mgoldin@lulu.com>) id 1IG6Jc-00058F-Mf
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 05:00:08 +0000
Received: from mushi by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <mushi@savannah.gnu.org>) id 1IG6Jc-00057n-FD
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 05:00:08 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IG6Jc-00057n-FD@cvs.savannah.gnu.org>
From: Melissa Goldin <mgoldin@lulu.com>
Date: Wed, 01 Aug 2007 05:00:08 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/doc/C/usermanual usage.xml
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Aug 2007 05:00:17 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Melissa Goldin <mushi>	07/08/01 05:00:08

Modified files:
	doc/C/usermanual: usage.xml 

Log message:
	Small changes: changed section to chapter and fixed a few tagging errors.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/usage.xml?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: usage.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/usermanual/usage.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- usage.xml	7 Jun 2007 14:11:26 -0000	1.2
+++ usage.xml	1 Aug 2007 05:00:08 -0000	1.3
@@ -1,4 +1,4 @@
-<sect1 id="usage">
+<chapter id="usage">
     <title>Using &app;</title>
     
     <para>
@@ -9,8 +9,7 @@
       just play the movie using the default actions. So if you type:
     </para>
       
-
-    <para>
+<para>
       <emphasis>gnash samples/car_smash.swf</emphasis>
     </para>
 
@@ -26,7 +25,7 @@
       
     </para>
 
-    <sect2 id="options">
+    <sect1 id="options">
       <title>&app; Command Line Options</title>
 
       <para>
@@ -290,9 +289,9 @@
 	
       </variablelist>
       
-    </sect2>
+    </sect1>
 
-    <sect2 id="keys">
+    <sect1 id="keys">
       <title>&app; Interactive Control Keys</title>
 
       <para>
@@ -412,8 +411,8 @@
 	  </listitem>
 	</varlistentry>
       </variablelist>
-    </sect2>
+    </sect1>
 
     &gnashrc;
 
-  </sect1>
+  </chapter>



From MAILER-DAEMON Wed Aug 01 01:00:50 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IG6KI-0000FQ-5h
	for mharc-gnash-commit@gnu.org; Wed, 01 Aug 2007 01:00:50 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IG6KF-0000C3-Rt
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 01:00:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IG6KF-0000Bq-GN
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 01:00:47 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IG6KF-0000Bn-8m
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 01:00:47 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mgoldin@lulu.com>) id 1IG6KE-0001Qs-QN
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 01:00:46 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <mgoldin@lulu.com>) id 1IG6KE-0007Zt-AJ
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 05:00:46 +0000
Received: from mushi by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <mushi@savannah.gnu.org>) id 1IG6KE-0007ZK-4L
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 05:00:46 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IG6KE-0007ZK-4L@cvs.savannah.gnu.org>
From: Melissa Goldin <mgoldin@lulu.com>
Date: Wed, 01 Aug 2007 05:00:46 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/doc/C/usermanual/usage gnashrc.xml
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Aug 2007 05:00:48 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Melissa Goldin <mushi>	07/08/01 05:00:46

Modified files:
	doc/C/usermanual/usage: gnashrc.xml 

Log message:
	Small changes: changed section to chapter and corrected tagging errors.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/usage/gnashrc.xml?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: gnashrc.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/usermanual/usage/gnashrc.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gnashrc.xml	5 Jun 2007 12:05:28 -0000	1.4
+++ gnashrc.xml	1 Aug 2007 05:00:45 -0000	1.5
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<sect2 id="gnashrc">
+<sect1 id="gnashrc">
   <title>User Configuration File</title>
 
   <para>
@@ -232,5 +232,5 @@
   </programlisting>
 
 
-</sect2>
+</sect1>
   



From MAILER-DAEMON Wed Aug 01 01:02:16 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IG6Lg-0000g3-BI
	for mharc-gnash-commit@gnu.org; Wed, 01 Aug 2007 01:02:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IG6Le-0000fl-Vn
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 01:02:15 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IG6Le-0000fZ-G5
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 01:02:14 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IG6Le-0000fS-DN
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 01:02:14 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mgoldin@lulu.com>) id 1IG6Ld-0001sj-Ta
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 01:02:14 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <mgoldin@lulu.com>) id 1IG6Ld-0005ll-Cw
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 05:02:13 +0000
Received: from mushi by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <mushi@savannah.gnu.org>) id 1IG6Ld-0005lE-6z
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 05:02:13 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IG6Ld-0005lE-6z@cvs.savannah.gnu.org>
From: Melissa Goldin <mgoldin@lulu.com>
Date: Wed, 01 Aug 2007 05:02:13 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/doc/C/usermanual/installation building.xml
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Aug 2007 05:02:15 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Melissa Goldin <mushi>	07/08/01 05:02:13

Modified files:
	doc/C/usermanual/installation: building.xml 

Log message:
	For now, I've pulled a lot of the information out of this file and into the installation.xml file.  The information that was here in relation to downloading the source code didn't necessarily belong with build information.  This section will most likely be enlarged later, and will include some common build options, etc.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/installation/building.xml?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: building.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/usermanual/installation/building.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- building.xml	7 Jun 2007 14:11:26 -0000	1.2
+++ building.xml	1 Aug 2007 05:02:12 -0000	1.3
@@ -1,12 +1,12 @@
 <title>Building from Source</title>
 
 <para>
-  Once you have <link linkend="configure">configured</link> &app;,
+  Once you have <link linkend="pre-configuration">configured</link> &app;,
   you are ready to build the code.  &app; is built using
   <emphasis>GNU make</emphasis>.
 </para>
 
-<sect3 id="compile">
+<sect2 id="compile">
   <title>Compiling the Code</title>
 
   <para>
@@ -27,18 +27,16 @@
     The default value for both of these variables is
     <emphasis>-O2 -g</emphasis>.  A list of influential 
     environment variables can be seen in the configuration help:
-    <programlisting>
-  ./configure --help
-    </programlisting>
+</para>
+<para><userinput>./configure --help</userinput></para>
+<para>
     In the following example, debugging is enabled and optimization is
     disabled:
-    <programlisting>
-  make CFLAGS=-g CXXFLAGS=-g
-    </programlisting>
-  </para>
-</sect3>
+</para>
+<para><userinput>make CFLAGS=-g CXXFLAGS=-g</userinput></para>
+</sect2>
 
-<sect3 id="processdoc">
+<sect2 id="processdoc">
   <title>Creating the Documentation</title>
 
   <para>
@@ -79,10 +77,10 @@
   make apidoc
     </programlisting>
   </para>
-</sect3>
+</sect2>
 
 
-<sect3 id="runtests">
+<sect2 id="runtests">
   <title>Running the Tests</title>
 
   <para>
@@ -90,7 +88,7 @@
     <link linkend="bugreport">instructions for reporting a bug</link>.
   </para>
 
-  <sect4 id="dejagnu">
+  <sect3 id="dejagnu">
     <title>Using DejaGnu</title>
 
     <para>
@@ -106,7 +104,7 @@
       </programlisting>
     </para>
   
-    <sect5 id="testing_verbosity">
+    <sect4 id="testing_verbosity">
       <title>Increasing Verbosity</title>
       <para>
         If you encounter a problem with a test, increasing the
@@ -120,9 +118,9 @@
   make check RUNTESTFLAGS="-v -a"
         </programlisting>
       </para> 
-    </sect5>
+    </sect4>
      
-    <sect5 id="running_some_tests">
+    <sect4 id="running_some_tests">
       <title>Running Some Tests</title>
       <para>
         It is possible to run just a particular test, or 
@@ -151,10 +149,10 @@
   make -C testsuite/movies.all check
         </programlisting>
       </para>
-    </sect5>
-     
   </sect4>
-  <sect4 id="manually">
+     
+  </sect3>
+  <sect3 id="manually">
     <title>Running The Tests Manually</title>
      
     <para>
@@ -174,7 +172,7 @@
       </programlisting>
     </para>
   
-    <sect5 id="manual_compiled_tests">
+    <sect4 id="manual_compiled_tests">
     <title>Movie tests</title>
       <para>
         This creates a Flash movie version of the test case, which
@@ -184,9 +182,9 @@
    gnash -v XML-v6.swf
         </programlisting>
       </para>
-    </sect5>
+    </sect4>
   
-    <sect5 id="manual_actionscript_tests">
+    <sect4 id="manual_actionscript_tests">
       <title>ActionScript Unit Tests</title>
       <para>
         Unit tests for ActionScript classes in 'testsuite/actionscript.all'
@@ -195,9 +193,9 @@
   gprocessor -v XML-v6.swf
         </programlisting>
       </para>
-    </sect5>
   </sect4>
+  </sect3>
 
 
 
-</sect3>
+</sect2>



From MAILER-DAEMON Wed Aug 01 01:02:51 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IG6MF-0000oB-Gm
	for mharc-gnash-commit@gnu.org; Wed, 01 Aug 2007 01:02:51 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IG6ME-0000ni-2r
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 01:02:50 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IG6MD-0000nP-2u
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 01:02:49 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IG6MC-0000nK-VR
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 01:02:48 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mgoldin@lulu.com>) id 1IG6MC-00023L-GE
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 01:02:48 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <mgoldin@lulu.com>) id 1IG6MC-0007Jv-0n
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 05:02:48 +0000
Received: from mushi by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <mushi@savannah.gnu.org>) id 1IG6MB-0007JT-SH
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 05:02:47 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IG6MB-0007JT-SH@cvs.savannah.gnu.org>
From: Melissa Goldin <mgoldin@lulu.com>
Date: Wed, 01 Aug 2007 05:02:47 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/doc/C/usermanual/installation configurati...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Aug 2007 05:02:50 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Melissa Goldin <mushi>	07/08/01 05:02:47

Modified files:
	doc/C/usermanual/installation: configuration.xml 

Log message:
	Small changes; changed section to chapter and fixed some tagging errors

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/installation/configuration.xml?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: configuration.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/usermanual/installation/configuration.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- configuration.xml	26 May 2007 10:47:21 -0000	1.4
+++ configuration.xml	1 Aug 2007 05:02:47 -0000	1.5
@@ -1,6 +1,5 @@
-<title>Configuration</title>
 <para>
-  &app; uses <ulink type="http"
+&app;, like most GNU projects, allows a user to select various options before compiling its source code. These options include selecting from the available features, specifying custom paths for installation, and cross compiling.  &app; uses <ulink type="http"
   url="http://www.gnu.org/software/autoconf/">GNU Autoconf</ulink>
   for configuration.
 </para>
@@ -42,19 +41,23 @@
   which create the smallest working standalone version of &app;.  In
   this example, <emphasis>configure</emphasis> is being run from the
   source root directory:
-  <programlisting>
-  ./configure --disable-debugger --disable-cygnal --disable-docbook --disable-plugin --enable-media=mad --enable-gui=sdl
-  </programlisting>
 </para>
 
-<sect4 id="features">
+<screen>
+<userinput>
+./configure --disable-debugger --disable-cygnal --disable-docbook \
+--disable-plugin --enable-media=mad --enable-gui=sdl
+</userinput>
+</screen>
+
+<sect2 id="features">
   &featureoptions;
-</sect4>
+</sect2>
          
-<sect4 id="custompath">
+<sect2 id="custompath">
   &custompath;
-</sect4>
+</sect2>
 
-<sect4 id="crosscompilingconfiguration">
+<sect2 id="crosscompilingconfiguration">
   &cross_compiling;
-</sect4>
+</sect2>



From MAILER-DAEMON Wed Aug 01 01:04:31 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IG6Nr-0001Uj-F3
	for mharc-gnash-commit@gnu.org; Wed, 01 Aug 2007 01:04:31 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IG6Nm-0001TP-OC
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 01:04:26 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IG6Nl-0001SN-GK
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 01:04:25 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IG6Nk-0001SA-Qh
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 01:04:24 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mgoldin@lulu.com>) id 1IG6Nk-0002Wh-3R
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 01:04:24 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <mgoldin@lulu.com>) id 1IG6Nj-0001py-Kk
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 05:04:23 +0000
Received: from mushi by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <mushi@savannah.gnu.org>) id 1IG6Nj-0001pv-Gq
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 05:04:23 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IG6Nj-0001pv-Gq@cvs.savannah.gnu.org>
From: Melissa Goldin <mgoldin@lulu.com>
Date: Wed, 01 Aug 2007 05:04:23 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/doc/C/usermanual/installation feature_con...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Aug 2007 05:04:27 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Melissa Goldin <mushi>	07/08/01 05:04:23

Modified files:
	doc/C/usermanual/installation: feature_configuration.xml 

Log message:
	Small changes: validation error correction and updating section-level from 'article' to 'book'

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/installation/feature_configuration.xml?cvsroot=gnash&r1=1.12&r2=1.13

Patches:
Index: feature_configuration.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/usermanual/installation/feature_configuration.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- feature_configuration.xml	31 Jul 2007 16:20:26 -0000	1.12
+++ feature_configuration.xml	1 Aug 2007 05:04:23 -0000	1.13
@@ -27,8 +27,6 @@
   A complete list of available features follows.
 </para>
 
-<!-- <para>TODO - review this section</para> -->
-
 <variablelist>
   <varlistentry>
     <term>--enable-debugger</term>
@@ -110,41 +108,51 @@
 	<varlistentry>
 	  <term>GTK</term>
 	  <listitem>
+<para>
     The GTK+ toolkit, which is the default GUI.
     Said to interwork particularly well with firefox.
+</para>
 	  </listitem>
 	</varlistentry>
 	<varlistentry>
 	  <term>SDL</term>
 	  <listitem>
+<para>
     Simple DirectMedia Layer, a simple and portable GUI.
     Its sound facilities are used when --enable-media=ffmpeg|mad
     regoardless of whether it is also in charge of the GUI.
+</para>
 	  </listitem>
 	</varlistentry>
 	<varlistentry>
 	  <term>KDE</term>
 	  <listitem>
+<para>
     An interface adapted to the KDE Desktop Environment.
     This must be selected when building the Konqueror plugin
     "klash". Furthermore, the only renderer that currently
     works with KDE is opengl.
+</para>
 	  </listitem>
 	</varlistentry>
 	<varlistentry>
 	  <term>FLTK</term>
 	  <listitem>
+<para>
     Fast Light ToolKit, low on resource usage.
     Since all build using fltk are now broken, we declare it
     "for developers".
+</para>
 	  </listitem>
 	</varlistentry>
 	<varlistentry>
 	  <term>FB</term>
 	  <listitem>
+<para>
     The Linux Frame Buffer, also known as /dev/fb0.
     AGG is the only renderer that can currently be used
     with the framebuffer GUI.
+</para>
 	  </listitem>
 	</varlistentry>
       </variablelist>



From MAILER-DAEMON Wed Aug 01 01:05:00 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IG6OK-0001nI-S1
	for mharc-gnash-commit@gnu.org; Wed, 01 Aug 2007 01:05:00 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IG6OJ-0001nC-To
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 01:04:59 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IG6OJ-0001n0-FC
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 01:04:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IG6OJ-0001mx-8v
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 01:04:59 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mgoldin@lulu.com>) id 1IG6OI-0002j1-Sr
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 01:04:58 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <mgoldin@lulu.com>) id 1IG6OI-0001qP-Fk
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 05:04:58 +0000
Received: from mushi by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <mushi@savannah.gnu.org>) id 1IG6OI-0001qM-A2
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 05:04:58 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IG6OI-0001qM-A2@cvs.savannah.gnu.org>
From: Melissa Goldin <mgoldin@lulu.com>
Date: Wed, 01 Aug 2007 05:04:58 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/doc/C/usermanual/installation install.xml
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Aug 2007 05:05:00 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Melissa Goldin <mushi>	07/08/01 05:04:58

Modified files:
	doc/C/usermanual/installation: install.xml 

Log message:
	Small changes: validation error correction and updating section levels from 'article' to 'book'

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/installation/install.xml?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: install.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/usermanual/installation/install.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- install.xml	17 Jun 2007 08:29:15 -0000	1.3
+++ install.xml	1 Aug 2007 05:04:58 -0000	1.4
@@ -30,14 +30,14 @@
   platform-dependent executables and libraries are installed.
 </para>
   
-<sect4 id="libinstall">
+<sect2 id="libinstall">
   <title>Libraries</title>
   
   <para>
     Installed libraries are located in 
     <filename>/usr/local/lib</filename> by default.
     If the <emphasis>--prefix</emphasis> option was used in
-    <link linkend="configure">configuration</link>, the libraries will
+    <link linkend="pre-configuration">configuration</link>, the libraries will
     be installed in the directory <filename>lib</filename> inside the
     path you specified.  If the libraries are stored in a non-standard
     location, you need to identify the path in one of two ways.
@@ -59,9 +59,9 @@
     run <emphasis>ldconfig</emphasis> as root to update the runtime
     cache.
   </para>
-</sect4>
+</sect2>
 
-<sect4 id="appinstall">
+<sect2 id="appinstall">
   <title>Executables</title>
 
   <para>
@@ -81,9 +81,9 @@
     If no path was specified, the default is 
     <filename>/usr/local/bin</filename>.
   </para>
-</sect4>
+</sect2>
 
-<sect4 id="docinstall">
+<sect2 id="docinstall">
   <title>Documentation</title>
 
   <para>
@@ -108,4 +108,4 @@
     which menu item &app; appears in the <emphasis>GNOME help</emphasis>
     system.
   </para>
-</sect4>
+</sect2>



From MAILER-DAEMON Wed Aug 01 01:05:40 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IG6Ox-00024v-W1
	for mharc-gnash-commit@gnu.org; Wed, 01 Aug 2007 01:05:40 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IG6Ow-00023H-JA
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 01:05:38 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IG6Ow-00022a-6L
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 01:05:38 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IG6Ov-000223-NL
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 01:05:37 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mgoldin@lulu.com>) id 1IG6Ov-0002sp-7A
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 01:05:37 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <mgoldin@lulu.com>) id 1IG6Ou-0001rT-Le
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 05:05:36 +0000
Received: from mushi by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <mushi@savannah.gnu.org>) id 1IG6Ou-0001rO-Cr
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 05:05:36 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IG6Ou-0001rO-Cr@cvs.savannah.gnu.org>
From: Melissa Goldin <mgoldin@lulu.com>
Date: Wed, 01 Aug 2007 05:05:36 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/doc/C/usermanual/installation sources.xml
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Aug 2007 05:05:38 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Melissa Goldin <mushi>	07/08/01 05:05:36

Modified files:
	doc/C/usermanual/installation: sources.xml 

Log message:
	small changes: updating section level to reflect 'book' intead of 'article'

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/installation/sources.xml?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: sources.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/usermanual/installation/sources.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- sources.xml	26 May 2007 10:44:38 -0000	1.4
+++ sources.xml	1 Aug 2007 05:05:36 -0000	1.5
@@ -30,73 +30,4 @@
 </para>  
 
 
-<sect3 id="gettingsource">
-  <title>Getting the Source</title>
 
-  <para>
-    &app; is available as a <link linkend="sourcereleases">release
-    tarball</link>, a <link linkend="sourcerepo">development 
-    checkout</link>, or a <link linkend="sourcesnapshot">development
-    snapshot</link>.
-  </para>
-
-  <sect4 id="sourcereleases">
-    <title>Releases</title>
-
-    <para>
-      The source can be acquired from a
-      <ulink type="http" 
-      url="http://www.gnu.org/prep/ftp.html">GNU FTP
-      Mirror</ulink>.  The release version is intended to be
-      stable, and is probably your best choice if the release took
-      place recently.  If you need features or fixes which were
-      introduced after the release, consider a 
-      <link linkend="sourcerepo">CVS checkout</link> or the
-      <link linkend="sourcesnapshot">daily snapshot</link>.
-    </para>
-    <para>
-      To download, select a mirror near you, then choose the
-      <filename>gnash</filename> directory.
-    </para>
-  </sect4>
-
-  <sect4 id="sourcerepo">
-    <title>Repository</title>
-
-    <para>
-      The latest development sources are available via
-      anonymous CVS (leave the password blank).  This is recommended
-      if you need features or bug fixes which were introduced after
-      the <link linkend="sourcereleases">last release</link>.  Look at
-      the <link linkend="sourcesnapshot">daily snapshot</link> if you
-      experience difficulty accessing the repository.
-    </para>
-    <para>
-      First set the
-      environment variable <emphasis>CVS_RSH</emphasis> to 'ssh', as shown
-      in this example, which uses the GNU Bourne-Again shell (bash):
-      <programlisting>
-  export CVS_RSH="ssh"
-  cvs -z3 -d:pserver:anonymous@cvs.sv.gnu.org:/sources/gnash co gnash
-      </programlisting>
-      It is also possible to
-      <ulink url="http://cvs.savannah.gnu.org/viewcvs/gnash/?root=gnash"
-      type="http">browse the repository</ulink> on the web.
-    </para>
-  </sect4>
-
-  <sect4 id="sourcesnapshot">
-    <title>Snapshot</title>
-
-    <para>
-      The daily development snapshot can be downloaded from
-      <ulink url="http://www.gnashdev.org/dev_snapshots/"
-      type="http">http://www.gnashdev.org/dev_snapshots/</ulink>.
-      This is the best option if you need changes which were introduced
-      after the <link linkend="sourcereleases">last release</link> of
-      &app;, but are unable to <link linkend="sourcerepo">download
-      directly from the repository.</link>
-    </para>
-  </sect4>
-
-</sect3>



From MAILER-DAEMON Wed Aug 01 06:09:31 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGB90-0000yE-J6
	for mharc-gnash-commit@gnu.org; Wed, 01 Aug 2007 06:09:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGB8w-0000wX-V9
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 06:09:28 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGB8v-0000vb-VI
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 06:09:26 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGB8v-0000vG-DF
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 06:09:25 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <tomasgroth@yahoo.dk>) id 1IGB8u-0004W5-Tg
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 06:09:25 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <tomasgroth@yahoo.dk>) id 1IGB8u-0007QG-33
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 10:09:24 +0000
Received: from tgc by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <tgc@savannah.gnu.org>) id 1IGB8t-0007Px-Oq
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 10:09:23 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGB8t-0007Px-Oq@cvs.savannah.gnu.org>
From: Tomas Groth <tomasgroth@yahoo.dk>
Date: Wed, 01 Aug 2007 10:09:23 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog backend/sound_handler_gst.cpp b...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Aug 2007 10:09:28 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Tomas Groth <tgc>	07/08/01 10:09:23

Modified files:
	.              : ChangeLog 
	backend        : sound_handler_gst.cpp sound_handler_gst.h 

Log message:
		* backend/sound_handler_gst.{h,cpp}: Switch to try_mutex, and in 
		  callback_handoff only try to lock, and return if unsuccesfull
		  to avoid a potential deadlock, fixes bug #20596. Warning fixes

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3893&r2=1.3894
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_gst.cpp?cvsroot=gnash&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_gst.h?cvsroot=gnash&r1=1.13&r2=1.14

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3893
retrieving revision 1.3894
diff -u -b -r1.3893 -r1.3894
--- ChangeLog	1 Aug 2007 04:02:13 -0000	1.3893
+++ ChangeLog	1 Aug 2007 10:09:22 -0000	1.3894
@@ -1,3 +1,9 @@
+2007-08-01 Tomas Groth Christensen <tomasgroth@yahoo.dk>
+
+	* backend/sound_handler_gst.{h,cpp}: Switch to try_mutex, and in 
+	  callback_handoff only try to lock, and return if unsuccesfull
+	  to avoid a potential deadlock, fixes bug #20596. Warning fixes.
+
 2007-08-01 Sandro Santilli <strk@keybit.net>
 
 	* plugin/plugin.cpp: run 'gtk-gnash' by default.
@@ -125,7 +131,7 @@
 	* testsuite/actionscript.all/TextField.as: expect one failure
 	  less.
 
-2007-07-30 Sergio Costas
+2007-07-30 Sergio Costas <raster (at) rastersoft.com>
 
 	* backend/sound_handler_gst.cpp: Use the audioconverter element
 	  to get the current position, to avoid delay.

Index: backend/sound_handler_gst.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_gst.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- backend/sound_handler_gst.cpp	30 Jul 2007 09:05:51 -0000	1.56
+++ backend/sound_handler_gst.cpp	1 Aug 2007 10:09:23 -0000	1.57
@@ -20,7 +20,7 @@
 // Based on sound_handler_sdl.cpp by Thatcher Ulrich http://tulrich.com 2003
 // which has been donated to the Public Domain.
 
-/* $Id: sound_handler_gst.cpp,v 1.56 2007/07/30 09:05:51 tgc Exp $ */
+/* $Id: sound_handler_gst.cpp,v 1.57 2007/08/01 10:09:23 tgc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -80,7 +80,7 @@
 // can be use for playing it.
 {
 
-	mutex::scoped_lock lock(_mutex);
+	try_mutex::scoped_lock lock(_mutex);
 
 	sound_data *sounddata = new sound_data;
 	if (!sounddata) {
@@ -144,7 +144,7 @@
 // this gets called when a stream gets more data
 long	GST_sound_handler::fill_stream_data(void* data, int data_bytes, int /*sample_count*/, int handle_id)
 {
-	mutex::scoped_lock lock(_mutex);
+	try_mutex::scoped_lock lock(_mutex);
 
 	// @@ does a negative handle_id have any meaning ?
 	//    should we change it to unsigned instead ?
@@ -186,9 +186,20 @@
 {
 	gst_elements *gstelements = static_cast<gst_elements*>(user_data);
 
-	mutex::scoped_lock lock(gstelements->handler->_mutex);
+	try_mutex::scoped_try_lock lock(gstelements->handler->_mutex);
 
-	// First callback
+	// If we couldn't obtain a lock return to avoid a deadlock
+	if (!lock.locked()) {
+
+		// We return nothing in this case to avoid noise being decoded and played
+		if (GST_BUFFER_SIZE(buffer) != 0 && GST_BUFFER_DATA(buffer)) {
+			GST_BUFFER_DATA(buffer) = 0;
+			GST_BUFFER_SIZE(buffer) = 0;
+		}
+		return;
+	}
+
+	// First callback or after a couldn't-get-lock-return 
 	if (GST_BUFFER_SIZE(buffer) == 0) {
 		if (gstelements->data_size > BUFFER_SIZE) {
 			GST_BUFFER_SIZE(buffer) = BUFFER_SIZE;
@@ -252,7 +263,7 @@
 void	GST_sound_handler::play_sound(int sound_handle, int loop_count, int /*offset*/, long start_position, const std::vector<sound_envelope>* /*envelopes*/)
 // Play the index'd sample.
 {
-	mutex::scoped_lock lock(_mutex);
+	try_mutex::scoped_lock lock(_mutex);
 
 	// Check if the sound exists, or if audio is muted
 	if (sound_handle < 0 || (unsigned int) sound_handle >= m_sound_data.size() || muted)
@@ -459,7 +470,7 @@
 
 void	GST_sound_handler::stop_sound(int sound_handle)
 {
-	mutex::scoped_lock lock(_mutex);
+	try_mutex::scoped_lock lock(_mutex);
 
 	// Check if the sound exists.
 	if (sound_handle < 0 || (unsigned int) sound_handle >= m_sound_data.size())
@@ -499,7 +510,7 @@
 void	GST_sound_handler::delete_sound(int sound_handle)
 // this gets called when it's done with a sample.
 {
-	mutex::scoped_lock lock(_mutex);
+	try_mutex::scoped_lock lock(_mutex);
 
 	if (sound_handle >= 0 && (unsigned int) sound_handle < m_sound_data.size())
 	{
@@ -524,7 +535,7 @@
 //	where 0 is off and 100 is full volume. The default setting is 100.
 int	GST_sound_handler::get_volume(int sound_handle) {
 
-	mutex::scoped_lock lock(_mutex);
+	try_mutex::scoped_lock lock(_mutex);
 
 	// Check if the sound exists.
 	if (sound_handle >= 0 && (unsigned int) sound_handle < m_sound_data.size())
@@ -540,7 +551,7 @@
 //	100 is full volume and 0 is no volume. The default setting is 100.
 void	GST_sound_handler::set_volume(int sound_handle, int volume) {
 
-	mutex::scoped_lock lock(_mutex);
+	try_mutex::scoped_lock lock(_mutex);
 
 	// Check if the sound exists.
 	if (sound_handle < 0 || (unsigned int) sound_handle >= m_sound_data.size())
@@ -568,7 +579,7 @@
 
 void GST_sound_handler::get_info(int sound_handle, int* format, bool* stereo) {
 
-	mutex::scoped_lock lock(_mutex);
+	try_mutex::scoped_lock lock(_mutex);
 
 	// Check if the sound exists.
 	if (sound_handle >= 0 && (unsigned int) sound_handle < m_sound_data.size())
@@ -606,7 +617,7 @@
 
 unsigned int GST_sound_handler::get_duration(int sound_handle)
 {
-	mutex::scoped_lock lock(_mutex);
+	try_mutex::scoped_lock lock(_mutex);
 
 	// Check if the sound exists.
 	if (sound_handle < 0 || (unsigned int) sound_handle >= m_sound_data.size())
@@ -629,7 +640,7 @@
 
 unsigned int GST_sound_handler::get_position(int sound_handle)
 {
-	mutex::scoped_lock lock(_mutex);
+	try_mutex::scoped_lock lock(_mutex);
 
 	// Check if the sound exists.
 	if (sound_handle < 0 || (unsigned int) sound_handle >= m_sound_data.size())
@@ -659,6 +670,7 @@
 			return 0;
 		}
 	}
+	return 0;
 }
 
 // Pointer handling and checking functions

Index: backend/sound_handler_gst.h
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_gst.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- backend/sound_handler_gst.h	27 Jul 2007 15:09:41 -0000	1.13
+++ backend/sound_handler_gst.h	1 Aug 2007 10:09:23 -0000	1.14
@@ -55,10 +55,10 @@
 	GstPad     *addersinkpad;
 	
 	// position in the stream
-	long position;
+	unsigned long position;
 
 	// data size
-	long data_size;
+	unsigned long data_size;
 
 	long loop_count;
 	
@@ -127,7 +127,7 @@
 	bool muted;
 
 	/// Mutex for making sure threads doesn't mess things up
-	boost::mutex _mutex;
+	boost::try_mutex _mutex;
 
 public:
 



From MAILER-DAEMON Wed Aug 01 08:06:33 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGCyH-0006Ii-Qa
	for mharc-gnash-commit@gnu.org; Wed, 01 Aug 2007 08:06:33 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGCyG-0006Id-J9
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 08:06:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGCyG-0006IR-3e
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 08:06:32 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGCyF-0006IO-S4
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 08:06:31 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1IGCyF-0005Fm-Gt
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 08:06:31 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <udo.gnu@nova-sys.net>) id 1IGCyE-0003BX-Ts
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 12:06:31 +0000
Received: from udog by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <udog@savannah.gnu.org>) id 1IGCyE-0003BB-NE
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 12:06:30 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGCyE-0003BB-NE@cvs.savannah.gnu.org>
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
Date: Wed, 01 Aug 2007 12:06:30 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog gui/gtk_glue_agg.h gui/gtk_glue...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Aug 2007 12:06:32 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Udo Giacomozzi <udog>	07/08/01 12:06:30

Modified files:
	.              : ChangeLog 
	gui            : gtk_glue_agg.h gtk_glue_agg.cpp 

Log message:
	gui/gtk_glue_agg.{cpp,h}: stubbed pixel format detection. Will break OLPC support but fix bug #20649 for all others.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3894&r2=1.3895
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk_glue_agg.h?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk_glue_agg.cpp?cvsroot=gnash&r1=1.23&r2=1.24

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.3894
retrieving revision 1.3895
diff -u -b -r1.3894 -r1.3895
--- ChangeLog	1 Aug 2007 10:09:22 -0000	1.3894
+++ ChangeLog	1 Aug 2007 12:06:30 -0000	1.3895
@@ -1,3 +1,8 @@
+2007-08-01 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* gui/gtk_glue_agg.{cpp,h}: stubbed pixel format detection. Will
+	  break OLPC support but fix bug #20649 for all others.
+
 2007-08-01 Tomas Groth Christensen <tomasgroth@yahoo.dk>
 
 	* backend/sound_handler_gst.{h,cpp}: Switch to try_mutex, and in 

Index: gui/gtk_glue_agg.h
===================================================================
RCS file: /cvsroot/gnash/gnash/gui/gtk_glue_agg.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- gui/gtk_glue_agg.h	31 Jul 2007 16:43:47 -0000	1.13
+++ gui/gtk_glue_agg.h	1 Aug 2007 12:06:30 -0000	1.14
@@ -56,6 +56,7 @@
     int _offscreenbuf_size;
     render_handler *_agg_renderer;
     int _width, _height, _bpp;
+    char _pixelformat[16];
     bool _have_shm;
 #ifdef ENABLE_MIT_SHM
     XImage *_shm_image;
@@ -80,10 +81,15 @@
     /// format. Returns NULL on failure.
     render_handler *create_shm_handler();    
     
-    // converts a bitmask to a shift/size information (used for pixel format
-    // detection)
+    /// converts a bitmask to a shift/size information (used for pixel format
+    /// detection)
     void decode_mask(unsigned long mask, unsigned int *shift, unsigned int *size);
     
+    /// Tries to detect the pixel format used by the X server (usually RGB24).
+    /// It does not have to match the hardware pixel format, just the one
+    /// expected for pixmaps. This function is /not/ used for MIT-SHM!
+    bool detect_pixelformat();
+    
 };
 
 } // namespace gnash

Index: gui/gtk_glue_agg.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/gui/gtk_glue_agg.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- gui/gtk_glue_agg.cpp	2 Jul 2007 08:13:27 -0000	1.23
+++ gui/gtk_glue_agg.cpp	1 Aug 2007 12:06:30 -0000	1.24
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: gtk_glue_agg.cpp,v 1.23 2007/07/02 08:13:27 udog Exp $ */
+/* $Id: gtk_glue_agg.cpp,v 1.24 2007/08/01 12:06:30 udog Exp $ */
 
 
 /// \page gtk_shm_support GTK shared memory extension support
@@ -103,13 +103,14 @@
     
     _have_shm = check_mit_shm(gdk_display);
     
-#ifdef PIXELFORMAT_RGB565
-    _bpp = 16;
-#else
-    // GDK's gdk_draw_rgb_image() needs 24-bit RGB data, so we initialize the
-    // AGG renderer with RGB24 and let GTK take care of the proper pixel format.
-    _bpp = 24;
-#endif
+    if (!detect_pixelformat()) {
+      printf("FATAL: Could not detect the pixel format used by your X server.\n");
+      printf("Please report this problem to the Gnash developer team.\n");
+      return false;
+    }
+    
+    log_msg("Your X server expects %s pixmap data.", _pixelformat);
+    
     return true;
 }
 
@@ -233,6 +234,25 @@
     _drawing_area = drawing_area;
 }
 
+bool 
+GtkAggGlue::detect_pixelformat() 
+{
+
+  // <UdoG>: Currently there is NO detection of the pixel format used by the 
+  // X server. I tried with gdk_visual_get_system() and gdk_visual_get_best() 
+  // but they return the /hardware/ pixel format, which is not what we want.
+  // Normally any X server will use RGB24, regardless of video hardware.
+  // Only the OLPC has a hacked(?) X server that expects RGB565 data.
+  // I dropped support for the OLPC to make GTK-AGG work for normal X servers.
+  // We need to find a detection method that works in both cases...  
+  
+  _bpp = 24;
+  strcpy(_pixelformat, "RGB24");
+  
+  return true;
+  
+}
+
 render_handler*
 GtkAggGlue::create_shm_handler()
 {
@@ -311,13 +331,7 @@
     if (_agg_renderer) return _agg_renderer;
   }
 
-#ifdef PIXELFORMAT_RGB565
-#warning A pixel format of RGB565; you must have a (hacked) GTK which supports \
-         this format (e.g., GTK on the OLPC).
-    _agg_renderer = create_render_handler_agg("RGB565");
-#else
-    _agg_renderer = create_render_handler_agg("RGB24");
-#endif
+  _agg_renderer = create_render_handler_agg(_pixelformat);
     return _agg_renderer;
 }
 



From MAILER-DAEMON Wed Aug 01 09:16:46 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGE4E-00030G-8D
	for mharc-gnash-commit@gnu.org; Wed, 01 Aug 2007 09:16:46 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGE4D-0002zp-1J
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 09:16:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGE4C-0002zQ-2K
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 09:16:44 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGE4B-0002zG-SL
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 09:16:43 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1IGE4B-0005uc-HL
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 09:16:43 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <udo.gnu@nova-sys.net>) id 1IGE49-0007A2-WD
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 13:16:42 +0000
Received: from udog by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <udog@savannah.gnu.org>) id 1IGE49-00079J-E2
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 13:16:41 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGE49-00079J-E2@cvs.savannah.gnu.org>
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
Date: Wed, 01 Aug 2007 13:16:41 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/gui gtk.cpp gtk_glue.h gtk_glue_agg.cpp g...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Aug 2007 13:16:45 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Udo Giacomozzi <udog>	07/08/01 13:16:40

Modified files:
	gui            : gtk.cpp gtk_glue.h gtk_glue_agg.cpp 
	                 gtk_glue_agg.h gtksup.h gui.cpp gui.h 

Log message:
	added beforeRendering() callback and optimized MIT-SHM syncing.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.101&r2=1.102
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk_glue.h?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk_glue_agg.cpp?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk_glue_agg.h?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtksup.h?cvsroot=gnash&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.cpp?cvsroot=gnash&r1=1.89&r2=1.90
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.h?cvsroot=gnash&r1=1.57&r2=1.58

Patches:
Index: gtk.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -b -r1.101 -r1.102
--- gtk.cpp	30 Jul 2007 21:26:39 -0000	1.101
+++ gtk.cpp	1 Aug 2007 13:16:39 -0000	1.102
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: gtk.cpp,v 1.101 2007/07/30 21:26:39 strk Exp $ */
+/* $Id: gtk.cpp,v 1.102 2007/08/01 13:16:39 udog Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -268,6 +268,12 @@
 }
 
 void
+GtkGui::beforeRendering()
+{
+  _glue->beforeRendering();
+}
+
+void
 GtkGui::renderBuffer()
 {
 	if ( _drawbounds.size() == 0 ) return; // nothing to do..

Index: gtk_glue.h
===================================================================
RCS file: /cvsroot/gnash/gnash/gui/gtk_glue.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- gtk_glue.h	30 Jul 2007 21:26:39 -0000	1.12
+++ gtk_glue.h	1 Aug 2007 13:16:40 -0000	1.13
@@ -43,6 +43,7 @@
 			{ render();	};
     virtual void configure(GtkWidget *const widget,
                            GdkEventConfigure *const event) = 0;
+    virtual void beforeRendering() { /* nop */ };
   protected:
     GtkWidget *_drawing_area;
 };

Index: gtk_glue_agg.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/gui/gtk_glue_agg.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- gtk_glue_agg.cpp	1 Aug 2007 12:06:30 -0000	1.24
+++ gtk_glue_agg.cpp	1 Aug 2007 13:16:40 -0000	1.25
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: gtk_glue_agg.cpp,v 1.24 2007/08/01 12:06:30 udog Exp $ */
+/* $Id: gtk_glue_agg.cpp,v 1.25 2007/08/01 13:16:40 udog Exp $ */
 
 
 /// \page gtk_shm_support GTK shared memory extension support
@@ -109,7 +109,7 @@
       return false;
     }
     
-    log_msg("Your X server expects %s pixmap data.", _pixelformat);
+    log_msg("Your X server expects %s pixmap data for standard mode.", _pixelformat);
     
     return true;
 }
@@ -419,6 +419,24 @@
 }
 
 void
+GtkAggGlue::beforeRendering()
+{
+#ifdef ENABLE_MIT_SHM
+  if (_shm_image) {
+    // The shared memory buffer is copied in background(!) since the X 
+    // calls are executed asynchroneously. This is dangerous because it
+    // may happen that the renderer updates the buffer while the X server
+    // still copies the data to the VRAM (flicker can occurr).
+    // Instead of using the XShmCompletionEvent for this we just call XSync
+    // right before writing to the shared memory again. This will make sure
+    // that the X server finishes to copy the data to VRAM before we
+    // change it again.
+    XSync(gdk_display, False);
+  }
+#endif  
+}
+
+void
 GtkAggGlue::render()
 {
 
@@ -435,22 +453,7 @@
       _width, _height,
       False); 
       
-      // <Udo>:
-      // The shared memory buffer is copied in background(!) since the X 
-      // calls are executed asynchroneously. This is dangerous because it
-      // may happen that the renderer updates the buffer while the X server
-      // still copies the data to the VRAM (flicker can occurr).
-      // Normally this is avoided using the XShmCompletionEvent which is sent
-      // to the client once the buffer has been copied. The last argument to
-      // XShmPutImage must be set to True for this. 
-      // We'd need to wait for this event before calling the renderer again.
-      // I know nothing about X event handling and so I just call XSync here
-      // to wait until all commands have been executed. This has the 
-      // disadvantage that we can't leave the X server some time till the core 
-      // is ready to *render* the next frame. I don't think it would make a 
-      // significant performance difference unless data to video ram is very 
-      // slow (could be the case for old / embedded computers, though).       
-      XSync(gdk_display, False);
+      // NOTE: Data will be copied in background, see beforeRendering()
 
   } else {
 #endif  
@@ -491,7 +494,7 @@
   		maxx-minx+1, maxy-miny+1,
       False);
       
-    XSync(gdk_display, False); // see GtkAggGlue::render(void)
+    // NOTE: Data will be copied in background, see beforeRendering()
   
   } else {
 #endif       

Index: gtk_glue_agg.h
===================================================================
RCS file: /cvsroot/gnash/gnash/gui/gtk_glue_agg.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- gtk_glue_agg.h	1 Aug 2007 12:06:30 -0000	1.14
+++ gtk_glue_agg.h	1 Aug 2007 13:16:40 -0000	1.15
@@ -47,6 +47,7 @@
     void prepDrawingArea(GtkWidget *drawing_area);
     render_handler* createRenderHandler();
     void setRenderHandlerSize(int width, int height);
+    void beforeRendering();
     void render();
     void render(int minx, int miny, int maxx, int maxy);
     void configure(GtkWidget *const widget, GdkEventConfigure *const event);

Index: gtksup.h
===================================================================
RCS file: /cvsroot/gnash/gnash/gui/gtksup.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- gtksup.h	30 Jul 2007 21:26:39 -0000	1.47
+++ gtksup.h	1 Aug 2007 13:16:40 -0000	1.48
@@ -53,6 +53,7 @@
 
     virtual bool createMenu();
     virtual bool setupEvents();
+    virtual void beforeRendering();
     virtual void renderBuffer();
     virtual void setInterval(unsigned int interval);
     virtual void setTimeout(unsigned int timeout);

Index: gui.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/gui/gui.cpp,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- gui.cpp	3 Jul 2007 15:53:39 -0000	1.89
+++ gui.cpp	1 Aug 2007 13:16:40 -0000	1.90
@@ -415,6 +415,8 @@
 		setInvalidatedRegions(changed_ranges);
 #endif
 
+    beforeRendering();
+
 		// render the frame.
 		// It's up to the GUI/renderer combination
 		// to do any clipping, if desired.     

Index: gui.h
===================================================================
RCS file: /cvsroot/gnash/gnash/gui/gui.h,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- gui.h	26 Jul 2007 14:39:09 -0000	1.57
+++ gui.h	1 Aug 2007 13:16:40 -0000	1.58
@@ -131,6 +131,10 @@
     virtual void setInvalidatedRegion(const rect& bounds);
     virtual void setInvalidatedRegions(const InvalidatedRanges& ranges);
     
+    // Called right before rendering anything (after setInvalidatedRegion).
+    // Used by GTK-AGG.
+    virtual void beforeRendering() { /* nop */ };
+    
     // Should return TRUE when the GUI/Renderer combination supports multiple
     // invalidated bounds regions. 
     virtual bool want_multiple_regions() { return false; }



From MAILER-DAEMON Wed Aug 01 09:20:35 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGE7v-0008KG-83
	for mharc-gnash-commit@gnu.org; Wed, 01 Aug 2007 09:20:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGE7t-0008Hx-G3
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 09:20:33 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGE7s-0008Gl-OJ
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 09:20:33 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGE7s-0008GO-Hd
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 09:20:32 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IGE7s-0006yn-Au
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 09:20:32 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IGE7r-0002cJ-5L
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 13:20:31 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IGE7q-0002bw-UB
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 13:20:31 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGE7q-0002bw-UB@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 01 Aug 2007 13:20:30 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog gui/Makefile.am
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Aug 2007 13:20:33 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/01 13:20:30

Modified files:
	.              : ChangeLog 
	gui            : Makefile.am 

Log message:
	* gui/Makefile.am: distribute gnash.in

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3895&r2=1.3896
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.98&r2=1.99

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3895
retrieving revision 1.3896
diff -u -b -r1.3895 -r1.3896
--- ChangeLog	1 Aug 2007 12:06:30 -0000	1.3895
+++ ChangeLog	1 Aug 2007 13:20:30 -0000	1.3896
@@ -1,3 +1,7 @@
+2007-08-01 Sandro Santilli <strk@keybit.net>
+
+	* gui/Makefile.am: distribute gnash.in
+
 2007-08-01 Udo Giacomozzi <udo.gnu@nova-sys.net>
 
 	* gui/gtk_glue_agg.{cpp,h}: stubbed pixel format detection. Will

Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- gui/Makefile.am	31 Jul 2007 21:59:49 -0000	1.98
+++ gui/Makefile.am	1 Aug 2007 13:20:30 -0000	1.99
@@ -29,6 +29,8 @@
 # noinst_LTLIBRARIES = libgnashgui.la
 BUILT_SOURCES = klash.moc .configline
 
+EXTRA_DIST = gnash.in
+
 noinst_LTLIBRARIES = 
 AM_CPPFLAGS = -I.. \
         -I$(top_srcdir) \



From MAILER-DAEMON Wed Aug 01 09:32:21 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGEJJ-0000WJ-Ss
	for mharc-gnash-commit@gnu.org; Wed, 01 Aug 2007 09:32:21 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGEJI-0000Vv-NY
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 09:32:20 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGEJH-0000Vd-SF
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 09:32:20 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGEJH-0000Va-NX
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 09:32:19 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IGEJH-00023D-Fg
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 09:32:19 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IGEJG-0006RK-BV
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 13:32:18 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IGEJG-0006Qa-5T
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 13:32:18 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGEJG-0006Qa-5T@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 01 Aug 2007 13:32:18 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog gui/gnash.in
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Aug 2007 13:32:20 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/01 13:32:18

Modified files:
	.              : ChangeLog 
	gui            : gnash.in 

Log message:
	* gui/gnash.in: don't loose parameters layout. Fixes bug #20651.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3896&r2=1.3897
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.in?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3896
retrieving revision 1.3897
diff -u -b -r1.3896 -r1.3897
--- ChangeLog	1 Aug 2007 13:20:30 -0000	1.3896
+++ ChangeLog	1 Aug 2007 13:32:17 -0000	1.3897
@@ -1,5 +1,6 @@
 2007-08-01 Sandro Santilli <strk@keybit.net>
 
+	* gui/gnash.in: don't loose parameters layout. Fixes bug #20651.
 	* gui/Makefile.am: distribute gnash.in
 
 2007-08-01 Udo Giacomozzi <udo.gnu@nova-sys.net>

Index: gui/gnash.in
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gui/gnash.in	31 Jul 2007 20:08:44 -0000	1.3
+++ gui/gnash.in	1 Aug 2007 13:32:17 -0000	1.4
@@ -43,7 +43,7 @@
 for gui in ${gui} ${GUIS}; do
 	exe=${THIS_DIR}/${gui}-gnash
 	if test -e ${exe}; then
-		exec ${exe} $*
+		exec ${exe} "$@"
 	fi
 done
 



From MAILER-DAEMON Wed Aug 01 11:57:00 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGGZI-0005Bs-Pj
	for mharc-gnash-commit@gnu.org; Wed, 01 Aug 2007 11:57:00 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGGZH-00059i-3L
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 11:56:59 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGGZF-00057f-RC
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 11:56:58 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGGZF-00057Q-OD
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 11:56:57 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IGGZE-00082c-Sa
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 11:56:57 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IGGZC-00074R-RP
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 15:56:54 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IGGZC-00074B-Ls
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 15:56:54 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGGZC-00074B-Ls@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 01 Aug 2007 15:56:54 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/asobj/Boolean.cpp server...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Aug 2007 15:56:59 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/01 15:56:54

Modified files:
	.              : ChangeLog 
	server/asobj   : Boolean.cpp Number.cpp string.cpp 
	server/vm      : VM.cpp VM.h 

Log message:
	        * server/asobj/: Boolean.cpp, Number.cpp, string.cpp:
	          register static constructors and prototypes with the VM.
	        * server/vm/VM.{cpp,h}: Add support for registering
	          arbitrary as_object for reachability. Intended to
	          be used whenever a static as_object pointer is allocated.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3897&r2=1.3898
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Boolean.cpp?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Number.cpp?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/string.cpp?cvsroot=gnash&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/VM.cpp?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/VM.h?cvsroot=gnash&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3897
retrieving revision 1.3898
diff -u -b -r1.3897 -r1.3898
--- ChangeLog	1 Aug 2007 13:32:17 -0000	1.3897
+++ ChangeLog	1 Aug 2007 15:56:53 -0000	1.3898
@@ -1,5 +1,13 @@
 2007-08-01 Sandro Santilli <strk@keybit.net>
 
+	* server/asobj/: Boolean.cpp, Number.cpp, string.cpp:
+	  register static constructors and prototypes with the VM.
+	* server/vm/VM.{cpp,h}: Add support for registering
+	  arbitrary as_object for reachability. Intended to
+	  be used whenever a static as_object pointer is allocated.
+
+2007-08-01 Sandro Santilli <strk@keybit.net>
+
 	* gui/gnash.in: don't loose parameters layout. Fixes bug #20651.
 	* gui/Makefile.am: distribute gnash.in
 

Index: server/asobj/Boolean.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Boolean.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- server/asobj/Boolean.cpp	1 Jul 2007 10:54:26 -0000	1.15
+++ server/asobj/Boolean.cpp	1 Aug 2007 15:56:54 -0000	1.16
@@ -27,6 +27,7 @@
 #include "smart_ptr.h" // for boost intrusive_ptr
 #include "builtin_function.h" // need builtin_function
 #include "GnashException.h"
+#include "VM.h" // for registering static GcResources (constructor and prototype)
 
 namespace gnash {
 
@@ -48,6 +49,8 @@
 	if ( ! o )
 	{
 		o = new as_object();
+		VM::get().addStatic(o.get());
+
 		attachBooleanInterface(*o);
 	}
 	return o.get();
@@ -122,6 +125,8 @@
 	if ( cl == NULL )
 	{
 		cl=new builtin_function(&boolean_ctor, getBooleanInterface());
+		VM::get().addStatic(cl.get());
+
 		// replicate all interface to class, to be able to access
 		// all methods as static functions
 		attachBooleanInterface(*cl);

Index: server/asobj/Number.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Number.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- server/asobj/Number.cpp	1 Jul 2007 10:54:29 -0000	1.31
+++ server/asobj/Number.cpp	1 Aug 2007 15:56:54 -0000	1.32
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: Number.cpp,v 1.31 2007/07/01 10:54:29 bjacques Exp $ */
+/* $Id: Number.cpp,v 1.32 2007/08/01 15:56:54 strk Exp $ */
 
 #include "log.h"
 #include "tu_config.h"
@@ -27,6 +27,7 @@
 #include "as_object.h" // for inheritance
 #include "as_value.h" // for doubleToString
 #include "builtin_function.h" // need builtin_function
+#include "VM.h" // for registering static GcResources (constructor and prototype)
 
 #include <sstream>
 #include <cmath>
@@ -80,6 +81,8 @@
 	if ( o == NULL )
 	{
 		o = new as_object();
+		VM::get().addStatic(o.get());
+
 		attachNumberInterface(*o);
 	}
 	return o.get();
@@ -146,6 +149,8 @@
 	if ( cl == NULL )
 	{
 		cl=new builtin_function(&number_ctor, getNumberInterface());
+		VM::get().addStatic(cl.get());
+
 		// We don't want to attach Number prototype methods to the Number
 		// class itself.
 		//attachNumberInterface(*cl); 

Index: server/asobj/string.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/string.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- server/asobj/string.cpp	1 Jul 2007 10:54:32 -0000	1.33
+++ server/asobj/string.cpp	1 Aug 2007 15:56:54 -0000	1.34
@@ -16,7 +16,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: string.cpp,v 1.33 2007/07/01 10:54:32 bjacques Exp $ */
+/* $Id: string.cpp,v 1.34 2007/08/01 15:56:54 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -32,7 +32,7 @@
 #include "as_value.h"
 #include "GnashException.h"
 #include <boost/algorithm/string/case_conv.hpp>
-#include "VM.h"
+#include "VM.h" // for registering static GcResources (constructor and prototype)
 
 #define ENSURE_FN_ARGS(min, max, rv)                                    \
     if (fn.nargs < min) {                                               \
@@ -98,8 +98,11 @@
 {
     static boost::intrusive_ptr<as_object> o;
 
-    if ( o == NULL ) {
+    if ( o == NULL )
+    {
         o = new as_object();
+	VM::get().addStatic(o.get());
+
         attachStringInterface(*o);
     }
 
@@ -530,8 +533,11 @@
 
     static boost::intrusive_ptr<builtin_function> cl;
 
-    if ( cl == NULL ) {
+    if ( cl == NULL )
+    {
         cl=new builtin_function(&string_ctor, getStringInterface());
+	VM::get().addStatic(cl.get());
+
         // replicate all interface to class, to be able to access
         // all methods as static functions
         attachStringInterface(*cl);
@@ -549,11 +555,9 @@
 
     // Register _global.String
     global.init_member("String", cl.get());
-
 }
 
 boost::intrusive_ptr<as_object>
-
 init_string_instance(const char* val)
 {
     boost::intrusive_ptr<builtin_function> cl = getStringConstructor();

Index: server/vm/VM.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/VM.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/vm/VM.cpp	1 Jul 2007 10:54:37 -0000	1.11
+++ server/vm/VM.cpp	1 Aug 2007 15:56:54 -0000	1.12
@@ -16,7 +16,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: VM.cpp,v 1.11 2007/07/01 10:54:37 bjacques Exp $ */
+/* $Id: VM.cpp,v 1.12 2007/08/01 15:56:54 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -152,9 +152,18 @@
 VM::markReachableResources() const
 {
 #ifdef GNASH_USE_GC
+
 	_root_movie->markReachableResources();
+
 	_global->setReachable();
+
+	/// Mark all static GcResources
+	for (ResVect::const_iterator i=_statics.begin(), e=_statics.end(); i!=e; ++i)
+	{
+		(*i)->setReachable();
+	}
 #endif
+
 }
 
 void

Index: server/vm/VM.h
===================================================================
RCS file: /sources/gnash/gnash/server/vm/VM.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/vm/VM.h	1 Jul 2007 10:54:37 -0000	1.12
+++ server/vm/VM.h	1 Aug 2007 15:56:54 -0000	1.13
@@ -127,6 +127,13 @@
 	/// 
 	void setGlobal(as_object*);
 
+	/// A vector of static GcResources (tipically used for built-in class constructors)
+	//
+	/// The resources in this list will always be marked as reachable
+	///
+	typedef std::vector< boost::intrusive_ptr<GcResource> > ResVect;
+	ResVect _statics;
+
 public:
 
 	/// \brief
@@ -187,8 +194,19 @@
 	std::locale& getLocale() const;
 
 	/// Mark all reachable resources (for GC)
+	//
+	/// - root movie / stage (_root_movie)
+	/// - Global object (_global)
+	/// - registered static GcResources (_statics)
+	///
+	///
 	void markReachableResources() const;
 
+	void addStatic(GcResource* res)
+	{
+		_statics.push_back(res);
+	}
+
 };
 
 } // namespace gnash



From MAILER-DAEMON Wed Aug 01 12:02:02 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGGe9-0006ba-EZ
	for mharc-gnash-commit@gnu.org; Wed, 01 Aug 2007 12:02:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGGe6-0006bL-Hj
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 12:01:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGGe3-0006aM-8a
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 12:01:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGGe3-0006Zw-51
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 12:01:55 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1IGGe1-0000qz-Vo
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 12:01:54 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l71G1pU96892;
	Wed, 1 Aug 2007 18:01:51 +0200 (CEST) (envelope-from strk@keybit.net)
Date: Wed, 1 Aug 2007 18:01:51 +0200
From: Sandro Santilli <strk@keybit.net>
To: gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash ChangeLog server/asobj/Boolean.cpp server...
Message-ID: <20070801160151.GE94586@keybit.net>
Mail-Followup-To: gnash-commit@gnu.org
References: <E1IGGZC-00074B-Ls@cvs.savannah.gnu.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1IGGZC-00074B-Ls@cvs.savannah.gnu.org>
X-Detected-Kernel: FreeBSD 2.0-4.2
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Aug 2007 16:01:58 -0000

On Wed, Aug 01, 2007 at 03:56:54PM +0000, Sandro Santilli wrote:
> CVSROOT:	/sources/gnash
> Module name:	gnash
> Changes by:	Sandro Santilli <strk>	07/08/01 15:56:54
> 
> Modified files:
> 	.              : ChangeLog 
> 	server/asobj   : Boolean.cpp Number.cpp string.cpp 
> 	server/vm      : VM.cpp VM.h 
> 
> Log message:
> 	        * server/asobj/: Boolean.cpp, Number.cpp, string.cpp:
> 	          register static constructors and prototypes with the VM.
> 	        * server/vm/VM.{cpp,h}: Add support for registering
> 	          arbitrary as_object for reachability. Intended to
> 	          be used whenever a static as_object pointer is allocated.

This commit prepared a solution for the 'static GcResources' problem.

The problem is that all built-in classes use a static pointer for allocating
the constructors and it's prototype. These static pointers are not guaranteed
to be reachable during a run. For example, if a user override the global
String constructor, next GC run will free it, so the static pointer will
end up pointing to released memory.

This is generally fine as no action could try to use that object anymore.
But there are a few exception.

In the Number,Boolean and String object case, the exception is that
as_value::to_object() would try to construct a Boolean , String or Number
instance if the primitive value type is a boolean,string or number
respectively. This results in accessing the constructor and prototype
past the release of them.

Now, this patch registers the Boolean,Number and String static constructor
and prototype objects with the VM, in a generic vector of GcReousrces
to keep alive.

--strk;



From MAILER-DAEMON Wed Aug 01 12:47:11 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGHLr-0002Aw-CB
	for mharc-gnash-commit@gnu.org; Wed, 01 Aug 2007 12:47:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGHLp-0002Ar-9w
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 12:47:09 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGHLo-0002Af-Ew
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 12:47:08 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGHLo-0002Ac-CH
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 12:47:08 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1IGHLn-00046T-TF
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 12:47:08 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <udo.gnu@nova-sys.net>) id 1IGHLl-0005If-Ic
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 16:47:05 +0000
Received: from udog by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <udog@savannah.gnu.org>) id 1IGHLl-0005IE-19
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 16:47:05 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGHLl-0005IE-19@cvs.savannah.gnu.org>
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
Date: Wed, 01 Aug 2007 16:47:05 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog gui/gtk_glue_agg.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Aug 2007 16:47:09 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Udo Giacomozzi <udog>	07/08/01 16:47:04

Modified files:
	.              : ChangeLog 
	gui            : gtk_glue_agg.cpp 

Log message:
	gui/gtk_glue_agg.cpp: Support the OLPC again

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3898&r2=1.3899
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk_glue_agg.cpp?cvsroot=gnash&r1=1.25&r2=1.26

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.3898
retrieving revision 1.3899
diff -u -b -r1.3898 -r1.3899
--- ChangeLog	1 Aug 2007 15:56:53 -0000	1.3898
+++ ChangeLog	1 Aug 2007 16:47:04 -0000	1.3899
@@ -1,3 +1,7 @@
+2007-08-01 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* gui/gtk_glue_agg.cpp: Support the OLPC again
+
 2007-08-01 Sandro Santilli <strk@keybit.net>
 
 	* server/asobj/: Boolean.cpp, Number.cpp, string.cpp:

Index: gui/gtk_glue_agg.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/gui/gtk_glue_agg.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- gui/gtk_glue_agg.cpp	1 Aug 2007 13:16:40 -0000	1.25
+++ gui/gtk_glue_agg.cpp	1 Aug 2007 16:47:04 -0000	1.26
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: gtk_glue_agg.cpp,v 1.25 2007/08/01 13:16:40 udog Exp $ */
+/* $Id: gtk_glue_agg.cpp,v 1.26 2007/08/01 16:47:04 udog Exp $ */
 
 
 /// \page gtk_shm_support GTK shared memory extension support
@@ -238,17 +238,30 @@
 GtkAggGlue::detect_pixelformat() 
 {
 
-  // <UdoG>: Currently there is NO detection of the pixel format used by the 
-  // X server. I tried with gdk_visual_get_system() and gdk_visual_get_best() 
-  // but they return the /hardware/ pixel format, which is not what we want.
-  // Normally any X server will use RGB24, regardless of video hardware.
-  // Only the OLPC has a hacked(?) X server that expects RGB565 data.
-  // I dropped support for the OLPC to make GTK-AGG work for normal X servers.
-  // We need to find a detection method that works in both cases...  
+  // By definition, GTK/GDK *always* expects RGB24 data for 
+  // gdk_draw_rgb_image(). However, we want to support the OLPC which uses a 
+  // hacked GTK that works with RGB565 data.
+  
+#ifdef PIXELFORMAT_RGB24   // normal case 
   
   _bpp = 24;
   strcpy(_pixelformat, "RGB24");
   
+#else
+
+#ifdef PIXELFORMAT_RGB565  // OLPC
+
+  _bpp = 16;
+  strcpy(_pixelformat, "RGB565");
+  
+#else
+
+#error Missing a supported pixel format for GTK GUI. You probably want to configure --with-pixelformat=RGB24   
+
+#endif  //ifdef PIXELFORMAT_RGB565   
+ 
+#endif  //ifdef PIXELFORMAT_RGB24
+  
   return true;
   
 }



From MAILER-DAEMON Wed Aug 01 12:49:24 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGHO0-0003wa-Mb
	for mharc-gnash-commit@gnu.org; Wed, 01 Aug 2007 12:49:24 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGHNz-0003uV-Cm
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 12:49:23 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGHNy-0003tF-NX
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 12:49:22 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGHNy-0003tB-FJ
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 12:49:22 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IGHNy-0004ZY-B5
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 12:49:22 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IGHNx-0007dx-0G
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 16:49:21 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IGHNw-0007dh-Qw
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 16:49:20 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGHNw-0007dh-Qw@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 01 Aug 2007 16:49:20 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog backend/sound_handler.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Aug 2007 16:49:23 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/01 16:49:20

Modified files:
	.              : ChangeLog 
	backend        : sound_handler.h 

Log message:
	        * backend/sound_handler.h (create_sound): document ownership
	          of the 'data' argument, and add a TODO item about changing
	          the interface.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3899&r2=1.3900
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler.h?cvsroot=gnash&r1=1.21&r2=1.22

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3899
retrieving revision 1.3900
diff -u -b -r1.3899 -r1.3900
--- ChangeLog	1 Aug 2007 16:47:04 -0000	1.3899
+++ ChangeLog	1 Aug 2007 16:49:20 -0000	1.3900
@@ -1,3 +1,9 @@
+2007-08-01 Sandro Santilli <strk@keybit.net>
+
+	* backend/sound_handler.h (create_sound): document ownership
+	  of the 'data' argument, and add a TODO item about changing
+	  the interface.
+
 2007-08-01 Udo Giacomozzi <udo.gnu@nova-sys.net>
 
 	* gui/gtk_glue_agg.cpp: Support the OLPC again

Index: backend/sound_handler.h
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- backend/sound_handler.h	27 Jul 2007 15:16:43 -0000	1.21
+++ backend/sound_handler.h	1 Aug 2007 16:49:20 -0000	1.22
@@ -18,7 +18,7 @@
 // 
 //
 
-/* $Id: sound_handler.h,v 1.21 2007/07/27 15:16:43 strk Exp $ */
+/* $Id: sound_handler.h,v 1.22 2007/08/01 16:49:20 strk Exp $ */
 
 /// \page sound_handler_intro Sound handler introduction
 ///
@@ -89,6 +89,8 @@
 	//
 	/// @param data
 	/// The data to be stored. For soundstream this is NULL.
+	/// 	If not NULL, the data is currently *copied*
+	/// 	TODO: avoid the copy, if possible, getting ownership transferred instead
 	///
 	/// @param data_bytes
 	/// The size of the data to be stored. For soundstream this is 0.



From MAILER-DAEMON Wed Aug 01 12:53:53 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGHSL-0005hA-35
	for mharc-gnash-commit@gnu.org; Wed, 01 Aug 2007 12:53:53 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGHSI-0005fu-UD
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 12:53:50 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGHSI-0005eY-64
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 12:53:50 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGHSI-0005eL-2C
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 12:53:50 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IGHSH-0005ys-Kv
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 12:53:49 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IGHSG-00033G-II
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 16:53:48 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IGHSG-00033A-AY
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 16:53:48 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGHSG-00033A-AY@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 01 Aug 2007 16:53:48 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog backend/sound_handler.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Aug 2007 16:53:51 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/01 16:53:48

Modified files:
	.              : ChangeLog 
	backend        : sound_handler.h 

Log message:
	Also comment fill_stream_data

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3900&r2=1.3901
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler.h?cvsroot=gnash&r1=1.22&r2=1.23

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3900
retrieving revision 1.3901
diff -u -b -r1.3900 -r1.3901
--- ChangeLog	1 Aug 2007 16:49:20 -0000	1.3900
+++ ChangeLog	1 Aug 2007 16:53:47 -0000	1.3901
@@ -1,6 +1,6 @@
 2007-08-01 Sandro Santilli <strk@keybit.net>
 
-	* backend/sound_handler.h (create_sound): document ownership
+	* backend/sound_handler.h (create_sound, fill_stream_data): document ownership
 	  of the 'data' argument, and add a TODO item about changing
 	  the interface.
 

Index: backend/sound_handler.h
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- backend/sound_handler.h	1 Aug 2007 16:49:20 -0000	1.22
+++ backend/sound_handler.h	1 Aug 2007 16:53:47 -0000	1.23
@@ -18,7 +18,7 @@
 // 
 //
 
-/* $Id: sound_handler.h,v 1.22 2007/08/01 16:49:20 strk Exp $ */
+/* $Id: sound_handler.h,v 1.23 2007/08/01 16:53:47 strk Exp $ */
 
 /// \page sound_handler_intro Sound handler introduction
 ///
@@ -121,7 +121,8 @@
 	/// gnash's parser calls this to fill up soundstreams data
 	//
 	/// @param data
-	/// The sound data to be saved.
+	/// 	The sound data to be saved. Will be copied.
+	/// 	TODO: avoid the copy, if possible, getting ownership transferred instead
 	///
 	/// @param data_bytes
 	/// Size of the data in bytes



From MAILER-DAEMON Wed Aug 01 14:57:08 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGJNc-0007z6-5X
	for mharc-gnash-commit@gnu.org; Wed, 01 Aug 2007 14:57:08 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGJNa-0007yp-CZ
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 14:57:06 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGJNZ-0007yc-EN
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 14:57:05 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGJNZ-0007yZ-89
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 14:57:05 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IGJNY-0003vx-UE
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 14:57:05 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IGJNX-0006GF-L4
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 18:57:03 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IGJNX-0006G7-Gt
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 18:57:03 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGJNX-0006G7-Gt@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 01 Aug 2007 18:57:03 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/swf/tag_loaders.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Aug 2007 18:57:07 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/01 18:57:03

Modified files:
	.              : ChangeLog 
	server/swf     : tag_loaders.cpp 

Log message:
	        * server/swf/tag_loaders.cpp: (define_sound_loader) check if number of
	          samples exceed available bytes in the tag. (sound_expand) assertion
	          checking. (u8_expand) use a scoped_array in the easy case (we'll
	          need more smart pointers in general).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3901&r2=1.3902
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.117&r2=1.118

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3901
retrieving revision 1.3902
diff -u -b -r1.3901 -r1.3902
--- ChangeLog	1 Aug 2007 16:53:47 -0000	1.3901
+++ ChangeLog	1 Aug 2007 18:57:02 -0000	1.3902
@@ -1,5 +1,9 @@
 2007-08-01 Sandro Santilli <strk@keybit.net>
 
+	* server/swf/tag_loaders.cpp: (define_sound_loader) check if number of
+	  samples exceed available bytes in the tag. (sound_expand) assertion
+	  checking. (u8_expand) use a scoped_array in the easy case (we'll
+	  need more smart pointers in general).
 	* backend/sound_handler.h (create_sound, fill_stream_data): document ownership
 	  of the 'data' argument, and add a TODO item about changing
 	  the interface.

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -b -r1.117 -r1.118
--- server/swf/tag_loaders.cpp	27 Jul 2007 15:09:42 -0000	1.117
+++ server/swf/tag_loaders.cpp	1 Aug 2007 18:57:03 -0000	1.118
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: tag_loaders.cpp,v 1.117 2007/07/27 15:09:42 tgc Exp $ */
+/* $Id: tag_loaders.cpp,v 1.118 2007/08/01 18:57:03 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1086,6 +1086,15 @@
 
 	    data_bytes = in->get_tag_end_position() - in->get_position();
 
+	    if ( sample_count > data_bytes )
+	    {
+		IF_VERBOSE_MALFORMED_SWF(
+		    log_swferror(_("Samples count (%u) exceed the number of bytes available in the DefineSound tag containing it (%u)"),
+			sample_count, data_bytes);
+		);
+		return;
+	    }
+
 	    // sound_expand allocates storage for data[].
 	    // and modifies 3 parameters: format, data and data_bytes.
 	    sound_expand(in, format, sample_16bit, stereo, sample_count, data, data_bytes);
@@ -1305,6 +1314,8 @@
 	bool sample_16bit, bool stereo, unsigned int &sample_count,
 	unsigned char* &data, unsigned &data_bytes)
 {
+    assert(data_bytes < sample_count);
+
     // Make sure that an unassigned pointer cannot get through
     data = NULL;
 
@@ -1547,21 +1558,20 @@
 	bool stereo)
 {
 	unsigned total_samples = stereo ? sample_count*2 : sample_count;
-	uint8_t *in_data = new uint8_t[total_samples];
+
+	boost::scoped_array<uint8_t> in_data ( new uint8_t[total_samples] );
 	int16_t	*out_data = new int16_t[total_samples];
 
-	in->read((char *)in_data, total_samples); // Read 8-bit samples
+	in->read((char *)in_data.get(), total_samples); // Read 8-bit samples
 
 	// Convert 8-bit to 16
-	uint8_t *inp = in_data;
+	uint8_t *inp = in_data.get();
 	int16_t *outp = out_data;
 	for (unsigned i=total_samples; i>0; i--) {
 		*outp++ = ((int16_t)(*inp++) - 128) * 256;
 	}
 	
 	data = (unsigned char *)out_data;
-
-	delete [] in_data;
 }
 
 //



From MAILER-DAEMON Wed Aug 01 16:28:06 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGKne-0006Mb-NI
	for mharc-gnash-commit@gnu.org; Wed, 01 Aug 2007 16:28:06 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGKnc-0006KT-5v
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 16:28:04 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGKna-0006IO-VC
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 16:28:03 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGKna-0006II-Tg
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 16:28:02 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IGKna-0003PS-Mh
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 16:28:02 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IGKnZ-0002yb-91
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 20:28:01 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IGKnY-0002y6-Ua
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 20:28:01 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGKnY-0002y6-Ua@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 01 Aug 2007 20:28:00 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/stream.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Aug 2007 20:28:04 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/01 20:28:00

Modified files:
	.              : ChangeLog 
	server         : stream.h 

Log message:
	        * server/stream.h: add ensureBytes() method to verify
	          SWF integrity.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3902&r2=1.3903
http://cvs.savannah.gnu.org/viewcvs/gnash/server/stream.h?cvsroot=gnash&r1=1.20&r2=1.21

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3902
retrieving revision 1.3903
diff -u -b -r1.3902 -r1.3903
--- ChangeLog	1 Aug 2007 18:57:02 -0000	1.3902
+++ ChangeLog	1 Aug 2007 20:28:00 -0000	1.3903
@@ -1,5 +1,10 @@
 2007-08-01 Sandro Santilli <strk@keybit.net>
 
+	* server/stream.h: add ensureBytes() method to verify
+	  SWF integrity.
+
+2007-08-01 Sandro Santilli <strk@keybit.net>
+
 	* server/swf/tag_loaders.cpp: (define_sound_loader) check if number of
 	  samples exceed available bytes in the tag. (sound_expand) assertion
 	  checking. (u8_expand) use a scoped_array in the easy case (we'll

Index: server/stream.h
===================================================================
RCS file: /sources/gnash/gnash/server/stream.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/stream.h	15 May 2007 13:48:37 -0000	1.20
+++ server/stream.h	1 Aug 2007 20:28:00 -0000	1.21
@@ -12,6 +12,8 @@
 #include "container.h"
 #include "swf.h"
 #include "tu_config.h"
+#include "GnashException.h"
+
 #include <string>
 
 class tu_file;
@@ -155,6 +157,22 @@
 			set_position(get_tag_end_position());
 		}
 
+		/// \brief
+		/// Ensure the requested number of bytes are available in the
+		/// currently opened tag.
+		//
+		/// Throws an exception on a short count.
+		/// This method should be called before any attempt to read
+		/// fields from the SWF.
+		///
+		void ensureBytes(unsigned long needed)
+		{
+			if ( get_tag_end_position() - get_position() < needed )
+			{
+				throw ParserException("premature end of tag");
+			}
+		}
+
 	private:
 		// should this be long ?
 		unsigned _current_tag_length;



From MAILER-DAEMON Wed Aug 01 17:03:18 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGLLh-0002Ak-V5
	for mharc-gnash-commit@gnu.org; Wed, 01 Aug 2007 17:03:17 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGLLg-000291-1B
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 17:03:16 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGLLf-00027x-CB
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 17:03:15 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGLLf-00027X-2A
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 17:03:15 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IGLLe-0000c9-HG
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 17:03:14 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IGLLd-0007UF-B1
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 21:03:13 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IGLLd-0007Tw-1O
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 21:03:13 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGLLd-0007Tw-1O@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 01 Aug 2007 21:03:13 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/swf/tag_loaders.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Aug 2007 21:03:16 -0000

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

Modified files:
	.              : ChangeLog 
	server/swf     : tag_loaders.cpp 

Log message:
	        * server/swf/tag_loaders.cpp (sound_expand): fix assertion
	          checking; added some uses of the new stream::ensureBytes() method;
	          add more scoped_array uses.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3903&r2=1.3904
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.118&r2=1.119

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3903
retrieving revision 1.3904
diff -u -b -r1.3903 -r1.3904
--- ChangeLog	1 Aug 2007 20:28:00 -0000	1.3903
+++ ChangeLog	1 Aug 2007 21:03:12 -0000	1.3904
@@ -1,5 +1,11 @@
 2007-08-01 Sandro Santilli <strk@keybit.net>
 
+	* server/swf/tag_loaders.cpp (sound_expand): fix assertion
+	  checking; added some uses of the new stream::ensureBytes() method;
+	  add more scoped_array uses.
+
+2007-08-01 Sandro Santilli <strk@keybit.net>
+
 	* server/stream.h: add ensureBytes() method to verify
 	  SWF integrity.
 

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -b -r1.118 -r1.119
--- server/swf/tag_loaders.cpp	1 Aug 2007 18:57:03 -0000	1.118
+++ server/swf/tag_loaders.cpp	1 Aug 2007 21:03:12 -0000	1.119
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: tag_loaders.cpp,v 1.118 2007/08/01 18:57:03 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.119 2007/08/01 21:03:12 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -413,6 +413,8 @@
     // tags 20 || 36
     assert(tag == SWF::DEFINELOSSLESS || tag == SWF::DEFINELOSSLESS2);
 
+    in->ensureBytes(16+16+16+8); // the initial header 
+
     uint16_t	character_id = in->read_u16();
     uint8_t	bitmap_format = in->read_u8();	// 3 == 8 bit, 4 == 16 bit, 5 == 32 bit
     uint16_t	width = in->read_u16();
@@ -425,6 +427,8 @@
 		  tag, character_id, bitmap_format, width, height);
     );
 
+    // TODO: there's a lot of duplicated code in this function, we should clean it up
+
     //bitmap_info*	bi = NULL;
     if (m->get_create_bitmaps() == DO_LOAD_BITMAPS)
     {
@@ -434,6 +438,7 @@
 #else
 	if (tag == SWF::DEFINELOSSLESS) // 20
 	{
+
 	    // RGB image data.
 	    std::auto_ptr<image::rgb> image ( image::create_rgb(width, height) );
 
@@ -442,22 +447,24 @@
 		// 8-bit data, preceded by a palette.
 
 		const int bytes_per_pixel = 1;
+
+    		in->ensureBytes(1); // color table size
 		int color_table_size = in->read_u8();
 		color_table_size++;	// !! SWF stores one less than the actual size
 
 		int pitch = (width * bytes_per_pixel + 3) & ~3;
 
 		int buffer_bytes = color_table_size * 3 + pitch * height;
-		uint8_t* buffer = new uint8_t[buffer_bytes];
+		boost::scoped_array<uint8_t> buffer ( new uint8_t[buffer_bytes] );
 
-		inflate_wrapper(in->get_underlying_stream(), buffer, buffer_bytes);
+		inflate_wrapper(in->get_underlying_stream(), buffer.get(), buffer_bytes);
 		assert(in->get_position() <= in->get_tag_end_position());
 
-		uint8_t* color_table = buffer;
+		uint8_t* color_table = buffer.get();
 
 		for (int j = 0; j < height; j++)
 		{
-		    uint8_t*	image_in_row = buffer + color_table_size * 3 + j * pitch;
+		    uint8_t*	image_in_row = buffer.get() + color_table_size * 3 + j * pitch;
 		    uint8_t*	image_out_row = image::scanline(image.get(), j);
 		    for (int i = 0; i < width; i++)
 		    {
@@ -468,7 +475,6 @@
 		    }
 		}
 
-		delete [] buffer;
 	    }
 	    else if (bitmap_format == 4)
 	    {
@@ -477,14 +483,14 @@
 		int pitch = (width * bytes_per_pixel + 3) & ~3;
 
 		int buffer_bytes = pitch * height;
-		uint8_t* buffer = new uint8_t[buffer_bytes];
+		boost::scoped_array<uint8_t> buffer ( new uint8_t[buffer_bytes] );
 
-		inflate_wrapper(in->get_underlying_stream(), buffer, buffer_bytes);
+		inflate_wrapper(in->get_underlying_stream(), buffer.get(), buffer_bytes);
 		assert(in->get_position() <= in->get_tag_end_position());
 
 		for (int j = 0; j < height; j++)
 		{
-		    uint8_t*	image_in_row = buffer + j * pitch;
+		    uint8_t*	image_in_row = buffer.get() + j * pitch;
 		    uint8_t*	image_out_row = image::scanline(image.get(), j);
 		    for (int i = 0; i < width; i++)
 		    {
@@ -497,7 +503,6 @@
 		    }
 		}
 
-		delete [] buffer;
 	    }
 	    else if (bitmap_format == 5)
 	    {
@@ -506,15 +511,15 @@
 		int pitch = width * bytes_per_pixel;
 
 		int buffer_bytes = pitch * height;
-		uint8_t* buffer = new uint8_t[buffer_bytes];
+		boost::scoped_array<uint8_t> buffer ( new uint8_t[buffer_bytes] );
 
-		inflate_wrapper(in->get_underlying_stream(), buffer, buffer_bytes);
+		inflate_wrapper(in->get_underlying_stream(), buffer.get(), buffer_bytes);
 		assert(in->get_position() <= in->get_tag_end_position());
 
 		// Need to re-arrange ARGB into RGB.
 		for (int j = 0; j < height; j++)
 		{
-		    uint8_t*	image_in_row = buffer + j * pitch;
+		    uint8_t*	image_in_row = buffer.get() + j * pitch;
 		    uint8_t*	image_out_row = image::scanline(image.get(), j);
 		    for (int i = 0; i < width; i++)
 		    {
@@ -529,7 +534,6 @@
 		    }
 		}
 
-		delete [] buffer;
 	    }
 
 	    if ( m->get_bitmap_character_def(character_id) )
@@ -558,22 +562,23 @@
 		// 8-bit data, preceded by a palette.
 
 		const int bytes_per_pixel = 1;
+    		in->ensureBytes(1); // color table size
 		int color_table_size = in->read_u8();
 		color_table_size++;	// !! SWF stores one less than the actual size
 
 		int pitch = (width * bytes_per_pixel + 3) & ~3;
 
 		int buffer_bytes = color_table_size * 4 + pitch * height;
-		uint8_t* buffer = new uint8_t[buffer_bytes];
+		boost::scoped_array<uint8_t> buffer ( new uint8_t[buffer_bytes] );
 
-		inflate_wrapper(in->get_underlying_stream(), buffer, buffer_bytes);
+		inflate_wrapper(in->get_underlying_stream(), buffer.get(), buffer_bytes);
 		assert(in->get_position() <= in->get_tag_end_position());
 
-		uint8_t* color_table = buffer;
+		uint8_t* color_table = buffer.get();
 
 		for (int j = 0; j < height; j++)
 		{
-		    uint8_t*	image_in_row = buffer + color_table_size * 4 + j * pitch;
+		    uint8_t*	image_in_row = buffer.get() + color_table_size * 4 + j * pitch;
 		    uint8_t*	image_out_row = image::scanline(image.get(), j);
 		    for (int i = 0; i < width; i++)
 		    {
@@ -585,7 +590,6 @@
 		    }
 		}
 
-	        delete [] buffer;
 	    }
 	    else if (bitmap_format == 4)
 	    {
@@ -594,14 +598,14 @@
 		int pitch = (width * bytes_per_pixel + 3) & ~3;
 
 		int buffer_bytes = pitch * height;
-		uint8_t* buffer = new uint8_t[buffer_bytes];
+		boost::scoped_array<uint8_t> buffer ( new uint8_t[buffer_bytes] );
 
-		inflate_wrapper(in->get_underlying_stream(), buffer, buffer_bytes);
+		inflate_wrapper(in->get_underlying_stream(), buffer.get(), buffer_bytes);
 		assert(in->get_position() <= in->get_tag_end_position());
 
 		for (int j = 0; j < height; j++)
 		{
-		    uint8_t*	image_in_row = buffer + j * pitch;
+		    uint8_t*	image_in_row = buffer.get() + j * pitch;
 		    uint8_t*	image_out_row = image::scanline(image.get(), j);
 		    for (int i = 0; i < width; i++)
 		    {
@@ -615,7 +619,6 @@
 		    }
 		}
 
-		delete [] buffer;
 	    }
 	    else if (bitmap_format == 5)
 	    {
@@ -643,7 +646,6 @@
 	    }
 
 	    bitmap_character_def* ch = new bitmap_character_def(image);
-//	    delete image;
 
 	    // add image to movie, under character id.
 	    m->add_bitmap_character_def(character_id, ch);
@@ -1314,7 +1316,7 @@
 	bool sample_16bit, bool stereo, unsigned int &sample_count,
 	unsigned char* &data, unsigned &data_bytes)
 {
-    assert(data_bytes < sample_count);
+    assert(sample_count < data_bytes);
 
     // Make sure that an unassigned pointer cannot get through
     data = NULL;



From MAILER-DAEMON Wed Aug 01 17:32:03 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGLnX-0000Eh-C6
	for mharc-gnash-commit@gnu.org; Wed, 01 Aug 2007 17:32:03 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGLnV-0000Cj-PF
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 17:32:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGLnU-0000CX-2i
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 17:32:00 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGLnT-0000CI-U0
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 17:31:59 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IGLnT-00069q-Iz
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 17:31:59 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IGLnS-0006Dr-E9
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 21:31:58 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IGLnS-0006Db-4e
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 21:31:58 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGLnS-0006Db-4e@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 01 Aug 2007 21:31:58 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/swf/tag_loaders.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Aug 2007 21:32:01 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/01 21:31:58

Modified files:
	.              : ChangeLog 
	server/swf     : tag_loaders.cpp 

Log message:
	        * server/swf/tag_loaders.cpp: completely remove the bogus assertion
	          about the required input bytes in relation to the number of samples.
	          Rather, add more ensureBytes() uses, closer to where the data is
	          actually read from the stream.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3904&r2=1.3905
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.119&r2=1.120

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3904
retrieving revision 1.3905
diff -u -b -r1.3904 -r1.3905
--- ChangeLog	1 Aug 2007 21:03:12 -0000	1.3904
+++ ChangeLog	1 Aug 2007 21:31:57 -0000	1.3905
@@ -1,5 +1,12 @@
 2007-08-01 Sandro Santilli <strk@keybit.net>
 
+	* server/swf/tag_loaders.cpp: completely remove the bogus assertion
+	  about the required input bytes in relation to the number of samples.
+	  Rather, add more ensureBytes() uses, closer to where the data is
+	  actually read from the stream.
+
+2007-08-01 Sandro Santilli <strk@keybit.net>
+
 	* server/swf/tag_loaders.cpp (sound_expand): fix assertion
 	  checking; added some uses of the new stream::ensureBytes() method;
 	  add more scoped_array uses.

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -b -r1.119 -r1.120
--- server/swf/tag_loaders.cpp	1 Aug 2007 21:03:12 -0000	1.119
+++ server/swf/tag_loaders.cpp	1 Aug 2007 21:31:57 -0000	1.120
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: tag_loaders.cpp,v 1.119 2007/08/01 21:03:12 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.120 2007/08/01 21:31:57 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1054,12 +1054,15 @@
 
 	sound_handler* handler = get_sound_handler();
 
+	in->ensureBytes(2+1+4); // character id + flags + sample count
+
 	uint16_t	character_id = in->read_u16();
 
 	sound_handler::format_type	format = (sound_handler::format_type) in->read_uint(4);
 	int	sample_rate = in->read_uint(2);	// multiples of 5512.5
 	bool	sample_16bit = in->read_uint(1) ? true : false;
 	bool	stereo = in->read_uint(1) ? true : false;
+
 	unsigned int	sample_count = in->read_u32();
 
 	IF_VERBOSE_PARSE
@@ -1086,17 +1089,6 @@
     	    unsigned data_bytes; // First it is the amount of data from file,
 			// then the amount allocated at *data (it may grow)
 
-	    data_bytes = in->get_tag_end_position() - in->get_position();
-
-	    if ( sample_count > data_bytes )
-	    {
-		IF_VERBOSE_MALFORMED_SWF(
-		    log_swferror(_("Samples count (%u) exceed the number of bytes available in the DefineSound tag containing it (%u)"),
-			sample_count, data_bytes);
-		);
-		return;
-	    }
-
 	    // sound_expand allocates storage for data[].
 	    // and modifies 3 parameters: format, data and data_bytes.
 	    sound_expand(in, format, sample_16bit, stereo, sample_count, data, data_bytes);
@@ -1316,7 +1308,6 @@
 	bool sample_16bit, bool stereo, unsigned int &sample_count,
 	unsigned char* &data, unsigned &data_bytes)
 {
-    assert(sample_count < data_bytes);
 
     // Make sure that an unassigned pointer cannot get through
     data = NULL;
@@ -1337,6 +1328,7 @@
 	// Convert to 16-bit host-endian
 	if (sample_16bit) {
 	    // FORMAT_RAW 16-bit is exactly what we want!
+	    in->ensureBytes(data_bytes); 
 	    data = new unsigned char[data_bytes];
 	    in->read((char *)data, data_bytes);
 	} else {
@@ -1362,6 +1354,7 @@
 
 	} else {
 	    // Read 16-bit data into buffer
+	    in->ensureBytes(data_bytes); 
 	    data = new unsigned char[data_bytes];
 	    in->read((char *)data, data_bytes);
 
@@ -1399,6 +1392,7 @@
 
     case sound_handler::FORMAT_MP3:
 	// Decompressed elsewhere
+	in->ensureBytes(data_bytes); 
 	data = new unsigned char[data_bytes];
 	in->read((char *)data, data_bytes);
 	break;
@@ -1406,6 +1400,7 @@
     case sound_handler::FORMAT_NELLYMOSER_8HZ_MONO:
     case sound_handler::FORMAT_NELLYMOSER:
 	// One day...
+	in->ensureBytes(data_bytes); 
 	in->skip_bytes(data_bytes);
 	data = NULL;
 	break;
@@ -1561,6 +1556,8 @@
 {
 	unsigned total_samples = stereo ? sample_count*2 : sample_count;
 
+	in->ensureBytes(total_samples); 
+
 	boost::scoped_array<uint8_t> in_data ( new uint8_t[total_samples] );
 	int16_t	*out_data = new int16_t[total_samples];
 
@@ -1728,11 +1725,17 @@
 	data = reinterpret_cast<unsigned char *>(out_data);
 
 	// Read header.
+	in->ensureBytes(2);   // header size
 	int	n_bits = in->read_uint(2) + 2;	// 2 to 5 bits
 
+	// 4 is the fixed header for each sample ( 16bit sample id, 6bit stepsize_index )
+	// nbits is the number of bits for each sample
+	in->ensureBytes( sample_count * ( 3 + ceil(n_bits/8) ) );
+
 	while (sample_count)
 	{
 		// Read initial sample & index values.
+
 		int	sample = in->read_sint(16);
 
 		int	stepsize_index = in->read_uint(6);



From MAILER-DAEMON Wed Aug 01 17:37:02 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGLsM-0002Mm-6B
	for mharc-gnash-commit@gnu.org; Wed, 01 Aug 2007 17:37:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGLsK-0002Lv-4Q
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 17:37:00 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGLsJ-0002Lg-No
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 17:36:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGLsJ-0002Ld-Hj
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 17:36:59 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IGLsJ-0006rV-61
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 17:36:59 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IGLsI-0001j8-Jh
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 21:36:58 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IGLsI-0001iw-E9
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 21:36:58 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGLsI-0001iw-E9@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 01 Aug 2007 21:36:58 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/swf/tag_loaders.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Aug 2007 21:37:00 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/01 21:36:58

Modified files:
	.              : ChangeLog 
	server/swf     : tag_loaders.cpp 

Log message:
	        * server/swf/tag_loaders.cpp (define_sound_loader): fix a bug
	          introduced by last commit (sorry)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3905&r2=1.3906
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.120&r2=1.121

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3905
retrieving revision 1.3906
diff -u -b -r1.3905 -r1.3906
--- ChangeLog	1 Aug 2007 21:31:57 -0000	1.3905
+++ ChangeLog	1 Aug 2007 21:36:57 -0000	1.3906
@@ -1,5 +1,10 @@
 2007-08-01 Sandro Santilli <strk@keybit.net>
 
+	* server/swf/tag_loaders.cpp (define_sound_loader): fix a bug
+	  introduced by last commit (sorry)
+
+2007-08-01 Sandro Santilli <strk@keybit.net>
+
 	* server/swf/tag_loaders.cpp: completely remove the bogus assertion
 	  about the required input bytes in relation to the number of samples.
 	  Rather, add more ensureBytes() uses, closer to where the data is

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -b -r1.120 -r1.121
--- server/swf/tag_loaders.cpp	1 Aug 2007 21:31:57 -0000	1.120
+++ server/swf/tag_loaders.cpp	1 Aug 2007 21:36:58 -0000	1.121
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: tag_loaders.cpp,v 1.120 2007/08/01 21:31:57 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.121 2007/08/01 21:36:58 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1086,8 +1086,10 @@
 	    }
 
 	    unsigned char *data; // Expanded audio data ready for playing
-    	    unsigned data_bytes; // First it is the amount of data from file,
+
+	    // First it is the amount of data from file,
 			// then the amount allocated at *data (it may grow)
+            unsigned data_bytes = in->get_tag_end_position() - in->get_position();
 
 	    // sound_expand allocates storage for data[].
 	    // and modifies 3 parameters: format, data and data_bytes.



From MAILER-DAEMON Wed Aug 01 23:48:37 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGRfx-0007CG-Bn
	for mharc-gnash-commit@gnu.org; Wed, 01 Aug 2007 23:48:37 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGRfv-0007C8-U4
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 23:48:35 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGRft-0007Bv-UM
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 23:48:35 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGRft-0007Bs-PP
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 23:48:33 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IGRft-0008Pb-En
	for gnash-commit@gnu.org; Wed, 01 Aug 2007 23:48:33 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IGRfs-0004jk-Rh
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 03:48:32 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IGRfs-0004jh-Mw
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 03:48:32 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGRfs-0004jh-Mw@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Thu, 02 Aug 2007 03:48:32 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/ops.as
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Aug 2007 03:48:36 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/02 03:48:32

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: ops.as 

Log message:
	* testsuite/actionscript.all/ops.as: more tests and more failures.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3906&r2=1.3907
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/ops.as?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3906
retrieving revision 1.3907
diff -u -b -r1.3906 -r1.3907
--- ChangeLog	1 Aug 2007 21:36:57 -0000	1.3906
+++ ChangeLog	2 Aug 2007 03:48:32 -0000	1.3907
@@ -1,3 +1,8 @@
+2007-08-02 Zou Lunkai <zoulunkai@gmail.com>
+	
+	* testsuite/actionscript.all/ops.as: more tests and more failures. still
+	  need more, we don't want fail on those basic logical operations.
+	  
 2007-08-01 Sandro Santilli <strk@keybit.net>
 
 	* server/swf/tag_loaders.cpp (define_sound_loader): fix a bug

Index: testsuite/actionscript.all/ops.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/ops.as,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/actionscript.all/ops.as	31 Jul 2007 15:30:29 -0000	1.1
+++ testsuite/actionscript.all/ops.as	2 Aug 2007 03:48:32 -0000	1.2
@@ -20,7 +20,7 @@
  *  Test binary predicates (equal, less_then, greater_then, logical and bitwise ops)
  */
 
-rcsid="$Id: ops.as,v 1.1 2007/07/31 15:30:29 strk Exp $";
+rcsid="$Id: ops.as,v 1.2 2007/08/02 03:48:32 zoulunkai Exp $";
 
 #include "check.as"
 
@@ -71,30 +71,229 @@
 // Less then operator (ACTION_LESSTHAN : 0x0F)
 //---------------------------------------------
 
-// TODO ... 
+x = 0.999;
+y = 1.0;
+check(x<y);
+
+x=String("0.999");
+y=String("1.0");
+xcheck(x<y);
+
+x=String("A");
+y=String("a");
+xcheck(x<y);
+
+x=String("abc");
+y=String("abcd");
+xcheck(x<y);
+
+x=0.999;
+y=String("1.000");
+xcheck(x<y);
+
+x=String("0.999");
+y=1.0;
+xcheck(x<y);
 
 //------------------------------------------------
 // Logical AND operator (ACTION_LOGICALAND : 0x10)
 //------------------------------------------------
-
-// TODO ... 
+x = true;
+y = true;
+z = x && y;
+check_equals(z, y);
+
+x = true;
+y = false;
+z = x && y;
+check_equals(z, y);
+
+x = true;
+y = 0;
+z=x && y;
+check_equals(z, y);
+
+x = true;
+y = 1;
+z=x && y;
+check_equals(z, y);
+
+x = true;
+y = String("1.999");
+z=x && y;
+check_equals(z, x); 
+
+x=String("1.999");
+y=true;
+z=x && y;
+check_equals(z, y);
+
+x=String("adcd");
+y=true;
+z=x && y;
+#if OUTPUT_VERSION < 7
+	xcheck_equals(z, false);
+#else
+	check_equals(z, true);
+#endif 
+
+x=true;
+y=String("adcd");
+z=x && y;
+#if OUTPUT_VERSION < 7
+	xcheck_equals(z, false);
+#else
+	check_equals(z, true);
+#endif
+
+x=0;
+y=true;
+z=x && y;
+check_equals(z, x);
+
+x=1;
+y=false;
+z=x && y;
+check_equals(z, y);
+
+x = new Number(9);
+y=false;
+z=x && y;
+check_equals(z, y);
+
+x = new Object();
+y = false;
+check_equals(z, y);
+
+x=String("adcd");
+y=false;
+z=x && y;
+check_equals(z, y); 
 
 //------------------------------------------------
 // Logical OR operator (ACTION_LOGICALOR : 0x11)
 //------------------------------------------------
 
-// TODO ... 
+x = 0;
+y = 0;
+z = x || y;
+check_equals(z, y); 
+
+x = 0;
+y = 1;
+z = x || y;
+check_equals(z, y); 
+
+x = 0;
+y = 0.0001;
+z = x || y;
+xcheck(z!=y); 
+check_equals(z, true); 
+
+x = 0;
+y = "abcd";
+z = x || y;
+#if OUTPUT_VERSION == 4
+	check_equals(z, 1); 
+#elseif < 7
+	check_equals(z, false); 
+#esle
+	check_equals(z, true);
+#endif
+
+x = 0;
+y = String("abcd");
+z = x || y;
+#if OUTPUT_VERSION < 7
+	xcheck_equals(z, false); 
+#else
+	check_equals(z, true);
+#endif
+
+x = 0;
+y = new String("abcd");
+z = x || y;
+check_equals(z, true);
+
+x = 0;
+y = Object();
+z = x || y;
+check_equals(z, true);
+
+x = 0;
+y = new Object();
+z = x || y;
+check_equals(z, true);
+
+x = 0;
+y = "0";
+z = x || y;
+#if OUTPUT_VERSION < 7
+	check_equals(z, false);
+#else
+	check_equals(z, true);
+#endif
+
+x = 0;
+y = String("0");
+z = x || y;
+#if OUTPUT_VERSION < 7
+	xcheck_equals(z, false);
+#else
+	check_equals(z, true);
+#endif
+
+x = 0;
+y = new String("0");
+z = x || y;
+xcheck(z!=y);
+check_equals(z, true);
 
-//------------------------------------------------
-// Logical OR operator (ACTION_LOGICALOR : 0x11)
-//------------------------------------------------
-
-// TODO ... 
 
 //------------------------------------------------
 // Bitwise AND operator (ACTION_BITWISEAND : 0x60)
 //------------------------------------------------
 
+x=1;
+y=1;
+check_equals(x&y, 1); 
+
+x=1;
+y=2;
+check_equals(x&y, 0); 
+
+x = 1.0;
+y = 3.0;
+check_equals(x&y, 1); 
+
+x = 1.9999;
+y = 3.0;
+check_equals(x&y, 1); 
+
+x = 1.9999;
+y = 3.9999;
+check_equals(x&y, 1); 
+
+x = new String("1");
+y = new String("3");
+check_equals(x&y, 1); 
+
+x = new String("1.0");
+y = new String("3.0");
+check_equals(x&y, 1); 
+
+x = new String("1.999");
+y = new String("3.999");
+check_equals(x&y, 1); 
+
+x = new String("3.999");
+y = 7;
+check_equals(x&y, 3); 
+
+x = Number("7.999");
+y = 3;
+check_equals(x&y, 3);
+
 check_equals( (undefined&1), 0 );
 check_equals( (1&undefined), 0 );
 check_equals( (1&null), 0 );
@@ -107,6 +306,30 @@
 // Bitwise OR operator (ACTION_BITWISEOR : 0x61)
 //------------------------------------------------
 
+x = 1;
+y = 8;
+check_equals(x|y, 9); 
+
+x = 1.1;
+y = 8.1;
+check_equals(x|y, 9); 
+
+x = 1.999;
+y = 8.999;
+check_equals(x|y, 9); 
+
+x = new String("1.999");
+y = 8.999;
+check_equals(x|y, 9); 
+
+x = String("1.999");
+y = String("8.999");
+check_equals(x|y, 9); 
+
+x = 9;
+y = String("1.5");
+check_equals(x|y, 9); 
+
 check_equals( (undefined|1), 1 );
 check_equals( (1|undefined), 1 );
 check_equals( (undefined|undefined), 0 );



From MAILER-DAEMON Thu Aug 02 00:57:26 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGSkY-0002yf-0i
	for mharc-gnash-commit@gnu.org; Thu, 02 Aug 2007 00:57:26 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGSkU-0002xs-Hk
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 00:57:22 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGSkS-0002xg-K6
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 00:57:21 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGSkS-0002xd-GP
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 00:57:20 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IGSkS-0002Eg-4i
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 00:57:20 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IGSkR-0002Iu-JM
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 04:57:19 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IGSkR-0002Ir-7r
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 04:57:19 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGSkR-0002Ir-7r@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 02 Aug 2007 04:57:19 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/movie_root.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Aug 2007 04:57:22 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/02 04:57:19

Modified files:
	.              : ChangeLog 
	server         : movie_root.cpp 

Log message:
	        * server/movie_root.cpp: set background to white by default.
	          Should fix bug #20655.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3907&r2=1.3908
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.79&r2=1.80

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3907
retrieving revision 1.3908
diff -u -b -r1.3907 -r1.3908
--- ChangeLog	2 Aug 2007 03:48:32 -0000	1.3907
+++ ChangeLog	2 Aug 2007 04:57:18 -0000	1.3908
@@ -1,3 +1,8 @@
+2007-08-02 Sandro Santilli <strk@keybit.net>
+
+	* server/movie_root.cpp: set background to white by default.
+	  Should fix bug #20655.
+
 2007-08-02 Zou Lunkai <zoulunkai@gmail.com>
 	
 	* testsuite/actionscript.all/ops.as: more tests and more failures. still

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- server/movie_root.cpp	24 Jul 2007 14:44:12 -0000	1.79
+++ server/movie_root.cpp	2 Aug 2007 04:57:19 -0000	1.80
@@ -64,7 +64,7 @@
 	m_viewport_width(1),
 	m_viewport_height(1),
 	m_pixel_scale(1.0f),
-	m_background_color(0, 0, 0, 255),
+	m_background_color(255, 255, 255, 255),
 	m_timer(0.0f),
 	m_mouse_x(0),
 	m_mouse_y(0),



From MAILER-DAEMON Thu Aug 02 01:06:47 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGStb-0004fI-C8
	for mharc-gnash-commit@gnu.org; Thu, 02 Aug 2007 01:06:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGStZ-0004fB-J0
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 01:06:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGStX-0004ez-T6
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 01:06:44 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGStX-0004ew-Qz
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 01:06:43 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IGStX-0003aF-Cl
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 01:06:43 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IGStW-0001RA-9k
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 05:06:42 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IGStW-0001R7-3x
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 05:06:42 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGStW-0001R7-3x@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 02 Aug 2007 05:06:42 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/asobj/MovieClipLoader.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Aug 2007 05:06:45 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/02 05:06:42

Modified files:
	.              : ChangeLog 
	server/asobj   : MovieClipLoader.cpp 

Log message:
	        * server/asobj/MovieClipLoader.cpp: implement reachable resources
	          marker (listeners).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3908&r2=1.3909
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/MovieClipLoader.cpp?cvsroot=gnash&r1=1.26&r2=1.27

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3908
retrieving revision 1.3909
diff -u -b -r1.3908 -r1.3909
--- ChangeLog	2 Aug 2007 04:57:18 -0000	1.3908
+++ ChangeLog	2 Aug 2007 05:06:41 -0000	1.3909
@@ -1,5 +1,7 @@
 2007-08-02 Sandro Santilli <strk@keybit.net>
 
+	* server/asobj/MovieClipLoader.cpp: implement reachable resources
+	  marker (listeners).
 	* server/movie_root.cpp: set background to white by default.
 	  Should fix bug #20655.
 

Index: server/asobj/MovieClipLoader.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/MovieClipLoader.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- server/asobj/MovieClipLoader.cpp	1 Jul 2007 10:54:29 -0000	1.26
+++ server/asobj/MovieClipLoader.cpp	2 Aug 2007 05:06:41 -0000	1.27
@@ -132,6 +132,18 @@
 
 	/// @ }
 
+protected:
+
+#ifdef GNASH_USE_GC
+	/// Mark MovieClipLoader-specific reachable resources and invoke
+	/// the parent's class version (markAsObjectReachable)
+	//
+	/// MovieClipLoader-specific reachable resources are:
+	/// 	- The listeners (_listeners)
+	///
+	virtual void markReachableResources() const;
+#endif // GNASH_USE_GC
+
 private:
 
 	typedef std::set< boost::intrusive_ptr<as_object> > Listeners;
@@ -289,6 +301,21 @@
 
 }
 
+#ifdef GNASH_USE_GC
+void
+MovieClipLoader::markReachableResources() const
+{
+	assert(isReachable());
+
+	// mark listeners
+	for(Listeners::iterator i=_listeners.begin(), e=_listeners.end(); i!=e; ++i)
+	{
+		(*i)->setReachable();
+	}
+	markAsObjectReachable();
+}
+#endif // GNASH_USE_GC
+
 static as_value
 moviecliploader_loadclip(const fn_call& fn)
 {



From MAILER-DAEMON Thu Aug 02 01:30:20 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGTGO-0007e0-7P
	for mharc-gnash-commit@gnu.org; Thu, 02 Aug 2007 01:30:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGTGM-0007bu-EH
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 01:30:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGTGK-0007Zw-N9
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 01:30:18 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGTGK-0007Zm-Fj
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 01:30:16 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IGTGK-0007DL-5Z
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 01:30:16 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IGTGI-0003Gw-NC
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 05:30:14 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IGTGI-0003Gt-9G
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 05:30:14 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGTGI-0003Gt-9G@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 02 Aug 2007 05:30:14 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog gui/Makefile.am
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Aug 2007 05:30:18 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/02 05:30:14

Modified files:
	.              : ChangeLog 
	gui            : Makefile.am 

Log message:
	        * gui/Makefile.am: comment out the _DEPENDENCIES lines. Properly
	          rebuilds the binaries when needed (might be breaking another kind
	          of dependency, but this one was pretty disturbing for me in that
	          it didn't trigger rebuil when _LIBS changed)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3909&r2=1.3910
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.99&r2=1.100

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3909
retrieving revision 1.3910
diff -u -b -r1.3909 -r1.3910
--- ChangeLog	2 Aug 2007 05:06:41 -0000	1.3909
+++ ChangeLog	2 Aug 2007 05:30:13 -0000	1.3910
@@ -1,5 +1,9 @@
 2007-08-02 Sandro Santilli <strk@keybit.net>
 
+	* gui/Makefile.am: comment out the _DEPENDENCIES lines. Properly
+	  rebuilds the binaries when needed (might be breaking another kind
+	  of dependency, but this one was pretty disturbing for me in that
+	  it didn't trigger rebuil when _LIBS changed)
 	* server/asobj/MovieClipLoader.cpp: implement reachable resources
 	  marker (listeners).
 	* server/movie_root.cpp: set background to white by default.

Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -b -r1.99 -r1.100
--- gui/Makefile.am	1 Aug 2007 13:20:30 -0000	1.99
+++ gui/Makefile.am	2 Aug 2007 05:30:13 -0000	1.100
@@ -191,7 +191,7 @@
 	 $(AM_CPPFLAGS) $(KDE_CFLAGS) $(QT_CFLAGS)
 kde_gnash_SOURCES = $(GUI_SRCS) gui_kde.cpp
 kde_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic 
-kde_gnash_DEPENDENCIES = .configline
+#kde_gnash_DEPENDENCIES = .configline
 kde_gnash_LDADD = \
 	$(MYSQL_LIBS) \
 	$(GNASH_LIBS) \
@@ -221,7 +221,7 @@
 	 $(AM_CPPFLAGS) $(SDL_CFLAGS) 
 sdl_gnash_SOURCES = $(GUI_SRCS) gui_sdl.cpp
 sdl_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic 
-sdl_gnash_DEPENDENCIES = .configline
+#sdl_gnash_DEPENDENCIES = .configline
 sdl_gnash_LDADD = \
 	$(MYSQL_LIBS) \
 	$(GNASH_LIBS) \
@@ -251,7 +251,7 @@
 	$(AM_CPPFLAGS) $(FLTK2_CFLAGS)
 fltk_gnash_SOURCES = $(GUI_SRCS) gui_fltk.cpp
 fltk_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic 
-fltk_gnash_DEPENDENCIES = .configline
+#fltk_gnash_DEPENDENCIES = .configline
 fltk_gnash_LDADD = \
 	$(MYSQL_LIBS) \
 	$(GNASH_LIBS) \
@@ -280,7 +280,7 @@
 aqua_gnash_CPPFLAGS = -DGUI_AQUA $(AM_CPPFLAGS) -DGUI_CONFIG=\"AQUA\"
 aqua_gnash_SOURCES = $(GUI_SRCS) gui_aqua.cpp
 aqua_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic 
-aqua_gnash_DEPENDENCIES = .configline
+#aqua_gnash_DEPENDENCIES = .configline
 aqua_gnash_LDADD = \
 	$(MYSQL_LIBS) \
 	$(GNASH_LIBS) \
@@ -310,7 +310,7 @@
 gtk_gnash_CPPFLAGS = -DGUI_GTK -DGUI_CONFIG=\"GTK\" \
 	$(AM_CPPFLAGS) $(GTK_CFLAGS)
 gtk_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
-gtk_gnash_DEPENDENCIES = .configline
+#gtk_gnash_DEPENDENCIES = .configline
 
 if BUILD_OGL_RENDERER
 gtk_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
@@ -344,7 +344,7 @@
 fb_gnash_CPPFLAGS = -DGUI_FB -DGUI_CONFIG=\"FB\" \
 	$(AM_CPPFLAGS) 
 fb_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
-fb_gnash_DEPENDENCIES = .configline
+#fb_gnash_DEPENDENCIES = .configline
 
 if BUILD_AGG_RENDERER
 fb_gnash_CPPFLAGS += $(AGG_CFLAGS)
@@ -363,7 +363,7 @@
 riscos_gnash_CPPFLAGS = -DGUI_FB -DGUI_CONFIG=\"FB\" \
 	$(AM_CPPFLAGS) 
 riscos_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
-riscos_gnash_DEPENDENCIES = .configline
+#riscos_gnash_DEPENDENCIES = .configline
 
 if BUILD_AGG_RENDERER
 riscos_gnash_CPPFLAGS += $(AGG_CFLAGS)



From MAILER-DAEMON Thu Aug 02 01:46:49 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGTWL-0003qj-PS
	for mharc-gnash-commit@gnu.org; Thu, 02 Aug 2007 01:46:49 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGTWJ-0003qS-U7
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 01:46:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGTWI-0003qG-HA
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 01:46:46 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGTWI-0003qB-9W
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 01:46:46 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IGTWH-0001XW-Uz
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 01:46:46 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IGTWF-0007MU-TY
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 05:46:44 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IGTWC-0007K2-CF
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 05:46:42 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGTWC-0007K2-CF@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Thu, 02 Aug 2007 05:46:40 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/ops.as
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Aug 2007 05:46:48 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/02 05:46:40

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: ops.as 

Log message:
	* testsuite/actionscript.all/ops.as: more tests, checks to xchecks.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3910&r2=1.3911
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/ops.as?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3910
retrieving revision 1.3911
diff -u -b -r1.3910 -r1.3911
--- ChangeLog	2 Aug 2007 05:30:13 -0000	1.3910
+++ ChangeLog	2 Aug 2007 05:46:37 -0000	1.3911
@@ -1,3 +1,7 @@
+2007-08-02 Zou Lunkai <zoulunkai@gmail.com>
+	
+	* testsuite/actionscript.all/ops.as: more tests, checks to xchecks.
+	  
 2007-08-02 Sandro Santilli <strk@keybit.net>
 
 	* gui/Makefile.am: comment out the _DEPENDENCIES lines. Properly

Index: testsuite/actionscript.all/ops.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/ops.as,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/actionscript.all/ops.as	2 Aug 2007 03:48:32 -0000	1.2
+++ testsuite/actionscript.all/ops.as	2 Aug 2007 05:46:39 -0000	1.3
@@ -20,7 +20,7 @@
  *  Test binary predicates (equal, less_then, greater_then, logical and bitwise ops)
  */
 
-rcsid="$Id: ops.as,v 1.2 2007/08/02 03:48:32 zoulunkai Exp $";
+rcsid="$Id: ops.as,v 1.3 2007/08/02 05:46:39 zoulunkai Exp $";
 
 #include "check.as"
 
@@ -38,6 +38,10 @@
 check(undefined == undefined);
 check(null==undefined); 
 check(undefined==null); 
+xcheck(1==true);
+check(true==1);
+check(2!=true);
+xcheck(true!=2);
 
 // for Arrays
 ary1 = [1,2,3];
@@ -276,19 +280,19 @@
 
 x = new String("1");
 y = new String("3");
-check_equals(x&y, 1); 
+xcheck_equals(x&y, 1); 
 
 x = new String("1.0");
 y = new String("3.0");
-check_equals(x&y, 1); 
+xcheck_equals(x&y, 1); 
 
 x = new String("1.999");
 y = new String("3.999");
-check_equals(x&y, 1); 
+xcheck_equals(x&y, 1); 
 
 x = new String("3.999");
 y = 7;
-check_equals(x&y, 3); 
+xcheck_equals(x&y, 3); 
 
 x = Number("7.999");
 y = 3;
@@ -320,11 +324,11 @@
 
 x = new String("1.999");
 y = 8.999;
-check_equals(x|y, 9); 
+xcheck_equals(x|y, 9); 
 
 x = String("1.999");
 y = String("8.999");
-check_equals(x|y, 9); 
+xcheck_equals(x|y, 9); 
 
 x = 9;
 y = String("1.5");



From MAILER-DAEMON Thu Aug 02 02:03:47 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGTml-00026J-3l
	for mharc-gnash-commit@gnu.org; Thu, 02 Aug 2007 02:03:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGTmj-00026E-PS
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 02:03:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGTmj-000262-4j
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 02:03:45 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGTmi-00025z-V3
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 02:03:45 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IGTmi-0005F3-Gx
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 02:03:44 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IGTmh-0001bp-Hp
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 06:03:43 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IGTmh-0001bm-Ck
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 06:03:43 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGTmh-0001bm-Ck@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 02 Aug 2007 06:03:43 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/asobj/NetConnection.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Aug 2007 06:03:46 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/02 06:03:43

Modified files:
	.              : ChangeLog 
	server/asobj   : NetConnection.h 

Log message:
	* server/asobj/NetConnection.h: remove the unused _owner method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3911&r2=1.3912
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetConnection.h?cvsroot=gnash&r1=1.35&r2=1.36

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3911
retrieving revision 1.3912
diff -u -b -r1.3911 -r1.3912
--- ChangeLog	2 Aug 2007 05:46:37 -0000	1.3911
+++ ChangeLog	2 Aug 2007 06:03:42 -0000	1.3912
@@ -1,3 +1,7 @@
+2007-08-02 Sandro Santilli <strk@keybit.net>
+
+	* server/asobj/NetConnection.h: remove the unused _owner method.
+
 2007-08-02 Zou Lunkai <zoulunkai@gmail.com>
 	
 	* testsuite/actionscript.all/ops.as: more tests, checks to xchecks.

Index: server/asobj/NetConnection.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetConnection.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- server/asobj/NetConnection.h	1 Jul 2007 10:54:29 -0000	1.35
+++ server/asobj/NetConnection.h	2 Aug 2007 06:03:43 -0000	1.36
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: NetConnection.h,v 1.35 2007/07/01 10:54:29 bjacques Exp $ */
+/* $Id: NetConnection.h,v 1.36 2007/08/02 06:03:43 strk Exp $ */
 
 #ifndef __NETCONNECTION_H__
 #define __NETCONNECTION_H__
@@ -149,9 +149,6 @@
 	/// the complete url of the file
 	std::string _completeUrl;
 
-	/// the as_object which owns the connection
-	boost::intrusive_ptr<as_object> _owner;
-
 	/// The file/stream loader thread and interface
 	std::auto_ptr<LoadThread> _loader;
 



From MAILER-DAEMON Thu Aug 02 02:15:00 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGTxc-0000DJ-EO
	for mharc-gnash-commit@gnu.org; Thu, 02 Aug 2007 02:15:00 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGTxa-0000Ac-G2
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 02:14:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGTxZ-00009j-LE
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 02:14:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGTxZ-00009a-FL
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 02:14:57 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IGTxZ-0007nQ-9l
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 02:14:57 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IGTxY-0002ro-1c
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 06:14:56 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IGTxX-0002re-N1
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 06:14:55 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGTxX-0002re-N1@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 02 Aug 2007 06:14:55 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/libbase GC.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Aug 2007 06:14:59 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/02 06:14:55

Modified files:
	libbase        : GC.cpp 

Log message:
	make GC buildable in debug level 1

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/GC.cpp?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: GC.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/GC.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- GC.cpp	3 Jul 2007 19:44:07 -0000	1.6
+++ GC.cpp	2 Aug 2007 06:14:55 -0000	1.7
@@ -16,7 +16,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: GC.cpp,v 1.6 2007/07/03 19:44:07 nihilus Exp $ */
+/* $Id: GC.cpp,v 1.7 2007/08/02 06:14:55 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -73,10 +73,13 @@
 void
 GC::cleanUnreachable()
 {
-#if (GNASH_GC_DEBUG > 1)
+#ifdef GNASH_GC_DEBUG
 	size_t deleted = 0;
+#if (GNASH_GC_DEBUG > 1)
 	log_debug(_("GC %p: SWEEP SCAN"), (void*)this);
 #endif
+#endif
+
 	for (ResList::iterator i=_resList.begin(), e=_resList.end(); i!=e; )
 	{
 		const GcResource* res = *i;



From MAILER-DAEMON Thu Aug 02 02:30:37 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGUCj-0001AW-Hd
	for mharc-gnash-commit@gnu.org; Thu, 02 Aug 2007 02:30:37 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGUCh-0001A1-G2
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 02:30:35 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGUCf-00019p-U2
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 02:30:34 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGUCf-00019m-OR
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 02:30:33 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IGUCf-00038U-Fo
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 02:30:33 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IGUCe-0003il-An
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 06:30:32 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IGUCd-0003ih-RL
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 06:30:32 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGUCd-0003ih-RL@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 02 Aug 2007 06:30:31 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/libbase GC.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Aug 2007 06:30:36 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/02 06:30:31

Modified files:
	libbase        : GC.cpp 

Log message:
	use the typeName() method from utility.h to print nice class names

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/GC.cpp?cvsroot=gnash&r1=1.7&r2=1.8

Patches:
Index: GC.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/GC.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- GC.cpp	2 Aug 2007 06:14:55 -0000	1.7
+++ GC.cpp	2 Aug 2007 06:30:31 -0000	1.8
@@ -16,7 +16,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: GC.cpp,v 1.7 2007/08/02 06:14:55 strk Exp $ */
+/* $Id: GC.cpp,v 1.8 2007/08/02 06:30:31 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -26,6 +26,7 @@
 #include "builtin_function.h"
 
 #ifdef GNASH_GC_DEBUG
+# include "utility.h" // for typeName()
 # include "log.h"
 #endif
 
@@ -88,7 +89,7 @@
 #ifdef GNASH_GC_DEBUG 
 #if GNASH_GC_DEBUG > 1
 			log_debug(_("GC %p: cleanUnreachable deleting object %p (%s)"),
-					(void*)this, (void*)res, typeid(*res).name());
+					(void*)this, (void*)res, typeName(*res).c_str());
 #endif
 			++deleted;
 #endif



From MAILER-DAEMON Thu Aug 02 03:54:38 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGVW2-0003Ro-4W
	for mharc-gnash-commit@gnu.org; Thu, 02 Aug 2007 03:54:38 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGVW0-0003Rg-H4
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 03:54:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGVVz-0003RU-L7
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 03:54:36 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGVVz-0003RR-Gh
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 03:54:35 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1IGVVz-0006BL-48
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 03:54:35 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <udo.gnu@nova-sys.net>) id 1IGVVy-0001WA-2u
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 07:54:34 +0000
Received: from udog by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <udog@savannah.gnu.org>) id 1IGVVx-0001W7-UX
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 07:54:34 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGVVx-0001W7-UX@cvs.savannah.gnu.org>
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
Date: Thu, 02 Aug 2007 07:54:33 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog gui/gtk_glue_agg.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Aug 2007 07:54:37 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Udo Giacomozzi <udog>	07/08/02 07:54:33

Modified files:
	.              : ChangeLog 
	gui            : gtk_glue_agg.cpp 

Log message:
	gui/gtk_glue_agg.cpp: Warn when compiling for OLPC, change compile-time error to runtime error to be multi-GUI friendly.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3912&r2=1.3913
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk_glue_agg.cpp?cvsroot=gnash&r1=1.26&r2=1.27

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.3912
retrieving revision 1.3913
diff -u -b -r1.3912 -r1.3913
--- ChangeLog	2 Aug 2007 06:03:42 -0000	1.3912
+++ ChangeLog	2 Aug 2007 07:54:33 -0000	1.3913
@@ -1,3 +1,8 @@
+2007-08-02 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* gui/gtk_glue_agg.cpp: Warn when compiling for OLPC, change compile-time
+	  error to runtime error to be multi-GUI friendly.
+
 2007-08-02 Sandro Santilli <strk@keybit.net>
 
 	* server/asobj/NetConnection.h: remove the unused _owner method.

Index: gui/gtk_glue_agg.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/gui/gtk_glue_agg.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- gui/gtk_glue_agg.cpp	1 Aug 2007 16:47:04 -0000	1.26
+++ gui/gtk_glue_agg.cpp	2 Aug 2007 07:54:33 -0000	1.27
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: gtk_glue_agg.cpp,v 1.26 2007/08/01 16:47:04 udog Exp $ */
+/* $Id: gtk_glue_agg.cpp,v 1.27 2007/08/02 07:54:33 udog Exp $ */
 
 
 /// \page gtk_shm_support GTK shared memory extension support
@@ -246,23 +246,31 @@
   
   _bpp = 24;
   strcpy(_pixelformat, "RGB24");
+  return true;
   
 #else
 
 #ifdef PIXELFORMAT_RGB565  // OLPC
 
+#warning A pixel format of RGB565; you must have a (hacked) GTK which supports \
+         this format (e.g., GTK on the OLPC).
+                  
   _bpp = 16;
   strcpy(_pixelformat, "RGB565");
+  return true;
   
 #else
 
-#error Missing a supported pixel format for GTK GUI. You probably want to configure --with-pixelformat=RGB24   
+#warning GTK GUI requires --with-pixelformat=RGB24 for AGG renderer
+ 
+  printf("Missing a supported pixel format for GTK GUI. You probably want to "
+    "configure --with-pixelformat=RGB24\n");
+  return false;   
 
 #endif  //ifdef PIXELFORMAT_RGB565   
  
 #endif  //ifdef PIXELFORMAT_RGB24
   
-  return true;
   
 }
 



From MAILER-DAEMON Thu Aug 02 05:33:48 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGX3z-0004iX-BJ
	for mharc-gnash-commit@gnu.org; Thu, 02 Aug 2007 05:33:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGX3x-0004dl-5N
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 05:33:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGX3v-0004cY-Lx
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 05:33:44 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGX3u-0004bz-L9
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 05:33:43 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IGX3u-0007ye-A8
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 05:33:42 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IGX3t-0007xS-Bn
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 09:33:41 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IGX3t-0007xP-5F
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 09:33:41 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGX3t-0007xP-5F@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Thu, 02 Aug 2007 09:33:41 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/testsuite/actionscript.all ops.as
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Aug 2007 09:33:45 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/02 09:33:41

Modified files:
	testsuite/actionscript.all: ops.as 

Log message:
	more tests and more fails

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/ops.as?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: ops.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/ops.as,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- ops.as	2 Aug 2007 05:46:39 -0000	1.3
+++ ops.as	2 Aug 2007 09:33:40 -0000	1.4
@@ -20,7 +20,7 @@
  *  Test binary predicates (equal, less_then, greater_then, logical and bitwise ops)
  */
 
-rcsid="$Id: ops.as,v 1.3 2007/08/02 05:46:39 zoulunkai Exp $";
+rcsid="$Id: ops.as,v 1.4 2007/08/02 09:33:40 zoulunkai Exp $";
 
 #include "check.as"
 
@@ -42,6 +42,14 @@
 check(true==1);
 check(2!=true);
 xcheck(true!=2);
+check_equals(1+true, 2);
+check_equals(true+1, 2);
+check_equals(1+false, 1);
+check_equals(false+1, 1);
+check_equals(true+true, 2);
+check_equals(true+false, 1);
+check_equals(false, 0);
+check_equals(false+false, 0);
 
 // for Arrays
 ary1 = [1,2,3];
@@ -360,13 +368,81 @@
 // Shift left operator (ACTION_SHIFTLEFT : 0x63)
 //------------------------------------------------
 
-// TODO ... 
+x = 1;
+y = x << 2;
+xcheck_equals(y, 4);
+
+x = 0xffffffff;
+y = x << 16;
+xcheck_equals(y, -65536);
+
+x = 1.9;
+y = x << 2;
+xcheck_equals(y, 4);
+
+x= undefined;
+y = x << 1;
+check_equals(y, 0);
+
+x= NaN;
+y = x << 1;
+xcheck_equals(y, 0);
+
+x = "abcd";
+y = x << 1;
+xcheck_equals(y, 0);
+
+x = "3";
+y = x << 1;
+xcheck_equals(y, 6);
+
+x = String("3");
+y = x << 1;
+xcheck_equals(y, 6);
+
+x = new String("3");
+y = x << 1;
+xcheck_equals(y, 6); 
 
 //------------------------------------------------
 // Shift right operator (ACTION_SHIFTRIGHT : 0x64)
 //------------------------------------------------
 
-// TODO ... 
+x = 7;
+y = x >> 2;
+check_equals(y, 1);
+
+x = 0xffffffff;
+y = x >> 16;
+check_equals(y, -1);
+
+x = 7.9;
+y = x >> 2;
+check_equals(y, 1);
+
+x= undefined;
+y = x >> 1;
+check_equals(y, 0);
+
+x= NaN;
+y = x >> 1;
+xcheck_equals(y, 0);
+
+x = "abcd";
+y = x >> 1;
+xcheck_equals(y, 0);
+
+x = "7";
+y = x >> 1;
+check_equals(y, 3);
+
+x = String("7");
+y = x >> 1;
+xcheck_equals(y, 3);
+
+x = new String("7");
+y = x >> 1;
+xcheck_equals(y, 3);
 
 //-------------------------------------------------
 // Shift right2 operator (ACTION_SHIFTRIGHT2 : 0x65)



From MAILER-DAEMON Thu Aug 02 12:07:40 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGdDA-0004BD-4O
	for mharc-gnash-commit@gnu.org; Thu, 02 Aug 2007 12:07:40 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGdD8-0004AX-9C
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 12:07:38 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGdD7-0004A4-3O
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 12:07:37 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGdD6-00049v-TK
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 12:07:36 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IGdD6-0004qT-Fq
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 12:07:36 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IGdCz-0005xK-5U
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 16:07:29 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IGdCz-0005xH-0J
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 16:07:29 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGdCz-0005xH-0J@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 02 Aug 2007 16:07:29 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/PropertyList.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Aug 2007 16:07:38 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/02 16:07:28

Modified files:
	.              : ChangeLog 
	server         : PropertyList.cpp 

Log message:
	        * server/PropertyList.cpp: add compile-time macro for debugging
	          property allocations.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3913&r2=1.3914
http://cvs.savannah.gnu.org/viewcvs/gnash/server/PropertyList.cpp?cvsroot=gnash&r1=1.16&r2=1.17

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3913
retrieving revision 1.3914
diff -u -b -r1.3913 -r1.3914
--- ChangeLog	2 Aug 2007 07:54:33 -0000	1.3913
+++ ChangeLog	2 Aug 2007 16:07:28 -0000	1.3914
@@ -1,3 +1,8 @@
+2007-08-02 Sandro Santilli <strk@keybit.net>
+
+	* server/PropertyList.cpp: add compile-time macro for debugging
+	  property allocations.
+
 2007-08-02 Udo Giacomozzi <udo.gnu@nova-sys.net>
 
 	* gui/gtk_glue_agg.cpp: Warn when compiling for OLPC, change compile-time

Index: server/PropertyList.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/PropertyList.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/PropertyList.cpp	1 Jul 2007 10:54:19 -0000	1.16
+++ server/PropertyList.cpp	2 Aug 2007 16:07:28 -0000	1.17
@@ -33,6 +33,9 @@
 
 #include <utility> // for std::make_pair
 
+// Define the following to enable printing address of each property added
+//#define DEBUG_PROPERTY_ALLOC
+
 namespace gnash {
 
 PropertyList::PropertyList()
@@ -82,7 +85,11 @@
 	if ( found == _props.end() )
 	{
 		// create a new member
-		_props[key] = new SimpleProperty(val);
+		SimpleProperty* prop = new SimpleProperty(val);
+#ifdef DEBUG_PROPERTY_ALLOC
+		log_debug("SimpleProperty %s = %p", key.c_str(), (void*)prop);
+#endif // DEBUG_PROPERTY_ALLOC
+		_props[key] = prop;
 		return true;
 	}
 
@@ -242,7 +249,11 @@
 	iterator found = _props.find( key );
 	if ( found != _props.end() ) return false; // already exists !!
 
-	_props[key] = new GetterSetterProperty(GetterSetter(getter, setter));
+	GetterSetterProperty* prop = new GetterSetterProperty(GetterSetter(getter, setter));
+#ifdef DEBUG_PROPERTY_ALLOC
+	log_debug("GetterSetterProperty %s = %p", key.c_str(), (void*)prop);
+#endif // DEBUG_PROPERTY_ALLOC
+	_props[key] = prop;
 	return true;
 }
 



From MAILER-DAEMON Thu Aug 02 13:21:43 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGeMp-000757-Nm
	for mharc-gnash-commit@gnu.org; Thu, 02 Aug 2007 13:21:43 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGeMn-00074m-Qv
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 13:21:41 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGeMm-00074a-0b
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 13:21:40 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGeMl-00074X-Rv
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 13:21:39 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IGeMl-0002KJ-Jf
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 13:21:39 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IGeMk-0003Sz-EA
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 17:21:38 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IGeMk-0003Sv-1x
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 17:21:38 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGeMk-0003Sv-1x@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 02 Aug 2007 17:21:38 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/vm/ASHandlers.cpp testsu...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Aug 2007 17:21:42 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/02 17:21:37

Modified files:
	.              : ChangeLog 
	server/vm      : ASHandlers.cpp 
	testsuite/actionscript.all: ops.as 

Log message:
	        * server/vm/ASHandlers.cpp: shift right/left : take undefined
	          values as zeroes.
	        * testsuite/actionscript.all/ops.as: minor additions, xcheck to
	          check.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3914&r2=1.3915
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.114&r2=1.115
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/ops.as?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3914
retrieving revision 1.3915
diff -u -b -r1.3914 -r1.3915
--- ChangeLog	2 Aug 2007 16:07:28 -0000	1.3914
+++ ChangeLog	2 Aug 2007 17:21:37 -0000	1.3915
@@ -1,5 +1,12 @@
 2007-08-02 Sandro Santilli <strk@keybit.net>
 
+	* server/vm/ASHandlers.cpp: shift right/left : take undefined
+	  values as zeroes.
+	* testsuite/actionscript.all/ops.as: minor additions, xcheck to
+	  check.
+
+2007-08-02 Sandro Santilli <strk@keybit.net>
+
 	* server/PropertyList.cpp: add compile-time macro for debugging
 	  property allocations.
 

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -b -r1.114 -r1.115
--- server/vm/ASHandlers.cpp	31 Jul 2007 15:30:29 -0000	1.114
+++ server/vm/ASHandlers.cpp	2 Aug 2007 17:21:37 -0000	1.115
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ASHandlers.cpp,v 1.114 2007/07/31 15:30:29 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.115 2007/08/02 17:21:37 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -3075,6 +3075,7 @@
 	double operand1 = env.top(1).to_number(&env);
 	double operand2 = env.top(0).to_number(&env);
 
+	// TODO: have as_value::to_number<int> handle this ?
 	if ( isnan(operand1) ) operand1 = 0;
 	if ( isnan(operand2) ) operand2 = 0;
 
@@ -3092,6 +3093,7 @@
 	double operand1 = env.top(1).to_number(&env);
 	double operand2 = env.top(0).to_number(&env);
 
+	// TODO: have as_value::to_number<int> handle this ?
 	if ( isnan(operand1) ) operand1 = 0;
 	if ( isnan(operand2) ) operand2 = 0;
 
@@ -3110,6 +3112,7 @@
 	double operand1 = env.top(1).to_number(&env);
 	double operand2 = env.top(0).to_number(&env);
 
+	// TODO: have as_value::to_number<int> handle this ?
 	if ( isnan(operand1) ) operand1 = 0;
 	if ( isnan(operand2) ) operand2 = 0;
 
@@ -3130,7 +3133,10 @@
 	double operand1 = env.top(1).to_number(&env);
 	double operand2 = env.top(0).to_number(&env);
 
-	env.top(1) = int(operand1) >> int(operand2);
+	// TODO: have as_value::to_number<int> handle this ?
+	if ( isnan(operand1) ) operand1=0;
+
+	env.top(1) = int16_t(operand1) << int(operand2);
 	env.drop(1);
 }
 
@@ -3147,7 +3153,10 @@
 	double operand1 = env.top(1).to_number(&env);
 	double operand2 = env.top(0).to_number(&env);
 
-	env.top(1) = int(operand1) >> int(operand2);
+	// TODO: have as_value::to_number<int> handle this ?
+	if ( isnan(operand1) ) operand1=0;
+
+	env.top(1) = int16_t(operand1) >> int(operand2);
 	env.drop(1);
 }
 
@@ -3163,6 +3172,9 @@
 	double operand1 = env.top(1).to_number(&env);
 	double operand2 = env.top(0).to_number(&env);
 
+	// TODO: have as_value::to_number<int> handle this ?
+	if ( isnan(operand1) ) operand1=0;
+
 	env.top(1) = uint32_t(operand1) >> int(operand2);
 	env.drop(1);
 }

Index: testsuite/actionscript.all/ops.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/ops.as,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- testsuite/actionscript.all/ops.as	2 Aug 2007 09:33:40 -0000	1.4
+++ testsuite/actionscript.all/ops.as	2 Aug 2007 17:21:37 -0000	1.5
@@ -20,7 +20,7 @@
  *  Test binary predicates (equal, less_then, greater_then, logical and bitwise ops)
  */
 
-rcsid="$Id: ops.as,v 1.4 2007/08/02 09:33:40 zoulunkai Exp $";
+rcsid="$Id: ops.as,v 1.5 2007/08/02 17:21:37 strk Exp $";
 
 #include "check.as"
 
@@ -370,7 +370,7 @@
 
 x = 1;
 y = x << 2;
-xcheck_equals(y, 4);
+check_equals(y, 4);
 
 x = 0xffffffff;
 y = x << 16;
@@ -378,23 +378,27 @@
 
 x = 1.9;
 y = x << 2;
-xcheck_equals(y, 4);
+check_equals(y, 4);
 
 x= undefined;
 y = x << 1;
+check_equals(typeof(y), 'number');
+check(! isnan(y) );
 check_equals(y, 0);
 
+check_equals(0 << 1, 0);
+
 x= NaN;
 y = x << 1;
-xcheck_equals(y, 0);
+check_equals(y, 0);
 
 x = "abcd";
 y = x << 1;
-xcheck_equals(y, 0);
+check_equals(y, 0);
 
 x = "3";
 y = x << 1;
-xcheck_equals(y, 6);
+check_equals(y, 6);
 
 x = String("3");
 y = x << 1;
@@ -426,11 +430,11 @@
 
 x= NaN;
 y = x >> 1;
-xcheck_equals(y, 0);
+check_equals(y, 0);
 
 x = "abcd";
 y = x >> 1;
-xcheck_equals(y, 0);
+check_equals(y, 0);
 
 x = "7";
 y = x >> 1;



From MAILER-DAEMON Thu Aug 02 13:36:03 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGeah-0006z3-8K
	for mharc-gnash-commit@gnu.org; Thu, 02 Aug 2007 13:36:03 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGeaf-0006yy-9X
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 13:36:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGead-0006yi-Ur
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 13:36:01 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGead-0006yf-IY
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 13:35:59 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IGead-0004wu-9S
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 13:35:59 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IGeab-0003kK-Kr
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 17:35:57 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IGeab-0003kG-G5
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 17:35:57 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGeab-0003kG-G5@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 02 Aug 2007 17:35:57 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/as_value.cpp testsuite/a...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Aug 2007 17:36:01 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/02 17:35:57

Modified files:
	.              : ChangeLog 
	server         : as_value.cpp 
	testsuite/actionscript.all: ops.as 

Log message:
	        * server/as_value.cpp (equals) : fix true==1 and true!=2
	          (was failing).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3915&r2=1.3916
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/ops.as?cvsroot=gnash&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3915
retrieving revision 1.3916
diff -u -b -r1.3915 -r1.3916
--- ChangeLog	2 Aug 2007 17:21:37 -0000	1.3915
+++ ChangeLog	2 Aug 2007 17:35:56 -0000	1.3916
@@ -1,5 +1,7 @@
 2007-08-02 Sandro Santilli <strk@keybit.net>
 
+	* server/as_value.cpp (equals) : fix true==1 and true!=2
+	  (was failing).
 	* server/vm/ASHandlers.cpp: shift right/left : take undefined
 	  values as zeroes.
 	* testsuite/actionscript.all/ops.as: minor additions, xcheck to

Index: server/as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- server/as_value.cpp	25 Jul 2007 16:27:55 -0000	1.60
+++ server/as_value.cpp	2 Aug 2007 17:35:57 -0000	1.61
@@ -651,12 +651,10 @@
     else if (m_type == NUMBER && v.m_type == STRING)
     {
 	return equalsSameType(v.to_number(env)); // m_number_value == v.to_number(env);
-	//return m_number_value == v.to_number(env);
     }
     else if (v.m_type == NUMBER && m_type == STRING)
     {
-	return v.equalsSameType(to_number(env)); // m_number_value == v.to_number(env);
-	//return v.m_number_value == to_number(env);
+	return v.equalsSameType(to_number(env)); // v.m_number_value == to_number(env);
     }
     else if (m_type == STRING)
     {
@@ -664,7 +662,11 @@
     }
     else if (m_type == BOOLEAN)
     {
-	return m_boolean_value == v.to_bool();
+	return as_value(to_number(env)).equals(v); // m_boolean_value == v.to_bool();
+    }
+    else if (v.m_type == BOOLEAN)
+    {
+	return as_value(v.to_number()).equals(*this); 
     }
 
     else if (m_type == OBJECT || m_type == AS_FUNCTION)

Index: testsuite/actionscript.all/ops.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/ops.as,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- testsuite/actionscript.all/ops.as	2 Aug 2007 17:21:37 -0000	1.5
+++ testsuite/actionscript.all/ops.as	2 Aug 2007 17:35:57 -0000	1.6
@@ -20,7 +20,7 @@
  *  Test binary predicates (equal, less_then, greater_then, logical and bitwise ops)
  */
 
-rcsid="$Id: ops.as,v 1.5 2007/08/02 17:21:37 strk Exp $";
+rcsid="$Id: ops.as,v 1.6 2007/08/02 17:35:57 strk Exp $";
 
 #include "check.as"
 
@@ -38,10 +38,10 @@
 check(undefined == undefined);
 check(null==undefined); 
 check(undefined==null); 
-xcheck(1==true);
+check(1==true);
 check(true==1);
 check(2!=true);
-xcheck(true!=2);
+check(true!=2);
 check_equals(1+true, 2);
 check_equals(true+1, 2);
 check_equals(1+false, 1);
@@ -199,7 +199,7 @@
 x = 0;
 y = 0.0001;
 z = x || y;
-xcheck(z!=y); 
+check(z!=y); 
 check_equals(z, true); 
 
 x = 0;
@@ -258,7 +258,7 @@
 x = 0;
 y = new String("0");
 z = x || y;
-xcheck(z!=y);
+check(z!=y);
 check_equals(z, true);
 
 



From MAILER-DAEMON Thu Aug 02 14:16:23 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGfDj-00021a-Le
	for mharc-gnash-commit@gnu.org; Thu, 02 Aug 2007 14:16:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGfDi-00021E-Cu
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 14:16:22 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGfDh-00020z-Et
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 14:16:22 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGfDh-00020w-Cy
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 14:16:21 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IGfDh-0004tU-5P
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 14:16:21 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IGfDf-0007dj-A8
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 18:16:19 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IGfDe-0007dd-Ku
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 18:16:18 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGfDe-0007dd-Ku@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 02 Aug 2007 18:16:18 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/arra...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Aug 2007 18:16:22 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/02 18:16:18

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: array.as 

Log message:
	* testsuite/actionscript.all/array.as: add test for Array.valueOf().

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3916&r2=1.3917
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/array.as?cvsroot=gnash&r1=1.26&r2=1.27

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3916
retrieving revision 1.3917
diff -u -b -r1.3916 -r1.3917
--- ChangeLog	2 Aug 2007 17:35:56 -0000	1.3916
+++ ChangeLog	2 Aug 2007 18:16:17 -0000	1.3917
@@ -1,5 +1,6 @@
 2007-08-02 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/actionscript.all/array.as: add test for Array.valueOf().
 	* server/as_value.cpp (equals) : fix true==1 and true!=2
 	  (was failing).
 	* server/vm/ASHandlers.cpp: shift right/left : take undefined

Index: testsuite/actionscript.all/array.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/array.as,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- testsuite/actionscript.all/array.as	31 Jul 2007 20:42:07 -0000	1.26
+++ testsuite/actionscript.all/array.as	2 Aug 2007 18:16:18 -0000	1.27
@@ -5,7 +5,7 @@
 // Updated with sort functions, and to use check() macro
 // by Mike Carlson Feb. 14th, 2006
 
-rcsid="$Id: array.as,v 1.26 2007/07/31 20:42:07 strk Exp $";
+rcsid="$Id: array.as,v 1.27 2007/08/02 18:16:18 strk Exp $";
 
 #include "check.as"
 
@@ -39,6 +39,7 @@
 check(Array.prototype.hasOwnProperty('unshift'));
 check(Array.prototype.hasOwnProperty('toString'));
 check(!Array.prototype.hasOwnProperty('length'));
+check(!Array.prototype.hasOwnProperty('valueOf'));
 #endif // OUTPUT_VERSION >= 6
 
 var a;
@@ -51,6 +52,13 @@
 check(a.hasOwnProperty('length'));
 #endif
 
+primitiveArrayValue = a.valueOf();
+check_equals(typeof(primitiveArrayValue), 'object');
+check_equals( primitiveArrayValue, a );
+#if OUTPUT_VERSION > 5
+check( primitiveArrayValue === a );
+#endif
+
 b=[];
 b.push(551,"asdf",12);
 



From MAILER-DAEMON Thu Aug 02 14:28:49 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGfPk-0000ew-SQ
	for mharc-gnash-commit@gnu.org; Thu, 02 Aug 2007 14:28:48 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGfPj-0000dV-Gi
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 14:28:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGfPi-0000cM-BR
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 14:28:46 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGfPi-0000c7-1c
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 14:28:46 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IGfPh-0007RC-DC
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 14:28:45 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IGfPf-0007wc-Co
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 18:28:43 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IGfPf-0007wX-6L
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 18:28:43 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGfPf-0007wX-6L@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 02 Aug 2007 18:28:43 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/as_value.cpp server/as_v...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Aug 2007 18:28:47 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/02 18:28:43

Modified files:
	.              : ChangeLog 
	server         : as_value.cpp as_value.h 
	server/vm      : ASHandlers.cpp 

Log message:
	        * server/as_value.{cpp,h}: as_environment parameter made mandatory
	          for the equals() method.
	        * server/vm/ASHandlers.cpp (ActionEquals): update calls to
	          as_value::equals().

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3917&r2=1.3918
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.h?cvsroot=gnash&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.115&r2=1.116

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3917
retrieving revision 1.3918
diff -u -b -r1.3917 -r1.3918
--- ChangeLog	2 Aug 2007 18:16:17 -0000	1.3917
+++ ChangeLog	2 Aug 2007 18:28:42 -0000	1.3918
@@ -1,5 +1,12 @@
 2007-08-02 Sandro Santilli <strk@keybit.net>
 
+	* server/as_value.{cpp,h}: as_environment parameter made mandatory
+	  for the equals() method.
+	* server/vm/ASHandlers.cpp (ActionEquals): update calls to
+	  as_value::equals().
+
+2007-08-02 Sandro Santilli <strk@keybit.net>
+
 	* testsuite/actionscript.all/array.as: add test for Array.valueOf().
 	* server/as_value.cpp (equals) : fix true==1 and true!=2
 	  (was failing).

Index: server/as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- server/as_value.cpp	2 Aug 2007 17:35:57 -0000	1.61
+++ server/as_value.cpp	2 Aug 2007 18:28:42 -0000	1.62
@@ -630,7 +630,7 @@
 }
 
 bool
-as_value::equals(const as_value& v, as_environment* env) const
+as_value::equals(const as_value& v, as_environment& env) const
 {
     //log_msg("equals(%s, %s) called", to_debug_string().c_str(), v.to_debug_string().c_str());
 
@@ -650,31 +650,30 @@
 
     else if (m_type == NUMBER && v.m_type == STRING)
     {
-	return equalsSameType(v.to_number(env)); // m_number_value == v.to_number(env);
+	return equalsSameType(v.to_number(&env)); 
     }
     else if (v.m_type == NUMBER && m_type == STRING)
     {
-	return v.equalsSameType(to_number(env)); // v.m_number_value == to_number(env);
+	return v.equalsSameType(to_number(&env)); 
     }
     else if (m_type == STRING)
     {
-	return m_string_value == v.to_string(env);
+	return m_string_value == v.to_string(&env);
     }
     else if (m_type == BOOLEAN)
     {
-	return as_value(to_number(env)).equals(v); // m_boolean_value == v.to_bool();
+	return as_value(to_number(&env)).equals(v, env); // m_boolean_value == v.to_bool();
     }
     else if (v.m_type == BOOLEAN)
     {
-	return as_value(v.to_number()).equals(*this); 
+	return as_value(v.to_number(&env)).equals(*this, env); 
     }
 
     else if (m_type == OBJECT || m_type == AS_FUNCTION)
     {
     	assert ( ! (v.m_type == OBJECT || v.m_type == AS_FUNCTION) );
 	// convert this value to a primitive and recurse
-	if ( ! env ) return false;
-	as_value v2 = to_primitive(*env); 
+	as_value v2 = to_primitive(env); 
 	if ( v2.m_type == OBJECT || v2.m_type == AS_FUNCTION ) return false; // no valid conversion 
 	else return v2.equals(v, env);
     }
@@ -683,8 +682,7 @@
     {
     	assert ( ! (m_type == OBJECT || m_type == AS_FUNCTION) );
 	// convert this value to a primitive and recurse
-	if ( ! env ) return false;
-	as_value v2 = v.to_primitive(*env); 
+	as_value v2 = v.to_primitive(env); 
 	if ( v2.m_type == OBJECT || v2.m_type == AS_FUNCTION ) return false; // no valid conversion 
 	else return equals(v2, env);
     }

Index: server/as_value.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- server/as_value.h	25 Jul 2007 16:27:55 -0000	1.60
+++ server/as_value.h	2 Aug 2007 18:28:42 -0000	1.61
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: as_value.h,v 1.60 2007/07/25 16:27:55 strk Exp $ */
+/* $Id: as_value.h,v 1.61 2007/08/02 18:28:42 strk Exp $ */
 
 #ifndef GNASH_AS_VALUE_H
 #define GNASH_AS_VALUE_H
@@ -533,12 +533,11 @@
 	///	- A == B is equivalent to B == A, except for order of
 	///	  evaluation of A and B.
 	///
-	///
 	/// @param env
-	///	The environment to use for running the toString() method
-	///	for object values. If NULL, toString() won't be run.
+	///	The environment to use for running the toString() and valueOf()
+	///	methods for object values. 
 	///
-	bool equals(const as_value& v, as_environment* env=NULL) const;
+	bool equals(const as_value& v, as_environment& env) const;
 
 	/// Sets this value to this string plus the given string.
 	void	string_concat(const std::string& str);

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -b -r1.115 -r1.116
--- server/vm/ASHandlers.cpp	2 Aug 2007 17:21:37 -0000	1.115
+++ server/vm/ASHandlers.cpp	2 Aug 2007 18:28:42 -0000	1.116
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ASHandlers.cpp,v 1.115 2007/08/02 17:21:37 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.116 2007/08/02 18:28:42 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -2614,7 +2614,7 @@
     thread.ensureStack(2);
 
     /// ECMA-262 abstract equality comparison (sect 11.9.3)
-    env.top(1).set_bool(env.top(1).equals(env.top(0), &env));
+    env.top(1).set_bool(env.top(1).equals(env.top(0), env));
     env.drop(1);
 }
 



From MAILER-DAEMON Thu Aug 02 14:57:05 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGfr7-0004Hw-Ek
	for mharc-gnash-commit@gnu.org; Thu, 02 Aug 2007 14:57:05 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGfr4-0004Go-Ni
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 14:57:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGfr3-0004Gc-VY
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 14:57:02 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGfr3-0004GZ-TF
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 14:57:01 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IGfr3-00057M-IE
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 14:57:01 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IGfr2-0001Zc-D5
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 18:57:00 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IGfr2-0001ZZ-8t
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 18:57:00 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGfr2-0001ZZ-8t@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 02 Aug 2007 18:57:00 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/Movi...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Aug 2007 18:57:03 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/02 18:57:00

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: MovieClip.as 

Log message:
	* testsuite/actionscript.all/MovieClip.as: test MovieClip.valueOf().

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3918&r2=1.3919
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.78&r2=1.79

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3918
retrieving revision 1.3919
diff -u -b -r1.3918 -r1.3919
--- ChangeLog	2 Aug 2007 18:28:42 -0000	1.3918
+++ ChangeLog	2 Aug 2007 18:56:59 -0000	1.3919
@@ -1,5 +1,6 @@
 2007-08-02 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/actionscript.all/MovieClip.as: test MovieClip.valueOf().
 	* server/as_value.{cpp,h}: as_environment parameter made mandatory
 	  for the equals() method.
 	* server/vm/ASHandlers.cpp (ActionEquals): update calls to

Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- testsuite/actionscript.all/MovieClip.as	26 Jul 2007 03:41:19 -0000	1.78
+++ testsuite/actionscript.all/MovieClip.as	2 Aug 2007 18:57:00 -0000	1.79
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.78 2007/07/26 03:41:19 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.79 2007/08/02 18:57:00 strk Exp $";
 
 #include "check.as"
 
@@ -64,13 +64,22 @@
 #if OUTPUT_VERSION >= 6
 check(MovieClip.prototype.hasOwnProperty('loadMovie'));
 check(!MovieClip.prototype.hasOwnProperty('loadMovieNum'));
+check(!MovieClip.prototype.hasOwnProperty('valueOf')); 
+check(!MovieClip.prototype.hasOwnProperty('toString')); 
 #endif
+check_equals(typeof(mc.valueOf), 'function');
+check_equals(typeof(mc.toString), 'function');
+
+check_equals(typeof(mc.valueOf()), 'movieclip');
 
 check_equals(typeof(mc.enabled), 'boolean');
 #if OUTPUT_VERSION >= 6
 check(!mc.hasOwnProperty('enabled'));
 check(mc.__proto__.hasOwnProperty('enabled'));
+check(!mc.hasOwnProperty('valueOf'));
+check(!mc.hasOwnProperty('toString'));
 #endif
+
 check_equals(mc.enabled, true);
 mc.enabled = false;
 check_equals(typeof(mc.enabled), 'boolean');



From MAILER-DAEMON Thu Aug 02 15:10:57 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGg4X-0002rx-4C
	for mharc-gnash-commit@gnu.org; Thu, 02 Aug 2007 15:10:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGg4U-0002rG-Qs
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 15:10:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGg4T-0002qg-R7
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 15:10:54 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGg4T-0002qX-HP
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 15:10:53 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IGg4T-00009Z-7y
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 15:10:53 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IGg4S-0001zP-42
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 19:10:52 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IGg4R-0001zE-UC
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 19:10:51 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGg4R-0001zE-UC@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 02 Aug 2007 19:10:51 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/Func...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Aug 2007 19:10:55 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/02 19:10:51

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: Function.as ops.as 

Log message:
	        * testsuite/actionscript.all/: Function.as, ops.as:
	          Moved tests for equality operator against MovieClip where
	          it belongs.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3919&r2=1.3920
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Function.as?cvsroot=gnash&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/ops.as?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3919
retrieving revision 1.3920
diff -u -b -r1.3919 -r1.3920
--- ChangeLog	2 Aug 2007 18:56:59 -0000	1.3919
+++ ChangeLog	2 Aug 2007 19:10:51 -0000	1.3920
@@ -1,5 +1,11 @@
 2007-08-02 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/actionscript.all/: Function.as, ops.as:
+	  Moved tests for equality operator against MovieClip where
+	  it belongs.
+
+2007-08-02 Sandro Santilli <strk@keybit.net>
+
 	* testsuite/actionscript.all/MovieClip.as: test MovieClip.valueOf().
 	* server/as_value.{cpp,h}: as_environment parameter made mandatory
 	  for the equals() method.

Index: testsuite/actionscript.all/Function.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Function.as,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- testsuite/actionscript.all/Function.as	26 Jul 2007 03:41:18 -0000	1.52
+++ testsuite/actionscript.all/Function.as	2 Aug 2007 19:10:51 -0000	1.53
@@ -21,7 +21,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Function.as,v 1.52 2007/07/26 03:41:18 strk Exp $";
+rcsid="$Id: Function.as,v 1.53 2007/08/02 19:10:51 strk Exp $";
 
 #include "check.as"
 
@@ -674,12 +674,6 @@
 o.num = 5;
 testInFunctionContext(o);
 
-// Quick test to verify that a movieclip is never equal to an object, despite it's primitive value
-o = new Object();
-o.valueOf = function() { return _root; };
-check_equals(_root, o);
-check_equals(o, _root);
-
 //-----------------------------------------------------------------------------
 // Test local vars scope of outer function to be kept alive by inner functions
 //-----------------------------------------------------------------------------

Index: testsuite/actionscript.all/ops.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/ops.as,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- testsuite/actionscript.all/ops.as	2 Aug 2007 17:35:57 -0000	1.6
+++ testsuite/actionscript.all/ops.as	2 Aug 2007 19:10:51 -0000	1.7
@@ -20,7 +20,7 @@
  *  Test binary predicates (equal, less_then, greater_then, logical and bitwise ops)
  */
 
-rcsid="$Id: ops.as,v 1.6 2007/08/02 17:35:57 strk Exp $";
+rcsid="$Id: ops.as,v 1.7 2007/08/02 19:10:51 strk Exp $";
 
 #include "check.as"
 
@@ -78,6 +78,13 @@
   xcheck( str1 == str2 );  // SWF5 automatically converts to a string for comparison !
 #endif // OUTPUT_VERSION <= 5
 
+// for MovieClip
+
+check("_root" != _root);
+check(_root != "_root");
+o = new Object(); o.valueOf = function() { return _root; };
+check_equals(_root, o);
+check_equals(o, _root);
 
 //---------------------------------------------
 // Less then operator (ACTION_LESSTHAN : 0x0F)



From MAILER-DAEMON Thu Aug 02 16:11:39 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGh1H-0008Sb-My
	for mharc-gnash-commit@gnu.org; Thu, 02 Aug 2007 16:11:39 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGh1G-0008SN-Er
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 16:11:38 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGh1F-0008SB-MD
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 16:11:38 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGh1F-0008S8-Ei
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 16:11:37 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IGh1F-0003pK-5n
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 16:11:37 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IGh1E-0006Zr-2g
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 20:11:36 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IGh1D-0006Zm-Vv
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 20:11:36 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGh1D-0006Zm-Vv@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 02 Aug 2007 20:11:35 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/as_value.cpp testsuite/a...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Aug 2007 20:11:38 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/02 20:11:35

Modified files:
	.              : ChangeLog 
	server         : as_value.cpp 
	testsuite/actionscript.all: ops.as 

Log message:
	        * server/as_value.cpp (equals): yet another pass at
	          abstract equality operator. We're still not there, but
	          getting closer.
	        * testsuite/actionscript.all/ops.as: xcheck -> check.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3920&r2=1.3921
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/ops.as?cvsroot=gnash&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3920
retrieving revision 1.3921
diff -u -b -r1.3920 -r1.3921
--- ChangeLog	2 Aug 2007 19:10:51 -0000	1.3920
+++ ChangeLog	2 Aug 2007 20:11:35 -0000	1.3921
@@ -1,5 +1,12 @@
 2007-08-02 Sandro Santilli <strk@keybit.net>
 
+	* server/as_value.cpp (equals): yet another pass at
+	  abstract equality operator. We're still not there, but
+	  getting closer.
+	* testsuite/actionscript.all/ops.as: xcheck -> check.
+
+2007-08-02 Sandro Santilli <strk@keybit.net>
+
 	* testsuite/actionscript.all/: Function.as, ops.as:
 	  Moved tests for equality operator against MovieClip where
 	  it belongs.

Index: server/as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- server/as_value.cpp	2 Aug 2007 18:28:42 -0000	1.62
+++ server/as_value.cpp	2 Aug 2007 20:11:35 -0000	1.63
@@ -46,6 +46,9 @@
 // rather then by "target" ref.
 #define MOVIECLIP_AS_SOFTREF
 
+// Define the macro below to make abstract equality operator verbose
+//#define GNASH_DEBUG_EQUALITY
+
 namespace gnash {
 
 //
@@ -632,7 +635,12 @@
 bool
 as_value::equals(const as_value& v, as_environment& env) const
 {
-    //log_msg("equals(%s, %s) called", to_debug_string().c_str(), v.to_debug_string().c_str());
+    // Comments starting with numbers refer to the ECMA-262 document
+
+#ifdef GNASH_DEBUG_EQUALITY
+    static int count=0;
+    log_debug("equals(%s, %s) called [%d]", to_debug_string().c_str(), v.to_debug_string().c_str(), count++);
+#endif
 
     bool this_nulltype = (m_type == UNDEFINED || m_type == NULLTYPE);
     bool v_nulltype = (v.get_type() == UNDEFINED || v.get_type() == NULLTYPE);
@@ -648,46 +656,82 @@
     if ( obj_or_func && v_obj_or_func ) return m_object_value == v.m_object_value;
     if ( m_type == v.m_type ) return equalsSameType(v);
 
+    // 16. If Type(x) is Number and Type(y) is String,
+    //    return the result of the comparison x == ToNumber(y).
     else if (m_type == NUMBER && v.m_type == STRING)
     {
 	return equalsSameType(v.to_number(&env)); 
     }
+
+    // 17. If Type(x) is String and Type(y) is Number,
+    //     return the result of the comparison ToNumber(x) == y.
     else if (v.m_type == NUMBER && m_type == STRING)
     {
 	return v.equalsSameType(to_number(&env)); 
     }
-    else if (m_type == STRING)
-    {
-	return m_string_value == v.to_string(&env);
-    }
+
+    // 18. If Type(x) is Boolean, return the result of the comparison ToNumber(x) == y.
     else if (m_type == BOOLEAN)
     {
 	return as_value(to_number(&env)).equals(v, env); // m_boolean_value == v.to_bool();
     }
+
+    // 19. If Type(y) is Boolean, return the result of the comparison x == ToNumber(y).
     else if (v.m_type == BOOLEAN)
     {
 	return as_value(v.to_number(&env)).equals(*this, env); 
     }
 
-    else if (m_type == OBJECT || m_type == AS_FUNCTION)
+    // 20. If Type(x) is either String or Number and Type(y) is Object,
+    //     return the result of the comparison x == ToPrimitive(y).
+    else if ( (m_type == STRING || m_type == NUMBER ) && ( v.is_object() ) ) // v.m_type == OBJECT || v.m_type == AS_FUNCTION ) )
+    {
+        // convert this value to a primitive and recurse
+        as_value v2 = v.to_primitive(env); 
+#ifdef GNASH_DEBUG_EQUALITY
+       log_debug(" convertion to primitive : %s -> %s", v.to_debug_string().c_str(), v2.to_debug_string().c_str());
+#endif
+        if ( v.strictly_equals(v2) ) // returned self ?
+        {
+            return false; // no valid conversion  
+        }
+        else return equals(v2, env);
+    }
+
+    // 21. If Type(x) is Object and Type(y) is either String or Number,
+    //    return the result of the comparison ToPrimitive(x) == y.
+    else if ( (v.m_type == STRING || v.m_type == NUMBER ) && ( is_object() ) ) // m_type == OBJECT || m_type == AS_FUNCTION ) )
     {
-    	assert ( ! (v.m_type == OBJECT || v.m_type == AS_FUNCTION) );
 	// convert this value to a primitive and recurse
 	as_value v2 = to_primitive(env); 
-	if ( v2.m_type == OBJECT || v2.m_type == AS_FUNCTION ) return false; // no valid conversion 
+#ifdef GNASH_DEBUG_EQUALITY
+       log_debug(" convertion to primitive : %s -> %s", to_debug_string().c_str(), v2.to_debug_string().c_str());
+#endif
+        if ( strictly_equals(v2) ) // returned self ?
+        {
+            return false; // no valid conversion 
+        }
 	else return v2.equals(v, env);
     }
 
-    else if (v.m_type == OBJECT || v.m_type == AS_FUNCTION)
+    // Both operands are objects (OBJECT,AS_FUNCTION,MOVIECLIP)
+    assert(is_object() && v.is_object());
+
+    // If any of the two converts to a primitive, we recurse
+
+    as_value p = to_primitive(env); 
+    as_value vp = v.to_primitive(env); 
+#ifdef GNASH_DEBUG_EQUALITY
+    log_debug(" convertion to primitive (this): %s -> %s", to_debug_string().c_str(), p.to_debug_string().c_str());
+    log_debug(" convertion to primitive (that): %s -> %s", v.to_debug_string().c_str(), vp.to_debug_string().c_str());
+#endif
+    if ( strictly_equals(p) && v.strictly_equals(vp) ) // both returned self ?
     {
-    	assert ( ! (m_type == OBJECT || m_type == AS_FUNCTION) );
-	// convert this value to a primitive and recurse
-	as_value v2 = v.to_primitive(env); 
-	if ( v2.m_type == OBJECT || v2.m_type == AS_FUNCTION ) return false; // no valid conversion 
-	else return equals(v2, env);
+            return false; // no valid conversion 
     }
 
-    return false;
+    return p.equals(vp, env);
+
 }
 	
 // Sets *this to this string plus the given string.

Index: testsuite/actionscript.all/ops.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/ops.as,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- testsuite/actionscript.all/ops.as	2 Aug 2007 19:10:51 -0000	1.7
+++ testsuite/actionscript.all/ops.as	2 Aug 2007 20:11:35 -0000	1.8
@@ -20,7 +20,7 @@
  *  Test binary predicates (equal, less_then, greater_then, logical and bitwise ops)
  */
 
-rcsid="$Id: ops.as,v 1.7 2007/08/02 19:10:51 strk Exp $";
+rcsid="$Id: ops.as,v 1.8 2007/08/02 20:11:35 strk Exp $";
 
 #include "check.as"
 
@@ -56,7 +56,7 @@
 ary2 = [1,2,3];
 check( ! (ary1 == ary2) ); // two different objects
 check( ! (ary1 == "1,2,3") ); // the array doesn't get converted to a string
-xcheck( ! ("1,2,3" == ary1) ); // the array doesn't get converted to a string
+check( ! ("1,2,3" == ary1) ); // the array doesn't get converted to a string
 
 // for String
 str1 = new String("hello");



From MAILER-DAEMON Thu Aug 02 17:08:06 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGhtu-0005Tw-OX
	for mharc-gnash-commit@gnu.org; Thu, 02 Aug 2007 17:08:06 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGhtt-0005Tr-Fs
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 17:08:05 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGhtr-0005Tf-Oh
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 17:08:04 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGhtr-0005Tc-Jv
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 17:08:03 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IGhtr-0000Wv-9B
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 17:08:03 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IGhtq-0001sZ-2y
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 21:08:02 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IGhtp-0001sW-T4
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 21:08:01 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGhtp-0001sW-T4@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 02 Aug 2007 21:08:01 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/ops.as
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Aug 2007 21:08:05 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/02 21:08:01

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: ops.as 

Log message:
	* testsuite/actionscript.all/ops.as: more tests for 'string' == NaN.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3921&r2=1.3922
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/ops.as?cvsroot=gnash&r1=1.8&r2=1.9

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3921
retrieving revision 1.3922
diff -u -b -r1.3921 -r1.3922
--- ChangeLog	2 Aug 2007 20:11:35 -0000	1.3921
+++ ChangeLog	2 Aug 2007 21:08:01 -0000	1.3922
@@ -1,5 +1,6 @@
 2007-08-02 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/actionscript.all/ops.as: more tests for 'string' == NaN.
 	* server/as_value.cpp (equals): yet another pass at
 	  abstract equality operator. We're still not there, but
 	  getting closer.

Index: testsuite/actionscript.all/ops.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/ops.as,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- testsuite/actionscript.all/ops.as	2 Aug 2007 20:11:35 -0000	1.8
+++ testsuite/actionscript.all/ops.as	2 Aug 2007 21:08:01 -0000	1.9
@@ -20,7 +20,7 @@
  *  Test binary predicates (equal, less_then, greater_then, logical and bitwise ops)
  */
 
-rcsid="$Id: ops.as,v 1.8 2007/08/02 20:11:35 strk Exp $";
+rcsid="$Id: ops.as,v 1.9 2007/08/02 21:08:01 strk Exp $";
 
 #include "check.as"
 
@@ -38,6 +38,12 @@
 check(undefined == undefined);
 check(null==undefined); 
 check(undefined==null); 
+check(! (NaN == 0) );
+check(! (0 == NaN) );
+check(! ('string' == 0) );
+check(! (0 == 'string') );
+check(! ('string' == NaN) );
+check(! (NaN == 'string') );
 check(1==true);
 check(true==1);
 check(2!=true);



From MAILER-DAEMON Thu Aug 02 17:10:28 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGhwC-0006PK-Fq
	for mharc-gnash-commit@gnu.org; Thu, 02 Aug 2007 17:10:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGhwA-0006Of-MK
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 17:10:26 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGhw9-0006OS-C6
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 17:10:25 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGhw9-0006OP-1t
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 17:10:25 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IGhw8-00013r-H1
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 17:10:24 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IGhw7-0001vz-I2
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 21:10:23 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IGhw7-0001vw-EE
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 21:10:23 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGhw7-0001vw-EE@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 02 Aug 2007 21:10:23 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/testsuite/actionscript.all ops.as
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Aug 2007 21:10:26 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/02 21:10:23

Modified files:
	testsuite/actionscript.all: ops.as 

Log message:
	check->xcheck

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/ops.as?cvsroot=gnash&r1=1.9&r2=1.10

Patches:
Index: ops.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/ops.as,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- ops.as	2 Aug 2007 21:08:01 -0000	1.9
+++ ops.as	2 Aug 2007 21:10:23 -0000	1.10
@@ -20,7 +20,7 @@
  *  Test binary predicates (equal, less_then, greater_then, logical and bitwise ops)
  */
 
-rcsid="$Id: ops.as,v 1.9 2007/08/02 21:08:01 strk Exp $";
+rcsid="$Id: ops.as,v 1.10 2007/08/02 21:10:23 strk Exp $";
 
 #include "check.as"
 
@@ -42,8 +42,8 @@
 check(! (0 == NaN) );
 check(! ('string' == 0) );
 check(! (0 == 'string') );
-check(! ('string' == NaN) );
-check(! (NaN == 'string') );
+xcheck(! ('string' == NaN) );
+xcheck(! (NaN == 'string') );
 check(1==true);
 check(true==1);
 check(2!=true);



From MAILER-DAEMON Thu Aug 02 17:14:40 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGi0G-0001sA-Oh
	for mharc-gnash-commit@gnu.org; Thu, 02 Aug 2007 17:14:40 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGi0E-0001rh-IE
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 17:14:38 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGi0D-0001rE-Pi
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 17:14:38 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGi0D-0001r9-IW
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 17:14:37 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IGi0D-00021m-BC
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 17:14:37 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IGi0C-00036Z-7a
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 21:14:36 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IGi0C-00036S-09
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 21:14:36 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGi0C-00036S-09@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 02 Aug 2007 21:14:36 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/array.cpp server/as_func...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Aug 2007 21:14:38 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/02 21:14:35

Modified files:
	.              : ChangeLog 
	server         : array.cpp as_function.cpp 

Log message:
	        * server/array.cpp: register static constructor and prototype,
	          since arrays are used by the core independentely of their
	          availability as global classes (function arguments are arrays).
	        * server/as_function.cpp: register static constructor and prototype,
	          since functions are used by the core independently of their
	          availability as global classes (each function uses the Function
	          prototype).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3922&r2=1.3923
http://cvs.savannah.gnu.org/viewcvs/gnash/server/array.cpp?cvsroot=gnash&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_function.cpp?cvsroot=gnash&r1=1.35&r2=1.36

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3922
retrieving revision 1.3923
diff -u -b -r1.3922 -r1.3923
--- ChangeLog	2 Aug 2007 21:08:01 -0000	1.3922
+++ ChangeLog	2 Aug 2007 21:14:35 -0000	1.3923
@@ -1,5 +1,15 @@
 2007-08-02 Sandro Santilli <strk@keybit.net>
 
+	* server/array.cpp: register static constructor and prototype,
+	  since arrays are used by the core independentely of their
+	  availability as global classes (function arguments are arrays).
+	* server/as_function.cpp: register static constructor and prototype,
+	  since functions are used by the core independently of their
+	  availability as global classes (each function uses the Function
+	  prototype).
+
+2007-08-02 Sandro Santilli <strk@keybit.net>
+
 	* testsuite/actionscript.all/ops.as: more tests for 'string' == NaN.
 	* server/as_value.cpp (equals): yet another pass at
 	  abstract equality operator. We're still not there, but

Index: server/array.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/array.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- server/array.cpp	31 Jul 2007 02:39:05 -0000	1.68
+++ server/array.cpp	2 Aug 2007 21:14:35 -0000	1.69
@@ -1335,6 +1335,8 @@
 	if ( proto == NULL )
 	{
 		proto = new as_object();
+		VM::get().addStatic(proto.get());
+
 		attachArrayInterface(*proto);
 	}
 	return proto.get();
@@ -1354,6 +1356,7 @@
 	if ( ar == NULL )
 	{
 		ar = new builtin_function(&array_new, getArrayInterface());
+		VM::get().addStatic(ar.get());
 
 		// We replicate interface to the Array class itself
 		attachArrayInterface(*ar);

Index: server/as_function.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_function.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- server/as_function.cpp	1 Jul 2007 10:54:20 -0000	1.35
+++ server/as_function.cpp	2 Aug 2007 21:14:35 -0000	1.36
@@ -71,8 +71,10 @@
 	static boost::intrusive_ptr<as_object> proto;
 
 	if ( proto.get() == NULL ) {
+
 		// Initialize Function prototype
 		proto = new as_object();
+		VM::get().addStatic(proto.get());
 
 		if ( VM::get().getSWFVersion() >= 6 )
 		{
@@ -154,10 +156,15 @@
 boost::intrusive_ptr<builtin_function>
 as_function::getFunctionConstructor()
 {
-	static boost::intrusive_ptr<builtin_function> func=new builtin_function(
+	static boost::intrusive_ptr<builtin_function> func = NULL;
+	if ( ! func )
+	{
+		func = new builtin_function(
 		function_ctor, // function constructor doesn't do anything
 		getFunctionPrototype() // exported interface
 		);
+		VM::get().addStatic(func.get());
+	}
 	return func;
 }
 



From MAILER-DAEMON Thu Aug 02 17:23:47 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGi95-000650-7U
	for mharc-gnash-commit@gnu.org; Thu, 02 Aug 2007 17:23:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGi93-00064s-JW
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 17:23:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGi92-00064Z-Gj
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 17:23:44 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGi92-00064W-Bw
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 17:23:44 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IGi92-0003wJ-4C
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 17:23:44 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IGi91-0003Zj-2F
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 21:23:43 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IGi90-0003Zg-TG
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 21:23:42 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGi90-0003Zg-TG@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 02 Aug 2007 21:23:42 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/edit_text_character.cpp ...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Aug 2007 21:23:45 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/02 21:23:42

Modified files:
	.              : ChangeLog 
	server         : edit_text_character.cpp sprite_instance.cpp 
	                 video_stream_instance.cpp 

Log message:
	        * server/edit_text_character.cpp: register statics.
	        * server/sprite_instance.cpp: register statics.
	        * server/video_stream_instance.cpp: register statics.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3923&r2=1.3924
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.95&r2=1.96
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.302&r2=1.303
http://cvs.savannah.gnu.org/viewcvs/gnash/server/video_stream_instance.cpp?cvsroot=gnash&r1=1.32&r2=1.33

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3923
retrieving revision 1.3924
diff -u -b -r1.3923 -r1.3924
--- ChangeLog	2 Aug 2007 21:14:35 -0000	1.3923
+++ ChangeLog	2 Aug 2007 21:23:42 -0000	1.3924
@@ -1,5 +1,8 @@
 2007-08-02 Sandro Santilli <strk@keybit.net>
 
+	* server/edit_text_character.cpp: register statics.
+	* server/sprite_instance.cpp: register statics.
+	* server/video_stream_instance.cpp: register statics.
 	* server/array.cpp: register static constructor and prototype,
 	  since arrays are used by the core independentely of their
 	  availability as global classes (function arguments are arrays).

Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- server/edit_text_character.cpp	25 Jul 2007 14:20:14 -0000	1.95
+++ server/edit_text_character.cpp	2 Aug 2007 21:23:42 -0000	1.96
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: edit_text_character.cpp,v 1.95 2007/07/25 14:20:14 strk Exp $ */
+/* $Id: edit_text_character.cpp,v 1.96 2007/08/02 21:23:42 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -360,6 +360,8 @@
 	if ( proto == NULL )
 	{
 		proto = new as_object();
+		VM::get().addStatic(proto.get());
+
 		attachTextFieldInterface(*proto);
 		//proto->init_member("constructor", new builtin_function(textfield_ctor)); 
 	}
@@ -1342,6 +1344,8 @@
 	if ( cl == NULL )
 	{
 		cl=new builtin_function(&textfield_ctor, getTextFieldInterface());
+		VM::get().addStatic(cl.get());
+
 		// replicate all interface to class, to be able to access
 		// all methods as static functions
 		attachTextFieldStaticMembers(*cl);

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -b -r1.302 -r1.303
--- server/sprite_instance.cpp	27 Jul 2007 03:35:58 -0000	1.302
+++ server/sprite_instance.cpp	2 Aug 2007 21:23:42 -0000	1.303
@@ -1589,6 +1589,8 @@
 	if ( proto == NULL )
 	{
 		proto = new as_object();
+		VM::get().addStatic(proto.get());
+
 		attachMovieClipInterface(*proto);
 		//proto->init_member("constructor", new builtin_function(movieclip_ctor));
 	}
@@ -1604,6 +1606,8 @@
 	if ( cl == NULL )
 	{
 		cl=new builtin_function(&movieclip_ctor, getMovieClipInterface());
+		VM::get().addStatic(cl.get());
+
 		// replicate all interface to class, to be able to access
 		// all methods as static functions
 		attachMovieClipInterface(*cl);

Index: server/video_stream_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/video_stream_instance.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- server/video_stream_instance.cpp	9 Jul 2007 13:33:30 -0000	1.32
+++ server/video_stream_instance.cpp	2 Aug 2007 21:23:42 -0000	1.33
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 
-// $Id: video_stream_instance.cpp,v 1.32 2007/07/09 13:33:30 strk Exp $
+// $Id: video_stream_instance.cpp,v 1.33 2007/08/02 21:23:42 strk Exp $
 
 #include "sprite_instance.h"
 #include "video_stream_instance.h"
@@ -45,6 +45,8 @@
 	if ( proto == NULL )
 	{
 		proto = new as_object();
+		VM::get().addStatic(proto.get());
+
 		attachVideoInterface(*proto);
 		//proto->init_member("constructor", new builtin_function(video_ctor));
 	}
@@ -265,6 +267,8 @@
 	if ( cl == NULL )
 	{
 		cl=new builtin_function(&video_ctor, getVideoInterface());
+		VM::get().addStatic(cl.get());
+
 		// replicate all interface to class, to be able to access
 		// all methods as static functions
 		//attachVideoInterface(*cl);



From MAILER-DAEMON Thu Aug 02 18:07:29 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGipN-0005Zc-TV
	for mharc-gnash-commit@gnu.org; Thu, 02 Aug 2007 18:07:29 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGipM-0005ZK-Ok
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 18:07:28 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGipM-0005Z8-1i
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 18:07:28 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGipL-0005Z5-Um
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 18:07:27 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IGipL-00056i-HY
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 18:07:27 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IGipK-0005yB-D0
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 22:07:26 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IGipK-0005y8-9w
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 22:07:26 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGipK-0005y8-9w@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 02 Aug 2007 22:07:26 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/movie_root.cpp server/mo...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Aug 2007 22:07:28 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/02 22:07:26

Modified files:
	.              : ChangeLog 
	server         : movie_root.cpp movie_root.h 

Log message:
	        * server/movie_root.{cpp,h}: use a member (and a getter) for the global
	          key object, and properly mark it as alive.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3924&r2=1.3925
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.80&r2=1.81
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.h?cvsroot=gnash&r1=1.69&r2=1.70

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3924
retrieving revision 1.3925
diff -u -b -r1.3924 -r1.3925
--- ChangeLog	2 Aug 2007 21:23:42 -0000	1.3924
+++ ChangeLog	2 Aug 2007 22:07:25 -0000	1.3925
@@ -1,5 +1,10 @@
 2007-08-02 Sandro Santilli <strk@keybit.net>
 
+	* server/movie_root.{cpp,h}: use a member (and a getter) for the global
+	  key object, and properly mark it as alive.
+
+2007-08-02 Sandro Santilli <strk@keybit.net>
+
 	* server/edit_text_character.cpp: register statics.
 	* server/sprite_instance.cpp: register statics.
 	* server/video_stream_instance.cpp: register statics.

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- server/movie_root.cpp	2 Aug 2007 04:57:19 -0000	1.80
+++ server/movie_root.cpp	2 Aug 2007 22:07:25 -0000	1.81
@@ -247,23 +247,19 @@
 
 }
 
-
-
-key_as_object *
-movie_root::notify_global_key(key::code k, bool down)
+boost::intrusive_ptr<key_as_object>
+movie_root::getKeyObject()
 {
 	VM& vm = VM::get();
-	if ( vm.getSWFVersion() < 5 )
-	{
-		// Key was added in SWF5
-		return NULL; 
-	}
 
-	static boost::intrusive_ptr<key_as_object> keyobject = NULL;
-	if ( ! keyobject )
+	// TODO: test what happens with the global "Key" object
+	//       is removed or overridden by the user
+
+	if ( ! _keyobject )
 	{
-		// This isn't very performant... do we allow user override
-		// of _global.Key, btw ?
+		// This isn't very performant... 
+		// it will keep trying to find it even if impossible
+		// to find.
 
 		as_value kval;
 		as_object* global = VM::get().getGlobal();
@@ -278,21 +274,36 @@
 			//log_msg("Found member 'Key' in _global: %s", kval.to_string());
 			boost::intrusive_ptr<as_object> obj = kval.to_object();
 			//log_msg("_global.Key to_object() : %s @ %p", typeid(*obj).name(), obj);
-			keyobject = boost::dynamic_pointer_cast<key_as_object>( obj );
+			_keyobject = boost::dynamic_pointer_cast<key_as_object>( obj );
+		}
 		}
+
+	return _keyobject;
+}
+
+
+key_as_object *
+movie_root::notify_global_key(key::code k, bool down)
+{
+	VM& vm = VM::get();
+	if ( vm.getSWFVersion() < 5 )
+	{
+		// Key was added in SWF5
+		return NULL; 
 	}
 
+	boost::intrusive_ptr<key_as_object> keyobject = getKeyObject();
 	if ( keyobject )
 	{
-		if (down) keyobject->set_key_down(k);
-		else keyobject->set_key_up(k);
+		if (down) _keyobject->set_key_down(k);
+		else _keyobject->set_key_up(k);
 	}
 	else
 	{
 		log_error("gnash::notify_key_event(): _global.Key doesn't exist, or isn't the expected built-in\n");
 	}
 
-	return keyobject.get();
+	return _keyobject.get();
 }
 
 bool
@@ -1118,8 +1129,7 @@
 void
 movie_root::markReachableResources() const
 {
-	// Mark root movie as reachable
-	// TODO: mark all levels !!
+	// Mark movie levels as reachable
 	for (Levels::const_reverse_iterator i=_movies.rbegin(), e=_movies.rend(); i!=e; ++i)
 	{
 		i->second->setReachable();
@@ -1157,6 +1167,9 @@
 		(*i)->setReachable();
 	}
 #endif
+
+	// Mark global key object
+	if ( _keyobject ) _keyobject->setReachable();
 }
 #endif // GNASH_USE_GC
 

Index: server/movie_root.h
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.h,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- server/movie_root.h	18 Jul 2007 23:31:59 -0000	1.69
+++ server/movie_root.h	2 Aug 2007 22:07:26 -0000	1.70
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: movie_root.h,v 1.69 2007/07/18 23:31:59 strk Exp $ */
+/* $Id: movie_root.h,v 1.70 2007/08/02 22:07:26 strk Exp $ */
 
 /// \page events_handling Handling of user events
 ///
@@ -539,6 +539,7 @@
     /// - Timer targets (_intervalTimers)
     /// - Resources reachable by ActionQueue code (_actionQueue)
     /// - Key listeners (_keyListeners || m_key_listeners)
+    /// - global Key object (_keyobject)
     ///
     void markReachableResources() const;
 #endif // GNASH_USE_GC
@@ -612,6 +613,9 @@
 #else
     ListenerSet m_key_listeners;
 #endif
+
+    boost::intrusive_ptr<key_as_object> _keyobject;
+
     /// Objects listening for mouse events (down,up,move)
     ListenerSet m_mouse_listeners;
 
@@ -680,6 +684,13 @@
     /// _level<num>
     ///
     void setLevel(unsigned int num, boost::intrusive_ptr<movie_instance> movie);
+
+    /// Return the global Key object 
+    //
+    /// @@ might be worth making public
+    ///
+    boost::intrusive_ptr<key_as_object> getKeyObject();
+
 };
 
 



From MAILER-DAEMON Thu Aug 02 19:08:12 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGjm8-00024T-Le
	for mharc-gnash-commit@gnu.org; Thu, 02 Aug 2007 19:08:12 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGjm7-000237-Fe
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 19:08:11 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGjm6-00021x-Cq
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 19:08:11 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGjm6-00021l-7R
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 19:08:10 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IGjm5-00076e-U7
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 19:08:10 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IGjm4-0001Sr-Qs
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 23:08:08 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IGjm4-0001So-Mr
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 23:08:08 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGjm4-0001So-Mr@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 02 Aug 2007 23:08:08 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/asobj/gen-asclass.sh
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Aug 2007 23:08:11 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/02 23:08:08

Modified files:
	.              : ChangeLog 
	server/asobj   : gen-asclass.sh 

Log message:
	* server/asobj/gen-asclass.sh: add the addStatic call to statics.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3925&r2=1.3926
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/gen-asclass.sh?cvsroot=gnash&r1=1.15&r2=1.16

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3925
retrieving revision 1.3926
diff -u -b -r1.3925 -r1.3926
--- ChangeLog	2 Aug 2007 22:07:25 -0000	1.3925
+++ ChangeLog	2 Aug 2007 23:08:08 -0000	1.3926
@@ -1,5 +1,6 @@
 2007-08-02 Sandro Santilli <strk@keybit.net>
 
+	* server/asobj/gen-asclass.sh: add the addStatic call to statics.
 	* server/movie_root.{cpp,h}: use a member (and a getter) for the global
 	  key object, and properly mark it as alive.
 

Index: server/asobj/gen-asclass.sh
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/gen-asclass.sh,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- server/asobj/gen-asclass.sh	1 Jul 2007 10:54:32 -0000	1.15
+++ server/asobj/gen-asclass.sh	2 Aug 2007 23:08:08 -0000	1.16
@@ -180,6 +180,8 @@
 	if ( ! o )
 	{
 		o = new as_object();
+		VM::get().addStatic(o.get());
+
 		attach${asname}Interface(*o);
 	}
 	return o.get();
@@ -252,6 +254,8 @@
 	if ( cl == NULL )
 	{
 		cl=new builtin_function(&${lowname}_ctor, get${asname}Interface());
+		VM::get().addStatic(cl.get());
+
 		// replicate all interface to class, to be able to access
 		// all methods as static functions
 		attach${asname}Interface(*cl);



From MAILER-DAEMON Thu Aug 02 23:01:23 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGnPm-0003FP-W6
	for mharc-gnash-commit@gnu.org; Thu, 02 Aug 2007 23:01:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGnPl-0003FH-0F
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 23:01:21 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGnPj-0003F5-8N
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 23:01:19 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGnPj-0003F2-38
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 23:01:19 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <rob@welcomehome.org>) id 1IGnPi-0003EL-DC
	for gnash-commit@gnu.org; Thu, 02 Aug 2007 23:01:18 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <rob@welcomehome.org>) id 1IGnPh-0001uX-7V
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 03:01:17 +0000
Received: from rsavoye by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <rsavoye@savannah.gnu.org>) id 1IGnPh-0001uU-34
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 03:01:17 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGnPh-0001uU-34@cvs.savannah.gnu.org>
From: Rob Savoye <rob@welcomehome.org>
Date: Fri, 03 Aug 2007 03:01:17 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash plugin/Makefile.am Makefile.am configure....
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Aug 2007 03:01:21 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Rob Savoye <rsavoye>	07/08/03 03:01:16

Modified files:
	plugin         : Makefile.am 
	.              : Makefile.am configure.ac ChangeLog 
	gui            : Makefile.am 
	macros         : firefox.m4 kde.m4 
	plugin/klash   : Makefile.am 

Log message:
		* plugin/Makefile.am: Use BUILD_KDE_GUI instead of KLASH. Use
		NSAPI instead of PLUGIN, KPARTS instead of KLASH.
		* Makefile.am: Change from PLUGIN to NSAPI and KPARTS for conditionals. 
		* configure.ac: Change --disable-klash to --disable-kparts, add
		--disable-nsapi to replace the older --disable-plugin
		setting. Make building the plugins conditional on the gui being
		selected and if the development libraries exist.
		* gui/Makefile.am: Comment out the dyna,ic vs static support, it's
		uneeded for now.
		* macros/firefox.m4: Use nsapi instead of plugin as the
		conditional.
		* macros/kde.m4: set has_kde to yes by default. It can get
		disabled later.
		* plugin/klash/Makefile.am: Use KPARTS instead of KLASH.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/Makefile.am?cvsroot=gnash&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.82&r2=1.83
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.388&r2=1.389
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3926&r2=1.3927
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.100&r2=1.101
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/firefox.m4?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/kde.m4?cvsroot=gnash&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/Makefile.am?cvsroot=gnash&r1=1.32&r2=1.33

Patches:
Index: plugin/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/Makefile.am,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- plugin/Makefile.am	1 Jul 2007 10:54:14 -0000	1.60
+++ plugin/Makefile.am	3 Aug 2007 03:01:15 -0000	1.61
@@ -15,14 +15,14 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.60 2007/07/01 10:54:14 bjacques Exp $
+# $Id: Makefile.am,v 1.61 2007/08/03 03:01:15 rsavoye Exp $
 
 AUTOMAKE_OPTIONS = 
 
-if KLASH
+if BUILD_KDE_GUI
 KLASH = klash
 endif
-SUBDIRS = $(KLASH) # test mozilla-sdk
+SUBDIRS = $(KLASH)
 
 # if DMALLOC
 # MALL_CFLAGS = $(DMALLOC_CFLAGS)
@@ -79,6 +79,7 @@
 	 mozilla-sdk/include/prwin16.h \
          mozilla-sdk/include/obsolete/protypes.h 
 
+if NSAPI
 libgnashplugin_la_SOURCES  = plugin.cpp \
 	mozilla-sdk/npn_gate.cpp \
         mozilla-sdk/npp_gate.cpp \
@@ -114,3 +115,5 @@
 
 uninstall-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	$(RM) -f $(DESTDIR)$(plugindir)/libgnashplugin.so
+
+endif

Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- Makefile.am	26 Jul 2007 15:40:35 -0000	1.82
+++ Makefile.am	3 Aug 2007 03:01:15 -0000	1.83
@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # 
 
-# $Id: Makefile.am,v 1.82 2007/07/26 15:40:35 strk Exp $
+# $Id: Makefile.am,v 1.83 2007/08/03 03:01:15 rsavoye Exp $
 
 ## Process this file with automake to produce Makefile.in
 AUTOMAKE_OPTIONS = 1.6.0
@@ -34,14 +34,12 @@
 	po \
 	$(NULL)
 
-if PLUGIN
-if HAVE_GTK2
+if NSAPI
 PLUGIN_DIRS = plugin
-else
-if KLASH
-PLUGIN_DIRS = plugin
-endif
 endif
+
+if KPARTS
+PLUGIN_DIRS = plugin
 endif
 
 if DOCBOOK
@@ -219,8 +217,25 @@
 	@echo "Configurable options are:"
 	@echo "Media handler: $(MEDIA_CONFIG)"
 	@echo "Renderer engine: $(RENDERER_CONFIG)"
-	@echo "Supported GUI: $(GUI_CONFIG) ( default $(DEFAULT_GUI) )"
-#	@echo "Extensions: "
+
+if BUILD_GTK_GUI
+	@echo "Supported GUI: GTK"
+endif
+if BUILD_KDE_GUI
+	@echo "Supported GUI: KDE"
+endif
+if BUILD_SDL_GUI
+	@echo "Supported GUI: SDL"
+endif
+if BUILD_FLTK_GUI
+	@echo "Supported GUI: FLTK"
+endif
+if BUILD_AQUA_GUI
+	@echo "Supported GUI: AQUA"
+endif
+if BUILD_FB_GUI
+	@echo "Supported GUI: FB"
+endif
 
 check: check-recursive anal
 

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.388
retrieving revision 1.389
diff -u -b -r1.388 -r1.389
--- configure.ac	31 Jul 2007 21:59:49 -0000	1.388
+++ configure.ac	3 Aug 2007 03:01:15 -0000	1.389
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.388 2007/07/31 21:59:49 strk Exp $
+dnl $Id: configure.ac,v 1.389 2007/08/03 03:01:15 rsavoye Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -220,15 +220,8 @@
 
 AM_CONDITIONAL(SDKINSTALL, test x$sdkinstall = xyes)
 
-dnl Add KFLASH support, if specified.
-AC_ARG_ENABLE(klash,
-  AC_HELP_STRING([--disable-klash], [Disable support for Konqueror plugin]),
-[case "${enableval}" in
-  yes) klash=yes ;;
-  no)  klash=no ;;
-  *)   AC_MSG_ERROR([bad value ${enableval} for --disable-klash option]) ;;
-esac],klash=yes)
-
+has_kde=no
+has_gtk2=no
 build_fb=no
 build_fltk=no
 build_kde=no
@@ -609,7 +602,7 @@
   export incllist="`eval echo ${with_top_level}/include ${pkgroot}/${host_alias}/include ${pkgroot}/include`"
   export libslist="`eval echo ${with_top_level}/lib ${pkgroot}/${host_alias}/lib ${pkgroot}/lib64 ${pkgroot}/lib32 ${pkgroot}/lib`"
   export pathlist="`eval echo ${pkgroot}/${host_alias}/bin:${pkgroot}/bin`"
-  plugin=no
+  nsapi=no
 else
   AC_MSG_NOTICE([Configuring Gnash for native compilation])
   export incllist="`eval cat ${srcdir}/macros/incllist`"
@@ -638,21 +631,57 @@
 AC_PATH_TOOL([AUTOTRACE], [autotrace])
 AC_HEADER_DIRENT
 
+dnl Add KFLASH support, if specified.
+
+AC_ARG_ENABLE(kparts,
+  AC_HELP_STRING([--disable-kparts], [Disble support for Konqueror plugin (default=no)]),
+[case "${enableval}" in
+  yes) kparts=yes ;;
+  no)  kparts=no ;;
+  *)   AC_MSG_ERROR([bad value ${enableval} for --disable-kpart option]) ;;
+esac],kparts=yes)
+
 dnl
-dnl !! This has been moved here to make --enable-plugin work
+dnl !! This has been moved here to make --enable-nsapi work
 dnl !! All of plugin-related macro calls could be moved into
 dnl !! a specialized macros/plugin.m4
 dnl
-AC_ARG_ENABLE(plugin,
-  AC_HELP_STRING([--disable-plugin], [Disable plugins build]),
+AC_ARG_ENABLE(nsapi,
+  AC_HELP_STRING([--disable-nsapi], [Disable NSAPI plugin build (default=no)]),
   [case "${enableval}" in
-    yes) plugin=yes ;;
-    no)  plugin=no ;;
-    *)   AC_MSG_ERROR([bad value ${enableval} for disable-plugin option]) ;;
+    yes) nsapi=yes ;;
+    no)  nsapi=no ;;
+    *)   AC_MSG_ERROR([bad value ${enableval} for disable-nsapi option]) ;;
   esac],
-  plugin=yes
+  nsapi=yes
 )
 
+dnl dnl  Enable us to disable building all browser plugins in one command.
+dnl AC_ARG_ENABLE(plugins,
+dnl   AC_HELP_STRING([--disable-plugins], [Disable all browser plugins from building (default=no)]),
+dnl   [case "${enableval}" in
+dnl     yes) plugins=yes ;;
+dnl     no)  plugins=no ;;
+dnl     *)   AC_MSG_ERROR([bad value ${enableval} for disable-plugins option]) ;;
+dnl   esac],
+dnl   plugins=yes
+dnl )
+dnl if test x$plugins = xno; then
+dnl   nsapi=no
+dnl   kparts=no
+dnl fi
+
+dnl if test x$build_gtk = xyes; then
+dnl   if test x$plugins = xyes; then
+dnl     nsapi=yes
+dnl   fi
+dnl fi
+dnl if test x$build_kde = xyes; then
+dnl   if test x$plugins = xyes; then
+dnl     kparts=yes
+dnl   fi
+dnl fi
+
 GNASH_PATH_FIREFOX
 
 dnl IRIX-hack.
@@ -900,35 +929,48 @@
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(short)
 
-dnl # NO plugin ? NO klash !
-if test x"$plugin" = xno; then
-  echo "WARNING: plugin disabled, klash disabled accordingly"
-  klash=no
-fi
-
-dnl # Check KDE if kde gui or klash were requested
-if test x$build_kde = xyes -o x"$klash" = xyes; then
+dnl # Check KDE if kde gui or kparts were requested
+if test x$build_kde = xyes -o x"$kparts" = xyes; then
   kde=yes
   qt=yes
-  build_kde=yes
   GNASH_PATH_KDE
   GNASH_PATH_QT
 fi
 AM_CONDITIONAL(HAVE_KDE, [test x$has_kde = xyes])
 AM_CONDITIONAL(HAVE_QT, [test x$has_qt = xyes])
 
-dnl # NO kde ? NO klash !
-if test x$has_kde != xyes; then
-  if test x$klash = xyes; then
-    echo "WARNING: No KDE development package installed, disabling klash"
-    klash=no
-  fi
+dnl Need GLIB for both GTK and GST
+if test x$build_gtk = xyes -o x${media_handler} = "xgst"; then
+  GNASH_PATH_GLIB
 fi
-if test x$has_qt != xyes; then
-  if test x$klash = xyes; then
-    echo "WARNING: No QT development package installed, disabling klash"
-    klash=no
-  fi
+
+AM_CONDITIONAL(HAVE_GLIB, [ test x$has_glib = xyes ])
+
+if test x$build_ogl = xyes -a x$build_gtk = xyes; then
+   GNASH_PATH_GLEXT
+fi
+if test x$build_gtk = xyes; then
+   GNASH_PATH_GTK2
+   GNASH_PATH_PANGO
+   GNASH_PKG_FIND(atk, [atk/atk.h], [atk library], atk_focus_tracker_init, [1.0])
+fi
+
+if test x$has_gtk2 = xyes; then
+  nsapi=yes
+fi
+
+dnl if gtk isn't installed, even if it's specified, don't try to build
+dnl the NSAPI plugin, which is GTK based.
+if test x$has_gtk2 = xno; then
+  nsapi=no
+  AC_MSG_WARN(["No GTK development package installed, disabling NSAPI plugin"])
+fi
+
+dnl if kde isn't installed, even if it's specified, don't try to build
+dnl the KPARTS plugin, which is KDE based.
+if test x$has_kde = xno; then
+  kparts=no
+  AC_MSG_WARN(["No KDE development package installed, disabling KPARTS plugin"])
 fi
 
 AM_CONDITIONAL(BUILD_GTK_GUI, [ test x$build_gtk = xyes ])
@@ -940,7 +982,9 @@
 AM_CONDITIONAL(BUILD_AQUA_GUI, [ test x$build_aqua = xyes ])
 AM_CONDITIONAL(BUILD_RISCOS_GUI, [ test x$build_riscos = xyes ])
 
-AM_CONDITIONAL(KLASH, [test x$klash = xyes])
+# plugin building flags
+AM_CONDITIONAL(NSAPI, [test x$nsapi = xyes])
+AM_CONDITIONAL(KPARTS, [test x$kparts = xyes])
 
 AC_SUBST(KDE_CFLAGS)
 AC_SUBST(KDE_LIBS)
@@ -948,22 +992,6 @@
   GNASH_PATH_OPENGL
 fi
 
-dnl Need GLIB for both GTK and GST
-if test x$build_gtk = xyes -o x${media_handler} = "xgst"; then
-  GNASH_PATH_GLIB
-fi
-
-AM_CONDITIONAL(HAVE_GLIB, [ test x$has_glib = xyes ])
-
-if test x$build_ogl = xyes -a x$build_gtk = xyes; then
-   GNASH_PATH_GLEXT
-fi
-if test x$build_gtk = xyes; then
-   GNASH_PATH_GTK2
-   GNASH_PATH_PANGO
-   GNASH_PKG_FIND(atk, [atk/atk.h], [atk library], atk_focus_tracker_init, [1.0])
-fi
-
 if test x$build_gtk = xyes; then
   AC_ARG_ENABLE(ghelp,
     AC_HELP_STRING([--enable-ghelp], [Enable support for the GNOME help system]),
@@ -997,7 +1025,7 @@
 GNASH_PKG_FIND(expat, [expat.h], [Expat library], XML_ErrorString)
 
 dnl these conditionals were moved out of kde.m4
-AM_CONDITIONAL(HAS_KDE, [test x$kde = xyes])
+AM_CONDITIONAL(HAS_KDE, [test x$has_kde = xyes])
 # used to disable x11-specific stuff on special platforms
 AM_CONDITIONAL(include_x11, test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no")
 AM_CONDITIONAL(include_ARTS, test "$build_arts" '!=' "no")
@@ -1012,10 +1040,9 @@
     AC_ERROR([You have GTK installed, but not GtkGLExt. You need GtkGLExt to use the OpenGL renderer. Attempting to build SDL version])
   fi
   gui=sdl
-  plugin=no
+  nsapi=no
   AC_MSG_WARN([GTK2 specified for the GUI, but GtkGlExt is not present. Trying SDL instead.])
 fi
-AM_CONDITIONAL(PLUGIN, [test x$plugin = xyes])
 
 if test x"$media_handler" = x"ffmpeg"; then
   GNASH_PATH_FFMPEG
@@ -1357,14 +1384,14 @@
   echo "        DMalloc support disabled (default). Use --enable-dmalloc to enable."
 fi
 
-if test x"$plugin" = x"yes"; then
-  echo "        Firefox plugin enabled (default). Use --disable-plugin to disable."
+if test x"$nsapi" = x"yes"; then
+  echo "        Firefox plugin enabled (default). Use --disable-nsapi to disable."
 else
   echo "        Firefox plugin disabled."
 fi
 
-if test x"$klash" = x"yes"; then
-  echo "        Konqueror plugin enabled (default). Use --disable-klash to disable"
+if test x"$kparts" = x"yes"; then
+  echo "        Konqueror plugin enabled (default). Use --disble-kparts to disable"
 else
   echo "        Konqueror plugin disabled."
 fi
@@ -1448,14 +1475,14 @@
   fi
 fi
 
-if test x$kde = xyes -o x$klash = xyes; then
+if test x$kde = xyes -o x$kparts = xyes; then
   if test x"$has_kde" = xyes; then
     echo "        KDE flags are: $KDE_CFLAGS"
     echo "        KDE libs are: $KDE_LIBS"
   else
-    if test x$build_kde = xyes -o x$klash = xyes ; then
+    if test x$build_kde = xyes -o x$parts = xyes ; then
       echo "        ERROR: No KDE development package installed!"
-      echo "               Reconfigure with --disable-klash and/or"
+      echo "               Reconfigure with --disable-kparts and/or"
       echo "               change to a different gui with --enable-gui=..."
       echo "               or install the KDE development environment from http://kde.org"
       echo "               or .deb users: apt-get install kdelibs-dev"
@@ -1467,7 +1494,7 @@
     echo "        QT flags are: $QT_CFLAGS"
     echo "        QT libs are: $QT_LIBS"
   else
-    if test x$build_kde = xyes -o x$klash = xyes ; then
+    if test x$build_kde = xyes -o x$kparts = xyes ; then
       if test x"$has_kde" != xyes; then
 	# We have already moaned about KDE absence, so presumably they'll get
 	# QT-dev when they install KDE-dev
@@ -1477,8 +1504,8 @@
         echo "        ERROR: No QT development package installed!"
         echo "               Install a QT development environment from http://trolltech.com"
         echo "               or .deb users: apt-get install libqt3-mt-dev"
-	if test x$klash = xyes; then
-          echo "               or reconfigure with --disable-klash"
+	if test x$kparts = xyes; then
+          echo "               or reconfigure with --disable-kparts"
 	fi
 	if test x$build_kde = xyes; then
           echo "               or change to a different gui with --enable-gui=..."
@@ -1784,7 +1811,7 @@
 fi
 unset need_sdl
 
-if test x"$plugin" = x"yes"; then
+if test x"$nsapi" = x"yes"; then
 dnl  if test x"$FIREFOX_CFLAGS" != x; then
 dnl    echo "        Firefox flags are: $FIREFOX_CFLAGS"
 dnl    echo "        Firefox libs are: $FIREFOX_LIBS"

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3926
retrieving revision 1.3927
diff -u -b -r1.3926 -r1.3927
--- ChangeLog	2 Aug 2007 23:08:08 -0000	1.3926
+++ ChangeLog	3 Aug 2007 03:01:16 -0000	1.3927
@@ -1,3 +1,20 @@
+2007-08-02  Rob Savoye  <rob@deal.welcomehome.org>
+
+	* plugin/Makefile.am: Use BUILD_KDE_GUI instead of KLASH. Use
+	NSAPI instead of PLUGIN, KPARTS instead of KLASH.
+	* Makefile.am: Change from PLUGIN to NSAPI and KPARTS for conditionals. 
+	* configure.ac: Change --disable-klash to --disable-kparts, add
+	--disable-nsapi to replace the older --disable-plugin
+	setting. Make building the plugins conditional on the gui being
+	selected and if the development libraries exist.
+	* gui/Makefile.am: Comment out the dyna,ic vs static support, it's
+	uneeded for now.
+	* macros/firefox.m4: Use nsapi instead of plugin as the
+	conditional.
+	* macros/kde.m4: set has_kde to yes by default. It can get
+	disabled later.
+	* plugin/klash/Makefile.am: Use KPARTS instead of KLASH.
+
 2007-08-02 Sandro Santilli <strk@keybit.net>
 
 	* server/asobj/gen-asclass.sh: add the addStatic call to statics.

Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- gui/Makefile.am	2 Aug 2007 05:30:13 -0000	1.100
+++ gui/Makefile.am	3 Aug 2007 03:01:16 -0000	1.101
@@ -98,7 +98,7 @@
 #      LIB_FLAGS = -release $(VERSION)
 # endif # ENABLE_SHARED
 # else # make shared libraries suitable for linking.
-#      LIB_FLAGS = -release $(VERSION)
+      LIB_FLAGS = -release $(VERSION)
 # endif # DYNAMIC_GUI
 
 # AQUA Toolkit

Index: macros/firefox.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/firefox.m4,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- macros/firefox.m4	29 Jul 2007 19:22:06 -0000	1.24
+++ macros/firefox.m4	3 Aug 2007 03:01:16 -0000	1.25
@@ -35,7 +35,7 @@
 
   FIREFOX_PLUGINS=""
   GNASHEXE=""
-  if test x"${plugin}" = x"yes"; then
+  if test x"${nsapi}" = x"yes"; then
 
     AC_ARG_WITH(plugindir, AC_HELP_STRING([--with-plugindir=DIR], [Directory to install Firefox plugin in]),
       [FIREFOX_PLUGINS=$withval]
@@ -66,106 +66,6 @@
   AC_SUBST(FIREFOX_PLUGINS)
 
 ])dnl end of GNASH_PATH_FIREFOX
-
-dnl This is the old version which we're keeping around for now. It
-dnl would be very useful if the plugin does develop more of a
-dnl dependancy on the mozilla development package.
-AC_DEFUN([GNASH_PATH_FIREFOX_FULL],
-[dnl 
-dnl Get the cflags and libraries
-dnl
-dnl This enables or disables the support to make Gnash function as a
-dnl Mozilla or Firefox plugin.
-  AC_ARG_ENABLE(plugin, AC_HELP_STRING([--enable-plugin-full], [Enable
-support for being a plugin using Firefox development packages]),
-  [case "${enableval}" in
-    yes) plugin=yes ;;
-    no)  plugin=no ;;
-    *)   AC_MSG_ERROR([bad value ${enableval} for disable-plugin option]) ;;
-  esac], plugin=yes)
-
-  if test x"$plugin" = x"yes"; then
-    AC_DEFINE([PLUGIN_SUPPORT], [], [Build plugin support for Mozilla/Firefox])
-
-    AC_ARG_WITH(firefox, AC_HELP_STRING([--with-firefox=PFX], [Prefix where firefox is installed (optional)]), 
-      [firefox_prefix=$withval], [firefox_prefix=""]
-    )
-    AC_ARG_WITH(firefox-libraries, AC_HELP_STRING([--with-firefox-libraries=DIR], [Directory where firefox library is installed (optional)]), 
-      [firefox_libraries=$withval], [firefox_libraries=""]
-    )
-    AC_ARG_WITH(firefox-includes,AC_HELP_STRING([--with-firefox-includes=DIR], [Directory where firefox header files are installed (optional)]), 
-      [firefox_includes=$withval], [firefox_includes=""]
-    )
-    AC_ARG_WITH(plugin-dir, AC_HELP_STRING([--with-plugin-dir=DIR], [Mozilla plugin dir]),
-      [FIREFOX_PLUGINS=$withval]
-    )
- 
-    if test "x${firefox_libraries}" != "x" ; then
-      FIREFOX_LIBS="-L$firefox_libraries"
-    elif test "x${firefox_prefix}" != "x" ; then
-      FIREFOX_LIBS="-L${firefox_prefix}/lib"
-    fi
-
-    if test "x$firefox_includes" != "x" ; then
-      FIREFOX_CFLAGS="-I$firefox_includes"
-    elif test "x$firefox_prefix" != "x" ; then
-      FIREFOX_CFLAGS="-I$firefox_prefix/include"
-    fi
-
-    no_firefox=""
-    mconfig=""
-
-    AC_CHECK_PROG(mconfig, firefox-config, firefox-config)
-
-    if test x"${mconfig}" = "x" ; then
-      AC_CHECK_PROG(mconfig, mozilla-config, mozilla-config)
-    fi
-
-    if test x"${mconfig}" = "x" ; then
-      plugin="no"
-      FIREFOX_CFLAGS=""
-      FIREFOX_LIBS=""
-      FIREFOX_DEFS=""
-    else
-      AC_MSG_CHECKING([for Firefox/Mozilla SDK])
-      if test "x${FIREFOX_CFLAGS}" = "x" ; then
-dnl -I/usr/include/mozilla/java
-dnl -I/usr/include/mozilla/plugin 
-dnl -I/usr/include/mozilla/nspr
-dnl -I/usr/include/mozilla
-        FIREFOX_CFLAGS=`${mconfig} --cflags java plugin`
-      fi
-
-      if test "x${FIREFOX_LIBS}" = "x" ; then
-dnl -L/usr/lib/mozilla
-        FIREFOX_LIBS=`${mconfig} --libs java plugin`
-      fi
-
-      if test "x${FIREFOX_LIBS}" != "x" ; then
-dnl -DMOZ_X11=1 is all that's really needed
-        FIREFOX_DEFS=`${mconfig} --defines java plugin`
-dnl   if we don't have a path for the plugin by now, pick a default one
-        if test x"${FIREFOX_PLUGINS}" = "x" ; then
-	        FIREFOX_PLUGINS=`echo ${FIREFOX_LIBS} | sed -e 's:-L\(@<:@^ @:>@*\) .*$:\1:' -e  's:^-L::'`/plugins
-        fi
-      fi
-    fi
-
-    if test x"${FIREFOX_CFLAGS}" != "x" -a  x"${FIREFOX_LIBS}" != "x"; then
-      AC_MSG_RESULT(yes)
-      AC_DEFINE(HAVE_FIREFOX,1,[Define this if you have firefox support available])
-    fi
-  fi
-
-  AM_CONDITIONAL(PLUGIN, [test x$plugin = xyes])
-
-  AC_SUBST(FIREFOX_CFLAGS)
-  AC_SUBST(FIREFOX_LIBS)
-  AC_SUBST(FIREFOX_DEFS)
-  AC_SUBST(FIREFOX_PLUGINS)
-])
-dnl end of GNASH_PATH_FIREFO
-
 # Local Variables:
 # c-basic-offset: 2
 # tab-width: 2

Index: macros/kde.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/kde.m4,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- macros/kde.m4	1 Jul 2007 10:54:12 -0000	1.34
+++ macros/kde.m4	3 Aug 2007 03:01:16 -0000	1.35
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: kde.m4,v 1.34 2007/07/01 10:54:12 bjacques Exp $
+dnl $Id: kde.m4,v 1.35 2007/08/03 03:01:16 rsavoye Exp $
 
 AC_DEFUN([GNASH_PATH_KDE],
 [
@@ -31,7 +31,7 @@
   ])
 
   kde_prefix="/usr"
-  has_kde=yes
+  has_kde=no
   if test x"${ac_cv_path_kde_incl}" = x; then
     AC_PATH_PROG(KDE_CONFIG, kde-config, ,[${pathlist}])
     if test "x$KDE_CONFIG" != "x" ; then

Index: plugin/klash/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/Makefile.am,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- plugin/klash/Makefile.am	23 Jul 2007 22:20:48 -0000	1.32
+++ plugin/klash/Makefile.am	3 Aug 2007 03:01:16 -0000	1.33
@@ -15,11 +15,11 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.32 2007/07/23 22:20:48 strk Exp $
+# $Id: Makefile.am,v 1.33 2007/08/03 03:01:16 rsavoye Exp $
 
 AUTOMAKE_OPTIONS = 
 
-if KLASH
+if KPARTS
 AM_CPPFLAGS= $(KDE_CFLAGS) $(QT_CFLAGS) -DGNASHBINDIR=\"$(GNASHEXE)\"
 
 plugindir   = $(libdir)/kde3



From MAILER-DAEMON Fri Aug 03 00:23:00 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGogm-0007z0-7g
	for mharc-gnash-commit@gnu.org; Fri, 03 Aug 2007 00:23:00 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGogk-0007yv-Ra
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 00:22:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGogi-0007uv-RZ
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 00:22:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGogi-0007ul-OB
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 00:22:56 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IGogi-0001lJ-F1
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 00:22:56 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IGogh-0004yk-Hs
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 04:22:55 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IGogh-0004yh-Br
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 04:22:55 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGogh-0004yh-Br@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 03 Aug 2007 04:22:55 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog plugin/Makefile.am plugin/klash...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Aug 2007 04:22:59 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/03 04:22:55

Modified files:
	.              : ChangeLog 
	plugin         : Makefile.am 
	plugin/klash   : Makefile.am 

Log message:
	        * plugin/Makefile.am: don't build libgnashplugin if NSAPI
	          conditional is false.
	        * plugin/klash/Makefile.am: don't override the 'all' target.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3927&r2=1.3928
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/Makefile.am?cvsroot=gnash&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/Makefile.am?cvsroot=gnash&r1=1.33&r2=1.34

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3927
retrieving revision 1.3928
diff -u -b -r1.3927 -r1.3928
--- ChangeLog	3 Aug 2007 03:01:16 -0000	1.3927
+++ ChangeLog	3 Aug 2007 04:22:54 -0000	1.3928
@@ -1,3 +1,9 @@
+2007-08-02 Sandro Santilli <strk@keybit.net>
+
+	* plugin/Makefile.am: don't build libgnashplugin if NSAPI
+	  conditional is false.
+	* plugin/klash/Makefile.am: don't override the 'all' target.
+
 2007-08-02  Rob Savoye  <rob@deal.welcomehome.org>
 
 	* plugin/Makefile.am: Use BUILD_KDE_GUI instead of KLASH. Use

Index: plugin/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/Makefile.am,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- plugin/Makefile.am	3 Aug 2007 03:01:15 -0000	1.61
+++ plugin/Makefile.am	3 Aug 2007 04:22:55 -0000	1.62
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.61 2007/08/03 03:01:15 rsavoye Exp $
+# $Id: Makefile.am,v 1.62 2007/08/03 04:22:55 strk Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -53,8 +53,6 @@
 
 # AM_CXXFLAGS = $(AM_CPPFLAGS)
 
-plugin_LTLIBRARIES = libgnashplugin.la
-
 noinst_HEADERS = plugin.h \
 	 mozilla-sdk/pluginbase.h \
 	 mozilla-sdk/npplat.h \
@@ -80,6 +78,9 @@
          mozilla-sdk/include/obsolete/protypes.h 
 
 if NSAPI
+
+plugin_LTLIBRARIES = libgnashplugin.la
+
 libgnashplugin_la_SOURCES  = plugin.cpp \
 	mozilla-sdk/npn_gate.cpp \
         mozilla-sdk/npp_gate.cpp \

Index: plugin/klash/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/Makefile.am,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- plugin/klash/Makefile.am	3 Aug 2007 03:01:16 -0000	1.33
+++ plugin/klash/Makefile.am	3 Aug 2007 04:22:55 -0000	1.34
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.33 2007/08/03 03:01:16 rsavoye Exp $
+# $Id: Makefile.am,v 1.34 2007/08/03 04:22:55 strk Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -68,9 +68,6 @@
 	$(RM) -f $(DESTDIR)$(plugindir)/libklashpart.la
 	$(RM) -f $(DESTDIR)$(plugindir)/libklashpart.a
 
-else
-all:
-	echo "Building klash is disabled"
 endif
 
 force:



From MAILER-DAEMON Fri Aug 03 00:27:44 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGolM-0001Nn-KG
	for mharc-gnash-commit@gnu.org; Fri, 03 Aug 2007 00:27:44 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGolK-0001NG-J4
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 00:27:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGolI-0001N1-L8
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 00:27:41 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGolI-0001My-Fm
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 00:27:40 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IGolI-0002cL-6c
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 00:27:40 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IGolH-00053c-Rp
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 04:27:39 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IGolH-00053Z-NC
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 04:27:39 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGolH-00053Z-NC@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 03 Aug 2007 04:27:39 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog plugin/Makefile.am
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Aug 2007 04:27:42 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/03 04:27:39

Modified files:
	.              : ChangeLog 
	plugin         : Makefile.am 

Log message:
	* plugin/Makefile.am: always descend to klash/ subdir and let the inner Makefile.am handle conditionals for KPARTS.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3928&r2=1.3929
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/Makefile.am?cvsroot=gnash&r1=1.62&r2=1.63

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3928
retrieving revision 1.3929
diff -u -b -r1.3928 -r1.3929
--- ChangeLog	3 Aug 2007 04:22:54 -0000	1.3928
+++ ChangeLog	3 Aug 2007 04:27:39 -0000	1.3929
@@ -1,7 +1,8 @@
 2007-08-02 Sandro Santilli <strk@keybit.net>
 
 	* plugin/Makefile.am: don't build libgnashplugin if NSAPI
-	  conditional is false.
+	  conditional is false; always descend to klash/ subdir
+	  and let the inner Makefile.am handle conditionals for KPARTS.
 	* plugin/klash/Makefile.am: don't override the 'all' target.
 
 2007-08-02  Rob Savoye  <rob@deal.welcomehome.org>

Index: plugin/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/Makefile.am,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- plugin/Makefile.am	3 Aug 2007 04:22:55 -0000	1.62
+++ plugin/Makefile.am	3 Aug 2007 04:27:39 -0000	1.63
@@ -15,14 +15,11 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.62 2007/08/03 04:22:55 strk Exp $
+# $Id: Makefile.am,v 1.63 2007/08/03 04:27:39 strk Exp $
 
 AUTOMAKE_OPTIONS = 
 
-if BUILD_KDE_GUI
-KLASH = klash
-endif
-SUBDIRS = $(KLASH)
+SUBDIRS = klash
 
 # if DMALLOC
 # MALL_CFLAGS = $(DMALLOC_CFLAGS)



From MAILER-DAEMON Fri Aug 03 00:37:49 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IGov6-0005W3-P9
	for mharc-gnash-commit@gnu.org; Fri, 03 Aug 2007 00:37:48 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IGov4-0005TC-KX
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 00:37:46 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IGov3-0005SX-Mb
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 00:37:46 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IGov3-0005ST-Hv
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 00:37:45 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IGov3-00048g-7j
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 00:37:45 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IGov2-0005DP-Bb
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 04:37:44 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IGov2-0005DM-7a
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 04:37:44 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IGov2-0005DM-7a@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 03 Aug 2007 04:37:44 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog Makefile.am
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Aug 2007 04:37:47 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/03 04:37:44

Modified files:
	.              : ChangeLog Makefile.am 

Log message:
	        * Makefile.am: add plugins info to 'dumpconfig' output,
	          simplify the SUBDIR construction (side-effect is we always
	          descend to most subdirs, even if there's nothing to do in them)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3929&r2=1.3930
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.83&r2=1.84

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3929
retrieving revision 1.3930
diff -u -b -r1.3929 -r1.3930
--- ChangeLog	3 Aug 2007 04:27:39 -0000	1.3929
+++ ChangeLog	3 Aug 2007 04:37:43 -0000	1.3930
@@ -1,5 +1,8 @@
 2007-08-02 Sandro Santilli <strk@keybit.net>
 
+	* Makefile.am: add plugins info to 'dumpconfig' output,
+	  simplify the SUBDIR construction (side-effect is we always
+	  descend to most subdirs, even if there's nothing to do in them)
 	* plugin/Makefile.am: don't build libgnashplugin if NSAPI
 	  conditional is false; always descend to klash/ subdir
 	  and let the inner Makefile.am handle conditionals for KPARTS.

Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- Makefile.am	3 Aug 2007 03:01:15 -0000	1.83
+++ Makefile.am	3 Aug 2007 04:37:44 -0000	1.84
@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # 
 
-# $Id: Makefile.am,v 1.83 2007/08/03 03:01:15 rsavoye Exp $
+# $Id: Makefile.am,v 1.84 2007/08/03 04:37:44 strk Exp $
 
 ## Process this file with automake to produce Makefile.in
 AUTOMAKE_OPTIONS = 1.6.0
@@ -30,33 +30,22 @@
 	backend \
 	utilities \
 	gui \
+	extensions \
+	plugin \
 	testsuite \
 	po \
+	doc \
 	$(NULL)
 
-if NSAPI
-PLUGIN_DIRS = plugin
-endif
-
-if KPARTS
-PLUGIN_DIRS = plugin
-endif
-
-if DOCBOOK
-DOC_DIRS = doc
-endif
-
 if CYGNAL
 CYGNAL_DIRS = cygnal
 endif
 
-EXTEND_DIRS = extensions
-
-SUBDIRS      = $(STD_DIRS) $(DOC_DIRS) $(PLUGIN_DIRS) $(EXTEND_DIRS) $(CYGNAL_DIRS)
+SUBDIRS      = $(STD_DIRS) $(CYGNAL_DIRS)
 
 man_MANS = doc/gnash.1
 
-DIST_SUBDIRS = $(STD_DIRS) doc plugin cygnal extensions
+DIST_SUBDIRS = $(STD_DIRS) cygnal 
 
 EXTRA_DIST = config.rpath $(man_MANS) macros/incllist macros/libslist 
 
@@ -210,31 +199,44 @@
 	@echo "	AGG_CFLAGS is $(AGG_CFLAGS)"
 	@echo "	AGG_LIBS is $(AGG_LIBS)"
 endif
+	@echo ""
 	@echo "A blank value for CFLAGS means the header is installed in the"
 	@echo "default system header location. All the LIBS should have a"
 	@echo "legit value"
 	@echo ""
 	@echo "Configurable options are:"
-	@echo "Media handler: $(MEDIA_CONFIG)"
-	@echo "Renderer engine: $(RENDERER_CONFIG)"
+	@echo "	Media handler: $(MEDIA_CONFIG)"
+	@echo "	Renderer engine: $(RENDERER_CONFIG)"
 
 if BUILD_GTK_GUI
-	@echo "Supported GUI: GTK"
+	@echo "	Supported GUI: GTK"
 endif
 if BUILD_KDE_GUI
-	@echo "Supported GUI: KDE"
+	@echo "	Supported GUI: KDE"
 endif
 if BUILD_SDL_GUI
-	@echo "Supported GUI: SDL"
+	@echo "	Supported GUI: SDL"
 endif
 if BUILD_FLTK_GUI
-	@echo "Supported GUI: FLTK"
+	@echo "	Supported GUI: FLTK"
 endif
 if BUILD_AQUA_GUI
-	@echo "Supported GUI: AQUA"
+	@echo "	Supported GUI: AQUA"
 endif
 if BUILD_FB_GUI
-	@echo "Supported GUI: FB"
+	@echo "	Supported GUI: FB"
+endif
+
+if KPARTS
+	@echo "	Konqueror (kparts) plugin enabled"
+else
+	@echo "	Konqueror (kparts) plugin disabled"
+endif
+
+if NSAPI
+	@echo "	Firefox (NSAPI) plugin enabled"
+else
+	@echo "	Firefox (NSAPI) plugin disabled"
 endif
 
 check: check-recursive anal



From MAILER-DAEMON Fri Aug 03 13:23:59 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IH0sZ-0001Ou-Pd
	for mharc-gnash-commit@gnu.org; Fri, 03 Aug 2007 13:23:59 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IH0sX-0001Oe-9r
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 13:23:57 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IH0sR-0001O7-L4
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 13:23:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IH0sR-0001O4-Fl
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 13:23:51 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <rob@welcomehome.org>) id 1IH0sO-0002CY-HM
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 13:23:50 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <rob@welcomehome.org>) id 1IH0s1-0002KK-0Q
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 17:23:25 +0000
Received: from rsavoye by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <rsavoye@savannah.gnu.org>) id 1IH0s0-0002KH-MS
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 17:23:24 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IH0s0-0002KH-MS@cvs.savannah.gnu.org>
From: Rob Savoye <rob@welcomehome.org>
Date: Fri, 03 Aug 2007 17:23:24 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash configure.ac ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Aug 2007 17:23:57 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Rob Savoye <rsavoye>	07/08/03 17:23:24

Modified files:
	.              : configure.ac ChangeLog 

Log message:
		* configure.ac: Fix typo so --disable-nsapi works. Cleanup the
		logic of what gets built when. Add a few warnings.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.389&r2=1.390
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3930&r2=1.3931

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -b -r1.389 -r1.390
--- configure.ac	3 Aug 2007 03:01:15 -0000	1.389
+++ configure.ac	3 Aug 2007 17:23:23 -0000	1.390
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.389 2007/08/03 03:01:15 rsavoye Exp $
+dnl $Id: configure.ac,v 1.390 2007/08/03 17:23:23 rsavoye Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -930,9 +930,7 @@
 AC_CHECK_SIZEOF(short)
 
 dnl # Check KDE if kde gui or kparts were requested
-if test x$build_kde = xyes -o x"$kparts" = xyes; then
-  kde=yes
-  qt=yes
+if test x$build_kde = xyes -o x$kparts = xyes; then
   GNASH_PATH_KDE
   GNASH_PATH_QT
 fi
@@ -949,28 +947,34 @@
 if test x$build_ogl = xyes -a x$build_gtk = xyes; then
    GNASH_PATH_GLEXT
 fi
-if test x$build_gtk = xyes; then
+if test x$build_gtk = xyes -o x$nsapi = xyes; then
    GNASH_PATH_GTK2
    GNASH_PATH_PANGO
    GNASH_PKG_FIND(atk, [atk/atk.h], [atk library], atk_focus_tracker_init, [1.0])
 fi
 
-if test x$has_gtk2 = xyes; then
-  nsapi=yes
-fi
-
 dnl if gtk isn't installed, even if it's specified, don't try to build
 dnl the NSAPI plugin, which is GTK based.
 if test x$has_gtk2 = xno; then
   nsapi=no
-  AC_MSG_WARN(["No GTK development package installed, disabling NSAPI plugin"])
+dnl  build_gtk=no
+  AC_MSG_WARN(["Disabling NSAPI plugin, no GTK development tools found"])
+fi
+
+if test x$build_gtk = xno -o x$nsapi = xyes; then
+  AC_MSG_WARN(["Enabled NSAPI plugin, but you aren't building a GTK based GUI!"])
 fi
 
 dnl if kde isn't installed, even if it's specified, don't try to build
 dnl the KPARTS plugin, which is KDE based.
-if test x$has_kde = xno; then
+if test x$has_kde = xno -a x$kparts = xyes; then
   kparts=no
-  AC_MSG_WARN(["No KDE development package installed, disabling KPARTS plugin"])
+dnl  build_kde=no
+  AC_MSG_WARN(["Disabling KPARTS plugin, no KDE development found"])
+fi
+
+if test x$build_kde = xno -o x$kparts = xyes; then
+  AC_MSG_WARN(["Enabled KPARTS plugin, but you aren't building a KDE based GUI!"])
 fi
 
 AM_CONDITIONAL(BUILD_GTK_GUI, [ test x$build_gtk = xyes ])
@@ -1391,7 +1395,7 @@
 fi
 
 if test x"$kparts" = x"yes"; then
-  echo "        Konqueror plugin enabled (default). Use --disble-kparts to disable"
+  echo "        Konqueror plugin enabled (default). Use --disable-kparts to disable"
 else
   echo "        Konqueror plugin disabled."
 fi

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3930
retrieving revision 1.3931
diff -u -b -r1.3930 -r1.3931
--- ChangeLog	3 Aug 2007 04:37:43 -0000	1.3930
+++ ChangeLog	3 Aug 2007 17:23:24 -0000	1.3931
@@ -1,3 +1,8 @@
+2007-08-03  Rob Savoye  <rob@deal.welcomehome.org>
+
+	* configure.ac: Fix typo so --disable-nsapi works. Cleanup the
+	logic of what gets built when. Add a few warnings.
+
 2007-08-02 Sandro Santilli <strk@keybit.net>
 
 	* Makefile.am: add plugins info to 'dumpconfig' output,



From MAILER-DAEMON Fri Aug 03 14:18:26 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IH1jF-0005gt-Oz
	for mharc-gnash-commit@gnu.org; Fri, 03 Aug 2007 14:18:25 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IH1jE-0005eq-Fk
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 14:18:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IH1j8-0005aN-5Y
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 14:18:23 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IH1j7-0005aG-Ua
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 14:18:17 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IH1iw-0006F2-7P
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 14:18:06 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IH1iF-0007vx-6E
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 18:17:23 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IH1iE-0007vt-P4
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 18:17:22 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IH1iE-0007vt-P4@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 03 Aug 2007 18:17:22 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog configure.ac
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Aug 2007 18:18:24 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/03 18:17:22

Modified files:
	.              : ChangeLog configure.ac 

Log message:
	        * configure.ac: fix misleading warning about KDE/GTK gui
	          not being built while KPARTS/NSAPI plugin is when instead
	          the guis are actually being built.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3932&r2=1.3933
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.390&r2=1.391

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3932
retrieving revision 1.3933
diff -u -b -r1.3932 -r1.3933
--- ChangeLog	3 Aug 2007 18:04:08 -0000	1.3932
+++ ChangeLog	3 Aug 2007 18:17:21 -0000	1.3933
@@ -1,3 +1,9 @@
+2007-08-02 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac: fix misleading warning about KDE/GTK gui 
+	  not being built while KPARTS/NSAPI plugin is when instead
+	  the guis are actually being built.
+
 2007-08-03 Ivor Blockley <meteoryte@yahoo.com.au>
 
 	* server/array.cpp: fix iterators invalidation (bug #20667).

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -b -r1.390 -r1.391
--- configure.ac	3 Aug 2007 17:23:23 -0000	1.390
+++ configure.ac	3 Aug 2007 18:17:22 -0000	1.391
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.390 2007/08/03 17:23:23 rsavoye Exp $
+dnl $Id: configure.ac,v 1.391 2007/08/03 18:17:22 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -961,7 +961,7 @@
   AC_MSG_WARN(["Disabling NSAPI plugin, no GTK development tools found"])
 fi
 
-if test x$build_gtk = xno -o x$nsapi = xyes; then
+if test x$build_gtk = xno -a x$nsapi = xyes; then
   AC_MSG_WARN(["Enabled NSAPI plugin, but you aren't building a GTK based GUI!"])
 fi
 
@@ -973,7 +973,7 @@
   AC_MSG_WARN(["Disabling KPARTS plugin, no KDE development found"])
 fi
 
-if test x$build_kde = xno -o x$kparts = xyes; then
+if test x$build_kde = xno -a x$kparts = xyes; then
   AC_MSG_WARN(["Enabled KPARTS plugin, but you aren't building a KDE based GUI!"])
 fi
 



From MAILER-DAEMON Fri Aug 03 14:29:47 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IH1uF-0000Za-4u
	for mharc-gnash-commit@gnu.org; Fri, 03 Aug 2007 14:29:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IH1uC-0000Yp-Mm
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 14:29:44 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IH1uA-0000Y9-0d
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 14:29:43 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IH1u9-0000Y4-TT
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 14:29:41 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IH1ty-0000ek-HX
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 14:29:31 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IH1t9-0008Al-1T
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 18:28:39 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IH1t8-0008Ai-U5
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 18:28:38 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IH1t8-0008Ai-U5@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 03 Aug 2007 18:28:38 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash Makefile.am
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Aug 2007 18:29:44 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/03 18:28:38

Modified files:
	.              : Makefile.am 

Log message:
	minor style thing

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.84&r2=1.85

Patches:
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- Makefile.am	3 Aug 2007 04:37:44 -0000	1.84
+++ Makefile.am	3 Aug 2007 18:28:38 -0000	1.85
@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # 
 
-# $Id: Makefile.am,v 1.84 2007/08/03 04:37:44 strk Exp $
+# $Id: Makefile.am,v 1.85 2007/08/03 18:28:38 strk Exp $
 
 ## Process this file with automake to produce Makefile.in
 AUTOMAKE_OPTIONS = 1.6.0
@@ -228,9 +228,9 @@
 endif
 
 if KPARTS
-	@echo "	Konqueror (kparts) plugin enabled"
+	@echo "	Konqueror (KPARTS) plugin enabled"
 else
-	@echo "	Konqueror (kparts) plugin disabled"
+	@echo "	Konqueror (KPARTS) plugin disabled"
 endif
 
 if NSAPI



From MAILER-DAEMON Fri Aug 03 14:32:32 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IH1wu-0000yh-JK
	for mharc-gnash-commit@gnu.org; Fri, 03 Aug 2007 14:32:32 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IH1ws-0000yL-Pc
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 14:32:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IH1wr-0000y9-DE
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 14:32:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IH1wr-0000y6-B2
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 14:32:29 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IH1wj-0001PY-NK
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 14:32:23 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IH1wO-0008Eh-9G
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 18:32:00 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IH1wO-0008Ee-5Q
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 18:32:00 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IH1wO-0008Ee-5Q@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 03 Aug 2007 18:32:00 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog configure.ac
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Aug 2007 18:32:30 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/03 18:32:00

Modified files:
	.              : ChangeLog configure.ac 

Log message:
	        * configure.ac: fix automatic kparts/nsapi plugin build
	          based on gui availability.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3933&r2=1.3934
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.391&r2=1.392

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3933
retrieving revision 1.3934
diff -u -b -r1.3933 -r1.3934
--- ChangeLog	3 Aug 2007 18:17:21 -0000	1.3933
+++ ChangeLog	3 Aug 2007 18:31:59 -0000	1.3934
@@ -1,5 +1,10 @@
 2007-08-02 Sandro Santilli <strk@keybit.net>
 
+	* configure.ac: fix automatic kparts/nsapi plugin build
+	  based on gui availability.
+
+2007-08-02 Sandro Santilli <strk@keybit.net>
+
 	* configure.ac: fix misleading warning about KDE/GTK gui 
 	  not being built while KPARTS/NSAPI plugin is when instead
 	  the guis are actually being built.

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -b -r1.391 -r1.392
--- configure.ac	3 Aug 2007 18:17:22 -0000	1.391
+++ configure.ac	3 Aug 2007 18:31:59 -0000	1.392
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.391 2007/08/03 18:17:22 strk Exp $
+dnl $Id: configure.ac,v 1.392 2007/08/03 18:31:59 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -634,12 +634,12 @@
 dnl Add KFLASH support, if specified.
 
 AC_ARG_ENABLE(kparts,
-  AC_HELP_STRING([--disable-kparts], [Disble support for Konqueror plugin (default=no)]),
+  AC_HELP_STRING([--disable-kparts], [Disble support for Konqueror plugin (default: enabled if kde gui is)]),
 [case "${enableval}" in
   yes) kparts=yes ;;
   no)  kparts=no ;;
   *)   AC_MSG_ERROR([bad value ${enableval} for --disable-kpart option]) ;;
-esac],kparts=yes)
+esac],kparts=$build_kde)
 
 dnl
 dnl !! This has been moved here to make --enable-nsapi work
@@ -647,13 +647,13 @@
 dnl !! a specialized macros/plugin.m4
 dnl
 AC_ARG_ENABLE(nsapi,
-  AC_HELP_STRING([--disable-nsapi], [Disable NSAPI plugin build (default=no)]),
+  AC_HELP_STRING([--disable-nsapi], [Disable NSAPI plugin build (default: enabled if gtk gui is)]),
   [case "${enableval}" in
     yes) nsapi=yes ;;
     no)  nsapi=no ;;
     *)   AC_MSG_ERROR([bad value ${enableval} for disable-nsapi option]) ;;
   esac],
-  nsapi=yes
+  nsapi=$build_gtk
 )
 
 dnl dnl  Enable us to disable building all browser plugins in one command.



From MAILER-DAEMON Fri Aug 03 14:49:20 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IH2DA-0000gh-1f
	for mharc-gnash-commit@gnu.org; Fri, 03 Aug 2007 14:49:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IH2D8-0000gc-V8
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 14:49:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IH2D0-0000eG-NI
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 14:49:18 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IH2D0-0000eA-HQ
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 14:49:10 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IH2Cj-0005GS-3h
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 14:48:54 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IH2CU-0001Ua-Em
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 18:48:38 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IH2CU-0001UX-AS
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 18:48:38 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IH2CU-0001UX-AS@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 03 Aug 2007 18:48:38 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog configure.ac
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Aug 2007 18:49:19 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/03 18:48:38

Modified files:
	.              : ChangeLog configure.ac 

Log message:
	        * configure.ac: check GTK dependencies only if $build_gtk=yes.
	          print a WARNING and set $build_gtk=no if deps are not met.
	          All of this is done *before* NSAPI is checked, so it would
	          correctly be built or not depending on $build_gtk only.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3934&r2=1.3935
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.392&r2=1.393

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3934
retrieving revision 1.3935
diff -u -b -r1.3934 -r1.3935
--- ChangeLog	3 Aug 2007 18:31:59 -0000	1.3934
+++ ChangeLog	3 Aug 2007 18:48:37 -0000	1.3935
@@ -1,5 +1,12 @@
 2007-08-02 Sandro Santilli <strk@keybit.net>
 
+	* configure.ac: check GTK dependencies only if $build_gtk=yes.
+	  print a WARNING and set $build_gtk=no if deps are not met.
+	  All of this is done *before* NSAPI is checked, so it would
+	  correctly be built or not depending on $build_gtk only.
+
+2007-08-02 Sandro Santilli <strk@keybit.net>
+
 	* configure.ac: fix automatic kparts/nsapi plugin build
 	  based on gui availability.
 

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -b -r1.392 -r1.393
--- configure.ac	3 Aug 2007 18:31:59 -0000	1.392
+++ configure.ac	3 Aug 2007 18:48:38 -0000	1.393
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.392 2007/08/03 18:31:59 strk Exp $
+dnl $Id: configure.ac,v 1.393 2007/08/03 18:48:38 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -540,6 +540,24 @@
 AC_SUBST([LIBTOOL_DEPS])
 AC_LIB_LTDL
 
+if test x$build_gtk = xyes; then
+   GNASH_PATH_GTK2
+   GNASH_PATH_PANGO
+   GNASH_PKG_FIND(atk, [atk/atk.h], [atk library], atk_focus_tracker_init, [1.0])
+   if test x$build_ogl = xyes; then
+      GNASH_PATH_GLEXT
+   fi
+
+   dnl if gtk isn't installed, even if it's specified, don't try to build
+   dnl the GTK gui. 
+   if test x$has_gtk2 = xno; then
+      build_gtk=no
+      AC_MSG_WARN(["Disabling GTK GUI, no GTK development tools found"])
+   fi
+fi
+
+
+
 AM_CONDITIONAL(ENABLE_SHARED, [test x"${enable_shared}" = xyes])
 AM_CONDITIONAL(ENABLE_STATIC, [test x"${enable_shared}" = xno])
 dnl -- AM_CONDITIONAL(STATIC_GUI, test x"${dynamic_gui}" = xno -o x"${enable_shared}" = xno)
@@ -944,23 +962,6 @@
 
 AM_CONDITIONAL(HAVE_GLIB, [ test x$has_glib = xyes ])
 
-if test x$build_ogl = xyes -a x$build_gtk = xyes; then
-   GNASH_PATH_GLEXT
-fi
-if test x$build_gtk = xyes -o x$nsapi = xyes; then
-   GNASH_PATH_GTK2
-   GNASH_PATH_PANGO
-   GNASH_PKG_FIND(atk, [atk/atk.h], [atk library], atk_focus_tracker_init, [1.0])
-fi
-
-dnl if gtk isn't installed, even if it's specified, don't try to build
-dnl the NSAPI plugin, which is GTK based.
-if test x$has_gtk2 = xno; then
-  nsapi=no
-dnl  build_gtk=no
-  AC_MSG_WARN(["Disabling NSAPI plugin, no GTK development tools found"])
-fi
-
 if test x$build_gtk = xno -a x$nsapi = xyes; then
   AC_MSG_WARN(["Enabled NSAPI plugin, but you aren't building a GTK based GUI!"])
 fi



From MAILER-DAEMON Fri Aug 03 15:28:00 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IH2oa-0007o4-BC
	for mharc-gnash-commit@gnu.org; Fri, 03 Aug 2007 15:28:00 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IH2oY-0007ns-LK
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 15:27:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IH2oN-0007iU-Ae
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 15:27:58 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IH2oM-0007iH-UF
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 15:27:46 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IH2oL-0004nI-9F
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 15:27:45 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IH2o9-0007f5-NQ
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 19:27:34 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IH2o6-0007cm-J5
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 19:27:31 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IH2o6-0007cm-J5@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 03 Aug 2007 19:27:30 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog Makefile.am
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Aug 2007 19:27:58 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/03 19:27:30

Modified files:
	.              : ChangeLog Makefile.am 

Log message:
	* Makefile.am: only descend in doc/ subdir if DOCBOOK is enabled.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3935&r2=1.3936
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.85&r2=1.86

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3935
retrieving revision 1.3936
diff -u -b -r1.3935 -r1.3936
--- ChangeLog	3 Aug 2007 18:48:37 -0000	1.3935
+++ ChangeLog	3 Aug 2007 19:27:28 -0000	1.3936
@@ -1,5 +1,9 @@
 2007-08-02 Sandro Santilli <strk@keybit.net>
 
+	* Makefile.am: only descend in doc/ subdir if DOCBOOK is enabled.
+
+2007-08-02 Sandro Santilli <strk@keybit.net>
+
 	* configure.ac: check GTK dependencies only if $build_gtk=yes.
 	  print a WARNING and set $build_gtk=no if deps are not met.
 	  All of this is done *before* NSAPI is checked, so it would

Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- Makefile.am	3 Aug 2007 18:28:38 -0000	1.85
+++ Makefile.am	3 Aug 2007 19:27:29 -0000	1.86
@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # 
 
-# $Id: Makefile.am,v 1.85 2007/08/03 18:28:38 strk Exp $
+# $Id: Makefile.am,v 1.86 2007/08/03 19:27:29 strk Exp $
 
 ## Process this file with automake to produce Makefile.in
 AUTOMAKE_OPTIONS = 1.6.0
@@ -41,11 +41,15 @@
 CYGNAL_DIRS = cygnal
 endif
 
-SUBDIRS      = $(STD_DIRS) $(CYGNAL_DIRS)
+if DOCBOOK
+DOC_DIRS = doc
+endif
+
+SUBDIRS      = $(STD_DIRS) $(CYGNAL_DIRS) $(DOC_DIRS)
 
 man_MANS = doc/gnash.1
 
-DIST_SUBDIRS = $(STD_DIRS) cygnal 
+DIST_SUBDIRS = $(STD_DIRS) cygnal doc
 
 EXTRA_DIST = config.rpath $(man_MANS) macros/incllist macros/libslist 
 



From MAILER-DAEMON Fri Aug 03 15:42:27 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IH32Z-0001mv-Nz
	for mharc-gnash-commit@gnu.org; Fri, 03 Aug 2007 15:42:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IH32Y-0001mg-Dn
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 15:42:26 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IH32T-0001lU-B7
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 15:42:25 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IH32T-0001lR-7t
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 15:42:21 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IH32R-0007Gm-0X
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 15:42:19 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IH32B-00089Y-3t
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 19:42:03 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IH32A-00089T-Ug
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 19:42:03 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IH32A-00089T-Ug@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 03 Aug 2007 19:42:02 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog configure.ac
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Aug 2007 19:42:26 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/03 19:42:02

Modified files:
	.              : ChangeLog configure.ac 

Log message:
	        * configure.ac: move GTK detection code *after* the cross-compiling
	          section, so that $incllist is properly set. Add notice about
	          the fact that any GNASH_PATH_XX must be invoked after that one.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3936&r2=1.3937
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.393&r2=1.394

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3936
retrieving revision 1.3937
diff -u -b -r1.3936 -r1.3937
--- ChangeLog	3 Aug 2007 19:27:28 -0000	1.3936
+++ ChangeLog	3 Aug 2007 19:42:02 -0000	1.3937
@@ -1,5 +1,11 @@
 2007-08-02 Sandro Santilli <strk@keybit.net>
 
+	* configure.ac: move GTK detection code *after* the cross-compiling
+	  section, so that $incllist is properly set. Add notice about
+	  the fact that any GNASH_PATH_XX must be invoked after that one.
+
+2007-08-02 Sandro Santilli <strk@keybit.net>
+
 	* Makefile.am: only descend in doc/ subdir if DOCBOOK is enabled.
 
 2007-08-02 Sandro Santilli <strk@keybit.net>

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -b -r1.393 -r1.394
--- configure.ac	3 Aug 2007 18:48:38 -0000	1.393
+++ configure.ac	3 Aug 2007 19:42:02 -0000	1.394
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.393 2007/08/03 18:48:38 strk Exp $
+dnl $Id: configure.ac,v 1.394 2007/08/03 19:42:02 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -540,23 +540,6 @@
 AC_SUBST([LIBTOOL_DEPS])
 AC_LIB_LTDL
 
-if test x$build_gtk = xyes; then
-   GNASH_PATH_GTK2
-   GNASH_PATH_PANGO
-   GNASH_PKG_FIND(atk, [atk/atk.h], [atk library], atk_focus_tracker_init, [1.0])
-   if test x$build_ogl = xyes; then
-      GNASH_PATH_GLEXT
-   fi
-
-   dnl if gtk isn't installed, even if it's specified, don't try to build
-   dnl the GTK gui. 
-   if test x$has_gtk2 = xno; then
-      build_gtk=no
-      AC_MSG_WARN(["Disabling GTK GUI, no GTK development tools found"])
-   fi
-fi
-
-
 
 AM_CONDITIONAL(ENABLE_SHARED, [test x"${enable_shared}" = xyes])
 AM_CONDITIONAL(ENABLE_STATIC, [test x"${enable_shared}" = xno])
@@ -614,6 +597,18 @@
 dnl these same settings rather than duplicating them like we used to.
 dnl To override thise, use the --with-*-incl= and --with-*-libs=
 dnl options to configure.
+dnl
+dnl !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+dnl !! 
+dnl !! IMPORTANT NOTICE 
+dnl !!
+dnl !!  Any call to GNASH_PATH_XXX must be be given *after*
+dnl !!  this snippet, or incllist would not be set resulting
+dnl !!  in header detection to malfunction
+dnl !! 
+dnl !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+dnl
+dnl
 if test x$cross_compiling = xyes; then
   AC_MSG_NOTICE([Configuring Gnash for cross compilation])
   export pkgroot="`$CXX -print-search-dirs | grep "install:" | sed -e 's/install: //' -e 's:/lib/gcc/.*::'`"
@@ -628,7 +623,33 @@
   export pathlist=$PATH
 fi
 
+dnl -----------------------------------------------------------
+dnl   Verify dependencies for requested GUIs are met, and
+dnl   disable build of the GUIS for which deps are NOT met
+dnl ------------------------------------------------------------
+
+if test x$build_gtk = xyes; then
+   GNASH_PATH_GTK2
+   GNASH_PATH_PANGO
+   GNASH_PKG_FIND(atk, [atk/atk.h], [atk library], atk_focus_tracker_init, [1.0])
+   if test x$build_ogl = xyes; then
+      GNASH_PATH_GLEXT
+   fi
+
+   dnl if gtk isn't installed, even if it's specified, don't try to build
+   dnl the GTK gui. 
+   if test x$has_gtk2 = xno; then
+      build_gtk=no
+      AC_MSG_WARN(["Disabling GTK GUI, no GTK development tools found"])
+   fi
+fi
+
+dnl TODO: add checks for all other GUIs
+
+
+dnl -----------------------------------------------------------
 dnl Try to ignore stupid dependencies
+dnl -----------------------------------------------------------
 
 AC_MSG_CHECKING(linker --as-needed support)
 gcc_cv_ld_as_needed=no



From MAILER-DAEMON Fri Aug 03 15:59:09 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IH3Ii-0004Og-Uf
	for mharc-gnash-commit@gnu.org; Fri, 03 Aug 2007 15:59:08 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IH3Ih-0004OV-QX
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 15:59:07 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IH3Ib-0004Nz-KZ
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 15:59:07 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IH3Ib-0004Nw-Es
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 15:59:01 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IH3IP-0001SI-Hz
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 15:58:50 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IH3Ho-0001HV-Co
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 19:58:12 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IH3Ho-0001HS-8M
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 19:58:12 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IH3Ho-0001HS-8M@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 03 Aug 2007 19:58:12 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/macros gtk2.m4
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Aug 2007 19:59:08 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/03 19:58:12

Modified files:
	macros         : gtk2.m4 

Log message:
	Fixed the 'WARNING: not sure' funny message

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gtk2.m4?cvsroot=gnash&r1=1.41&r2=1.42

Patches:
Index: gtk2.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gtk2.m4,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- gtk2.m4	1 Jul 2007 10:54:12 -0000	1.41
+++ gtk2.m4	3 Aug 2007 19:58:12 -0000	1.42
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
-dnl $Id: gtk2.m4,v 1.41 2007/07/01 10:54:12 bjacques Exp $
+dnl $Id: gtk2.m4,v 1.42 2007/08/03 19:58:12 strk Exp $
 
 AC_DEFUN([GNASH_PATH_GTK2],
 [
@@ -62,10 +62,10 @@
     done
   fi
   if test x"${ac_cv_path_gtk2_incl}" = x; then
+    AC_MSG_RESULT([not found, trying again])
     AC_CHECK_HEADERS(gtk/gtk.h)
-    AC_MSG_RESULT($ac_cv_path_gtk2_incl)
   else
-    AC_MSG_WARN([not sure])
+    AC_MSG_RESULT($ac_cv_path_gtk2_incl)
   fi
 
   dnl Look for the library



From MAILER-DAEMON Fri Aug 03 16:27:39 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IH3kJ-0000oh-BP
	for mharc-gnash-commit@gnu.org; Fri, 03 Aug 2007 16:27:39 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IH3kH-0000o0-HK
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 16:27:37 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IH3kD-0000m9-1A
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 16:27:36 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IH3kC-0000m2-TP
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 16:27:32 -0400
Received: from mx20.gnu.org ([199.232.41.8])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IH3jk-0007nH-AU
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 16:27:06 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by mx20.gnu.org with esmtp (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1IH3jW-0003fd-EG
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 16:26:50 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IH3iE-0003c6-Kj
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 20:25:30 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IH3iE-0003c3-Gx
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 20:25:30 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IH3iE-0003c3-Gx@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 03 Aug 2007 20:25:30 +0000
X-detected-kernel: Linux 2.6 (newer, 3)
X-Detected-Kernel: Linux 2.6, seldom 2.4 (older, 4)
Subject: [Gnash-commit] gnash ChangeLog configure.ac
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Aug 2007 20:27:37 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/03 20:25:30

Modified files:
	.              : ChangeLog configure.ac 

Log message:
	        * configure.ac: make sure PKG_CONFIG is defined before calling
	          GNAH_PATH_XXX. Made the notice clearer about GNASH_PATH_XX
	          need to be put after it.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3937&r2=1.3938
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.395&r2=1.396

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3937
retrieving revision 1.3938
diff -u -b -r1.3937 -r1.3938
--- ChangeLog	3 Aug 2007 19:42:02 -0000	1.3937
+++ ChangeLog	3 Aug 2007 20:25:29 -0000	1.3938
@@ -1,5 +1,11 @@
 2007-08-02 Sandro Santilli <strk@keybit.net>
 
+	* configure.ac: make sure PKG_CONFIG is defined before calling 
+	  GNAH_PATH_XXX. Made the notice clearer about GNASH_PATH_XX
+	  need to be put after it.
+
+2007-08-02 Sandro Santilli <strk@keybit.net>
+
 	* configure.ac: move GTK detection code *after* the cross-compiling
 	  section, so that $incllist is properly set. Add notice about
 	  the fact that any GNASH_PATH_XX must be invoked after that one.

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -b -r1.395 -r1.396
--- configure.ac	3 Aug 2007 19:45:26 -0000	1.395
+++ configure.ac	3 Aug 2007 20:25:30 -0000	1.396
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.395 2007/08/03 19:45:26 strk Exp $
+dnl $Id: configure.ac,v 1.396 2007/08/03 20:25:30 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -598,16 +598,6 @@
 dnl To override thise, use the --with-*-incl= and --with-*-libs=
 dnl options to configure.
 dnl
-dnl !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-dnl !! 
-dnl !! IMPORTANT NOTICE 
-dnl !!
-dnl !!  Any call to GNASH_PATH_XXX must be be given *after*
-dnl !!  this snippet, or incllist would not be set resulting
-dnl !!  in header detection to malfunction
-dnl !! 
-dnl !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-dnl
 dnl
 if test x$cross_compiling = xyes; then
   AC_MSG_NOTICE([Configuring Gnash for cross compilation])
@@ -623,6 +613,19 @@
   export pathlist=$PATH
 fi
 
+dnl Check for PKG_CONFIG before any GNASH_PATH call
+PKG_PROG_PKG_CONFIG
+
+dnl !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+dnl !! 
+dnl !! IMPORTANT NOTICE 
+dnl !!
+dnl !!  Any call to GNASH_PATH_XXX must be be given *after* this snippet.
+dnl !!  This is to ensure that PKG_CONFIG, cross_compiling and incllist are
+dnl !!  properly set at the time of call.
+dnl !! 
+dnl !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
 dnl -----------------------------------------------------------
 dnl   Verify dependencies for requested GUIs are met, and
 dnl   disable build of the GUIS for which deps are NOT met
@@ -666,7 +669,6 @@
 AM_CONDITIONAL(HAVE_DMALLOC, [ test x$has_dmalloc = xyes ])
 
 AC_CHECK_FUNCS(mallinfo)
-PKG_PROG_PKG_CONFIG
 AC_PATH_TOOL([AUTOTRACE], [autotrace])
 AC_HEADER_DIRENT
 



From MAILER-DAEMON Fri Aug 03 16:55:18 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IH4B4-00048Z-0F
	for mharc-gnash-commit@gnu.org; Fri, 03 Aug 2007 16:55:18 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IH4B2-00048U-75
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 16:55:16 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IH4B0-00047L-05
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 16:55:15 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IH4Az-00046r-MM
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 16:55:13 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IH4Ax-0005JA-6U
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 16:55:12 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IH4Aa-0005T6-5D
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 20:54:48 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IH4Aa-0005T3-18
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 20:54:48 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IH4Aa-0005T3-18@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 03 Aug 2007 20:54:48 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/asobj/NetStream.cpp serv...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Aug 2007 20:55:16 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/03 20:54:47

Modified files:
	.              : ChangeLog 
	server/asobj   : NetStream.cpp NetStream.h 

Log message:
	        * server/asobj/NetStream.{cpp,h}: mark associated as_environment
	          as reachable (but I think there are ownership problem there,
	          the as_environment might be deleted before the NetStream object
	          is, in which case we'd access random memory).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3938&r2=1.3939
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.cpp?cvsroot=gnash&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.h?cvsroot=gnash&r1=1.47&r2=1.48

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3938
retrieving revision 1.3939
diff -u -b -r1.3938 -r1.3939
--- ChangeLog	3 Aug 2007 20:25:29 -0000	1.3938
+++ ChangeLog	3 Aug 2007 20:54:47 -0000	1.3939
@@ -1,5 +1,12 @@
 2007-08-02 Sandro Santilli <strk@keybit.net>
 
+	* server/asobj/NetStream.{cpp,h}: mark associated as_environment
+	  as reachable (but I think there are ownership problem there,
+	  the as_environment might be deleted before the NetStream object
+	  is, in which case we'd access random memory).
+
+2007-08-02 Sandro Santilli <strk@keybit.net>
+
 	* configure.ac: make sure PKG_CONFIG is defined before calling 
 	  GNAH_PATH_XXX. Made the notice clearer about GNASH_PATH_XX
 	  need to be put after it.

Index: server/asobj/NetStream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- server/asobj/NetStream.cpp	1 Jul 2007 10:54:29 -0000	1.68
+++ server/asobj/NetStream.cpp	3 Aug 2007 20:54:47 -0000	1.69
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: NetStream.cpp,v 1.68 2007/07/01 10:54:29 bjacques Exp $ */
+/* $Id: NetStream.cpp,v 1.69 2007/08/03 20:54:47 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -651,6 +651,8 @@
 
 	if ( m_statusHandler ) m_statusHandler->setReachable();
 
+	if ( m_env ) m_env->markReachableResources();
+
 	// Invoke generic as_object marker
 	markAsObjectReachable();
 }

Index: server/asobj/NetStream.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- server/asobj/NetStream.h	1 Jul 2007 10:54:29 -0000	1.47
+++ server/asobj/NetStream.h	3 Aug 2007 20:54:47 -0000	1.48
@@ -19,7 +19,7 @@
 //
 //
 
-/*  $Id: NetStream.h,v 1.47 2007/07/01 10:54:29 bjacques Exp $ */
+/*  $Id: NetStream.h,v 1.48 2007/08/03 20:54:47 strk Exp $ */
 
 #ifndef __NETSTREAM_H__
 #define __NETSTREAM_H__
@@ -121,7 +121,13 @@
 	///
 	void processStatusNotifications();
 
-	// The actionscript enviroment for the AS callbacks
+	/// The actionscript enviroment for the AS callbacks
+	//
+	/// TODO: research on safety of this: who's the owner of the as_environment ?
+	///       can we be sure that the environment won't be prematurely deleted ?
+	///       We'd need an as_environment::testInvariant() to call in our own
+	///       testInvariant() method (also TODO).
+	///
 	as_environment* m_env;
 
 	// The size of the buffer in milliseconds
@@ -172,6 +178,7 @@
 	/// Reachable resources are:
 	///	- associated NetConnection object (_netCon)
 	///	- onStatus event handler (m_statusHandler)
+	///	- The associated as_environment (m_env)
 	///
 	virtual void markReachableResources() const;
 
@@ -234,6 +241,7 @@
 	/// Sets the AS Enviroment needed for eventhandlers
 	//
 	/// @param enviroment
+	///	TODO: document ownership !!
 	///
 	void setEnvironment(as_environment* env)
 	{



From MAILER-DAEMON Fri Aug 03 17:10:45 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IH4Q1-0007Wv-Kv
	for mharc-gnash-commit@gnu.org; Fri, 03 Aug 2007 17:10:45 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IH4Q0-0007Wm-6q
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 17:10:44 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IH4Pw-0007WI-Ep
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 17:10:43 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IH4Pw-0007WF-8w
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 17:10:40 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IH4Ps-0008V2-1t
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 17:10:38 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IH4Pb-0005lp-LO
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 21:10:19 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IH4Pb-0005lm-Fv
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 21:10:19 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IH4Pb-0005lm-Fv@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 03 Aug 2007 21:10:19 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/array.cpp server/array.h...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Aug 2007 21:10:44 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/03 21:10:19

Modified files:
	.              : ChangeLog 
	server         : array.cpp array.h 
	testsuite/actionscript.all: array.as 

Log message:
	Patch #6134 by Ivor Blockley <meteoryte@yahoo.com.au>:
	
	        * server/array.{cpp,h}: fixes previously identified issues with
	          array.cpp involving functions that needed to be environment and
	          SWF-version aware (mainly functions involved in sorting).
	        * testsuite/actionscript.all/array.as: xcheck->check, few more
	          tests.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3939&r2=1.3940
http://cvs.savannah.gnu.org/viewcvs/gnash/server/array.cpp?cvsroot=gnash&r1=1.70&r2=1.71
http://cvs.savannah.gnu.org/viewcvs/gnash/server/array.h?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/array.as?cvsroot=gnash&r1=1.27&r2=1.28

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3939
retrieving revision 1.3940
diff -u -b -r1.3939 -r1.3940
--- ChangeLog	3 Aug 2007 20:54:47 -0000	1.3939
+++ ChangeLog	3 Aug 2007 21:10:18 -0000	1.3940
@@ -1,39 +1,47 @@
-2007-08-02 Sandro Santilli <strk@keybit.net>
+2007-08-03 Ivor Blockley <meteoryte@yahoo.com.au>
+
+	* server/array.{cpp,h}: fixes previously identified issues with
+	  array.cpp involving functions that needed to be environment and
+	  SWF-version aware (mainly functions involved in sorting). 
+	* testsuite/actionscript.all/array.as: xcheck->check, few more
+	  tests.
+
+2007-08-03 Sandro Santilli <strk@keybit.net>
 
 	* server/asobj/NetStream.{cpp,h}: mark associated as_environment
 	  as reachable (but I think there are ownership problem there,
 	  the as_environment might be deleted before the NetStream object
 	  is, in which case we'd access random memory).
 
-2007-08-02 Sandro Santilli <strk@keybit.net>
+2007-08-03 Sandro Santilli <strk@keybit.net>
 
 	* configure.ac: make sure PKG_CONFIG is defined before calling 
 	  GNAH_PATH_XXX. Made the notice clearer about GNASH_PATH_XX
 	  need to be put after it.
 
-2007-08-02 Sandro Santilli <strk@keybit.net>
+2007-08-03 Sandro Santilli <strk@keybit.net>
 
 	* configure.ac: move GTK detection code *after* the cross-compiling
 	  section, so that $incllist is properly set. Add notice about
 	  the fact that any GNASH_PATH_XX must be invoked after that one.
 
-2007-08-02 Sandro Santilli <strk@keybit.net>
+2007-08-03 Sandro Santilli <strk@keybit.net>
 
 	* Makefile.am: only descend in doc/ subdir if DOCBOOK is enabled.
 
-2007-08-02 Sandro Santilli <strk@keybit.net>
+2007-08-03 Sandro Santilli <strk@keybit.net>
 
 	* configure.ac: check GTK dependencies only if $build_gtk=yes.
 	  print a WARNING and set $build_gtk=no if deps are not met.
 	  All of this is done *before* NSAPI is checked, so it would
 	  correctly be built or not depending on $build_gtk only.
 
-2007-08-02 Sandro Santilli <strk@keybit.net>
+2007-08-03 Sandro Santilli <strk@keybit.net>
 
 	* configure.ac: fix automatic kparts/nsapi plugin build
 	  based on gui availability.
 
-2007-08-02 Sandro Santilli <strk@keybit.net>
+2007-08-03 Sandro Santilli <strk@keybit.net>
 
 	* configure.ac: fix misleading warning about KDE/GTK gui 
 	  not being built while KPARTS/NSAPI plugin is when instead

Index: server/array.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/array.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- server/array.cpp	3 Aug 2007 18:04:09 -0000	1.70
+++ server/array.cpp	3 Aug 2007 21:10:19 -0000	1.71
@@ -41,7 +41,7 @@
 
 namespace gnash {
 
-typedef bool (* as_cmp_fn) (const as_value&, const as_value&);
+typedef boost::function2<bool, const as_value&, const as_value&> as_cmp_fn;
 
 static as_object* getArrayInterface();
 static void attachArrayProperties(as_object& proto);
@@ -57,211 +57,269 @@
 	return a > 0;
 }
 
-// simple as_value strict-weak-ordering comparison functions:
-inline static bool
-as_value_lt (const as_value& a, const as_value& b)
+// simple as_value strict-weak-ordering comparison functors:
+struct as_value_lt
 {
-	// TODO: pass env, use versioned (to_string)
-	return a.to_string().compare(b.to_string()) < 0;
-}
+	as_environment* _env;
+	int _sv;
 
-inline static bool
-as_value_gt (const as_value& a, const as_value& b)
-{
-	// TODO: pass env, use versioned (to_string)
-	return a.to_string().compare(b.to_string()) > 0;
-}
+	as_value_lt(as_environment* env)
+		: _env(env)
+	{
+		_sv = VM::get().getSWFVersion();
+	}
 
-inline static bool
-as_value_eq (const as_value& a, const as_value& b)
-{
-	// TODO: pass env, use versioned (to_string)
-	return a.to_string().compare(b.to_string()) == 0;
-}
+	inline int str_cmp(const as_value& a, const as_value& b)
+	{
+		std::string s = a.to_string_versioned(_sv, _env);
+		return s.compare(b.to_string_versioned(_sv, _env));
+	}
 
-inline static int
-as_value_StrNoCaseCmp (const as_value& a, const as_value& b)
-{
+	inline int str_nocase_cmp(const as_value& a, const as_value& b)
+	{
 	using namespace boost::algorithm;
 
-	// TODO: pass env, use versioned (to_string)
-	std::string strA = to_upper_copy(a.to_string());
-	std::string strB = to_upper_copy(b.to_string());
-
-	return strA.compare(strB);
-}
-
-inline static bool
-as_value_nocase_lt (const as_value& a, const as_value& b)
-{
-	return as_value_StrNoCaseCmp(a, b) < 0;
-}
-
-inline static bool
-as_value_nocase_gt (const as_value& a, const as_value& b)
-{
-	return as_value_StrNoCaseCmp(a, b) > 0;
-}
-
-inline static bool
-as_value_nocase_eq (const as_value& a, const as_value& b)
-{
-	return as_value_StrNoCaseCmp(a, b) == 0;
-}
+		std::string c = to_upper_copy(a.to_string_versioned(_sv, _env));
+		std::string d = to_upper_copy(b.to_string_versioned(_sv, _env));
+		return c.compare(d);
+	}
 
-inline static bool
-as_value_numLT (const as_value& a, const as_value& b)
-{
+	inline bool as_value_numLT (const as_value& a, const as_value& b)
+	{
 	if (a.is_undefined()) return false;
 	if (b.is_undefined()) return true;
 	if (a.is_null()) return false;
 	if (b.is_null()) return true;
-	double aval = a.to_number();
-	double bval = b.to_number();
+		double aval = a.to_number(_env);
+		double bval = b.to_number(_env);
 	if (isnan(aval)) return false;
 	if (isnan(bval)) return true;
 	return aval < bval;
-}
+	}
 
-inline static bool
-as_value_numGT (const as_value& a, const as_value& b)
-{
+	inline bool as_value_numGT (const as_value& a, const as_value& b)
+	{
 	if (b.is_undefined()) return false;
 	if (a.is_undefined()) return true;
 	if (b.is_null()) return false;
 	if (a.is_null()) return true;
-	double aval = a.to_number();
-	double bval = b.to_number();
+		double aval = a.to_number(_env);
+		double bval = b.to_number(_env);
 	if (isnan(bval)) return false;
 	if (isnan(aval)) return true;
 	return aval > bval;
-}
+	}
 
-inline static bool
-as_value_numEQ (const as_value& a, const as_value& b)
-{
+	inline bool as_value_numEQ (const as_value& a, const as_value& b)
+	{
 	if (a.is_undefined() && b.is_undefined()) return true;
 	if (a.is_null() && b.is_null()) return true;
-	double aval = a.to_number();
-	double bval = b.to_number();
+		double aval = a.to_number(_env);
+		double bval = b.to_number(_env);
 	if (isnan(aval) && isnan(bval)) return true;
 	return aval == bval;
-}
+	}
+
+	bool operator() (const as_value& a, const as_value& b)
+	{
+		return str_cmp(a, b) < 0;
+	}
+};
+
+struct as_value_gt : public as_value_lt
+{
+	as_value_gt(as_environment* env) : as_value_lt(env) {}
+	bool operator() (const as_value& a, const as_value& b)
+	{
+		return str_cmp(a, b) > 0;
+	}
+};
+
+struct as_value_eq : public as_value_lt
+{
+	as_value_eq(as_environment* env) : as_value_lt(env) {}
+	bool operator() (const as_value& a, const as_value& b)
+	{
+		return str_cmp(a, b) == 0;
+	}
+};
 
-inline static bool
-as_value_num_lt (const as_value& a, const as_value& b)
+struct as_value_nocase_lt : public as_value_lt
 {
+	as_value_nocase_lt(as_environment* env) : as_value_lt(env) {}
+	bool operator() (const as_value& a, const as_value& b)
+	{
+		return str_nocase_cmp(a, b) < 0;
+	}
+};
+
+struct as_value_nocase_gt : public as_value_lt
+{
+	as_value_nocase_gt(as_environment* env) : as_value_lt(env) {}
+	bool operator() (const as_value& a, const as_value& b)
+	{
+		return str_nocase_cmp(a, b) > 0;
+	}
+};
+
+struct as_value_nocase_eq : public as_value_lt
+{
+	as_value_nocase_eq(as_environment* env) : as_value_lt(env) {}
+	bool operator() (const as_value& a, const as_value& b)
+	{
+		return str_nocase_cmp(a, b) == 0;
+	}
+};
+
+struct as_value_num_lt : public as_value_lt
+{
+	as_value_num_lt(as_environment* env) : as_value_lt(env) {}
+	bool operator() (const as_value& a, const as_value& b)
+	{
 	if (a.is_string() || b.is_string())
-		return as_value_lt(a, b);
+			return str_cmp(a, b) < 0;
 	return as_value_numLT(a, b);
-}
+	}
+};
 
-inline static bool
-as_value_num_gt (const as_value& a, const as_value& b)
+struct as_value_num_gt : public as_value_lt
 {
+	as_value_num_gt(as_environment* env) : as_value_lt(env) {}
+	bool operator() (const as_value& a, const as_value& b)
+	{
 	if (a.is_string() || b.is_string())
-		return as_value_gt(a, b);
+			return str_cmp(a, b) > 0;
 	return as_value_numGT(a, b);
-}
+	}
+};
 
-inline static bool
-as_value_num_eq (const as_value& a, const as_value& b)
+struct as_value_num_eq : public as_value_lt
 {
+	as_value_num_eq(as_environment* env) : as_value_lt(env) {}
+	bool operator() (const as_value& a, const as_value& b)
+	{
 	if (a.is_string() || b.is_string())
-		return as_value_eq(a, b);
+			return str_cmp(a, b) == 0;
 	return as_value_numEQ(a, b);
-}
+	}
+};
 
-inline static bool
-as_value_num_nocase_lt (const as_value& a, const as_value& b)
+struct as_value_num_nocase_lt : public as_value_lt
 {
+	as_value_num_nocase_lt(as_environment* env) : as_value_lt(env) {}
+	bool operator() (const as_value& a, const as_value& b)
+	{
 	if (a.is_string() || b.is_string())
-		return as_value_nocase_lt(a, b);
+			return str_nocase_cmp(a, b) < 0;
 	return as_value_numLT(a, b);
-}
+	}
+};
 
-inline static bool
-as_value_num_nocase_gt (const as_value& a, const as_value& b)
+struct as_value_num_nocase_gt : public as_value_lt
 {
+	as_value_num_nocase_gt(as_environment* env) : as_value_lt(env) {}
+	bool operator() (const as_value& a, const as_value& b)
+	{
 	if (a.is_string() || b.is_string())
-		return as_value_nocase_gt(a, b);
+			return str_nocase_cmp(a, b) > 0;
 	return as_value_numGT(a, b);
-}
+	}
+};
 
-inline static bool
-as_value_num_nocase_eq (const as_value& a, const as_value& b)
+struct as_value_num_nocase_eq : public as_value_lt
 {
+	as_value_num_nocase_eq(as_environment* env) : as_value_lt(env) {}
+	bool operator() (const as_value& a, const as_value& b)
+	{
 	if (a.is_string() || b.is_string())
-		return as_value_nocase_eq(a, b);
+			return str_nocase_cmp(a, b) == 0;
 	return as_value_numEQ(a, b);
-}
+	}
+};
 
-// Return basic as_value comparison function for corresponding sort flag
+// Return basic as_value comparison functor for corresponding sort flag
 // Note:
 // fUniqueSort and fReturnIndexedArray must first be stripped from the flag
-static as_cmp_fn
-get_basic_cmp(uint8_t flags)
+as_cmp_fn
+get_basic_cmp(uint8_t flags, as_environment* env)
 {
+	as_cmp_fn f;
+
 	switch ( flags )
 	{
-		case 0: 
-			return &as_value_lt;
+		case 0: // default string comparison
+			f = as_value_lt(env);
+			return f;
 
 		case as_array_object::fDescending:
-			return &as_value_gt;
+			f = as_value_gt(env);
+			return f;
 
 		case as_array_object::fCaseInsensitive: 
-			return &as_value_nocase_lt;
+			f = as_value_nocase_lt(env);
+			return f;
 
 		case as_array_object::fCaseInsensitive | 
 				as_array_object::fDescending:
-			return &as_value_nocase_gt;
+			f = as_value_nocase_gt(env);
+			return f;
 
 		case as_array_object::fNumeric: 
-			return &as_value_num_lt;
+			f = as_value_num_lt(env);
+			return f;
 
 		case as_array_object::fNumeric | as_array_object::fDescending:
-			return &as_value_num_gt;
+			f = as_value_num_gt(env);
+			return f;
 
 		case as_array_object::fCaseInsensitive | 
 				as_array_object::fNumeric:
-			return &as_value_num_nocase_lt;
+			f = as_value_num_nocase_lt(env);
+			return f;
 
 		case as_array_object::fCaseInsensitive | 
 				as_array_object::fNumeric |
 				as_array_object::fDescending:
-			return &as_value_num_nocase_gt;
+			f = as_value_num_nocase_gt(env);
+			return f;
 
 		default:
 			log_error(_("Unhandled sort flags: %d (0x%X)"), flags, flags);
-			return &as_value_lt;
+			f = as_value_lt(env);
+			return f;
 	}
 }
 
 // Return basic as_value equality function for corresponding sort flag
 // Note:
 // fUniqueSort and fReturnIndexedArray must first be stripped from the flag
-static as_cmp_fn
-get_basic_eq(uint8_t flags)
+as_cmp_fn
+get_basic_eq(uint8_t flags, as_environment* env)
 {
+	as_cmp_fn f;
 	flags &= ~(as_array_object::fDescending);
+
 	switch ( flags )
 	{
 		case 0: // default string comparison
-			return &as_value_eq;
+			f = as_value_eq(env);
+			return f;
 
 		case as_array_object::fCaseInsensitive: 
-			return &as_value_nocase_eq;
+			f = as_value_nocase_eq(env);
+			return f;
 
 		case as_array_object::fNumeric: 
-			return &as_value_num_eq;
+			f = as_value_num_eq(env);
+			return f;
 
 		case as_array_object::fCaseInsensitive | 
 				as_array_object::fNumeric:
-			return &as_value_num_nocase_eq;
+			f = as_value_num_nocase_eq(env);
 
 		default:
-			return &as_value_eq;
+			f = as_value_eq(env);
+			return f;
 	}
 }
 
@@ -319,11 +377,10 @@
 		
 		ao->get_member(_prop, &av);
 		bo->get_member(_prop, &bv);
-		return (*_comp)(av, bv);
+		return _comp(av, bv);
 	}
 };
 
-
 // Comparator for sorting on multiple array properties
 class as_value_multiprop
 {
@@ -820,11 +877,12 @@
 {
 	boost::intrusive_ptr<as_array_object> array = 
 		ensureType<as_array_object>(fn.this_ptr);
+	as_environment* env = &(fn.env());
 	uint8_t flags = 0;
 
 	if ( fn.nargs == 0 )
 	{
-		array->sort(&as_value_lt);
+		array->sort(as_value_lt(env));
 		return as_value((boost::intrusive_ptr<as_object>)array);
 	}
 	else if ( fn.nargs == 1 && fn.arg(0).is_number() )
@@ -847,8 +905,8 @@
 			as_value_custom(*as_func, icmp, fn.this_ptr);
 
 		if ( (flags & as_array_object::fReturnIndexedArray) )
-			return as_value(array->sort_indexed(&avc));
-		array->sort(&avc);
+			return as_value(array->sort_indexed(avc));
+		array->sort(avc);
 		return as_value((boost::intrusive_ptr<as_object>)array);
 		// note: custom AS function sorting apparently ignores the 
 		// UniqueSort flag which is why it is also ignored here
@@ -862,12 +920,12 @@
 	}
 	bool do_unique, do_index;
 	flags = flag_preprocess(flags, &do_unique, &do_index);
-	as_cmp_fn comp = get_basic_cmp(flags);
+	as_cmp_fn comp = get_basic_cmp(flags, env);
 
 	if (do_unique)
 	{
 		as_cmp_fn eq =
-			get_basic_eq(flags);
+			get_basic_eq(flags, env);
 		if (do_index) return array->sort_indexed(comp, eq);
 		return array->sort(comp, eq);
 	}
@@ -881,42 +939,37 @@
 {
 	boost::intrusive_ptr<as_array_object> array = 
 		ensureType<as_array_object>(fn.this_ptr);
+	as_environment* env = &(fn.env());
+	bool do_unique = false, do_index = false;
+	uint8_t flags = 0;
+	int sv = VM::get().getSWFVersion();
 
-	// case: sortOn("prop")
-	if ( fn.nargs == 1 && fn.arg(0).is_string() )
+	// cases: sortOn("prop) and sortOn("prop", Array.FLAG)
+	if ( fn.nargs > 0 && fn.arg(0).is_string() )
 	{
-		std::string propField = PROPNAME(fn.arg(0).to_string()); // TODO: pass env, use versioned 
-		as_value_prop avc = as_value_prop(propField, &as_value_lt);
-		array->sort(&avc);
-		return as_value((boost::intrusive_ptr<as_object>)array);
-	}
+		std::string propField = 
+			PROPNAME(fn.arg(0).to_string_versioned(sv, env));
 
-	// case: sortOn("prop", Array.FLAG)
-	bool do_unique = false, do_index = false;
-	if ( fn.nargs == 2 && fn.arg(0).is_string() )
+		if ( fn.nargs > 1 && fn.arg(1).is_number() )
 	{
-		std::string propField = PROPNAME(fn.arg(0).to_string()); // TODO: pass env, use versioned
-		if ( fn.arg(1).is_number() )
-		{
-			uint8_t flags = 
-				static_cast<uint8_t>(fn.arg(1).to_number());
+			flags = static_cast<uint8_t>(fn.arg(1).to_number());
 			flags = flag_preprocess(flags, &do_unique, &do_index);
+		}
 			as_value_prop avc = as_value_prop(propField, 
-						get_basic_cmp(flags));
+					get_basic_cmp(flags, env));
 			if (do_unique)
 			{
 				as_value_prop ave = as_value_prop(propField, 
-					get_basic_eq(flags));
+				get_basic_eq(flags, env));
 				if (do_index)
-					return array->sort_indexed(&avc, &ave);
-				return array->sort(&avc, &ave);
+				return array->sort_indexed(avc, ave);
+			return array->sort(avc, ave);
 			}
 			if (do_index)
-				return as_value(array->sort_indexed(&avc));
-			array->sort(&avc);
+			return as_value(array->sort_indexed(avc));
+		array->sort(avc);
 			return as_value((boost::intrusive_ptr<as_object>)array);
 		}
-	}
 
 	// case: sortOn(["prop1", "prop2"] ...)
 	if (fn.nargs > 0 && fn.arg(0).is_object() ) 
@@ -931,15 +984,18 @@
 		for (std::deque<as_value>::const_iterator it = props->begin();
 			it != props->end(); ++it)
 		{
-			std::string s = PROPNAME((*it).to_string()); // TODO: pass env, use versioned
+			std::string s = 
+				PROPNAME((*it).to_string_versioned(sv, env));
 			prp.push_back(s);
 		}
 		
 		// case: sortOn(["prop1", "prop2"])
 		if (fn.nargs == 1)
-		{	// assign each cmp function to the standard cmp fn
+		{
+			// assign each cmp function to the standard cmp fn
+			as_cmp_fn c = get_basic_cmp(0, env);
 			for (unsigned int i = 0; i < optnum; i++)
-				cmp[i] = &as_value_lt;
+				cmp[i] = c;
 		}
 		// case: sortOn(["prop1", "prop2"], [Array.FLAG1, Array.FLAG2])
 		else if ( fn.arg(1).is_object() )
@@ -957,18 +1013,19 @@
 					&do_unique, &do_index);
 
 				for (unsigned int i = 0; i < optnum; i++)
-					cmp[i] = get_basic_cmp(flgs[i]);
+					cmp[i] = get_basic_cmp(flgs[i], env);
 
 				if (do_unique)
 				{
 					for (unsigned int i = 0; i < optnum; i++)
-						eq[i] = get_basic_eq(flgs[i]);
+						eq[i] = get_basic_eq(flgs[i], env);
 				}
 			}
 			else
 			{
+				as_cmp_fn c = get_basic_cmp(0, env);
 				for (unsigned int i = 0; i < optnum; i++)
-					cmp[i] = &as_value_lt;
+					cmp[i] = c;
 			}
 		}
 		// case: sortOn(["prop1", "prop2"], Array.FLAG)
@@ -977,14 +1034,14 @@
 			uint8_t flags = 
 				static_cast<uint8_t>(fn.arg(1).to_number());
 			flag_preprocess(flags, &do_unique, &do_index);
-			as_cmp_fn c = get_basic_cmp(flags);
+			as_cmp_fn c = get_basic_cmp(flags, env);
 
 			for (unsigned int i = 0; i < optnum; i++)
 				cmp[i] = c;
 			
 			if (do_unique)
 			{
-				as_cmp_fn e = get_basic_eq(flags);
+				as_cmp_fn e = get_basic_eq(flags, env);
 				for (unsigned int i = 0; i < optnum; i++)
 					eq[i] = e;
 			}
@@ -998,19 +1055,22 @@
 			as_value_multiprop_eq ave = 
 				as_value_multiprop_eq(prp, eq);
 			if (do_index)
-				return array->sort_indexed(&avc, &ave);
-			return array->sort(&avc, &ave);
+				return array->sort_indexed(avc, ave);
+			return array->sort(avc, ave);
 		}
 		if (do_index)
-			return as_value(array->sort_indexed(&avc));
-		array->sort(&avc);
+			return as_value(array->sort_indexed(avc));
+		array->sort(avc);
 		return as_value((boost::intrusive_ptr<as_object>)array);
 
 	}
 	IF_VERBOSE_ASCODING_ERRORS(
 	log_aserror(_("SortOn called with invalid arguments."));
 	)
+	if (fn.nargs == 0 )
 	return as_value();
+
+	return as_value((boost::intrusive_ptr<as_object>)array);
 }
 
 // Callback to push values to the back of an array
@@ -1101,11 +1161,13 @@
 	boost::intrusive_ptr<as_array_object> array = ensureType<as_array_object>(fn.this_ptr);
 
 	std::string separator = ",";
+	int swfversion = VM::get().getSWFVersion();
+	as_environment* env = &(fn.env());
 
 	if (fn.nargs > 0)
-		separator = fn.arg(0).to_string(); // TODO: pass env, use versioned
+		separator = fn.arg(0).to_string_versioned(swfversion, env);
 
-	std::string ret = array->join(separator, &(fn.env()));
+	std::string ret = array->join(separator, env);
 
 	return as_value(ret.c_str());
 }
@@ -1265,13 +1327,14 @@
 		// Create an empty array with the given number of undefined elements.
 		//
 		as_value index_number, undef_value;
+		int sv = VM::get().getSWFVersion();
+		as_environment* env = &(fn.env());
 
 		undef_value.set_undefined();
 		for (int i = 0; i < int(fn.arg(0).to_number()); i++)
 		{
 			index_number.set_int(i);
-			// TODO: pass env, use versioned (to_string)
-			ao->set_member(index_number.to_string().c_str(), undef_value);
+			ao->set_member(index_number.to_string_versioned(sv, env).c_str(), undef_value);
 		}
 	}
 	else

Index: server/array.h
===================================================================
RCS file: /sources/gnash/gnash/server/array.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- server/array.h	29 Jul 2007 12:57:01 -0000	1.31
+++ server/array.h	3 Aug 2007 21:10:19 -0000	1.32
@@ -181,9 +181,9 @@
 	///	boolean functor or function comparing two as_value& objects
 	///
 	template <class AVCMP>
-	void sort(AVCMP* avc)
+	void sort(AVCMP avc)
 	{
-		std::sort(elements.begin(), elements.end(), *avc);
+		std::sort(elements.begin(), elements.end(), avc);
 	}
 
 	/// \brief
@@ -201,12 +201,12 @@
 	///     used to determine equality
 	///
 	template <class AVCMP, class AVEQ>
-	as_value sort(AVCMP* avc, AVEQ* ave)
+	as_value sort(AVCMP avc, AVEQ ave)
 	{
 		std::deque<as_value> nelem = std::deque<as_value>(elements);
 
-		std::sort(nelem.begin(), nelem.end(), *avc);
-		if (adjacent_find(nelem.begin(), nelem.end(), *ave) != nelem.end() )
+		std::sort(nelem.begin(), nelem.end(), avc);
+		if (adjacent_find(nelem.begin(), nelem.end(), ave) != nelem.end() )
 			return as_value(0);
 
 		elements = nelem;
@@ -220,10 +220,10 @@
 	///	boolean functor or function comparing two as_value& objects
 	///
 	template <class AVCMP>
-	as_array_object* sort_indexed(AVCMP* avc)
+	as_array_object* sort_indexed(AVCMP avc)
 	{
 		std::deque<indexed_as_value> ielem = get_indexed_elements();
-		std::sort(ielem.begin(), ielem.end(), *avc);
+		std::sort(ielem.begin(), ielem.end(), avc);
 		return get_indices(ielem);
 	}
 
@@ -241,13 +241,13 @@
 	///     used to determine equality
 	///
 	template <class AVCMP, class AVEQ>
-	as_value sort_indexed(AVCMP* avc, AVEQ* ave)
+	as_value sort_indexed(AVCMP avc, AVEQ ave)
 	{
 		std::deque<indexed_as_value> ielem = get_indexed_elements();
 
-		std::sort(ielem.begin(), ielem.end(), *avc);
+		std::sort(ielem.begin(), ielem.end(), avc);
 
-		if (adjacent_find(ielem.begin(), ielem.end(), *ave) != ielem.end() )
+		if (adjacent_find(ielem.begin(), ielem.end(), ave) != ielem.end() )
 			return as_value(0);
 
 		return get_indices(ielem);

Index: testsuite/actionscript.all/array.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/array.as,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- testsuite/actionscript.all/array.as	2 Aug 2007 18:16:18 -0000	1.27
+++ testsuite/actionscript.all/array.as	3 Aug 2007 21:10:19 -0000	1.28
@@ -5,7 +5,7 @@
 // Updated with sort functions, and to use check() macro
 // by Mike Carlson Feb. 14th, 2006
 
-rcsid="$Id: array.as,v 1.27 2007/08/02 18:16:18 strk Exp $";
+rcsid="$Id: array.as,v 1.28 2007/08/03 21:10:19 strk Exp $";
 
 #include "check.as"
 
@@ -467,12 +467,12 @@
 check_equals( e.toString(), "singleton" );
 
 r = f.sort();
-xcheck_equals( r.toString(), "Name,Name,Year" );
-xcheck_equals( f.toString(), "Name,Name,Year" );
+check_equals( r.toString(), "Name,Name,Year" );
+check_equals( f.toString(), "Name,Name,Year" );
 r = f.sort( Array.UNIQUESORT );
 check_equals( r.toString(), "0" );
 f.sort( Array.DESCENDING | Array.CASEINSENSITIVE );
-xcheck_equals( f.toString(), "Year,Name,Name" );
+check_equals( f.toString(), "Year,Name,Name" );
 
 trace(" -- Return Indexed Array Tests -- ");
 
@@ -507,7 +507,7 @@
 check_equals( r.toString(), "0" );
 
 trace(" -- Custom AS function tests -- ");
-r = a.sort( cmp_fn, Array.UNIQUE );
+r = a.sort( cmp_fn, Array.UNIQUESORT );
 check_equals( r.toString(), ",vi,ed,nano,emacs,Jedit" );
 check_equals( a.toString(), ",vi,ed,nano,emacs,Jedit" );
 r = a.sort( something_undefined );
@@ -574,13 +574,13 @@
 check_equals( r.toString(), "0" );
 r = c.sort( Array.UNIQUESORT | Array.NUMERIC | Array.DESCENDING | Array.RETURNINDEXEDARRAY );
 check_equals( r.toString(), "0" );
-r = a.sort( cmp_fn, Array.UNIQUE | Array.CASEINSENSITIVE );
+r = a.sort( cmp_fn, Array.UNIQUESORT | Array.CASEINSENSITIVE );
 check_equals( tolen(r), "[0, 2, 2, 2, 4, 5, 5]" );
 check_equals( tolen(a), "[0, 2, 2, 2, 4, 5, 5]" );
-r = a.sort( cmp_fn, Array.UNIQUE | Array.CASEINSENSITIVE | Array.RETURNINDEXEDARRAY );
-check_equals( r.toString(), "0,1,2,3,4,5,6" );  // gnash fails in SWF7,8 but succeeds in SWF5,6
-r = a.sort( cmp_fn, Array.UNIQUE | Array.CASEINSENSITIVE | Array.RETURNINDEXEDARRAY | Array.DESCENDING );
-check_equals( r.toString(), "6,5,4,3,2,1,0" ); // gnash fails in SWF7,8 but succeeds in SWF5,6
+r = a.sort( cmp_fn, Array.UNIQUESORT | Array.CASEINSENSITIVE | Array.RETURNINDEXEDARRAY );
+check_equals( r.toString(), "0,1,2,3,4,5,6" ); 
+r = a.sort( cmp_fn, Array.UNIQUESORT | Array.CASEINSENSITIVE | Array.RETURNINDEXEDARRAY | Array.DESCENDING );
+check_equals( r.toString(), "6,5,4,3,2,1,0" );
 
 trace(" -- Array with null value  -- ");
 c.push(null);
@@ -642,13 +642,17 @@
 a.push({Name: "Colossus", Year: 1943, Electronic: true});
 a.push({Name: "ENIAC", Year: 1944, Electronic: true});
 
+b = [];
+b.push({Name: id, Year: yr, Electronic: yr});
+b.push({Name: yr, Year: id, Electronic: yr});
+
 function tostr(x)
 {
 	var i;
 	str = "";
 	for(i = 0; i < x.length; i++)
 	{
-		y = a[i];
+		y = x[i];
 		str += (y.Name + "," + y.Year + "," + y.Electronic );
 		if (i != x.length - 1) str += " | ";
 	}
@@ -773,6 +777,48 @@
 check_equals( tostr(r), "Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true | Zuse Z3,1941,false" );
 check_equals( tostr(a), "Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true | Zuse Z3,1941,false" );
 
+trace("sortOn using an object implementing/over-riding the toString() method as the property argument");
+
+a.sortOn( id );
+check_equals( tostr(a), "Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true | Zuse Z3,1941,false" );
+
+a.sortOn( id, Array.CASEINSENSITIVE | Array.DESCENDING );
+check_equals( tostr(a), "Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true | Zuse Z3,1941,false" );
+
+a.sortOn( [id], 0 );
+check_equals( tostr(a), "Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true | Zuse Z3,1941,false" );
+
+a.sortOn( [yr, id], [Array.NUMERIC, Array.DESCENDING] );
+check_equals( tostr(a), "Zuse Z3,1941,false | Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true" );
+
+trace("sortOn with properties that are objects implementing the toString() method");
+
+r = b.sortOn( "Name" );
+check_equals( tostr(r), "Name,Year,Year | Year,Name,Year");
+check_equals( tostr(b), "Name,Year,Year | Year,Name,Year");
+b.sortOn( "Year" );
+check_equals( tostr(b), "Year,Name,Year | Name,Year,Year");
+b.sortOn( ["Year", "Name"], [Array.NUMERIC | Array.DESCENDING, 0] );
+check_equals( tostr(b), "Name,Year,Year | Year,Name,Year");
+
+trace("sortOn invalid calls");
+r = a.sortOn();
+check( r == undefined );
+check_equals( tostr(a), "Zuse Z3,1941,false | Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true" );
+
+r = a.sortOn(undefined);
+check_equals( typeof(r) , 'object' );
+check( r instanceof Array );
+check_equals( tostr(a), "Zuse Z3,1941,false | Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true" );
+
+#if OUTPUT_VERSION < 7
+trace("sortOn property name case-mismatch");
+a.sortOn( "name" );
+check_equals( tostr(a), "Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true | Zuse Z3,1941,false" );
+a.sortOn( ["year", "name"], Array.NUMERIC );
+check_equals( tostr(a), "Atanasoff-Berry,1941,true | Zuse Z3,1941,false | Colossus,1943,true | ENIAC,1944,true" );
+#endif // OUTPUT_VERSION < 7
+
 #if OUTPUT_VERSION > 6
 trace("sortOn with some properties undefined");
 a.push({Name: "Harvard Mark I", Year: 1944, Mass: 4500});
@@ -803,60 +849,4 @@
 check_equals( r.toString(), "0,3,1,2,4");
 #endif // OUTPUT_VERSION > 6
 
-#if OUTPUT_VERSION < 7
-trace("sortOn property name case-mismatch");
-a.sortOn( "name" );
-check_equals( tostr(a), "Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true | Zuse Z3,1941,false" );
-a.sortOn( ["year", "name"], Array.NUMERIC );
-check_equals( tostr(a), "Atanasoff-Berry,1941,true | Zuse Z3,1941,false | Colossus,1943,true | ENIAC,1944,true" );
-#endif // OUTPUT_VERSION < 7
-
-trace("sortOn invalid calls");
-r = a.sortOn();
-check( r == undefined );
-#if OUTPUT_VERSION < 7
-check_equals( tostr(a), "Atanasoff-Berry,1941,true | Zuse Z3,1941,false | Colossus,1943,true | ENIAC,1944,true" );
-#else // OUTPUT_VERSION >= 7
-check_equals( tostr(a), "Zuse Z3,1941,false | Colossus,1943,true | ENIAC,1944,true | Atanasoff-Berry,1941,true | Harvard Mark I,1944,undefined" );
-#endif // OUTPUT_VERSION >= 7
-
-r = a.sortOn(undefined);
-xcheck_equals( typeof(r) , 'object' );
-xcheck( r instanceof Array );
-#if OUTPUT_VERSION < 7
-xcheck_equals( tostr(r) , "Atanasoff-Berry,1941,true | Zuse Z3,1941,false | Colossus,1943,true | ENIAC,1944,true" );
-#else // OUTPUT_VERSION >= 7
-xcheck_equals( tostr(r) , "Zuse Z3,1941,false | Colossus,1943,true | ENIAC,1944,true | Atanasoff-Berry,1941,true | Harvard Mark I,1944,undefined" );
-#endif // OUTPUT_VERSION >= 7
-
-trace("sortOn using an object implementing/over-riding the toString() method as the property argument");
-
-r = a.sortOn( id );
-#if OUTPUT_VERSION < 7
-check_equals( tostr(a), "Atanasoff-Berry,1941,true | Zuse Z3,1941,false | Colossus,1943,true | ENIAC,1944,true" );
-#else // OUTPUT_VERSION >= 7
-check_equals( tostr(a), "Zuse Z3,1941,false | Colossus,1943,true | ENIAC,1944,true | Atanasoff-Berry,1941,true | Harvard Mark I,1944,undefined" );
-#endif // OUTPUT_VERSION >= 7
-
-a.sortOn( id, Array.CASEINSENSITIVE | Array.DESCENDING );
-#if OUTPUT_VERSION < 7
-check_equals( tostr(a), "Atanasoff-Berry,1941,true | Zuse Z3,1941,false | Colossus,1943,true | ENIAC,1944,true" );
-#else // OUTPUT_VERSION >= 7
-check_equals( tostr(a), "Zuse Z3,1941,false | Colossus,1943,true | ENIAC,1944,true | Atanasoff-Berry,1941,true | Harvard Mark I,1944,undefined");
-#endif // OUTPUT_VERSION >= 7
-
-
-r = a.sortOn( [id], 0 );
-#if OUTPUT_VERSION < 7
-xcheck_equals( tostr(a), "Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true | Zuse Z3,1941,false" );
-#else // OUTPUT_VERSION >= 7
-xcheck_equals( tostr(a), "Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true | Harvard Mark I,1944,undefined | Zuse Z3,1941,false" );
-#endif // OUTPUT_VERSION >= 7
-
-r = a.sortOn( [yr, id], [Array.NUMERIC, Array.DESCENDING] );
-#if OUTPUT_VERSION < 7
-xcheck_equals( tostr(a), "Zuse Z3,1941,false | Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true" );
-#else // OUTPUT_VERSION >= 7
-xcheck_equals( tostr(a), "Zuse Z3,1941,false | Atanasoff-Berry,1941,true | Colossus,1943,true | Harvard Mark I,1944,undefined | ENIAC,1944,true" );
-#endif // OUTPUT_VERSION >= 7
 



From MAILER-DAEMON Fri Aug 03 17:27:22 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IH4g6-0007KN-8z
	for mharc-gnash-commit@gnu.org; Fri, 03 Aug 2007 17:27:22 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IH4g5-0007Jn-37
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 17:27:21 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IH4g2-0007IM-Pb
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 17:27:20 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IH4g2-0007IC-DU
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 17:27:18 -0400
Received: from mx20.gnu.org ([199.232.41.8])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IH4g0-0002vg-3r
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 17:27:17 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by mx20.gnu.org with esmtp (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1IH4fX-00046U-QM
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 17:26:47 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IH4ey-0007P9-OV
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 21:26:12 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IH4ey-0007P6-I0
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 21:26:12 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IH4ey-0007P6-I0@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 03 Aug 2007 21:26:12 +0000
X-detected-kernel: Linux 2.6 (newer, 3)
X-Detected-Kernel: Linux 2.6, seldom 2.4 (older, 4)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/Stag...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Aug 2007 21:27:21 -0000

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

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: Stage.as 

Log message:
	        * testsuite/actionscript.all/Stage.as: test deleting an object
	          which is also a listener (Gnash segfaults).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3940&r2=1.3941
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Stage.as?cvsroot=gnash&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3940
retrieving revision 1.3941
diff -u -b -r1.3940 -r1.3941
--- ChangeLog	3 Aug 2007 21:10:18 -0000	1.3940
+++ ChangeLog	3 Aug 2007 21:26:11 -0000	1.3941
@@ -1,3 +1,8 @@
+2007-08-03 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/actionscript.all/Stage.as: test deleting an object
+	  which is also a listener (Gnash segfaults).
+
 2007-08-03 Ivor Blockley <meteoryte@yahoo.com.au>
 
 	* server/array.{cpp,h}: fixes previously identified issues with

Index: testsuite/actionscript.all/Stage.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Stage.as,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- testsuite/actionscript.all/Stage.as	26 Jul 2007 03:41:19 -0000	1.12
+++ testsuite/actionscript.all/Stage.as	3 Aug 2007 21:26:12 -0000	1.13
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Stage.as,v 1.12 2007/07/26 03:41:19 strk Exp $";
+rcsid="$Id: Stage.as,v 1.13 2007/08/03 21:26:12 strk Exp $";
 
 #include "check.as"
 
@@ -54,6 +54,13 @@
 check_equals(Stage.scaleMode, "showAll");
 Stage.scaleMode = "noScale";
 
+o = new Object();
+o.onResize = function() {
+	_root.note("Resize event received by deleted object");
+};
+Stage.addListener(o);
+delete o;
+
 #else // OUTPUT_VERSION <= 5
 
 check_equals (typeof(Stage.addListener), 'undefined');



From MAILER-DAEMON Fri Aug 03 17:45:13 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IH4xN-00031V-Kl
	for mharc-gnash-commit@gnu.org; Fri, 03 Aug 2007 17:45:13 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IH4xM-000312-Eg
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 17:45:12 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IH4xK-0002zt-0Q
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 17:45:11 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IH4xJ-0002zn-PS
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 17:45:09 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IH4xD-0005tY-3g
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 17:45:03 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IH4wi-0008R9-Q1
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 21:44:32 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IH4wi-0008R6-Ko
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 21:44:32 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IH4wi-0008R6-Ko@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 03 Aug 2007 21:44:32 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/movie_root.cpp server/as...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Aug 2007 21:45:12 -0000

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

Modified files:
	.              : ChangeLog 
	server         : movie_root.cpp 
	server/asobj   : Stage.cpp 

Log message:
	        * server/movie_root.cpp (getStage): properly convert case when
	          fetching the "Stage" object from SWF6 or lower.
	        * server/asobj/Stage.cpp (onResize): properly convert case
	          when fetching the "scaleMode" property from SWF6 or lower.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3941&r2=1.3942
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.81&r2=1.82
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Stage.cpp?cvsroot=gnash&r1=1.16&r2=1.17

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3941
retrieving revision 1.3942
diff -u -b -r1.3941 -r1.3942
--- ChangeLog	3 Aug 2007 21:26:11 -0000	1.3941
+++ ChangeLog	3 Aug 2007 21:44:31 -0000	1.3942
@@ -1,5 +1,12 @@
 2007-08-03 Sandro Santilli <strk@keybit.net>
 
+	* server/movie_root.cpp (getStage): properly convert case when
+	  fetching the "Stage" object from SWF6 or lower.
+	* server/asobj/Stage.cpp (onResize): properly convert case
+	  when fetching the "scaleMode" property from SWF6 or lower.
+
+2007-08-03 Sandro Santilli <strk@keybit.net>
+
 	* testsuite/actionscript.all/Stage.as: test deleting an object
 	  which is also a listener (Gnash segfaults).
 

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- server/movie_root.cpp	2 Aug 2007 22:07:25 -0000	1.81
+++ server/movie_root.cpp	3 Aug 2007 21:44:32 -0000	1.82
@@ -198,7 +198,7 @@
 	if ( ! VM::isInitialized() ) return NULL;
 	as_object* global = VM::get().getGlobal();
 	if ( ! global ) return NULL;
-	if ( ! global->get_member("Stage", &v) ) return NULL;
+	if ( ! global->get_member(PROPNAME("Stage"), &v) ) return NULL;
 	return boost::dynamic_pointer_cast<Stage>(v.to_object());
 }
 		

Index: server/asobj/Stage.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Stage.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/asobj/Stage.cpp	1 Jul 2007 10:54:31 -0000	1.16
+++ server/asobj/Stage.cpp	3 Aug 2007 21:44:32 -0000	1.17
@@ -30,6 +30,7 @@
 #include "VM.h"
 
 #include <string>
+#include <boost/algorithm/string/case_conv.hpp> // for using PROPNAME
 
 namespace gnash {
 
@@ -68,7 +69,7 @@
 Stage::onResize(as_environment* env)
 {
 	as_value v;
-	if ( get_member("scaleMode", &v) && v.to_string(env) == "noScale" )
+	if ( get_member(PROPNAME("scaleMode"), &v) && v.to_string(env) == "noScale" )
 	{
 		notifyResize(env);
 	}



From MAILER-DAEMON Fri Aug 03 17:57:17 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IH592-000728-W0
	for mharc-gnash-commit@gnu.org; Fri, 03 Aug 2007 17:57:17 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IH590-0006yf-SE
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 17:57:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IH58x-0006xI-Ur
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 17:57:14 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IH58x-0006xE-Mc
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 17:57:11 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IH58v-0008Gs-Kq
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 17:57:10 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IH58l-0000vF-Bv
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 21:56:59 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IH58l-0000v8-8M
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 21:56:59 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IH58l-0000v8-8M@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 03 Aug 2007 21:56:59 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/asobj/Stage.cpp server/a...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Aug 2007 21:57:15 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/03 21:56:59

Modified files:
	.              : ChangeLog 
	server/asobj   : Stage.cpp Stage.h 

Log message:
	        * server/asobj/Stage.{cpp,h}: Mark all listeners as reachable,
	          drop the unused dropDanglingListeners (since it's verified
	          the Stage doesn't store *weak* pointers).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3942&r2=1.3943
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Stage.cpp?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Stage.h?cvsroot=gnash&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3942
retrieving revision 1.3943
diff -u -b -r1.3942 -r1.3943
--- ChangeLog	3 Aug 2007 21:44:31 -0000	1.3942
+++ ChangeLog	3 Aug 2007 21:56:58 -0000	1.3943
@@ -1,5 +1,11 @@
 2007-08-03 Sandro Santilli <strk@keybit.net>
 
+	* server/asobj/Stage.{cpp,h}: Mark all listeners as reachable,
+	  drop the unused dropDanglingListeners (since it's verified
+	  the Stage doesn't store *weak* pointers).
+
+2007-08-03 Sandro Santilli <strk@keybit.net>
+
 	* server/movie_root.cpp (getStage): properly convert case when
 	  fetching the "Stage" object from SWF6 or lower.
 	* server/asobj/Stage.cpp (onResize): properly convert case

Index: server/asobj/Stage.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Stage.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- server/asobj/Stage.cpp	3 Aug 2007 21:44:32 -0000	1.17
+++ server/asobj/Stage.cpp	3 Aug 2007 21:56:59 -0000	1.18
@@ -137,25 +137,6 @@
 	_listeners.remove(obj);
 }
 
-/// Remove listeners with a refcount == 1
-//
-/// This function should be called before marking
-/// objects to keep alive (when GC gets in effect)
-///
-void
-Stage::dropDanglingListeners()
-{
-	// TODO: find a way to find dangling listeners
-#ifndef GNASH_USE_GC
-	for (ListenersList::iterator it=_listeners.begin(),
-			itEnd=_listeners.end();
-			it != itEnd; ++it)
-	{
-		if ( (*it)->get_ref_count() == 1 ) it=_listeners.erase(it);
-	}
-#endif
-}
-
 const char*
 Stage::getScaleModeString()
 {
@@ -302,4 +283,18 @@
 	global.init_member("Stage", obj.get());
 }
 
+#ifdef GNASH_USE_GC
+void
+Stage::markReachableResources() const
+{
+        for (ListenersList::const_iterator i=_listeners.begin(), e=_listeners.end(); i!=e; ++i)
+        {
+                (*i)->setReachable();
+        }
+
+	// Invoke generic as_object marker
+	markAsObjectReachable();
+}
+#endif // def GNASH_USE_GC
+
 } // end of gnash namespace

Index: server/asobj/Stage.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Stage.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/asobj/Stage.h	1 Jul 2007 10:54:31 -0000	1.9
+++ server/asobj/Stage.h	3 Aug 2007 21:56:59 -0000	1.10
@@ -86,6 +86,13 @@
 	///
 	const char* getScaleModeString();
 
+protected:
+
+#ifdef GNASH_USE_GC
+	/// Mark all Stage listeners as reachable
+	void markReachableResources() const;
+#endif 
+
 private:
 
 	/// Notify all listeners about a resize event
@@ -99,13 +106,6 @@
 	/// Notify an object about an resize event
 	void notifyResize(boost::intrusive_ptr<as_object> obj, as_environment* env);
 
-	/// Remove listeners with a refcount == 1
-	//
-	/// This function should be called before marking
-	/// objects to keep alive (when GC gets in effect)
-	///
-	void dropDanglingListeners();
-
 	typedef std::list<boost::intrusive_ptr<as_object> > ListenersList;
 
 	ListenersList _listeners;



From MAILER-DAEMON Fri Aug 03 18:04:55 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IH5GR-0007jD-B9
	for mharc-gnash-commit@gnu.org; Fri, 03 Aug 2007 18:04:55 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IH5GQ-0007ie-5s
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 18:04:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IH5GO-0007iH-Tl
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 18:04:53 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IH5GO-0007iB-Mo
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 18:04:52 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IH5GN-0001Ur-3S
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 18:04:51 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IH5Fx-0001Ag-R5
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 22:04:25 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IH5Fx-0001Ac-MV
	for gnash-commit@gnu.org; Fri, 03 Aug 2007 22:04:25 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IH5Fx-0001Ac-MV@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 03 Aug 2007 22:04:25 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/asobj/Stage.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Aug 2007 22:04:54 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/03 22:04:25

Modified files:
	.              : ChangeLog 
	server/asobj   : Stage.cpp 

Log message:
	        * server/asobj/Stage.cpp (notifyResize): use PROPNAME()
	          for proper case of notification event. Finish the dangling
	          referneces drop thing.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3943&r2=1.3944
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Stage.cpp?cvsroot=gnash&r1=1.18&r2=1.19

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3943
retrieving revision 1.3944
diff -u -b -r1.3943 -r1.3944
--- ChangeLog	3 Aug 2007 21:56:58 -0000	1.3943
+++ ChangeLog	3 Aug 2007 22:04:25 -0000	1.3944
@@ -1,5 +1,11 @@
 2007-08-03 Sandro Santilli <strk@keybit.net>
 
+	* server/asobj/Stage.cpp (notifyResize): use PROPNAME()
+	  for proper case of notification event. Finish the dangling
+	  referneces drop thing.
+
+2007-08-03 Sandro Santilli <strk@keybit.net>
+
 	* server/asobj/Stage.{cpp,h}: Mark all listeners as reachable,
 	  drop the unused dropDanglingListeners (since it's verified
 	  the Stage doesn't store *weak* pointers).

Index: server/asobj/Stage.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Stage.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- server/asobj/Stage.cpp	3 Aug 2007 21:56:59 -0000	1.18
+++ server/asobj/Stage.cpp	3 Aug 2007 22:04:25 -0000	1.19
@@ -82,14 +82,7 @@
 			itEnd=_listeners.end();
 			it != itEnd; ++it)
 	{
-#ifndef GNASH_USE_GC
-		if ( (*it)->get_ref_count() == 1 ) it=_listeners.erase(it);
-		else
-#endif // ndef GNASH_USE_GC
 		notifyResize(*it, env);
-		// TODO: make sure objects deregister themselve from being listeners
-		//       when deleted by the GC ! (btw, how to ensure the GC didn't 
-		//       delete the Stage first  ? ...)
 	}
 }
 
@@ -97,7 +90,7 @@
 void
 Stage::notifyResize(boost::intrusive_ptr<as_object> obj, as_environment* env)
 {
-	const std::string eventname = "onResize";
+	std::string eventname = PROPNAME("onResize");
 
 	as_value method;
 	if ( ! obj->get_member(eventname, &method) ) {



From MAILER-DAEMON Sat Aug 04 00:19:49 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IHB7F-0001Km-2t
	for mharc-gnash-commit@gnu.org; Sat, 04 Aug 2007 00:19:49 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IHB7D-0001KP-Mb
	for gnash-commit@gnu.org; Sat, 04 Aug 2007 00:19:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IHB7A-0001Gd-09
	for gnash-commit@gnu.org; Sat, 04 Aug 2007 00:19:47 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IHB79-0001GV-TW
	for gnash-commit@gnu.org; Sat, 04 Aug 2007 00:19:43 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IHB77-00043O-TD
	for gnash-commit@gnu.org; Sat, 04 Aug 2007 00:19:42 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IHB6w-0001kY-0a
	for gnash-commit@gnu.org; Sat, 04 Aug 2007 04:19:30 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IHB6v-0001kT-OU
	for gnash-commit@gnu.org; Sat, 04 Aug 2007 04:19:29 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IHB6v-0001kT-OU@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 04 Aug 2007 04:19:29 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/asobj/xmlnode.cpp server...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Aug 2007 04:19:48 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/04 04:19:29

Modified files:
	.              : ChangeLog 
	server/asobj   : xmlnode.cpp xmlnode.h 

Log message:
	        * server/asobj/xmlnode.{cpp,h}: mark reachable resources
	          (childs and parent).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3944&r2=1.3945
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlnode.cpp?cvsroot=gnash&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlnode.h?cvsroot=gnash&r1=1.16&r2=1.17

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3944
retrieving revision 1.3945
diff -u -b -r1.3944 -r1.3945
--- ChangeLog	3 Aug 2007 22:04:25 -0000	1.3944
+++ ChangeLog	4 Aug 2007 04:19:28 -0000	1.3945
@@ -1,3 +1,8 @@
+2007-08-04 Sandro Santilli <strk@keybit.net>
+
+	* server/asobj/xmlnode.{cpp,h}: mark reachable resources
+	  (childs and parent).
+
 2007-08-03 Sandro Santilli <strk@keybit.net>
 
 	* server/asobj/Stage.cpp (notifyResize): use PROPNAME()

Index: server/asobj/xmlnode.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlnode.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- server/asobj/xmlnode.cpp	1 Jul 2007 10:54:32 -0000	1.37
+++ server/asobj/xmlnode.cpp	4 Aug 2007 04:19:29 -0000	1.38
@@ -16,7 +16,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: xmlnode.cpp,v 1.37 2007/07/01 10:54:32 bjacques Exp $ */
+/* $Id: xmlnode.cpp,v 1.38 2007/08/04 04:19:29 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -763,6 +763,23 @@
 
 }
 
+#ifdef GNASH_USE_GC
+void
+XMLNode::markReachableResources() const
+{
+	// Mark childs
+	for (ChildList::const_iterator i=_children.begin(), e=_children.end(); i!=e; ++i)
+	{
+		(*i)->setReachable();
+	}
+
+	// Mark parent
+	if ( _parent ) _parent->setReachable();
+
+	markAsObjectReachable();
+}
+#endif // GNASH_USE_GC
+
 } // end of gnash namespace
 
 // Local Variables:

Index: server/asobj/xmlnode.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlnode.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/asobj/xmlnode.h	1 Jul 2007 10:54:32 -0000	1.16
+++ server/asobj/xmlnode.h	4 Aug 2007 04:19:29 -0000	1.17
@@ -237,6 +237,19 @@
     ChildList       _children;
     AttribList      _attributes;
 
+protected:
+
+#ifdef GNASH_USE_GC
+	/// Mark XMLNode-specific reachable resources and invoke
+	/// the parent's class version (markAsObjectReachable)
+	//
+	/// XMLNode-specific reachable resources are:
+	/// 	- The child elements (_children)
+	/// 	- The parent elements (_parent)
+	///
+	virtual void markReachableResources() const;
+#endif // GNASH_USE_GC
+
 private:
 
     // TODO: make a lot more things private !



From MAILER-DAEMON Sat Aug 04 00:23:55 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IHBBD-0002Rt-3k
	for mharc-gnash-commit@gnu.org; Sat, 04 Aug 2007 00:23:55 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IHBBB-0002Rg-Gh
	for gnash-commit@gnu.org; Sat, 04 Aug 2007 00:23:53 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IHBB9-0002RU-Pn
	for gnash-commit@gnu.org; Sat, 04 Aug 2007 00:23:52 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IHBB9-0002RR-M5
	for gnash-commit@gnu.org; Sat, 04 Aug 2007 00:23:51 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IHBB6-0004Uv-9U
	for gnash-commit@gnu.org; Sat, 04 Aug 2007 00:23:50 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IHBAq-0001rC-Pu
	for gnash-commit@gnu.org; Sat, 04 Aug 2007 04:23:32 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IHBAq-0001r9-LL
	for gnash-commit@gnu.org; Sat, 04 Aug 2007 04:23:32 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IHBAq-0001r9-LL@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 04 Aug 2007 04:23:32 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/array.cpp testsuite/acti...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Aug 2007 04:23:54 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/04 04:23:32

Modified files:
	.              : ChangeLog 
	server         : array.cpp 
	testsuite/actionscript.all: array.as 

Log message:
	Patch #6136 by Ivor Blockley <meteoryte@yahoo.com.au>:
	
	        * server/array.cpp:
	          Pointers to the as_environment object in the as_value comparison
	          functors are now references.
	          Fix a bug caused by a missing return statement in the get_basic_eq
	          function.
	        * testsuite/actionscript.all/array.as:
	          UNIQUE -> UNIQUESORT flag.
	          add some tests to see how AS objects implementing the valueOf method
	          interact with array class methods.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3945&r2=1.3946
http://cvs.savannah.gnu.org/viewcvs/gnash/server/array.cpp?cvsroot=gnash&r1=1.71&r2=1.72
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/array.as?cvsroot=gnash&r1=1.28&r2=1.29

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3945
retrieving revision 1.3946
diff -u -b -r1.3945 -r1.3946
--- ChangeLog	4 Aug 2007 04:19:28 -0000	1.3945
+++ ChangeLog	4 Aug 2007 04:23:31 -0000	1.3946
@@ -1,3 +1,15 @@
+2007-08-04 Ivor Blockley <meteoryte@yahoo.com.au>
+
+	* server/array.cpp:
+	  Pointers to the as_environment object in the as_value comparison
+	  functors are now references.
+	  Fix a bug caused by a missing return statement in the get_basic_eq
+	  function.
+	* testsuite/actionscript.all/array.as:
+	  UNIQUE -> UNIQUESORT flag.
+	  add some tests to see how AS objects implementing the valueOf method
+	  interact with array class methods.
+
 2007-08-04 Sandro Santilli <strk@keybit.net>
 
 	* server/asobj/xmlnode.{cpp,h}: mark reachable resources

Index: server/array.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/array.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- server/array.cpp	3 Aug 2007 21:10:19 -0000	1.71
+++ server/array.cpp	4 Aug 2007 04:23:32 -0000	1.72
@@ -58,12 +58,14 @@
 }
 
 // simple as_value strict-weak-ordering comparison functors:
+
+// string comparison, ascending (default sort method)
 struct as_value_lt
 {
-	as_environment* _env;
+	as_environment& _env;
 	int _sv;
 
-	as_value_lt(as_environment* env)
+	as_value_lt(as_environment& env)
 		: _env(env)
 	{
 		_sv = VM::get().getSWFVersion();
@@ -71,16 +73,16 @@
 
 	inline int str_cmp(const as_value& a, const as_value& b)
 	{
-		std::string s = a.to_string_versioned(_sv, _env);
-		return s.compare(b.to_string_versioned(_sv, _env));
+		std::string s = a.to_string_versioned(_sv, &_env);
+		return s.compare(b.to_string_versioned(_sv,& _env));
 	}
 
 	inline int str_nocase_cmp(const as_value& a, const as_value& b)
 	{
 		using namespace boost::algorithm;
 
-		std::string c = to_upper_copy(a.to_string_versioned(_sv, _env));
-		std::string d = to_upper_copy(b.to_string_versioned(_sv, _env));
+		std::string c = to_upper_copy(a.to_string_versioned(_sv, &_env));
+		std::string d = to_upper_copy(b.to_string_versioned(_sv, &_env));
 		return c.compare(d);
 	}
 
@@ -90,8 +92,8 @@
 		if (b.is_undefined()) return true;
 		if (a.is_null()) return false;
 		if (b.is_null()) return true;
-		double aval = a.to_number(_env);
-		double bval = b.to_number(_env);
+		double aval = a.to_number(&_env);
+		double bval = b.to_number(&_env);
 		if (isnan(aval)) return false;
 		if (isnan(bval)) return true;
 		return aval < bval;
@@ -103,8 +105,8 @@
 		if (a.is_undefined()) return true;
 		if (b.is_null()) return false;
 		if (a.is_null()) return true;
-		double aval = a.to_number(_env);
-		double bval = b.to_number(_env);
+		double aval = a.to_number(&_env);
+		double bval = b.to_number(&_env);
 		if (isnan(bval)) return false;
 		if (isnan(aval)) return true;
 		return aval > bval;
@@ -114,8 +116,8 @@
 	{
 		if (a.is_undefined() && b.is_undefined()) return true;
 		if (a.is_null() && b.is_null()) return true;
-		double aval = a.to_number(_env);
-		double bval = b.to_number(_env);
+		double aval = a.to_number(&_env);
+		double bval = b.to_number(&_env);
 		if (isnan(aval) && isnan(bval)) return true;
 		return aval == bval;
 	}
@@ -126,54 +128,60 @@
 	}
 };
 
+// string comparison, descending
 struct as_value_gt : public as_value_lt
 {
-	as_value_gt(as_environment* env) : as_value_lt(env) {}
+	as_value_gt(as_environment& env) : as_value_lt(env) {}
 	bool operator() (const as_value& a, const as_value& b)
 	{
 		return str_cmp(a, b) > 0;
 	}
 };
 
+// string equality
 struct as_value_eq : public as_value_lt
 {
-	as_value_eq(as_environment* env) : as_value_lt(env) {}
+	as_value_eq(as_environment& env) : as_value_lt(env) {}
 	bool operator() (const as_value& a, const as_value& b)
 	{
 		return str_cmp(a, b) == 0;
 	}
 };
 
+// case-insensitive string comparison, ascending
 struct as_value_nocase_lt : public as_value_lt
 {
-	as_value_nocase_lt(as_environment* env) : as_value_lt(env) {}
+	as_value_nocase_lt(as_environment& env) : as_value_lt(env) {}
 	bool operator() (const as_value& a, const as_value& b)
 	{
 		return str_nocase_cmp(a, b) < 0;
 	}
 };
 
+// case-insensitive string comparison, descending
 struct as_value_nocase_gt : public as_value_lt
 {
-	as_value_nocase_gt(as_environment* env) : as_value_lt(env) {}
+	as_value_nocase_gt(as_environment& env) : as_value_lt(env) {}
 	bool operator() (const as_value& a, const as_value& b)
 	{
 		return str_nocase_cmp(a, b) > 0;
 	}
 };
 
+// case-insensitive string equality
 struct as_value_nocase_eq : public as_value_lt
 {
-	as_value_nocase_eq(as_environment* env) : as_value_lt(env) {}
+	as_value_nocase_eq(as_environment& env) : as_value_lt(env) {}
 	bool operator() (const as_value& a, const as_value& b)
 	{
 		return str_nocase_cmp(a, b) == 0;
 	}
 };
 
+// numeric comparison, ascending
 struct as_value_num_lt : public as_value_lt
 {
-	as_value_num_lt(as_environment* env) : as_value_lt(env) {}
+	as_value_num_lt(as_environment& env) : as_value_lt(env) {}
 	bool operator() (const as_value& a, const as_value& b)
 	{
 		if (a.is_string() || b.is_string())
@@ -182,9 +190,10 @@
 	}
 };
 
+// numeric comparison, descending
 struct as_value_num_gt : public as_value_lt
 {
-	as_value_num_gt(as_environment* env) : as_value_lt(env) {}
+	as_value_num_gt(as_environment& env) : as_value_lt(env) {}
 	bool operator() (const as_value& a, const as_value& b)
 	{
 		if (a.is_string() || b.is_string())
@@ -193,9 +202,10 @@
 	}
 };
 
+// numeric equality
 struct as_value_num_eq : public as_value_lt
 {
-	as_value_num_eq(as_environment* env) : as_value_lt(env) {}
+	as_value_num_eq(as_environment& env) : as_value_lt(env) {}
 	bool operator() (const as_value& a, const as_value& b)
 	{
 		if (a.is_string() || b.is_string())
@@ -204,9 +214,10 @@
 	}
 };
 
+// case-insensitive numeric comparison, ascending
 struct as_value_num_nocase_lt : public as_value_lt
 {
-	as_value_num_nocase_lt(as_environment* env) : as_value_lt(env) {}
+	as_value_num_nocase_lt(as_environment& env) : as_value_lt(env) {}
 	bool operator() (const as_value& a, const as_value& b)
 	{
 		if (a.is_string() || b.is_string())
@@ -215,9 +226,10 @@
 	}
 };
 
+// case-insensitive numeric comparison, descending
 struct as_value_num_nocase_gt : public as_value_lt
 {
-	as_value_num_nocase_gt(as_environment* env) : as_value_lt(env) {}
+	as_value_num_nocase_gt(as_environment& env) : as_value_lt(env) {}
 	bool operator() (const as_value& a, const as_value& b)
 	{
 		if (a.is_string() || b.is_string())
@@ -226,9 +238,10 @@
 	}
 };
 
+// case-insensitive numeric equality
 struct as_value_num_nocase_eq : public as_value_lt
 {
-	as_value_num_nocase_eq(as_environment* env) : as_value_lt(env) {}
+	as_value_num_nocase_eq(as_environment& env) : as_value_lt(env) {}
 	bool operator() (const as_value& a, const as_value& b)
 	{
 		if (a.is_string() || b.is_string())
@@ -241,7 +254,7 @@
 // Note:
 // fUniqueSort and fReturnIndexedArray must first be stripped from the flag
 as_cmp_fn
-get_basic_cmp(uint8_t flags, as_environment* env)
+get_basic_cmp(uint8_t flags, as_environment& env)
 {
 	as_cmp_fn f;
 
@@ -290,11 +303,11 @@
 	}
 }
 
-// Return basic as_value equality function for corresponding sort flag
+// Return basic as_value equality functor for corresponding sort flag
 // Note:
 // fUniqueSort and fReturnIndexedArray must first be stripped from the flag
 as_cmp_fn
-get_basic_eq(uint8_t flags, as_environment* env)
+get_basic_eq(uint8_t flags, as_environment& env)
 {
 	as_cmp_fn f;
 	flags &= ~(as_array_object::fDescending);
@@ -316,6 +329,7 @@
 		case as_array_object::fCaseInsensitive | 
 				as_array_object::fNumeric:
 			f = as_value_num_nocase_eq(env);
+			return f;
 
 		default:
 			f = as_value_eq(env);
@@ -877,7 +891,7 @@
 {
 	boost::intrusive_ptr<as_array_object> array = 
 		ensureType<as_array_object>(fn.this_ptr);
-	as_environment* env = &(fn.env());
+	as_environment& env = fn.env();
 	uint8_t flags = 0;
 
 	if ( fn.nargs == 0 )
@@ -939,7 +953,7 @@
 {
 	boost::intrusive_ptr<as_array_object> array = 
 		ensureType<as_array_object>(fn.this_ptr);
-	as_environment* env = &(fn.env());
+	as_environment& env = fn.env();
 	bool do_unique = false, do_index = false;
 	uint8_t flags = 0;
 	int sv = VM::get().getSWFVersion();
@@ -948,7 +962,7 @@
 	if ( fn.nargs > 0 && fn.arg(0).is_string() )
 	{
 		std::string propField = 
-			PROPNAME(fn.arg(0).to_string_versioned(sv, env));
+			PROPNAME(fn.arg(0).to_string_versioned(sv, &env));
 
 		if ( fn.nargs > 1 && fn.arg(1).is_number() )
 		{
@@ -985,7 +999,7 @@
 			it != props->end(); ++it)
 		{
 			std::string s = 
-				PROPNAME((*it).to_string_versioned(sv, env));
+				PROPNAME((*it).to_string_versioned(sv, &env));
 			prp.push_back(s);
 		}
 		

Index: testsuite/actionscript.all/array.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/array.as,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- testsuite/actionscript.all/array.as	3 Aug 2007 21:10:19 -0000	1.28
+++ testsuite/actionscript.all/array.as	4 Aug 2007 04:23:32 -0000	1.29
@@ -5,7 +5,7 @@
 // Updated with sort functions, and to use check() macro
 // by Mike Carlson Feb. 14th, 2006
 
-rcsid="$Id: array.as,v 1.28 2007/08/03 21:10:19 strk Exp $";
+rcsid="$Id: array.as,v 1.29 2007/08/04 04:23:32 strk Exp $";
 
 #include "check.as"
 
@@ -42,6 +42,19 @@
 check(!Array.prototype.hasOwnProperty('valueOf'));
 #endif // OUTPUT_VERSION >= 6
 
+neg = new Object();
+neg.valueOf = function () { return -1; };
+zero = new Object();
+zero.valueOf = function () { return 0; };
+pos = new Object();
+pos.valueOf = function () { return 1; };
+two = new Object();
+two.valueOf = function () { return 2; };
+numeric = new Object();
+numeric.valueOf = function () { return Array.NUMERIC; };
+numericRev = new Object();
+numericRev.valueOf = function () { return (Array.NUMERIC | Array.DESCENDING); };
+
 var a;
 var popped;
 a=[551,"asdf",12];
@@ -76,6 +89,9 @@
 check_equals ( tmp.toString(), "," );
 #endif
 
+tmp = new Array(two);
+check_equals ( tmp.length, 2 );
+
 check_equals ( a.length, 3 );
 check_equals ( a[2], 12 );
 popped=a.pop();
@@ -228,6 +244,10 @@
 portion = concatted.slice(18);
 check_equals ( portion.toString(), "");
 
+// using objects that implement valueOf as index positions
+portion = concatted.slice(zero, two);
+check_equals ( portion.toString(), "0,1");
+
 //-------------------------------
 // Test splice
 //-------------------------------
@@ -383,6 +403,13 @@
 	return 0;
 }
 
+function cmp_fn_obj(x,y)
+{
+	if (x.length < y.length) { return neg; }
+	if (x.length > y.length) { return pos; }
+	return zero;
+}
+
 function tolen(x)
 {
 	var i;
@@ -437,6 +464,13 @@
 r = b.sort( Array.DESCENDING | Array.NUMERIC );
 check_equals( r.toString(), "8,5,3,1,0,-2,-7,-9" );
 check_equals( b.toString(), "8,5,3,1,0,-2,-7,-9" );
+r = b.sort( zero );
+check_equals( r.toString(), "-2,-7,-9,0,1,3,5,8" );
+check_equals( b.toString(), "-2,-7,-9,0,1,3,5,8" );
+b.sort( numeric );
+check_equals( b.toString(), "-9,-7,-2,0,1,3,5,8" );
+b.sort( numericRev );
+check_equals( b.toString(), "8,5,3,1,0,-2,-7,-9" );
 
 r = c.sort();
 check_equals( r.toString(), "-0.5,-3.7,0,0.001,2,7.2,8.35,Infinity" );
@@ -531,6 +565,19 @@
 check_equals( r.toString(), "singleton" );
 check_equals( e.toString(), "singleton" );
 
+trace(" -- Custom AS function tests using an AS comparator that returns objects -- ");
+r = a.sort( cmp_fn_obj, Array.DESCENDING );
+check_equals( tolen(r), "[5, 5, 4, 2, 2, 0]" );
+check_equals( tolen(a), "[5, 5, 4, 2, 2, 0]" );
+a.sort( cmp_fn_obj, Array.CASEINSENSITIVE | Array.NUMERIC );
+check_equals( tolen(a), "[0, 2, 2, 4, 5, 5]" );
+r = a.sort( cmp_fn_obj, Array.RETURNINDEXEDARRAY );
+check_equals( r.toString(), "0,1,2,3,4,5" );
+r = a.sort( cmp_fn_obj, Array.RETURNINDEXEDARRAY | Array.DESCENDING );
+check_equals( r.toString(), "5,4,3,2,1,0" );
+e.sort( cmp_fn_obj, Array.UNIQUESORT | Array.CASEINSENSITIVE );
+check_equals( e.toString(), "singleton" );
+
 a.push("ED");
 b.push(3.0);
 c.push(9/0);
@@ -811,6 +858,10 @@
 check( r instanceof Array );
 check_equals( tostr(a), "Zuse Z3,1941,false | Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true" );
 
+trace("sortOn with flag as an object overriding the valueOf method");
+a.sortOn( ["Year", "Electronic", "Name"], numeric );
+check_equals( tostr(a), "ENIAC,1944,true | Colossus,1943,true | Atanasoff-Berry,1941,true | Zuse Z3,1941,false" );
+
 #if OUTPUT_VERSION < 7
 trace("sortOn property name case-mismatch");
 a.sortOn( "name" );
@@ -839,7 +890,7 @@
 a.sortOn( ["Mass", "Year", "Name"], [Array.NUMERIC | Array.DESCENDING, Array.NUMERIC | Array.DESCENDING | 0] );
 check_equals( tostr(a), "Atanasoff-Berry,1941,true | Harvard Mark I,1944,undefined | Zuse Z3,1941,false | Colossus,1943,true | ENIAC,1944,true" );
 
-a.sortOn( ["Mass", "Name"], [Array.UNIQUE, Array.DESCENDING] );
+a.sortOn( ["Mass", "Name"], [Array.UNIQUESORT, Array.DESCENDING] );
 check_equals( tostr(a), "Atanasoff-Berry,1941,true | Harvard Mark I,1944,undefined | Zuse Z3,1941,false | ENIAC,1944,true | Colossus,1943,true" );
 
 a.sortOn( ["Electronic", "Mass", "Name"], [0, Array.NUMERIC | Array.DESCENDING, 0] );



From MAILER-DAEMON Sat Aug 04 00:58:47 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IHBix-0004h6-DQ
	for mharc-gnash-commit@gnu.org; Sat, 04 Aug 2007 00:58:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IHBiv-0004gk-0j
	for gnash-commit@gnu.org; Sat, 04 Aug 2007 00:58:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IHBis-0004gH-W6
	for gnash-commit@gnu.org; Sat, 04 Aug 2007 00:58:44 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IHBis-0004gB-TJ
	for gnash-commit@gnu.org; Sat, 04 Aug 2007 00:58:42 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IHBiq-0000NS-RA
	for gnash-commit@gnu.org; Sat, 04 Aug 2007 00:58:41 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IHBiR-00057G-Rm
	for gnash-commit@gnu.org; Sat, 04 Aug 2007 04:58:15 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IHBiR-00057D-KY
	for gnash-commit@gnu.org; Sat, 04 Aug 2007 04:58:15 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IHBiR-00057D-KY@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 04 Aug 2007 04:58:15 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog gui/gnash.in
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Aug 2007 04:58:45 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/04 04:58:15

Modified files:
	.              : ChangeLog 
	gui            : gnash.in 

Log message:
	* gui/gnash.in: add missing she bang.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3946&r2=1.3947
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.in?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3946
retrieving revision 1.3947
diff -u -b -r1.3946 -r1.3947
--- ChangeLog	4 Aug 2007 04:23:31 -0000	1.3946
+++ ChangeLog	4 Aug 2007 04:58:14 -0000	1.3947
@@ -1,3 +1,7 @@
+2007-08-04 Sandro Santilli <strk@keybit.net>
+
+	* gui/gnash.in: add missing she bang.
+
 2007-08-04 Ivor Blockley <meteoryte@yahoo.com.au>
 
 	* server/array.cpp:

Index: gui/gnash.in
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gui/gnash.in	1 Aug 2007 13:32:17 -0000	1.4
+++ gui/gnash.in	4 Aug 2007 04:58:15 -0000	1.5
@@ -1,3 +1,6 @@
+#!/bin/sh
+
+#
 # gnash:  Wrapper script for running the different GUI versions of gnash 
 # 
 #   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.



From MAILER-DAEMON Sat Aug 04 12:43:52 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IHMjI-0003Zg-FN
	for mharc-gnash-commit@gnu.org; Sat, 04 Aug 2007 12:43:52 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IHMjH-0003ZP-FZ
	for gnash-commit@gnu.org; Sat, 04 Aug 2007 12:43:51 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IHMjC-0003Yv-FB
	for gnash-commit@gnu.org; Sat, 04 Aug 2007 12:43:50 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IHMjC-0003Ys-B8
	for gnash-commit@gnu.org; Sat, 04 Aug 2007 12:43:46 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IHMj9-0000Ya-Sa
	for gnash-commit@gnu.org; Sat, 04 Aug 2007 12:43:44 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IHMiv-000070-RG
	for gnash-commit@gnu.org; Sat, 04 Aug 2007 16:43:29 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IHMiv-00006u-Kg
	for gnash-commit@gnu.org; Sat, 04 Aug 2007 16:43:29 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IHMiv-00006u-Kg@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 04 Aug 2007 16:43:29 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/generic-testrunner.sh
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Aug 2007 16:43:51 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/04 16:43:29

Modified files:
	.              : ChangeLog 
	testsuite      : generic-testrunner.sh 

Log message:
	        * testsuite/generic-testrunner.sh: it seems 'read' w/out arg
	          starts being a problem with some shells.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3947&r2=1.3948
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/generic-testrunner.sh?cvsroot=gnash&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3947
retrieving revision 1.3948
diff -u -b -r1.3947 -r1.3948
--- ChangeLog	4 Aug 2007 04:58:14 -0000	1.3947
+++ ChangeLog	4 Aug 2007 16:43:28 -0000	1.3948
@@ -1,5 +1,10 @@
 2007-08-04 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/generic-testrunner.sh: it seems 'read' w/out arg
+	  starts being a problem with some shells.
+
+2007-08-04 Sandro Santilli <strk@keybit.net>
+
 	* gui/gnash.in: add missing she bang.
 
 2007-08-04 Ivor Blockley <meteoryte@yahoo.com.au>

Index: testsuite/generic-testrunner.sh
===================================================================
RCS file: /sources/gnash/gnash/testsuite/generic-testrunner.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- testsuite/generic-testrunner.sh	1 Jul 2007 10:54:38 -0000	1.9
+++ testsuite/generic-testrunner.sh	4 Aug 2007 16:43:29 -0000	1.10
@@ -38,7 +38,7 @@
 echo
 
 echo "# Environment"
-env | grep GNASH | while read; do
+env | grep GNASH | while read REPLY; do
 	echo "export ${REPLY}"
 done
 



From MAILER-DAEMON Sat Aug 04 17:35:01 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IHRH3-0005Px-Oc
	for mharc-gnash-commit@gnu.org; Sat, 04 Aug 2007 17:35:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IHRH2-0005O9-5A
	for gnash-commit@gnu.org; Sat, 04 Aug 2007 17:35:00 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IHRGy-0005JJ-H4
	for gnash-commit@gnu.org; Sat, 04 Aug 2007 17:34:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IHRGy-0005J8-Bj
	for gnash-commit@gnu.org; Sat, 04 Aug 2007 17:34:56 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IHRGv-0005YV-JA
	for gnash-commit@gnu.org; Sat, 04 Aug 2007 17:34:54 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IHRGJ-00033z-77
	for gnash-commit@gnu.org; Sat, 04 Aug 2007 21:34:15 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IHRGJ-00033w-39
	for gnash-commit@gnu.org; Sat, 04 Aug 2007 21:34:15 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IHRGJ-00033w-39@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 04 Aug 2007 21:34:15 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/arra...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Aug 2007 21:35:00 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/04 21:34:15

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: array.as 

Log message:
	* testsuite/actionscript.all/array.as: fixed testcase.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3948&r2=1.3949
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/array.as?cvsroot=gnash&r1=1.29&r2=1.30

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3948
retrieving revision 1.3949
diff -u -b -r1.3948 -r1.3949
--- ChangeLog	4 Aug 2007 16:43:28 -0000	1.3948
+++ ChangeLog	4 Aug 2007 21:34:14 -0000	1.3949
@@ -1,5 +1,9 @@
 2007-08-04 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/actionscript.all/array.as: fixed testcase.
+
+2007-08-04 Sandro Santilli <strk@keybit.net>
+
 	* testsuite/generic-testrunner.sh: it seems 'read' w/out arg
 	  starts being a problem with some shells.
 

Index: testsuite/actionscript.all/array.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/array.as,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- testsuite/actionscript.all/array.as	4 Aug 2007 04:23:32 -0000	1.29
+++ testsuite/actionscript.all/array.as	4 Aug 2007 21:34:14 -0000	1.30
@@ -5,7 +5,7 @@
 // Updated with sort functions, and to use check() macro
 // by Mike Carlson Feb. 14th, 2006
 
-rcsid="$Id: array.as,v 1.29 2007/08/04 04:23:32 strk Exp $";
+rcsid="$Id: array.as,v 1.30 2007/08/04 21:34:14 strk Exp $";
 
 #include "check.as"
 
@@ -90,7 +90,7 @@
 #endif
 
 tmp = new Array(two);
-check_equals ( tmp.length, 2 );
+check_equals ( tmp.length, 1 );
 
 check_equals ( a.length, 3 );
 check_equals ( a[2], 12 );
@@ -246,7 +246,7 @@
 
 // using objects that implement valueOf as index positions
 portion = concatted.slice(zero, two);
-check_equals ( portion.toString(), "0,1");
+xcheck_equals ( portion.toString(), "0,1");
 
 //-------------------------------
 // Test splice
@@ -465,10 +465,10 @@
 check_equals( r.toString(), "8,5,3,1,0,-2,-7,-9" );
 check_equals( b.toString(), "8,5,3,1,0,-2,-7,-9" );
 r = b.sort( zero );
-check_equals( r.toString(), "-2,-7,-9,0,1,3,5,8" );
-check_equals( b.toString(), "-2,-7,-9,0,1,3,5,8" );
+xcheck_equals( r.toString(), "8,5,3,1,0,-2,-7,-9" );
+check_equals( b.toString(), "8,5,3,1,0,-2,-7,-9" );
 b.sort( numeric );
-check_equals( b.toString(), "-9,-7,-2,0,1,3,5,8" );
+check_equals( b.toString(), "8,5,3,1,0,-2,-7,-9" );
 b.sort( numericRev );
 check_equals( b.toString(), "8,5,3,1,0,-2,-7,-9" );
 
@@ -570,7 +570,7 @@
 check_equals( tolen(r), "[5, 5, 4, 2, 2, 0]" );
 check_equals( tolen(a), "[5, 5, 4, 2, 2, 0]" );
 a.sort( cmp_fn_obj, Array.CASEINSENSITIVE | Array.NUMERIC );
-check_equals( tolen(a), "[0, 2, 2, 4, 5, 5]" );
+xcheck_equals( tolen(a), "[0, 2, 2, 4, 5, 5]" );
 r = a.sort( cmp_fn_obj, Array.RETURNINDEXEDARRAY );
 check_equals( r.toString(), "0,1,2,3,4,5" );
 r = a.sort( cmp_fn_obj, Array.RETURNINDEXEDARRAY | Array.DESCENDING );
@@ -860,7 +860,7 @@
 
 trace("sortOn with flag as an object overriding the valueOf method");
 a.sortOn( ["Year", "Electronic", "Name"], numeric );
-check_equals( tostr(a), "ENIAC,1944,true | Colossus,1943,true | Atanasoff-Berry,1941,true | Zuse Z3,1941,false" );
+check_equals( tostr(a), "Zuse Z3,1941,false | Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true" );
 
 #if OUTPUT_VERSION < 7
 trace("sortOn property name case-mismatch");



From MAILER-DAEMON Sun Aug 05 02:05:54 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IHZFS-0006bx-Km
	for mharc-gnash-commit@gnu.org; Sun, 05 Aug 2007 02:05:54 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IHZFR-0006bs-Gh
	for gnash-commit@gnu.org; Sun, 05 Aug 2007 02:05:53 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IHZFJ-0006bZ-2p
	for gnash-commit@gnu.org; Sun, 05 Aug 2007 02:05:52 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IHZFI-0006bW-TG
	for gnash-commit@gnu.org; Sun, 05 Aug 2007 02:05:44 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IHZFA-0001On-Sd
	for gnash-commit@gnu.org; Sun, 05 Aug 2007 02:05:38 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IHZEZ-00048B-SE
	for gnash-commit@gnu.org; Sun, 05 Aug 2007 06:05:00 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IHZEZ-000487-CG
	for gnash-commit@gnu.org; Sun, 05 Aug 2007 06:04:59 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IHZEZ-000487-CG@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Sun, 05 Aug 2007 06:04:59 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/Make...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Aug 2007 06:05:53 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/05 06:04:59

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: Makefile.am 
Added files:
	testsuite/actionscript.all: toString_valueOf.as 

Log message:
	* testsuite/actionscript.all/toString_valueOf.as, Makefile.am: focused tests, 
	hopefully helps the model("String" object is not bogus, and "trace" is also sane).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3949&r2=1.3950
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Makefile.am?cvsroot=gnash&r1=1.76&r2=1.77
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/toString_valueOf.as?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3949
retrieving revision 1.3950
diff -u -b -r1.3949 -r1.3950
--- ChangeLog	4 Aug 2007 21:34:14 -0000	1.3949
+++ ChangeLog	5 Aug 2007 06:04:57 -0000	1.3950
@@ -1,3 +1,8 @@
+2007-08-05 Zou Lunkai <zoulunkai@gmail.com>
+	
+	* testsuite/actionscript.all/toString_valueOf.as, Makefile.am: focused tests, 
+	  hopefully helps the model("String" object is not bogus, and "trace" is also sane).
+	
 2007-08-04 Sandro Santilli <strk@keybit.net>
 
 	* testsuite/actionscript.all/array.as: fixed testcase.

Index: testsuite/actionscript.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Makefile.am,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- testsuite/actionscript.all/Makefile.am	31 Jul 2007 15:30:29 -0000	1.76
+++ testsuite/actionscript.all/Makefile.am	5 Aug 2007 06:04:58 -0000	1.77
@@ -16,7 +16,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.76 2007/07/31 15:30:29 strk Exp $
+# $Id: Makefile.am,v 1.77 2007/08/05 06:04:58 zoulunkai Exp $
 
 AUTOMAKE_OPTIONS = dejagnu
 
@@ -111,6 +111,7 @@
 	enumerate.as		\
 	case.as			\
 	ops.as			\
+	toString_valueOf.as	\
 	$(NULL)
 
 ASTESTS_OUT = $(ASTESTS:.as=.swf)

Index: testsuite/actionscript.all/toString_valueOf.as
===================================================================
RCS file: testsuite/actionscript.all/toString_valueOf.as
diff -N testsuite/actionscript.all/toString_valueOf.as
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/actionscript.all/toString_valueOf.as	5 Aug 2007 06:04:59 -0000	1.1
@@ -0,0 +1,374 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modchecky
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; check not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fcheckth Floor, Boston, MA  02110-1301  USA
+//
+
+/*
+ *  Test toString and valueOf.
+ */
+
+
+#include "check.as"
+
+//
+//Testing toString and valueOf of Object
+//
+#if OUTPUT_VERSION > 5
+  check(Object.prototype.hasOwnProperty('toString'));
+  check(Object.prototype.hasOwnProperty('valueOf'));
+#else
+  // swf5 does not support hasOwnProperty method
+  check(typeof(hasOwnProperty) == 'undefined');
+  check(!Object.prototype.hasOwnProperty('toString'));
+  check(!Object.prototype.hasOwnProperty('valueOf'));
+#endif
+
+obj = new Object();
+x = obj.toString();
+y = obj.valueOf();
+check(typeof(x) == "string");
+check(typeof(y) == "object");
+check(x == "[object Object]"); 
+check(y == obj); //true
+//trace(obj); //output [object Object]
+#if OUTPUT_VERSION > 5
+  check(obj.toString == Object.prototype.toString);
+  check(obj.valueOf == Object.prototype.valueOf);
+#endif
+
+obj.toString = function () {return "TO_STRING";};
+obj.valueOf = function () {return "TO_VALUE";};
+#if OUTPUT_VERSION > 5
+  // no longer true in swf6, and a general case in swf6 and above
+  check(obj.toString != Object.prototype.toString);
+  check(obj.valueOf != Object.prototype.valueOf);
+#else
+  // this is true only in swf5
+  xcheck(obj.toString == Object.prototype.toString);
+  xcheck(obj.valueOf == Object.prototype.valueOf);
+#endif
+x = obj.toString();
+y = obj.valueOf();
+check(x=="TO_STRING");
+check(y=="TO_VALUE");
+check(typeof(obj)=="object"); 
+//trace(obj); // output TO_STRING
+check(typeof(y) == "string");
+check(obj == y); 
+
+//
+//Testing toString and valueOf of Number
+//
+#if OUTPUT_VERSION > 5
+  check(Number.prototype.hasOwnProperty('toString'));
+  check(Number.prototype.hasOwnProperty('valueOf'));
+  // no longer true in swf6, and a general case in swf6 and above
+  check(Number.prototype.toString != Object.prototype.toString);
+  check(Number.prototype.valueOf != Object.prototype.valueOf);
+#else
+  // this is true only in swf5
+  xcheck(Number.prototype.toString == Object.prototype.toString);
+  xcheck(Number.prototype.valueOf == Object.prototype.valueOf);
+#endif
+
+
+num1 = new Number(1);
+x = num1.toString();
+y = num1.valueOf();
+check(typeof(x)=="string"); 
+check(typeof(y)=="number"); 
+check(x==1); 
+check(y==1); 
+
+Number.prototype.toString = function () {return "TO_STRING"; };
+Number.prototype.valueOf = function () {return "TO_VALUE"; };
+
+num2 = new Number(2);
+num3 = num1 + num2;
+//valueOf called;
+check(num3 == "TO_VALUETO_VALUE");
+
+x = num1.toString();
+y = num1.valueOf();
+check(typeof(x)=="string"); 
+check(typeof(y)=="string"); 
+check(x=="TO_STRING"); 
+check(y=="TO_VALUE");  
+
+//
+//Testing toString and valueOf of String
+//
+#if OUTPUT_VERSION > 5
+  check(String.prototype.hasOwnProperty('toString'));
+  check(String.prototype.hasOwnProperty('valueOf'));
+  // no longer true in swf6, and a general case in swf6 and above
+  check(String.prototype.toString != Object.prototype.toString);
+  check(String.prototype.valueOf != Object.prototype.valueOf);
+#else
+  // this is true only in swf5
+  xcheck(String.prototype.toString == Object.prototype.toString);
+  xcheck(String.prototype.valueOf == Object.prototype.valueOf);
+#endif
+
+str1 = new String("10");
+x = str1.toString();
+y = str1.valueOf();
+check(typeof(x) == "string");
+check(typeof(y) == "string");
+check(x == 10);
+check(y == 10);
+check(x == "10");
+check(y == "10");
+//trace(x);  // output 10
+//trace(y);  // output 10
+
+str2 = new String("2");
+str3 = str1+str2;
+xcheck(str3 == "102"); 
+xcheck(str3 == 102); 
+
+String.prototype.toString = function () {return "TO_STRING";};
+String.prototype.valueOf = function () {return "TO_VALUE";};
+
+xcheck(parseInt(str1) == 10); 
+xcheck(parseInt(str2) == 2);  
+str3 =  str1 + str2;
+xcheck(typeof(str3) == "string");
+//valueOf called
+check(str3 == "TO_VALUETO_VALUE"); 
+//trace a string won't invoke the toString method
+//trace(str1); //output 10 !
+
+x = str1.toString();
+y = str1.valueOf();
+check(typeof(x) == "string"); 
+check(typeof(y) == "string"); 
+check(x == "TO_STRING");  
+check(y == "TO_VALUE");   
+
+
+//
+//Testing toString and valueOf of movieclip
+//
+#if OUTPUT_VERSION > 5
+  check(!MovieClip.prototype.hasOwnProperty('toString'));
+  check(!MovieClip.prototype.hasOwnProperty('valueOf'));
+  check(typeof(MovieClip.prototype.toString) == 'function');
+  check(typeof(MovieClip.prototype.valueOf) == 'function');
+#endif
+
+// For movieclips, this true from swf5~swf8!
+check(MovieClip.prototype.toString == Object.prototype.toString);
+check(MovieClip.prototype.valueOf == Object.prototype.valueOf);
+
+_root.createEmptyMovieClip("mc1", 1);
+x = mc1.toString();
+y = mc1.valueOf();
+#if OUTPUT_VERSION > 5
+  check(typeof(x) == 'string'); 
+  check(typeof(y) == 'movieclip');  
+  check(x == '[object Object]'); 
+  check(y == _level0.mc1); 
+#else
+  check(typeof(x) == 'undefined'); 
+  check(typeof(y) == 'undefined');  
+  check(x == undefined); 
+  check(y == undefined); 
+#endif
+check(y == _level0.mc1);  
+//trace a movieclip doesn't invoke the toString method
+//trace(mc1); //_level0.mc
+
+MovieClip.prototype.toString = function () {return "TO_STRING";};
+MovieClip.prototype.valueOf = function () {return "TO_VALUE";};
+
+x = mc1.toString();
+y = mc1.valueOf();
+#if OUTPUT_VERSION > 5
+  check(x=="TO_STRING");
+  check(y=="TO_VALUE");
+#else
+  check(x==undefined);
+  check(y==undefined);
+#endif
+
+_root.createEmptyMovieClip("mc2", 2);
+#if OUTPUT_VERSION > 5
+  check(typeof(mc1) == "movieclip"); 
+  check(typeof(mc2) == "movieclip"); 
+  mc3 = mc1 + mc2;
+  check(typeof(mc3) == "number");    
+  check(isNaN(mc3)); 
+#else
+  // swf5 does not support createEmptyMovieClip
+  check(typeof(createEmptyMovieClip) == "undefined");
+  check(typeof(mc1) == "undefined"); 
+  check(typeof(mc2) == "undefined"); 
+#endif
+
+//
+//Testing toString and valueOf of TextFields
+//
+#if OUTPUT_VERSION > 5
+  check(!TextField.prototype.hasOwnProperty('toString'));
+  check(!TextField.prototype.hasOwnProperty('valueOf'));
+  check(typeof(TextField.prototype.toString) == 'function' );
+	check(typeof(TextField.prototype.valueOf) == 'function' );
+#else
+	// TextField in swf5 does not have toString and valueOf methods(to be checked).
+	xcheck(typeof(TextField.prototype.toString) == 'undefined' );
+	xcheck(typeof(TextField.prototype.valueOf) == 'undefined' );
+#endif
+
+// For TextFields, this true from swf5~swf8!
+check(TextField.prototype.toString == Object.prototype.toString);
+check(TextField.prototype.valueOf == Object.prototype.valueOf);
+
+text1 = new TextField();
+check(typeof(text1) == "object");
+x = text1.toString();
+y = text1.valueOf();
+#if OUTPUT_VERSION > 5 
+  check(typeof(x) == "string");   
+  check(typeof(y) == "object");  
+  check(x == "[object Object]"); 
+  check(y.toString() == "[object Object]"); 
+  check(typeof(y.valueOf()) == "object"); 
+#else
+  xcheck(typeof(x) == "undefined");   
+  xcheck(typeof(y) == "undefined");  
+  xcheck(x == undefined); 
+  xcheck(y.toString() == undefined); 
+  xcheck(typeof(y.valueOf()) ==  "undefined"); 
+#endif 
+check(y == text1);
+
+//
+//Testing toString and valueOf of Buttons
+//
+
+#if OUTPUT_VERSION > 5 
+// swf5 does not support hasOwnProperty method
+check(!Button.prototype.hasOwnProperty('toString'));
+check(!Button.prototype.hasOwnProperty('valueOf'));
+#endif
+
+xcheck(typeof(Button.prototype.toString) == 'function' );
+xcheck(typeof(Button.prototype.valueOf) == 'function' );
+
+// For Buttons, this true from swf5~swf8!
+xcheck(Button.prototype.toString == Object.prototype.toString);
+xcheck(Button.prototype.valueOf == Object.prototype.valueOf);
+
+btn1 = new Button();
+xcheck(typeof(btn1) == "object");
+x = btn1.toString();
+y = btn1.valueOf();
+xcheck(typeof(x) == "string");  
+xcheck(typeof(y) == "object");   
+xcheck(x == "[object Object]");  
+xcheck(y.toString() == "[object Object]"); 
+xcheck(typeof(y.valueOf()) == "object");  
+xcheck(typeof(btn1) == "object");
+check(y == btn1);
+//trace(btn1); //output [object Object]
+
+//
+//Testing toString and valueOf of Boolean
+//
+
+#if OUTPUT_VERSION > 5 
+  check(Boolean.prototype.toString != Object.prototype.toString);
+  check(Boolean.prototype.valueOf != Object.prototype.valueOf);
+#else
+  xcheck(Boolean.prototype.toString == Object.prototype.toString);
+  xcheck(Boolean.prototype.valueOf == Object.prototype.valueOf);
+#endif
+
+b1 = new Boolean(false);
+check(typeof(b1) == "object");
+x = b1.toString();
+y = b1.valueOf();
+check(typeof(x) == "string");   
+check(typeof(y) == "boolean");  
+check(x == "false");
+check(y == false);
+
+b2 = new Boolean(true);
+b3 = b1 + b2;
+check(typeof(b3) == 'number');
+xcheck(b3 == 1);
+
+
+//
+//Testing toString and valueOf of Date
+//
+
+#if OUTPUT_VERSION > 5 
+  check(Date.prototype.toString != Object.prototype.toString);
+  check(Date.prototype.valueOf != Object.prototype.valueOf);
+#else
+  xcheck(Date.prototype.toString == Object.prototype.toString);
+  xcheck(Date.prototype.valueOf == Object.prototype.valueOf);
+#endif
+
+d1 = new Date(0);
+check(typeof(d1) == "object");
+x = d1.toString();
+y = d1.valueOf();
+check(typeof(x) == "string");  
+check(typeof(y) == "number");   
+check(x == "Thu Jan 1 08:00:00 GMT+0800 1970");
+check(y == 0);
+
+d2 = new Date(1);
+d3 = d1 + d2;
+#if OUTPUT_VERSION > 5 
+  check(typeof(d3) == 'string');
+  check(d3 == "Thu Jan 1 08:00:00 GMT+0800 1970Thu Jan 1 08:00:00 GMT+0800 1970");
+#else
+  check(typeof(d3) == 'number');
+  check(d3 == 1);
+#endif
+
+//
+//Testing toString and valueOf of Array
+//
+
+#if OUTPUT_VERSION > 5 
+	check(Array.prototype.hasOwnProperty('toString'));
+	check(!Array.prototype.hasOwnProperty('valueOf'));
+  check(Array.prototype.toString != Object.prototype.toString);
+#else
+  xcheck(Array.prototype.toString == Object.prototype.toString);
+#endif
+
+check(Array.prototype.valueOf == Object.prototype.valueOf);
+
+a1 = new Array(1,2,3,4);
+check(typeof(a1) == "object");
+x = a1.toString();
+y = a1.valueOf();
+check(typeof(x) == "string");  
+check(typeof(y) == "object");   
+check(x == "1,2,3,4");  
+check(y == a1);        
+
+a2 = new Array(2,3,4,5);
+a3 = a1 + a2;
+check(typeof(a3) == 'number');
+check(isNaN(a3));
+



From MAILER-DAEMON Sun Aug 05 02:14:57 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IHZOD-0006iM-0q
	for mharc-gnash-commit@gnu.org; Sun, 05 Aug 2007 02:14:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IHZOB-0006gT-I1
	for gnash-commit@gnu.org; Sun, 05 Aug 2007 02:14:55 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IHZOA-0006eu-Rq
	for gnash-commit@gnu.org; Sun, 05 Aug 2007 02:14:55 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IHZOA-0006eU-DA
	for gnash-commit@gnu.org; Sun, 05 Aug 2007 02:14:54 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IHZO8-0002Us-FY
	for gnash-commit@gnu.org; Sun, 05 Aug 2007 02:14:53 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IHZNn-0005HB-7J
	for gnash-commit@gnu.org; Sun, 05 Aug 2007 06:14:31 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IHZNm-0005Gz-Pe
	for gnash-commit@gnu.org; Sun, 05 Aug 2007 06:14:30 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IHZNm-0005Gz-Pe@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Sun, 05 Aug 2007 06:14:30 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/testsuite/actionscript.all toString_value...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Aug 2007 06:14:55 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/05 06:14:30

Modified files:
	testsuite/actionscript.all: toString_valueOf.as 

Log message:
	indent and checks-> xchecks

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/toString_valueOf.as?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: toString_valueOf.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/toString_valueOf.as,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- toString_valueOf.as	5 Aug 2007 06:04:59 -0000	1.1
+++ toString_valueOf.as	5 Aug 2007 06:14:30 -0000	1.2
@@ -180,7 +180,7 @@
 #if OUTPUT_VERSION > 5
   check(typeof(x) == 'string'); 
   check(typeof(y) == 'movieclip');  
-  check(x == '[object Object]'); 
+  xcheck(x == '[object Object]'); 
   check(y == _level0.mc1); 
 #else
   check(typeof(x) == 'undefined'); 
@@ -337,8 +337,8 @@
 d2 = new Date(1);
 d3 = d1 + d2;
 #if OUTPUT_VERSION > 5 
-  check(typeof(d3) == 'string');
-  check(d3 == "Thu Jan 1 08:00:00 GMT+0800 1970Thu Jan 1 08:00:00 GMT+0800 1970");
+  xcheck(typeof(d3) == 'string');
+  xcheck(d3 == "Thu Jan 1 08:00:00 GMT+0800 1970Thu Jan 1 08:00:00 GMT+0800 1970");
 #else
   check(typeof(d3) == 'number');
   check(d3 == 1);



From MAILER-DAEMON Sun Aug 05 15:30:01 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IHlnd-0001Tp-47
	for mharc-gnash-commit@gnu.org; Sun, 05 Aug 2007 15:30:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IHlnb-0001Te-U6
	for gnash-commit@gnu.org; Sun, 05 Aug 2007 15:30:00 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IHlnX-0001T3-QQ
	for gnash-commit@gnu.org; Sun, 05 Aug 2007 15:29:58 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IHlnX-0001T0-J9
	for gnash-commit@gnu.org; Sun, 05 Aug 2007 15:29:55 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IHlnU-0007rM-Sk
	for gnash-commit@gnu.org; Sun, 05 Aug 2007 15:29:54 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IHlnF-0007uv-Tn
	for gnash-commit@gnu.org; Sun, 05 Aug 2007 19:29:38 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IHlnF-0007us-No
	for gnash-commit@gnu.org; Sun, 05 Aug 2007 19:29:37 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IHlnF-0007us-No@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sun, 05 Aug 2007 19:29:37 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/vm/VM.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Aug 2007 19:30:00 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/05 19:29:37

Modified files:
	.              : ChangeLog 
	server/vm      : VM.h 

Log message:
	        * server/vm/VM.h: make gnash buildable with GC unused.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3950&r2=1.3951
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/VM.h?cvsroot=gnash&r1=1.13&r2=1.14

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3950
retrieving revision 1.3951
diff -u -b -r1.3950 -r1.3951
--- ChangeLog	5 Aug 2007 06:04:57 -0000	1.3950
+++ ChangeLog	5 Aug 2007 19:29:36 -0000	1.3951
@@ -1,3 +1,7 @@
+2007-08-05 Sandro Santilli <strk@keybit.net>
+
+	* server/vm/VM.h: make gnash buildable with GC unused.
+
 2007-08-05 Zou Lunkai <zoulunkai@gmail.com>
 	
 	* testsuite/actionscript.all/toString_valueOf.as, Makefile.am: focused tests, 

Index: server/vm/VM.h
===================================================================
RCS file: /sources/gnash/gnash/server/vm/VM.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/vm/VM.h	1 Aug 2007 15:56:54 -0000	1.13
+++ server/vm/VM.h	5 Aug 2007 19:29:37 -0000	1.14
@@ -127,12 +127,14 @@
 	/// 
 	void setGlobal(as_object*);
 
+#ifdef GNASH_USE_GC
 	/// A vector of static GcResources (tipically used for built-in class constructors)
 	//
 	/// The resources in this list will always be marked as reachable
 	///
 	typedef std::vector< boost::intrusive_ptr<GcResource> > ResVect;
 	ResVect _statics;
+#endif
 
 public:
 
@@ -202,10 +204,16 @@
 	///
 	void markReachableResources() const;
 
+#ifdef GNASH_USE_GC
 	void addStatic(GcResource* res)
 	{
 		_statics.push_back(res);
 	}
+#else  // ndef GNASH_USE_GC
+	// placeholder to avoid adding lots of
+	// compile-time switches in callers
+	void addStatic(as_object*) {}
+#endif
 
 };
 



From MAILER-DAEMON Sun Aug 05 23:30:56 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IHtJ2-0006Qv-DG
	for mharc-gnash-commit@gnu.org; Sun, 05 Aug 2007 23:30:56 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IHtJ1-0006Qq-DW
	for gnash-commit@gnu.org; Sun, 05 Aug 2007 23:30:55 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IHtIx-0006Of-CJ
	for gnash-commit@gnu.org; Sun, 05 Aug 2007 23:30:54 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IHtIx-0006OW-8F
	for gnash-commit@gnu.org; Sun, 05 Aug 2007 23:30:51 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IHtIu-0000Km-Mh
	for gnash-commit@gnu.org; Sun, 05 Aug 2007 23:30:50 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IHtIS-0005Ee-Tk
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 03:30:21 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IHtIS-0005Eb-4C
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 03:30:20 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IHtIS-0005Eb-4C@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 06 Aug 2007 03:30:20 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/DynamicShape.cpp server/...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Aug 2007 03:30:55 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/06 03:30:19

Modified files:
	.              : ChangeLog 
	server         : DynamicShape.cpp 
	server/parser  : character_def.h shape_character_def.cpp 
	                 shape_character_def.h 

Log message:
	        * server/parser/character_def.h: provide a protected copy constructor
	          resetting the render_cache_manager to NULL in the copy, to avoid
	          multiple destruction of the same object. Add private and aborting
	          assignment operator. Fixes bug #20694.
	        * server/parser/shape_character_def.{cpp,h}: implement copy
	          constructor. Add private and aborting assignment operator.
	          Deprecate input/output cache methods and data.
	        * server/DynamicShape.cpp: update after deprecation of cache
	          data for input/output stuff.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3951&r2=1.3952
http://cvs.savannah.gnu.org/viewcvs/gnash/server/DynamicShape.cpp?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/character_def.h?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/shape_character_def.cpp?cvsroot=gnash&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/shape_character_def.h?cvsroot=gnash&r1=1.13&r2=1.14

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3951
retrieving revision 1.3952
diff -u -b -r1.3951 -r1.3952
--- ChangeLog	5 Aug 2007 19:29:36 -0000	1.3951
+++ ChangeLog	6 Aug 2007 03:30:17 -0000	1.3952
@@ -1,5 +1,17 @@
 2007-08-05 Sandro Santilli <strk@keybit.net>
 
+	* server/parser/character_def.h: provide a protected copy constructor
+	  resetting the render_cache_manager to NULL in the copy, to avoid
+	  multiple destruction of the same object. Add private and aborting
+	  assignment operator. Fixes bug #20694.
+	* server/parser/shape_character_def.{cpp,h}: implement copy
+	  constructor. Add private and aborting assignment operator.
+	  Deprecate input/output cache methods and data.
+	* server/DynamicShape.cpp: update after deprecation of cache
+	  data for input/output stuff.
+
+2007-08-05 Sandro Santilli <strk@keybit.net>
+
 	* server/vm/VM.h: make gnash buildable with GC unused.
 
 2007-08-05 Zou Lunkai <zoulunkai@gmail.com>

Index: server/DynamicShape.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/DynamicShape.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/DynamicShape.cpp	1 Jul 2007 10:54:18 -0000	1.8
+++ server/DynamicShape.cpp	6 Aug 2007 03:30:18 -0000	1.9
@@ -17,7 +17,7 @@
 
 
 
-/* $Id: DynamicShape.cpp,v 1.8 2007/07/01 10:54:18 bjacques Exp $ */
+/* $Id: DynamicShape.cpp,v 1.9 2007/08/06 03:30:18 strk Exp $ */
 
 #include "DynamicShape.h"
 
@@ -41,7 +41,7 @@
 void
 DynamicShape::clear()
 {
-    clear_meshes();
+    //clear_meshes();
     m_paths.clear();
     m_fill_styles.clear();
     m_line_styles.clear();

Index: server/parser/character_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/character_def.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- server/parser/character_def.h	3 Jul 2007 05:46:03 -0000	1.14
+++ server/parser/character_def.h	6 Aug 2007 03:30:19 -0000	1.15
@@ -53,6 +53,8 @@
 private:
 	int	m_id;
 		
+	// don't assign-to
+	character_def& operator= (const character_def&) { abort(); return *this; }
 public:
 	character_def()
 		:
@@ -61,6 +63,7 @@
 		{
 		}
 	
+	
 	virtual ~character_def();
 	
 	virtual void display(character* /*instance_info*/)
@@ -125,6 +128,38 @@
   ///
   render_cache_manager* m_render_cache;
 	
+protected:
+
+	/// Copy a character definition
+	//
+	/// The copy will have a NULL render cache object.
+	/// The only known use of copy constructor is from
+	/// duplicateMovieClip, in particular during copy
+	/// of the drawable object, which is a subclass
+	/// of a shape_character_def
+	///
+	/// The choice of NOT copying the cache manager
+	/// is a choice of simplicity. We can't copy the
+	/// pointer as the character_def destructor will
+	/// destroy it, and we don't want to destroy it twice.
+	/// We don't want to make a copy of the whole cache
+	/// as it might be a waste of resource, we don't want
+	/// to share ownership as some character_def ended up
+	/// NOT being immutable any more !! :(
+	///
+	/// By setting the cache to NULL we'll leave reconstruction
+	/// of a cache to the renderers.
+	///
+	/// TODO: improve by implementing copy on write for the cache ?
+	///
+	character_def(const character_def& o)
+		:
+		resource(), // this is a new resource, nothing to copy
+		m_id(o.m_id),
+		m_render_cache(NULL)
+	{}
+
+	
 };
 
 

Index: server/parser/shape_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/shape_character_def.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- server/parser/shape_character_def.cpp	1 Jul 2007 10:54:34 -0000	1.30
+++ server/parser/shape_character_def.cpp	6 Aug 2007 03:30:19 -0000	1.31
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: shape_character_def.cpp,v 1.30 2007/07/01 10:54:34 bjacques Exp $ */
+/* $Id: shape_character_def.cpp,v 1.31 2007/08/06 03:30:19 strk Exp $ */
 
 // Based on the public domain shape.cpp of Thatcher Ulrich <tu@tulrich.com> 2003
 
@@ -145,27 +145,31 @@
 
 shape_character_def::shape_character_def()
 	:
+	character_def(),
 	m_fill_styles(),
 	m_line_styles(),
 	m_paths(),
-	m_bound(),
-	m_cached_meshes()
+	m_bound()
+	//,m_cached_meshes()
 {
 }
 
-
-void
-shape_character_def::clear_meshes()
+shape_character_def::shape_character_def(const shape_character_def& o)
+	:
+	character_def(o),
+	tesselate::tesselating_shape(o),
+	m_fill_styles(o.m_fill_styles),
+	m_line_styles(o.m_line_styles),
+	m_paths(o.m_paths),
+	m_bound(o.m_bound)
+	//,m_cached_meshes()
 {
-    // Free our mesh_sets.
-    for (unsigned int i = 0; i < m_cached_meshes.size(); i++) {
-	delete m_cached_meshes[i];
-    }
 }
 
+
 shape_character_def::~shape_character_def()
 {
-	clear_meshes();
+	//clear_meshes();
 }
 
 
@@ -796,6 +800,17 @@
 }
 
 
+#if 0 // deprecated
+
+void
+shape_character_def::clear_meshes()
+{
+    // Free our mesh_sets.
+    for (unsigned int i = 0; i < m_cached_meshes.size(); i++) {
+	delete m_cached_meshes[i];
+    }
+}
+
 void	shape_character_def::output_cached_data(tu_file* out, const cache_options& /* options */)
     // Dump our precomputed mesh data to the given stream.
 {
@@ -822,6 +837,8 @@
     }
 }
 
+#endif // deprecated cached data
+
 #ifdef GNASH_USE_GC
 void
 shape_character_def::markReachableResources() const

Index: server/parser/shape_character_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/shape_character_def.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/parser/shape_character_def.h	20 Jun 2007 14:23:50 -0000	1.13
+++ server/parser/shape_character_def.h	6 Aug 2007 03:30:19 -0000	1.14
@@ -5,7 +5,7 @@
 
 // Quadratic bezier outline shapes, the basis for most SWF rendering.
 
-/* $Id: shape_character_def.h,v 1.13 2007/06/20 14:23:50 strk Exp $ */
+/* $Id: shape_character_def.h,v 1.14 2007/08/06 03:30:19 strk Exp $ */
 
 #ifndef GNASH_SHAPE_CHARACTER_DEF_H
 #define GNASH_SHAPE_CHARACTER_DEF_H
@@ -27,6 +27,10 @@
 	/// \brief
 	/// Represents the outline of one or more shapes, along with
 	/// information on fill and line styles.
+	//
+	/// Inheritance from tesselating_shape is only needed to expose a known interface
+	/// for mesh_set class use.
+	///
 	class shape_character_def : public character_def, public tesselate::tesselating_shape
 	{
 	public:
@@ -59,8 +63,9 @@
 		/// Compute bounds by looking at the component paths
 		void	compute_bound(rect* r) const;
 
-		void	output_cached_data(tu_file* out, const cache_options& options);
-		void	input_cached_data(tu_file* in);
+		// deprecated
+		//void	output_cached_data(tu_file* out, const cache_options& options);
+		//void	input_cached_data(tu_file* in);
 
 		const FillStyleVect& get_fill_styles() const { return m_fill_styles; }
 		const LineStyleVect& get_line_styles() const { return m_line_styles; }
@@ -89,8 +94,11 @@
 		PathVect m_paths;
 		rect	m_bound;
 
-		/// Free all meshes
-		void clear_meshes();
+		/// Free all meshes (deprecated)
+		//void clear_meshes();
+
+		/// Copy a shape character definition
+		shape_character_def(const shape_character_def& o);
 
 	private:
 
@@ -106,9 +114,15 @@
 
 		void	sort_and_clean_meshes() const;
 		
+		// Don't assign to a shape character definition
+		shape_character_def& operator= (const shape_character_def&)
+		{
+			abort();
+			return *this;
+		}
 
-		// Cached pre-tesselated meshes.
-		mutable std::vector<mesh_set*>	m_cached_meshes;
+		// Cached pre-tesselated meshes. (deprecated)
+		//mutable std::vector<mesh_set*>	m_cached_meshes;
 	};
 
 }	// end namespace gnash



From MAILER-DAEMON Mon Aug 06 03:23:09 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IHwvk-0006oj-Ud
	for mharc-gnash-commit@gnu.org; Mon, 06 Aug 2007 03:23:08 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IHwvj-0006oS-5U
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 03:23:07 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IHwvi-0006oB-Mz
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 03:23:06 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IHwvi-0006o8-Gk
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 03:23:06 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IHwvW-0007wU-0H
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 03:22:54 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IHwv7-0003d6-IO
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 07:22:29 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IHwv7-0003d3-Dq
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 07:22:29 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IHwv7-0003d3-Dq@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Mon, 06 Aug 2007 07:22:29 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/ops.as
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Aug 2007 07:23:07 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/06 07:22:29

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: ops.as 

Log message:
	* testsuite/actionscript.all/ops.as: xcheck to check, it passed here.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3952&r2=1.3953
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/ops.as?cvsroot=gnash&r1=1.10&r2=1.11

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3952
retrieving revision 1.3953
diff -u -b -r1.3952 -r1.3953
--- ChangeLog	6 Aug 2007 03:30:17 -0000	1.3952
+++ ChangeLog	6 Aug 2007 07:22:28 -0000	1.3953
@@ -1,3 +1,7 @@
+2007-08-06 Zou Lunkai <zoulunkai@gmail.com>
+	
+	* testsuite/actionscript.all/ops.as: xcheck to check, it passed here.
+	  
 2007-08-05 Sandro Santilli <strk@keybit.net>
 
 	* server/parser/character_def.h: provide a protected copy constructor

Index: testsuite/actionscript.all/ops.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/ops.as,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- testsuite/actionscript.all/ops.as	2 Aug 2007 21:10:23 -0000	1.10
+++ testsuite/actionscript.all/ops.as	6 Aug 2007 07:22:29 -0000	1.11
@@ -20,7 +20,7 @@
  *  Test binary predicates (equal, less_then, greater_then, logical and bitwise ops)
  */
 
-rcsid="$Id: ops.as,v 1.10 2007/08/02 21:10:23 strk Exp $";
+rcsid="$Id: ops.as,v 1.11 2007/08/06 07:22:29 zoulunkai Exp $";
 
 #include "check.as"
 
@@ -387,7 +387,7 @@
 
 x = 0xffffffff;
 y = x << 16;
-xcheck_equals(y, -65536);
+xcheck_equals(Math.round(y), -65536);
 
 x = 1.9;
 y = x << 2;



From MAILER-DAEMON Mon Aug 06 03:40:50 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IHxCs-0005FS-Ex
	for mharc-gnash-commit@gnu.org; Mon, 06 Aug 2007 03:40:50 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IHxCq-0005FD-In
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 03:40:48 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IHxCp-0005Eo-06
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 03:40:48 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IHxCo-0005El-SK
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 03:40:46 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IHxCn-0002q3-5g
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 03:40:45 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IHxCR-0003uD-8X
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 07:40:23 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IHxCR-0003uA-2l
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 07:40:23 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IHxCR-0003uA-2l@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Mon, 06 Aug 2007 07:40:23 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/testsuite/actionscript.all ops.as
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Aug 2007 07:40:48 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/06 07:40:22

Modified files:
	testsuite/actionscript.all: ops.as 

Log message:
	xcheck to check, forgot in last commit.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/ops.as?cvsroot=gnash&r1=1.11&r2=1.12

Patches:
Index: ops.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/ops.as,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- ops.as	6 Aug 2007 07:22:29 -0000	1.11
+++ ops.as	6 Aug 2007 07:40:22 -0000	1.12
@@ -20,7 +20,7 @@
  *  Test binary predicates (equal, less_then, greater_then, logical and bitwise ops)
  */
 
-rcsid="$Id: ops.as,v 1.11 2007/08/06 07:22:29 zoulunkai Exp $";
+rcsid="$Id: ops.as,v 1.12 2007/08/06 07:40:22 zoulunkai Exp $";
 
 #include "check.as"
 
@@ -387,7 +387,7 @@
 
 x = 0xffffffff;
 y = x << 16;
-xcheck_equals(Math.round(y), -65536);
+check_equals(Math.round(y), -65536);
 
 x = 1.9;
 y = x << 2;



From MAILER-DAEMON Mon Aug 06 10:41:40 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1II3m8-000140-St
	for mharc-gnash-commit@gnu.org; Mon, 06 Aug 2007 10:41:40 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1II3m7-00013A-9G
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 10:41:39 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1II3lu-0000w6-Kx
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 10:41:38 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1II3lu-0000vw-8N
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 10:41:26 -0400
Received: from [217.59.8.147] (helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1II3lm-0001EZ-LI
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 10:41:20 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l76EeqL16788;
	Mon, 6 Aug 2007 16:40:52 +0200 (CEST) (envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Mon, 6 Aug 2007 16:40:52 +0200
To: Zou Lunkai <zoulunkai@gmail.com>
Subject: Re: [Gnash-commit] gnash/testsuite/actionscript.all ops.as
Message-ID: <20070806144052.GA16176@keybit.net>
Mail-Followup-To: Zou Lunkai <zoulunkai@gmail.com>, gnash-commit@gnu.org
References: <E1IHxCR-0003uA-2l@cvs.savannah.gnu.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1IHxCR-0003uA-2l@cvs.savannah.gnu.org>
X-Detected-Kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Aug 2007 14:41:39 -0000

On Mon, Aug 06, 2007 at 07:40:23AM +0000, Zou Lunkai wrote:

>  x = 0xffffffff;
>  y = x << 16;
> -xcheck_equals(Math.round(y), -65536);
> +check_equals(Math.round(y), -65536);

Added debugging messages to Gnash. The above results in:

29735] 10:08:38: Shifting -32768 left for 16
29735] 10:08:38: TRACE: FAILED: expected: -65536 obtained: -2147483648 [/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/ops.as:390]

Now, look at the numbers:

      -32768 : FFFFFFFFFFFF8000
 -2147483648 : FFFFFFFF80000000
      -65536 : FFFFFFFFFFFF0000

Gnash seems correct in returning -2147483648, doesn't it ?


--strk;



From MAILER-DAEMON Mon Aug 06 11:01:05 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1II44v-0006gw-CF
	for mharc-gnash-commit@gnu.org; Mon, 06 Aug 2007 11:01:05 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1II44t-0006ff-PW
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 11:01:03 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1II44m-0006eE-IV
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 11:01:02 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1II44m-0006eB-Bl
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 11:00:56 -0400
Received: from server2.indunet.it ([217.70.144.109])
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <udo.gnu@nova-sys.net>) id 1II44j-0005SK-TT
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 11:00:55 -0400
Received: from UDO-LAPTOP (sadsl-246098.rol.raiffeisen.net [195.254.246.98])
	(authenticated bits=0)
	by server2.indunet.it (8.12.8/8.12.5) with ESMTP id l76F0KU4006678;
	Mon, 6 Aug 2007 17:00:22 +0200
Date: Mon, 6 Aug 2007 17:00:17 +0200
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
X-Mailer: The Bat! (v3.99.3) Professional
Organization: NOVASYS
X-Priority: 3 (Normal)
Message-ID: <16693397.20070806170017@nova-sys.net>
To: strk <strk@keybit.net>
Subject: Re[2]: [Gnash-commit] gnash/testsuite/actionscript.all ops.as
In-Reply-To: <20070806144052.GA16176@keybit.net>
References: <E1IHxCR-0003uA-2l@cvs.savannah.gnu.org>
	<20070806144052.GA16176@keybit.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
X-Detected-Kernel: Linux 2.4-2.6
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Udo Giacomozzi <udo.gnu@nova-sys.net>
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Aug 2007 15:01:04 -0000

Hello strk,

Monday, August 6, 2007, 4:40:52 PM, you wrote:
s> Gnash seems correct in returning -2147483648, doesn't it ?

Note:

x = 0xffffffff;
trace(x); // 4294967295

y = x << 0;
trace(y); // -1

Udo




From MAILER-DAEMON Mon Aug 06 13:01:31 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1II5xT-0000ZR-1P
	for mharc-gnash-commit@gnu.org; Mon, 06 Aug 2007 13:01:31 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1II5xR-0000WR-B8
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 13:01:29 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1II5xM-0000PR-Sf
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 13:01:28 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1II5xM-0000P2-Nm
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 13:01:24 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1II5xJ-0003xs-MU
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 13:01:23 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l76H0xm19330;
	Mon, 6 Aug 2007 19:00:59 +0200 (CEST) (envelope-from strk@keybit.net)
Date: Mon, 6 Aug 2007 19:00:59 +0200
From: strk <strk@keybit.net>
To: Udo Giacomozzi <udo.gnu@nova-sys.net>
Subject: Re: [Gnash-commit] gnash/testsuite/actionscript.all ops.as
Message-ID: <20070806170059.GA16893@keybit.net>
Mail-Followup-To: Udo Giacomozzi <udo.gnu@nova-sys.net>,
	Zou Lunkai <zoulunkai@gmail.com>, gnash-commit@gnu.org
References: <E1IHxCR-0003uA-2l@cvs.savannah.gnu.org>
	<20070806144052.GA16176@keybit.net>
	<16693397.20070806170017@nova-sys.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <16693397.20070806170017@nova-sys.net>
X-Detected-Kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Aug 2007 17:01:29 -0000

On Mon, Aug 06, 2007 at 05:00:17PM +0200, Udo Giacomozzi wrote:
> Hello strk,
> 
> Monday, August 6, 2007, 4:40:52 PM, you wrote:
> s> Gnash seems correct in returning -2147483648, doesn't it ?
> 
> Note:
> 
> x = 0xffffffff;
> trace(x); // 4294967295
> 
> y = x << 0;
> trace(y); // -1

tried << 1,2,3,4 also ?

--strk;



From MAILER-DAEMON Mon Aug 06 14:25:22 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1II7Gc-0005ZV-Ml
	for mharc-gnash-commit@gnu.org; Mon, 06 Aug 2007 14:25:22 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1II7Gb-0005YM-8B
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 14:25:21 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1II7GY-0005WX-0z
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 14:25:20 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1II7GX-0005WU-Rv
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 14:25:17 -0400
Received: from mx20.gnu.org ([199.232.41.8])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1II7GV-0003sL-W4
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 14:25:16 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by mx20.gnu.org with esmtp (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1II7GI-0007eV-3R
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 14:25:02 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1II7Fb-0005r6-OY
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 18:24:19 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1II7Fb-0005r3-Ez
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 18:24:19 +0000
To: gnash-commit@gnu.org
Message-Id: <E1II7Fb-0005r3-Ez@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 06 Aug 2007 18:24:19 +0000
X-detected-kernel: Linux 2.6 (newer, 3)
X-Detected-Kernel: Linux 2.6, seldom 2.4 (older, 4)
Subject: [Gnash-commit] gnash/server/vm ASHandlers.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Aug 2007 18:25:21 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/06 18:24:19

Modified files:
	server/vm      : ASHandlers.cpp 

Log message:
	turn attempt to set a member of a non-object into an ASCODIN error

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.116&r2=1.117

Patches:
Index: ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -b -r1.116 -r1.117
--- ASHandlers.cpp	2 Aug 2007 18:28:42 -0000	1.116
+++ ASHandlers.cpp	6 Aug 2007 18:24:19 -0000	1.117
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ASHandlers.cpp,v 1.116 2007/08/02 18:28:42 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.117 2007/08/06 18:24:19 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -2734,9 +2734,9 @@
 	{
 		// Malformed SWF ? (don't think this is possible to do with ActionScript syntax)
 		// FIXME, should this be log_swferror?
-		IF_VERBOSE_ACTION (
+		IF_VERBOSE_ASCODING_ERRORS (
 			// Invalid object, can't set.
-			log_action(_("-- set_member %s.%s=%s on invalid object!"),
+			log_aserror(_("-- set_member %s.%s=%s on invalid object!"),
 				env.top(2).to_debug_string().c_str(),
 				member_name.c_str(),
 				member_value.to_debug_string().c_str());



From MAILER-DAEMON Mon Aug 06 14:29:15 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1II7KN-0007I4-03
	for mharc-gnash-commit@gnu.org; Mon, 06 Aug 2007 14:29:15 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1II7KL-0007Gz-Rb
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 14:29:13 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1II7KL-0007GG-4n
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 14:29:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1II7KK-0007G6-Ny
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 14:29:12 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1II7KI-0004UG-OD
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 14:29:11 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1II7Jq-0005ur-2J
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 18:28:42 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1II7Jp-0005un-TT
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 18:28:41 +0000
To: gnash-commit@gnu.org
Message-Id: <E1II7Jp-0005un-TT@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 06 Aug 2007 18:28:41 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/video_stream_instance.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Aug 2007 18:29:14 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/06 18:28:41

Modified files:
	.              : ChangeLog 
	server         : video_stream_instance.cpp 

Log message:
	        * server/video_stream_instance.cpp (markReachableResources): don't
	          forget to call the character's version of resource marking !!
	          Fixes bug #20657.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3953&r2=1.3954
http://cvs.savannah.gnu.org/viewcvs/gnash/server/video_stream_instance.cpp?cvsroot=gnash&r1=1.33&r2=1.34

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3953
retrieving revision 1.3954
diff -u -b -r1.3953 -r1.3954
--- ChangeLog	6 Aug 2007 07:22:28 -0000	1.3953
+++ ChangeLog	6 Aug 2007 18:28:41 -0000	1.3954
@@ -1,5 +1,11 @@
 2007-08-06 Zou Lunkai <zoulunkai@gmail.com>
 	
+	* server/video_stream_instance.cpp (markReachableResources): don't
+	  forget to call the character's version of resource marking !!
+	  Fixes bug #20657.
+
+2007-08-06 Zou Lunkai <zoulunkai@gmail.com>
+	
 	* testsuite/actionscript.all/ops.as: xcheck to check, it passed here.
 	  
 2007-08-05 Sandro Santilli <strk@keybit.net>

Index: server/video_stream_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/video_stream_instance.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- server/video_stream_instance.cpp	2 Aug 2007 21:23:42 -0000	1.33
+++ server/video_stream_instance.cpp	6 Aug 2007 18:28:41 -0000	1.34
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 
-// $Id: video_stream_instance.cpp,v 1.33 2007/08/02 21:23:42 strk Exp $
+// $Id: video_stream_instance.cpp,v 1.34 2007/08/06 18:28:41 strk Exp $
 
 #include "sprite_instance.h"
 #include "video_stream_instance.h"
@@ -283,6 +283,9 @@
 video_stream_instance::markReachableResources() const
 {
 	if ( _ns ) _ns->setReachable();
+
+	// Invoke character's version of reachability mark
+	markCharacterReachable();
 }
 #endif // GNASH_USE_GC
 



From MAILER-DAEMON Mon Aug 06 15:07:09 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1II7v3-00025C-GX
	for mharc-gnash-commit@gnu.org; Mon, 06 Aug 2007 15:07:09 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1II7v1-000254-Qb
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 15:07:07 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1II7uu-00021c-07
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 15:07:07 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1II7ut-00021X-Sv
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 15:06:59 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1II7uo-00039E-Qt
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 15:06:58 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l76J6CT21763;
	Mon, 6 Aug 2007 21:06:12 +0200 (CEST) (envelope-from strk@keybit.net)
Date: Mon, 6 Aug 2007 21:06:12 +0200
From: strk <strk@keybit.net>
To: Udo Giacomozzi <udo.gnu@nova-sys.net>, Zou Lunkai <zoulunkai@gmail.com>,
	gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash/testsuite/actionscript.all ops.as
Message-ID: <20070806190612.GA21191@keybit.net>
Mail-Followup-To: Udo Giacomozzi <udo.gnu@nova-sys.net>,
	Zou Lunkai <zoulunkai@gmail.com>, gnash-commit@gnu.org
References: <E1IHxCR-0003uA-2l@cvs.savannah.gnu.org>
	<20070806144052.GA16176@keybit.net>
	<16693397.20070806170017@nova-sys.net>
	<20070806170059.GA16893@keybit.net>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="PNTmBPCT7hxwcZjr"
Content-Disposition: inline
In-Reply-To: <20070806170059.GA16893@keybit.net>
X-Detected-Kernel: FreeBSD 2.0-4.2
Cc: 
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Aug 2007 19:07:08 -0000


--PNTmBPCT7hxwcZjr
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Mmm.. I just tried the online version at 
  http://gnash.lulu.com/testcases/v5/ops-v5.swf 

And get no failures !
So this seems to be a difference in Ming !

I attach my own SWF for testing it with the pp.
It requires 'Dejagnu.swf' to be available one directory below the
one you run it from.

--strk;

On Mon, Aug 06, 2007 at 07:00:59PM +0200, strk wrote:
> On Mon, Aug 06, 2007 at 05:00:17PM +0200, Udo Giacomozzi wrote:
> > Hello strk,
> > 
> > Monday, August 6, 2007, 4:40:52 PM, you wrote:
> > s> Gnash seems correct in returning -2147483648, doesn't it ?
> > 
> > Note:
> > 
> > x = 0xffffffff;
> > trace(x); // 4294967295
> > 
> > y = x << 0;
> > trace(y); // -1
> 
> tried << 1,2,3,4 also ?
> 
> --strk;
> 
> 
> _______________________________________________
> Gnash-commit mailing list
> Gnash-commit@gnu.org
> http://lists.gnu.org/mailman/listinfo/gnash-commit

-- 

 ()   ASCII Ribbon Campaign
 /\   Keep it simple! 


--PNTmBPCT7hxwcZjr
Content-Type: application/octet-stream
Content-Disposition: attachment; filename="ops-v5.swf"
Content-Transfer-Encoding: base64

Q1dTBbBhAAB42rWcX2wbyXnAZ0lLpCSfc5LvzjkfJY90tixZ/0hKlmSJtOizZUmVLLmWL/b9
s7wklxJtitRxl5LouEnvkl4vOARNUkSFL7iifbiHe7yHBgjSIA2QoC2KK5q8tEWBIuhLERRF
ei/pwwFVZ2Znd4fL3Z2hljbulvPvm+/3fTPzzewuxX3QmgKg628AOB4EVwOHh4d3T1xTHsib
xcqoupcDEgiArJ4HI8H3X0LZjQ11Sy4r2Q1ZVRVNBRu7eTWfLijgIADCIHJwDISlFrAG5oLH
2gB4/8+PzYEN2sVGZkvJPFTKG/mippR35UJ9jZbfVkoVzUEESchavlRU3QlsFbBSzCq5fFHJ
zsBsPgurpQosV4rw/Lb8UEHWnYd7eW0LjuQTO7K2taGVNhjTL89QAjgHCMMSgiqXSprhj43t
UrZSUJAteS0vF/KPlCzIFBS5vGQYVyrO4+T1srytgHwxVwLb6ibY18pyRgE7iFE3jiTBPlNA
0iAn5wu0ACfBPlNA0mD9znUARyBYr6qasg0y8o6czhcQjqKCXaWsIm+BdqBt5VWwWoI75dKO
Ui5UIUMMDSN1Y2CuhHwG5RzChgBaPh9tB/BmSSVuhmVFVlEZRK6eQeWxQYhVQE1RtYysKnBP
VmGmtL2TLyAFFTVf3IQyTJc2Kypqjf5R90OKCAcqO1ArwRuo4Uh0dGI0OpJWNDk2iJXGB+Fr
aNiQKrOnnYJcRXhk7EivcOnGzbVbt6HeuyZvwi25mC3g1gNyhvAjmxGkAvPbO6WyhrC2S7t5
hUpsybsKLJY0mFaUIpkhVUWDqAu4p0B1q1QpZFEV7iKHhzKuS5VybI9l2qNagjm5TNAnBuFt
1ICZUzCHXALz2DvlcmUHc5TKxF1YO/G93vfeloIMVvZ3lAxqhDpbKiKeKsTuHcZUe/lCASkq
FNJy5iF2HplUeBSV9nawgecPmo4beJbgz32jYN8oqRTxcOHPsqKWCrvg5pX19flrMxDcNVPX
ryyt6EVmSitpckEFt8nHDGHVu0Z1OKN3TzMGPymtID20vFI0a4iwVY6ZTHEDjRSUFa2MpzX1
JnEYO4/JiNVPW3gHO0orV6G8KaMBJFeAgoO5SA9CKGqF/g4A0H3QhkJX6P2TAMexZ7pxTSAE
SA0KbcHIgQSCS10fBUAHiXUt/U8C4ASgdSjsHWuR1nCu9QctWOrfgjgTiuBreBWJfRzASYkU
BCI3V8jnje5FVHUO4A5mzcqOBM4nUGoBFyQXsK77ARpiQyAkIQXhtuQpXBKJHARBuD24hmW6
UR9Epodcz5ArJNdecu0j15fJ9Sy5niPXfnI9T64DC/3Y+kFifQInL1jJISs5bCVHrOQoTaKO
On6A9gCJxL0Q8dTxSD/x5gmr4iSxfQxVIa2oanAlcrObNHrW3ihqNhoyG3XZG8XMRhfMRs/Z
G8XNRsNmo3F93P4a4Ikwobu4A7kYNb8YHkReNfxOCyfDF2yFuLsIniHPEyVTKFfXYIhpMI1y
dQ1GmAaXUK6uwSjTYAblahqQaftCCFtChvIUuX6ZzKsXV/H19CopeqlG7J0ASrSiSXZOcphk
ZHoRH7XPnrKN64t0XE2BZ3RKh5Husjf9EuatHei6Np20TZdHm5O0zXMebZ6nbZi16sNT3bgT
4ie84IkWXB6+nOymSxLVt6OatRD4pzYJQb3X2opPUwCdt8BBaz8uqjvJpNCp6d/voFPTr4/9
EShn1HwWnF1C4a+0o47K6vAujI3G4jAejU6NRafHopMwOjUzEZ2Jx+EjtEtVig/lPJzf34Fn
wRvgLf3IEYPJJIwB+AYY2yptK2OqVn44ppYzY5tFWd3SryNbipwdw8FXraDgOUY3zUw5v6ON
ok1mTNcPZthTC3Maiela+mJ9AP2vK4zij5EoQP+RZN9ItA9EQV+0j1YUKygyoyT+BOZJDZeY
GdImmbTyZiqZJGKr8irohQPoA8tFB3GGaEMlgwCZis4AuOy8njxva2UUD9rbEPGaExljraXQ
ko8lk1q5ogB8SSZjIN5r5XuTcRAbIlksBOLA2P7wRldKa7J+RCWNh5Avh9DGriqAXFGeFJu9
sZW0iZ6Wy9UYvsQxIM5gZTiP6Ibjw+NscR8p6SN20zRtHSNui4EtpVAogXXdg6gkji/jgPSC
G+DmuGQQ9JGmfWB8NIqOB5bE+KiRGxhkpaI1OWOgjA7j9JDdRz76YG8S6gXkirO0BpTAWvoB
ciNAu3hFWcuBfVAF+4kqiI5eunQJxBDOFSADOZ3B/2dxQTQKHqFPXC1nUdFqZTutlMGj3mSV
+Bbs91eRHbh+ilwHzAnXjxwzEOs38ySH5yBK4A9STxK0cLwfOX7/cRVcAtMU6CLT32PS32O2
P6uOLcXd0caMOiM9/XgCDW+cEb5H2t5z7PievWPamOnYSE/fiyH+CXAD3RmBMj6ZkuQoSQ5U
B8HI5MWL45NohRIXatUdpZTD5ef1kvMgrxblIhpq8olrojCRQIFhEozEwBTQ46dE4mgAxVES
aYNWpD2GdpF2PU0uS2jLmyBSLeFW0jhEruGFgxYQOmMEcaaH9uQptJ+NNSSDNzsz1lsqjzuI
Q45KURldZbjDZuUzDuK9HJWiMm26b/Fhh1wsrScceujjaBWVob4FZOO3VD7rIP4yR6WoDPVt
p83KLgfxsxyVojL6mTwQsLSddJA8x9EmKqNrCwYtbc85SPZztInKUNsYbc87SJ7naBOVobYx
nnzBQXKAo01Uht5LnYrgBmS6dJl6v+zQxyBHr6gMuypORRilLzp0cIGjVFSGrovTdkNfcpAf
4ugUlWENPc3ojDjID3N0isq06Tdqp2s92+0gPeIgfYbRKCrTY06jQK2Z0KGDUY5SUZkea9dq
kazl0usgPsbxrKiMPpotkm3X6nMQj3JUisrQCRTQrbQ8+7KDfIyjU1TGNDNQu1DOOsjHOTpF
ZdrY0SStAtTHa6SfAfqQZpDUSbQH3BTfitapGHfFmiXdnat58iMmXzP63ogBwwgD1EHFBAfx
AgdxguNFYAKwiB1OXnRDvMhBHKKIHQ3IUy8Cy4uuiAHWCBcVkxzEYQ7ipGsAbZFsE3HFeZQ9
ZuEUB26EM8RTXnC1zltxcJ7kObjTHLhRjuemvQbXOHpep1idtWPq2OElDtAYBepsQJ56y5hI
wOatOixXuBkOXJQDN+MC9wIIx0JBfE8SMG76SPaVblwVd6lC/cTIZhtnt/hxB71znPgsKkNP
irrWCUbpRYcOUhylojL0JDOB1DIaJx2kr3A0ispgjR34Gfa0nr+U6sb5GVt+Npyw8qiHKeKW
WZYy6aBxgUMpKkMHQ9c6jSf0Ap3Ql60Jjapd5uIiZy5P0bl8uQF5OlTTSCu77qcYnmmX7pY4
OJcpzlQD8tRDs5GDNtCK8ilj5RuOmmPAZt0ctcwhm6Vkcw3Is3cEs2QAU7fskLfskHYBF30r
HN4rHN4Vz7lWf4v4ikMfq5w5LipTM8dr7mSuOvSwxrmpEJXpYbXORKwz/jWHDm5zlIrK9Ohr
Zz48z5p53UH6NY5zRWWoc+eJmfOM0gWHDl7nKBWVwUrbQHhRn8pLeuRcJAi/p7+E1N+Wzkcu
r1l0ixF22S4yy3bebdm+yVkG83QZLDYgTz2m487XMM0zTItuTG9xmBYp03wD8nSzWm79x//9
7dzQH7/wr2RvWkGh5H/mzDf4y4R4JbJojvENh+4VzhiLyhhI4VW6PyZ1pvCalReGynPWl6hM
jwF10wb1+0eA2j4C1LYX1C0b1PoRoN4+AtTbHlC2GRW+fQSmyhGYKl6Osk2po0zz6hGYqu4R
e7lFf5WzQj9fNTGeJVCv0hwbLVaYaPGqW7R4hxMtXqXRYqUB+TY7M2gu83s+md/jMIeQKP1i
UjOxP/CJ/YEIttR07O/4xP4OB5ss+69YK86VfbmGfVmE/fuC7MsNyJsbTy1z01fmhz79/qEX
+x1x9paau5kxEfS/cA1+tehjDcj32KfMHf6UOQL6Jz7RP3F9fxBetmKK92Q5wkT/1OdE/9T9
LdayFVOaHsl/6HOO/9AF+wTGbjOeZYXvpp4O/o994v/Y/d5l2bp3Mcj9kP7UJ+lPGwkmTfby
z32y/9xrbutL0m3H7/RH/plP8s8EyaWmk//KJ/mv+OTkZP0fk6fnRq5G/sub3npq8JqDrn/m
3FGKytAbb33nkFiXvS7isn8RdNnrDci31e8c4fV6X9m8yt7Yubn1CFvjb3xujb/hb4019CkP
+saH53Ofw/M5f3jajCgSXko2lf13Ptl/1xB7c/3+hU/2LwSXRWdT57okiVGPNSDvEP/CnU9l
pbZL/laqk3yPB33KT/jukhoP311S08P3ScnfPD0pcU/QzF7NPEe6z75cX61/uY4a6lttxFlx
xFJ835H8Dc7r9YggecCRHNjIO8XJoSi526tuKHk8qrYe2tFnePpbr6b6/qxf35/1suDPDg/n
/mRdO/s0LRjwa8FAAxb8w+GXUn87OPO9plow7NeCYQ8L6PfGjbfxK7a38c2yIepkw5kGbIhK
Ho+z12w2zD0VGyb82jDhZcNXbDa8+VRsmPZrw7SXDQwzCaghx8UctOEnxPEToviJBW4H9fhv
0YcpSYofbDZ+SnQlu+GnXFZyKwiSTM2GtWzfsMxWLr2/wjkh3OPsVq+40pF0kEdHW7n0fpVD
t8Ghu+pNFxCiC7jRXePQ3efQXXOlCwiNbMBzZOc5dDKHbl5y/0OVGrKF+kNSwNVn1zlUaQ7V
dcn1T5PM7/rd9/xycU1LFy0LHMoM55unC4Knz7A92shYus0WbRTxaHPTUiw7kmcpubLA7aD+
5PPkyedzHz558oSefMbHYWoc/WuqBbf9WnDby4L//OJw7uDqBwVqwePD3pS69d3/bqoFd/1a
cFcSeEGXepomvOlkwpkGTHhT5NhjfGUj5/j1CL823Pdrw32vBwZt1gODzaeCn/U7i7Kcc4PM
HiuX7cdKs5VL7zlOhNzinClznHMDj462cul9k0OX59BtSu5/Nilz9r6gK9UWh+oBZ+/b4pwX
eD4LeI5onkP3kOOzPOesJTSiATe6Bxy6AofugcdpRuaeZtyoHnKotjkj+tD9NIOPBqFjxqge
t51mSsxpxmrpoqXAoSxSylID8mwkSQtFkrRL7yqHboczsionkqSFIokbncahe5tDp3lEkjQ3
krhRVThUZc68q3AiSVookrjR7XLoVI7PdjmRRGhEA250exw6jUO35xFJ0txI4ka1z6GqcEZ0
nxNJjhujeswWSfbskeS4x8hWOZS7lHKvAXmHb+TgQxS9hct000MSg75gRyctXFS+y0Fe4SC/
63U7cXj42ysA/PqwBvtZFtsQ2SfHvOotfYIcHmI77lI7vlpjR52I2xc+OYY9ooZ9tQF5+hVG
wxJJt8T4SRWDe8nO7f03pt/igHZwQL/lNQK53P/N5dC/5k+cb/ucON92wQ4i7GC3g5sJzDX8
8RjDLlLYr9XAXnPR9l0O7R9Q2q81IE9fPjJT8utJ67XnHzr08j3Oa09RGUuzdzx1H70/FRy9
zgbk2Z/AIWPG0q3Z6WidJe7wTVxLScaR8h0O5ffd1/By+FTEdZYd2a1PfLr1iRfwevN5P/LJ
+5EXb8KTt9XG+64I718K8r7bgLz56ChR+5XGZnJ/zPlyBo/7Y6/nRYmab2Q0lfsTn9yfeD0j
CjkdaLIMsmRD7hBB/lRwinQ0IM8/0LDYh4f6OcDA/oYI9l8JYn+jAXnmwfSZlP5gutne/pFP
b/+ooVNA1m+8+4nPePeTBjcU38A/8wn8s8Y2FN+8v/DJ+wsv3m968gZtvAkR3r8X5E00IG9u
KN903VB8c38mGJgTDcj32LlTzef+pU/uXzpzgxQYCr5/AgT0H+ilP6lu/rABYH4VQUqeCpEf
DP5/kwzKiw==

--PNTmBPCT7hxwcZjr--



From MAILER-DAEMON Mon Aug 06 15:31:12 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1II8IK-0005xQ-HJ
	for mharc-gnash-commit@gnu.org; Mon, 06 Aug 2007 15:31:12 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1II8II-0005xG-Pb
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 15:31:10 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1II8IG-0005wr-Jq
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 15:31:10 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1II8IG-0005wo-FZ
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 15:31:08 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1II8IE-00082t-VD
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 15:31:07 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1II8Hw-0001L2-7V
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 19:30:48 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1II8Hw-0001Kz-1I
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 19:30:48 +0000
To: gnash-commit@gnu.org
Message-Id: <E1II8Hw-0001Kz-1I@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 06 Aug 2007 19:30:48 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/ops.as
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Aug 2007 19:31:10 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/06 19:30:47

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: ops.as 

Log message:
	        * testsuite/actionscript.all/ops.as: add test for 0xffffffff
	          conversion to integer needing to be -1 (gnash fails, need Ming head
	          to reproduce)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3954&r2=1.3955
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/ops.as?cvsroot=gnash&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3954
retrieving revision 1.3955
diff -u -b -r1.3954 -r1.3955
--- ChangeLog	6 Aug 2007 18:28:41 -0000	1.3954
+++ ChangeLog	6 Aug 2007 19:30:47 -0000	1.3955
@@ -1,5 +1,8 @@
-2007-08-06 Zou Lunkai <zoulunkai@gmail.com>
+2007-08-06 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/actionscript.all/ops.as: add test for 0xffffffff
+	  conversion to integer needing to be -1 (gnash fails, need Ming head
+	  to reproduce)
 	* server/video_stream_instance.cpp (markReachableResources): don't
 	  forget to call the character's version of resource marking !!
 	  Fixes bug #20657.

Index: testsuite/actionscript.all/ops.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/ops.as,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- testsuite/actionscript.all/ops.as	6 Aug 2007 07:40:22 -0000	1.12
+++ testsuite/actionscript.all/ops.as	6 Aug 2007 19:30:47 -0000	1.13
@@ -20,7 +20,7 @@
  *  Test binary predicates (equal, less_then, greater_then, logical and bitwise ops)
  */
 
-rcsid="$Id: ops.as,v 1.12 2007/08/06 07:40:22 zoulunkai Exp $";
+rcsid="$Id: ops.as,v 1.13 2007/08/06 19:30:47 strk Exp $";
 
 #include "check.as"
 
@@ -375,6 +375,11 @@
 check_equals( (1^null), 1 );
 check_equals( (null^null), 0 );
 check_equals( (8^12), 4 );
+
+// The check below will fail if Ming converts the long int to a double
+// (only with Gnash, it works fine with the proprietary player)
+check_equals((0xffffffff|0), -1);
+
 // TODO ... 
 
 //------------------------------------------------
@@ -385,9 +390,16 @@
 y = x << 2;
 check_equals(y, 4);
 
-x = 0xffffffff;
+x = 0xffffffff; // Ming up to 0.4.0.beta4 will convert this to -1 !
+                // Newer Ming will store it as a double. Still, the
+                // player itself converts it back to -1 as an integer
+                // prior to applying the bitwise operator.
+y = x << 16;
+check_equals(y, -65536);
+
+x = -1;
 y = x << 16;
-check_equals(Math.round(y), -65536);
+check_equals(y, -65536);
 
 x = 1.9;
 y = x << 2;



From MAILER-DAEMON Mon Aug 06 15:34:27 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1II8LT-0007xW-9J
	for mharc-gnash-commit@gnu.org; Mon, 06 Aug 2007 15:34:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1II8LR-0007xB-3g
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 15:34:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1II8LP-0007wI-82
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 15:34:24 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1II8LP-0007w1-2M
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 15:34:23 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1II8LL-0000C8-Gl
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 15:34:21 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l76JXr722284;
	Mon, 6 Aug 2007 21:33:53 +0200 (CEST) (envelope-from strk@keybit.net)
Date: Mon, 6 Aug 2007 21:33:53 +0200
From: strk <strk@keybit.net>
To: Udo Giacomozzi <udo.gnu@nova-sys.net>, Zou Lunkai <zoulunkai@gmail.com>,
	gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash/testsuite/actionscript.all ops.as
Message-ID: <20070806193353.GB21191@keybit.net>
Mail-Followup-To: Udo Giacomozzi <udo.gnu@nova-sys.net>,
	Zou Lunkai <zoulunkai@gmail.com>, gnash-commit@gnu.org
References: <E1IHxCR-0003uA-2l@cvs.savannah.gnu.org>
	<20070806144052.GA16176@keybit.net>
	<16693397.20070806170017@nova-sys.net>
	<20070806170059.GA16893@keybit.net>
	<20070806190612.GA21191@keybit.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20070806190612.GA21191@keybit.net>
X-Detected-Kernel: FreeBSD 2.0-4.2
Cc: 
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Aug 2007 19:34:25 -0000

I tracked the difference between the two movies down to this:

My local version:
     [000]   Constant: 75 "x"
     [001]   Double: 4.29497e+09

The version on gnashdev:
     [000]   Constant: 75 "x"
     [001]   Integer: -1

Basically, a=0xffffffff becomes:

     [001]   Integer: -1

or

     [001]   Double: 4.29497e+09

Depending on whether automatic conversion to double is implemented in Ming we get
two different pushes. Still, it seems the properietary player returns -65536
when shifting both numbers 16 bits left.

This reduces to the double 4.29497e+09 being converted to -1 by the pp
but NOT by gnash.

--strk;



From MAILER-DAEMON Mon Aug 06 16:43:28 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1II9QG-0006kj-34
	for mharc-gnash-commit@gnu.org; Mon, 06 Aug 2007 16:43:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1II9QD-0006kI-7Q
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 16:43:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1II9Q7-0006gE-Ik
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 16:43:24 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1II9Q7-0006gB-D1
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 16:43:19 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1II9Q4-0005GW-MT
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 16:43:18 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1II9Pl-000628-VU
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 20:42:58 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1II9Pl-000622-Ra
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 20:42:57 +0000
To: gnash-commit@gnu.org
Message-Id: <E1II9Pl-000622-Ra@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 06 Aug 2007 20:42:57 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/as_value.cpp server/as_v...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Aug 2007 20:43:25 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/06 20:42:57

Modified files:
	.              : ChangeLog 
	server         : as_value.cpp as_value.h 
	server/vm      : ASHandlers.cpp 
	testsuite/swfdec: PASSING 

Log message:
	        * server/as_value.{cpp,h}: add a to_int() method taking
	          care of compatible integer conversion. Add note about
	          deprecation of templated to_number<>.
	        * server/vm/ASHandlers.cpp: explicitly use to_int() in bitwise
	          ops. Fixes ops.as testcases built with newer Ming. Add TODO
	          lines about possible other uses.
	        * testsuite/swfdec/PASSING: bitwise-{5,6,7}.swf now pass.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3955&r2=1.3956
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.h?cvsroot=gnash&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.117&r2=1.118
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/PASSING?cvsroot=gnash&r1=1.24&r2=1.25

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3955
retrieving revision 1.3956
diff -u -b -r1.3955 -r1.3956
--- ChangeLog	6 Aug 2007 19:30:47 -0000	1.3955
+++ ChangeLog	6 Aug 2007 20:42:56 -0000	1.3956
@@ -1,5 +1,15 @@
 2007-08-06 Sandro Santilli <strk@keybit.net>
 
+	* server/as_value.{cpp,h}: add a to_int() method taking
+	  care of compatible integer conversion. Add note about
+	  deprecation of templated to_number<>.
+	* server/vm/ASHandlers.cpp: explicitly use to_int() in bitwise
+	  ops. Fixes ops.as testcases built with newer Ming. Add TODO
+	  lines about possible other uses.
+	* testsuite/swfdec/PASSING: bitwise-{5,6,7}.swf now pass.
+
+2007-08-06 Sandro Santilli <strk@keybit.net>
+
 	* testsuite/actionscript.all/ops.as: add test for 0xffffffff
 	  conversion to integer needing to be -1 (gnash fails, need Ming head
 	  to reproduce)

Index: server/as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- server/as_value.cpp	2 Aug 2007 20:11:35 -0000	1.63
+++ server/as_value.cpp	6 Aug 2007 20:42:57 -0000	1.64
@@ -330,6 +330,26 @@
 	/* NOTREACHED */
 }
 
+int32_t
+as_value::to_int(as_environment& env) const
+{
+	double d = to_number(&env);
+	int i=0;
+
+	if ( ! isfinite(d) ) return 0;
+
+	if (d < 0)
+	{
+		i = - (uint32_t) fmod (-d, 4294967296.0);
+	}
+	else
+	{
+		i = (uint32_t) fmod (d, 4294967296.0);
+	}
+
+	return i;
+}
+
 // Conversion to boolean for SWF7 and up
 bool
 as_value::to_bool_v7() const

Index: server/as_value.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.h,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- server/as_value.h	2 Aug 2007 18:28:42 -0000	1.61
+++ server/as_value.h	6 Aug 2007 20:42:57 -0000	1.62
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: as_value.h,v 1.61 2007/08/02 18:28:42 strk Exp $ */
+/* $Id: as_value.h,v 1.62 2007/08/06 20:42:57 strk Exp $ */
 
 #ifndef GNASH_AS_VALUE_H
 #define GNASH_AS_VALUE_H
@@ -330,7 +330,7 @@
 	///
 	const std::string&	to_string_versioned(int version, as_environment* env=NULL) const;
 
-	/// Conversion to number 
+	/// Conversion to number (double)
 	//
 	/// @param env
 	///	The environment to use for running the valueOf() method
@@ -338,10 +338,26 @@
 	///
 	double	to_number(as_environment* env=NULL) const;
 
+	/// Conversion to 32bit integer
+	//
+	/// Use this conversion whenever an int is needed.
+	/// This is NOT the same as calling to_number<int32_t>().
+	///
+	/// @param env
+	///	The environment to use for running the valueOf() method
+	///	for object values. 
+	///
+	int32_t	to_int(as_environment& env) const;
+
 	/// Shorthand: casts the result of to_number() to the requested number
 	/// type.
 	//
 	/// Parameter identical to that of to_number().
+	///
+	/// TODO: deprecate this function, it gets confusing as when an integer
+	///       is needed the caller should invoke to_int() rather then to_number().
+	///       Implementing specializations for *all* integer types might be tedious
+	///
 	template <typename T>
 	T to_number (as_environment* env=NULL) const
 	{

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -b -r1.117 -r1.118
--- server/vm/ASHandlers.cpp	6 Aug 2007 18:24:19 -0000	1.117
+++ server/vm/ASHandlers.cpp	6 Aug 2007 20:42:57 -0000	1.118
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ASHandlers.cpp,v 1.117 2007/08/06 18:24:19 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.118 2007/08/06 20:42:57 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -867,7 +867,7 @@
 
     int size = unsigned(size_val.to_number(&env));
 
-    int	base = int(base_val.to_number(&env));
+    int	base = int(base_val.to_number(&env)); // TODO: use to_int ?
     int version = env.get_version();
     const std::string& str = string_val.to_string_versioned(version);
 
@@ -950,7 +950,7 @@
 //    GNASH_REPORT_FUNCTION;
     as_environment& env = thread.env;
     thread.ensureStack(1);
-    env.top(0).set_int(int(floor(env.top(0).to_number(&env))));
+    env.top(0).set_int(int(floor(env.top(0).to_number(&env)))); // TODO: use to_int ?
 }
 
 void
@@ -1146,7 +1146,7 @@
 
 	thread.ensureStack(3);
 
-	int depth = int(env.top(0).to_number(&env))+character::staticDepthOffset;
+	int depth = int(env.top(0).to_number(&env))+character::staticDepthOffset; // TODO: use to_int ?
 	const std::string& newname = env.top(1).to_string(&env);
 	const std::string& path = env.top(2).to_string(&env);
 
@@ -1379,7 +1379,7 @@
 
 	thread.ensureStack(1);  // max
 
-	int	max = int(env.top(0).to_number(&env));
+	int	max = int(env.top(0).to_number(&env)); // TODO: use to_int ?
 	if (max < 1) max = 1;
 	env.top(0).set_int(tu_random::next_random() % max);
 }
@@ -1416,7 +1416,7 @@
     as_environment& env = thread.env;
     thread.ensureStack(1);
     char	buf[2];
-    buf[0] = int(env.top(0).to_number(&env));
+    buf[0] = int(env.top(0).to_number(&env)); // TODO: use to_int() ?
     buf[1] = 0;
     env.top(0).set_string(buf);
 }
@@ -3072,14 +3072,10 @@
 	as_environment& env = thread.env;
 	thread.ensureStack(2);
 
-	double operand1 = env.top(1).to_number(&env);
-	double operand2 = env.top(0).to_number(&env);
-
-	// TODO: have as_value::to_number<int> handle this ?
-	if ( isnan(operand1) ) operand1 = 0;
-	if ( isnan(operand2) ) operand2 = 0;
+	int operand1 = env.top(1).to_int(env);
+	int operand2 = env.top(0).to_int(env);
 
-	env.top(1) = int(operand1) & int(operand2);
+	env.top(1) = operand1 & operand2;
 	env.drop(1);
 }
 
@@ -3090,14 +3086,10 @@
 	as_environment& env = thread.env;
 	thread.ensureStack(2);
 
-	double operand1 = env.top(1).to_number(&env);
-	double operand2 = env.top(0).to_number(&env);
+	int operand1 = env.top(1).to_int(env);
+	int operand2 = env.top(0).to_int(env);
 
-	// TODO: have as_value::to_number<int> handle this ?
-	if ( isnan(operand1) ) operand1 = 0;
-	if ( isnan(operand2) ) operand2 = 0;
-
-	env.top(1) = int(operand1)|int(operand2);
+	env.top(1) = operand1|operand2;
 	env.drop(1);
 }
 
@@ -3109,14 +3101,10 @@
 	as_environment& env = thread.env;
 	thread.ensureStack(2);
 
-	double operand1 = env.top(1).to_number(&env);
-	double operand2 = env.top(0).to_number(&env);
-
-	// TODO: have as_value::to_number<int> handle this ?
-	if ( isnan(operand1) ) operand1 = 0;
-	if ( isnan(operand2) ) operand2 = 0;
+	int operand1 = env.top(1).to_int(env);
+	int operand2 = env.top(0).to_int(env);
 
-	env.top(1) = int(operand1)^int(operand2);
+	env.top(1) = operand1^operand2;
 	env.drop(1);
 }
 
@@ -3130,13 +3118,10 @@
 	as_environment& env = thread.env;
 	thread.ensureStack(2);
 
-	double operand1 = env.top(1).to_number(&env);
-	double operand2 = env.top(0).to_number(&env);
-
-	// TODO: have as_value::to_number<int> handle this ?
-	if ( isnan(operand1) ) operand1=0;
+	int16_t operand1 = env.top(1).to_int(env);
+	int16_t operand2 = env.top(0).to_int(env);
 
-	env.top(1) = int16_t(operand1) << int(operand2);
+	env.top(1) = operand1 << operand2;
 	env.drop(1);
 }
 
@@ -3150,13 +3135,10 @@
 	as_environment& env = thread.env;
 	thread.ensureStack(2);
 
-	double operand1 = env.top(1).to_number(&env);
-	double operand2 = env.top(0).to_number(&env);
+	int16_t operand1 = env.top(1).to_int(env);
+	int operand2 = env.top(0).to_int(env);
 
-	// TODO: have as_value::to_number<int> handle this ?
-	if ( isnan(operand1) ) operand1=0;
-
-	env.top(1) = int16_t(operand1) >> int(operand2);
+	env.top(1) = operand1 >> operand2;
 	env.drop(1);
 }
 
@@ -3169,13 +3151,10 @@
 	as_environment& env = thread.env;
 	thread.ensureStack(2);
 
-	double operand1 = env.top(1).to_number(&env);
-	double operand2 = env.top(0).to_number(&env);
-
-	// TODO: have as_value::to_number<int> handle this ?
-	if ( isnan(operand1) ) operand1=0;
+	uint32_t operand1 = env.top(1).to_int(env);
+	int operand2 = env.top(0).to_int(env);
 
-	env.top(1) = uint32_t(operand1) >> int(operand2);
+	env.top(1) = operand1 >> operand2;
 	env.drop(1);
 }
 

Index: testsuite/swfdec/PASSING
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/PASSING,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- testsuite/swfdec/PASSING	11 Jul 2007 00:33:57 -0000	1.24
+++ testsuite/swfdec/PASSING	6 Aug 2007 20:42:57 -0000	1.25
@@ -93,3 +93,6 @@
 instance-name-loaded-5.swf
 instance-name-loaded-6.swf
 instance-name-loaded-7.swf
+bitwise-5.swf
+bitwise-6.swf
+bitwise-7.swf



From MAILER-DAEMON Mon Aug 06 16:52:40 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1II9ZA-00025E-QN
	for mharc-gnash-commit@gnu.org; Mon, 06 Aug 2007 16:52:40 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1II9Z8-00024v-ET
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 16:52:38 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1II9Z7-00023M-52
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 16:52:37 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1II9Z7-00023F-05
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 16:52:37 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1II9Yz-0006dC-Vp
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 16:52:30 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1II9Yq-0007Ev-KZ
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 20:52:20 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1II9Yq-0007Es-H1
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 20:52:20 +0000
To: gnash-commit@gnu.org
Message-Id: <E1II9Yq-0007Es-H1@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 06 Aug 2007 20:52:20 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/testsuite/actionscript.all toString_value...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Aug 2007 20:52:39 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/06 20:52:20

Modified files:
	testsuite/actionscript.all: toString_valueOf.as 

Log message:
	check -> check_equals (check_equals should always be preferred when available)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/toString_valueOf.as?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: toString_valueOf.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/toString_valueOf.as,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- toString_valueOf.as	5 Aug 2007 06:14:30 -0000	1.2
+++ toString_valueOf.as	6 Aug 2007 20:52:20 -0000	1.3
@@ -326,13 +326,13 @@
 #endif
 
 d1 = new Date(0);
-check(typeof(d1) == "object");
+check_equals(typeof(d1), "object");
 x = d1.toString();
 y = d1.valueOf();
-check(typeof(x) == "string");  
-check(typeof(y) == "number");   
-check(x == "Thu Jan 1 08:00:00 GMT+0800 1970");
-check(y == 0);
+check_equals(typeof(x), "string");  
+check_equals(typeof(y), "number");   
+check_equals(x, "Thu Jan 1 08:00:00 GMT+0800 1970");
+check_equals(y, 0);
 
 d2 = new Date(1);
 d3 = d1 + d2;



From MAILER-DAEMON Mon Aug 06 17:09:06 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1II9p3-0006sw-TV
	for mharc-gnash-commit@gnu.org; Mon, 06 Aug 2007 17:09:05 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1II9p1-0006s9-QP
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 17:09:03 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1II9p0-0006rQ-9x
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 17:09:03 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1II9oz-0006rH-Um
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 17:09:02 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1II9oy-0000wH-9q
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 17:09:00 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1II9oj-0007Xq-PB
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 21:08:45 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1II9oj-0007Xn-LF
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 21:08:45 +0000
To: gnash-commit@gnu.org
Message-Id: <E1II9oj-0007Xn-LF@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 06 Aug 2007 21:08:45 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/toSt...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Aug 2007 21:09:04 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/06 21:08:45

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: toString_valueOf.as 

Log message:
	        * testsuite/actionscript.all/toString_valueOf.as: fix some
	          of the tests, disable a test depending on timezone. Please
	          further tests on Date go to the Date.as file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3956&r2=1.3957
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/toString_valueOf.as?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3956
retrieving revision 1.3957
diff -u -b -r1.3956 -r1.3957
--- ChangeLog	6 Aug 2007 20:42:56 -0000	1.3956
+++ ChangeLog	6 Aug 2007 21:08:45 -0000	1.3957
@@ -1,5 +1,8 @@
 2007-08-06 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/actionscript.all/toString_valueOf.as: fix some
+	  of the tests, disable a test depending on timezone. Please
+	  further tests on Date go to the Date.as file.
 	* server/as_value.{cpp,h}: add a to_int() method taking
 	  care of compatible integer conversion. Add note about
 	  deprecation of templated to_number<>.

Index: testsuite/actionscript.all/toString_valueOf.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/toString_valueOf.as,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- testsuite/actionscript.all/toString_valueOf.as	6 Aug 2007 20:52:20 -0000	1.3
+++ testsuite/actionscript.all/toString_valueOf.as	6 Aug 2007 21:08:45 -0000	1.4
@@ -331,19 +331,26 @@
 y = d1.valueOf();
 check_equals(typeof(x), "string");  
 check_equals(typeof(y), "number");   
-check_equals(x, "Thu Jan 1 08:00:00 GMT+0800 1970");
+// NOTE: the value of toString() here depends on timezone !
+//       It's the epoch, but depending on timezone the GMT+<x> and actual hour change
+//       For this reason the test is disabled till a solution is found.
+//check_equals(x, "Thu Jan 1 08:00:00 GMT+0800 1970"); 
 check_equals(y, 0);
 
 d2 = new Date(1);
-d3 = d1 + d2;
+d3 = d1 + d2; // in SWF5 this should result in a number, in SWF6 or higher, in a string
+exp = d1.toString() + d2.toString();
 #if OUTPUT_VERSION > 5 
-  xcheck(typeof(d3) == 'string');
-  xcheck(d3 == "Thu Jan 1 08:00:00 GMT+0800 1970Thu Jan 1 08:00:00 GMT+0800 1970");
+  xcheck_equals(typeof(d3), 'string');
+  xcheck_equals(d3, exp);
 #else
-  check(typeof(d3) == 'number');
-  check(d3 == 1);
+  check_equals(typeof(d3), 'number');
+  check_equals(d3, 1);
 #endif
 
+// Date(0) == Date(1) 
+check_equals(d1.toString(), d2.toString());
+
 //
 //Testing toString and valueOf of Array
 //



From MAILER-DAEMON Mon Aug 06 17:40:28 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IIAJP-00082t-TY
	for mharc-gnash-commit@gnu.org; Mon, 06 Aug 2007 17:40:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IIAJO-00081X-EE
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 17:40:26 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IIAJJ-000805-6p
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 17:40:25 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IIAJJ-000802-1l
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 17:40:21 -0400
Received: from server2.indunet.it ([217.70.144.109])
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <udo.gnu@nova-sys.net>) id 1IIAJG-0005rX-51
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 17:40:19 -0400
Received: from UDO-LAPTOP (host113-29.pool8290.interbusiness.it [82.90.29.113])
	(authenticated bits=0)
	by server2.indunet.it (8.12.8/8.12.5) with ESMTP id l76LduU4028187;
	Mon, 6 Aug 2007 23:40:03 +0200
Date: Mon, 6 Aug 2007 23:39:53 +0200
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
X-Mailer: The Bat! (v3.99.3) Professional
Organization: NOVASYS
X-Priority: 3 (Normal)
Message-ID: <11410371531.20070806233953@nova-sys.net>
To: strk <strk@keybit.net>
Subject: Re[2]: [Gnash-commit] gnash/testsuite/actionscript.all ops.as
In-Reply-To: <20070806170059.GA16893@keybit.net>
References: <E1IHxCR-0003uA-2l@cvs.savannah.gnu.org>
	<20070806144052.GA16176@keybit.net>
	<16693397.20070806170017@nova-sys.net>
	<20070806170059.GA16893@keybit.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
X-Detected-Kernel: Linux 2.4-2.6
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Udo Giacomozzi <udo.gnu@nova-sys.net>
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Aug 2007 21:40:26 -0000

Hello strk,

Monday, August 6, 2007, 7:00:59 PM, you wrote:
s> tried << 1,2,3,4 also ?

Sure. Retuns -2, -4, -8, -16 et cetera...


Udo




From MAILER-DAEMON Mon Aug 06 17:47:31 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IIAQF-0002Ts-Ea
	for mharc-gnash-commit@gnu.org; Mon, 06 Aug 2007 17:47:31 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IIAQE-0002Tm-G7
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 17:47:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IIAQ9-0002TJ-2D
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 17:47:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IIAQ8-0002TG-QN
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 17:47:24 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IIAQ5-0006or-U3
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 17:47:23 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IIAPn-0002NG-F3
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 21:47:03 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IIAPn-0002N7-3X
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 21:47:03 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IIAPn-0002N7-3X@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 06 Aug 2007 21:47:03 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog doc/C/Makefile.am doc/C/asspec/...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Aug 2007 21:47:30 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/06 21:47:02

Modified files:
	.              : ChangeLog 
	doc/C          : Makefile.am 
	doc/C/asspec   : Makefile.am 

Log message:
	        * doc/C/Makefile.am, doc/C/asspec/Makefile.am: don't list entities
	          twice for distribution (fixed make uninstall for the most part,
	          needs some other tweak for png files)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3957&r2=1.3958
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/Makefile.am?cvsroot=gnash&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/asspec/Makefile.am?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3957
retrieving revision 1.3958
diff -u -b -r1.3957 -r1.3958
--- ChangeLog	6 Aug 2007 21:08:45 -0000	1.3957
+++ ChangeLog	6 Aug 2007 21:47:01 -0000	1.3958
@@ -1,5 +1,8 @@
 2007-08-06 Sandro Santilli <strk@keybit.net>
 
+	* doc/C/Makefile.am, doc/C/asspec/Makefile.am: don't list entities
+	  twice for distribution (fixed make uninstall for the most part,
+	  needs some other tweak for png files)
 	* testsuite/actionscript.all/toString_valueOf.as: fix some
 	  of the tests, disable a test depending on timezone. Please
 	  further tests on Date go to the Date.as file.

Index: doc/C/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/doc/C/Makefile.am,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- doc/C/Makefile.am	1 Jul 2007 10:53:57 -0000	1.39
+++ doc/C/Makefile.am	6 Aug 2007 21:47:02 -0000	1.40
@@ -106,7 +106,7 @@
 	logging.xml	\
 	$(NULL)
 
-xml_files = $(entities) $(docname).xml actionscript.xml
+xml_files = $(docname).xml actionscript.xml
 
 #noinst_SCRIPT = gen-doc.sh
 dist_man_MANS = gnash.1
@@ -116,13 +116,14 @@
 man:  gnash.1 
 texi: gnash.texi actionscript.texi
 info: gnash.info actionscript.info
-gnash.pdf gnash.html gnash.texi: $(xml_files)
+gnash.pdf gnash.html gnash.texi: $(xml_files) $(entities)
 actionscript.pdf actionscript.html actionscript.texi: actionscript.xml actionscript/main.xml actionscript/as_value.xml actionscript/new_as_class.xml
 
 SUFFIXES = .xml .html .texi .pdf .info .1 .fo
 
 EXTRA_DIST = \
 	$(xml_files) \
+	$(entities) \
 	$(omffile) \
 	gnash.texi \
 	actionscript.texi \
@@ -225,3 +226,6 @@
 uninstall-info-hook:
 	$(RM) $(DESTDIR)$(infodir)/gnash.info
 
+#app-dist-hook:
+
+#dist-hook: app-dist-hook

Index: doc/C/asspec/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/doc/C/asspec/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- doc/C/asspec/Makefile.am	1 Jul 2007 10:53:57 -0000	1.4
+++ doc/C/asspec/Makefile.am	6 Aug 2007 21:47:02 -0000	1.5
@@ -62,19 +62,20 @@
 	xmlnode.xml \
 	xmlsocket.xml
 
-xml_files = $(entities) $(docname).xml
+xml_files = $(docname).xml
 
 html: asspec.html
 pdf:  asspec.pdf
 man:  asspec.1 
 texi: asspec.texi
 info: asspec.info
-asspec.pdf asspec.html asspec.texi: $(xml_files)
+asspec.pdf asspec.html asspec.texi: $(xml_files) $(entities)
 
 SUFFIXES = .xml .html .texi .pdf .info .1 .fo
 
 EXTRA_DIST = \
 	$(xml_files) \
+	$(entities) \
 	$(omffile) \
 	asspec.texi \
 	asspec.info \
@@ -172,3 +173,6 @@
 uninstall-info-hook:
 	$(RM) $(DESTDIR)$(infodir)/asspec.info
 
+#app-dist-hook:
+
+#dist-hook: app-dist-hook



From MAILER-DAEMON Mon Aug 06 20:58:32 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IIDP6-0002e2-Ni
	for mharc-gnash-commit@gnu.org; Mon, 06 Aug 2007 20:58:32 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IIDP4-0002cg-KW
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 20:58:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IIDP1-0002Ys-4Z
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 20:58:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IIDP0-0002Yp-Vf
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 20:58:27 -0400
Received: from rv-out-0910.google.com ([209.85.198.189])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1IIDOy-0002wa-MJ
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 20:58:25 -0400
Received: by rv-out-0910.google.com with SMTP id c27so1097485rvf
	for <gnash-commit@gnu.org>; Mon, 06 Aug 2007 17:58:01 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=YPkdsN6OC889HmnhZCjvjLVEo5XneoIp2O6YD0Bz26b6cFSZJSjKss3yEyuZ6B8p2GfRPA6Yn1iuXdkEBDXb+UOmDFk+RQDhWBA+rvaN1OVdSkAtXWCQs3JMSOWXhO1R47LVpuzyHNBGnNlR2t1KOarSFEmEyNzowE1U9dn18og=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=RXiSK/TvrC1Y5bYRLVnfztsTnclcb+/U2qVo08fcaOhE3rCunoxuXu+Lsp7ckiVoQ8XIH3o06DxlvTW68td+BdtH5o+1ZMbzLJq6L43QsDBo77jUXtFlm05NeXvbPt506/P3jTAWqWxiS+Ojn/rC/QCN78t2jPy9QBIQsOOC3AA=
Received: by 10.114.81.1 with SMTP id e1mr6174806wab.1186448280202;
	Mon, 06 Aug 2007 17:58:00 -0700 (PDT)
Received: by 10.114.110.5 with HTTP; Mon, 6 Aug 2007 17:57:55 -0700 (PDT)
Message-ID: <ca4b43ff0708061757i1f754037oe08ec29f5b4fd7b5@mail.gmail.com>
Date: Tue, 7 Aug 2007 08:57:55 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "Udo Giacomozzi" <udo.gnu@nova-sys.net>, strk <strk@keybit.net>
Subject: Re: [Gnash-commit] gnash/testsuite/actionscript.all ops.as
In-Reply-To: <20070806190612.GA21191@keybit.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1IHxCR-0003uA-2l@cvs.savannah.gnu.org>
	<20070806144052.GA16176@keybit.net>
	<16693397.20070806170017@nova-sys.net>
	<20070806170059.GA16893@keybit.net>
	<20070806190612.GA21191@keybit.net>
X-Detected-Kernel: Linux 2.6 (newer, 2)
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Aug 2007 00:58:30 -0000

I tried your attached file and got a the following message:

FAILED: expected: -65536 obtained: 1
[/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/ops.as:393]


On 8/7/07, strk <strk@keybit.net> wrote:
> Mmm.. I just tried the online version at
>  http://gnash.lulu.com/testcases/v5/ops-v5.swf
>
> And get no failures !
> So this seems to be a difference in Ming !
>
> I attach my own SWF for testing it with the pp.
> It requires 'Dejagnu.swf' to be available one directory below the
> one you run it from.
>
> --strk;
>
> On Mon, Aug 06, 2007 at 07:00:59PM +0200, strk wrote:
> > On Mon, Aug 06, 2007 at 05:00:17PM +0200, Udo Giacomozzi wrote:
> > > Hello strk,
> > >
> > > Monday, August 6, 2007, 4:40:52 PM, you wrote:
> > > s> Gnash seems correct in returning -2147483648, doesn't it ?
> > >
> > > Note:
> > >
> > > x = 0xffffffff;
> > > trace(x); // 4294967295
> > >
> > > y = x << 0;
> > > trace(y); // -1
> >
> > tried << 1,2,3,4 also ?
> >
> > --strk;
> >
> >
> > _______________________________________________
> > Gnash-commit mailing list
> > Gnash-commit@gnu.org
> > http://lists.gnu.org/mailman/listinfo/gnash-commit
>
> --
>
>  ()   ASCII Ribbon Campaign
>  /\   Keep it simple!
>
>
>



From MAILER-DAEMON Mon Aug 06 21:11:15 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IIDbP-0006MN-GY
	for mharc-gnash-commit@gnu.org; Mon, 06 Aug 2007 21:11:15 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IIDbO-0006MG-DD
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 21:11:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IIDbM-0006M4-PM
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 21:11:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IIDbM-0006M1-Jk
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 21:11:12 -0400
Received: from wa-out-1112.google.com ([209.85.146.177])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1IIDbK-0005CJ-NS
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 21:11:11 -0400
Received: by wa-out-1112.google.com with SMTP id k34so1933595wah
	for <gnash-commit@gnu.org>; Mon, 06 Aug 2007 18:10:51 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=YDP07d/bn6dzjDXmpXSuUVEjlQGp0ULLtd4DvlQMayePOrBmrb4XVm1eQ4zZiGJVgLG6agq7srgphsPAR8YpK8fOJkNtNWLLfe5AtQ+w42Mp2BoGppD9nHtlzLSOcGL2KXD36XHAo/s9n34Fs0cq333Ev3EFr272NmNg9ee8J5Y=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=IPFjxcblJAkenanWq+Ji2TTjr0AZ1oDXGwTb/i6LZqPrKOQeRvy9EJcnJ3pf4I9LEkfP3Vhqvdrk1QH4qXG/qYxnpjxnge/ALRVRBFqU4gbIGlNKFRAW1Jqi3ht6j9S9jPTJKcDHT/sKPrfTYlo0judK57HMgMLgMPS5poNQBr0=
Received: by 10.114.173.15 with SMTP id v15mr6204463wae.1186449051096;
	Mon, 06 Aug 2007 18:10:51 -0700 (PDT)
Received: by 10.114.110.5 with HTTP; Mon, 6 Aug 2007 18:10:51 -0700 (PDT)
Message-ID: <ca4b43ff0708061810j7960419dn19eae4850dfa85e7@mail.gmail.com>
Date: Tue, 7 Aug 2007 09:10:51 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "Udo Giacomozzi" <udo.gnu@nova-sys.net>, strk <strk@keybit.net>
Subject: Re: [Gnash-commit] gnash/testsuite/actionscript.all ops.as
In-Reply-To: <20070806193353.GB21191@keybit.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1IHxCR-0003uA-2l@cvs.savannah.gnu.org>
	<20070806144052.GA16176@keybit.net>
	<16693397.20070806170017@nova-sys.net>
	<20070806170059.GA16893@keybit.net>
	<20070806190612.GA21191@keybit.net>
	<20070806193353.GB21191@keybit.net>
X-Detected-Kernel: Linux 2.6 (newer, 2)
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Aug 2007 01:11:14 -0000

I don't care what are the internal conversions that Ming has made.

x = 0xffffffff;
x = x << 16;
trace(x); // should output -1, no mater on a 32bit or 64bit system.
shouldn't it?

So if Ming(cvs version) give us a different result, it must be a Ming
compiler error.

BTW,

x = 4.29497e+09;
x = x << 16;
trace(x); //of course the output won't be -1.  it is 177209344 as I tested.


> This reduces to the double 4.29497e+09 being converted to -1 by the pp
> but NOT by gnash.

Em..., What do you mean?


On 8/7/07, strk <strk@keybit.net> wrote:
> I tracked the difference between the two movies down to this:
>
> My local version:
>     [000]   Constant: 75 "x"
>     [001]   Double: 4.29497e+09
>
> The version on gnashdev:
>     [000]   Constant: 75 "x"
>     [001]   Integer: -1
>
> Basically, a=0xffffffff becomes:
>
>     [001]   Integer: -1
>
> or
>
>     [001]   Double: 4.29497e+09
>
> Depending on whether automatic conversion to double is implemented in Ming we get
> two different pushes. Still, it seems the properietary player returns -65536
> when shifting both numbers 16 bits left.
>
> This reduces to the double 4.29497e+09 being converted to -1 by the pp
> but NOT by gnash.
>
> --strk;
>



From MAILER-DAEMON Mon Aug 06 22:24:14 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IIEk2-0002Bi-7n
	for mharc-gnash-commit@gnu.org; Mon, 06 Aug 2007 22:24:14 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IIEk1-0002Bb-2g
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 22:24:13 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IIEjw-0002B6-Km
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 22:24:11 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IIEjw-0002B3-Ez
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 22:24:08 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1IIEjt-0008VX-GS
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 22:24:07 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l772Nc430771;
	Tue, 7 Aug 2007 04:23:38 +0200 (CEST) (envelope-from strk@keybit.net)
Date: Tue, 7 Aug 2007 04:23:38 +0200
From: strk <strk@keybit.net>
To: zou lunkai <zoulunkai@gmail.com>
Subject: Re: [Gnash-commit] gnash/testsuite/actionscript.all ops.as
Message-ID: <20070807022338.GA23821@keybit.net>
Mail-Followup-To: zou lunkai <zoulunkai@gmail.com>,
	Udo Giacomozzi <udo.gnu@nova-sys.net>, gnash-commit@gnu.org
References: <E1IHxCR-0003uA-2l@cvs.savannah.gnu.org>
	<20070806144052.GA16176@keybit.net>
	<16693397.20070806170017@nova-sys.net>
	<20070806170059.GA16893@keybit.net>
	<20070806190612.GA21191@keybit.net>
	<20070806193353.GB21191@keybit.net>
	<ca4b43ff0708061810j7960419dn19eae4850dfa85e7@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <ca4b43ff0708061810j7960419dn19eae4850dfa85e7@mail.gmail.com>
X-Detected-Kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Aug 2007 02:24:13 -0000

On Tue, Aug 07, 2007 at 09:10:51AM +0800, zou lunkai wrote:

> > This reduces to the double 4.29497e+09 being converted to -1 by the pp
> > but NOT by gnash.
> 
> Em..., What do you mean?

I mean that 4.29497e+09|0 should evaluate to -1.
It now does (after adding the as_value::to_int() method)

--strk;



From MAILER-DAEMON Mon Aug 06 22:49:31 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IIF8V-0008LC-Ib
	for mharc-gnash-commit@gnu.org; Mon, 06 Aug 2007 22:49:31 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IIF8T-0008JN-Ur
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 22:49:29 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IIF8R-0008IA-NL
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 22:49:29 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IIF8R-0008Hw-In
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 22:49:27 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IIF8O-00041A-V3
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 22:49:26 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IIF7y-0005DI-Ox
	for gnash-commit@gnu.org; Tue, 07 Aug 2007 02:48:58 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IIF7y-0005DF-LS
	for gnash-commit@gnu.org; Tue, 07 Aug 2007 02:48:58 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IIF7y-0005DF-LS@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 07 Aug 2007 02:48:58 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog doc/xmldocs.make
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Aug 2007 02:49:30 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/07 02:48:58

Modified files:
	.              : ChangeLog 
	doc            : xmldocs.make 

Log message:
	        * doc/xmldocs.make: fix uninstall rule to properly remove images
	          of the manual.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3958&r2=1.3959
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/xmldocs.make?cvsroot=gnash&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3958
retrieving revision 1.3959
diff -u -b -r1.3958 -r1.3959
--- ChangeLog	6 Aug 2007 21:47:01 -0000	1.3958
+++ ChangeLog	7 Aug 2007 02:48:57 -0000	1.3959
@@ -1,5 +1,7 @@
 2007-08-06 Sandro Santilli <strk@keybit.net>
 
+	* doc/xmldocs.make: fix uninstall rule to properly remove images
+	  of the manual.
 	* doc/C/Makefile.am, doc/C/asspec/Makefile.am: don't list entities
 	  twice for distribution (fixed make uninstall for the most part,
 	  needs some other tweak for png files)

Index: doc/xmldocs.make
===================================================================
RCS file: /sources/gnash/gnash/doc/xmldocs.make,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- doc/xmldocs.make	23 Apr 2006 02:51:44 -0000	1.7
+++ doc/xmldocs.make	7 Aug 2007 02:48:58 -0000	1.8
@@ -13,7 +13,7 @@
 #     4) Figures must go under $(figdir)/ and be in PNG format
 #     5) You should only have one document per directory 
 #     6) Note that the figure directory, $(figdir)/, should not have its
-#        own Ma fdl-appendix.xmlkefile since this Makefile installs those figures.
+#        own Makefile since this Makefile installs those figures.
 #
 # example Makefile.am:
 #   figdir = figures
@@ -85,7 +85,7 @@
 	-if test "$(figdir)"; then \
 	  for file in $(srcdir)/$(figdir)/*.png; do \
 	    basefile=`echo $$file | sed -e  's,^.*/,,'`; \
-	    rm -f $(DESTDIR)/$(figdir)/$$basefile; \
+	    rm -f $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \
 	  done; \
 	  rmdir $(DESTDIR)$(docdir)/$(figdir); \
 	fi



From MAILER-DAEMON Mon Aug 06 23:32:42 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IIFoI-0003AZ-BE
	for mharc-gnash-commit@gnu.org; Mon, 06 Aug 2007 23:32:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IIFoG-00039s-SA
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 23:32:40 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IIFoF-00039S-UG
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 23:32:40 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IIFoF-00039P-OC
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 23:32:39 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IIFo8-0002Ll-Vi
	for gnash-commit@gnu.org; Mon, 06 Aug 2007 23:32:33 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IIFnx-0007TT-RV
	for gnash-commit@gnu.org; Tue, 07 Aug 2007 03:32:21 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IIFnx-0007TQ-KG
	for gnash-commit@gnu.org; Tue, 07 Aug 2007 03:32:21 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IIFnx-0007TQ-KG@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Tue, 07 Aug 2007 03:32:21 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/testsuite/actionscript.all ops.as
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Aug 2007 03:32:41 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/07 03:32:21

Modified files:
	testsuite/actionscript.all: ops.as 

Log message:
	* testsuite/actionscript.all/ops.as: two more tests, both  passed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/ops.as?cvsroot=gnash&r1=1.13&r2=1.14

Patches:
Index: ops.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/ops.as,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- ops.as	6 Aug 2007 19:30:47 -0000	1.13
+++ ops.as	7 Aug 2007 03:32:21 -0000	1.14
@@ -20,7 +20,7 @@
  *  Test binary predicates (equal, less_then, greater_then, logical and bitwise ops)
  */
 
-rcsid="$Id: ops.as,v 1.13 2007/08/06 19:30:47 strk Exp $";
+rcsid="$Id: ops.as,v 1.14 2007/08/07 03:32:21 zoulunkai Exp $";
 
 #include "check.as"
 
@@ -401,6 +401,14 @@
 y = x << 16;
 check_equals(y, -65536);
 
+x = 4.294967295e+09;
+y = x << 16;
+check_equals(y, -65536);
+
+x = 4.29497e+09;
+y = x << 16;
+check_equals(y, 177209344);
+
 x = 1.9;
 y = x << 2;
 check_equals(y, 4);



From MAILER-DAEMON Tue Aug 07 03:25:43 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IIJRn-0005cP-Em
	for mharc-gnash-commit@gnu.org; Tue, 07 Aug 2007 03:25:43 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IIJRk-0005bK-VG
	for gnash-commit@gnu.org; Tue, 07 Aug 2007 03:25:41 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IIJRi-0005ZS-1C
	for gnash-commit@gnu.org; Tue, 07 Aug 2007 03:25:40 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IIJRh-0005ZI-Se
	for gnash-commit@gnu.org; Tue, 07 Aug 2007 03:25:37 -0400
Received: from mx20.gnu.org ([199.232.41.8])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1IIJRf-0000CV-LH
	for gnash-commit@gnu.org; Tue, 07 Aug 2007 03:25:36 -0400
Received: from server2.indunet.it ([217.70.144.109])
	by mx20.gnu.org with esmtp (Exim 4.60)
	(envelope-from <udo.gnu@nova-sys.net>) id 1IIJRT-00015c-Id
	for gnash-commit@gnu.org; Tue, 07 Aug 2007 03:25:23 -0400
Received: from UDO-LAPTOP (sadsl-246098.rol.raiffeisen.net [195.254.246.98])
	(authenticated bits=0)
	by server2.indunet.it (8.12.8/8.12.5) with ESMTP id l777PFU4007972;
	Tue, 7 Aug 2007 09:25:17 +0200
Date: Tue, 7 Aug 2007 09:25:12 +0200
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
X-Mailer: The Bat! (v3.99.3) Professional
Organization: NOVASYS
X-Priority: 3 (Normal)
Message-ID: <1032697474.20070807092512@nova-sys.net>
To: "zou lunkai" <zoulunkai@gmail.com>
Subject: Re[2]: [Gnash-commit] gnash/testsuite/actionscript.all ops.as
In-Reply-To: <ca4b43ff0708061810j7960419dn19eae4850dfa85e7@mail.gmail.com>
References: <E1IHxCR-0003uA-2l@cvs.savannah.gnu.org>
	<20070806144052.GA16176@keybit.net>
	<16693397.20070806170017@nova-sys.net>
	<20070806170059.GA16893@keybit.net>
	<20070806190612.GA21191@keybit.net>
	<20070806193353.GB21191@keybit.net>
	<ca4b43ff0708061810j7960419dn19eae4850dfa85e7@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
X-detected-kernel: Linux 2.4-2.6
X-Detected-Kernel: Linux 2.6, seldom 2.4 (older, 4)
Cc: strk <strk@keybit.net>, gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Udo Giacomozzi <udo.gnu@nova-sys.net>
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Aug 2007 07:25:41 -0000

Hello zou,

Tuesday, August 7, 2007, 3:10:51 AM, you wrote:
zl> x = 0xffffffff;
zl> x = x << 16;
zl> trace(x); // should output -1, no mater on a 32bit or 64bit system.
zl> shouldn't it?

Why -1 ? You are shifting 16 bits.


Monday, August 6, 2007, 9:33:53 PM, strk wrote:
s>Still, it seems the properietary player returns -65536
s> when shifting both numbers 16 bits left.

Isn't that as expected?

Apparently the PP is using 32 bits signed integer internally when
shifting.

0xFFFFFFFF == 2^32-1 for unsigned int == -1 for signed int

0xFFFFFFFF << 1  == 0xFFFFFFFE == -2
0xFFFFFFFF << 2  == 0xFFFFFFFC == -4
0xFFFFFFFF << 16 == 0xFFFF0000 == -65536

and so on.

Or am I missing something?

Udo




From MAILER-DAEMON Tue Aug 07 04:45:15 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IIKgl-00062h-FI
	for mharc-gnash-commit@gnu.org; Tue, 07 Aug 2007 04:45:15 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IIKgk-00062O-4i
	for gnash-commit@gnu.org; Tue, 07 Aug 2007 04:45:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IIKgi-00062B-Kf
	for gnash-commit@gnu.org; Tue, 07 Aug 2007 04:45:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IIKgi-000628-Hm
	for gnash-commit@gnu.org; Tue, 07 Aug 2007 04:45:12 -0400
Received: from wa-out-1112.google.com ([209.85.146.179])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1IIKgg-0001Bl-UW
	for gnash-commit@gnu.org; Tue, 07 Aug 2007 04:45:11 -0400
Received: by wa-out-1112.google.com with SMTP id k34so2036193wah
	for <gnash-commit@gnu.org>; Tue, 07 Aug 2007 01:44:50 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=gQA/jUAx2DaBBGVCBYkS0y3WUlrdWALHhFQIZH+9Ry2pXjKco3QgprElEhEBqagEbt3RpVNHkfqWG9bPte9MyHooeqeJVjbbvp4LwCvxDSQYAqO/qLGe2T51T6x8ZmpF09LY6/jcbj9CdWGd1a+dCDkpCeEYXJoUEoinipeUde4=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=qRdBdLTExqSc9k4hN4fm2MwE6bn1Vt05kBIndwajPcNpx9tCn4iaDeCPes2jqtGFxRZQn8IT0asy1pot636J23C7fvS3Tzk021kNGpXKNfI+FkAYZ4KRLusAgoxXCV4L+10dX9M1c9Jl1u3dstqCBE1xpNrUy0AeY1zY37gF2ro=
Received: by 10.115.33.1 with SMTP id l1mr6525819waj.1186476290140;
	Tue, 07 Aug 2007 01:44:50 -0700 (PDT)
Received: by 10.114.110.5 with HTTP; Tue, 7 Aug 2007 01:44:50 -0700 (PDT)
Message-ID: <ca4b43ff0708070144m569bc5d7qbabd4822bc204333@mail.gmail.com>
Date: Tue, 7 Aug 2007 16:44:50 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "Udo Giacomozzi" <udo.gnu@nova-sys.net>
Subject: Re: Re[2]: [Gnash-commit] gnash/testsuite/actionscript.all ops.as
In-Reply-To: <1032697474.20070807092512@nova-sys.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1IHxCR-0003uA-2l@cvs.savannah.gnu.org>
	<20070806144052.GA16176@keybit.net>
	<16693397.20070806170017@nova-sys.net>
	<20070806170059.GA16893@keybit.net>
	<20070806190612.GA21191@keybit.net>
	<20070806193353.GB21191@keybit.net>
	<ca4b43ff0708061810j7960419dn19eae4850dfa85e7@mail.gmail.com>
	<1032697474.20070807092512@nova-sys.net>
X-Detected-Kernel: Linux 2.6 (newer, 2)
Cc: gnash-commit@gnu.org, strk <strk@keybit.net>
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Aug 2007 08:45:14 -0000

On 8/7/07, Udo Giacomozzi <udo.gnu@nova-sys.net> wrote:
> Hello zou,
>
> Tuesday, August 7, 2007, 3:10:51 AM, you wrote:
> zl> x = 0xffffffff;
> zl> x = x << 16;
> zl> trace(x); // should output -1, no mater on a 32bit or 64bit system.
> zl> shouldn't it?
>
> Why -1 ? You are shifting 16 bits.
>
ops, sorry, it was my mistake.  It should ouput -65536.

(0xffffffff << 16) == ( -1 << 16) == (-65536)

strk found that 0xffffffff was compiled to 4.29497e+09 instead of an
integral  with Ming cvs-head. I uses an older version of Ming, and
after compile 0xffffffff is still an integral. What I intended to mean
was that no matter 0xffffffff being compiled as an integral or a
floating number, the final results should expected to be the
same(-65536). Otherwise, it is a compiler error.

eg.
x = -1;
y = x << 16;
check_equals(y, -65536);

x = 4.294967295e+09;
y = x << 16;
check_equals(y, -65536);

>
> Monday, August 6, 2007, 9:33:53 PM, strk wrote:
> s>Still, it seems the properietary player returns -65536
> s> when shifting both numbers 16 bits left.
>
> Isn't that as expected?
>
> Apparently the PP is using 32 bits signed integer internally when
> shifting.
>
> 0xFFFFFFFF == 2^32-1 for unsigned int == -1 for signed int
>
> 0xFFFFFFFF << 1  == 0xFFFFFFFE == -2
> 0xFFFFFFFF << 2  == 0xFFFFFFFC == -4
> 0xFFFFFFFF << 16 == 0xFFFF0000 == -65536
>
> and so on.
>
> Or am I missing something?
>
yes, you are right. All the results are expected.



From MAILER-DAEMON Tue Aug 07 12:28:29 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IIRv3-0007HX-LF
	for mharc-gnash-commit@gnu.org; Tue, 07 Aug 2007 12:28:29 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IIRv1-0007H9-Hd
	for gnash-commit@gnu.org; Tue, 07 Aug 2007 12:28:27 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IIRuz-0007GT-DF
	for gnash-commit@gnu.org; Tue, 07 Aug 2007 12:28:27 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IIRuz-0007GO-AO
	for gnash-commit@gnu.org; Tue, 07 Aug 2007 12:28:25 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <tomasgroth@yahoo.dk>) id 1IIRux-0003Dc-9d
	for gnash-commit@gnu.org; Tue, 07 Aug 2007 12:28:24 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <tomasgroth@yahoo.dk>) id 1IIRuD-0007yj-V3
	for gnash-commit@gnu.org; Tue, 07 Aug 2007 16:27:38 +0000
Received: from tgc by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <tgc@savannah.gnu.org>) id 1IIRuD-0007yg-Q9
	for gnash-commit@gnu.org; Tue, 07 Aug 2007 16:27:37 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IIRuD-0007yg-Q9@cvs.savannah.gnu.org>
From: Tomas Groth <tomasgroth@yahoo.dk>
Date: Tue, 07 Aug 2007 16:27:37 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog backend/sound_handler_gst.cpp b...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Aug 2007 16:28:28 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Tomas Groth <tgc>	07/08/07 16:27:37

Modified files:
	.              : ChangeLog 
	backend        : sound_handler_gst.cpp sound_handler_sdl.cpp 

Log message:
		* backend/sound_handler_gst.cpp: Fix returns from getPosition
		  (patch #6140), and fix a segfault when asking for position
		  before sound has been started (patch #6138).
		* backend/sound_handler_sdl.cpp: Fix returns from getPosition
		  (patch #6140).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3959&r2=1.3960
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_gst.cpp?cvsroot=gnash&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_sdl.cpp?cvsroot=gnash&r1=1.76&r2=1.77

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3959
retrieving revision 1.3960
diff -u -b -r1.3959 -r1.3960
--- ChangeLog	7 Aug 2007 02:48:57 -0000	1.3959
+++ ChangeLog	7 Aug 2007 16:27:36 -0000	1.3960
@@ -1,3 +1,11 @@
+2007-08-07 Sergio Costas <raster (at) rastersoft.com>
+
+	* backend/sound_handler_gst.cpp: Fix returns from getPosition
+	  (patch #6140), and fix a segfault when asking for position
+	  before sound has been started (patch #6138).
+	* backend/sound_handler_sdl.cpp: Fix returns from getPosition
+	  (patch #6140).
+
 2007-08-06 Sandro Santilli <strk@keybit.net>
 
 	* doc/xmldocs.make: fix uninstall rule to properly remove images

Index: backend/sound_handler_gst.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_gst.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- backend/sound_handler_gst.cpp	1 Aug 2007 10:09:23 -0000	1.57
+++ backend/sound_handler_gst.cpp	7 Aug 2007 16:27:37 -0000	1.58
@@ -20,7 +20,7 @@
 // Based on sound_handler_sdl.cpp by Thatcher Ulrich http://tulrich.com 2003
 // which has been donated to the Public Domain.
 
-/* $Id: sound_handler_gst.cpp,v 1.57 2007/08/01 10:09:23 tgc Exp $ */
+/* $Id: sound_handler_gst.cpp,v 1.58 2007/08/07 16:27:37 tgc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -630,7 +630,8 @@
 
 	// Return the sound duration in milliseconds
 	if (sounddata->sample_count > 0 && sounddata->sample_rate > 0) {
-		unsigned int ret = sounddata->sample_count / sounddata->sample_rate * 100;
+		unsigned int ret = sounddata->sample_count / sounddata->sample_rate * 1000;
+		ret += ((sounddata->sample_count % sounddata->sample_rate) * 1000) / sounddata->sample_rate;
 		if (sounddata->stereo) ret = ret / 2;
 		return ret;
 	} else {
@@ -651,6 +652,11 @@
 
 	sound_data* sounddata = m_sound_data[sound_handle];
 
+	// If there is no active sounds, return 0
+	if (sounddata->m_gst_elements.size() == 0) {
+		return 0;
+	}
+
 	// return the position of the last element added
 	GstElement *pipeline,*audioconvert;
 	GstStateChangeReturn ret;

Index: backend/sound_handler_sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_sdl.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- backend/sound_handler_sdl.cpp	27 Jul 2007 15:09:41 -0000	1.76
+++ backend/sound_handler_sdl.cpp	7 Aug 2007 16:27:37 -0000	1.77
@@ -18,7 +18,7 @@
 // Based on sound_handler_sdl.cpp by Thatcher Ulrich http://tulrich.com 2003
 // which has been donated to the Public Domain.
 
-// $Id: sound_handler_sdl.cpp,v 1.76 2007/07/27 15:09:41 tgc Exp $
+// $Id: sound_handler_sdl.cpp,v 1.77 2007/08/07 16:27:37 tgc Exp $
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -550,7 +550,8 @@
 
 	// Return the sound duration in milliseconds
 	if (sounddata->sample_count > 0 && sounddata->sample_rate > 0) {
-		unsigned int ret = sounddata->sample_count / sounddata->sample_rate * 100;
+		unsigned int ret = sounddata->sample_count / sounddata->sample_rate * 1000;
+		ret += ((sounddata->sample_count % sounddata->sample_rate) * 1000) / sounddata->sample_rate;
 		if (sounddata->stereo) ret = ret / 2;
 		return ret;
 	} else {
@@ -579,6 +580,7 @@
 
 	// Return the playhead position in milliseconds
 	unsigned int ret = asound->samples_played / sounddata->sample_rate * 100;
+	ret += ((asound->samples_played % sounddata->sample_rate) * 100) / sounddata->sample_rate;
 	if (sounddata->stereo) ret = ret / 2;
 	return ret;
 }



From MAILER-DAEMON Tue Aug 07 16:53:53 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IIW3t-0004Sm-R9
	for mharc-gnash-commit@gnu.org; Tue, 07 Aug 2007 16:53:53 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IIW3s-0004SR-6T
	for gnash-commit@gnu.org; Tue, 07 Aug 2007 16:53:52 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IIW3o-0004RG-KZ
	for gnash-commit@gnu.org; Tue, 07 Aug 2007 16:53:51 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IIW3o-0004RD-8v
	for gnash-commit@gnu.org; Tue, 07 Aug 2007 16:53:48 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IIW3f-0000Ht-9n
	for gnash-commit@gnu.org; Tue, 07 Aug 2007 16:53:42 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IIW3D-0000oa-Ef
	for gnash-commit@gnu.org; Tue, 07 Aug 2007 20:53:11 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IIW3D-0000oX-9f
	for gnash-commit@gnu.org; Tue, 07 Aug 2007 20:53:11 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IIW3D-0000oX-9f@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 07 Aug 2007 20:53:11 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog Makefile.am libbase/jpeg.cpp li...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Aug 2007 20:53:52 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/07 20:53:11

Modified files:
	.              : ChangeLog Makefile.am 
	libbase        : jpeg.cpp zlib_adapter.cpp 
	server         : fill_style.cpp fill_style.h matrix.cpp 
	                 movie_instance.cpp rect.cpp sprite_instance.cpp 
	                 stream.h styles.cpp styles.h types.cpp types.h 
	server/parser  : action_buffer.cpp morph2_character_def.cpp 
	                 morph2_character_def.h shape_character_def.cpp 

Log message:
	        * server/sprite_instance.cpp (processCompletedLoadVariableRequest):
	          fix attempt to increment past-the-end iterator.
	        * libbase/zlib_adaptar.cpp: don't hang on corrupted input.
	        * libbase/jpeg.{cpp,h}: don't segfault on corrupted input.
	        * server/matrix.cpp (read): add TODO item (check input)
	        * server/rect.cpp (read): add TODO item (check input)
	        * server/movie_instance.cpp (advance): warn only once about movie
	          containing no frames.
	        * server/parser/morph2_character_def.{cpp,h} (read): document,
	          don't read past end of tag.
	        * server/stream.h (read_variable_count): document and add
	          integrity checks. Add a GNASH_TRUST_SWF macro to turn ensureBytes
	          to a no-op.
	        * server/parser/shape_character_def.cpp (read_fill_styles,
	          read_line_styles, read): don't read past end of tag. Don't try to
	          recover if an exception is thrown by fill style parser.
	        * server/styles.{cpp,h} (line_style::read): don't read past end of tag.
	        * server/fill_style.{cpp,h} (read): don't read past end of tag.
	        * server/types.{cpp,h} (rgba::read_rgba, rgbe::read): don't read past end
	          of tag.
	        * server/parser/action_buffer.cpp (read): don't read past end of tag.
	        * Makefile.am: don't list 'doc' twice in subdirs. Fixes 'distclean'
	          rule.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3960&r2=1.3961
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.86&r2=1.87
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/jpeg.cpp?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/zlib_adapter.cpp?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/server/fill_style.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/server/fill_style.h?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/matrix.cpp?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_instance.cpp?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/server/rect.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.303&r2=1.304
http://cvs.savannah.gnu.org/viewcvs/gnash/server/stream.h?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/server/styles.cpp?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/server/styles.h?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/server/types.cpp?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/server/types.h?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/action_buffer.cpp?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/morph2_character_def.cpp?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/morph2_character_def.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/shape_character_def.cpp?cvsroot=gnash&r1=1.31&r2=1.32

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3960
retrieving revision 1.3961
diff -u -b -r1.3960 -r1.3961
--- ChangeLog	7 Aug 2007 16:27:36 -0000	1.3960
+++ ChangeLog	7 Aug 2007 20:53:09 -0000	1.3961
@@ -1,3 +1,29 @@
+2007-08-07 Sandro Santilli <strk@keybit.net>
+
+	* server/sprite_instance.cpp (processCompletedLoadVariableRequest):
+	  fix attempt to increment past-the-end iterator.
+	* libbase/zlib_adaptar.cpp: don't hang on corrupted input.
+	* libbase/jpeg.{cpp,h}: don't segfault on corrupted input.
+	* server/matrix.cpp (read): add TODO item (check input)
+	* server/rect.cpp (read): add TODO item (check input)
+	* server/movie_instance.cpp (advance): warn only once about movie
+	  containing no frames.
+	* server/parser/morph2_character_def.{cpp,h} (read): document,
+	  don't read past end of tag.
+	* server/stream.h (read_variable_count): document and add
+	  integrity checks. Add a GNASH_TRUST_SWF macro to turn ensureBytes
+	  to a no-op.
+	* server/parser/shape_character_def.cpp (read_fill_styles,
+	  read_line_styles, read): don't read past end of tag. Don't try to
+	  recover if an exception is thrown by fill style parser.
+	* server/styles.{cpp,h} (line_style::read): don't read past end of tag.
+	* server/fill_style.{cpp,h} (read): don't read past end of tag.
+	* server/types.{cpp,h} (rgba::read_rgba, rgbe::read): don't read past end
+	  of tag.
+	* server/parser/action_buffer.cpp (read): don't read past end of tag.
+	* Makefile.am: don't list 'doc' twice in subdirs. Fixes 'distclean'
+	  rule.
+
 2007-08-07 Sergio Costas <raster (at) rastersoft.com>
 
 	* backend/sound_handler_gst.cpp: Fix returns from getPosition

Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- Makefile.am	3 Aug 2007 19:27:29 -0000	1.86
+++ Makefile.am	7 Aug 2007 20:53:09 -0000	1.87
@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # 
 
-# $Id: Makefile.am,v 1.86 2007/08/03 19:27:29 strk Exp $
+# $Id: Makefile.am,v 1.87 2007/08/07 20:53:09 strk Exp $
 
 ## Process this file with automake to produce Makefile.in
 AUTOMAKE_OPTIONS = 1.6.0
@@ -34,7 +34,6 @@
 	plugin \
 	testsuite \
 	po \
-	doc \
 	$(NULL)
 
 if CYGNAL

Index: libbase/jpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/jpeg.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- libbase/jpeg.cpp	15 May 2007 13:26:47 -0000	1.16
+++ libbase/jpeg.cpp	7 Aug 2007 20:53:09 -0000	1.17
@@ -11,6 +11,7 @@
 #include "jpeg.h"
 #include "tu_file.h"
 #include "log.h"
+#include "GnashException.h"
 
 #include <cstdio>
 
@@ -270,12 +271,7 @@
 
 
 	// Called when jpeglib has a fatal error.
-	static void	jpeg_error_exit(j_common_ptr cinfo)
-	{
-		gnash::log_swferror("Internal jpeg error: %s", cinfo->err->jpeg_message_table[cinfo->err->msg_code]);
-		// TODO: set a flag to stop parsing !!
-	}
-
+	static void	jpeg_error_exit(j_common_ptr cinfo);
 
 	// Set up some error handlers for the jpeg lib.
 	static void	setup_jpeg_err(jpeg_error_mgr* jerr)
@@ -302,6 +298,11 @@
 
 		bool	m_compressor_opened;
 
+		/// This flag will be set to true by the error callback
+		/// invoked by jpeg lib. Will be later used to throw
+		/// a ParserException.
+		///
+		bool errorOccurred;
 
 		enum SWF_DEFINE_BITS_JPEG2 { SWF_JPEG2 };
 		enum SWF_DEFINE_BITS_JPEG2_HEADER_ONLY { SWF_JPEG2_HEADER_ONLY };
@@ -310,10 +311,12 @@
 		// prepare to read data.
 		input_impl(tu_file* in)
 			:
-			m_compressor_opened(false)
+			m_compressor_opened(false),
+			errorOccurred(false)
 		{
 			setup_jpeg_err(&m_jerr);
 			m_cinfo.err = &m_jerr;
+			m_cinfo.client_data = this;
 
 			// Initialize decompression object.
 			jpeg_create_decompress(&m_cinfo);
@@ -333,10 +336,12 @@
 		//
 		input_impl(SWF_DEFINE_BITS_JPEG2_HEADER_ONLY /* e */, tu_file* in)
 			:
-			m_compressor_opened(false)
+			m_compressor_opened(false),
+			errorOccurred(false)
 		{
 			setup_jpeg_err(&m_jerr);
 			m_cinfo.err = &m_jerr;
+			m_cinfo.client_data = this;
 
 			// Initialize decompression object.
 			jpeg_create_decompress(&m_cinfo);
@@ -393,10 +398,37 @@
 			static const int stateReady = 202;	/* found SOS, ready for start_decompress */
 			while (m_cinfo.global_state != stateReady)
 			{
-				jpeg_read_header(&m_cinfo, FALSE);
+				int ret = jpeg_read_header(&m_cinfo, FALSE);
+				switch (ret)
+				{
+					case JPEG_SUSPENDED: // suspended due to lack of data
+						throw gnash::ParserException("lack of data during JPEG header parsing");
+						//log_debug("jpeg_read_header returned JPEG_SUSPENDED");
+						break;
+					case JPEG_HEADER_OK: // Found valid image datastream
+						//log_debug("jpeg_read_header returned JPEG_HEADER_OK");
+						break;
+					case JPEG_HEADER_TABLES_ONLY: // Found valid table-specs-only datastream
+						//log_debug("jpeg_read_header returned JPEG_HEADER_TABLES_ONLY");
+						break;
+					default:
+						//log_debug("jpeg_read_header returned %d", ret);
+						break;
+				}
+			}
+
+			if ( errorOccurred )
+			{
+				throw gnash::ParserException("errors during JPEG header parsing");
 			}
 
 			jpeg_start_decompress(&m_cinfo);
+
+			if ( errorOccurred )
+			{
+				throw gnash::ParserException("errors during JPEG decompression");
+			}
+
 			m_compressor_opened = true;
 		}
 
@@ -461,6 +493,16 @@
 		}
 	};
 
+	static void	jpeg_error_exit(j_common_ptr cinfo)
+	{
+		gnash::log_swferror("Internal jpeg error: %s", cinfo->err->jpeg_message_table[cinfo->err->msg_code]);
+
+		// Set a flag to stop parsing 
+		input_impl* impl = static_cast<input_impl*>(cinfo->client_data);
+		impl->errorOccurred = true;
+	}
+
+
 
 	/*static*/
 	input*

Index: libbase/zlib_adapter.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/zlib_adapter.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- libbase/zlib_adapter.cpp	24 May 2007 23:29:36 -0000	1.16
+++ libbase/zlib_adapter.cpp	7 Aug 2007 20:53:09 -0000	1.17
@@ -11,6 +11,7 @@
 #include "tu_file.h"
 #include "utility.h"
 #include "log.h"
+#include "GnashException.h"
 
 #include <memory>
 
@@ -121,6 +122,8 @@
 
 		int	inflate_from_stream(void* dst, int bytes)
 		{
+			using gnash::ParserException;
+
 			if (m_error)
 			{
 				return 0;
@@ -160,11 +163,23 @@
 					//m_error = 1;
 					break;
 				}
+				if (err == Z_DATA_ERROR)
+				{
+					throw ParserException("Data error inflating input");
+					break;
+				}
+				if (err == Z_MEM_ERROR)
+				{
+					throw ParserException("Memory error inflating input");
+					break;
+				}
 				if (err != Z_OK)
 				{
 					// something's wrong.
-					gnash::log_error("inflater_impl::inflate_from_stream() inflate() returned %d", err);
-					m_error = 1;
+					std::stringstream ss;
+					ss << "inflater_impl::inflate_from_stream() inflate() returned " << err;
+					throw ParserException(ss.str());
+					//m_error = 1;
 					break;
 				}
 
@@ -174,6 +189,11 @@
 				}
 			}
 
+			if (m_error)
+			{
+				return 0;
+			}
+
 			int	bytes_read = bytes - m_zstream.avail_out;
 			m_logical_stream_pos += bytes_read;
 
@@ -267,6 +287,7 @@
 
 	int	inflate_seek_to_end(void* appdata)
 	{
+		GNASH_REPORT_FUNCTION;
 		inflater_impl*	inf = (inflater_impl*) appdata;
 		if (inf->m_error)
 		{

Index: server/fill_style.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/fill_style.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/fill_style.cpp	1 Jul 2007 10:54:22 -0000	1.6
+++ server/fill_style.cpp	7 Aug 2007 20:53:10 -0000	1.7
@@ -44,6 +44,7 @@
 void
 gradient_record::read(stream* in, int tag_type)
 {
+    in->ensureBytes(1);
     m_ratio = in->read_u8();
     m_color.read(in, tag_type);
 }
@@ -72,6 +73,7 @@
 void
 fill_style::read(stream* in, int tag_type, movie_definition* md)
 {
+    in->ensureBytes(1);
     m_type = in->read_u8();
 
 		IF_VERBOSE_PARSE
@@ -126,6 +128,7 @@
         m_gradient_matrix.concatenate(m);
 				
         // GRADIENT
+        in->ensureBytes(1);
         uint8_t num_gradients = in->read_u8();
         if ( ! num_gradients )
 	{
@@ -174,6 +177,7 @@
         // 0x42: tiled bitmap fill with hard edges
         // 0x43: clipped bitmap fill with hard edges
 
+        in->ensureBytes(2);
         int	bitmap_char_id = in->read_u16();
 	IF_VERBOSE_PARSE
 	(
@@ -214,10 +218,12 @@
     }
     else
     {
-        log_unimpl("Unsupported fill style type: 0x%X", m_type);
+	stringstream ss;
+	ss << "Unknown fill style type " << m_type;
+        //log_unimpl("Unsupported fill style type: 0x%X", m_type);
         // This is a fatal error, we'll be leaving the stream
         // read pointer in an unknown position.
-        throw ParserException("Unsupported fill style (Malformed SWF?)");
+        throw ParserException(ss.str()); // "Unsupported fill style (Malformed SWF?)");
     }
 }
 

Index: server/fill_style.h
===================================================================
RCS file: /sources/gnash/gnash/server/fill_style.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/fill_style.h	1 Jul 2007 10:54:22 -0000	1.7
+++ server/fill_style.h	7 Aug 2007 20:53:10 -0000	1.8
@@ -17,7 +17,7 @@
 
 // Based on work of Thatcher Ulrich <tu@tulrich.com> 2003
 
-/* $Id: fill_style.h,v 1.7 2007/07/01 10:54:22 bjacques Exp $ */
+/* $Id: fill_style.h,v 1.8 2007/08/07 20:53:10 strk Exp $ */
 
 #ifndef GNASH_FILL_STYLE_H
 #define GNASH_FILL_STYLE_H
@@ -71,6 +71,9 @@
 	//
 	/// TODO: use a subclass for this (swf_fill_style?)
 	///
+	/// Throw a ParserException if there's no enough bytes in the
+	/// currently opened tag for reading. See stream::ensureBytes()
+	///
 	void	read(stream* in, int tag_type, movie_definition* m);
 
 	/// \brief

Index: server/matrix.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/matrix.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/matrix.cpp	1 Jul 2007 10:54:23 -0000	1.16
+++ server/matrix.cpp	7 Aug 2007 20:53:10 -0000	1.17
@@ -19,7 +19,7 @@
 //
 // Original author: Thatcher Ulrich <tu@tulrich.com> 2003
 //
-// $Id: matrix.cpp,v 1.16 2007/07/01 10:54:23 bjacques Exp $ 
+// $Id: matrix.cpp,v 1.17 2007/08/07 20:53:10 strk Exp $ 
 //
 
 #ifdef HAVE_CONFIG_H
@@ -206,6 +206,9 @@
 matrix::read(stream* in)
 // Initialize from the stream.
 {
+	// TODO: compute number of bytes needed to read the matrix
+	//       and ensure their availability using stream::ensureBytes
+
 	in->align();
 
 	set_identity();

Index: server/movie_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_instance.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- server/movie_instance.cpp	1 Jul 2007 10:54:23 -0000	1.14
+++ server/movie_instance.cpp	7 Aug 2007 20:53:10 -0000	1.15
@@ -75,7 +75,11 @@
 	if ( get_frame_count() == 0 )
 	{
 		IF_VERBOSE_MALFORMED_SWF(
-		log_swferror("The movie contains NO frames!");
+		static bool warned=false;
+		if ( ! warned ) {
+			log_swferror(_("The movie with url %s has NO frames!"), m_def->get_url().c_str());
+			warned=true;
+		}
 		);
 		return;
 	}

Index: server/rect.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/rect.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/rect.cpp	1 Jul 2007 10:54:24 -0000	1.12
+++ server/rect.cpp	7 Aug 2007 20:53:10 -0000	1.13
@@ -30,6 +30,11 @@
 
 void	rect::read(stream* in)
 {
+	// TODO: find how many bytes are required to 
+	//       read the whole rect and ensure they
+	//       are available in the current tag
+	//       using in->ensureBytes(x)
+	//
 	in->align();
 	int	nbits = in->read_uint(5);
 	float xmin = (float) in->read_sint(nbits);

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -b -r1.303 -r1.304
--- server/sprite_instance.cpp	2 Aug 2007 21:23:42 -0000	1.303
+++ server/sprite_instance.cpp	7 Aug 2007 20:53:10 -0000	1.304
@@ -3851,7 +3851,7 @@
 	if ( _loadVariableRequests.empty() ) return;
 
 	for (LoadVariablesThreads::iterator it=_loadVariableRequests.begin();
-			it != _loadVariableRequests.end(); ++it)
+			it != _loadVariableRequests.end(); )
 	{
 		LoadVariablesThread& request = *(*it);
 		if ( request.completed() )
@@ -3859,6 +3859,10 @@
 			processCompletedLoadVariableRequest(request);
 			it = _loadVariableRequests.erase(it);
 		}
+		else
+		{
+			++it;
+		}
 	}
 }
 

Index: server/stream.h
===================================================================
RCS file: /sources/gnash/gnash/server/stream.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- server/stream.h	1 Aug 2007 20:28:00 -0000	1.21
+++ server/stream.h	7 Aug 2007 20:53:10 -0000	1.22
@@ -16,6 +16,17 @@
 
 #include <string>
 
+// Define the following macro if you want to want Gnash parser
+// to assume the underlying SWF is well-formed. It would make
+// parsing faster, but might result in horrible behaviour with
+// malformed SWFs (like taking up all system memory, keeping
+// CPU busy for a long long time, or simply corrupting memory)
+//
+// This might be eventually set by a --disable-swf-checks or similar
+// configure switch...
+//
+//#define GNASH_TRUST_SWF_INPUT
+
 class tu_file;
 
 namespace gnash {
@@ -49,11 +60,24 @@
 		int16_t  read_s16();
 		uint32_t read_u32();
 		int32_t  read_s32();
+
+		/// \brief
+		/// Read a length in a byte or three.
+		//
+		/// If the byte == 0xff, read the lenght in 
+		/// next two bytes.
+		//
+		/// Takes care of integrity check (ensureByte)
+		///
 		unsigned read_variable_count()
 		{
+			ensureBytes(1);
 			unsigned count = read_u8();
 			if (count == 0xFF)
+			{
+				ensureBytes(2);
 				count = read_u16();
+			}
 			return count;
 		};
 
@@ -165,12 +189,16 @@
 		/// This method should be called before any attempt to read
 		/// fields from the SWF.
 		///
+		/// NOTE: if GNASH_TRUST_SWF_INPUT is defined this function is a no-op 
+		///
 		void ensureBytes(unsigned long needed)
 		{
+#ifndef GNASH_TRUST_SWF_INPUT
 			if ( get_tag_end_position() - get_position() < needed )
 			{
 				throw ParserException("premature end of tag");
 			}
+#endif
 		}
 
 	private:

Index: server/styles.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/styles.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- server/styles.cpp	13 Feb 2007 15:19:32 -0000	1.31
+++ server/styles.cpp	7 Aug 2007 20:53:10 -0000	1.32
@@ -33,6 +33,7 @@
 void
 line_style::read(stream* in, int tag_type)
 {
+    in->ensureBytes(2);
     m_width = in->read_u16();
     m_color.read(in, tag_type);
 }

Index: server/styles.h
===================================================================
RCS file: /sources/gnash/gnash/server/styles.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/styles.h	14 Feb 2007 01:40:27 -0000	1.19
+++ server/styles.h	7 Aug 2007 20:53:10 -0000	1.20
@@ -5,7 +5,7 @@
 
 // line style types.
 
-/* $Id: styles.h,v 1.19 2007/02/14 01:40:27 strk Exp $ */
+/* $Id: styles.h,v 1.20 2007/08/07 20:53:10 strk Exp $ */
 
 #ifndef GNASH_STYLES_H
 #define GNASH_STYLES_H
@@ -54,6 +54,9 @@
 	/// Stream is assumed to be positioned at 
 	/// the right place.
 	///
+	/// Throw a ParserException if there's no enough bytes in the
+	/// currently opened tag for reading. See stream::ensureBytes()
+	///
 	void	read(stream* in, int tag_type);
 	
 	/// Return thickness of the line, in TWIPS

Index: server/types.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/types.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- server/types.cpp	23 Apr 2007 19:19:30 -0000	1.24
+++ server/types.cpp	7 Aug 2007 20:53:10 -0000	1.25
@@ -74,11 +74,13 @@
 	void	rgba::read_rgba(stream* in)
 	{
 		read_rgb(in);
+    		in->ensureBytes(1);
 		m_a = in->read_u8();
 	}
 
 	void	rgba::read_rgb(stream* in)
 	{
+    		in->ensureBytes(3);
 		m_r = in->read_u8();
 		m_g = in->read_u8();
 		m_b = in->read_u8();

Index: server/types.h
===================================================================
RCS file: /sources/gnash/gnash/server/types.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/types.h	22 Jul 2007 03:29:25 -0000	1.16
+++ server/types.h	7 Aug 2007 20:53:10 -0000	1.17
@@ -96,9 +96,16 @@
 		///	a value <= 22 makes it read RGB
 		///	and value > 22 makes it read RGBA
 		///
+		/// Throw a ParserException if there's no enough bytes in the
+		/// currently opened tag for reading. See stream::ensureBytes()
+		///
 		void	read(stream* in, int tag_type);
 
 		/// Initialize from intput stream (reads RGBA)
+		//
+		/// Throw a ParserException if there's no enough bytes in the
+		/// currently opened tag for reading. See stream::ensureBytes()
+		///
 		void	read_rgba(stream* in);
 
 		/// Initialize from intput stream (reads RGB)

Index: server/parser/action_buffer.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/action_buffer.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- server/parser/action_buffer.cpp	1 Jul 2007 10:54:33 -0000	1.21
+++ server/parser/action_buffer.cpp	7 Aug 2007 20:53:10 -0000	1.22
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: action_buffer.cpp,v 1.21 2007/07/01 10:54:33 bjacques Exp $ */
+/* $Id: action_buffer.cpp,v 1.22 2007/08/07 20:53:10 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -66,16 +66,19 @@
 	size_t pc = m_buffer.size();
 #endif
 
+	in->ensureBytes(1); // action_id
 	uint8_t action_id = in->read_u8();
 	m_buffer.push_back(action_id);
 	
 	if (action_id & 0x80) {
 	    // Action contains extra data.  Read it.
+	    in->ensureBytes(2); // action length
 	    uint16_t length = in->read_u16();
 	    m_buffer.push_back(length & 0x0FF);
 	    m_buffer.push_back((length >> 8) & 0x0FF);
+	    in->ensureBytes(length); // action actions 
 	    for (uint16_t i = 0; i < length; i++) {
-		uint8_t b = in->read_u8();
+		uint8_t b = in->read_u8(); // bytes ensured outside loop
 		m_buffer.push_back(b);
 	    }
 	}

Index: server/parser/morph2_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/morph2_character_def.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/parser/morph2_character_def.cpp	1 Jul 2007 10:54:34 -0000	1.11
+++ server/parser/morph2_character_def.cpp	7 Aug 2007 20:53:10 -0000	1.12
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: morph2_character_def.cpp,v 1.11 2007/07/01 10:54:34 bjacques Exp $ */
+/* $Id: morph2_character_def.cpp,v 1.12 2007/08/07 20:53:10 strk Exp $ */
 
 // Based on the public domain morph2.cpp of:
 // Thatcher Ulrich <tu@tulrich.com>, Mike Shaver <shaver@off.net> 2003,
@@ -227,13 +227,16 @@
 		m_shape1->set_bound(bound1);
 		m_shape2->set_bound(bound2);
 
+		in->ensureBytes(4);
 		offset = in->read_u32();
 
+		// Next line will throw ParserException on malformed SWF
 		fill_style_count = in->read_variable_count();
 		int i;
 		for (i = 0; i < fill_style_count; i++) {
 			fill_style fs1, fs2;
 
+			in->ensureBytes(1);
 			fs1.m_type = in->read_u8();
 			fs2.m_type = fs1.m_type;
 
@@ -285,6 +288,7 @@
 				fs2.m_gradient_matrix.concatenate(m2);
 
 				// GRADIENT
+				in->ensureBytes(1);
 				int	num_gradients = in->read_u8();
 				assert(num_gradients >= 1 && num_gradients <= 8);
 
@@ -312,6 +316,7 @@
 			else if (fs1.m_type == 0x40 || fs1.m_type == 0x41)
 			{
 
+				in->ensureBytes(2);
 				int	bitmap_char_id = in->read_u16();
 				IF_VERBOSE_PARSE(
 				  log_parse(_("morph fsr bitmap_char = %d"),
@@ -338,6 +343,7 @@
 		line_style_count = in->read_variable_count();
 		for (i = 0; i < line_style_count; i++) {
 			line_style ls1, ls2;
+			in->ensureBytes(4);
 			ls1.m_width = in->read_u16();
 			ls2.m_width = in->read_u16();
 			ls1.m_color.read(in, tag_type);

Index: server/parser/morph2_character_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/morph2_character_def.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/parser/morph2_character_def.h	16 Jun 2007 10:40:57 -0000	1.3
+++ server/parser/morph2_character_def.h	7 Aug 2007 20:53:10 -0000	1.4
@@ -19,7 +19,30 @@
 	public:
 		morph2_character_def();
 		virtual ~morph2_character_def();
+
+		/// Read a DefineMorphShape tag from stream
+		//
+		/// Throw ParserException if the tag is malformed
+		///
+		/// @param in
+		///	The stream to read the definition from.
+		///	Tag type is assumed to have been read already
+		///
+		/// @param tag_type
+		///	Type of the tag.
+		///	Need be SWF::DEFINEMORPHSHAPE or an assertion would fail.
+		///	TODO: drop ?
+		///
+		/// @param with_style
+		///	Unused. TODO: drop.
+		///
+		/// @param md
+		///	Movie definition. Used to resolv character ids for fill styles.
+		///	Must be not-null or would segfault. 
+		///	TODO: take by reference !
+		///
 		void	read(stream* in, int tag_type, bool with_style, movie_definition* m);
+
 		virtual void	display(character* inst);
 		void lerp_matrix(matrix& t, const matrix& m1, const matrix& m2, const float ratio);
 

Index: server/parser/shape_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/shape_character_def.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- server/parser/shape_character_def.cpp	6 Aug 2007 03:30:19 -0000	1.31
+++ server/parser/shape_character_def.cpp	7 Aug 2007 20:53:10 -0000	1.32
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: shape_character_def.cpp,v 1.31 2007/08/06 03:30:19 strk Exp $ */
+/* $Id: shape_character_def.cpp,v 1.32 2007/08/07 20:53:10 strk Exp $ */
 
 // Based on the public domain shape.cpp of Thatcher Ulrich <tu@tulrich.com> 2003
 
@@ -30,7 +30,6 @@
 #include "render.h"
 #include "stream.h"
 #include "sprite_instance.h"
-#include "GnashException.h"
 
 #include "tu_file.h"
 
@@ -72,11 +71,13 @@
 {
 
 	// Get the count.
+	in->ensureBytes(1);
 	uint16_t fill_style_count = in->read_u8();
 	if (tag_type > 2)
 	{
 		if (fill_style_count == 0xFF)
 		{
+			in->ensureBytes(2);
 			fill_style_count = in->read_u16();
 		}
 	}
@@ -92,16 +93,7 @@
 		// TODO: add a fill_style constructor directly
 		//       reading from stream
 		fill_style fs;
-		try
-		{
 			fs.read(in, tag_type, m);
-		}
-		catch (ParserException& e)
-		{
-			IF_VERBOSE_MALFORMED_SWF(
-				log_swferror("%s", e.what());
-			);
-		}
 		// Push a style anyway, so any path referring to
 		// it still finds it..
 		styles.push_back(fs);
@@ -115,6 +107,7 @@
     // Read line styles and push them onto the back of the given array.
 {
     // Get the count.
+    in->ensureBytes(1);
     int	line_style_count = in->read_u8();
 
 		IF_VERBOSE_PARSE
@@ -126,6 +119,7 @@
     // if (tag_type > 2)
     // {
     if (line_style_count == 0xFF) {
+        in->ensureBytes(2);
 	line_style_count = in->read_u16();
 		IF_VERBOSE_PARSE
 		(



From MAILER-DAEMON Tue Aug 07 17:01:22 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IIWB8-00064E-6o
	for mharc-gnash-commit@gnu.org; Tue, 07 Aug 2007 17:01:22 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IIWB6-00063m-1u
	for gnash-commit@gnu.org; Tue, 07 Aug 2007 17:01:20 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IIWB5-00063W-2B
	for gnash-commit@gnu.org; Tue, 07 Aug 2007 17:01:19 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IIWB4-00063S-Sy
	for gnash-commit@gnu.org; Tue, 07 Aug 2007 17:01:18 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IIWB2-0001qQ-Vy
	for gnash-commit@gnu.org; Tue, 07 Aug 2007 17:01:17 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IIWAs-00012H-HR
	for gnash-commit@gnu.org; Tue, 07 Aug 2007 21:01:06 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IIWAs-00012E-Ck
	for gnash-commit@gnu.org; Tue, 07 Aug 2007 21:01:06 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IIWAs-00012E-Ck@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 07 Aug 2007 21:01:06 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog gui/Makefile.am
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Aug 2007 21:01:20 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/07 21:01:06

Modified files:
	.              : ChangeLog 
	gui            : Makefile.am 

Log message:
	* gui/Makefile.am: clean the 'gnash' script on make clean.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3961&r2=1.3962
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.101&r2=1.102

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3961
retrieving revision 1.3962
diff -u -b -r1.3961 -r1.3962
--- ChangeLog	7 Aug 2007 20:53:09 -0000	1.3961
+++ ChangeLog	7 Aug 2007 21:01:05 -0000	1.3962
@@ -1,5 +1,6 @@
 2007-08-07 Sandro Santilli <strk@keybit.net>
 
+	* gui/Makefile.am: clean the 'gnash' script on make clean. 
 	* server/sprite_instance.cpp (processCompletedLoadVariableRequest):
 	  fix attempt to increment past-the-end iterator.
 	* libbase/zlib_adaptar.cpp: don't hang on corrupted input.

Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -b -r1.101 -r1.102
--- gui/Makefile.am	3 Aug 2007 03:01:16 -0000	1.101
+++ gui/Makefile.am	7 Aug 2007 21:01:06 -0000	1.102
@@ -373,7 +373,7 @@
 endif				# BUILD_AGG_RENDERER
 endif				# BUILD_FB_GUI
 
-CLEANFILES = klash.moc .configline
+CLEANFILES = klash.moc .configline gnash
 
 klash.moc: $(srcdir)/kdesup.h
 	@if test x"$(MOC)" != x; then \



From MAILER-DAEMON Wed Aug 08 05:14:19 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IIhcR-0001Xh-Np
	for mharc-gnash-commit@gnu.org; Wed, 08 Aug 2007 05:14:19 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IIhcP-0001Vr-Kk
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 05:14:17 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IIhcO-0001V6-Ot
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 05:14:17 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IIhcO-0001Ur-KW
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 05:14:16 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <tomasgroth@yahoo.dk>) id 1IIhcN-0000R6-SB
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 05:14:16 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <tomasgroth@yahoo.dk>) id 1IIhcN-0007Qh-2T
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 09:14:15 +0000
Received: from tgc by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <tgc@savannah.gnu.org>) id 1IIhcM-0007Qa-Rj
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 09:14:14 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IIhcM-0007Qa-Rj@cvs.savannah.gnu.org>
From: Tomas Groth <tomasgroth@yahoo.dk>
Date: Wed, 08 Aug 2007 09:14:14 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog backend/sound_handler_sdl.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Aug 2007 09:14:18 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Tomas Groth <tgc>	07/08/08 09:14:14

Modified files:
	.              : ChangeLog 
	backend        : sound_handler_sdl.cpp 

Log message:
		* backend/sound_handler_sdl.cpp: Fix counting of samples played,
		  and use the output samplerate to calculate the playhead position
		  in time, fixes/improves bug #20684.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3962&r2=1.3963
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_sdl.cpp?cvsroot=gnash&r1=1.77&r2=1.78

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3962
retrieving revision 1.3963
diff -u -b -r1.3962 -r1.3963
--- ChangeLog	7 Aug 2007 21:01:05 -0000	1.3962
+++ ChangeLog	8 Aug 2007 09:14:14 -0000	1.3963
@@ -1,3 +1,9 @@
+2007-08-08 Tomas Groth Christensen <tomasgroth@yahoo.dk>
+
+	* backend/sound_handler_sdl.cpp: Fix counting of samples played,
+	  and use the output samplerate to calculate the playhead position
+	  in time, fixes/improves bug #20684.
+
 2007-08-07 Sandro Santilli <strk@keybit.net>
 
 	* gui/Makefile.am: clean the 'gnash' script on make clean. 

Index: backend/sound_handler_sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_sdl.cpp,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- backend/sound_handler_sdl.cpp	7 Aug 2007 16:27:37 -0000	1.77
+++ backend/sound_handler_sdl.cpp	8 Aug 2007 09:14:14 -0000	1.78
@@ -18,7 +18,7 @@
 // Based on sound_handler_sdl.cpp by Thatcher Ulrich http://tulrich.com 2003
 // which has been donated to the Public Domain.
 
-// $Id: sound_handler_sdl.cpp,v 1.77 2007/08/07 16:27:37 tgc Exp $
+// $Id: sound_handler_sdl.cpp,v 1.78 2007/08/08 09:14:14 tgc Exp $
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -579,9 +579,9 @@
 	active_sound* asound = sounddata->m_active_sounds[0];
 
 	// Return the playhead position in milliseconds
-	unsigned int ret = asound->samples_played / sounddata->sample_rate * 100;
-	ret += ((asound->samples_played % sounddata->sample_rate) * 100) / sounddata->sample_rate;
-	if (sounddata->stereo) ret = ret / 2;
+	unsigned int ret = asound->samples_played / audioSpec.freq * 1000;
+	ret += ((asound->samples_played % audioSpec.freq) * 1000) / audioSpec.freq;
+	if (audioSpec.channels > 1) ret = ret / audioSpec.channels;
 	return ret;
 }
 
@@ -698,7 +698,9 @@
 
 	// Update sound info
 	sound->raw_position += mix_length;
-	sound->samples_played += mix_length;
+
+	// Sample size is always 2
+	sound->samples_played += mix_length / 2;
 }
 
 



From MAILER-DAEMON Wed Aug 08 06:39:54 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IIixG-0002y9-60
	for mharc-gnash-commit@gnu.org; Wed, 08 Aug 2007 06:39:54 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IIixE-0002wT-P9
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 06:39:52 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IIixD-0002vQ-UH
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 06:39:52 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IIixD-0002v7-Nc
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 06:39:51 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <tomasgroth@yahoo.dk>) id 1IIixD-0002bd-Du
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 06:39:51 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <tomasgroth@yahoo.dk>) id 1IIixC-000590-HF
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 10:39:50 +0000
Received: from tgc by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <tgc@savannah.gnu.org>) id 1IIixC-00058x-C8
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 10:39:50 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IIixC-00058x-C8@cvs.savannah.gnu.org>
From: Tomas Groth <tomasgroth@yahoo.dk>
Date: Wed, 08 Aug 2007 10:39:50 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog backend/sound_handler_gst.cpp b...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Aug 2007 10:39:53 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Tomas Groth <tgc>	07/08/08 10:39:50

Modified files:
	.              : ChangeLog 
	backend        : sound_handler_gst.cpp sound_handler_sdl.cpp 

Log message:
		* backend/sound_handler_{sdl,gst}.cpp: Detect and fix if a soundstream
		  is out of sync (after position-jump or general out of sync issue),
		  fixes bug #20681.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3963&r2=1.3964
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_gst.cpp?cvsroot=gnash&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_sdl.cpp?cvsroot=gnash&r1=1.78&r2=1.79

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3963
retrieving revision 1.3964
diff -u -b -r1.3963 -r1.3964
--- ChangeLog	8 Aug 2007 09:14:14 -0000	1.3963
+++ ChangeLog	8 Aug 2007 10:39:49 -0000	1.3964
@@ -1,5 +1,11 @@
 2007-08-08 Tomas Groth Christensen <tomasgroth@yahoo.dk>
 
+	* backend/sound_handler_{sdl,gst}.cpp: Detect and fix if a soundstream
+	  is out of sync (after position-jump or general out of sync issue),
+	  fixes bug #20681.
+
+2007-08-08 Tomas Groth Christensen <tomasgroth@yahoo.dk>
+
 	* backend/sound_handler_sdl.cpp: Fix counting of samples played,
 	  and use the output samplerate to calculate the playhead position
 	  in time, fixes/improves bug #20684.

Index: backend/sound_handler_gst.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_gst.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- backend/sound_handler_gst.cpp	7 Aug 2007 16:27:37 -0000	1.58
+++ backend/sound_handler_gst.cpp	8 Aug 2007 10:39:50 -0000	1.59
@@ -20,7 +20,7 @@
 // Based on sound_handler_sdl.cpp by Thatcher Ulrich http://tulrich.com 2003
 // which has been donated to the Public Domain.
 
-/* $Id: sound_handler_gst.cpp,v 1.58 2007/08/07 16:27:37 tgc Exp $ */
+/* $Id: sound_handler_gst.cpp,v 1.59 2007/08/08 10:39:50 tgc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -275,12 +275,15 @@
 	sound_data* sounddata = m_sound_data[sound_handle];
 
 	// If this is called from a streamsoundblocktag, we only start if this
-	// sound isn't already playing. If a gst_element-struct is existing we
-	// assume it is also playing.
+	// sound isn't already playing. If a active_sound-struct is existing we
+	// assume it is also playing. If necessary we do some sync'ing
 	if (start_position > 0 && sounddata->m_gst_elements.size() > 0) {
+		// This is the ugly sync'ing. If the renderer-sync'ing  to the timeline
+		// works, this should only be needed when we're position-jumping in streams.
+		int diff = abs(sounddata->m_gst_elements[0]->position - start_position);
+		if (diff > 2000) sounddata->m_gst_elements[0]->position = start_position;
 		return;
 	}
-
 	// Make sure sound actually got some data
 	if (sounddata->data_size < 1) {
 		IF_VERBOSE_MALFORMED_SWF(

Index: backend/sound_handler_sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_sdl.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- backend/sound_handler_sdl.cpp	8 Aug 2007 09:14:14 -0000	1.78
+++ backend/sound_handler_sdl.cpp	8 Aug 2007 10:39:50 -0000	1.79
@@ -18,7 +18,7 @@
 // Based on sound_handler_sdl.cpp by Thatcher Ulrich http://tulrich.com 2003
 // which has been donated to the Public Domain.
 
-// $Id: sound_handler_sdl.cpp,v 1.78 2007/08/08 09:14:14 tgc Exp $
+// $Id: sound_handler_sdl.cpp,v 1.79 2007/08/08 10:39:50 tgc Exp $
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -244,8 +244,12 @@
 
 	// If this is called from a streamsoundblocktag, we only start if this
 	// sound isn't already playing. If a active_sound-struct is existing we
-	// assume it is also playing.
+	// assume it is also playing. If necessary we do some sync'ing
 	if (start_position > 0 && sounddata->m_active_sounds.size() > 0) {
+		// This is the ugly sync'ing. If the renderer-sync'ing  to the timeline
+		// works, this should only be needed when we're position-jumping in streams.
+		int diff = abs(sounddata->m_active_sounds[0]->position - start_position);
+		if (diff > 2000) sounddata->m_active_sounds[0]->position = start_position;
 		return;
 	}
 



From MAILER-DAEMON Wed Aug 08 12:26:50 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IIoN0-0002aL-6A
	for mharc-gnash-commit@gnu.org; Wed, 08 Aug 2007 12:26:50 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IIoMy-0002YN-FZ
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 12:26:48 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IIoMx-0002Xs-0j
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 12:26:47 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IIoMw-0002Xp-Ra
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 12:26:46 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IIoMw-0003Eh-IL
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 12:26:46 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IIoMw-000689-0v
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 16:26:46 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IIoMv-000686-R0
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 16:26:45 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IIoMv-000686-R0@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 08 Aug 2007 16:26:45 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/asobj/Mouse.cpp testsuit...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Aug 2007 16:26:49 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/08 16:26:45

Modified files:
	.              : ChangeLog 
	server/asobj   : Mouse.cpp 
	testsuite/actionscript.all: Mouse.as 

Log message:
	        * server/asobj/Mouse.cpp: make the global Mouse symbol point
	          to an object, not a constructor.
	        * testsuite/actionscript.all/Mouse.as: xcheck -> check.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3964&r2=1.3965
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Mouse.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Mouse.as?cvsroot=gnash&r1=1.10&r2=1.11

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3964
retrieving revision 1.3965
diff -u -b -r1.3964 -r1.3965
--- ChangeLog	8 Aug 2007 10:39:49 -0000	1.3964
+++ ChangeLog	8 Aug 2007 16:26:44 -0000	1.3965
@@ -1,3 +1,9 @@
+2007-08-08 Sandro Santilli <strk@keybit.net>
+
+	* server/asobj/Mouse.cpp: make the global Mouse symbol point
+	  to an object, not a constructor.
+	* testsuite/actionscript.all/Mouse.as: xcheck -> check.
+
 2007-08-08 Tomas Groth Christensen <tomasgroth@yahoo.dk>
 
 	* backend/sound_handler_{sdl,gst}.cpp: Detect and fix if a soundstream

Index: server/asobj/Mouse.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Mouse.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/asobj/Mouse.cpp	13 Jul 2007 19:24:15 -0000	1.12
+++ server/asobj/Mouse.cpp	8 Aug 2007 16:26:45 -0000	1.13
@@ -27,6 +27,7 @@
 #include "fn_call.h"
 #include "smart_ptr.h" // for boost intrusive_ptr
 #include "builtin_function.h" // need builtin_function
+//#include "VM.h" // for registering static
 
 namespace gnash {
 
@@ -145,19 +146,18 @@
 void mouse_class_init(as_object& global)
 {
 	// This is going to be the global Mouse "class"/"function"
-	static boost::intrusive_ptr<builtin_function> cl;
+	static boost::intrusive_ptr<as_object> obj;
 
-	if ( cl == NULL )
+	if ( ! obj )
 	{
-		cl=new builtin_function(&mouse_ctor, getMouseInterface());
-		// replicate all interface to class, to be able to access
-		// all methods as static functions
-		attachMouseInterface(*cl);
-		     
+		obj = new mouse_as_object();
+		// we shouldn't keep the Mouse object
+		// alive, I think.
+		//VM::get().addStatic(obj.get());
 	}
 
 	// Register _global.Mouse
-	global.init_member("Mouse", cl.get());
+	global.init_member("Mouse", obj.get());
 
 }
 

Index: testsuite/actionscript.all/Mouse.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Mouse.as,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- testsuite/actionscript.all/Mouse.as	26 Jul 2007 03:41:19 -0000	1.10
+++ testsuite/actionscript.all/Mouse.as	8 Aug 2007 16:26:45 -0000	1.11
@@ -20,15 +20,15 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Mouse.as,v 1.10 2007/07/26 03:41:19 strk Exp $";
+rcsid="$Id: Mouse.as,v 1.11 2007/08/08 16:26:45 strk Exp $";
 
 #include "check.as"
 
-xcheck_equals ( typeof(Mouse), 'object' );
+check_equals ( typeof(Mouse), 'object' );
 
 // Mouse object can't be instanciated !
 var mouseObj = new Mouse;
-xcheck_equals(mouseObj, undefined);
+check_equals(mouseObj, undefined);
 
 // test the Mouse::hide method
 check_equals ( typeof(Mouse.hide), 'function' );



From MAILER-DAEMON Wed Aug 08 14:26:47 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IIqF5-0007ht-Es
	for mharc-gnash-commit@gnu.org; Wed, 08 Aug 2007 14:26:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IIqF3-0007gn-U0
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 14:26:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IIqEy-0007aT-FZ
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 14:26:45 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IIqEy-0007aQ-AV
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 14:26:40 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IIqEy-0000uk-0S
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 14:26:40 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IIqEw-0005VH-SD
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 18:26:38 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IIqEw-0005VE-OA
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 18:26:38 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IIqEw-0005VE-OA@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 08 Aug 2007 18:26:38 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/impl.cpp server/swf/tag_...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Aug 2007 18:26:46 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/08 18:26:38

Modified files:
	.              : ChangeLog 
	server         : impl.cpp 
	server/swf     : tag_loaders.cpp tag_loaders.h 

Log message:
	        * server/impl.cpp, server/swf/tag_loaders.{cpp,h}: stub parsing
	          of REFLEX tag.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3965&r2=1.3966
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.cpp?cvsroot=gnash&r1=1.113&r2=1.114
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.121&r2=1.122
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.h?cvsroot=gnash&r1=1.19&r2=1.20

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3965
retrieving revision 1.3966
diff -u -b -r1.3965 -r1.3966
--- ChangeLog	8 Aug 2007 16:26:44 -0000	1.3965
+++ ChangeLog	8 Aug 2007 18:26:37 -0000	1.3966
@@ -1,5 +1,8 @@
 2007-08-08 Sandro Santilli <strk@keybit.net>
 
+
+	* server/impl.cpp, server/swf/tag_loaders.{cpp,h}: stub parsing
+	  of REFLEX tag.
 	* server/asobj/Mouse.cpp: make the global Mouse symbol point
 	  to an object, not a constructor.
 	* testsuite/actionscript.all/Mouse.as: xcheck -> check.

Index: server/impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/impl.cpp,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -b -r1.113 -r1.114
--- server/impl.cpp	18 Jul 2007 22:17:16 -0000	1.113
+++ server/impl.cpp	8 Aug 2007 18:26:38 -0000	1.114
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: impl.cpp,v 1.113 2007/07/18 22:17:16 strk Exp $ */
+/* $Id: impl.cpp,v 1.114 2007/08/08 18:26:38 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -237,6 +237,8 @@
 	register_tag_loader(SWF::DEFINESCALINGGRID, fixme_loader); // 78
 	register_tag_loader(SWF::DEFINESHAPE4, fixme_loader); // 83
 	register_tag_loader(SWF::DEFINEMORPHSHAPE2, fixme_loader); // 84
+
+	register_tag_loader(SWF::REFLEX, reflex_loader); // 777
 }
 
 

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -b -r1.121 -r1.122
--- server/swf/tag_loaders.cpp	1 Aug 2007 21:36:58 -0000	1.121
+++ server/swf/tag_loaders.cpp	8 Aug 2007 18:26:38 -0000	1.122
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: tag_loaders.cpp,v 1.121 2007/08/01 21:36:58 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.122 2007/08/08 18:26:38 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1519,6 +1519,24 @@
     // attach to movie_definition ?
 }
 
+void
+reflex_loader(stream* in, tag_type tag, movie_definition* /*m*/)
+{
+    assert(tag == SWF::REFLEX); // 777
+
+    in->ensureBytes(3);
+    uint8_t first = in->read_u8();
+    uint8_t second = in->read_u8();
+    uint8_t third = in->read_u8();
+
+    IF_VERBOSE_PARSE (
+	log_parse(_("  reflex = \"%c%c%c\""), first, second, third);
+    );
+
+    log_unimpl(_("REFLEX tag parsed (\"%c%c%c\") but unused"), first, second, third);
+
+}
+
 
 } // namespace gnash::SWF::tag_loaders
 } // namespace gnash::SWF
@@ -1732,7 +1750,7 @@
 
 	// 4 is the fixed header for each sample ( 16bit sample id, 6bit stepsize_index )
 	// nbits is the number of bits for each sample
-	in->ensureBytes( sample_count * ( 3 + ceil(n_bits/8) ) );
+	in->ensureBytes( sample_count * ( 3 + (int)ceil(n_bits/8) ) );
 
 	while (sample_count)
 	{

Index: server/swf/tag_loaders.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/swf/tag_loaders.h	1 Jul 2007 10:54:36 -0000	1.19
+++ server/swf/tag_loaders.h	8 Aug 2007 18:26:38 -0000	1.20
@@ -19,7 +19,7 @@
 //
 //
 
-/* $Id: tag_loaders.h,v 1.19 2007/07/01 10:54:36 bjacques Exp $ */
+/* $Id: tag_loaders.h,v 1.20 2007/08/08 18:26:38 strk Exp $ */
 
 #ifndef GNASH_SWF_TAG_LOADERS_H
 #define GNASH_SWF_TAG_LOADERS_H
@@ -78,6 +78,10 @@
 ///
 void	define_font_loader(stream*, tag_type, movie_definition*);
 
+/// SWF Tags Reflex (777)
+//
+void	reflex_loader(stream*, tag_type, movie_definition*);
+
 /// SWF Tag DefineFontInfo (13 or 62) 
 //
 /// Load a DefineFontInfo or DefineFontInfo2 tag. 



From MAILER-DAEMON Wed Aug 08 15:32:42 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IIrGs-0001fS-Ev
	for mharc-gnash-commit@gnu.org; Wed, 08 Aug 2007 15:32:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IIrGr-0001fF-9L
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 15:32:41 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IIrGo-0001f3-HX
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 15:32:39 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IIrGo-0001f0-CI
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 15:32:38 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IIrGo-0002VX-3a
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 15:32:38 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IIrGn-0001yX-FN
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 19:32:37 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IIrGn-0001yU-93
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 19:32:37 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IIrGn-0001yU-93@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 08 Aug 2007 19:32:37 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/sprite_instance.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Aug 2007 19:32:41 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/08 19:32:37

Modified files:
	.              : ChangeLog 
	server         : sprite_instance.cpp 

Log message:
	        * server/sprite_instance.cpp (processCompletedLoadVariableRequests):
	          use set_member, not set_variable - the latter is only meant to be
	          called on the root movie.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3966&r2=1.3967
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.304&r2=1.305

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3966
retrieving revision 1.3967
diff -u -b -r1.3966 -r1.3967
--- ChangeLog	8 Aug 2007 18:26:37 -0000	1.3966
+++ ChangeLog	8 Aug 2007 19:32:36 -0000	1.3967
@@ -1,6 +1,8 @@
 2007-08-08 Sandro Santilli <strk@keybit.net>
 
-
+	* server/sprite_instance.cpp (processCompletedLoadVariableRequests):
+	  use set_member, not set_variable - the latter is only meant to be
+	  called on the root movie.
 	* server/impl.cpp, server/swf/tag_loaders.{cpp,h}: stub parsing
 	  of REFLEX tag.
 	* server/asobj/Mouse.cpp: make the global Mouse symbol point

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -b -r1.304 -r1.305
--- server/sprite_instance.cpp	7 Aug 2007 20:53:10 -0000	1.304
+++ server/sprite_instance.cpp	8 Aug 2007 19:32:36 -0000	1.305
@@ -3838,8 +3838,8 @@
 	{
 		const string& name = it->first;
 		const string& val = it->second;
-		log_msg(_("Setting variable '%s' to value '%s'"), name.c_str(), val.c_str());
-		set_variable(name.c_str(), val.c_str()); // should it be set_member ?
+		//log_msg(_("Setting variable '%s' to value '%s'"), name.c_str(), val.c_str());
+		set_member(name.c_str(), val.c_str());
 	}
 }
 



From MAILER-DAEMON Wed Aug 08 15:53:09 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IIraf-0007jO-7j
	for mharc-gnash-commit@gnu.org; Wed, 08 Aug 2007 15:53:09 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IIrad-0007iY-5p
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 15:53:07 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IIrab-0007hS-Oc
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 15:53:06 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IIrab-0007hI-Ks
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 15:53:05 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IIrab-0005mt-40
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 15:53:05 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IIraZ-0003jk-Nc
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 19:53:03 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IIraZ-0003jh-K9
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 19:53:03 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IIraZ-0003jh-K9@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 08 Aug 2007 19:53:03 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/Load...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Aug 2007 19:53:08 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/08 19:53:03

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: LoadVars.as 

Log message:
	        * testsuite/actionscript.all/LoadVars.as: enabled tests erroneously
	          committed disabled.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3967&r2=1.3968
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/LoadVars.as?cvsroot=gnash&r1=1.13&r2=1.14

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3967
retrieving revision 1.3968
diff -u -b -r1.3967 -r1.3968
--- ChangeLog	8 Aug 2007 19:32:36 -0000	1.3967
+++ ChangeLog	8 Aug 2007 19:53:02 -0000	1.3968
@@ -1,5 +1,7 @@
 2007-08-08 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/actionscript.all/LoadVars.as: enabled tests erroneously
+	  committed disabled.
 	* server/sprite_instance.cpp (processCompletedLoadVariableRequests):
 	  use set_member, not set_variable - the latter is only meant to be
 	  called on the root movie.

Index: testsuite/actionscript.all/LoadVars.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/LoadVars.as,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- testsuite/actionscript.all/LoadVars.as	26 Jul 2007 03:41:18 -0000	1.13
+++ testsuite/actionscript.all/LoadVars.as	8 Aug 2007 19:53:03 -0000	1.14
@@ -21,7 +21,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: LoadVars.as,v 1.13 2007/07/26 03:41:18 strk Exp $";
+rcsid="$Id: LoadVars.as,v 1.14 2007/08/08 19:53:03 strk Exp $";
 
 #include "check.as"
 
@@ -36,8 +36,6 @@
 
 #else // OUTPUT_VERSION >= 6
 
-#if 0 // STRK REMOVEME
-
 check_equals(typeof(LoadVars), 'function');
 
 var loadvarsObj = new LoadVars;
@@ -62,7 +60,6 @@
 // test the LoadVars::tostring method
 check_equals (typeof(loadvarsObj.toString), 'function');
 
-#endif // 0 // STRK REMOVEME
 var loadvarsObj = new LoadVars; // STRK REMOVEME
 
 //--------------------------------------------------------------------------



From MAILER-DAEMON Wed Aug 08 16:09:05 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IIrq5-0005KZ-4s
	for mharc-gnash-commit@gnu.org; Wed, 08 Aug 2007 16:09:05 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IIrq2-0005Jc-Ja
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 16:09:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IIrq1-0005JH-5y
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 16:09:01 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IIrq1-0005J0-0s
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 16:09:01 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IIrq0-0000Nn-M6
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 16:09:00 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IIrpz-0004Rx-Gy
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 20:08:59 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IIrpz-0004Ru-Bl
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 20:08:59 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IIrpz-0004Ru-Bl@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 08 Aug 2007 20:08:59 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/sprite_instance.cpp serv...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Aug 2007 20:09:03 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/08 20:08:59

Modified files:
	.              : ChangeLog 
	server         : sprite_instance.cpp sprite_instance.h 

Log message:
	        * server/sprite_instance.cpp: drop set_variable() methods.
	          Have setVariables() call set_member directly (might change in the
	          future to call as_environment's set_variable, if we find out
	          variables in query string, FlashParams and loadVariable loaded text
	          files can contain path elements).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3968&r2=1.3969
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.305&r2=1.306
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.127&r2=1.128

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3968
retrieving revision 1.3969
diff -u -b -r1.3968 -r1.3969
--- ChangeLog	8 Aug 2007 19:53:02 -0000	1.3968
+++ ChangeLog	8 Aug 2007 20:08:58 -0000	1.3969
@@ -1,5 +1,13 @@
 2007-08-08 Sandro Santilli <strk@keybit.net>
 
+	* server/sprite_instance.cpp: drop set_variable() methods.
+	  Have setVariables() call set_member directly (might change in the
+	  future to call as_environment's set_variable, if we find out
+	  variables in query string, FlashParams and loadVariable loaded text
+	  files can contain path elements).
+
+2007-08-08 Sandro Santilli <strk@keybit.net>
+
 	* testsuite/actionscript.all/LoadVars.as: enabled tests erroneously
 	  committed disabled.
 	* server/sprite_instance.cpp (processCompletedLoadVariableRequests):

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -b -r1.305 -r1.306
--- server/sprite_instance.cpp	8 Aug 2007 19:32:36 -0000	1.305
+++ server/sprite_instance.cpp	8 Aug 2007 20:08:58 -0000	1.306
@@ -2236,52 +2236,6 @@
 
 }
 
-void sprite_instance::set_variable(const char* path_to_var,
-		const wchar_t* new_value)
-{
-	if (path_to_var == NULL)
-	{
-		log_error(_("NULL path_to_var passed to set_variable()"));
-		return;
-	}
-	if (new_value == NULL)
-	{
-		log_error(_("NULL passed to set_variable('%s',"
-			" NULL)"), path_to_var);
-		return;
-	}
-
-	// should only be called on the root movie.
-	assert(m_parent == NULL);
-
-	std::string path(path_to_var);
-	as_value val(new_value);
-
-	m_as_environment.set_variable(path, val);
-}
-
-void sprite_instance::set_variable(const char* path_to_var,
-		const char* new_value)
-{
-	    assert(m_parent == NULL);	// should only be called on the root movie.
-
-	    if (path_to_var == NULL)
-		{
-		    log_error(_("NULL path_to_var passed to set_variable()"));
-		    return;
-		}
-	    if (new_value == NULL)
-		{
-		    log_error(_("NULL passed to set_variable('%s', NULL)"), path_to_var);
-		    return;
-		}
-
-	    std::string path(path_to_var);
-	    as_value val(new_value);
-
-	    m_as_environment.set_variable(path, val);
-}
-
 void sprite_instance::advance_sprite(float delta_time)
 {
 	//GNASH_REPORT_FUNCTION;
@@ -3874,7 +3828,7 @@
 	{
 		const string& name = it->first;
 		const string& val = it->second;
-		set_variable(name.c_str(), val.c_str());
+		set_member(name, val.c_str());
 	}
 }
 

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -b -r1.127 -r1.128
--- server/sprite_instance.h	24 Jul 2007 13:08:56 -0000	1.127
+++ server/sprite_instance.h	8 Aug 2007 20:08:59 -0000	1.128
@@ -541,21 +541,9 @@
 	// ActionScript support
 	//
 
-
-	/// Set the named variable to the value
-	virtual void set_variable(const char* path_to_var,
-		const char* new_value);
-
-	/// Set the named variable to the wide value
-	//
-	/// TODO: check if worth deprecating
-	virtual void set_variable(const char* path_to_var,
-		const wchar_t* new_value);
-
 	// See dox in as_object.h
 	bool get_member(const std::string& name, as_value* val);
 
-		
 	/// Set the named member to the value. 
 	//
 	/// Return true if we have that member; false otherwise.



From MAILER-DAEMON Wed Aug 08 16:17:33 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IIryH-00009I-3m
	for mharc-gnash-commit@gnu.org; Wed, 08 Aug 2007 16:17:33 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IIryF-00009D-Sy
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 16:17:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IIryF-000090-Dv
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 16:17:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IIryF-00008x-8j
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 16:17:31 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IIryF-0002NW-43
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 16:17:31 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IIryD-0005ZL-JX
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 20:17:29 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IIryD-0005ZE-6n
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 20:17:29 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IIryD-0005ZE-6n@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 08 Aug 2007 20:17:29 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/server/asobj Object.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Aug 2007 20:17:32 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/08 20:17:29

Modified files:
	server/asobj   : Object.cpp 

Log message:
	add more info on ascoding errors

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Object.cpp?cvsroot=gnash&r1=1.25&r2=1.26

Patches:
Index: Object.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Object.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- Object.cpp	1 Jul 2007 10:54:30 -0000	1.25
+++ Object.cpp	8 Aug 2007 20:17:28 -0000	1.26
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: Object.cpp,v 1.25 2007/07/01 10:54:30 bjacques Exp $ */
+/* $Id: Object.cpp,v 1.26 2007/08/08 20:17:28 strk Exp $ */
 
 #include "tu_config.h"
 #include "Object.h"
@@ -250,7 +250,7 @@
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
 		log_aserror(_("Invalid call to Object.registerClass() - "
-			"empty symbol id"));
+			"empty symbol id (%s)"), fn.arg(0).to_debug_string().c_str());
 		);
 		return as_value(false);
 	}
@@ -260,7 +260,7 @@
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
 		log_aserror(_("Invalid call to Object.registerClass() - "
-			"class is not a function"));
+			"class is not a function (%s)"), fn.arg(1).to_debug_string().c_str());
 		);
 		return as_value(false);
 	}



From MAILER-DAEMON Wed Aug 08 16:51:43 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IIsVL-0003Ke-RL
	for mharc-gnash-commit@gnu.org; Wed, 08 Aug 2007 16:51:43 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IIsVK-0003JO-9j
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 16:51:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IIsVJ-0003J0-LP
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 16:51:41 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IIsVJ-0003It-Al
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 16:51:41 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IIsVI-0001Ol-TJ
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 16:51:41 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IIsVH-0007wh-Oe
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 20:51:39 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IIsVH-0007we-Jj
	for gnash-commit@gnu.org; Wed, 08 Aug 2007 20:51:39 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IIsVH-0007we-Jj@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 08 Aug 2007 20:51:39 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog plugin/plugin.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Aug 2007 20:51:42 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/08 20:51:39

Modified files:
	.              : ChangeLog 
	plugin         : plugin.cpp 

Log message:
	Patch by Benjamin Wolsey:
	
	        * plugin/plugin.cpp: replicate compatibility version to the end, to
	          make UFO flash version detector happy. Fixes bug #20696.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3969&r2=1.3970
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/plugin.cpp?cvsroot=gnash&r1=1.80&r2=1.81

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3969
retrieving revision 1.3970
diff -u -b -r1.3969 -r1.3970
--- ChangeLog	8 Aug 2007 20:08:58 -0000	1.3969
+++ ChangeLog	8 Aug 2007 20:51:38 -0000	1.3970
@@ -1,3 +1,8 @@
+2007-08-08 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
+
+	* plugin/plugin.cpp: replicate compatibility version to the end, to
+	  make UFO flash version detector happy. Fixes bug #20696.
+
 2007-08-08 Sandro Santilli <strk@keybit.net>
 
 	* server/sprite_instance.cpp: drop set_variable() methods.

Index: plugin/plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/plugin.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- plugin/plugin.cpp	1 Aug 2007 04:02:13 -0000	1.80
+++ plugin/plugin.cpp	8 Aug 2007 20:51:39 -0000	1.81
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: plugin.cpp,v 1.80 2007/08/01 04:02:13 strk Exp $ */
+/* $Id: plugin.cpp,v 1.81 2007/08/08 20:51:39 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -35,7 +35,7 @@
   <a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public License \
   </a>. For more information about Gnash, see <a \
   href=\"http://www.gnu.org/software/gnash/\"> \
-  http://www.gnu.org/software/gnash</a>."
+  http://www.gnu.org/software/gnash</a>. Compatible Shockwave Flash 8.0 r99."
 
 #include <sys/param.h>
 #include "plugin.h" //Fixes Warning on redef of MIN/MAX



From MAILER-DAEMON Thu Aug 09 00:18:44 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IIzTw-00069U-Fd
	for mharc-gnash-commit@gnu.org; Thu, 09 Aug 2007 00:18:44 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IIzTu-00069N-Q3
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 00:18:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IIzTt-00069B-4J
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 00:18:41 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IIzTs-000698-VG
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 00:18:41 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IIzTs-0006Yh-N9
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 00:18:40 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IIzTq-000822-VM
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 04:18:39 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IIzTq-00081t-IT
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 04:18:38 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IIzTq-00081t-IT@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 09 Aug 2007 04:18:38 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/stream.h server/swf/tag_...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Aug 2007 04:18:42 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/09 04:18:38

Modified files:
	.              : ChangeLog 
	server         : stream.h 
	server/swf     : tag_loaders.cpp 

Log message:
	        * server/stream.h (ensureBytes): be more verbose about the lack of
	          data. Fix signed/unsigned comparison.
	        * server/swf/tag_loaders.cpp (adpcm_expand): fix count of needed
	          bytes. Fixes bug #20725.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3970&r2=1.3971
http://cvs.savannah.gnu.org/viewcvs/gnash/server/stream.h?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.122&r2=1.123

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3970
retrieving revision 1.3971
diff -u -b -r1.3970 -r1.3971
--- ChangeLog	8 Aug 2007 20:51:38 -0000	1.3970
+++ ChangeLog	9 Aug 2007 04:18:37 -0000	1.3971
@@ -1,3 +1,10 @@
+2007-08-09 Sandro Santilli <strk@keybit.net>
+
+	* server/stream.h (ensureBytes): be more verbose about the lack of
+	  data. Fix signed/unsigned comparison.
+	* server/swf/tag_loaders.cpp (adpcm_expand): fix count of needed
+	  bytes. Fixes bug #20725.
+
 2007-08-08 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
 
 	* plugin/plugin.cpp: replicate compatibility version to the end, to

Index: server/stream.h
===================================================================
RCS file: /sources/gnash/gnash/server/stream.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- server/stream.h	7 Aug 2007 20:53:10 -0000	1.22
+++ server/stream.h	9 Aug 2007 04:18:37 -0000	1.23
@@ -15,6 +15,7 @@
 #include "GnashException.h"
 
 #include <string>
+#include <sstream>
 
 // Define the following macro if you want to want Gnash parser
 // to assume the underlying SWF is well-formed. It would make
@@ -194,9 +195,12 @@
 		void ensureBytes(unsigned long needed)
 		{
 #ifndef GNASH_TRUST_SWF_INPUT
-			if ( get_tag_end_position() - get_position() < needed )
+			unsigned long int left = get_tag_end_position() - get_position();
+			if ( left < needed )
 			{
-				throw ParserException("premature end of tag");
+				std::stringstream ss;
+				ss << "premature end of tag: need to read " << needed << " bytes, but only " << left << " left in this tag";
+				throw ParserException(ss.str());
 			}
 #endif
 		}

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -b -r1.122 -r1.123
--- server/swf/tag_loaders.cpp	8 Aug 2007 18:26:38 -0000	1.122
+++ server/swf/tag_loaders.cpp	9 Aug 2007 04:18:38 -0000	1.123
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: tag_loaders.cpp,v 1.122 2007/08/08 18:26:38 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.123 2007/08/09 04:18:38 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1054,7 +1054,7 @@
 
 	sound_handler* handler = get_sound_handler();
 
-	in->ensureBytes(2+1+4); // character id + flags + sample count
+	in->ensureBytes(2+4+1+4); // character id + flags + sample count
 
 	uint16_t	character_id = in->read_u16();
 
@@ -1318,6 +1318,7 @@
 
     case sound_handler::FORMAT_ADPCM:
       {
+	//log_debug("ADPCM format");
 	// Uncompress the ADPCM before handing data to host.
 	if (sample_count == 0) sample_count = data_bytes / ( stereo ? 4 : 2 );
 	adpcm_expand(data, in, sample_count, stereo);
@@ -1326,6 +1327,7 @@
 	break;
       }
     case sound_handler::FORMAT_RAW:
+	//log_debug("RAW format");
 	// 8- or 16-bit mono or stereo host-endian audio
 	// Convert to 16-bit host-endian
 	if (sample_16bit) {
@@ -1344,6 +1346,7 @@
 	break;
 
     case sound_handler::FORMAT_UNCOMPRESSED:
+	//log_debug("UNCOMPRESSED format");
 	// 8- or 16-bit mono or stereo little-endian audio
 	// Convert to 16-bit host-endian.
 	if (!sample_16bit)
@@ -1393,6 +1396,7 @@
 	break;
 
     case sound_handler::FORMAT_MP3:
+	//log_debug("MP3 format");
 	// Decompressed elsewhere
 	in->ensureBytes(data_bytes); 
 	data = new unsigned char[data_bytes];
@@ -1401,6 +1405,7 @@
 
     case sound_handler::FORMAT_NELLYMOSER_8HZ_MONO:
     case sound_handler::FORMAT_NELLYMOSER:
+	//log_debug("NELLYMOSER format");
 	// One day...
 	in->ensureBytes(data_bytes); 
 	in->skip_bytes(data_bytes);
@@ -1410,6 +1415,7 @@
     // This is impossible as an input but stops fussy compilers
     // complaining about unhandled enum values.
     case sound_handler::FORMAT_NATIVE16:
+	//log_debug("NATIVE16 format");
 	break;
     }
 }
@@ -1738,7 +1744,7 @@
 static void adpcm_expand(
 	unsigned char* &data,
 	stream* in,
-	int sample_count,	// in stereo, this is number of *pairs* of samples
+	int sample_count,	// in stereo, this is number of *pairs* of samples (TODO: why is this signed at all ??)
 	bool stereo)
 {
 	int16_t* out_data = new int16_t[stereo ? sample_count*2 : sample_count];
@@ -1746,11 +1752,27 @@
 
 	// Read header.
 	in->ensureBytes(2);   // header size
-	int	n_bits = in->read_uint(2) + 2;	// 2 to 5 bits
+	unsigned int n_bits = in->read_uint(2) + 2;	// 2 to 5 bits (TODO: use unsigned...)
+
+
+#ifndef GNASH_TRUST_SWF_INPUT
+
+	// bitsPerSample is the number of bits for each sample
+	unsigned int bitsPerSample = n_bits;
+	if (stereo) bitsPerSample *= 2;
+
+	// There's going to be one block every 4096 samples (or fraction)
+	unsigned int blocksCount = (unsigned int)ceil(sample_count/4096);
+
+	// Every block will have an header of 22 bits
+	unsigned int bitsPerBlock = 22;
+
+	unsigned long bytesNeeded = (unsigned long)ceil( ( (sample_count*bitsPerSample) + (bitsPerBlock * blocksCount) ) / 8 );
+
+	//log_debug("adpcm_expand, stereo:%d, sample_count:%d, nbits:%d, bytesNeeded:%d", stereo, sample_count, n_bits, bytesNeeded);
 
-	// 4 is the fixed header for each sample ( 16bit sample id, 6bit stepsize_index )
-	// nbits is the number of bits for each sample
-	in->ensureBytes( sample_count * ( 3 + (int)ceil(n_bits/8) ) );
+	in->ensureBytes(bytesNeeded);
+#endif // GNASH_TRUST_SWF_INPUT
 
 	while (sample_count)
 	{



From MAILER-DAEMON Thu Aug 09 02:22:47 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJ1Pz-0007St-5l
	for mharc-gnash-commit@gnu.org; Thu, 09 Aug 2007 02:22:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJ1Px-0007Sb-34
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 02:22:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJ1Pv-0007SP-LZ
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 02:22:43 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJ1Pv-0007SM-GY
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 02:22:43 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IJ1Pv-0005WN-9D
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 02:22:43 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IJ1Pt-00044A-Ma
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 06:22:41 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IJ1Pt-000447-Eg
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 06:22:41 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJ1Pt-000447-Eg@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Thu, 09 Aug 2007 06:22:41 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/testsuite/misc-swfc.all
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Aug 2007 06:22:45 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/09 06:22:41

New directory:
	testsuite/misc-swfc.all

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/?cvsroot=gnash



From MAILER-DAEMON Thu Aug 09 02:38:21 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJ1f3-0004MB-8B
	for mharc-gnash-commit@gnu.org; Thu, 09 Aug 2007 02:38:21 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJ1f1-0004LU-GN
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 02:38:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJ1f0-0004L4-GG
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 02:38:19 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJ1f0-0004L0-Bx
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 02:38:18 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IJ1ez-0007ja-LW
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 02:38:17 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IJ1ey-0004Zs-VP
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 06:38:17 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IJ1ey-0004Zp-NX
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 06:38:16 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJ1ey-0004Zp-NX@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Thu, 09 Aug 2007 06:38:16 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-swfc.all/Dejagnu...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Aug 2007 06:38:19 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/09 06:38:16

Modified files:
	.              : ChangeLog 
Added files:
	testsuite/misc-swfc.all: Dejagnu.sc Makefile.am check.sc 
	                         hello.sc sound.sc sound.wav 

Log message:
	apply patch#6147 from davr, a test framework by using swfc.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3971&r2=1.3972
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/Dejagnu.sc?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/Makefile.am?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/check.sc?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/hello.sc?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/sound.sc?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/sound.wav?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971
retrieving revision 1.3972
diff -u -b -r1.3971 -r1.3972
--- ChangeLog	9 Aug 2007 04:18:37 -0000	1.3971
+++ ChangeLog	9 Aug 2007 06:38:15 -0000	1.3972
@@ -1,3 +1,9 @@
+2007-08-09 David Rorex  <drorex@gmail.com>
+
+	* testsuite/misc-swfc.all: new directory for testcases.
+	* testsuite/misc-swfc.all/check.sc, Dejagnu.sc, sound.sc, hello.sc,
+	  sound.wav, Makefile.am: new test framework by using swfc.
+
 2007-08-09 Sandro Santilli <strk@keybit.net>
 
 	* server/stream.h (ensureBytes): be more verbose about the lack of

Index: testsuite/misc-swfc.all/Dejagnu.sc
===================================================================
RCS file: testsuite/misc-swfc.all/Dejagnu.sc
diff -N testsuite/misc-swfc.all/Dejagnu.sc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-swfc.all/Dejagnu.sc	9 Aug 2007 06:38:15 -0000	1.1
@@ -0,0 +1,130 @@
+        // Dejagnu.sc - SWFC script for dejagnu-like testing.
+        //
+        //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+        //
+        // This program is free software; you can redistribute it and/or modify
+        // it under the terms of the GNU General Public License as published by
+        // the Free Software Foundation; either version 3 of the License, or
+        // (at your option) any later version.
+        //
+        // This program is distributed in the hope that it will be useful,
+        // but WITHOUT ANY WARRANTY; without even the implied warranty of
+        // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        // GNU General Public License for more details.
+        //
+        // You should have received a copy of the GNU General Public License
+        // along with this program; if not, write to the Free Software
+        // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+        //
+        //
+        // Original author: David Rorex - drorex@gmail.com
+        //
+        //
+
+        _root.Dejagnu = __global.Dejagnu = {
+            passed:0,
+            failed:0,
+            xpassed:0,
+            xfailed:0,
+            untest:0,
+            unresolve:0,
+
+            fail : function (why) {
+                this.failed++;
+                var msg = 'FAILED: '+why;
+                this.xtrace(msg);
+            },
+
+            xfail: function (why) {
+                this.xfailed++;
+                var msg = 'XFAILED: '+why;
+                this.xtrace(msg);
+            },
+
+            pass: function (why) {
+                this.passed++;
+                var msg = 'PASSED: '+why;
+                trace (msg);
+            },
+
+            xpass: function (why) {
+                this.xpassed++;
+                var msg = 'XPASSED: '+why;
+                trace (msg);
+            },
+
+            totals: function () {
+                this.xtrace('#passed: '+ this.passed);
+                this.xtrace('#failed: '+ this.failed);
+                if ( this.xpassed ) {
+                    this.xtrace('#unexpected successes: '+ this.xpassed);
+                }
+                if ( this.xfailed ) {
+                    this.xtrace('#expected failures: '+ this.xfailed);
+                }
+           
+            },
+
+            check_equals: function (obt, exp, msg) {
+                if(msg == null) msg = "";
+                if ( obt == exp ) 
+                    this.pass(obt+' == '+exp);
+                else 
+                    this.fail('expected: "'+exp+'" , obtained: "'+obt+'" '+msg);
+            },
+
+            xcheck_equals: function (obt, exp, msg) {
+                if(msg == null) msg = "";
+                if ( obt == exp ) 
+                    this.xpass(obt+' == '+exp);
+                else 
+                    this.xfail('expected: '+exp+' , obtained: '+obt+" "+msg);
+            },
+
+            check: function (a, msg) {
+                if ( a ) 
+                    this.pass(msg != undefined ? msg : a);
+                else 
+                    this.fail(msg != undefined ? msg : a);
+            },
+
+            xcheck: function (a, msg) {
+                if ( a ) 
+                    this.xpass(msg != undefined ? msg : a);
+                else 
+                    this.xfail(msg != undefined ? msg : a);
+            },
+
+            note: function (msg) {
+                this.xtrace(msg);
+            },
+
+            xtrace: function (msg) {
+                _level0.textout.text += msg + "\n";
+                trace(msg);
+            },
+
+            untested: function (msg) {
+                trace("UNTESTED: "+msg);
+            },
+
+            unresolved: function (msg) {
+                trace("UNRESOLVED: "+msg);
+            },
+
+            done: function () {
+                this.totals();
+                _root.stop();
+            }
+
+        };
+
+        if(_level0.dejagnu_module_initialized != 1) {
+            // create a textfield to output to
+            _level0.createTextField("textout", 99, 10, 10, 500, 500);
+            _level0.dejagnu_module_initialized = 1;
+        }
+
+// helper functions
+#include "check.sc"
+

Index: testsuite/misc-swfc.all/Makefile.am
===================================================================
RCS file: testsuite/misc-swfc.all/Makefile.am
diff -N testsuite/misc-swfc.all/Makefile.am
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-swfc.all/Makefile.am	9 Aug 2007 06:38:16 -0000	1.1
@@ -0,0 +1,86 @@
+## Process this fill with automake to generate Makefile.in
+# 
+# Copyright (C) 2007 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+AUTOMAKE_OPTIONS = dejagnu
+
+# These will get executed and parsed for test output
+SCTESTS = \
+	hello.sc \
+	sound.sc \
+	$(NULL)
+
+# These will get compiled to SWFs just as above, but will not be executed as a test
+# They are for secondary movies to be loaded by the above tests.
+AUXMOVIES = \
+	    $(NULL)
+
+
+EXTRA_DIST = $(SCTESTS) $(AUXMOVIES) check.sc Dejagnu.sc
+
+#if ENABLE_SWFC
+
+SWFC = swfc
+SWFC_FLAGS = 
+SWFC_CPP = cpp -P -I$(srcdir)
+
+SCTESTS_OUT = $(SCTESTS:.sc=.swf)
+
+AUXMOVIES_OUT = $(AUXMOVIES:.sc=.swf)
+
+TEST_DRIVERS = ../simple.exp
+TEST_CASES = \
+	alltests-runner
+
+alltests-runner: $(srcdir)/../generic-testrunner.sh $(SCTESTS_OUT) $(AUXMOVIES_OUT)
+	sh $< -r 50 $(top_builddir) $(SCTESTS_OUT) > $@
+	chmod 755 $@
+
+.sc.swf:
+	$(SWFC_CPP) $< > $(@:%.swf=pp_%.sc) 
+	$(SWFC) $(SWFC_FLAGS) -o $@ $(@:%.swf=pp_%.sc)
+
+CLEANFILES =  \
+	gnash-dbg.log \
+	site.exp.bak \
+	alltests-runner \
+	testrun.* \
+	*.swf \
+	*.pp \
+	pp_*.sc \
+	*_testrunner \
+	*_Runner
+
+check-DEJAGNU: site-update $(TEST_CASES)
+	@runtest=$(RUNTEST); \
+	if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
+	    $$runtest $(RUNTESTFLAGS) $(TEST_DRIVERS); \
+	else \
+	  echo "WARNING: could not find \`runtest'" 1>&2; \
+          for i in "$(TEST_CASES)"; do \
+	    $(SHELL) $$i; \
+	  done; \
+	fi
+
+site-update: site.exp
+	@rm -fr site.exp.bak
+	@cp site.exp site.exp.bak
+	@sed -e '/testcases/d' site.exp.bak > site.exp
+	@echo "# This is a list of the pre-compiled testcases" >> site.exp
+	@echo "set testcases \"$(TEST_CASES)\"" >> site.exp
+
+#endif

Index: testsuite/misc-swfc.all/check.sc
===================================================================
RCS file: testsuite/misc-swfc.all/check.sc
diff -N testsuite/misc-swfc.all/check.sc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-swfc.all/check.sc	9 Aug 2007 06:38:16 -0000	1.1
@@ -0,0 +1,48 @@
+// check.as - Include file for SWFC testcases providing common testing facilities
+//
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
+//
+// Original author: David Rorex - drorex@gmail.com
+//
+
+#ifndef _CHECK_AS_
+#define _CHECK_AS_
+
+#define _INFO_ ' ['+__FILE__+':'+__LINE__+']'
+
+#define check_equals(a, b) Dejagnu.check_equals(a, b, _INFO_);
+//#define check_equals(a, b, msg) Dejagnu.check(a, b, msg + _INFO_);
+
+#define xcheck_equals(a, b) Dejagnu.xcheck_equals(a, b, _INFO_);
+//#define xcheck_equals(a, b, msg) Dejagnu.check(a, b, msg + _INFO_);
+
+#define check(a) Dejagnu.check(a, _INFO_);
+#define xcheck(a) Dejagnu.xcheck(a, _INFO_);
+
+#define pass(text) Dejagnu.pass(text + _INFO_)
+#define xpass(text) Dejagnu.xpass(text + _INFO_)
+#define fail(text) Dejagnu.fail(text + _INFO_)
+#define xfail(text) Dejagnu.xfail(text + _INFO_)
+#define pass(text) Dejagnu.pass(text + _INFO_)
+#define untested(text) Dejagnu.untested(text + _INFO_)
+#define unresolved(text) Dejagnu.unresolved(text + _INFO_)
+
+#define note(text) Dejagnu.note(text + _INFO_);
+
+
+#endif

Index: testsuite/misc-swfc.all/hello.sc
===================================================================
RCS file: testsuite/misc-swfc.all/hello.sc
diff -N testsuite/misc-swfc.all/hello.sc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-swfc.all/hello.sc	9 Aug 2007 06:38:16 -0000	1.1
@@ -0,0 +1,18 @@
+.flash bbox=200x200 filename="hello.swf" version=6 fps=30
+
+//load dejagnu library. This must go after the .flash tag
+
+.frame 1
+  .action:
+    #include "Dejagnu.sc"
+
+    trace("Hello World!");
+    var abc = 123;
+    check_equals(abc, 123);  // check something is equal
+    xcheck_equals(abc, 456); // check something is equal, but expect it to fail
+    var qux = true;
+    check(qux); // check a boolean is true
+    Dejagnu.done(); // don't forget to call this, or the test will not complete
+                    // Note that done() automatically calls stop();
+  .end
+.end

Index: testsuite/misc-swfc.all/sound.sc
===================================================================
RCS file: testsuite/misc-swfc.all/sound.sc
diff -N testsuite/misc-swfc.all/sound.sc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-swfc.all/sound.sc	9 Aug 2007 06:38:16 -0000	1.1
@@ -0,0 +1,54 @@
+.flash bbox=200x200 filename="sound_test.swf" version=6 fps=30
+
+.sound audio "sound.wav"
+
+.box b1 100 100 color=yellow fill=red
+
+.frame 1
+    .action:
+#include "Dejagnu.sc"
+    .end
+
+.frame 2
+	.put b1 pin=center scale=0%
+	.action:
+		var cubesize=0;
+		snd=new Sound();
+		snd.attachSound("audio");
+
+		trace("Sound duration is: ");
+		trace(snd.duration);
+		trace("Correct value should be 13740");
+                check_equals(snd.duration, 13740);
+	
+		trace("Now I'll get the position before starting it");
+		sndpos=snd.position;
+		trace("Position is:");
+		trace(sndpos);
+                check_equals(snd.position, 0);
+		snd.start(0,0);
+	.end
+
+.frame 6
+	.action:
+		cubesize+=1;
+		b1._width=cubesize;
+		b1._height=cubesize;
+		if (cubesize==50) {
+			cubesize=0;
+		}
+
+		if ((snd.position+100)<snd.duration) {
+			gotoandPlay(5);
+		} else {
+			gotoandPlay(8);
+		}
+	.end
+
+.frame 8
+	.action:
+                Dejagnu.done();
+		snd.stop();
+	.end
+	.stop
+.end

Index: testsuite/misc-swfc.all/sound.wav
===================================================================
RCS file: testsuite/misc-swfc.all/sound.wav
diff -N testsuite/misc-swfc.all/sound.wav
Binary files /dev/null and /tmp/cvsACJOp7 differ



From MAILER-DAEMON Thu Aug 09 04:46:50 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJ3fO-0004cE-Ki
	for mharc-gnash-commit@gnu.org; Thu, 09 Aug 2007 04:46:50 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJ3fL-0004ZD-VD
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 04:46:48 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJ3fK-0004Y4-Ms
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 04:46:47 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJ3fK-0004Xs-Jt
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 04:46:46 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IJ3fK-00055K-Az
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 04:46:46 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IJ3fJ-0005KX-JG
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 08:46:45 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IJ3fJ-0005KN-4l
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 08:46:45 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJ3fJ-0005KN-4l@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Thu, 09 Aug 2007 08:46:45 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/testsuite/misc-ming.all DefineEditTextTest.c
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Aug 2007 08:46:48 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/09 08:46:45

Modified files:
	testsuite/misc-ming.all: DefineEditTextTest.c 

Log message:
	removed some useless code.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DefineEditTextTest.c?cvsroot=gnash&r1=1.24&r2=1.25

Patches:
Index: DefineEditTextTest.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/DefineEditTextTest.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- DefineEditTextTest.c	24 Jul 2007 17:41:34 -0000	1.24
+++ DefineEditTextTest.c	9 Aug 2007 08:46:44 -0000	1.25
@@ -125,7 +125,6 @@
   //check(mo, "!TextField.prototype.hasOwnProperty('backgroundColor')");
   //check(mo, "!TextField.prototype.hasOwnProperty('text')");
   //check(mo, "!TextField.prototype.hasOwnProperty('textColor')");
-  //check(mo, "!TextField.prototype.hasOwnProperty('_alpha')");
 
   /*********************************************
    *
@@ -166,7 +165,6 @@
   check(mo, "TextField.prototype.hasOwnProperty('backgroundColor')");
   xcheck(mo, "TextField.prototype.hasOwnProperty('text')");
   check(mo, "TextField.prototype.hasOwnProperty('textColor')");
-  //check(mo, "TextField.prototype.hasOwnProperty('_alpha')");
   
   check_equals(mo, "typeof(dtext1)", "'object'");
   check_equals(mo, "typeof(dtext1.text)", "'string'");



From MAILER-DAEMON Thu Aug 09 06:56:38 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJ5h0-00078B-1G
	for mharc-gnash-commit@gnu.org; Thu, 09 Aug 2007 06:56:38 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJ5gy-000783-4N
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 06:56:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJ5gv-00077n-J3
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 06:56:34 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJ5gv-00077k-FH
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 06:56:33 -0400
Received: from rv-out-0910.google.com ([209.85.198.190])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1IJ5gu-00071S-NB
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 06:56:33 -0400
Received: by rv-out-0910.google.com with SMTP id c27so333929rvf
	for <gnash-commit@gnu.org>; Thu, 09 Aug 2007 03:56:31 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=FNn0QKOL/rL/KX9b1CFwwkMtmJYkPsYHAeT2m6l9YgeubYf2yUZlVO+DrtiTY8C2y/VnylafiOg0YBY6zg+fAwLnbwMn4iJkjsm7UIYK8LCLBC2wwNPc3GAJY5JT7llPZl8BuJIc3YT1ciKAMeDjvlCw1xZ0heANuKK6SQcSiBo=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=WZIhTtIdJOlz47xuNi/NAU4L3Wnj00AuWouFCwNxqMTbGHBp11Q+EupXRUzKY73HDXK6qWHcl9CB+kbARCbPtQAyiwh/Ug1JExW2+ZmIaWP9jFzaPRuskMvm8ZKdDbojNmR9tXUeKIWCjWwXu23EArcr+x81wIWI9DiFgPVYOxI=
Received: by 10.115.77.1 with SMTP id e1mr1189034wal.1186656991104;
	Thu, 09 Aug 2007 03:56:31 -0700 (PDT)
Received: by 10.114.110.5 with HTTP; Thu, 9 Aug 2007 03:56:30 -0700 (PDT)
Message-ID: <ca4b43ff0708090356r25e64153oc0081329ed084fda@mail.gmail.com>
Date: Thu, 9 Aug 2007 18:56:30 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "Sandro Santilli" <strk@keybit.net>
Subject: Re: [Gnash-commit] gnash ChangeLog server/as_value.cpp server/as_v...
In-Reply-To: <E1II9Pl-000622-Ra@cvs.savannah.gnu.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1II9Pl-000622-Ra@cvs.savannah.gnu.org>
X-Detected-Kernel: Linux 2.6 (newer, 2)
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Aug 2007 10:56:36 -0000

"Make check" failed here today with cvs head.  Can anyone confirm me?
BTW, I'm still using Ming0.4.beta4, but I didn't get this before.

Here are the reports:
(1)
cd testsuite/actionscript.all
make check

FAIL: astests-v6-Runner: ! mc.hasOwnProperty('onEnterFrame')
[./MovieClip.as:192]
FAIL: astests-v7-Runner: ! mc.hasOwnProperty('onEnterFrame')
[./MovieClip.as:192]

(2)
 cd testsuite/misc-ming.all
 make check

FAIL: intervalTestRunner: tmp.to_number() == '1' (expected: 2)
[intervalTestRunner.cpp:94]
FAIL: intervalTestRunner: tmp.to_number() == '2' (expected: 3)
[intervalTestRunner.cpp:101]
FAIL: intervalTestRunner: tmp.to_number() == '3' (expected: 4)
[intervalTestRunner.cpp:108]
FAIL: intervalTestRunner: tmp.to_number() == '4' (expected: 5)
[intervalTestRunner.cpp:113]
FAIL: intervalTestRunner: tmp.to_number() == '3' (expected: 4)
[intervalTestRunner.cpp:115]
FAIL: intervalTestRunner: tmp.to_number() == '8' (expected: 1)
[intervalTestRunner.cpp:122]


On 8/7/07, Sandro Santilli <strk@keybit.net> wrote:
> CVSROOT:        /sources/gnash
> Module name:    gnash
> Changes by:     Sandro Santilli <strk>  07/08/06 20:42:57
>
> Modified files:
>         .              : ChangeLog
>         server         : as_value.cpp as_value.h
>         server/vm      : ASHandlers.cpp
>         testsuite/swfdec: PASSING
>
> Log message:
>                 * server/as_value.{cpp,h}: add a to_int() method taking
>                   care of compatible integer conversion. Add note about
>                   deprecation of templated to_number<>.
>                 * server/vm/ASHandlers.cpp: explicitly use to_int() in bitwise
>                   ops. Fixes ops.as testcases built with newer Ming. Add TODO
>                   lines about possible other uses.
>                 * testsuite/swfdec/PASSING: bitwise-{5,6,7}.swf now pass.
>
> CVSWeb URLs:
> http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3955&r2=1.3956
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.63&r2=1.64
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.h?cvsroot=gnash&r1=1.61&r2=1.62
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.117&r2=1.118
> http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/PASSING?cvsroot=gnash&r1=1.24&r2=1.25
>
> Patches:
> Index: ChangeLog
> ===================================================================
> RCS file: /sources/gnash/gnash/ChangeLog,v
> retrieving revision 1.3955
> retrieving revision 1.3956
> diff -u -b -r1.3955 -r1.3956
> --- ChangeLog   6 Aug 2007 19:30:47 -0000       1.3955
> +++ ChangeLog   6 Aug 2007 20:42:56 -0000       1.3956
> @@ -1,5 +1,15 @@
>  2007-08-06 Sandro Santilli <strk@keybit.net>
>
> +       * server/as_value.{cpp,h}: add a to_int() method taking
> +         care of compatible integer conversion. Add note about
> +         deprecation of templated to_number<>.
> +       * server/vm/ASHandlers.cpp: explicitly use to_int() in bitwise
> +         ops. Fixes ops.as testcases built with newer Ming. Add TODO
> +         lines about possible other uses.
> +       * testsuite/swfdec/PASSING: bitwise-{5,6,7}.swf now pass.
> +
> +2007-08-06 Sandro Santilli <strk@keybit.net>
> +
>         * testsuite/actionscript.all/ops.as: add test for 0xffffffff
>           conversion to integer needing to be -1 (gnash fails, need Ming head
>           to reproduce)
>
> Index: server/as_value.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/server/as_value.cpp,v
> retrieving revision 1.63
> retrieving revision 1.64
> diff -u -b -r1.63 -r1.64
> --- server/as_value.cpp 2 Aug 2007 20:11:35 -0000       1.63
> +++ server/as_value.cpp 6 Aug 2007 20:42:57 -0000       1.64
> @@ -330,6 +330,26 @@
>         /* NOTREACHED */
>  }
>
> +int32_t
> +as_value::to_int(as_environment& env) const
> +{
> +       double d = to_number(&env);
> +       int i=0;
> +
> +       if ( ! isfinite(d) ) return 0;
> +
> +       if (d < 0)
> +       {
> +               i = - (uint32_t) fmod (-d, 4294967296.0);
> +       }
> +       else
> +       {
> +               i = (uint32_t) fmod (d, 4294967296.0);
> +       }
> +
> +       return i;
> +}
> +
>  // Conversion to boolean for SWF7 and up
>  bool
>  as_value::to_bool_v7() const
>
> Index: server/as_value.h
> ===================================================================
> RCS file: /sources/gnash/gnash/server/as_value.h,v
> retrieving revision 1.61
> retrieving revision 1.62
> diff -u -b -r1.61 -r1.62
> --- server/as_value.h   2 Aug 2007 18:28:42 -0000       1.61
> +++ server/as_value.h   6 Aug 2007 20:42:57 -0000       1.62
> @@ -15,7 +15,7 @@
>  // along with this program; if not, write to the Free Software
>  // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>
> -/* $Id: as_value.h,v 1.61 2007/08/02 18:28:42 strk Exp $ */
> +/* $Id: as_value.h,v 1.62 2007/08/06 20:42:57 strk Exp $ */
>
>  #ifndef GNASH_AS_VALUE_H
>  #define GNASH_AS_VALUE_H
> @@ -330,7 +330,7 @@
>         ///
>         const std::string&      to_string_versioned(int version, as_environment* env=NULL) const;
>
> -       /// Conversion to number
> +       /// Conversion to number (double)
>         //
>         /// @param env
>         ///     The environment to use for running the valueOf() method
> @@ -338,10 +338,26 @@
>         ///
>         double  to_number(as_environment* env=NULL) const;
>
> +       /// Conversion to 32bit integer
> +       //
> +       /// Use this conversion whenever an int is needed.
> +       /// This is NOT the same as calling to_number<int32_t>().
> +       ///
> +       /// @param env
> +       ///     The environment to use for running the valueOf() method
> +       ///     for object values.
> +       ///
> +       int32_t to_int(as_environment& env) const;
> +
>         /// Shorthand: casts the result of to_number() to the requested number
>         /// type.
>         //
>         /// Parameter identical to that of to_number().
> +       ///
> +       /// TODO: deprecate this function, it gets confusing as when an integer
> +       ///       is needed the caller should invoke to_int() rather then to_number().
> +       ///       Implementing specializations for *all* integer types might be tedious
> +       ///
>         template <typename T>
>         T to_number (as_environment* env=NULL) const
>         {
>
> Index: server/vm/ASHandlers.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
> retrieving revision 1.117
> retrieving revision 1.118
> diff -u -b -r1.117 -r1.118
> --- server/vm/ASHandlers.cpp    6 Aug 2007 18:24:19 -0000       1.117
> +++ server/vm/ASHandlers.cpp    6 Aug 2007 20:42:57 -0000       1.118
> @@ -17,7 +17,7 @@
>  // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  //
>
> -/* $Id: ASHandlers.cpp,v 1.117 2007/08/06 18:24:19 strk Exp $ */
> +/* $Id: ASHandlers.cpp,v 1.118 2007/08/06 20:42:57 strk Exp $ */
>
>  #ifdef HAVE_CONFIG_H
>  #include "config.h"
> @@ -867,7 +867,7 @@
>
>      int size = unsigned(size_val.to_number(&env));
>
> -    int        base = int(base_val.to_number(&env));
> +    int        base = int(base_val.to_number(&env)); // TODO: use to_int ?
>      int version = env.get_version();
>      const std::string& str = string_val.to_string_versioned(version);
>
> @@ -950,7 +950,7 @@
>  //    GNASH_REPORT_FUNCTION;
>      as_environment& env = thread.env;
>      thread.ensureStack(1);
> -    env.top(0).set_int(int(floor(env.top(0).to_number(&env))));
> +    env.top(0).set_int(int(floor(env.top(0).to_number(&env)))); // TODO: use to_int ?
>  }
>
>  void
> @@ -1146,7 +1146,7 @@
>
>         thread.ensureStack(3);
>
> -       int depth = int(env.top(0).to_number(&env))+character::staticDepthOffset;
> +       int depth = int(env.top(0).to_number(&env))+character::staticDepthOffset; // TODO: use to_int ?
>         const std::string& newname = env.top(1).to_string(&env);
>         const std::string& path = env.top(2).to_string(&env);
>
> @@ -1379,7 +1379,7 @@
>
>         thread.ensureStack(1);  // max
>
> -       int     max = int(env.top(0).to_number(&env));
> +       int     max = int(env.top(0).to_number(&env)); // TODO: use to_int ?
>         if (max < 1) max = 1;
>         env.top(0).set_int(tu_random::next_random() % max);
>  }
> @@ -1416,7 +1416,7 @@
>      as_environment& env = thread.env;
>      thread.ensureStack(1);
>      char       buf[2];
> -    buf[0] = int(env.top(0).to_number(&env));
> +    buf[0] = int(env.top(0).to_number(&env)); // TODO: use to_int() ?
>      buf[1] = 0;
>      env.top(0).set_string(buf);
>  }
> @@ -3072,14 +3072,10 @@
>         as_environment& env = thread.env;
>         thread.ensureStack(2);
>
> -       double operand1 = env.top(1).to_number(&env);
> -       double operand2 = env.top(0).to_number(&env);
> -
> -       // TODO: have as_value::to_number<int> handle this ?
> -       if ( isnan(operand1) ) operand1 = 0;
> -       if ( isnan(operand2) ) operand2 = 0;
> +       int operand1 = env.top(1).to_int(env);
> +       int operand2 = env.top(0).to_int(env);
>
> -       env.top(1) = int(operand1) & int(operand2);
> +       env.top(1) = operand1 & operand2;
>         env.drop(1);
>  }
>
> @@ -3090,14 +3086,10 @@
>         as_environment& env = thread.env;
>         thread.ensureStack(2);
>
> -       double operand1 = env.top(1).to_number(&env);
> -       double operand2 = env.top(0).to_number(&env);
> +       int operand1 = env.top(1).to_int(env);
> +       int operand2 = env.top(0).to_int(env);
>
> -       // TODO: have as_value::to_number<int> handle this ?
> -       if ( isnan(operand1) ) operand1 = 0;
> -       if ( isnan(operand2) ) operand2 = 0;
> -
> -       env.top(1) = int(operand1)|int(operand2);
> +       env.top(1) = operand1|operand2;
>         env.drop(1);
>  }
>
> @@ -3109,14 +3101,10 @@
>         as_environment& env = thread.env;
>         thread.ensureStack(2);
>
> -       double operand1 = env.top(1).to_number(&env);
> -       double operand2 = env.top(0).to_number(&env);
> -
> -       // TODO: have as_value::to_number<int> handle this ?
> -       if ( isnan(operand1) ) operand1 = 0;
> -       if ( isnan(operand2) ) operand2 = 0;
> +       int operand1 = env.top(1).to_int(env);
> +       int operand2 = env.top(0).to_int(env);
>
> -       env.top(1) = int(operand1)^int(operand2);
> +       env.top(1) = operand1^operand2;
>         env.drop(1);
>  }
>
> @@ -3130,13 +3118,10 @@
>         as_environment& env = thread.env;
>         thread.ensureStack(2);
>
> -       double operand1 = env.top(1).to_number(&env);
> -       double operand2 = env.top(0).to_number(&env);
> -
> -       // TODO: have as_value::to_number<int> handle this ?
> -       if ( isnan(operand1) ) operand1=0;
> +       int16_t operand1 = env.top(1).to_int(env);
> +       int16_t operand2 = env.top(0).to_int(env);
>
> -       env.top(1) = int16_t(operand1) << int(operand2);
> +       env.top(1) = operand1 << operand2;
>         env.drop(1);
>  }
>
> @@ -3150,13 +3135,10 @@
>         as_environment& env = thread.env;
>         thread.ensureStack(2);
>
> -       double operand1 = env.top(1).to_number(&env);
> -       double operand2 = env.top(0).to_number(&env);
> +       int16_t operand1 = env.top(1).to_int(env);
> +       int operand2 = env.top(0).to_int(env);
>
> -       // TODO: have as_value::to_number<int> handle this ?
> -       if ( isnan(operand1) ) operand1=0;
> -
> -       env.top(1) = int16_t(operand1) >> int(operand2);
> +       env.top(1) = operand1 >> operand2;
>         env.drop(1);
>  }
>
> @@ -3169,13 +3151,10 @@
>         as_environment& env = thread.env;
>         thread.ensureStack(2);
>
> -       double operand1 = env.top(1).to_number(&env);
> -       double operand2 = env.top(0).to_number(&env);
> -
> -       // TODO: have as_value::to_number<int> handle this ?
> -       if ( isnan(operand1) ) operand1=0;
> +       uint32_t operand1 = env.top(1).to_int(env);
> +       int operand2 = env.top(0).to_int(env);
>
> -       env.top(1) = uint32_t(operand1) >> int(operand2);
> +       env.top(1) = operand1 >> operand2;
>         env.drop(1);
>  }
>
>
> Index: testsuite/swfdec/PASSING
> ===================================================================
> RCS file: /sources/gnash/gnash/testsuite/swfdec/PASSING,v
> retrieving revision 1.24
> retrieving revision 1.25
> diff -u -b -r1.24 -r1.25
> --- testsuite/swfdec/PASSING    11 Jul 2007 00:33:57 -0000      1.24
> +++ testsuite/swfdec/PASSING    6 Aug 2007 20:42:57 -0000       1.25
> @@ -93,3 +93,6 @@
>  instance-name-loaded-5.swf
>  instance-name-loaded-6.swf
>  instance-name-loaded-7.swf
> +bitwise-5.swf
> +bitwise-6.swf
> +bitwise-7.swf
>
>
> _______________________________________________
> Gnash-commit mailing list
> Gnash-commit@gnu.org
> http://lists.gnu.org/mailman/listinfo/gnash-commit
>



From MAILER-DAEMON Thu Aug 09 07:43:15 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJ6Q7-0008Lw-J3
	for mharc-gnash-commit@gnu.org; Thu, 09 Aug 2007 07:43:15 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJ6Q5-0008LX-Fo
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 07:43:13 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJ6Q3-0008L9-Un
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 07:43:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJ6Q3-0008L5-OJ
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 07:43:11 -0400
Received: from wa-out-1112.google.com ([209.85.146.180])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1IJ6Q3-00084U-6X
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 07:43:11 -0400
Received: by wa-out-1112.google.com with SMTP id k34so502098wah
	for <gnash-commit@gnu.org>; Thu, 09 Aug 2007 04:43:09 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=bmWfQCFaEmOvWZGqfoaLdAR19vYKXd4VmWL1EiP0wmzVi1gPCn1lHACauR/iiMLf/IE7lH+BUwFnFy2MnZWkRqRS4Pyq2Y7KnYGyFxjA77JmrSHMaix5SporcOkXu7EXjkavOhZNZt7HVrtuMWuPHxWzlbv7VG/cMaLhRdGnfMI=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=ti1pX4To6h3vBPPzzdV+jqurNEDzeKUT+zXxsdSZpW1lUt7ZHEaVWqEzk6hqRCNRtBOugQr+W7rTHp6wb0oUGAmxRIbT6L8ltQB1g4ZJWvRKF6+vkDYejsr73IhwOPaJqjgQR+aZRUbGCp4fcGirWbVUWO9LiPw7XhQoMEDYIf0=
Received: by 10.115.90.1 with SMTP id s1mr2379805wal.1186659789504;
	Thu, 09 Aug 2007 04:43:09 -0700 (PDT)
Received: by 10.114.110.5 with HTTP; Thu, 9 Aug 2007 04:43:09 -0700 (PDT)
Message-ID: <ca4b43ff0708090443p3366cf96y14ac2792c2dcd9e8@mail.gmail.com>
Date: Thu, 9 Aug 2007 19:43:09 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "Sandro Santilli" <strk@keybit.net>
Subject: Re: [Gnash-commit] gnash ChangeLog server/as_value.cpp server/as_v...
In-Reply-To: <ca4b43ff0708090356r25e64153oc0081329ed084fda@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1II9Pl-000622-Ra@cvs.savannah.gnu.org>
	<ca4b43ff0708090356r25e64153oc0081329ed084fda@mail.gmail.com>
X-Detected-Kernel: Linux 2.6 (newer, 2)
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Aug 2007 11:43:13 -0000

On 8/9/07, zou lunkai <zoulunkai@gmail.com> wrote:
> "Make check" failed here today with cvs head.  Can anyone confirm me?
> BTW, I'm still using Ming0.4.beta4, but I didn't get this before.
>
> Here are the reports:
> (1)
> cd testsuite/actionscript.all
> make check
>
> FAIL: astests-v6-Runner: ! mc.hasOwnProperty('onEnterFrame')
> [./MovieClip.as:192]
> FAIL: astests-v7-Runner: ! mc.hasOwnProperty('onEnterFrame')
> [./MovieClip.as:192]
>
These are reproduceable.

> (2)
>  cd testsuite/misc-ming.all
>  make check
>
> FAIL: intervalTestRunner: tmp.to_number() == '1' (expected: 2)
> [intervalTestRunner.cpp:94]
> FAIL: intervalTestRunner: tmp.to_number() == '2' (expected: 3)
> [intervalTestRunner.cpp:101]
> FAIL: intervalTestRunner: tmp.to_number() == '3' (expected: 4)
> [intervalTestRunner.cpp:108]
> FAIL: intervalTestRunner: tmp.to_number() == '4' (expected: 5)
> [intervalTestRunner.cpp:113]
> FAIL: intervalTestRunner: tmp.to_number() == '3' (expected: 4)
> [intervalTestRunner.cpp:115]
> FAIL: intervalTestRunner: tmp.to_number() == '8' (expected: 1)
> [intervalTestRunner.cpp:122]
>
Ah, I can not reproduce these every time.



From MAILER-DAEMON Thu Aug 09 08:18:16 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJ6y0-0000yM-FQ
	for mharc-gnash-commit@gnu.org; Thu, 09 Aug 2007 08:18:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJ6xy-0000yA-1W
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 08:18:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJ6xv-0000xJ-Nh
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 08:18:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJ6xv-0000xG-Hy
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 08:18:11 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IJ6xu-00009F-Nq
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 08:18:11 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IJ6xs-0005O2-PZ
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 12:18:09 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IJ6xs-0005Ny-7O
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 12:18:08 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJ6xs-0005Ny-7O@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Thu, 09 Aug 2007 12:18:08 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/character.h server/dlist...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Aug 2007 12:18:14 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/09 12:18:07

Modified files:
	.              : ChangeLog 
	server         : character.h dlist.cpp sprite_instance.cpp 
	                 sprite_instance.h 
	server/parser  : Timeline.h morph2_character_def.cpp 
	                 movie_def_impl.h movie_definition.h 
	                 sprite_definition.h 
	server/swf     : PlaceObject2Tag.cpp 
	testsuite/misc-ming.all: place_and_remove_object_insane_test.c 

Log message:
	Hopefully improved the old timeline design.
	
	* server/character.h: add a constant 'noRatioValue'.
	* server/dlist.cpp: In function move_display_object(), don't set ratio
	  to zero when no ratio value provided by the displaylist tags; In function
	  reset(), remove all none-referenceable characters.
	* server/parser/timeline.h: revert to 1.3, keep strk's design, use std::set
	  instead of std::map.
	* server/parser/movie_def_impl.h, movie_definition.h, sprite_definition.h:
	  update interface of getTimelineDepths().
	* server/parser/morph2_character_def.cpp: set ratio value to zero at rendering 
	 time when no one is provided. 
	* server/sprite_instance.h: add a member variable is_jumping_back.
	* server/sprite_instance.cpp: reimplement add_display_object(); cleanup 
	  goto_frame(); wipe out timeline design 1,2,3; deprecate resetDisplayList();
	  ready to deprcate 'replace_if_depth_is_occupied '.
	* server/swf/placeObject2Tag.cpp: set ratio to character::NoRatioValue instead of
	  zero when no ratio provided.
	* testsuite/misc-ming.all/place_and_remove_object_insane_test.c: xchecks to  
	  checks. should fix bug 20504.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3972&r2=1.3973
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.86&r2=1.87
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.cpp?cvsroot=gnash&r1=1.74&r2=1.75
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.306&r2=1.307
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.128&r2=1.129
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/Timeline.h?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/morph2_character_def.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.h?cvsroot=gnash&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_definition.h?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/sprite_definition.h?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/PlaceObject2Tag.cpp?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/place_and_remove_object_insane_test.c?cvsroot=gnash&r1=1.11&r2=1.12

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3972
retrieving revision 1.3973
diff -u -b -r1.3972 -r1.3973
--- ChangeLog	9 Aug 2007 06:38:15 -0000	1.3972
+++ ChangeLog	9 Aug 2007 12:18:04 -0000	1.3973
@@ -1,3 +1,24 @@
+2007-08-09 Zou Lunkai <zoulunkai@gmail.com>
+	
+	* server/character.h: add a constant 'noRatioValue'.
+	* server/dlist.cpp: In function move_display_object(), don't set ratio
+	  to zero when no ratio value provided by the displaylist tags; In function
+	  reset(), remove all none-referenceable characters.
+	* server/parser/timeline.h: revert to 1.3, keep strk's design, use std::set
+	  instead of std::map.
+	* server/parser/movie_def_impl.h, movie_definition.h, sprite_definition.h:
+	  update interface of getTimelineDepths().
+	* server/parser/morph2_character_def.cpp: set ratio value to zero at rendering 
+	  time when no one is provided. 
+	* server/sprite_instance.h: add a member variable is_jumping_back.
+	* server/sprite_instance.cpp: reimplement add_display_object(); cleanup 
+	  goto_frame(); wipe out timeline design 1,2,3; deprecate resetDisplayList();
+	  ready to deprcate 'replace_if_depth_is_occupied '.
+	* server/swf/placeObject2Tag.cpp: set ratio to character::NoRatioValue instead of
+	  zero when no ratio provided.
+	* testsuite/misc-ming.all/place_and_remove_object_insane_test.c: xchecks to checks.
+	  should fix bug 20504. All in all, hopefully improved the old timeline design.
+	
 2007-08-09 David Rorex  <drorex@gmail.com>
 
 	* testsuite/misc-swfc.all: new directory for testcases.

Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- server/character.h	10 Jul 2007 21:43:00 -0000	1.86
+++ server/character.h	9 Aug 2007 12:18:05 -0000	1.87
@@ -19,7 +19,7 @@
 //
 //
 
-/* $Id: character.h,v 1.86 2007/07/10 21:43:00 strk Exp $ */
+/* $Id: character.h,v 1.87 2007/08/09 12:18:05 zoulunkai Exp $ */
 
 #ifndef GNASH_CHARACTER_H
 #define GNASH_CHARACTER_H
@@ -344,6 +344,9 @@
     /// value should not collide with real depths.  
     static const int noClipDepthValue = -1000000;
 
+	// Maybe it's better to move all these constants to DisplayListTag
+	static const int noRatioValue = -1;
+
     ~character();
 
     character(character* parent, int id)

Index: server/dlist.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- server/dlist.cpp	24 Jul 2007 13:25:10 -0000	1.74
+++ server/dlist.cpp	9 Aug 2007 12:18:05 -0000	1.75
@@ -263,7 +263,10 @@
 	ch->set_depth(depth);
 	if ( color_xform ) ch->set_cxform(*color_xform);
 	if ( mat ) ch->set_matrix(*mat);
+	if(ratio != character::noRatioValue)
+	{
 	ch->set_ratio(ratio);
+	}
 	ch->set_clip_depth(clip_depth);
 	ch->restart();
 
@@ -367,7 +370,10 @@
 	{
 		ch->set_matrix(*mat);
 	}
+	if(ratio != character::noRatioValue)
+	{
 	ch->set_ratio(ratio);
+	}
 }
 	
 	
@@ -503,7 +509,7 @@
 
 	// 1. Find all "timeline depth" for the target frame, querying the
 	//    Timeline object in the sprite/movie definition (see implementation details)
-	std::map<int, int>  save;
+	std::vector<int>  save;
 	movieDef.getTimelineDepths(tgtFrame, save);
 
 //#define GNASH_DEBUG_TIMELINE 1
@@ -517,7 +523,7 @@
 #endif
 
 
-	typedef std::map<int, int>::iterator SeekIter;
+	typedef std::vector<int>::iterator SeekIter;
 
 	SeekIter startSeek = save.begin();
         SeekIter endSeek = save.end();
@@ -544,27 +550,18 @@
 			continue;
 		}
 
-#if 0 // let's handle this at PlaceObject2 execution time... an instance placed by REPLACE tag
-      // in a subsequent frame will be replaced again rather then left untouched.
-      // This is to allow later fixing of REPLACE tag to avoid creation of a new instance
-      // (see replace_shapes1test.swf and replace_sprites1test.swf)
-
-		// Remove if placed by REPLACE tag in a later frame
-		if ( info->placedByReplaceTag() && info->placedInFrame() > tgtFrame )
+		// remove all shapes and morphs, it should be safe and correct.
+		// but suboptimal when considering the invalidated bound.
+		// we need to do this in some corner cases. 
+		if(!di->isActionScriptReferenceable())
 		{
-			// Not to be saved, killing
-			// [ replace_sprites1test.swf and replace_shapes1test.swf seems to not want the replace ... ]
-			if ( call_unload ) di->unload();
 			it = _characters.erase(it);
 			continue;
 		}
-#endif
 
 		/// Only remove if not in the save vector, 
-		/// or in the save vector but has a different ratio value
-		SeekIter match = save.find(di_depth);
-		if( match == save.end() || 
-			( match != save.end() && match->second != di->get_ratio() ))
+		SeekIter match = std::find(startSeek, endSeek, di_depth);
+		if( match == save.end())
 		{
 			// Not to be saved, killing
 			if ( call_unload ) di->unload();

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -b -r1.306 -r1.307
--- server/sprite_instance.cpp	8 Aug 2007 20:08:58 -0000	1.306
+++ server/sprite_instance.cpp	9 Aug 2007 12:18:06 -0000	1.307
@@ -73,11 +73,6 @@
 //#define GNASH_DEBUG_TIMELINE 1
 //#define GNASH_DEBUG_REPLACE 1
 
-// Unfed for original design, 2 for second redesign attempt, 3 for third redesign attempt
-#define NEW_TIMELINE_DESIGN 3
-
-
-
 // Forward declarations
 static as_object* getMovieClipInterface();
 static void attachMovieClipInterface(as_object& o);
@@ -1723,6 +1718,7 @@
 	m_play_state(PLAY),
 	m_current_frame(0),
 	m_has_looped(false),
+	is_jumping_back(false),
 	m_init_actions_executed(),
 	m_as_environment(),
 	m_has_key_event(false),
@@ -2289,7 +2285,8 @@
 				// TODO: check why this would be any different
 				//       then calling restoreDisplayList(0) instead..
 				//       Ah! I think I know..
-				resetDisplayList();
+				//resetDisplayList();
+				restoreDisplayList(0); // seems OK to me.
 			}
 
 			// TODO: Make sure m_current_frame is 0-based during execution of DLIST tags
@@ -2373,6 +2370,9 @@
 		if (m_has_key_event)
 		{
 #ifdef NEW_KEY_LISTENER_LIST_DESIGN
+			// TODO: Don't do this at every advancement
+			// OnClip key handlers should be registered at construction time, 
+			// User defined handlers should be registered explicitly by Key.addListener();
 			_vm.getRoot().add_key_listener(KeyListener(this, KeyListener::ON_CLIP_DEF));
 #else
 			_vm.getRoot().add_key_listener(this);
@@ -2448,113 +2448,6 @@
 	};
 }
 
-#if NEW_TIMELINE_DESIGN == 2 // 2nd redesign attempt
-
-/// A DisplayList visitor used to extract timeline instances that
-/// should be removed when rewinding playhead to a given frame
-///
-///
-/// See http://www.gnashdev.org/wiki/index.php/TimelineControl for
-/// more informations.
-///
-class TimelineInstanceFinder {
-
-	std::vector<character*> _toRemove;
-
-	// target frame, 0-based
-	size_t _frame;
-
-public:
-
-	/// @param tgtFrame
-	///	The frame to which we're rewinding. 0-based.
-	///
-	TimelineInstanceFinder(size_t tgtFrame)
-		:
-		_frame(tgtFrame)
-	{
-	}
-
-	/// Return a vector of characters to remove
-	std::vector<character*>& toRemove() { return _toRemove; }
-
-	bool operator() (character* ch) 
-	{
-		int depth = ch->get_depth();
-
-		// Timeline instances are always initially placed
-		// at negative depths and we don't want to remove those
-		// moved to different depths, so when depth 0 is
-		// reached our scan is complete.
-		if ( depth >= 0 )
-		{
-#ifdef GNASH_DEBUG_TIMELINE
-			cout << this << "] Char at depth " << depth << " reached, end scan" << endl;
-#endif
-			return false;
-		}
-
-		TimelineInfo* info = ch->getTimelineInfo();
-		if ( ! info )
-		{
-#ifdef GNASH_DEBUG_TIMELINE
-			cout << this << "] Char at depth " << depth
-				<< " is not a timeline, will remove" << endl;
-#endif
-			// non-timeline instances in static depth zone
-			// needs to be removed
-			_toRemove.push_back(ch);
-		}
-		else
-		{
-#ifdef GNASH_DEBUG_TIMELINE
-			cout << this << "] Char at depth " << depth
-				<< " is a timeline instance, placed originally in frame "
-				<< info->placedInFrame() << " at depth "
-				<< info->placedAtDepth() << endl;
-#endif
-
-			// timeline instances created after the target frame
-			// are always removed (those in the 'dynamic depth zone'
-			// won't get to this point)
-			if ( info->placedInFrame() > _frame )
-			{
-#ifdef GNASH_DEBUG_TIMELINE
-			        cout << this << "] will remove "
-					<< "(placed after target frame "
-					<< _frame << ")" << endl;
-#endif
-				_toRemove.push_back(ch);
-			}
-
-			// timeline instances created before or at the target frame
-			// are only removed if they are no more at the original depth
-			else if ( info->placedAtDepth() != depth )
-			{
-#ifdef GNASH_DEBUG_TIMELINE
-			        cout << this << "] will remove "
-					<< "(originally at a different depth)"
-					<< endl;
-#endif
-				_toRemove.push_back(ch);
-			}
-
-#ifdef GNASH_DEBUG_TIMELINE
-			else
-			{
-			        cout << this << "] will keep "
-					<< "(none of the above applied)"
-					<< endl;
-			}
-#endif
-		}
-
-		return true;
-	}
-};
-
-#endif // NEW_TIMELINE_DESIGN == 2
-
 /*private*/
 void
 sprite_instance::restoreDisplayList(size_t tgtFrame)
@@ -2564,47 +2457,14 @@
 	//       for jump-forwards would do
 	assert(tgtFrame <= m_current_frame);
 
-#if NEW_TIMELINE_DESIGN == 2 // 2nd redesign attempt
-
-	// 1. Remove from current DisplayList:
-	// 	- Timeline instances constructed after target frame are always removed.
-	// 	- Timeline instances constructed before or at the target frame but no more at the original depth are removed.
-	//  	- Dynamic instances found in the static depth zone 
-	
-	TimelineInstanceFinder finder(tgtFrame);
-#ifdef GNASH_DEBUG_TIMELINE
-	cout << "TimelineInstanceFinder " << &finder << " created for target frame " << tgtFrame << " from frame " << m_current_frame << endl;
-#endif
-	const_cast<DisplayList&>(m_display_list).visitForward(finder);
-	std::vector<character*>& toRemove = finder.toRemove();
-
-#ifdef GNASH_DEBUG_TIMELINE
-	cout << toRemove.size() << " chars found to remove." << endl;
-#endif
-	if ( ! toRemove.empty() )
-	{
-#ifdef GNASH_DEBUG_TIMELINE
-		cout << "Found to remove: " << endl;
-		std::ostream_iterator<as_value> ostrIter(cout, "," ) ;
-		std::copy(toRemove.begin(), toRemove.end(), ostrIter);
-		cout << "Current DisplayList: " << m_display_list << endl;
-#endif
-
-		set_invalidated(); 
-		m_display_list.clear(toRemove, true); // call onUnload
-
-#ifdef GNASH_DEBUG_TIMELINE
-		cout << "DisplayList after removal: " << m_display_list << endl;
-#endif
-	}
-
-#elif NEW_TIMELINE_DESIGN == 3 // 3rd redesign attempt
+	is_jumping_back = true; //remember we are jumping back
 
 	// 1. Find all "timeline depth" for the target frame, querying the
 	//    Timeline object in the sprite/movie definition (see implementation details)
 	// 2. Remove step 
 	// 2.1 Remove all current dynamic instances found in static depth zone 
 	// 2.2 Remove all current timeline instances at a depth NOT in the set found in step 1 
+	//  2.3 Remove all non-script-referencable instances, suboptimal!
 
 	// TODO: try to optize by avoid calling set_invalidated
 	DisplayList newList = m_display_list;
@@ -2617,10 +2477,7 @@
 		m_display_list = newList;
 	}
 
-#endif // NEW_TIMELINE_DESIGN == 3
-
-
-	// 2. Execute all displaylist tags from first to target frame 
+	// 3. Execute all displaylist tags from first to target frame 
 
 	for (size_t f = 0; f<=tgtFrame; ++f)
 	{
@@ -2633,6 +2490,7 @@
 		execute_frame_tags(f, TAG_DLIST);
 	}
 
+	is_jumping_back = false; // finished jumping back
 }
 
 // 0-based frame number !
@@ -2740,7 +2598,8 @@
 
 	// Unless the target frame is the next one, stop playback of soundstream
 	int stream_id = get_sound_stream_id();
-	if (target_frame_number != m_current_frame+1 && stream_id != -1) {
+    if (target_frame_number != m_current_frame+1 && stream_id != -1) 
+	{
 		sound_handler* sh = get_sound_handler();
 		if (sh != NULL) sh->stop_sound(stream_id);
 		set_sound_stream_id(-1);
@@ -2773,13 +2632,9 @@
 	if (target_frame_number < m_current_frame)
 	// Go backward to a previous frame
 	{
-#ifdef NEW_TIMELINE_DESIGN // new design
 		// restoreDisplayList takes care of properly setting the m_current_frame variable
 		restoreDisplayList(target_frame_number);
 		assert(m_current_frame == target_frame_number);
-#else // old design
-
-		set_invalidated(); 
 
   // <UdoG> current design is sub-optimal because it causes unnecessary 
   // redraw. Consider a static graphic that stays at it's position all
@@ -2790,41 +2645,12 @@
   // set_invalidated() call (which currently *is* correct) will cause
   // redraw of the whole sprite even if it doesn't change visually
   // at all.
-
-
-		resetDisplayList();
-		for (size_t f = 0; f<=target_frame_number; f++)
-		{
-			execute_frame_tags(f, TAG_DLIST);
-		}
-#endif
 	}
 	else
 	// Go forward to a later frame
 	{
 		// We'd immediately return if target_frame_number == m_current_frame
 		assert(target_frame_number > m_current_frame);
-
-		// Construct the DisplayList of the target frame
-#ifdef NEW_TIMELINE_DESIGN
-		while (m_current_frame++ < target_frame_number)
-		{
-#ifdef GNASH_DEBUG_TIMELINE
-			cout << "Executing tags in frame " << m_current_frame << endl;
-#endif
-			// Second argument requests that only "DisplayList" tags
-			// are executed. This means NO actions will be
-			// pushed on m_action_list.
-			execute_frame_tags(m_current_frame, TAG_DLIST);
-		}
-		--m_current_frame; // as we might h
-		assert(m_current_frame == target_frame_number);
-#ifdef GNASH_DEBUG_TIMELINE
-		cout << "At end of loop, m_current_frame is " << m_current_frame << endl;
-#endif
-
-#else // ! defined (NEW_TIMELINE_DESIGN)
-
 		for (size_t f = m_current_frame+1; f<=target_frame_number; ++f)
 		{
 			// Second argument requests that only "DisplayList" tags
@@ -2832,8 +2658,7 @@
 			// pushed on m_action_list.
 			execute_frame_tags(f, TAG_DLIST);
 		}
-#endif
-
+        m_current_frame = target_frame_number;
 	}
 
 #if defined(GNASH_DEBUG_TIMELINE)
@@ -2854,14 +2679,7 @@
 	// do this, so use execute_frame_tags instead).
 	execute_frame_tags(target_frame_number, TAG_ACTION);
 
-#ifndef NEW_TIMELINE_DESIGN
-	//FIXME: set m_current_frame to the target frame;
-	//  I think it's too early to do it here! Later actions in the 
-	//  current frame should also be executed(Zou)
-	m_current_frame = target_frame_number;      
-#else
 	assert(m_current_frame == target_frame_number);
-#endif
 
 
 	// After entering to advance_sprite() m_current_frame points to frame
@@ -2967,7 +2785,7 @@
 		const cxform& color_transform, const matrix& mat,
 		int ratio, int clip_depth)
 {
-//	    GNASH_REPORT_FUNCTION;
+//GNASH_REPORT_FUNCTION;
 	assert(m_def != NULL);
 
 	character_def*	cdef = m_def->get_character_def(character_id);
@@ -2982,117 +2800,46 @@
 
 	character* existing_char = m_display_list.get_character_at_depth(depth);
 
-	if (existing_char)
-	{
-#ifdef GNASH_DEBUG_PLACE
-		log_debug("Another character exists in depth %d", depth);
-#endif
+    boost::intrusive_ptr<character> ch;
 
-		// If we already have this object on this
-		// plane, then move it instead of replacing it.
-		// NOTE: move_display_object() will take care of NOT moving the
-		//       character if get_accept_anim_moves() returns false.
-		//       ... I guess it's checked inside move_display_object ...
-		if ( existing_char->get_id() == character_id )
+    // Create a new instance and syntetize an instance name if scriptable when:
+    //  (1) target depth is empty 
+    //  (2) we are in jump-back-mode
+    if(!existing_char || is_jumping_back)
 		{
-#ifdef GNASH_DEBUG_PLACE
-			log_debug("Char has same id (%d), moving ", character_id);
-#endif
-
-			// TODO: update name ?
-			move_display_object(depth, &color_transform,
-				&mat, ratio, clip_depth);
-			return NULL;
-		}
-
-
-#if 1 // snipped based on deduction based on testcases:
-      // replace_sprites1test.swf, replace_shapes1test.swf and clip_as_button2.swf
-
-		TimelineInfo* info = existing_char->getTimelineInfo();
-		if ( info && info->placedByReplaceTag() && info->placedInFrame() > m_current_frame )
-		{
-#ifdef GNASH_DEBUG_PLACE
-			log_debug("Char was placed by REPLACE tag in frame %d (now in frame %d)", info->placedInFrame(), m_current_frame);
-#endif
+        ch = cdef->create_character_instance(this, character_id);
+        ch->setTimelineInfo(depth, m_current_frame, false);
 
-			if ( existing_char->to_movie() )
+        if(name)
 			{
-#ifdef GNASH_DEBUG_PLACE
-				log_debug("Char is a sprite, moving");
-#endif
-				// If it's a sprite we move it.
-				// See replace_sprites1test.swf
-				move_display_object(depth, &color_transform, &mat, ratio, clip_depth);
+            ch->set_name(name);
 			}
-			else
+        else if(!name && ch->wantsInstanceName())
 			{
-#ifdef GNASH_DEBUG_PLACE
-				log_debug("Char is NOT a sprite, replacing");
-#endif
-				// If it's something else (a shape?) replace it
-				replace_display_object(character_id, name, depth, &color_transform,
-						&mat, ratio, clip_depth);
-			}
-			return NULL;
+            std::string instance_name = getNextUnnamedInstanceName();
+            ch->set_name(instance_name.c_str());
 		}
-#endif
-
-#if 0 // still not sure here...
-		// See loop_test5.swf (maybe should compare against *this* ratio instead...
-		if ( existing_char->get_ratio() > 0 )
-		{
-#ifdef GNASH_DEBUG_PLACE
-			log_debug("Char has ratio==%g (> 0). Replacing it.", existing_char->get_ratio());
-#endif
-
-			replace_display_object(character_id, name, depth, &color_transform, &mat,
-					ratio, clip_depth);
-			return NULL;
 		}
-#endif
 
-		// If we've been asked NOT to replace existing chars just
-		// return NULL now
-		if ( ! replace_if_depth_is_occupied )
+    bool is_ratio_compatible=true;
+    if(existing_char)
 		{
-			return NULL;
-		}
+     is_ratio_compatible= (ratio == existing_char->get_ratio())
+        || (ratio==character::noRatioValue && existing_char->get_ratio()==0)
+        || (ratio==0 && existing_char->get_ratio()==character::noRatioValue);
 	}
-	//printf("%s: character %s, id is %d, count is %d\n", __FUNCTION__, existing_char->get_name(), character_id,m_display_list.get_character_count()); 
-
-	assert(cdef);
-	boost::intrusive_ptr<character> ch = cdef->create_character_instance(this, character_id);
-	assert(ch.get() != NULL);
 
-	// Make a timeline instance, passing it lifetime information
-	// We're assuming m_current_frame is 0-based, and correct at time of tags execution
-	// TODO: make sure this is true when executing tags from goto_frame !
-#ifdef GNASH_DEBUG_TIMELINE
-	cout << " Placing timeline char " << character_id << " at depth " << depth << " in frame " << m_current_frame << " of sprite " << getTarget() << endl;
-#endif
-	ch->setTimelineInfo(depth, m_current_frame, false);
-
-	if ( name )
-	{
-		ch->set_name(name);
-	}
-	else if ( ch->wantsInstanceName() )
+    // Place a new character if:
+    //  (1)target depth is empty 
+    //  (2)target depth is not empty but the character has a different ratio 
+    // in jump-back-mode.
+    if(!existing_char || (is_jumping_back && !is_ratio_compatible))
 	{
-		// MovieClip instances *need* a name, to properly setup
-		// an as_value for them (values are kept by "target path"
-		// reference.  We syntetize an instance name in this case.
-		// TODO: check if we need to do this for other character types
-		std::string instance_name = getNextUnnamedInstanceName();
-		ch->set_name(instance_name.c_str());
-	}
-
 	// Attach event handlers (if any).
 	for (size_t i = 0, n = event_handlers.size(); i < n; i++)
 	{
 		swf_event* ev = event_handlers[i];
 		ch->add_event_handler(ev->event(), ev->action());
-		//event_handlers[i]->attach_to(*ch);
 	}
 
 	m_display_list.place_character(
@@ -3103,10 +2850,20 @@
 		ratio,
 		clip_depth);
 
-#ifndef GNASH_USE_GC
-	assert(ch == NULL || ch->get_ref_count() > 1);
-#endif // ndef GNASH_USE_GC
 	return ch.get();
+    }
+    
+    // move the existing charater if has same ratio in jump-back-mode
+    if(existing_char && is_jumping_back && is_ratio_compatible)
+    {
+        // remove the created character from the key listener list,
+        // it might be there(eg. button_character).
+        _vm.getRoot().remove_key_listener(ch.get());
+
+        move_display_object(depth, &color_transform, &mat, ratio, clip_depth);
+    }
+
+    return NULL;
 }
 
 void
@@ -3120,7 +2877,6 @@
 		int clip_depth)
 {
 	assert(m_def != NULL);
-	//log_msg(_("%s: character %s, id is %d, depth is %d"), __FUNCTION__, name, character_id, depth); // FIXME: debugging crap
 
 	character_def*	cdef = m_def->get_character_def(character_id);
 	if (cdef == NULL)
@@ -3131,57 +2887,28 @@
 	}
 	assert(cdef);
 
-#define MOVE_NONSHAPES_ON_REPLACE
-#ifdef MOVE_NONSHAPES_ON_REPLACE
 	character* existing_char = m_display_list.get_character_at_depth(depth);
 	if (existing_char)
 	{
-#ifdef GNASH_DEBUG_REPLACE
-		log_debug("Another character exists in depth %d", depth);
-#endif
+        // if the existing character is not a shape, move it instead of replace
 		if ( existing_char->isActionScriptReferenceable() )
 		{
-#ifdef GNASH_DEBUG_PLACE
-			log_debug("Char is a scriptable instance, moving rather then replace");
-#endif
-			// If it's a sprite we move it.
-			// See replace_sprites1test.swf and replace_buttons1test.swf
-			// Note that for buttons, it seems we should also wipe out the members !
-			// Maybe this is not the this we're supposed to do here, rather some weird
-			// simptom from implementation of a proper displaylist reconstruction.
-			// For example, the REPLACE tag might act like a PLACE tag when executed
-			// alone, looking for missing info (character_id, name) in the previous 
-			// PLACE tag affecting this same depth..
-			//
 			move_display_object(depth, color_transform, mat, ratio, clip_depth);
 			return;
 		}
-	}
 	else
 	{
-#ifdef GNASH_DEBUG_REPLACE
-		log_debug("REPLACE: no character exists in depth %d - should add ?", depth);
-#endif
-	}
-#endif // MOVE_NONSHAPES_ON_REPLACE
-
-	boost::intrusive_ptr<character> ch = cdef->create_character_instance(this,
-			character_id);
+            boost::intrusive_ptr<character> ch = cdef->create_character_instance(this, character_id);
 
-	// Make a timeline instance, passing it lifetime information
-	// We're assuming m_current_frame is 0-based, and correct at time of tags execution
-	// TODO: make sure this is true when executing tags from goto_frame !
-#ifdef GNASH_DEBUG_TIMELINE
-	cout << " Replacing timeline char at depth " << depth << " in frame " << m_current_frame << " of sprite " << getTarget() << " with char " << character_id << endl;
-#endif
 	ch->setTimelineInfo(depth, m_current_frame, true);
 
 	replace_display_object(
 		ch.get(), name, depth,
 		color_transform,
 		mat,
-		ratio, clip_depth
-		);
+                ratio, clip_depth);
+        }
+    } // end of if(existing_char)
 }
 
 void sprite_instance::replace_display_object(
@@ -3540,7 +3267,13 @@
 	}
 
 	// TODO: should variable name be considered case-insensitive ?
+	TextfieldMap::iterator it = _text_variables->find(name);
+	// Don't replace the original textfiled character
+	// TODO: more tests for TextField variables.
+	if ( it == _text_variables->end() )
+	{
 	_text_variables->operator[] (name) = ch;
+	}
 }
 
 /* private */

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -b -r1.128 -r1.129
--- server/sprite_instance.h	8 Aug 2007 20:08:59 -0000	1.128
+++ server/sprite_instance.h	9 Aug 2007 12:18:06 -0000	1.129
@@ -476,17 +476,6 @@
 	///
 	void	remove_display_object(int depth, int /* id */)
 	{
-      	character* existing_char = m_display_list.get_character_at_depth(depth);
-		if(existing_char && existing_char->getTimelineInfo())
-		{
-  			// Don't remove characters placed after target frame
-  			/// TODO: Don't remove character placed after the this RemoveObject tag
-			if(m_current_frame <= existing_char->getTimelineInfo()->placedInFrame() )
-			{
-				return;
-			}
-		}
-
 	    set_invalidated();
 	    m_display_list.remove_display_object(depth);
 	}
@@ -892,6 +881,9 @@
 	// true if this sprite reached the last frame and restarted
 	bool		m_has_looped;
 
+	// true is the sprite is jumping back.
+	bool		is_jumping_back;
+
 	// a bit-array class would be ideal for this
 	std::vector<bool>	m_init_actions_executed;
 

Index: server/parser/Timeline.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/Timeline.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/parser/Timeline.h	1 Jul 2007 10:54:33 -0000	1.5
+++ server/parser/Timeline.h	9 Aug 2007 12:18:06 -0000	1.6
@@ -25,7 +25,7 @@
 #endif
 
 #include <vector>
-#include <map>
+#include <set>
 #include <boost/thread/mutex.hpp>
 
 namespace gnash
@@ -58,7 +58,7 @@
 	/// Construct a Timeline instance 
 	Timeline()
 	{
-		_frameDepths.push_back(DepthMap());
+		_frameDepths.push_back(DepthSet());
 	}
 
 	/// Destroy a Timeline instance
@@ -94,7 +94,7 @@
 	///
 	void closeFrame()
 	{
-		boost::mutex::scoped_lock lock(_frameDepthsMutex);
+		//boost::mutex::scoped_lock lock(_frameDepthsMutex);
 
 		// Copy depth set from previous frame
 		_frameDepths.push_back(_frameDepths.back());
@@ -106,9 +106,6 @@
 	///	Depth of an instance placed by PlaceObject* tag.
 	///	Assumed to be in the static zone (an assertion would fail otherwise).
 	///
-	/// @param ratio
-	/// Ratio of an instance defined by PlaceObject* tag, default to zero.
-	///
 	/// Does NOT lock the mutex as this function is intended to be 
 	/// called by a single thread (the loader/parser).
 	///
@@ -116,11 +113,11 @@
 	///	Depth of an instance placed by PlaceObject* tag.
 	///	Assumed to be in the static zone (an assertion would fail otherwise).
 	///
-	void addDepth(int depth, int ratio=0)
+	void addDepth(int depth)
 	{
 		assert(depth < 0 && depth >= -16384); // or should be > -16384 (not ==?)
 
-		_frameDepths.back().insert(DRPair(depth, ratio));
+		_frameDepths.back().insert(depth);
 	}
 
 	/// Remove a timeline depth from the current frame 
@@ -166,24 +163,21 @@
 	///	
 	///	
 	///
-	void getFrameDepths(size_t frameno, std::map<int, int>& depths)
+	void getFrameDepths(size_t frameno, std::vector<int>& depths)
 	{
 		assert(frameno < _frameDepths.size());
 
-		DepthMap& from = _frameDepths[frameno];
-		depths.insert(from.begin(), from.end());
+		DepthSet& from = _frameDepths[frameno];
+		depths.assign(from.begin(), from.end());
 	}
 
 private:
 
-	/// A pair of depth value and ratio ralue
-	typedef std::map<int, int>::value_type DRPair;
-
-	/// A set of depth-ratio-pairs in the static zone
-	typedef std::map<int, int> DepthMap;
+	/// A set of depths in the static zone
+	typedef std::set<int> DepthSet;
 
-	/// A vector of depth maps (one for each frame)
-	typedef std::vector<DepthMap> FrameDepths;
+	/// A vector of depth sets (one for each frame)
+	typedef std::vector<DepthSet> FrameDepths;
 
 	/// Return the number of frames completely defined
 	//
@@ -223,10 +217,10 @@
 	for (Timeline::FrameDepths::const_iterator it=t._frameDepths.begin(), itEnd=t._frameDepths.end(); it!=itEnd; ++it)
 	{
 		os << "[";
-		for (Timeline::DepthMap::const_iterator di=it->begin(), de=it->end(); di!=de; ++di)
+		for (Timeline::DepthSet::const_iterator di=it->begin(), de=it->end(); di!=de; ++di)
 		{
-			if ( di != it->begin() ) os << ", ";
-			os << "<" << di->first << ", " << di->second << ">";
+			if ( di != it->begin() ) os << ",";
+			os << *di;
 		}
 		os << "]";
 		os << "\n";

Index: server/parser/morph2_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/morph2_character_def.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/parser/morph2_character_def.cpp	7 Aug 2007 20:53:10 -0000	1.12
+++ server/parser/morph2_character_def.cpp	9 Aug 2007 12:18:06 -0000	1.13
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: morph2_character_def.cpp,v 1.12 2007/08/07 20:53:10 strk Exp $ */
+/* $Id: morph2_character_def.cpp,v 1.13 2007/08/09 12:18:06 zoulunkai Exp $ */
 
 // Based on the public domain morph2.cpp of:
 // Thatcher Ulrich <tu@tulrich.com>, Mike Shaver <shaver@off.net> 2003,
@@ -115,7 +115,7 @@
 //		GNASH_REPORT_FUNCTION;
 
 		unsigned int i;
-		float ratio = inst->get_ratio() / 65535.0; 
+		float ratio = (inst->get_ratio()==character::noRatioValue) ? 0 : inst->get_ratio()/65535.0;
 
 		// bounds
 		rect	new_bound;

Index: server/parser/movie_def_impl.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- server/parser/movie_def_impl.h	1 Jul 2007 17:34:59 -0000	1.50
+++ server/parser/movie_def_impl.h	9 Aug 2007 12:18:07 -0000	1.51
@@ -619,9 +619,9 @@
 	//
 	// TODO: implement in base class ?
 	//
-	void addTimelineDepth(int depth, int ratio)
+	void addTimelineDepth(int depth)
 	{
-		_timeline.addDepth(depth, ratio);
+		_timeline.addDepth(depth);
 	}
 
 	// See dox in base class
@@ -637,7 +637,7 @@
 	//
 	// TODO: implement in base class ?
 	//
-	void getTimelineDepths(size_t frameno, std::map<int, int>& depths)
+	void getTimelineDepths(size_t frameno, std::vector<int>& depths)
 	{
 		_timeline.getFrameDepths(frameno, depths);
 	}

Index: server/parser/movie_definition.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_definition.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/parser/movie_definition.h	1 Jul 2007 10:54:34 -0000	1.27
+++ server/parser/movie_definition.h	9 Aug 2007 12:18:07 -0000	1.28
@@ -57,7 +57,7 @@
 
 #include <string>
 #include <memory> // for auto_ptr
-#include <map>
+#include <set> 
 
 // Forward declarations
 namespace gnash {
@@ -578,9 +578,7 @@
 	///	Depth of an instance placed by PlaceObject* tag.
 	///	Assumed to be in the static zone (an assertion would fail otherwise).
 	///
-	/// @param ratio
-	/// Ratio of an instance defined by PlaceObject2 tag, ranges from 0 to 65535
-	virtual void addTimelineDepth(int /*depth*/, int /*ratio*/) {}
+	virtual void addTimelineDepth(int /*depth*/) {}
 
 	/// Remove a depth from the timeline depth set in current frame 
 	//
@@ -612,7 +610,7 @@
 	/// @param depths
 	///	A vector to copy all frame depths to.
 	///
-	virtual void getTimelineDepths(size_t /*frameno*/, std::map<int, int>& /*depths*/) 
+	virtual void getTimelineDepths(size_t /*frameno*/, std::vector<int>& /*depths*/) 
 	{}
     
 };

Index: server/parser/sprite_definition.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/sprite_definition.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- server/parser/sprite_definition.h	5 Jul 2007 19:29:10 -0000	1.26
+++ server/parser/sprite_definition.h	9 Aug 2007 12:18:07 -0000	1.27
@@ -86,9 +86,9 @@
 	//
 	// TODO: implement in base class ?
 	//
-	void addTimelineDepth(int depth, int ratio)
+	void addTimelineDepth(int depth)
 	{
-		_timeline.addDepth(depth, ratio);
+		_timeline.addDepth(depth);
 	}
 
 	// See dox in base class
@@ -104,7 +104,7 @@
 	//
 	// TODO: implement in base class ?
 	//
-	void getTimelineDepths(size_t frameno, std::map<int, int>& depths)
+	void getTimelineDepths(size_t frameno, std::vector<int>& depths)
 	{
 		_timeline.getFrameDepths(frameno, depths);
 	}

Index: server/swf/PlaceObject2Tag.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/PlaceObject2Tag.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/swf/PlaceObject2Tag.cpp	1 Jul 2007 10:54:35 -0000	1.16
+++ server/swf/PlaceObject2Tag.cpp	9 Aug 2007 12:18:07 -0000	1.17
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: PlaceObject2Tag.cpp,v 1.16 2007/07/01 10:54:35 bjacques Exp $ */
+/* $Id: PlaceObject2Tag.cpp,v 1.17 2007/08/09 12:18:07 zoulunkai Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -239,7 +239,10 @@
 		m_color_transform.read_rgba(in);
 	}
 
-	if (has_ratio) m_ratio = in->read_u16();
+	if (has_ratio) 
+		m_ratio = in->read_u16();
+	else
+		m_ratio = character::noRatioValue;
 
 	if (has_name) m_name = in->read_string();
 
@@ -380,7 +383,7 @@
 	int ratio = ch->getRatio();
     if ( depth < 0 && depth >= character::staticDepthOffset )
     {
-    	m->addTimelineDepth(depth, ratio);
+    	m->addTimelineDepth(depth);
     }
     else
     {

Index: testsuite/misc-ming.all/place_and_remove_object_insane_test.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/place_and_remove_object_insane_test.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- testsuite/misc-ming.all/place_and_remove_object_insane_test.c	1 Jul 2007 10:54:59 -0000	1.11
+++ testsuite/misc-ming.all/place_and_remove_object_insane_test.c	9 Aug 2007 12:18:07 -0000	1.12
@@ -111,9 +111,9 @@
                         check_equals(_root.mc_blue._x, 0); \
                     }else if(counter == 1)  \
                     { \
-                        xcheck_equals(_root.mc_blue._x, 60); \
-                        xcheck_equals(typeof(_root.mc_black), 'undefined'); \
-                        xcheck_equals(typeof(_root.mc_black_name_changed), 'movieclip'); \
+                        check_equals(_root.mc_blue._x, 60); \
+                        check_equals(typeof(_root.mc_black), 'undefined'); \
+                        check_equals(typeof(_root.mc_black_name_changed), 'movieclip'); \
                     } ");
   // This one is normal. mc_red._x should *not* be 20 when restart.
   // Note that mc_red has been removed at the 2nd frame, so when



From MAILER-DAEMON Thu Aug 09 08:40:22 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJ7JO-0003dJ-FS
	for mharc-gnash-commit@gnu.org; Thu, 09 Aug 2007 08:40:22 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJ7JN-0003d9-N2
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 08:40:21 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJ7JM-0003cc-3q
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 08:40:21 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJ7JM-0003cZ-0s
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 08:40:20 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJ7JK-0003Se-8G
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 08:40:18 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJ7JD-0005ld-Lm
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 12:40:11 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJ7JC-0005lX-VA
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 12:40:11 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJ7JC-0005lX-VA@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 09 Aug 2007 12:40:10 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog configure.ac [release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Aug 2007 12:40:21 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/09 12:40:10

Modified files:
	.              : ChangeLog configure.ac 

Log message:
	        * configure.ac: set version to 0.8.1

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971&r2=1.3971.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.396&r2=1.396.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971
retrieving revision 1.3971.2.1
diff -u -b -r1.3971 -r1.3971.2.1
--- ChangeLog	9 Aug 2007 04:18:37 -0000	1.3971
+++ ChangeLog	9 Aug 2007 12:40:09 -0000	1.3971.2.1
@@ -1,5 +1,9 @@
 2007-08-09 Sandro Santilli <strk@keybit.net>
 
+	* configure.ac: set version to 0.8.1
+
+2007-08-09 Sandro Santilli <strk@keybit.net>
+
 	* server/stream.h (ensureBytes): be more verbose about the lack of
 	  data. Fix signed/unsigned comparison.
 	* server/swf/tag_loaders.cpp (adpcm_expand): fix count of needed

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.396
retrieving revision 1.396.2.1
diff -u -b -r1.396 -r1.396.2.1
--- configure.ac	3 Aug 2007 20:25:30 -0000	1.396
+++ configure.ac	9 Aug 2007 12:40:10 -0000	1.396.2.1
@@ -15,10 +15,10 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.396 2007/08/03 20:25:30 strk Exp $
+dnl $Id: configure.ac,v 1.396.2.1 2007/08/09 12:40:10 strk Exp $
 
 AC_PREREQ(2.50)
-AC_INIT(gnash, cvs)
+AC_INIT(gnash, 0.8.1)
 AC_CONFIG_SRCDIR(server/gnash.h)
 AM_CONFIG_HEADER(config.h)
 



From MAILER-DAEMON Thu Aug 09 10:52:49 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJ9NZ-0006lK-CO
	for mharc-gnash-commit@gnu.org; Thu, 09 Aug 2007 10:52:49 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJ9NX-0006l9-9q
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 10:52:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJ9NU-0006kw-P1
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 10:52:45 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJ9NU-0006kt-Ih
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 10:52:44 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJ9NU-0001Za-6F
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 10:52:44 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJ9NS-0006i3-Od
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 14:52:42 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJ9NS-0006i0-L6
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 14:52:42 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJ9NS-0006i0-L6@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 09 Aug 2007 14:52:42 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash NEWS [release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Aug 2007 14:52:47 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/09 14:52:42

Modified files:
	.              : NEWS 

Log message:
	Updated for 0.8.1

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/NEWS?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.4&r2=1.4.6.1

Patches:
Index: NEWS
===================================================================
RCS file: /sources/gnash/gnash/NEWS,v
retrieving revision 1.4
retrieving revision 1.4.6.1
diff -u -b -r1.4 -r1.4.6.1
--- NEWS	4 Jun 2007 18:00:08 -0000	1.4
+++ NEWS	9 Aug 2007 14:52:42 -0000	1.4.6.1
@@ -1,4 +1,22 @@
-2007-06-XX  Rob Savoye  <rob@darkstar.welcomehome.org>
+2007-08-XX  Sandro Santilli <strk@keybit.net
+
+Fourth alpha release of Gnash (0.8.1).
+Improvements since 0.8.0 release are:
+
+	- Garbage Collector
+	- Support for device fonts
+	- Support for dynamic text fields
+	- Better key handling
+	- Support for FFMPEG SVN
+	- Support for on-demand install of needed Gstreamer codec plugins.
+	- Debugger off by default (improves performance and memory use)
+	- AGG renderer by default 
+	- Support for KDE/AGG combination
+	- Layout change : we'll now build <gui>-gnash and 'gnash' is a shell
+	  script with gui selection capabilities (-G)
+	- More robust parser 
+
+07-06-XX  Rob Savoye  <rob@darkstar.welcomehome.org>
 
 The third alpha release of Gnash. Improvements since the 0.7.2 release
 are: 



From MAILER-DAEMON Thu Aug 09 13:01:25 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJBO1-0006wN-L9
	for mharc-gnash-commit@gnu.org; Thu, 09 Aug 2007 13:01:25 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJBNz-0006wH-Lh
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 13:01:23 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJBNw-0006uP-SD
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 13:01:22 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJBNw-0006uM-PN
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 13:01:20 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJBNw-0002XI-7W
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 13:01:20 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJBNv-00073q-L0
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 17:01:19 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJBNv-00073n-Fi
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 17:01:19 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJBNv-00073n-Fi@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 09 Aug 2007 17:01:19 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/swf/tag_loaders.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Aug 2007 17:01:23 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/09 17:01:19

Modified files:
	.              : ChangeLog 
	server/swf     : tag_loaders.cpp 

Log message:
	        * server/swf/tag_loaders.cpp (adpcm_expand): another try at fixing the
	          needed bytes count for compressed adpcm samples. Also, remove call
	          to ceil.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3973&r2=1.3974
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.123&r2=1.124

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3973
retrieving revision 1.3974
diff -u -b -r1.3973 -r1.3974
--- ChangeLog	9 Aug 2007 12:18:04 -0000	1.3973
+++ ChangeLog	9 Aug 2007 17:01:18 -0000	1.3974
@@ -1,3 +1,9 @@
+2007-08-09 Sandro Santilli <strk@keybit.net>
+
+	* server/swf/tag_loaders.cpp (adpcm_expand): another try at fixing the
+	  needed bytes count for compressed adpcm samples. Also, remove call
+	  to ceil.
+
 2007-08-09 Zou Lunkai <zoulunkai@gmail.com>
 	
 	* server/character.h: add a constant 'noRatioValue'.

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -b -r1.123 -r1.124
--- server/swf/tag_loaders.cpp	9 Aug 2007 04:18:38 -0000	1.123
+++ server/swf/tag_loaders.cpp	9 Aug 2007 17:01:19 -0000	1.124
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: tag_loaders.cpp,v 1.123 2007/08/09 04:18:38 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.124 2007/08/09 17:01:19 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1751,27 +1751,47 @@
 	data = reinterpret_cast<unsigned char *>(out_data);
 
 	// Read header.
-	in->ensureBytes(2);   // header size
+	in->ensureBytes(1); // nbits
 	unsigned int n_bits = in->read_uint(2) + 2;	// 2 to 5 bits (TODO: use unsigned...)
 
 
 #ifndef GNASH_TRUST_SWF_INPUT
 
-	// bitsPerSample is the number of bits for each sample
-	unsigned int bitsPerSample = n_bits;
-	if (stereo) bitsPerSample *= 2;
-
-	// There's going to be one block every 4096 samples (or fraction)
-	unsigned int blocksCount = (unsigned int)ceil(sample_count/4096);
-
-	// Every block will have an header of 22 bits
-	unsigned int bitsPerBlock = 22;
-
-	unsigned long bytesNeeded = (unsigned long)ceil( ( (sample_count*bitsPerSample) + (bitsPerBlock * blocksCount) ) / 8 );
-
-	//log_debug("adpcm_expand, stereo:%d, sample_count:%d, nbits:%d, bytesNeeded:%d", stereo, sample_count, n_bits, bytesNeeded);
+	// bitsPerCompSample is the number of bits for each comp sample
+	unsigned int bitsPerCompSample = n_bits;
+	if (stereo) bitsPerCompSample *= 2;
+
+	// There's going to be one block every 4096 samples ...
+	unsigned int blocksCount = sample_count/4096;
+
+	// ... or fraction
+	if ( sample_count%4096 ) ++blocksCount;
+
+	// Of the total samples, all but the first sample in a block are comp
+	unsigned int compSamples = sample_count - blocksCount;
+
+	// From every block, a fixed 22 bits will be read (16 of which are the uncomp sample)
+	unsigned int fixedBitsPerBlock = 22;
+
+	// Total bits needed from stream
+	unsigned long bitsNeeded = (compSamples*bitsPerCompSample) + (fixedBitsPerBlock*blocksCount);
+
+	// 2 bits have been read already, so the stream position is now one byte after the
+	// next 6 bits we're going to read, so we strip those 6 bits from the count of bits
+	// we still need
+	bitsNeeded -= (8-2);
+
+	// Now, we convert this number to bytes, requiring one more if any 
+	unsigned int excessBits = bitsNeeded%8;
+	unsigned long bytesNeeded = bitsNeeded/8;
+	if ( excessBits ) ++bytesNeeded;
+
+	//log_debug("adpcm_expand, stereo:%d, sample_count:%u, bitsPerSample:%u, "
+	//	"blocksCount:%u, bitsPerBlock:%u, bitsNeeded:%lu, excessBits:%u, bytesNeeded:%lu",
+	//	stereo, sample_count, bitsPerCompSample, blocksCount, fixedBitsPerBlock, bitsNeeded, excessBits, bytesNeeded);
 
 	in->ensureBytes(bytesNeeded);
+
 #endif // GNASH_TRUST_SWF_INPUT
 
 	while (sample_count)



From MAILER-DAEMON Thu Aug 09 13:02:03 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJBOd-00072N-O9
	for mharc-gnash-commit@gnu.org; Thu, 09 Aug 2007 13:02:03 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJBOb-00071T-PX
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 13:02:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJBOa-00071H-RL
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 13:02:01 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJBOa-00071E-Lp
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 13:02:00 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJBOZ-0002du-Rs
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 13:01:59 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJBOZ-00074E-8n
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 17:01:59 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJBOZ-00074B-3v
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 17:01:59 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJBOZ-00074B-3v@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 09 Aug 2007 17:01:59 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/swf/tag_loaders.cpp
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Aug 2007 17:02:02 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/09 17:01:59

Modified files:
	.              : ChangeLog 
	server/swf     : tag_loaders.cpp 

Log message:
	        * server/swf/tag_loaders.cpp (adpcm_expand): another try at fixing the
	          needed bytes count for compressed adpcm samples. Also, remove call
	          to ceil.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.1&r2=1.3971.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.123&r2=1.123.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.1
retrieving revision 1.3971.2.2
diff -u -b -r1.3971.2.1 -r1.3971.2.2
--- ChangeLog	9 Aug 2007 12:40:09 -0000	1.3971.2.1
+++ ChangeLog	9 Aug 2007 17:01:57 -0000	1.3971.2.2
@@ -1,5 +1,11 @@
 2007-08-09 Sandro Santilli <strk@keybit.net>
 
+	* server/swf/tag_loaders.cpp (adpcm_expand): another try at fixing the
+	  needed bytes count for compressed adpcm samples. Also, remove call
+	  to ceil.
+
+2007-08-09 Sandro Santilli <strk@keybit.net>
+
 	* configure.ac: set version to 0.8.1
 
 2007-08-09 Sandro Santilli <strk@keybit.net>

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.123
retrieving revision 1.123.2.1
diff -u -b -r1.123 -r1.123.2.1
--- server/swf/tag_loaders.cpp	9 Aug 2007 04:18:38 -0000	1.123
+++ server/swf/tag_loaders.cpp	9 Aug 2007 17:01:58 -0000	1.123.2.1
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: tag_loaders.cpp,v 1.123 2007/08/09 04:18:38 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.123.2.1 2007/08/09 17:01:58 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1751,27 +1751,47 @@
 	data = reinterpret_cast<unsigned char *>(out_data);
 
 	// Read header.
-	in->ensureBytes(2);   // header size
+	in->ensureBytes(1); // nbits
 	unsigned int n_bits = in->read_uint(2) + 2;	// 2 to 5 bits (TODO: use unsigned...)
 
 
 #ifndef GNASH_TRUST_SWF_INPUT
 
-	// bitsPerSample is the number of bits for each sample
-	unsigned int bitsPerSample = n_bits;
-	if (stereo) bitsPerSample *= 2;
-
-	// There's going to be one block every 4096 samples (or fraction)
-	unsigned int blocksCount = (unsigned int)ceil(sample_count/4096);
-
-	// Every block will have an header of 22 bits
-	unsigned int bitsPerBlock = 22;
-
-	unsigned long bytesNeeded = (unsigned long)ceil( ( (sample_count*bitsPerSample) + (bitsPerBlock * blocksCount) ) / 8 );
-
-	//log_debug("adpcm_expand, stereo:%d, sample_count:%d, nbits:%d, bytesNeeded:%d", stereo, sample_count, n_bits, bytesNeeded);
+	// bitsPerCompSample is the number of bits for each comp sample
+	unsigned int bitsPerCompSample = n_bits;
+	if (stereo) bitsPerCompSample *= 2;
+
+	// There's going to be one block every 4096 samples ...
+	unsigned int blocksCount = sample_count/4096;
+
+	// ... or fraction
+	if ( sample_count%4096 ) ++blocksCount;
+
+	// Of the total samples, all but the first sample in a block are comp
+	unsigned int compSamples = sample_count - blocksCount;
+
+	// From every block, a fixed 22 bits will be read (16 of which are the uncomp sample)
+	unsigned int fixedBitsPerBlock = 22;
+
+	// Total bits needed from stream
+	unsigned long bitsNeeded = (compSamples*bitsPerCompSample) + (fixedBitsPerBlock*blocksCount);
+
+	// 2 bits have been read already, so the stream position is now one byte after the
+	// next 6 bits we're going to read, so we strip those 6 bits from the count of bits
+	// we still need
+	bitsNeeded -= (8-2);
+
+	// Now, we convert this number to bytes, requiring one more if any 
+	unsigned int excessBits = bitsNeeded%8;
+	unsigned long bytesNeeded = bitsNeeded/8;
+	if ( excessBits ) ++bytesNeeded;
+
+	//log_debug("adpcm_expand, stereo:%d, sample_count:%u, bitsPerSample:%u, "
+	//	"blocksCount:%u, bitsPerBlock:%u, bitsNeeded:%lu, excessBits:%u, bytesNeeded:%lu",
+	//	stereo, sample_count, bitsPerCompSample, blocksCount, fixedBitsPerBlock, bitsNeeded, excessBits, bytesNeeded);
 
 	in->ensureBytes(bytesNeeded);
+
 #endif // GNASH_TRUST_SWF_INPUT
 
 	while (sample_count)



From MAILER-DAEMON Thu Aug 09 13:25:52 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJBlg-0000lv-09
	for mharc-gnash-commit@gnu.org; Thu, 09 Aug 2007 13:25:52 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJBld-0000l4-RS
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 13:25:49 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJBld-0000kr-9L
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 13:25:49 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJBld-0000ko-41
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 13:25:49 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJBlc-0006mP-TS
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 13:25:48 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJBlb-0000Mr-Pk
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 17:25:47 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJBlb-0000Mo-KL
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 17:25:47 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJBlb-0000Mo-KL@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 09 Aug 2007 17:25:47 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/button_character_instanc...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Aug 2007 17:25:50 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/09 17:25:47

Modified files:
	.              : ChangeLog 
	server         : button_character_instance.cpp 

Log message:
	        * server/button_character_instance.cpp (construct): properly construct
	          all button child characters. Fixes bug #20729.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3974&r2=1.3975
http://cvs.savannah.gnu.org/viewcvs/gnash/server/button_character_instance.cpp?cvsroot=gnash&r1=1.53&r2=1.54

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3974
retrieving revision 1.3975
diff -u -b -r1.3974 -r1.3975
--- ChangeLog	9 Aug 2007 17:01:18 -0000	1.3974
+++ ChangeLog	9 Aug 2007 17:25:46 -0000	1.3975
@@ -1,5 +1,7 @@
 2007-08-09 Sandro Santilli <strk@keybit.net>
 
+	* server/button_character_instance.cpp (construct): properly construct
+	  all button child characters. Fixes bug #20729.
 	* server/swf/tag_loaders.cpp (adpcm_expand): another try at fixing the
 	  needed bytes count for compressed adpcm samples. Also, remove call
 	  to ceil.

Index: server/button_character_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/button_character_instance.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- server/button_character_instance.cpp	17 Jul 2007 06:04:22 -0000	1.53
+++ server/button_character_instance.cpp	9 Aug 2007 17:25:47 -0000	1.54
@@ -871,6 +871,7 @@
 
 		// we don't need an id here, do we ?
 		boost::intrusive_ptr<character> ch = bdef.m_character_def->create_character_instance(this, 0);
+		ch->construct(); // give this character life
 		m_record_character[r] = ch;
 		ch->set_matrix(mat);
 		ch->set_cxform(cx);



From MAILER-DAEMON Thu Aug 09 13:25:57 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJBll-0000r1-Ce
	for mharc-gnash-commit@gnu.org; Thu, 09 Aug 2007 13:25:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJBlj-0000pg-OI
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 13:25:55 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJBlj-0000pA-2c
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 13:25:55 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJBli-0000p0-Kz
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 13:25:54 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJBli-0006nb-Bi
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 13:25:54 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJBlh-0000NB-Qw
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 17:25:53 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJBlh-0000N8-LW
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 17:25:53 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJBlh-0000N8-LW@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 09 Aug 2007 17:25:53 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/button_character_instanc...
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Aug 2007 17:25:56 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/09 17:25:53

Modified files:
	.              : ChangeLog 
	server         : button_character_instance.cpp 

Log message:
	        * server/button_character_instance.cpp (construct): properly construct
	          all button child characters. Fixes bug #20729.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.2&r2=1.3971.2.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/button_character_instance.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.53&r2=1.53.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.2
retrieving revision 1.3971.2.3
diff -u -b -r1.3971.2.2 -r1.3971.2.3
--- ChangeLog	9 Aug 2007 17:01:57 -0000	1.3971.2.2
+++ ChangeLog	9 Aug 2007 17:25:52 -0000	1.3971.2.3
@@ -1,5 +1,7 @@
 2007-08-09 Sandro Santilli <strk@keybit.net>
 
+	* server/button_character_instance.cpp (construct): properly construct
+	  all button child characters. Fixes bug #20729.
 	* server/swf/tag_loaders.cpp (adpcm_expand): another try at fixing the
 	  needed bytes count for compressed adpcm samples. Also, remove call
 	  to ceil.

Index: server/button_character_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/button_character_instance.cpp,v
retrieving revision 1.53
retrieving revision 1.53.2.1
diff -u -b -r1.53 -r1.53.2.1
--- server/button_character_instance.cpp	17 Jul 2007 06:04:22 -0000	1.53
+++ server/button_character_instance.cpp	9 Aug 2007 17:25:53 -0000	1.53.2.1
@@ -871,6 +871,7 @@
 
 		// we don't need an id here, do we ?
 		boost::intrusive_ptr<character> ch = bdef.m_character_def->create_character_instance(this, 0);
+		ch->construct(); // give this character life
 		m_record_character[r] = ch;
 		ch->set_matrix(mat);
 		ch->set_cxform(cx);



From MAILER-DAEMON Thu Aug 09 13:46:36 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJC5k-0002o2-KZ
	for mharc-gnash-commit@gnu.org; Thu, 09 Aug 2007 13:46:36 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJC5j-0002nu-Gc
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 13:46:35 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJC5h-0002ni-VT
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 13:46:34 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJC5h-0002nf-RO
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 13:46:33 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJC5h-0002Dk-H6
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 13:46:33 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJC5g-0001oH-P5
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 17:46:32 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJC5g-0001oA-J9
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 17:46:32 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJC5g-0001oA-J9@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 09 Aug 2007 17:46:32 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog README_CVS
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Aug 2007 17:46:35 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/09 17:46:32

Modified files:
	.              : ChangeLog README_CVS 

Log message:
	        * README_CVS: minimum version of automake is 1.9.6. 1.7 and 1.8 have
	          been tried w/out success. Might be a regression, but that is...

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3975&r2=1.3976
http://cvs.savannah.gnu.org/viewcvs/gnash/README_CVS?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3975
retrieving revision 1.3976
diff -u -b -r1.3975 -r1.3976
--- ChangeLog	9 Aug 2007 17:25:46 -0000	1.3975
+++ ChangeLog	9 Aug 2007 17:46:31 -0000	1.3976
@@ -1,5 +1,7 @@
 2007-08-09 Sandro Santilli <strk@keybit.net>
 
+	* README_CVS: minimum version of automake is 1.9.6. 1.7 and 1.8 have
+	  been tried w/out success. Might be a regression, but that is...
 	* server/button_character_instance.cpp (construct): properly construct
 	  all button child characters. Fixes bug #20729.
 	* server/swf/tag_loaders.cpp (adpcm_expand): another try at fixing the

Index: README_CVS
===================================================================
RCS file: /sources/gnash/gnash/README_CVS,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- README_CVS	26 Apr 2007 02:45:51 -0000	1.2
+++ README_CVS	9 Aug 2007 17:46:32 -0000	1.3
@@ -1,4 +1,4 @@
-$Id: README_CVS,v 1.2 2007/04/26 02:45:51 jgilmore Exp $
+$Id: README_CVS,v 1.3 2007/08/09 17:46:32 strk Exp $
 
 		Building Gnash from its CVS repository
 
@@ -29,7 +29,7 @@
 GNU		Minimum		RPM or DEB package names:
 Package		Version  Debian		Ubuntu		Fedora		Gentoo
 -------         -------  ------         ------          ------		------
-automake	1.6.0	automake	automake	automake
+automake	1.9.6	automake	automake	automake
 autoconf	2.59			autoconf	autoconf
 cvs		1.11.22			cvs		cvs
 gettext		0.14.6			gettext		gettext



From MAILER-DAEMON Thu Aug 09 13:52:33 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJCBU-0005Yp-U7
	for mharc-gnash-commit@gnu.org; Thu, 09 Aug 2007 13:52:33 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJCBT-0005Yd-N5
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 13:52:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJCBT-0005YJ-6x
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 13:52:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJCBT-0005YG-1r
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 13:52:31 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJCBS-0003JO-NA
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 13:52:30 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJCBR-0002BK-Je
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 17:52:29 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJCBR-0002BH-FV
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 17:52:29 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJCBR-0002BH-FV@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 09 Aug 2007 17:52:29 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash README_CVS
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Aug 2007 17:52:31 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/09 17:52:29

Modified files:
	.              : README_CVS 

Log message:
	updated package names for automake1.9 of debian and ubuntu

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/README_CVS?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: README_CVS
===================================================================
RCS file: /sources/gnash/gnash/README_CVS,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- README_CVS	9 Aug 2007 17:46:32 -0000	1.3
+++ README_CVS	9 Aug 2007 17:52:29 -0000	1.4
@@ -1,4 +1,4 @@
-$Id: README_CVS,v 1.3 2007/08/09 17:46:32 strk Exp $
+$Id: README_CVS,v 1.4 2007/08/09 17:52:29 strk Exp $
 
 		Building Gnash from its CVS repository
 
@@ -28,8 +28,8 @@
 
 GNU		Minimum		RPM or DEB package names:
 Package		Version  Debian		Ubuntu		Fedora		Gentoo
--------         -------  ------         ------          ------		------
-automake	1.9.6	automake	automake	automake
+-------         -------  -----------    ------------    ---------	----------
+automake	1.9.6	automake1.9	automake1.9	automake
 autoconf	2.59			autoconf	autoconf
 cvs		1.11.22			cvs		cvs
 gettext		0.14.6			gettext		gettext



From MAILER-DAEMON Thu Aug 09 17:56:36 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJFzg-0003aC-29
	for mharc-gnash-commit@gnu.org; Thu, 09 Aug 2007 17:56:36 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJFze-0003YH-Cx
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 17:56:34 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJFzc-0003WY-Sj
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 17:56:33 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJFzc-0003WN-Po
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 17:56:32 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJFzc-0008Cb-Bd
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 17:56:32 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJFza-0001d1-TN
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 21:56:30 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJFza-0001cy-MI
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 21:56:30 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJFza-0001cy-MI@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 09 Aug 2007 21:56:30 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/swf/tag_loaders.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Aug 2007 21:56:34 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/09 21:56:30

Modified files:
	.              : ChangeLog 
	server/swf     : tag_loaders.cpp 

Log message:
	        * server/swf/tag_loaders.cpp: move all ADPCM-related code in an
	          ADPCMDecoder class.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3976&r2=1.3977
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.124&r2=1.125

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3976
retrieving revision 1.3977
diff -u -b -r1.3976 -r1.3977
--- ChangeLog	9 Aug 2007 17:46:31 -0000	1.3976
+++ ChangeLog	9 Aug 2007 21:56:29 -0000	1.3977
@@ -1,5 +1,7 @@
 2007-08-09 Sandro Santilli <strk@keybit.net>
 
+	* server/swf/tag_loaders.cpp: move all ADPCM-related code in an
+	  ADPCMDecoder class.
 	* README_CVS: minimum version of automake is 1.9.6. 1.7 and 1.8 have
 	  been tried w/out success. Might be a regression, but that is...
 	* server/button_character_instance.cpp (construct): properly construct

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -b -r1.124 -r1.125
--- server/swf/tag_loaders.cpp	9 Aug 2007 17:01:19 -0000	1.124
+++ server/swf/tag_loaders.cpp	9 Aug 2007 21:56:30 -0000	1.125
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: tag_loaders.cpp,v 1.124 2007/08/09 17:01:19 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.125 2007/08/09 21:56:30 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -77,13 +77,260 @@
 	int sample_count,  // in stereo, this is number of *pairs* of samples
 	bool stereo);
 
-static void adpcm_expand(unsigned char* &data, stream* in,
-	int sample_count,  // in stereo, this is number of *pairs* of samples
-	bool stereo);
-
 namespace SWF {
 namespace tag_loaders {
 
+// ----------------------------------------------------------------------------
+// ADPCMDecoder class
+// ----------------------------------------------------------------------------
+
+/// ADPCM decoder utilities
+//
+/// Algo from http://www.circuitcellar.com/pastissues/articles/richey110/text.htm
+/// And also Jansen.
+/// Here's another reference: http://www.geocities.com/SiliconValley/8682/aud3.txt
+/// Original IMA spec doesn't seem to be on the web :(
+///
+/// TODO: move in it's own file
+///
+class ADPCMDecoder {
+
+private:
+
+	// Data from Alexis' SWF reference
+	static int _index_update_table_2bits[2];
+	static int _index_update_table_3bits[4];
+	static int _index_update_table_4bits[8];
+	static int _index_update_table_5bits[16];
+
+	static int* s_index_update_tables[4];
+
+	// Data from Jansen.  http://homepages.cwi.nl/~jack/
+	// Check out his Dutch retro punk songs, heh heh :)
+	static const int STEPSIZE_CT = 89;
+	static int s_stepsize[STEPSIZE_CT];
+
+
+	static void doSample(int n_bits, int& sample, int& stepsize_index, int raw_code)
+	{
+		assert(raw_code >= 0 && raw_code < (1 << n_bits));								
+																
+		static const int	HI_BIT = (1 << (n_bits - 1));								
+		int*	index_update_table = s_index_update_tables[n_bits - 2];							
+																
+		/* Core of ADPCM. */												
+																
+		int	code_mag = raw_code & (HI_BIT - 1);									
+		bool	code_sign_bit = (raw_code & HI_BIT) ? 1 : 0;								
+		int	mag = (code_mag << 1) + 1;	/* shift in LSB (they do this so that pos & neg zero are different)*/	
+																
+		int	stepsize = s_stepsize[stepsize_index];									
+																
+		/* Compute the new sample.  It's the predicted value			*/					
+		/* (i.e. the previous value), plus a delta.  The delta			*/					
+		/* comes from the code times the stepsize.  going for			*/					
+		/* something like: delta = stepsize * (code * 2 + 1) >> code_bits	*/					
+		int	delta = (stepsize * mag) >> (n_bits - 1);								
+		if (code_sign_bit) delta = -delta;										
+																
+		sample += delta;												
+		sample = iclamp(sample, -32768, 32767);										
+																
+		/* Update our stepsize index.  Use a lookup table. */								
+		stepsize_index += index_update_table[code_mag];									
+		stepsize_index = iclamp(stepsize_index, 0, STEPSIZE_CT - 1);							
+	}
+
+	/* Uncompress 4096 mono samples of ADPCM. */									
+	static void doMonoBlock(int16_t** out_data, int n_bits, int sample_count, stream* in, int sample, int stepsize_index)
+	{
+		/* First sample doesn't need to be decompressed. */								
+		sample_count--;													
+		*(*out_data)++ = (int16_t) sample;										
+																
+		while (sample_count--)												
+		{														
+			int	raw_code = in->read_uint(n_bits);								
+			doSample(n_bits, sample, stepsize_index, raw_code);	/* sample & stepsize_index are in/out params */	
+			*(*out_data)++ = (int16_t) sample;									
+		}														
+	}
+
+
+	/* Uncompress 4096 stereo sample pairs of ADPCM. */									
+	static void doStereoBlock(
+			int16_t** out_data,	// in/out param
+			int n_bits,
+			int sample_count,
+			stream* in,
+			int left_sample,
+			int left_stepsize_index,
+			int right_sample,
+			int right_stepsize_index
+			)
+	{
+		/* First samples don't need to be decompressed. */								
+		sample_count--;													
+		*(*out_data)++ = (int16_t) left_sample;										
+		*(*out_data)++ = (int16_t) right_sample;										
+																
+		while (sample_count--)												
+		{														
+			int	left_raw_code = in->read_uint(n_bits);								
+			doSample(n_bits, left_sample, left_stepsize_index, left_raw_code);					
+			*(*out_data)++ = (int16_t) left_sample;									
+																
+			int	right_raw_code = in->read_uint(n_bits);								
+			doSample(n_bits, right_sample, right_stepsize_index, right_raw_code);					
+			*(*out_data)++ = (int16_t) right_sample;									
+		}														
+	}
+
+public:
+
+	// Utility function: uncompress ADPCM data from in stream to
+	// out_data[].	The output buffer must have (sample_count*2)
+	// bytes for mono, or (sample_count*4) bytes for stereo.
+	static void adpcm_expand(
+		unsigned char* &data,
+		stream* in,
+		int sample_count,	// in stereo, this is number of *pairs* of samples (TODO: why is this signed at all ??)
+		bool stereo)
+	{
+		int16_t* out_data = new int16_t[stereo ? sample_count*2 : sample_count];
+		data = reinterpret_cast<unsigned char *>(out_data);
+
+		// Read header.
+		in->ensureBytes(1); // nbits
+		unsigned int n_bits = in->read_uint(2) + 2;	// 2 to 5 bits (TODO: use unsigned...)
+
+
+#ifndef GNASH_TRUST_SWF_INPUT
+
+		// bitsPerCompSample is the number of bits for each comp sample
+		unsigned int bitsPerCompSample = n_bits;
+		if (stereo) bitsPerCompSample *= 2;
+
+		// There's going to be one block every 4096 samples ...
+		unsigned int blocksCount = sample_count/4096;
+
+		// ... or fraction
+		if ( sample_count%4096 ) ++blocksCount;
+
+		// Of the total samples, all but the first sample in a block are comp
+		unsigned int compSamples = sample_count - blocksCount;
+
+		// From every block, a fixed 22 bits will be read (16 of which are the uncomp sample)
+		unsigned int fixedBitsPerBlock = 22;
+
+		// Total bits needed from stream
+		unsigned long bitsNeeded = (compSamples*bitsPerCompSample) + (fixedBitsPerBlock*blocksCount);
+
+		// 2 bits have been read already, so the stream position is now one byte after the
+		// next 6 bits we're going to read, so we strip those 6 bits from the count of bits
+		// we still need
+		bitsNeeded -= (8-2);
+
+		// Now, we convert this number to bytes, requiring one more if any 
+		unsigned int excessBits = bitsNeeded%8;
+		unsigned long bytesNeeded = bitsNeeded/8;
+		if ( excessBits ) ++bytesNeeded;
+
+		//log_debug("adpcm_expand, stereo:%d, sample_count:%u, bitsPerSample:%u, "
+		//	"blocksCount:%u, bitsPerBlock:%u, bitsNeeded:%lu, excessBits:%u, bytesNeeded:%lu",
+		//	stereo, sample_count, bitsPerCompSample, blocksCount, fixedBitsPerBlock, bitsNeeded, excessBits, bytesNeeded);
+
+		in->ensureBytes(bytesNeeded);
+
+#endif // GNASH_TRUST_SWF_INPUT
+
+		while (sample_count)
+		{
+			// Read initial sample & index values.
+
+			int	sample = in->read_sint(16);
+
+			int	stepsize_index = in->read_uint(6);
+			assert(STEPSIZE_CT >= (1 << 6));	// ensure we don't need to clamp.
+
+			int	samples_this_block = imin(sample_count, 4096);
+			sample_count -= samples_this_block;
+
+			if (stereo == false)
+			{
+#define DO_MONO(n) doMonoBlock(&out_data, n, samples_this_block, in, sample, stepsize_index)
+
+				switch (n_bits)
+				{
+				default: assert(0); break;
+				case 2: DO_MONO(2); break;
+				case 3: DO_MONO(3); break;
+				case 4: DO_MONO(4); break;
+				case 5: DO_MONO(5); break;
+				}
+			}
+			else
+			{
+				// Stereo.
+
+				// Got values for left channel; now get initial sample
+				// & index for right channel.
+				int	right_sample = in->read_sint(16);
+
+				int	right_stepsize_index = in->read_uint(6);
+				assert(STEPSIZE_CT >= (1 << 6));	// ensure we don't need to clamp.
+
+#define DO_STEREO(n)					\
+		doStereoBlock(				\
+			&out_data, n, samples_this_block,	\
+			in, sample, stepsize_index,		\
+			right_sample, right_stepsize_index)
+				
+				switch (n_bits)
+				{
+				default: assert(0); break;
+				case 2: DO_STEREO(2); break;
+				case 3: DO_STEREO(3); break;
+				case 4: DO_STEREO(4); break;
+				case 5: DO_STEREO(5); break;
+				}
+			}
+		}
+
+	}
+
+
+};
+
+int ADPCMDecoder::_index_update_table_2bits[2] = { -1,  2 };
+int ADPCMDecoder::_index_update_table_3bits[4] = { -1, -1,  2,  4 };
+int ADPCMDecoder::_index_update_table_4bits[8] = { -1, -1, -1, -1,  2,  4,  6,  8 };
+int ADPCMDecoder::_index_update_table_5bits[16] = { -1, -1, -1, -1, -1, -1, -1, -1, 1,  2,  4,  6,  8, 10, 13, 16 };
+
+int* ADPCMDecoder::s_index_update_tables[4] = {
+	ADPCMDecoder::_index_update_table_2bits,
+	ADPCMDecoder::_index_update_table_3bits,
+	ADPCMDecoder::_index_update_table_4bits,
+	ADPCMDecoder::_index_update_table_5bits
+};
+
+int ADPCMDecoder::s_stepsize[STEPSIZE_CT] = {
+	7, 8, 9, 10, 11, 12, 13, 14, 16, 17,
+	19, 21, 23, 25, 28, 31, 34, 37, 41, 45,
+	50, 55, 60, 66, 73, 80, 88, 97, 107, 118,
+	130, 143, 157, 173, 190, 209, 230, 253, 279, 307,
+	337, 371, 408, 449, 494, 544, 598, 658, 724, 796,
+	876, 963, 1060, 1166, 1282, 1411, 1552, 1707, 1878, 2066,
+	2272, 2499, 2749, 3024, 3327, 3660, 4026, 4428, 4871, 5358,
+	5894, 6484, 7132, 7845, 8630, 9493, 10442, 11487, 12635, 13899,
+	15289, 16818, 18500, 20350, 22385, 24623, 27086, 29794, 32767
+};
+
+// ----------------------------------------------------------------------------
+// END OF ADPCMDecoder class
+// ----------------------------------------------------------------------------
+
+
 //
 // Some tag implementations
 //
@@ -1321,7 +1568,7 @@
 	//log_debug("ADPCM format");
 	// Uncompress the ADPCM before handing data to host.
 	if (sample_count == 0) sample_count = data_bytes / ( stereo ? 4 : 2 );
-	adpcm_expand(data, in, sample_count, stereo);
+	ADPCMDecoder::adpcm_expand(data, in, sample_count, stereo);
 	data_bytes = sample_count * (stereo ? 4 : 2);
 	format = sound_handler::FORMAT_NATIVE16;
 	break;
@@ -1599,80 +1846,11 @@
 	data = (unsigned char *)out_data;
 }
 
-//
-// ADPCM
-//
-
-// Data from Alexis' SWF reference
-static int	s_index_update_table_2bits[2] = { -1,  2 };
-static int	s_index_update_table_3bits[4] = { -1, -1,  2,  4 };
-static int	s_index_update_table_4bits[8] = { -1, -1, -1, -1,  2,  4,  6,  8 };
-static int	s_index_update_table_5bits[16] = { -1, -1, -1, -1, -1, -1, -1, -1, 1,  2,  4,  6,  8, 10, 13, 16 };
-
-static int*	s_index_update_tables[4] = {
-	s_index_update_table_2bits,
-	s_index_update_table_3bits,
-	s_index_update_table_4bits,
-	s_index_update_table_5bits,
-};
-
-// Data from Jansen.  http://homepages.cwi.nl/~jack/
-// Check out his Dutch retro punk songs, heh heh :)
-const int STEPSIZE_CT = 89;
-static int s_stepsize[STEPSIZE_CT] = {
-	7, 8, 9, 10, 11, 12, 13, 14, 16, 17,
-	19, 21, 23, 25, 28, 31, 34, 37, 41, 45,
-	50, 55, 60, 66, 73, 80, 88, 97, 107, 118,
-	130, 143, 157, 173, 190, 209, 230, 253, 279, 307,
-	337, 371, 408, 449, 494, 544, 598, 658, 724, 796,
-	876, 963, 1060, 1166, 1282, 1411, 1552, 1707, 1878, 2066,
-	2272, 2499, 2749, 3024, 3327, 3660, 4026, 4428, 4871, 5358,
-	5894, 6484, 7132, 7845, 8630, 9493, 10442, 11487, 12635, 13899,
-	15289, 16818, 18500, 20350, 22385, 24623, 27086, 29794, 32767
-};
-
-
-// Algo from http://www.circuitcellar.com/pastissues/articles/richey110/text.htm
-// And also Jansen.
-// Here's another reference: http://www.geocities.com/SiliconValley/8682/aud3.txt
-// Original IMA spec doesn't seem to be on the web :(
-
 
 // @@ lots of macros here!  It seems that VC6 can't correctly
 // handle integer template args, although it's happy to
 // compile them?!
 
-//	void DO_SAMPLE(int n_bits, int& sample, int& stepsize_index, int raw_code)
-#define DO_SAMPLE(n_bits, sample, stepsize_index, raw_code)									\
-{															\
-	assert(raw_code >= 0 && raw_code < (1 << n_bits));								\
-															\
-	static const int	HI_BIT = (1 << (n_bits - 1));								\
-	int*	index_update_table = s_index_update_tables[n_bits - 2];							\
-															\
-	/* Core of ADPCM. */												\
-															\
-	int	code_mag = raw_code & (HI_BIT - 1);									\
-	bool	code_sign_bit = (raw_code & HI_BIT) ? 1 : 0;								\
-	int	mag = (code_mag << 1) + 1;	/* shift in LSB (they do this so that pos & neg zero are different)*/	\
-															\
-	int	stepsize = s_stepsize[stepsize_index];									\
-															\
-	/* Compute the new sample.  It's the predicted value			*/					\
-	/* (i.e. the previous value), plus a delta.  The delta			*/					\
-	/* comes from the code times the stepsize.  going for			*/					\
-	/* something like: delta = stepsize * (code * 2 + 1) >> code_bits	*/					\
-	int	delta = (stepsize * mag) >> (n_bits - 1);								\
-	if (code_sign_bit) delta = -delta;										\
-															\
-	sample += delta;												\
-	sample = iclamp(sample, -32768, 32767);										\
-															\
-	/* Update our stepsize index.  Use a lookup table. */								\
-	stepsize_index += index_update_table[code_mag];									\
-	stepsize_index = iclamp(stepsize_index, 0, STEPSIZE_CT - 1);							\
-}
-
 
 class in_stream
 {
@@ -1691,162 +1869,4 @@
 };
 
 
-//	void DO_MONO_BLOCK(int16_t** out_data, int n_bits, int sample_count, stream* in, int sample, int stepsize_index)
-#define DO_MONO_BLOCK(out_data, n_bits, sample_count, in, sample, stepsize_index)						\
-{															\
-	/* First sample doesn't need to be decompressed. */								\
-	sample_count--;													\
-	*(*out_data)++ = (int16_t) sample;										\
-															\
-	while (sample_count--)												\
-	{														\
-		int	raw_code = in->read_uint(n_bits);								\
-		DO_SAMPLE(n_bits, sample, stepsize_index, raw_code);	/* sample & stepsize_index are in/out params */	\
-		*(*out_data)++ = (int16_t) sample;									\
-	}														\
-}
-
-
-//	void do_stereo_block(
-//		int16_t** out_data,	// in/out param
-//		int n_bits,
-//		int sample_count,
-//		stream* in,
-//		int left_sample,
-//		int left_stepsize_index,
-//		int right_sample,
-//		int right_stepsize_index
-//		)
-#define DO_STEREO_BLOCK(out_data, n_bits, sample_count, in, left_sample, left_stepsize_index, right_sample, right_stepsize_index) \
-/* Uncompress 4096 stereo sample pairs of ADPCM. */									  \
-{															  \
-	/* First samples don't need to be decompressed. */								  \
-	sample_count--;													  \
-	*(*out_data)++ = (int16_t) left_sample;										  \
-	*(*out_data)++ = (int16_t) right_sample;										  \
-															  \
-	while (sample_count--)												  \
-	{														  \
-		int	left_raw_code = in->read_uint(n_bits);								  \
-		DO_SAMPLE(n_bits, left_sample, left_stepsize_index, left_raw_code);					  \
-		*(*out_data)++ = (int16_t) left_sample;									  \
-															  \
-		int	right_raw_code = in->read_uint(n_bits);								  \
-		DO_SAMPLE(n_bits, right_sample, right_stepsize_index, right_raw_code);					  \
-		*(*out_data)++ = (int16_t) right_sample;									  \
-	}														  \
-}
-
-
-// Utility function: uncompress ADPCM data from in stream to
-// out_data[].	The output buffer must have (sample_count*2)
-// bytes for mono, or (sample_count*4) bytes for stereo.
-static void adpcm_expand(
-	unsigned char* &data,
-	stream* in,
-	int sample_count,	// in stereo, this is number of *pairs* of samples (TODO: why is this signed at all ??)
-	bool stereo)
-{
-	int16_t* out_data = new int16_t[stereo ? sample_count*2 : sample_count];
-	data = reinterpret_cast<unsigned char *>(out_data);
-
-	// Read header.
-	in->ensureBytes(1); // nbits
-	unsigned int n_bits = in->read_uint(2) + 2;	// 2 to 5 bits (TODO: use unsigned...)
-
-
-#ifndef GNASH_TRUST_SWF_INPUT
-
-	// bitsPerCompSample is the number of bits for each comp sample
-	unsigned int bitsPerCompSample = n_bits;
-	if (stereo) bitsPerCompSample *= 2;
-
-	// There's going to be one block every 4096 samples ...
-	unsigned int blocksCount = sample_count/4096;
-
-	// ... or fraction
-	if ( sample_count%4096 ) ++blocksCount;
-
-	// Of the total samples, all but the first sample in a block are comp
-	unsigned int compSamples = sample_count - blocksCount;
-
-	// From every block, a fixed 22 bits will be read (16 of which are the uncomp sample)
-	unsigned int fixedBitsPerBlock = 22;
-
-	// Total bits needed from stream
-	unsigned long bitsNeeded = (compSamples*bitsPerCompSample) + (fixedBitsPerBlock*blocksCount);
-
-	// 2 bits have been read already, so the stream position is now one byte after the
-	// next 6 bits we're going to read, so we strip those 6 bits from the count of bits
-	// we still need
-	bitsNeeded -= (8-2);
-
-	// Now, we convert this number to bytes, requiring one more if any 
-	unsigned int excessBits = bitsNeeded%8;
-	unsigned long bytesNeeded = bitsNeeded/8;
-	if ( excessBits ) ++bytesNeeded;
-
-	//log_debug("adpcm_expand, stereo:%d, sample_count:%u, bitsPerSample:%u, "
-	//	"blocksCount:%u, bitsPerBlock:%u, bitsNeeded:%lu, excessBits:%u, bytesNeeded:%lu",
-	//	stereo, sample_count, bitsPerCompSample, blocksCount, fixedBitsPerBlock, bitsNeeded, excessBits, bytesNeeded);
-
-	in->ensureBytes(bytesNeeded);
-
-#endif // GNASH_TRUST_SWF_INPUT
-
-	while (sample_count)
-	{
-		// Read initial sample & index values.
-
-		int	sample = in->read_sint(16);
-
-		int	stepsize_index = in->read_uint(6);
-		assert(STEPSIZE_CT >= (1 << 6));	// ensure we don't need to clamp.
-
-		int	samples_this_block = imin(sample_count, 4096);
-		sample_count -= samples_this_block;
-
-		if (stereo == false)
-		{
-#define DO_MONO(n) DO_MONO_BLOCK(&out_data, n, samples_this_block, in, sample, stepsize_index)
-
-			switch (n_bits)
-			{
-			default: assert(0); break;
-			case 2: DO_MONO(2); break;
-			case 3: DO_MONO(3); break;
-			case 4: DO_MONO(4); break;
-			case 5: DO_MONO(5); break;
-			}
-		}
-		else
-		{
-			// Stereo.
-
-			// Got values for left channel; now get initial sample
-			// & index for right channel.
-			int	right_sample = in->read_sint(16);
-
-			int	right_stepsize_index = in->read_uint(6);
-			assert(STEPSIZE_CT >= (1 << 6));	// ensure we don't need to clamp.
-
-#define DO_STEREO(n)					\
-	DO_STEREO_BLOCK(				\
-		&out_data, n, samples_this_block,	\
-		in, sample, stepsize_index,		\
-		right_sample, right_stepsize_index)
-			
-			switch (n_bits)
-			{
-			default: assert(0); break;
-			case 2: DO_STEREO(2); break;
-			case 3: DO_STEREO(3); break;
-			case 4: DO_STEREO(4); break;
-			case 5: DO_STEREO(5); break;
-			}
-		}
-	}
-
-}
-
 } // namespace gnash



From MAILER-DAEMON Thu Aug 09 17:57:34 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJG0c-0003tV-AL
	for mharc-gnash-commit@gnu.org; Thu, 09 Aug 2007 17:57:34 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJG0a-0003so-58
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 17:57:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJG0Z-0003sW-5L
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 17:57:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJG0Y-0003sQ-UK
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 17:57:31 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJG0Y-0008SF-Cg
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 17:57:30 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJG0X-0001dm-Pb
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 21:57:29 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJG0X-0001dj-L1
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 21:57:29 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJG0X-0001dj-L1@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 09 Aug 2007 21:57:29 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/swf/tag_loaders.cpp
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Aug 2007 21:57:32 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/09 21:57:29

Modified files:
	.              : ChangeLog 
	server/swf     : tag_loaders.cpp 

Log message:
	        * server/swf/tag_loaders.cpp: move all ADPCM-related code in an
	          ADPCMDecoder class.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.3&r2=1.3971.2.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.123.2.1&r2=1.123.2.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.3
retrieving revision 1.3971.2.4
diff -u -b -r1.3971.2.3 -r1.3971.2.4
--- ChangeLog	9 Aug 2007 17:25:52 -0000	1.3971.2.3
+++ ChangeLog	9 Aug 2007 21:57:28 -0000	1.3971.2.4
@@ -1,5 +1,7 @@
 2007-08-09 Sandro Santilli <strk@keybit.net>
 
+	* server/swf/tag_loaders.cpp: move all ADPCM-related code in an
+	  ADPCMDecoder class.
 	* server/button_character_instance.cpp (construct): properly construct
 	  all button child characters. Fixes bug #20729.
 	* server/swf/tag_loaders.cpp (adpcm_expand): another try at fixing the

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.123.2.1
retrieving revision 1.123.2.2
diff -u -b -r1.123.2.1 -r1.123.2.2
--- server/swf/tag_loaders.cpp	9 Aug 2007 17:01:58 -0000	1.123.2.1
+++ server/swf/tag_loaders.cpp	9 Aug 2007 21:57:29 -0000	1.123.2.2
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: tag_loaders.cpp,v 1.123.2.1 2007/08/09 17:01:58 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.123.2.2 2007/08/09 21:57:29 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -77,13 +77,260 @@
 	int sample_count,  // in stereo, this is number of *pairs* of samples
 	bool stereo);
 
-static void adpcm_expand(unsigned char* &data, stream* in,
-	int sample_count,  // in stereo, this is number of *pairs* of samples
-	bool stereo);
-
 namespace SWF {
 namespace tag_loaders {
 
+// ----------------------------------------------------------------------------
+// ADPCMDecoder class
+// ----------------------------------------------------------------------------
+
+/// ADPCM decoder utilities
+//
+/// Algo from http://www.circuitcellar.com/pastissues/articles/richey110/text.htm
+/// And also Jansen.
+/// Here's another reference: http://www.geocities.com/SiliconValley/8682/aud3.txt
+/// Original IMA spec doesn't seem to be on the web :(
+///
+/// TODO: move in it's own file
+///
+class ADPCMDecoder {
+
+private:
+
+	// Data from Alexis' SWF reference
+	static int _index_update_table_2bits[2];
+	static int _index_update_table_3bits[4];
+	static int _index_update_table_4bits[8];
+	static int _index_update_table_5bits[16];
+
+	static int* s_index_update_tables[4];
+
+	// Data from Jansen.  http://homepages.cwi.nl/~jack/
+	// Check out his Dutch retro punk songs, heh heh :)
+	static const int STEPSIZE_CT = 89;
+	static int s_stepsize[STEPSIZE_CT];
+
+
+	static void doSample(int n_bits, int& sample, int& stepsize_index, int raw_code)
+	{
+		assert(raw_code >= 0 && raw_code < (1 << n_bits));								
+																
+		static const int	HI_BIT = (1 << (n_bits - 1));								
+		int*	index_update_table = s_index_update_tables[n_bits - 2];							
+																
+		/* Core of ADPCM. */												
+																
+		int	code_mag = raw_code & (HI_BIT - 1);									
+		bool	code_sign_bit = (raw_code & HI_BIT) ? 1 : 0;								
+		int	mag = (code_mag << 1) + 1;	/* shift in LSB (they do this so that pos & neg zero are different)*/	
+																
+		int	stepsize = s_stepsize[stepsize_index];									
+																
+		/* Compute the new sample.  It's the predicted value			*/					
+		/* (i.e. the previous value), plus a delta.  The delta			*/					
+		/* comes from the code times the stepsize.  going for			*/					
+		/* something like: delta = stepsize * (code * 2 + 1) >> code_bits	*/					
+		int	delta = (stepsize * mag) >> (n_bits - 1);								
+		if (code_sign_bit) delta = -delta;										
+																
+		sample += delta;												
+		sample = iclamp(sample, -32768, 32767);										
+																
+		/* Update our stepsize index.  Use a lookup table. */								
+		stepsize_index += index_update_table[code_mag];									
+		stepsize_index = iclamp(stepsize_index, 0, STEPSIZE_CT - 1);							
+	}
+
+	/* Uncompress 4096 mono samples of ADPCM. */									
+	static void doMonoBlock(int16_t** out_data, int n_bits, int sample_count, stream* in, int sample, int stepsize_index)
+	{
+		/* First sample doesn't need to be decompressed. */								
+		sample_count--;													
+		*(*out_data)++ = (int16_t) sample;										
+																
+		while (sample_count--)												
+		{														
+			int	raw_code = in->read_uint(n_bits);								
+			doSample(n_bits, sample, stepsize_index, raw_code);	/* sample & stepsize_index are in/out params */	
+			*(*out_data)++ = (int16_t) sample;									
+		}														
+	}
+
+
+	/* Uncompress 4096 stereo sample pairs of ADPCM. */									
+	static void doStereoBlock(
+			int16_t** out_data,	// in/out param
+			int n_bits,
+			int sample_count,
+			stream* in,
+			int left_sample,
+			int left_stepsize_index,
+			int right_sample,
+			int right_stepsize_index
+			)
+	{
+		/* First samples don't need to be decompressed. */								
+		sample_count--;													
+		*(*out_data)++ = (int16_t) left_sample;										
+		*(*out_data)++ = (int16_t) right_sample;										
+																
+		while (sample_count--)												
+		{														
+			int	left_raw_code = in->read_uint(n_bits);								
+			doSample(n_bits, left_sample, left_stepsize_index, left_raw_code);					
+			*(*out_data)++ = (int16_t) left_sample;									
+																
+			int	right_raw_code = in->read_uint(n_bits);								
+			doSample(n_bits, right_sample, right_stepsize_index, right_raw_code);					
+			*(*out_data)++ = (int16_t) right_sample;									
+		}														
+	}
+
+public:
+
+	// Utility function: uncompress ADPCM data from in stream to
+	// out_data[].	The output buffer must have (sample_count*2)
+	// bytes for mono, or (sample_count*4) bytes for stereo.
+	static void adpcm_expand(
+		unsigned char* &data,
+		stream* in,
+		int sample_count,	// in stereo, this is number of *pairs* of samples (TODO: why is this signed at all ??)
+		bool stereo)
+	{
+		int16_t* out_data = new int16_t[stereo ? sample_count*2 : sample_count];
+		data = reinterpret_cast<unsigned char *>(out_data);
+
+		// Read header.
+		in->ensureBytes(1); // nbits
+		unsigned int n_bits = in->read_uint(2) + 2;	// 2 to 5 bits (TODO: use unsigned...)
+
+
+#ifndef GNASH_TRUST_SWF_INPUT
+
+		// bitsPerCompSample is the number of bits for each comp sample
+		unsigned int bitsPerCompSample = n_bits;
+		if (stereo) bitsPerCompSample *= 2;
+
+		// There's going to be one block every 4096 samples ...
+		unsigned int blocksCount = sample_count/4096;
+
+		// ... or fraction
+		if ( sample_count%4096 ) ++blocksCount;
+
+		// Of the total samples, all but the first sample in a block are comp
+		unsigned int compSamples = sample_count - blocksCount;
+
+		// From every block, a fixed 22 bits will be read (16 of which are the uncomp sample)
+		unsigned int fixedBitsPerBlock = 22;
+
+		// Total bits needed from stream
+		unsigned long bitsNeeded = (compSamples*bitsPerCompSample) + (fixedBitsPerBlock*blocksCount);
+
+		// 2 bits have been read already, so the stream position is now one byte after the
+		// next 6 bits we're going to read, so we strip those 6 bits from the count of bits
+		// we still need
+		bitsNeeded -= (8-2);
+
+		// Now, we convert this number to bytes, requiring one more if any 
+		unsigned int excessBits = bitsNeeded%8;
+		unsigned long bytesNeeded = bitsNeeded/8;
+		if ( excessBits ) ++bytesNeeded;
+
+		//log_debug("adpcm_expand, stereo:%d, sample_count:%u, bitsPerSample:%u, "
+		//	"blocksCount:%u, bitsPerBlock:%u, bitsNeeded:%lu, excessBits:%u, bytesNeeded:%lu",
+		//	stereo, sample_count, bitsPerCompSample, blocksCount, fixedBitsPerBlock, bitsNeeded, excessBits, bytesNeeded);
+
+		in->ensureBytes(bytesNeeded);
+
+#endif // GNASH_TRUST_SWF_INPUT
+
+		while (sample_count)
+		{
+			// Read initial sample & index values.
+
+			int	sample = in->read_sint(16);
+
+			int	stepsize_index = in->read_uint(6);
+			assert(STEPSIZE_CT >= (1 << 6));	// ensure we don't need to clamp.
+
+			int	samples_this_block = imin(sample_count, 4096);
+			sample_count -= samples_this_block;
+
+			if (stereo == false)
+			{
+#define DO_MONO(n) doMonoBlock(&out_data, n, samples_this_block, in, sample, stepsize_index)
+
+				switch (n_bits)
+				{
+				default: assert(0); break;
+				case 2: DO_MONO(2); break;
+				case 3: DO_MONO(3); break;
+				case 4: DO_MONO(4); break;
+				case 5: DO_MONO(5); break;
+				}
+			}
+			else
+			{
+				// Stereo.
+
+				// Got values for left channel; now get initial sample
+				// & index for right channel.
+				int	right_sample = in->read_sint(16);
+
+				int	right_stepsize_index = in->read_uint(6);
+				assert(STEPSIZE_CT >= (1 << 6));	// ensure we don't need to clamp.
+
+#define DO_STEREO(n)					\
+		doStereoBlock(				\
+			&out_data, n, samples_this_block,	\
+			in, sample, stepsize_index,		\
+			right_sample, right_stepsize_index)
+				
+				switch (n_bits)
+				{
+				default: assert(0); break;
+				case 2: DO_STEREO(2); break;
+				case 3: DO_STEREO(3); break;
+				case 4: DO_STEREO(4); break;
+				case 5: DO_STEREO(5); break;
+				}
+			}
+		}
+
+	}
+
+
+};
+
+int ADPCMDecoder::_index_update_table_2bits[2] = { -1,  2 };
+int ADPCMDecoder::_index_update_table_3bits[4] = { -1, -1,  2,  4 };
+int ADPCMDecoder::_index_update_table_4bits[8] = { -1, -1, -1, -1,  2,  4,  6,  8 };
+int ADPCMDecoder::_index_update_table_5bits[16] = { -1, -1, -1, -1, -1, -1, -1, -1, 1,  2,  4,  6,  8, 10, 13, 16 };
+
+int* ADPCMDecoder::s_index_update_tables[4] = {
+	ADPCMDecoder::_index_update_table_2bits,
+	ADPCMDecoder::_index_update_table_3bits,
+	ADPCMDecoder::_index_update_table_4bits,
+	ADPCMDecoder::_index_update_table_5bits
+};
+
+int ADPCMDecoder::s_stepsize[STEPSIZE_CT] = {
+	7, 8, 9, 10, 11, 12, 13, 14, 16, 17,
+	19, 21, 23, 25, 28, 31, 34, 37, 41, 45,
+	50, 55, 60, 66, 73, 80, 88, 97, 107, 118,
+	130, 143, 157, 173, 190, 209, 230, 253, 279, 307,
+	337, 371, 408, 449, 494, 544, 598, 658, 724, 796,
+	876, 963, 1060, 1166, 1282, 1411, 1552, 1707, 1878, 2066,
+	2272, 2499, 2749, 3024, 3327, 3660, 4026, 4428, 4871, 5358,
+	5894, 6484, 7132, 7845, 8630, 9493, 10442, 11487, 12635, 13899,
+	15289, 16818, 18500, 20350, 22385, 24623, 27086, 29794, 32767
+};
+
+// ----------------------------------------------------------------------------
+// END OF ADPCMDecoder class
+// ----------------------------------------------------------------------------
+
+
 //
 // Some tag implementations
 //
@@ -1321,7 +1568,7 @@
 	//log_debug("ADPCM format");
 	// Uncompress the ADPCM before handing data to host.
 	if (sample_count == 0) sample_count = data_bytes / ( stereo ? 4 : 2 );
-	adpcm_expand(data, in, sample_count, stereo);
+	ADPCMDecoder::adpcm_expand(data, in, sample_count, stereo);
 	data_bytes = sample_count * (stereo ? 4 : 2);
 	format = sound_handler::FORMAT_NATIVE16;
 	break;
@@ -1599,80 +1846,11 @@
 	data = (unsigned char *)out_data;
 }
 
-//
-// ADPCM
-//
-
-// Data from Alexis' SWF reference
-static int	s_index_update_table_2bits[2] = { -1,  2 };
-static int	s_index_update_table_3bits[4] = { -1, -1,  2,  4 };
-static int	s_index_update_table_4bits[8] = { -1, -1, -1, -1,  2,  4,  6,  8 };
-static int	s_index_update_table_5bits[16] = { -1, -1, -1, -1, -1, -1, -1, -1, 1,  2,  4,  6,  8, 10, 13, 16 };
-
-static int*	s_index_update_tables[4] = {
-	s_index_update_table_2bits,
-	s_index_update_table_3bits,
-	s_index_update_table_4bits,
-	s_index_update_table_5bits,
-};
-
-// Data from Jansen.  http://homepages.cwi.nl/~jack/
-// Check out his Dutch retro punk songs, heh heh :)
-const int STEPSIZE_CT = 89;
-static int s_stepsize[STEPSIZE_CT] = {
-	7, 8, 9, 10, 11, 12, 13, 14, 16, 17,
-	19, 21, 23, 25, 28, 31, 34, 37, 41, 45,
-	50, 55, 60, 66, 73, 80, 88, 97, 107, 118,
-	130, 143, 157, 173, 190, 209, 230, 253, 279, 307,
-	337, 371, 408, 449, 494, 544, 598, 658, 724, 796,
-	876, 963, 1060, 1166, 1282, 1411, 1552, 1707, 1878, 2066,
-	2272, 2499, 2749, 3024, 3327, 3660, 4026, 4428, 4871, 5358,
-	5894, 6484, 7132, 7845, 8630, 9493, 10442, 11487, 12635, 13899,
-	15289, 16818, 18500, 20350, 22385, 24623, 27086, 29794, 32767
-};
-
-
-// Algo from http://www.circuitcellar.com/pastissues/articles/richey110/text.htm
-// And also Jansen.
-// Here's another reference: http://www.geocities.com/SiliconValley/8682/aud3.txt
-// Original IMA spec doesn't seem to be on the web :(
-
 
 // @@ lots of macros here!  It seems that VC6 can't correctly
 // handle integer template args, although it's happy to
 // compile them?!
 
-//	void DO_SAMPLE(int n_bits, int& sample, int& stepsize_index, int raw_code)
-#define DO_SAMPLE(n_bits, sample, stepsize_index, raw_code)									\
-{															\
-	assert(raw_code >= 0 && raw_code < (1 << n_bits));								\
-															\
-	static const int	HI_BIT = (1 << (n_bits - 1));								\
-	int*	index_update_table = s_index_update_tables[n_bits - 2];							\
-															\
-	/* Core of ADPCM. */												\
-															\
-	int	code_mag = raw_code & (HI_BIT - 1);									\
-	bool	code_sign_bit = (raw_code & HI_BIT) ? 1 : 0;								\
-	int	mag = (code_mag << 1) + 1;	/* shift in LSB (they do this so that pos & neg zero are different)*/	\
-															\
-	int	stepsize = s_stepsize[stepsize_index];									\
-															\
-	/* Compute the new sample.  It's the predicted value			*/					\
-	/* (i.e. the previous value), plus a delta.  The delta			*/					\
-	/* comes from the code times the stepsize.  going for			*/					\
-	/* something like: delta = stepsize * (code * 2 + 1) >> code_bits	*/					\
-	int	delta = (stepsize * mag) >> (n_bits - 1);								\
-	if (code_sign_bit) delta = -delta;										\
-															\
-	sample += delta;												\
-	sample = iclamp(sample, -32768, 32767);										\
-															\
-	/* Update our stepsize index.  Use a lookup table. */								\
-	stepsize_index += index_update_table[code_mag];									\
-	stepsize_index = iclamp(stepsize_index, 0, STEPSIZE_CT - 1);							\
-}
-
 
 class in_stream
 {
@@ -1691,162 +1869,4 @@
 };
 
 
-//	void DO_MONO_BLOCK(int16_t** out_data, int n_bits, int sample_count, stream* in, int sample, int stepsize_index)
-#define DO_MONO_BLOCK(out_data, n_bits, sample_count, in, sample, stepsize_index)						\
-{															\
-	/* First sample doesn't need to be decompressed. */								\
-	sample_count--;													\
-	*(*out_data)++ = (int16_t) sample;										\
-															\
-	while (sample_count--)												\
-	{														\
-		int	raw_code = in->read_uint(n_bits);								\
-		DO_SAMPLE(n_bits, sample, stepsize_index, raw_code);	/* sample & stepsize_index are in/out params */	\
-		*(*out_data)++ = (int16_t) sample;									\
-	}														\
-}
-
-
-//	void do_stereo_block(
-//		int16_t** out_data,	// in/out param
-//		int n_bits,
-//		int sample_count,
-//		stream* in,
-//		int left_sample,
-//		int left_stepsize_index,
-//		int right_sample,
-//		int right_stepsize_index
-//		)
-#define DO_STEREO_BLOCK(out_data, n_bits, sample_count, in, left_sample, left_stepsize_index, right_sample, right_stepsize_index) \
-/* Uncompress 4096 stereo sample pairs of ADPCM. */									  \
-{															  \
-	/* First samples don't need to be decompressed. */								  \
-	sample_count--;													  \
-	*(*out_data)++ = (int16_t) left_sample;										  \
-	*(*out_data)++ = (int16_t) right_sample;										  \
-															  \
-	while (sample_count--)												  \
-	{														  \
-		int	left_raw_code = in->read_uint(n_bits);								  \
-		DO_SAMPLE(n_bits, left_sample, left_stepsize_index, left_raw_code);					  \
-		*(*out_data)++ = (int16_t) left_sample;									  \
-															  \
-		int	right_raw_code = in->read_uint(n_bits);								  \
-		DO_SAMPLE(n_bits, right_sample, right_stepsize_index, right_raw_code);					  \
-		*(*out_data)++ = (int16_t) right_sample;									  \
-	}														  \
-}
-
-
-// Utility function: uncompress ADPCM data from in stream to
-// out_data[].	The output buffer must have (sample_count*2)
-// bytes for mono, or (sample_count*4) bytes for stereo.
-static void adpcm_expand(
-	unsigned char* &data,
-	stream* in,
-	int sample_count,	// in stereo, this is number of *pairs* of samples (TODO: why is this signed at all ??)
-	bool stereo)
-{
-	int16_t* out_data = new int16_t[stereo ? sample_count*2 : sample_count];
-	data = reinterpret_cast<unsigned char *>(out_data);
-
-	// Read header.
-	in->ensureBytes(1); // nbits
-	unsigned int n_bits = in->read_uint(2) + 2;	// 2 to 5 bits (TODO: use unsigned...)
-
-
-#ifndef GNASH_TRUST_SWF_INPUT
-
-	// bitsPerCompSample is the number of bits for each comp sample
-	unsigned int bitsPerCompSample = n_bits;
-	if (stereo) bitsPerCompSample *= 2;
-
-	// There's going to be one block every 4096 samples ...
-	unsigned int blocksCount = sample_count/4096;
-
-	// ... or fraction
-	if ( sample_count%4096 ) ++blocksCount;
-
-	// Of the total samples, all but the first sample in a block are comp
-	unsigned int compSamples = sample_count - blocksCount;
-
-	// From every block, a fixed 22 bits will be read (16 of which are the uncomp sample)
-	unsigned int fixedBitsPerBlock = 22;
-
-	// Total bits needed from stream
-	unsigned long bitsNeeded = (compSamples*bitsPerCompSample) + (fixedBitsPerBlock*blocksCount);
-
-	// 2 bits have been read already, so the stream position is now one byte after the
-	// next 6 bits we're going to read, so we strip those 6 bits from the count of bits
-	// we still need
-	bitsNeeded -= (8-2);
-
-	// Now, we convert this number to bytes, requiring one more if any 
-	unsigned int excessBits = bitsNeeded%8;
-	unsigned long bytesNeeded = bitsNeeded/8;
-	if ( excessBits ) ++bytesNeeded;
-
-	//log_debug("adpcm_expand, stereo:%d, sample_count:%u, bitsPerSample:%u, "
-	//	"blocksCount:%u, bitsPerBlock:%u, bitsNeeded:%lu, excessBits:%u, bytesNeeded:%lu",
-	//	stereo, sample_count, bitsPerCompSample, blocksCount, fixedBitsPerBlock, bitsNeeded, excessBits, bytesNeeded);
-
-	in->ensureBytes(bytesNeeded);
-
-#endif // GNASH_TRUST_SWF_INPUT
-
-	while (sample_count)
-	{
-		// Read initial sample & index values.
-
-		int	sample = in->read_sint(16);
-
-		int	stepsize_index = in->read_uint(6);
-		assert(STEPSIZE_CT >= (1 << 6));	// ensure we don't need to clamp.
-
-		int	samples_this_block = imin(sample_count, 4096);
-		sample_count -= samples_this_block;
-
-		if (stereo == false)
-		{
-#define DO_MONO(n) DO_MONO_BLOCK(&out_data, n, samples_this_block, in, sample, stepsize_index)
-
-			switch (n_bits)
-			{
-			default: assert(0); break;
-			case 2: DO_MONO(2); break;
-			case 3: DO_MONO(3); break;
-			case 4: DO_MONO(4); break;
-			case 5: DO_MONO(5); break;
-			}
-		}
-		else
-		{
-			// Stereo.
-
-			// Got values for left channel; now get initial sample
-			// & index for right channel.
-			int	right_sample = in->read_sint(16);
-
-			int	right_stepsize_index = in->read_uint(6);
-			assert(STEPSIZE_CT >= (1 << 6));	// ensure we don't need to clamp.
-
-#define DO_STEREO(n)					\
-	DO_STEREO_BLOCK(				\
-		&out_data, n, samples_this_block,	\
-		in, sample, stepsize_index,		\
-		right_sample, right_stepsize_index)
-			
-			switch (n_bits)
-			{
-			default: assert(0); break;
-			case 2: DO_STEREO(2); break;
-			case 3: DO_STEREO(3); break;
-			case 4: DO_STEREO(4); break;
-			case 5: DO_STEREO(5); break;
-			}
-		}
-	}
-
-}
-
 } // namespace gnash



From MAILER-DAEMON Thu Aug 09 19:24:42 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJHMw-0000cl-7o
	for mharc-gnash-commit@gnu.org; Thu, 09 Aug 2007 19:24:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJHMu-0000am-MD
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 19:24:40 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJHMt-0000aX-U2
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 19:24:40 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJHMt-0000aQ-Qg
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 19:24:39 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJHMt-0000Qk-Hl
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 19:24:39 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJHMs-0007GL-BC
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 23:24:38 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJHMs-0007GH-0k
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 23:24:38 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJHMs-0007GH-0k@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 09 Aug 2007 23:24:38 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/swf/tag_loaders.cpp
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Aug 2007 23:24:40 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/09 23:24:37

Modified files:
	.              : ChangeLog 
	server/swf     : tag_loaders.cpp 

Log message:
	        * server/swf/tag_loaders.cpp (ADPCMDecoder::adpcm_expand):
	          Rather then throwing a ParseException, just print an error
	          as it's much likely the error is in Gnash parser, rather
	          then in a malformed SWF, and tests show we do a better
	          job like that then by stopping the parser.
	          Also, print an error if the bytesNeeded computation doesn't
	          match the actual number of bytes read.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.4&r2=1.3971.2.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.123.2.2&r2=1.123.2.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.4
retrieving revision 1.3971.2.5
diff -u -b -r1.3971.2.4 -r1.3971.2.5
--- ChangeLog	9 Aug 2007 21:57:28 -0000	1.3971.2.4
+++ ChangeLog	9 Aug 2007 23:24:36 -0000	1.3971.2.5
@@ -1,5 +1,15 @@
 2007-08-09 Sandro Santilli <strk@keybit.net>
 
+	* server/swf/tag_loaders.cpp (ADPCMDecoder::adpcm_expand):
+	  Rather then throwing a ParseException, just print an error
+	  as it's much likely the error is in Gnash parser, rather
+	  then in a malformed SWF, and tests show we do a better
+	  job like that then by stopping the parser.
+	  Also, print an error if the bytesNeeded computation doesn't
+	  match the actual number of bytes read.
+
+2007-08-09 Sandro Santilli <strk@keybit.net>
+
 	* server/swf/tag_loaders.cpp: move all ADPCM-related code in an
 	  ADPCMDecoder class.
 	* server/button_character_instance.cpp (construct): properly construct

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.123.2.2
retrieving revision 1.123.2.3
diff -u -b -r1.123.2.2 -r1.123.2.3
--- server/swf/tag_loaders.cpp	9 Aug 2007 21:57:29 -0000	1.123.2.2
+++ server/swf/tag_loaders.cpp	9 Aug 2007 23:24:37 -0000	1.123.2.3
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: tag_loaders.cpp,v 1.123.2.2 2007/08/09 21:57:29 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.123.2.3 2007/08/09 23:24:37 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -226,21 +226,22 @@
 		// Total bits needed from stream
 		unsigned long bitsNeeded = (compSamples*bitsPerCompSample) + (fixedBitsPerBlock*blocksCount);
 
-		// 2 bits have been read already, so the stream position is now one byte after the
-		// next 6 bits we're going to read, so we strip those 6 bits from the count of bits
-		// we still need
-		bitsNeeded -= (8-2);
-
-		// Now, we convert this number to bytes, requiring one more if any 
-		unsigned int excessBits = bitsNeeded%8;
+		// Now, we convert this number to bytes...
 		unsigned long bytesNeeded = bitsNeeded/8;
-		if ( excessBits ) ++bytesNeeded;
-
-		//log_debug("adpcm_expand, stereo:%d, sample_count:%u, bitsPerSample:%u, "
-		//	"blocksCount:%u, bitsPerBlock:%u, bitsNeeded:%lu, excessBits:%u, bytesNeeded:%lu",
-		//	stereo, sample_count, bitsPerCompSample, blocksCount, fixedBitsPerBlock, bitsNeeded, excessBits, bytesNeeded);
+		// ... requiring one more if the bits in excess are more then
+		//     the ones still available in last byte read 
+		unsigned int excessBits = bitsNeeded%8;
+		if ( excessBits > 6 ) ++bytesNeeded;
 
-		in->ensureBytes(bytesNeeded);
+		// Take note of the current position to later verify if we got the 
+		// number of required bytes right
+		unsigned long prevPosition = in->get_position();
+
+		// We substract 1 byte as the 6 excessive of a byte are already in the stream,
+		// and we won't require another one unless more then 6 excessive bits are needed
+		// WARNING: this is currently disabled due to a bug in this function often resulting
+		//          in reads past the end of the stream
+		//in->ensureBytes(bytesNeeded-1);
 
 #endif // GNASH_TRUST_SWF_INPUT
 
@@ -297,6 +298,39 @@
 			}
 		}
 
+#ifndef GNASH_TRUST_SWF_INPUT
+		unsigned long curPos = in->get_position();
+		unsigned long bytesRead = curPos - prevPosition;
+		if ( bytesRead != bytesNeeded )
+		{
+			// This would happen if the computation of bytesNeeded doesn't match the current
+			// implementation.
+			// NOTE That the current implementation seems pretty much bogus as we *often* end
+			// up reading past the end of the tag. Once we fix the decoding we shoudl also fix
+			// the computation of bytes needed
+			log_error("admcp_expand: we expected to read %lu bytes, but we read %lu instead (%ld error)",
+				bytesNeeded, bytesRead, bytesNeeded-bytesRead);
+			// abort();
+		}
+
+		unsigned long endTagPos = in->get_tag_end_position();
+		if ( curPos > endTagPos )
+		{
+			// This happens when our decoder reads past the end of the tag.
+			// In general, we should aborth parsing of the current tag when this happens,
+			// anyway, it seems that *some* sound can be heard nonetheless so we keep going.
+			log_error("admcp_expand: read past tag boundary: current position: %lu, end of tag position: %lu (overflow: %lu bytes)",
+				curPos, endTagPos, curPos-endTagPos);
+
+#if 0
+			log_debug("      stereo:%d, sample_count:%u, compressedSamples:%d, bitsPerCompSample:%u, "
+				"blocksCount:%u, bitsPerBlock:%u, bitsNeeded:%lu, excessBits:%u, bytesNeeded:%lu, bytesLeft:%lu",
+				stereo, sample_count, compSamples, bitsPerCompSample, blocksCount, fixedBitsPerBlock,
+				bitsNeeded, excessBits, bytesNeeded, in->get_tag_end_position()-in->get_position());
+#endif
+		}
+#endif // GNASH_TRUST_SWF_INPUT
+
 	}
 
 



From MAILER-DAEMON Thu Aug 09 19:24:47 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJHN1-0000fl-Am
	for mharc-gnash-commit@gnu.org; Thu, 09 Aug 2007 19:24:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJHN0-0000f4-EF
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 19:24:46 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJHMz-0000eS-SW
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 19:24:45 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJHMz-0000eP-Gz
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 19:24:45 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJHMz-0000Ro-55
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 19:24:45 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJHMy-0007Gc-EN
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 23:24:44 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJHMy-0007GZ-9C
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 23:24:44 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJHMy-0007GZ-9C@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 09 Aug 2007 23:24:44 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/swf/tag_loaders.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Aug 2007 23:24:46 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/09 23:24:44

Modified files:
	.              : ChangeLog 
	server/swf     : tag_loaders.cpp 

Log message:
	        * server/swf/tag_loaders.cpp (ADPCMDecoder::adpcm_expand):
	          Rather then throwing a ParseException, just print an error
	          as it's much likely the error is in Gnash parser, rather
	          then in a malformed SWF, and tests show we do a better
	          job like that then by stopping the parser.
	          Also, print an error if the bytesNeeded computation doesn't
	          match the actual number of bytes read.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3977&r2=1.3978
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.125&r2=1.126

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3977
retrieving revision 1.3978
diff -u -b -r1.3977 -r1.3978
--- ChangeLog	9 Aug 2007 21:56:29 -0000	1.3977
+++ ChangeLog	9 Aug 2007 23:24:43 -0000	1.3978
@@ -1,5 +1,15 @@
 2007-08-09 Sandro Santilli <strk@keybit.net>
 
+	* server/swf/tag_loaders.cpp (ADPCMDecoder::adpcm_expand):
+	  Rather then throwing a ParseException, just print an error
+	  as it's much likely the error is in Gnash parser, rather
+	  then in a malformed SWF, and tests show we do a better
+	  job like that then by stopping the parser.
+	  Also, print an error if the bytesNeeded computation doesn't
+	  match the actual number of bytes read.
+
+2007-08-09 Sandro Santilli <strk@keybit.net>
+
 	* server/swf/tag_loaders.cpp: move all ADPCM-related code in an
 	  ADPCMDecoder class.
 	* README_CVS: minimum version of automake is 1.9.6. 1.7 and 1.8 have

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -b -r1.125 -r1.126
--- server/swf/tag_loaders.cpp	9 Aug 2007 21:56:30 -0000	1.125
+++ server/swf/tag_loaders.cpp	9 Aug 2007 23:24:44 -0000	1.126
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: tag_loaders.cpp,v 1.125 2007/08/09 21:56:30 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.126 2007/08/09 23:24:44 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -226,21 +226,22 @@
 		// Total bits needed from stream
 		unsigned long bitsNeeded = (compSamples*bitsPerCompSample) + (fixedBitsPerBlock*blocksCount);
 
-		// 2 bits have been read already, so the stream position is now one byte after the
-		// next 6 bits we're going to read, so we strip those 6 bits from the count of bits
-		// we still need
-		bitsNeeded -= (8-2);
-
-		// Now, we convert this number to bytes, requiring one more if any 
-		unsigned int excessBits = bitsNeeded%8;
+		// Now, we convert this number to bytes...
 		unsigned long bytesNeeded = bitsNeeded/8;
-		if ( excessBits ) ++bytesNeeded;
-
-		//log_debug("adpcm_expand, stereo:%d, sample_count:%u, bitsPerSample:%u, "
-		//	"blocksCount:%u, bitsPerBlock:%u, bitsNeeded:%lu, excessBits:%u, bytesNeeded:%lu",
-		//	stereo, sample_count, bitsPerCompSample, blocksCount, fixedBitsPerBlock, bitsNeeded, excessBits, bytesNeeded);
+		// ... requiring one more if the bits in excess are more then
+		//     the ones still available in last byte read 
+		unsigned int excessBits = bitsNeeded%8;
+		if ( excessBits > 6 ) ++bytesNeeded;
 
-		in->ensureBytes(bytesNeeded);
+		// Take note of the current position to later verify if we got the 
+		// number of required bytes right
+		unsigned long prevPosition = in->get_position();
+
+		// We substract 1 byte as the 6 excessive of a byte are already in the stream,
+		// and we won't require another one unless more then 6 excessive bits are needed
+		// WARNING: this is currently disabled due to a bug in this function often resulting
+		//          in reads past the end of the stream
+		//in->ensureBytes(bytesNeeded-1);
 
 #endif // GNASH_TRUST_SWF_INPUT
 
@@ -297,6 +298,39 @@
 			}
 		}
 
+#ifndef GNASH_TRUST_SWF_INPUT
+		unsigned long curPos = in->get_position();
+		unsigned long bytesRead = curPos - prevPosition;
+		if ( bytesRead != bytesNeeded )
+		{
+			// This would happen if the computation of bytesNeeded doesn't match the current
+			// implementation.
+			// NOTE That the current implementation seems pretty much bogus as we *often* end
+			// up reading past the end of the tag. Once we fix the decoding we shoudl also fix
+			// the computation of bytes needed
+			log_error("admcp_expand: we expected to read %lu bytes, but we read %lu instead (%ld error)",
+				bytesNeeded, bytesRead, bytesNeeded-bytesRead);
+			// abort();
+		}
+
+		unsigned long endTagPos = in->get_tag_end_position();
+		if ( curPos > endTagPos )
+		{
+			// This happens when our decoder reads past the end of the tag.
+			// In general, we should aborth parsing of the current tag when this happens,
+			// anyway, it seems that *some* sound can be heard nonetheless so we keep going.
+			log_error("admcp_expand: read past tag boundary: current position: %lu, end of tag position: %lu (overflow: %lu bytes)",
+				curPos, endTagPos, curPos-endTagPos);
+
+#if 0
+			log_debug("      stereo:%d, sample_count:%u, compressedSamples:%d, bitsPerCompSample:%u, "
+				"blocksCount:%u, bitsPerBlock:%u, bitsNeeded:%lu, excessBits:%u, bytesNeeded:%lu, bytesLeft:%lu",
+				stereo, sample_count, compSamples, bitsPerCompSample, blocksCount, fixedBitsPerBlock,
+				bitsNeeded, excessBits, bytesNeeded, in->get_tag_end_position()-in->get_position());
+#endif
+		}
+#endif // GNASH_TRUST_SWF_INPUT
+
 	}
 
 



From MAILER-DAEMON Thu Aug 09 19:30:00 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJHS3-00031f-Pd
	for mharc-gnash-commit@gnu.org; Thu, 09 Aug 2007 19:29:59 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJHS1-0002zg-H9
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 19:29:57 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJHS1-0002zH-1A
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 19:29:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJHS0-0002zA-Pe
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 19:29:56 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJHS0-0001N9-G0
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 19:29:56 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJHRy-0007LT-1n
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 23:29:54 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJHRx-0007LQ-TM
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 23:29:53 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJHRx-0007LQ-TM@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 09 Aug 2007 23:29:53 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/FreetypeGlyphsProvider.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Aug 2007 23:29:57 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/09 23:29:53

Modified files:
	.              : ChangeLog 
	server         : FreetypeGlyphsProvider.cpp 

Log message:
	        * server/FreetypeGlyphsProvider.cpp (getGlyph): don't abort if
	          FT_Load_Char doesn't return an outline glyph, rather print
	          an UNIMPLEMENTED message and the type of glyph you got.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3978&r2=1.3979
http://cvs.savannah.gnu.org/viewcvs/gnash/server/FreetypeGlyphsProvider.cpp?cvsroot=gnash&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3978
retrieving revision 1.3979
diff -u -b -r1.3978 -r1.3979
--- ChangeLog	9 Aug 2007 23:24:43 -0000	1.3978
+++ ChangeLog	9 Aug 2007 23:29:53 -0000	1.3979
@@ -1,5 +1,8 @@
 2007-08-09 Sandro Santilli <strk@keybit.net>
 
+	* server/FreetypeGlyphsProvider.cpp (getGlyph): don't abort if
+	  FT_Load_Char doesn't return an outline glyph, rather print
+	  an UNIMPLEMENTED message and the type of glyph you got.
 	* server/swf/tag_loaders.cpp (ADPCMDecoder::adpcm_expand):
 	  Rather then throwing a ParseException, just print an error
 	  as it's much likely the error is in Gnash parser, rather

Index: server/FreetypeGlyphsProvider.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/FreetypeGlyphsProvider.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/FreetypeGlyphsProvider.cpp	24 Jul 2007 15:01:27 -0000	1.7
+++ server/FreetypeGlyphsProvider.cpp	9 Aug 2007 23:29:53 -0000	1.8
@@ -408,7 +408,13 @@
 	log_debug("Advance value for glyph '%c' is %g (horiAdvance:%ld, scale:%g)", code, advance, m_face->glyph->metrics.horiAdvance, scale);
 #endif
 
-	assert(m_face->glyph->format == FT_GLYPH_FORMAT_OUTLINE);
+	if ( m_face->glyph->format != FT_GLYPH_FORMAT_OUTLINE )
+	{
+		log_unimpl("FT_Load_Char() returned a glyph format != FT_GLYPH_FORMAT_OUTLINE (%d)",
+			m_face->glyph->format);
+		return 0;
+	}
+	//assert(m_face->glyph->format == FT_GLYPH_FORMAT_OUTLINE);
 
 	FT_Outline* outline = &(m_face->glyph->outline);
 



From MAILER-DAEMON Thu Aug 09 19:31:11 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJHTD-0003ec-Mg
	for mharc-gnash-commit@gnu.org; Thu, 09 Aug 2007 19:31:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJHTB-0003eS-1U
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 19:31:09 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJHT9-0003dQ-HP
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 19:31:08 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJHT9-0003dB-9c
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 19:31:07 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJHT8-0001Y1-Vk
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 19:31:07 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJHT8-0007N8-JK
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 23:31:06 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJHT8-0007N5-G4
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 23:31:06 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJHT8-0007N5-G4@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 09 Aug 2007 23:31:06 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/FreetypeGlyphsProvider.cpp
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Aug 2007 23:31:09 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/09 23:31:06

Modified files:
	.              : ChangeLog 
	server         : FreetypeGlyphsProvider.cpp 

Log message:
	        * server/FreetypeGlyphsProvider.cpp (getGlyph): don't abort if
	          FT_Load_Char doesn't return an outline glyph, rather print
	          an UNIMPLEMENTED message and the type of glyph you got.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.5&r2=1.3971.2.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/FreetypeGlyphsProvider.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.7&r2=1.7.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.5
retrieving revision 1.3971.2.6
diff -u -b -r1.3971.2.5 -r1.3971.2.6
--- ChangeLog	9 Aug 2007 23:24:36 -0000	1.3971.2.5
+++ ChangeLog	9 Aug 2007 23:31:05 -0000	1.3971.2.6
@@ -1,5 +1,8 @@
 2007-08-09 Sandro Santilli <strk@keybit.net>
 
+	* server/FreetypeGlyphsProvider.cpp (getGlyph): don't abort if
+	  FT_Load_Char doesn't return an outline glyph, rather print
+	  an UNIMPLEMENTED message and the type of glyph you got.
 	* server/swf/tag_loaders.cpp (ADPCMDecoder::adpcm_expand):
 	  Rather then throwing a ParseException, just print an error
 	  as it's much likely the error is in Gnash parser, rather

Index: server/FreetypeGlyphsProvider.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/FreetypeGlyphsProvider.cpp,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -b -r1.7 -r1.7.2.1
--- server/FreetypeGlyphsProvider.cpp	24 Jul 2007 15:01:27 -0000	1.7
+++ server/FreetypeGlyphsProvider.cpp	9 Aug 2007 23:31:06 -0000	1.7.2.1
@@ -408,7 +408,13 @@
 	log_debug("Advance value for glyph '%c' is %g (horiAdvance:%ld, scale:%g)", code, advance, m_face->glyph->metrics.horiAdvance, scale);
 #endif
 
-	assert(m_face->glyph->format == FT_GLYPH_FORMAT_OUTLINE);
+	if ( m_face->glyph->format != FT_GLYPH_FORMAT_OUTLINE )
+	{
+		log_unimpl("FT_Load_Char() returned a glyph format != FT_GLYPH_FORMAT_OUTLINE (%d)",
+			m_face->glyph->format);
+		return 0;
+	}
+	//assert(m_face->glyph->format == FT_GLYPH_FORMAT_OUTLINE);
 
 	FT_Outline* outline = &(m_face->glyph->outline);
 



From MAILER-DAEMON Thu Aug 09 23:54:23 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJLZv-0000oN-6a
	for mharc-gnash-commit@gnu.org; Thu, 09 Aug 2007 23:54:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJLZt-0000ni-Oj
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 23:54:21 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJLZs-0000nN-Sm
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 23:54:21 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJLZs-0000nK-N4
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 23:54:20 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJLZr-0008IU-JS
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 23:54:19 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJLZj-0008Tr-S7
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 03:54:11 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJLZj-0008To-Nc
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 03:54:11 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJLZj-0008To-Nc@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 10 Aug 2007 03:54:11 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/swf/tag_loaders.cpp
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Aug 2007 03:54:21 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/10 03:54:11

Modified files:
	.              : ChangeLog 
	server/swf     : tag_loaders.cpp 

Log message:
	        * server/swf/tag_loaders.cpp (sound_stream_block_loader): don't
	          discard the first 4 bytes if not reading an MP3. Makes ADPCM
	          sound better for the feed.swf case (but ADPCM decoder needs
	          lot more work to be correct)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.6&r2=1.3971.2.7
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.123.2.3&r2=1.123.2.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.6
retrieving revision 1.3971.2.7
diff -u -b -r1.3971.2.6 -r1.3971.2.7
--- ChangeLog	9 Aug 2007 23:31:05 -0000	1.3971.2.6
+++ ChangeLog	10 Aug 2007 03:54:10 -0000	1.3971.2.7
@@ -1,5 +1,12 @@
 2007-08-09 Sandro Santilli <strk@keybit.net>
 
+	* server/swf/tag_loaders.cpp (sound_stream_block_loader): don't
+	  discard the first 4 bytes if not reading an MP3. Makes ADPCM
+	  sound better for the feed.swf case (but ADPCM decoder needs
+	  lot more work to be correct)
+
+2007-08-09 Sandro Santilli <strk@keybit.net>
+
 	* server/FreetypeGlyphsProvider.cpp (getGlyph): don't abort if
 	  FT_Load_Char doesn't return an outline glyph, rather print
 	  an UNIMPLEMENTED message and the type of glyph you got.

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.123.2.3
retrieving revision 1.123.2.4
diff -u -b -r1.123.2.3 -r1.123.2.4
--- server/swf/tag_loaders.cpp	9 Aug 2007 23:24:37 -0000	1.123.2.3
+++ server/swf/tag_loaders.cpp	10 Aug 2007 03:54:11 -0000	1.123.2.4
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: tag_loaders.cpp,v 1.123.2.3 2007/08/09 23:24:37 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.123.2.4 2007/08/10 03:54:11 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1543,8 +1543,10 @@
 
     assert(tag == SWF::SOUNDSTREAMBLOCK); // 19
 
-    // discard garbage data
-    in->skip_bytes(4);
+    // discard garbage data (MP3 only)
+    // TODO: stop using statics (stream_input_format) for stream sounds..
+    //       tgc should be working on this
+    if ( stream_input_format == sound_handler::FORMAT_MP3) in->skip_bytes(4);
 
     // If we don't have a sound_handler registered stop here
     if (!handler) return;



From MAILER-DAEMON Thu Aug 09 23:54:27 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJLZz-0000r3-Dc
	for mharc-gnash-commit@gnu.org; Thu, 09 Aug 2007 23:54:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJLZx-0000qT-KQ
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 23:54:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJLZw-0000py-Oo
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 23:54:25 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJLZw-0000ps-KW
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 23:54:24 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJLZv-0008Jb-I7
	for gnash-commit@gnu.org; Thu, 09 Aug 2007 23:54:23 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJLZo-0008U8-TJ
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 03:54:16 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJLZo-0008U5-Nz
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 03:54:16 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJLZo-0008U5-Nz@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 10 Aug 2007 03:54:16 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/swf/tag_loaders.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Aug 2007 03:54:25 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/10 03:54:16

Modified files:
	.              : ChangeLog 
	server/swf     : tag_loaders.cpp 

Log message:
	        * server/swf/tag_loaders.cpp (sound_stream_block_loader): don't
	          discard the first 4 bytes if not reading an MP3. Makes ADPCM
	          sound better for the feed.swf case (but ADPCM decoder needs
	          lot more work to be correct)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3979&r2=1.3980
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.126&r2=1.127

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3979
retrieving revision 1.3980
diff -u -b -r1.3979 -r1.3980
--- ChangeLog	9 Aug 2007 23:29:53 -0000	1.3979
+++ ChangeLog	10 Aug 2007 03:54:16 -0000	1.3980
@@ -1,5 +1,12 @@
 2007-08-09 Sandro Santilli <strk@keybit.net>
 
+	* server/swf/tag_loaders.cpp (sound_stream_block_loader): don't
+	  discard the first 4 bytes if not reading an MP3. Makes ADPCM
+	  sound better for the feed.swf case (but ADPCM decoder needs
+	  lot more work to be correct)
+
+2007-08-09 Sandro Santilli <strk@keybit.net>
+
 	* server/FreetypeGlyphsProvider.cpp (getGlyph): don't abort if
 	  FT_Load_Char doesn't return an outline glyph, rather print
 	  an UNIMPLEMENTED message and the type of glyph you got.

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -b -r1.126 -r1.127
--- server/swf/tag_loaders.cpp	9 Aug 2007 23:24:44 -0000	1.126
+++ server/swf/tag_loaders.cpp	10 Aug 2007 03:54:16 -0000	1.127
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: tag_loaders.cpp,v 1.126 2007/08/09 23:24:44 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.127 2007/08/10 03:54:16 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1543,8 +1543,10 @@
 
     assert(tag == SWF::SOUNDSTREAMBLOCK); // 19
 
-    // discard garbage data
-    in->skip_bytes(4);
+    // discard garbage data (MP3 only)
+    // TODO: stop using statics (stream_input_format) for stream sounds..
+    //       tgc should be working on this
+    if ( stream_input_format == sound_handler::FORMAT_MP3) in->skip_bytes(4);
 
     // If we don't have a sound_handler registered stop here
     if (!handler) return;



From MAILER-DAEMON Fri Aug 10 00:25:43 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJM4F-0002om-2v
	for mharc-gnash-commit@gnu.org; Fri, 10 Aug 2007 00:25:43 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJM4D-0002oR-Kc
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 00:25:41 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJM4C-0002ny-O5
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 00:25:41 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJM4C-0002nr-IC
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 00:25:40 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1IJM4B-0005yU-PA
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 00:25:40 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l7A4PYk15640;
	Fri, 10 Aug 2007 06:25:34 +0200 (CEST)
	(envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Fri, 10 Aug 2007 06:25:34 +0200
To: Zou Lunkai <zoulunkai@gmail.com>
Subject: Re: [Gnash-commit] gnash ChangeLog server/character.h server/dlist...
Message-ID: <20070810042534.GA13154@keybit.net>
Mail-Followup-To: Zou Lunkai <zoulunkai@gmail.com>, gnash-commit@gnu.org
References: <E1IJ6xs-0005Ny-7O@cvs.savannah.gnu.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1IJ6xs-0005Ny-7O@cvs.savannah.gnu.org>
X-Detected-Kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Aug 2007 04:25:42 -0000

On Thu, Aug 09, 2007 at 12:18:08PM +0000, Zou Lunkai wrote:

> Index: server/parser/Timeline.h
> ===================================================================
> RCS file: /sources/gnash/gnash/server/parser/Timeline.h,v
> retrieving revision 1.5
> retrieving revision 1.6
> diff -u -b -r1.5 -r1.6
> --- server/parser/Timeline.h	1 Jul 2007 10:54:33 -0000	1.5
> +++ server/parser/Timeline.h	9 Aug 2007 12:18:06 -0000	1.6
> @@ -94,7 +94,7 @@
>  	///
>  	void closeFrame()
>  	{
> -		boost::mutex::scoped_lock lock(_frameDepthsMutex);
> +		//boost::mutex::scoped_lock lock(_frameDepthsMutex);

Isn't Timeline set by parser thread and used by playback thread anymore ?
That's why the mutex was there... (something which is hard to test with
a testcase, being time-based pending bug)

(I belive getFrameDeptsh() should also lock, didn't notice if you 
changed that or was already bogus).

The methods description tell which methods should lock and which not.

--strk;



From MAILER-DAEMON Fri Aug 10 00:36:18 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJMEU-0007VR-Hd
	for mharc-gnash-commit@gnu.org; Fri, 10 Aug 2007 00:36:18 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJMET-0007Tx-AP
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 00:36:17 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJMER-0007Sh-UD
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 00:36:16 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJMER-0007Se-PW
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 00:36:15 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJMER-0007pj-AR
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 00:36:15 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJMEQ-0004kB-4V
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 04:36:14 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJMEQ-0004k6-06
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 04:36:14 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJMEQ-0004k6-06@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 10 Aug 2007 04:36:14 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog backend/Makefile.am libamf/Make...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Aug 2007 04:36:18 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/10 04:36:13

Modified files:
	.              : ChangeLog 
	backend        : Makefile.am 
	libamf         : Makefile.am 
	libbase        : Makefile.am 
	libgeometry    : Makefile.am 
	plugin/mozilla-sdk: Makefile.am 
	server         : Makefile.am 

Log message:
	Applied patch from bug #20665 by Alexander Sack <asac@jwsdot.com>:
	
	        * backend/Makefile.am, libamf/Makefile.am, libbase/Makefile.am,
	          libgeometry/Makefile.am, plugin/mozilla-sdk/Makefile.am,
	          server/Makefile.am: use $pkglibdir for unversioned libs.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3980&r2=1.3981
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/Makefile.am?cvsroot=gnash&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/Makefile.am?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/Makefile.am?cvsroot=gnash&r1=1.77&r2=1.78
http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/Makefile.am?cvsroot=gnash&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/mozilla-sdk/Makefile.am?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Makefile.am?cvsroot=gnash&r1=1.120&r2=1.121

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3980
retrieving revision 1.3981
diff -u -b -r1.3980 -r1.3981
--- ChangeLog	10 Aug 2007 03:54:16 -0000	1.3980
+++ ChangeLog	10 Aug 2007 04:36:12 -0000	1.3981
@@ -1,3 +1,9 @@
+2007-08-10 Alexander Sack <asac@jwsdot.com>
+
+	* backend/Makefile.am, libamf/Makefile.am, libbase/Makefile.am,
+	  libgeometry/Makefile.am, plugin/mozilla-sdk/Makefile.am,
+	  server/Makefile.am: use $pkglibdir for unversioned libs.
+
 2007-08-09 Sandro Santilli <strk@keybit.net>
 
 	* server/swf/tag_loaders.cpp (sound_stream_block_loader): don't

Index: backend/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/backend/Makefile.am,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- backend/Makefile.am	23 Jul 2007 22:07:58 -0000	1.58
+++ backend/Makefile.am	10 Aug 2007 04:36:13 -0000	1.59
@@ -78,7 +78,7 @@
 
 # bin_PROGRAMS = gnash
 
-lib_LTLIBRARIES = libgnashbackend.la
+pkglib_LTLIBRARIES = libgnashbackend.la
 
 # RENDER_SOURCES = render_handler_tri.cpp
 SOUND_SOURCES = 

Index: libamf/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libamf/Makefile.am,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- libamf/Makefile.am	30 Jul 2007 22:48:19 -0000	1.27
+++ libamf/Makefile.am	10 Aug 2007 04:36:13 -0000	1.28
@@ -15,11 +15,11 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.27 2007/07/30 22:48:19 strk Exp $
+# $Id: Makefile.am,v 1.28 2007/08/10 04:36:13 strk Exp $
 
 AUTOMAKE_OPTIONS = 
 
-lib_LTLIBRARIES = libgnashamf.la
+pkglib_LTLIBRARIES = libgnashamf.la
 libgnashamf_la_SOURCES = amf.cpp rtmp.cpp
 
 libgnashamf_la_LIBADD = $(top_builddir)/libbase/libgnashbase.la

Index: libbase/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libbase/Makefile.am,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- libbase/Makefile.am	20 Jul 2007 01:50:32 -0000	1.77
+++ libbase/Makefile.am	10 Aug 2007 04:36:13 -0000	1.78
@@ -29,7 +29,7 @@
 
 # If we are using an installable libltdl, then it needs to be built
 # before libgnash, as libgnash depends on it for extensions.
-lib_LTLIBRARIES =  $(LIBLTDLLIB) libgnashbase.la
+pkglib_LTLIBRARIES =  $(LIBLTDLLIB) libgnashbase.la
 
 libgnashbase_la_CPPFLAGS = -DPLUGINSDIR=\"$(pluginsdir)\" \
 	-I.. -I$(srcdir) \
@@ -186,9 +186,9 @@
 #noinst_PROGRAMS = demo
 #demo_SOURCES = demo.cpp
 #demo_LDADD = libgnashbase.la
-demo$(EXEEXT): demo.o $(lib_LTLIBRARIES)
+demo$(EXEEXT): demo.o $(pkglib_LTLIBRARIES)
 # 	@$(RM) demo$(EXEEXT)
-# 	$(CXXLINK) $(AM_LDFLAGS) demo.o $(lib_LTLIBRARIES) $(LIBS)
+# 	$(CXXLINK) $(AM_LDFLAGS) demo.o $(pkglib_LTLIBRARIES) $(LIBS)
 
 # Rebuild with GCC 4.x Mudflap support
 mudflap:

Index: libgeometry/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libgeometry/Makefile.am,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- libgeometry/Makefile.am	1 Jul 2007 10:54:11 -0000	1.30
+++ libgeometry/Makefile.am	10 Aug 2007 04:36:13 -0000	1.31
@@ -18,7 +18,7 @@
 # 
 #
 
-# $Id: Makefile.am,v 1.30 2007/07/01 10:54:11 bjacques Exp $
+# $Id: Makefile.am,v 1.31 2007/08/10 04:36:13 strk Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -27,7 +27,7 @@
 # AM_LDFLAGS  = $(OPENGL_LIBNS) $(SDL_LIBS)
 
 # noinst_LTLIBRARIES = libgeometry.la
-lib_LTLIBRARIES = libgnashgeo.la
+pkglib_LTLIBRARIES = libgnashgeo.la
 # noinst_LIBRARIES = libgeometry.a
 
 # These headers get installed

Index: plugin/mozilla-sdk/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/mozilla-sdk/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- plugin/mozilla-sdk/Makefile.am	1 Jul 2007 10:54:15 -0000	1.15
+++ plugin/mozilla-sdk/Makefile.am	10 Aug 2007 04:36:13 -0000	1.16
@@ -28,7 +28,7 @@
 # AM_LDFLAGS  = $(FIREFOX_LIBS)
 
 # noinst_LTLIBRARIES = libmozsdk.la
-lib_LTLIBRARIES = libmozsdk.la
+pkglib_LTLIBRARIES = libmozsdk.la
 
 noinst_HEADERS = npplat.h \
 	 pluginbase.h \

Index: server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/Makefile.am,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -b -r1.120 -r1.121
--- server/Makefile.am	1 Jul 2007 10:54:18 -0000	1.120
+++ server/Makefile.am	10 Aug 2007 04:36:13 -0000	1.121
@@ -18,14 +18,14 @@
 # 
 #
 
-# $Id: Makefile.am,v 1.120 2007/07/01 10:54:18 bjacques Exp $
+# $Id: Makefile.am,v 1.121 2007/08/10 04:36:13 strk Exp $
 
 AUTOMAKE_OPTIONS = 
 
 SUBDIRS = asobj parser vm
 
 # noinst_LTLIBRARIES = libserver.la 
-lib_LTLIBRARIES = libgnashserver.la
+pkglib_LTLIBRARIES = libgnashserver.la
 # noinst_SCRIPTS = gen-files.sh
 
 # TODO: use a conditional to optionally link ?



From MAILER-DAEMON Fri Aug 10 00:36:26 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJMEb-0007aE-TF
	for mharc-gnash-commit@gnu.org; Fri, 10 Aug 2007 00:36:25 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJMEa-0007a5-Js
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 00:36:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJMEZ-0007Zg-JV
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 00:36:24 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJMEZ-0007Zd-Bx
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 00:36:23 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJMEY-0007r7-Vk
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 00:36:23 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJMEX-0004kn-UK
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 04:36:22 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJMEX-0004kj-ND
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 04:36:21 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJMEX-0004kj-ND@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 10 Aug 2007 04:36:21 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog backend/Makefile.am libamf/Make...
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Aug 2007 04:36:24 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/10 04:36:21

Modified files:
	.              : ChangeLog 
	backend        : Makefile.am 
	libamf         : Makefile.am 
	libbase        : Makefile.am 
	libgeometry    : Makefile.am 
	plugin/mozilla-sdk: Makefile.am 
	server         : Makefile.am 

Log message:
	Applied patch from bug #20665 by Alexander Sack <asac@jwsdot.com>:
	
	        * backend/Makefile.am, libamf/Makefile.am, libbase/Makefile.am,
	          libgeometry/Makefile.am, plugin/mozilla-sdk/Makefile.am,
	          server/Makefile.am: use $pkglibdir for unversioned libs.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.7&r2=1.3971.2.8
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/Makefile.am?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.58&r2=1.58.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/Makefile.am?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.27&r2=1.27.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/Makefile.am?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.77&r2=1.77.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/Makefile.am?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.30&r2=1.30.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/mozilla-sdk/Makefile.am?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.15&r2=1.15.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Makefile.am?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.120&r2=1.120.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.7
retrieving revision 1.3971.2.8
diff -u -b -r1.3971.2.7 -r1.3971.2.8
--- ChangeLog	10 Aug 2007 03:54:10 -0000	1.3971.2.7
+++ ChangeLog	10 Aug 2007 04:36:18 -0000	1.3971.2.8
@@ -1,3 +1,9 @@
+2007-08-10 Alexander Sack <asac@jwsdot.com>
+
+	* backend/Makefile.am, libamf/Makefile.am, libbase/Makefile.am,
+	  libgeometry/Makefile.am, plugin/mozilla-sdk/Makefile.am,
+	  server/Makefile.am: use $pkglibdir for unversioned libs.
+
 2007-08-09 Sandro Santilli <strk@keybit.net>
 
 	* server/swf/tag_loaders.cpp (sound_stream_block_loader): don't

Index: backend/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/backend/Makefile.am,v
retrieving revision 1.58
retrieving revision 1.58.2.1
diff -u -b -r1.58 -r1.58.2.1
--- backend/Makefile.am	23 Jul 2007 22:07:58 -0000	1.58
+++ backend/Makefile.am	10 Aug 2007 04:36:19 -0000	1.58.2.1
@@ -78,7 +78,7 @@
 
 # bin_PROGRAMS = gnash
 
-lib_LTLIBRARIES = libgnashbackend.la
+pkglib_LTLIBRARIES = libgnashbackend.la
 
 # RENDER_SOURCES = render_handler_tri.cpp
 SOUND_SOURCES = 

Index: libamf/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libamf/Makefile.am,v
retrieving revision 1.27
retrieving revision 1.27.2.1
diff -u -b -r1.27 -r1.27.2.1
--- libamf/Makefile.am	30 Jul 2007 22:48:19 -0000	1.27
+++ libamf/Makefile.am	10 Aug 2007 04:36:20 -0000	1.27.2.1
@@ -15,11 +15,11 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.27 2007/07/30 22:48:19 strk Exp $
+# $Id: Makefile.am,v 1.27.2.1 2007/08/10 04:36:20 strk Exp $
 
 AUTOMAKE_OPTIONS = 
 
-lib_LTLIBRARIES = libgnashamf.la
+pkglib_LTLIBRARIES = libgnashamf.la
 libgnashamf_la_SOURCES = amf.cpp rtmp.cpp
 
 libgnashamf_la_LIBADD = $(top_builddir)/libbase/libgnashbase.la

Index: libbase/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libbase/Makefile.am,v
retrieving revision 1.77
retrieving revision 1.77.2.1
diff -u -b -r1.77 -r1.77.2.1
--- libbase/Makefile.am	20 Jul 2007 01:50:32 -0000	1.77
+++ libbase/Makefile.am	10 Aug 2007 04:36:20 -0000	1.77.2.1
@@ -29,7 +29,7 @@
 
 # If we are using an installable libltdl, then it needs to be built
 # before libgnash, as libgnash depends on it for extensions.
-lib_LTLIBRARIES =  $(LIBLTDLLIB) libgnashbase.la
+pkglib_LTLIBRARIES =  $(LIBLTDLLIB) libgnashbase.la
 
 libgnashbase_la_CPPFLAGS = -DPLUGINSDIR=\"$(pluginsdir)\" \
 	-I.. -I$(srcdir) \
@@ -186,9 +186,9 @@
 #noinst_PROGRAMS = demo
 #demo_SOURCES = demo.cpp
 #demo_LDADD = libgnashbase.la
-demo$(EXEEXT): demo.o $(lib_LTLIBRARIES)
+demo$(EXEEXT): demo.o $(pkglib_LTLIBRARIES)
 # 	@$(RM) demo$(EXEEXT)
-# 	$(CXXLINK) $(AM_LDFLAGS) demo.o $(lib_LTLIBRARIES) $(LIBS)
+# 	$(CXXLINK) $(AM_LDFLAGS) demo.o $(pkglib_LTLIBRARIES) $(LIBS)
 
 # Rebuild with GCC 4.x Mudflap support
 mudflap:

Index: libgeometry/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libgeometry/Makefile.am,v
retrieving revision 1.30
retrieving revision 1.30.2.1
diff -u -b -r1.30 -r1.30.2.1
--- libgeometry/Makefile.am	1 Jul 2007 10:54:11 -0000	1.30
+++ libgeometry/Makefile.am	10 Aug 2007 04:36:20 -0000	1.30.2.1
@@ -18,7 +18,7 @@
 # 
 #
 
-# $Id: Makefile.am,v 1.30 2007/07/01 10:54:11 bjacques Exp $
+# $Id: Makefile.am,v 1.30.2.1 2007/08/10 04:36:20 strk Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -27,7 +27,7 @@
 # AM_LDFLAGS  = $(OPENGL_LIBNS) $(SDL_LIBS)
 
 # noinst_LTLIBRARIES = libgeometry.la
-lib_LTLIBRARIES = libgnashgeo.la
+pkglib_LTLIBRARIES = libgnashgeo.la
 # noinst_LIBRARIES = libgeometry.a
 
 # These headers get installed

Index: plugin/mozilla-sdk/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/mozilla-sdk/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -b -r1.15 -r1.15.2.1
--- plugin/mozilla-sdk/Makefile.am	1 Jul 2007 10:54:15 -0000	1.15
+++ plugin/mozilla-sdk/Makefile.am	10 Aug 2007 04:36:21 -0000	1.15.2.1
@@ -28,7 +28,7 @@
 # AM_LDFLAGS  = $(FIREFOX_LIBS)
 
 # noinst_LTLIBRARIES = libmozsdk.la
-lib_LTLIBRARIES = libmozsdk.la
+pkglib_LTLIBRARIES = libmozsdk.la
 
 noinst_HEADERS = npplat.h \
 	 pluginbase.h \

Index: server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/Makefile.am,v
retrieving revision 1.120
retrieving revision 1.120.2.1
diff -u -b -r1.120 -r1.120.2.1
--- server/Makefile.am	1 Jul 2007 10:54:18 -0000	1.120
+++ server/Makefile.am	10 Aug 2007 04:36:21 -0000	1.120.2.1
@@ -18,14 +18,14 @@
 # 
 #
 
-# $Id: Makefile.am,v 1.120 2007/07/01 10:54:18 bjacques Exp $
+# $Id: Makefile.am,v 1.120.2.1 2007/08/10 04:36:21 strk Exp $
 
 AUTOMAKE_OPTIONS = 
 
 SUBDIRS = asobj parser vm
 
 # noinst_LTLIBRARIES = libserver.la 
-lib_LTLIBRARIES = libgnashserver.la
+pkglib_LTLIBRARIES = libgnashserver.la
 # noinst_SCRIPTS = gen-files.sh
 
 # TODO: use a conditional to optionally link ?



From MAILER-DAEMON Fri Aug 10 01:24:28 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJMz6-0001Ss-Eb
	for mharc-gnash-commit@gnu.org; Fri, 10 Aug 2007 01:24:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJMz4-0001Sf-VK
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 01:24:27 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJMz3-0001S0-0r
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 01:24:26 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJMz2-0001Rt-Qb
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 01:24:24 -0400
Received: from wa-out-1112.google.com ([209.85.146.179])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1IJMz2-0000QF-Ff
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 01:24:24 -0400
Received: by wa-out-1112.google.com with SMTP id k34so760260wah
	for <gnash-commit@gnu.org>; Thu, 09 Aug 2007 22:24:23 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=EkfGYIEaQ1o4Lg1Z9N9YLWPsykib38lPHPwneVrw4TieWnfND7fOjBZfJFY8E1Summ0RrsWxgYPeM/8NwdlKx58rMRPJJeT40I4f1ab9ovteKsK2ZLdDCd6rq9TjJpY2qaNyUN6Lm/avH1N46Gd5xzlQzZIzQS1CqmDx5rF9Pbw=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=J4SJdzaeOExPvqIBu6jVZbJLg9lYj6O4M5cE3+CEJRUcy9nhMd2BEkmMoMdkmYW5wxYq7vWk1TFJpMfY4C2KLfhTOWB6UCQpgXkyJRLD5SabrEVo0Ztn41+ckfUW42ltqtRg+ZVVnwPLvm/DPluGKythiOumCO7cJqyMP2s6NJk=
Received: by 10.115.93.16 with SMTP id v16mr141481wal.1186723463309;
	Thu, 09 Aug 2007 22:24:23 -0700 (PDT)
Received: by 10.114.110.5 with HTTP; Thu, 9 Aug 2007 22:24:23 -0700 (PDT)
Message-ID: <ca4b43ff0708092224j1c64a6bfxfd675601556b1eb3@mail.gmail.com>
Date: Fri, 10 Aug 2007 13:24:23 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "Sandro Santilli" <strk@keybit.net>, gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash ChangeLog server/character.h server/dlist...
In-Reply-To: <20070810042534.GA13154@keybit.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1IJ6xs-0005Ny-7O@cvs.savannah.gnu.org>
	<20070810042534.GA13154@keybit.net>
X-Detected-Kernel: Linux 2.6 (newer, 2)
Cc: 
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Aug 2007 05:24:27 -0000

> > -             boost::mutex::scoped_lock lock(_frameDepthsMutex);
> > +             //boost::mutex::scoped_lock lock(_frameDepthsMutex);

ops, I did not do this purposely, it was an accident. I'll correct it soon.

 For the new timeline design, I bet there are some other places that
need cleanups, but should be better than the old ones in general.

 I'll update the wiki first, and wait a few days to see if there is
any regression and then follow up some other cleanups.


On 8/10/07, strk <strk@keybit.net> wrote:
> On Thu, Aug 09, 2007 at 12:18:08PM +0000, Zou Lunkai wrote:
>
> > Index: server/parser/Timeline.h
> > ===================================================================
> > RCS file: /sources/gnash/gnash/server/parser/Timeline.h,v
> > retrieving revision 1.5
> > retrieving revision 1.6
> > diff -u -b -r1.5 -r1.6
> > --- server/parser/Timeline.h  1 Jul 2007 10:54:33 -0000       1.5
> > +++ server/parser/Timeline.h  9 Aug 2007 12:18:06 -0000       1.6
> > @@ -94,7 +94,7 @@
> >       ///
> >       void closeFrame()
> >       {
> > -             boost::mutex::scoped_lock lock(_frameDepthsMutex);
> > +             //boost::mutex::scoped_lock lock(_frameDepthsMutex);
>
> Isn't Timeline set by parser thread and used by playback thread anymore ?
> That's why the mutex was there... (something which is hard to test with
> a testcase, being time-based pending bug)
>
> (I belive getFrameDeptsh() should also lock, didn't notice if you
> changed that or was already bogus).
>
> The methods description tell which methods should lock and which not.
>
> --strk;
>



From MAILER-DAEMON Fri Aug 10 01:58:48 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJNWJ-0003Yk-UT
	for mharc-gnash-commit@gnu.org; Fri, 10 Aug 2007 01:58:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJNWH-0003YO-JO
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 01:58:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJNWG-0003YC-3m
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 01:58:44 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJNWF-0003Y9-UL
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 01:58:43 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IJNWF-0006in-I2
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 01:58:43 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IJNWF-0007u6-2k
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 05:58:43 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IJNWE-0007u3-UP
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 05:58:42 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJNWE-0007u3-UP@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Fri, 10 Aug 2007 05:58:42 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/dlist.cpp [release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Aug 2007 05:58:46 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Zou Lunkai <zoulunkai>	07/08/10 05:58:42

Modified files:
	.              : ChangeLog 
	server         : dlist.cpp 

Log message:
	* server/dlist.cpp: revert mask related code, fix bug#20655, which is a blocker.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.8&r2=1.3971.2.9
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.74&r2=1.74.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.8
retrieving revision 1.3971.2.9
diff -u -b -r1.3971.2.8 -r1.3971.2.9
--- ChangeLog	10 Aug 2007 04:36:18 -0000	1.3971.2.8
+++ ChangeLog	10 Aug 2007 05:58:42 -0000	1.3971.2.9
@@ -1,3 +1,8 @@
+2007-08-10 Zou Lunkai <zoulunkai@gmail.com>
+	
+	* server/dlist.cpp: revert mask related code, fix bug#20655, which is
+	  a blocker.
+	
 2007-08-10 Alexander Sack <asac@jwsdot.com>
 
 	* backend/Makefile.am, libamf/Makefile.am, libbase/Makefile.am,

Index: server/dlist.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.cpp,v
retrieving revision 1.74
retrieving revision 1.74.2.1
diff -u -b -r1.74 -r1.74.2.1
--- server/dlist.cpp	24 Jul 2007 13:25:10 -0000	1.74
+++ server/dlist.cpp	10 Aug 2007 05:58:42 -0000	1.74.2.1
@@ -805,7 +805,8 @@
 
 		// check whether this object should become mask
 		// (see bug #20527 for the "&& !masked" condition)
-		if (ch->isMask() && !masked)
+		// if (ch->isMask() && !masked)
+		if (ch->isMask())
 		{
 			//log_msg(_("begin submit mask"));
 			render::begin_submit_mask();
@@ -816,7 +817,8 @@
 		// if this object should have become a mask,
 		// inform the renderer that it now has all
 		// information about it
-		if (ch->isMask() && !masked)
+		// if (ch->isMask() && !masked)
+		if (ch->isMask())
 		{
 			//log_msg(_("end submit mask"));
 			render::end_submit_mask();



From MAILER-DAEMON Fri Aug 10 04:34:24 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJPwu-0001i4-0j
	for mharc-gnash-commit@gnu.org; Fri, 10 Aug 2007 04:34:24 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJPwr-0001fD-JQ
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 04:34:21 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJPwq-0001dy-RT
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 04:34:21 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJPwq-0001dc-Lc
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 04:34:20 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IJPwq-0002jl-EK
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 04:34:20 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IJPwp-0002Pa-1X
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 08:34:19 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IJPwo-0002PX-Sz
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 08:34:18 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJPwo-0002PX-Sz@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Fri, 10 Aug 2007 08:34:18 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/server/parser Timeline.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Aug 2007 08:34:21 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/10 08:34:18

Modified files:
	server/parser  : Timeline.h 

Log message:
	* server/parser/Timeline.h: enable boost::mutex::scoped_lock, it was a accident to  get it commented.
	* actionscript.all/case.as: more tests, we don't want to fail on cases.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/Timeline.h?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: Timeline.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/Timeline.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- Timeline.h	9 Aug 2007 12:18:06 -0000	1.6
+++ Timeline.h	10 Aug 2007 08:34:18 -0000	1.7
@@ -94,7 +94,7 @@
 	///
 	void closeFrame()
 	{
-		//boost::mutex::scoped_lock lock(_frameDepthsMutex);
+		boost::mutex::scoped_lock lock(_frameDepthsMutex);
 
 		// Copy depth set from previous frame
 		_frameDepths.push_back(_frameDepths.back());



From MAILER-DAEMON Fri Aug 10 04:34:36 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJPx6-0001wW-De
	for mharc-gnash-commit@gnu.org; Fri, 10 Aug 2007 04:34:36 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJPx4-0001u0-EW
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 04:34:34 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJPx3-0001tb-CR
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 04:34:34 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJPx3-0001tU-9L
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 04:34:33 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IJPx3-0002lP-21
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 04:34:33 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IJPx2-0002Pz-G1
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 08:34:32 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IJPx2-0002Pw-Bm
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 08:34:32 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJPx2-0002Pw-Bm@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Fri, 10 Aug 2007 08:34:32 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/testsuite/actionscript.all case.as
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Aug 2007 08:34:35 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/10 08:34:32

Modified files:
	testsuite/actionscript.all: case.as 

Log message:
	* server/parser/Timeline.h: enable boost::mutex::scoped_lock, it was a accident to  get it commented.
	* actionscript.all/case.as: more tests, we don't want to fail on cases.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/case.as?cvsroot=gnash&r1=1.5&r2=1.6

Patches:
Index: case.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/case.as,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- case.as	24 Jul 2007 13:13:27 -0000	1.5
+++ case.as	10 Aug 2007 08:34:32 -0000	1.6
@@ -22,12 +22,11 @@
  *  Test case sensitivity 
  */
 
-rcsid="$Id: case.as,v 1.5 2007/07/24 13:13:27 strk Exp $";
+rcsid="$Id: case.as,v 1.6 2007/08/10 08:34:32 zoulunkai Exp $";
 
 #include "check.as"
 
 #if OUTPUT_VERSION <= 6
-
 aBcD = 100;
 oBj = new Object();
 obj.xYZ = 100;
@@ -35,9 +34,13 @@
 check_equals(ABCD, 100);
 check_equals(typeof(OBJ), 'object');
 check_equals(OBJ.xyz, 100);
+#else
+//swf7 and above are case sensitive
+check_equals(ABCD, undefined);
+check_equals(OBJ, undefined);
+#endif 
 
 #if OUTPUT_VERSION == 6
-// createEmptyMovieClip is supported with swf > 5
 // 
 // create _root.mc0 and _root.mc0.mc1
 // 
@@ -67,4 +70,63 @@
 #endif  // MING_SUPPORTS_ASM
 #endif  // OUTPUT_VERSION == 6
 
-#endif  // OUTPUT_VERSION > 5
+#if OUTPUT_VERSION >= 6
+//
+// creat two movieclips named by same letters but different cases
+//
+mcRef = new Array(10);
+i = 0;
+MovieClip.prototype.onConstruct = function ()
+{
+	mcRef[i++] = this;
+};
+
+_root.createEmptyMovieClip("clip", 6); //this will invoke the onConstruct listener
+_root.createEmptyMovieClip("CLIP", 7); //this will invoke the onConstruct listener
+
+// support visual checks
+with(mcRef[0])
+{
+	beginFill(0xff0000, 100);
+	moveTo(100, 100);
+	lineTo(200,100);
+	lineTo(200,200);
+	lineTo(100,200);
+	lineTo(100,100);
+	endFill();
+}
+
+// support visual checks
+with(mcRef[1])
+{
+	beginFill(0x00ff00, 100);
+	moveTo(100, 100);
+	lineTo(200,100);
+	lineTo(200,200);
+	lineTo(100,200);
+	lineTo(100,100);
+	endFill();
+}
+mcRef[1]._x += 100;
+
+check(mcRef[0]!= mcRef[1]);
+check_equals(mcRef[0].getDepth(), 6);
+check_equals(mcRef[1].getDepth(), 7);
+check_equals(mcRef[0]._name, "clip");
+check_equals(mcRef[1]._name, "CLIP");
+check_equals(mcRef[0]._target, "/clip");
+check_equals(mcRef[1]._target, "/CLIP");
+#endif
+
+#if OUTPUT_VERSION <= 6
+//case insensitive, so they reference the same movieclip.
+//Or both are undefined with OUTPUT_VERSION <= 5
+check(clip == CLIP); 
+#else 
+//case sensitive, so they are different
+xcheck(clip != CLIP);
+check_equals(clip.getDepth(), 6);
+xcheck_equals(CLIP.getDepth(), 7);
+#endif 
+
+_root.totals();



From MAILER-DAEMON Fri Aug 10 06:24:19 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJRfG-0002s0-P4
	for mharc-gnash-commit@gnu.org; Fri, 10 Aug 2007 06:24:18 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJRfE-0002oz-BC
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 06:24:16 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJRfB-0002mw-Vy
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 06:24:14 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJRfB-0002mo-Or
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 06:24:13 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <tomasgroth@yahoo.dk>) id 1IJRfA-0007mM-LD
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 06:24:13 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <tomasgroth@yahoo.dk>) id 1IJRf9-0001yt-W7
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 10:24:12 +0000
Received: from tgc by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <tgc@savannah.gnu.org>) id 1IJRf9-0001yq-Pj
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 10:24:11 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJRf9-0001yq-Pj@cvs.savannah.gnu.org>
From: Tomas Groth <tomasgroth@yahoo.dk>
Date: Fri, 10 Aug 2007 10:24:11 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog backend/sound_handler.h backend...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Aug 2007 10:24:17 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Tomas Groth <tgc>	07/08/10 10:24:11

Modified files:
	.              : ChangeLog 
	backend        : sound_handler.h sound_handler_gst.cpp 
	                 sound_handler_gst.h sound_handler_sdl.cpp 
	                 sound_handler_sdl.h 
	server/swf     : tag_loaders.cpp 

Log message:
		* backend/sound_handler.h, backend/sound_handler_{sdl,gst}.{h,cpp},
		  server/swf/tag_loaders.cpp: Introduce the SoundInfo class which 
		  contains the properties of the sound (format, samplerate, etc.).
		  When parsing a sound-tag the SoundInfo-object is created and
		  passed to the soundhandler along with the audio data, and the
		  parser can later ask for the SoundInfo-object for a specific
		  sound, which is needed when parsing sound-streams.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3981&r2=1.3982
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler.h?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_gst.cpp?cvsroot=gnash&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_gst.h?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_sdl.cpp?cvsroot=gnash&r1=1.79&r2=1.80
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_sdl.h?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.127&r2=1.128

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3981
retrieving revision 1.3982
diff -u -b -r1.3981 -r1.3982
--- ChangeLog	10 Aug 2007 04:36:12 -0000	1.3981
+++ ChangeLog	10 Aug 2007 10:24:10 -0000	1.3982
@@ -1,3 +1,13 @@
+2007-08-10 Tomas Groth Christensen <tomasgroth@yahoo.dk>
+
+	* backend/sound_handler.h, backend/sound_handler_{sdl,gst}.{h,cpp},
+	  server/swf/tag_loaders.cpp: Introduce the SoundInfo class which 
+	  contains the properties of the sound (format, samplerate, etc.).
+	  When parsing a sound-tag the SoundInfo-object is created and
+	  passed to the soundhandler along with the audio data, and the
+	  parser can later ask for the SoundInfo-object for a specific
+	  sound, which is needed when parsing sound-streams.
+
 2007-08-10 Alexander Sack <asac@jwsdot.com>
 
 	* backend/Makefile.am, libamf/Makefile.am, libbase/Makefile.am,

Index: backend/sound_handler.h
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- backend/sound_handler.h	1 Aug 2007 16:53:47 -0000	1.23
+++ backend/sound_handler.h	10 Aug 2007 10:24:11 -0000	1.24
@@ -18,7 +18,7 @@
 // 
 //
 
-/* $Id: sound_handler.h,v 1.23 2007/08/01 16:53:47 strk Exp $ */
+/* $Id: sound_handler.h,v 1.24 2007/08/10 10:24:11 tgc Exp $ */
 
 /// \page sound_handler_intro Sound handler introduction
 ///
@@ -36,9 +36,11 @@
 #include "tu_types.h"
 
 #include <vector>
+#include <memory>
 
 namespace gnash {
 	class stream;
+	class SoundInfo;
 }
 
 namespace gnash {
@@ -95,27 +97,16 @@
 	/// @param data_bytes
 	/// The size of the data to be stored. For soundstream this is 0.
 	///
-	/// @param sample_count
-	/// Number of samples in the data.
-	///
-	/// @param format
-	/// Defines what sound type the data is.
-	///
-	/// @param sample_rate
-	/// The sample rate of the sound.
-	///
-	/// @param stereo
-	/// Defines whether the sound is in stereo.
+	/// @param sinfo
+	/// A SoundInfo object contained in an auto_ptr, which contains info about samplerate,
+	/// samplecount, stereo and more. The SoundObject must be not-NULL!
 	///
 	/// @return the id given by the soundhandler for later identification.
 	///
 	virtual int	create_sound(
 		void*		data,
-		int		data_bytes,
-		int		sample_count,
-		format_type	format,
-		int		sample_rate,	/* one of 5512, 11025, 22050, 44100 */
-		bool		stereo
+		unsigned int	data_bytes,
+		std::auto_ptr<SoundInfo> sinfo
 		) = 0;
 
 	/// gnash's parser calls this to fill up soundstreams data
@@ -133,20 +124,17 @@
 	/// @param handle_id
 	/// The soundhandlers id of the sound we want some info about.
 	///
-	virtual long	fill_stream_data(void* data, int data_bytes, int sample_count, int handle_id) = 0;
+	virtual long	fill_stream_data(void* data, unsigned int data_bytes, unsigned int sample_count, int handle_id) = 0;
 
-	/// Gives info about the format, samplerate and stereo of the sound in question.
+	/// Returns a pointer to the SoundInfo object for the sound with the given id.
+	/// The SoundInfo object is still owned by the soundhandler.
 	//
 	/// @param soundhandle
 	/// The soundhandlers id of the sound we want some info about.
 	///
-	/// @param format
-	/// Here the format id will be placed.
-	///
-	/// @param stereo
-	/// Here will be placed whether or not the sound is stereo.
+	/// @return a pointer to the SoundInfo object for the sound with the given id.
 	///
-	virtual void get_info(int sound_handle, int* format, bool* stereo) = 0;
+	virtual SoundInfo* get_sound_info(int sound_handle) = 0;
 
 	/// gnash calls this when it wants you to play the defined sound.
 	//
@@ -300,6 +288,97 @@
 	size_t _soundsStopped;
 };
 
+///
+/// Class containing information about a sound. Is created by the parser while
+/// parsing, and ownership is then transfered to sound_data. When the parser is
+/// parsing streams, it will ask the soundhandler for this to know what properties
+/// the stream has.
+///
+class SoundInfo {
+public:
+	/// Constructor
+	//
+	/// @param format
+	/// The format of the sound. Can be MP3, ADPCM, uncompressed or Nellymoser
+	///
+	/// @param stero
+	/// Defines whether the sound is in stereo.
+	///
+	/// @param sampleRate
+	/// The sample rate of the sound.
+	///
+	/// @param sampleCount
+	/// The sample count in the sound. In soundstreams this is an average for each frame.
+	///
+	/// @param is16bit
+	/// Defines whether the sound is in stereo.
+	/// Defines whether the sound is in 16bit format (samplesize == 2)? else it 
+	/// is 8bit (samplesize == 1). Used for streams when decoding adpcm.
+	///
+	SoundInfo(sound_handler::format_type format, sound_handler::format_type orgFormat, bool stereo, uint32_t sampleRate, uint32_t sampleCount, bool is16bit)
+	:	_format(format),
+		_orgFormat(orgFormat),
+		_stereo(stereo),
+		_sampleRate(sampleRate),
+		_sampleCount(sampleCount),
+		_is16bit(is16bit)
+	{
+	}
+
+	/// Returns the current format of the sound
+	///
+	/// @return the current format of the sound
+	sound_handler::format_type getFormat() { return _format; }
+
+	/// Returns the original format of the sound
+	///
+	/// @return the original format of the sound
+	sound_handler::format_type getOrgFormat() { return _orgFormat; }
+
+	/// Returns the stereo status of the sound
+	///
+	/// @return the stereo status of the sound
+	bool isStereo() { return _stereo; }
+
+	/// Returns the samplerate of the sound
+	///
+	/// @return the samplerate of the sound
+	unsigned long getSampleRate() { return _sampleRate; }
+
+	/// Returns the samplecount of the sound
+	///
+	/// @return the samplecount of the sound
+	unsigned long getSampleCount() { return _sampleCount; }
+
+	/// Returns the 16bit status of the sound
+	///
+	/// @return the 16bit status of the sound
+	bool is16bit() { return _is16bit; }
+
+private:
+	/// Current format of the sound (MP3, raw, etc).
+	sound_handler::format_type _format;
+
+	/// Original format of the sound (ADPCM, etc).
+	sound_handler::format_type _orgFormat;
+
+	/// The size of the undecoded data
+	unsigned long _dataSize;
+
+	/// Stereo or not
+	bool _stereo;
+
+	/// Sample rate, one of 5512, 11025, 22050, 44100
+	uint32_t _sampleRate;
+
+	/// Number of samples
+	uint32_t _sampleCount;
+
+	/// Is the audio in 16bit format (samplesize == 2)? else it 
+	/// is 8bit (samplesize == 1). Used for streams when decoding adpcm.
+	bool _is16bit;
+};
+
 // TODO: move to appropriate specific sound handlers
 DSOEXPORT sound_handler*	create_sound_handler_sdl();
 DSOEXPORT sound_handler*	create_sound_handler_gst();

Index: backend/sound_handler_gst.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_gst.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- backend/sound_handler_gst.cpp	8 Aug 2007 10:39:50 -0000	1.59
+++ backend/sound_handler_gst.cpp	10 Aug 2007 10:24:11 -0000	1.60
@@ -20,7 +20,7 @@
 // Based on sound_handler_sdl.cpp by Thatcher Ulrich http://tulrich.com 2003
 // which has been donated to the Public Domain.
 
-/* $Id: sound_handler_gst.cpp,v 1.59 2007/08/08 10:39:50 tgc Exp $ */
+/* $Id: sound_handler_gst.cpp,v 1.60 2007/08/10 10:24:11 tgc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -71,31 +71,26 @@
 
 int	GST_sound_handler::create_sound(
 	void* data,
-	int data_bytes,
-	int sample_count,
-	format_type format,
-	int sample_rate,
-	bool stereo)
+	unsigned int data_bytes,
+	std::auto_ptr<SoundInfo> sinfo)
 // Called to create a sample.  We'll return a sample ID that
 // can be use for playing it.
 {
 
 	try_mutex::scoped_lock lock(_mutex);
 
+	assert(sinfo.get());
 	sound_data *sounddata = new sound_data;
 	if (!sounddata) {
-		log_error(_("Could not allocate memory for sound data"));
+		log_error(_("could not allocate memory for sound data"));
 		return -1;
 	}
 
-	sounddata->format = format;
 	sounddata->data_size = data_bytes;
-	sounddata->stereo = stereo;
-	sounddata->sample_count = sample_count;
-	sounddata->sample_rate = sample_rate;
 	sounddata->volume = 100;
+	sounddata->soundinfo = sinfo;
 
-	switch (format)
+	switch (sounddata->soundinfo->getFormat())
 	{
 	case FORMAT_NATIVE16:
 		sounddata->data = new guint8[data_bytes];
@@ -131,7 +126,7 @@
 
 	default:
 		// Unhandled format.
-		log_error(_("Unknown sound format %d requested; gnash does not handle it"), (int)format);
+		log_error(_("Unknown sound format %d requested; gnash does not handle it"), (int)sounddata->soundinfo->getFormat());
 		return -1; // Unhandled format, set to NULL.
 	}
 
@@ -142,7 +137,7 @@
 
 
 // this gets called when a stream gets more data
-long	GST_sound_handler::fill_stream_data(void* data, int data_bytes, int /*sample_count*/, int handle_id)
+long	GST_sound_handler::fill_stream_data(void* data, unsigned int data_bytes, unsigned int /*sample_count*/, int handle_id)
 {
 	try_mutex::scoped_lock lock(_mutex);
 
@@ -359,7 +354,12 @@
 
 	// Create a gstreamer decoder for the chosen sound.
 
-	if (sounddata->format == FORMAT_MP3) { // || sounddata->format == FORMAT_VORBIS) {
+	// Temp variables to make the code simpler and easier to read
+	format_type soundFormat = sounddata->soundinfo->getFormat();
+	bool soundStereo = sounddata->soundinfo->isStereo();
+	uint32_t soundSampleRate = sounddata->soundinfo->getSampleRate();
+
+	if (soundFormat == FORMAT_MP3) {
 
 		gst_element->decoder = gst_element_factory_make ("mad", NULL);
 		if (gst_element->decoder == NULL) {
@@ -386,8 +386,8 @@
 		GstCaps *caps = gst_caps_new_simple ("audio/mpeg",
 			"mpegversion", G_TYPE_INT, 1,
 			"layer", G_TYPE_INT, 3,
-			"rate", G_TYPE_INT, sounddata->sample_rate,
-			"channels", G_TYPE_INT, sounddata->stereo ? 2 : 1, NULL);
+			"rate", G_TYPE_INT, soundSampleRate,
+			"channels", G_TYPE_INT, soundStereo ? 2 : 1, NULL);
 		g_object_set (G_OBJECT (gst_element->capsfilter), "caps", caps, NULL);
 		gst_caps_unref (caps);
 
@@ -406,12 +406,12 @@
 						gst_element->audioresample, 
 						gst_element->volume, NULL);
 
-	} else if (sounddata->format == FORMAT_NATIVE16) {
+	} else if (soundFormat == FORMAT_NATIVE16) {
 
 		// Set the info about the stream so that gstreamer knows what it is.
 		GstCaps *caps = gst_caps_new_simple ("audio/x-raw-int",
-			"rate", G_TYPE_INT, sounddata->sample_rate,
-			"channels", G_TYPE_INT, sounddata->stereo ? 2 : 1,
+			"rate", G_TYPE_INT, soundSampleRate,
+			"channels", G_TYPE_INT, soundStereo ? 2 : 1,
 			"endianness", G_TYPE_INT, G_BIG_ENDIAN,
 			"width", G_TYPE_INT, 16,
 			"depth", G_TYPE_INT, 16,
@@ -517,7 +517,6 @@
 
 	if (sound_handle >= 0 && (unsigned int) sound_handle < m_sound_data.size())
 	{
-		delete[] m_sound_data[sound_handle]->data;
 		delete m_sound_data[sound_handle];
 		m_sound_data.erase (m_sound_data.begin() + sound_handle);
 	}
@@ -580,15 +579,16 @@
 
 }
 
-void GST_sound_handler::get_info(int sound_handle, int* format, bool* stereo) {
+SoundInfo* GST_sound_handler::get_sound_info(int sound_handle) {
 
 	try_mutex::scoped_lock lock(_mutex);
 
 	// Check if the sound exists.
-	if (sound_handle >= 0 && (unsigned int) sound_handle < m_sound_data.size())
+	if (sound_handle >= 0 && static_cast<unsigned int>(sound_handle) < m_sound_data.size())
 	{
-		*format = m_sound_data[sound_handle]->format;
-		*stereo = m_sound_data[sound_handle]->stereo;
+		return m_sound_data[sound_handle]->soundinfo.get();
+	} else {
+		return NULL;
 	} 
 
 }
@@ -631,11 +631,14 @@
 
 	sound_data* sounddata = m_sound_data[sound_handle];
 
+	uint32_t sampleCount = sounddata->soundinfo->getSampleCount();
+	uint32_t sampleRate = sounddata->soundinfo->getSampleRate();
+
 	// Return the sound duration in milliseconds
-	if (sounddata->sample_count > 0 && sounddata->sample_rate > 0) {
-		unsigned int ret = sounddata->sample_count / sounddata->sample_rate * 1000;
-		ret += ((sounddata->sample_count % sounddata->sample_rate) * 1000) / sounddata->sample_rate;
-		if (sounddata->stereo) ret = ret / 2;
+	if (sampleCount > 0 && sampleRate > 0) {
+		unsigned int ret = sampleCount / sampleRate * 1000;
+		ret += ((sampleCount % sampleRate) * 1000) / sampleRate;
+		if (sounddata->soundinfo->isStereo()) ret = ret / 2;
 		return ret;
 	} else {
 		return 0;

Index: backend/sound_handler_gst.h
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_gst.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- backend/sound_handler_gst.h	1 Aug 2007 10:09:23 -0000	1.14
+++ backend/sound_handler_gst.h	10 Aug 2007 10:24:11 -0000	1.15
@@ -89,20 +89,11 @@
 	// The (un)compressed data
 	guint8* data;
 
-	// data format
-	int format;
-
 	// data size
 	long data_size;
 
-	// stereo or not
-	bool stereo;
-
-	// number of samples
-	int sample_count;
-
-	// sample rate
-	int sample_rate;
+	// Object holding information about the sound
+	std::auto_ptr<SoundInfo> soundinfo;
 
 	// Volume, SWF range: 0-100, GST range 0-10 (we only use 0-1, the rest is amplified)
 	// It's the SWF range that is represented here
@@ -111,6 +102,11 @@
 	// gstreamer objects
 	std::vector<gst_elements*>	m_gst_elements;
 
+	~sound_data()
+	{
+		// TODO: use boost::scoped_array
+		delete [] data;
+	}
 };
 
 // Use gstreamer to handle sounds.
@@ -138,13 +134,12 @@
 	virtual ~GST_sound_handler();
 
 	/// Called to create a sound.
-	virtual int	create_sound(void* data, int data_bytes,
-				     int sample_count, format_type format,
-				     int sample_rate, bool stereo);
+	virtual int	create_sound(void* data, unsigned int data_bytes,
+				     std::auto_ptr<SoundInfo> sinfo);
 
 	/// this gets called when a stream gets more data
-	virtual long	fill_stream_data(void* data, int data_bytes,
-					 int sample_count, int handle_id);
+	virtual long	fill_stream_data(void* data, unsigned int data_bytes,
+					 unsigned int sample_count, int handle_id);
 
 	/// Play the index'd sample.
 	virtual void	play_sound(int sound_handle, int loop_count, int offset,
@@ -166,7 +161,7 @@
 	virtual void	set_volume(int sound_handle, int volume);
 		
 	/// Gnash uses this to get info about a sound. Used when a stream needs more data.
-	virtual void	get_info(int sound_handle, int* format, bool* stereo);
+	virtual SoundInfo* get_sound_info(int sound_handle);
 
 	/// Gnash calls this to mute audio.
 	virtual void	mute();

Index: backend/sound_handler_sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_sdl.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- backend/sound_handler_sdl.cpp	8 Aug 2007 10:39:50 -0000	1.79
+++ backend/sound_handler_sdl.cpp	10 Aug 2007 10:24:11 -0000	1.80
@@ -18,7 +18,7 @@
 // Based on sound_handler_sdl.cpp by Thatcher Ulrich http://tulrich.com 2003
 // which has been donated to the Public Domain.
 
-// $Id: sound_handler_sdl.cpp,v 1.79 2007/08/08 10:39:50 tgc Exp $
+// $Id: sound_handler_sdl.cpp,v 1.80 2007/08/10 10:24:11 tgc Exp $
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -63,46 +63,42 @@
 
 int	SDL_sound_handler::create_sound(
 	void* data,
-	int data_bytes,
-	int sample_count,
-	format_type format,
-	int sample_rate,
-	bool stereo)
+	unsigned int data_bytes,
+	std::auto_ptr<SoundInfo> sinfo)
 // Called to create a sample.  We'll return a sample ID that
 // can be use for playing it.
 {
 
+	assert(sinfo.get());
 	sound_data *sounddata = new sound_data;
 	if (!sounddata) {
 		log_error(_("could not allocate memory for sound data"));
 		return -1;
 	}
 
-	sounddata->format = format;
 	sounddata->data_size = data_bytes;
-	sounddata->stereo = stereo;
-	sounddata->sample_count = sample_count;
-	sounddata->sample_rate = sample_rate;
 	sounddata->volume = 100;
+	sounddata->soundinfo = sinfo;
 
 	int16_t*	adjusted_data = 0;
 	int	adjusted_size = 0;
 
         mutex::scoped_lock lock(_mutex);
 
-	switch (format)
+	switch (sounddata->soundinfo->getFormat())
 	{
 	case FORMAT_NATIVE16:
 
-		if (data_bytes > 0) {
-			convert_raw_data(&adjusted_data, &adjusted_size, data, sample_count, 2, sample_rate, stereo,
+		if (sounddata->data_size > 0) {
+			convert_raw_data(&adjusted_data, &adjusted_size, data, sounddata->soundinfo->getSampleCount(), 
+					2, sounddata->soundinfo->getSampleRate(), sounddata->soundinfo->isStereo(),
 					 audioSpec.freq, (audioSpec.channels == 2 ? true : false));
 			if (!adjusted_data) {
 				log_error(_("Some kind of error occurred with sound data"));
 				return -1;
 			}
 			sounddata->data_size = adjusted_size;
-			sounddata->data = (Uint8*) adjusted_data;
+			sounddata->data = reinterpret_cast<uint8_t*>(adjusted_data);
 		}
 		break;
 
@@ -137,7 +133,7 @@
 
 	default:
 		// Unhandled format.
-		log_error(_("unknown sound format %d requested; gnash does not handle it"), (int)format);
+		log_error(_("unknown sound format %d requested; gnash does not handle it"), (int)sounddata->soundinfo->getFormat());
 		return -1; // Unhandled format, set to NULL.
 	}
 
@@ -149,7 +145,7 @@
 }
 
 // this gets called when a stream gets more data
-long	SDL_sound_handler::fill_stream_data(void* data, int data_bytes, int sample_count, int handle_id)
+long	SDL_sound_handler::fill_stream_data(void* data, unsigned int data_bytes, unsigned int sample_count, int handle_id)
 {
 
 	mutex::scoped_lock lock(_mutex);
@@ -162,7 +158,7 @@
 	sound_data* sounddata = m_sound_data[handle_id];
 
 	// Handling of the sound data
-	switch (sounddata->format) {
+	switch (sounddata->soundinfo->getFormat()) {
 	case FORMAT_NATIVE16:
 	    {
 		int16_t*	adjusted_data = 0;
@@ -170,7 +166,7 @@
 
 		convert_raw_data(&adjusted_data, &adjusted_size,
 				 data, sample_count, 2 /*sample size*/,
-				 sounddata->sample_rate, sounddata->stereo,
+				 sounddata->soundinfo->getSampleRate(), sounddata->soundinfo->isStereo(),
 				 audioSpec.freq, (audioSpec.channels == 2));
 		if (!adjusted_data || adjusted_size < 1) {
 			log_error(_("Some kind of error with resampling sound data"));
@@ -199,6 +195,7 @@
 
 	case FORMAT_MP3:
 	    {
+
 		// Reallocate the required memory.
 		Uint8* tmp_data = new Uint8[data_bytes + sounddata->data_size];
 		memcpy(tmp_data, sounddata->data, sounddata->data_size);
@@ -221,7 +218,7 @@
 	    break;
 
 	default:
-		log_error(_("Behavior for this audio codec %d is unknown.  Please send this SWF to the developers"), (int)(sounddata->format));
+		log_error(_("Behavior for this audio codec %d is unknown.  Please send this SWF to the developers"), (int)(sounddata->soundinfo->getFormat()));
 	}
 
 	return start_size;
@@ -273,7 +270,7 @@
 	else sound->position = start_position;
 
 	if (offset < 0) sound->offset = 0;
-	else sound->offset = (sounddata->stereo ? offset : offset*2); // offset is stored as stereo
+	else sound->offset = (sounddata->soundinfo->isStereo() ? offset : offset*2); // offset is stored as stereo
 
 	sound->envelopes = envelopes;
 	sound->current_env = 0;
@@ -282,7 +279,7 @@
 	// Set number of loop we should do. -1 is infinte loop, 0 plays it once, 1 twice etc.
 	sound->loop_count = loop_count;
 
-	if (sounddata->format == FORMAT_MP3) {
+	if (sounddata->soundinfo->getFormat() == FORMAT_MP3) {
 
 #ifdef USE_FFMPEG
 		// Init the avdecoder-decoder
@@ -358,7 +355,7 @@
 			active_sound* sound = sounddata->m_active_sounds[i];
 
 			// Stop sound, remove it from the active list (mp3)
-			if (sounddata->format == 2) {
+			if (sounddata->soundinfo->getFormat() == FORMAT_MP3) {
 #ifdef USE_FFMPEG
 				avcodec_close(sound->cc);
 				av_parser_close(sound->parser);
@@ -411,7 +408,7 @@
 			active_sound* sound = sounddata->m_active_sounds[i];
 
 			// Stop sound, remove it from the active list (mp3)
-			if (sounddata->format == 2) {
+			if (sounddata->soundinfo->getFormat() == FORMAT_MP3) {
 #ifdef USE_FFMPEG
 				avcodec_close(sound->cc);
 				av_parser_close(sound->parser);
@@ -471,15 +468,16 @@
 
 }
 	
-void SDL_sound_handler::get_info(int sound_handle, int* format, bool* stereo) {
+SoundInfo* SDL_sound_handler::get_sound_info(int sound_handle) {
 
 	mutex::scoped_lock lock(_mutex);
 
 	// Check if the sound exists.
 	if (sound_handle >= 0 && static_cast<unsigned int>(sound_handle) < m_sound_data.size())
 	{
-		*format = m_sound_data[sound_handle]->format;
-		*stereo = m_sound_data[sound_handle]->stereo;
+		return m_sound_data[sound_handle]->soundinfo.get();
+	} else {
+		return NULL;
 	}
 
 }
@@ -552,11 +550,14 @@
 
 	sound_data* sounddata = m_sound_data[sound_handle];
 
+	uint32_t sampleCount = sounddata->soundinfo->getSampleCount();
+	uint32_t sampleRate = sounddata->soundinfo->getSampleRate();
+
 	// Return the sound duration in milliseconds
-	if (sounddata->sample_count > 0 && sounddata->sample_rate > 0) {
-		unsigned int ret = sounddata->sample_count / sounddata->sample_rate * 1000;
-		ret += ((sounddata->sample_count % sounddata->sample_rate) * 1000) / sounddata->sample_rate;
-		if (sounddata->stereo) ret = ret / 2;
+	if (sampleCount > 0 && sampleRate > 0) {
+		unsigned int ret = sampleCount / sampleRate * 1000;
+		ret += ((sampleCount % sampleRate) * 1000) / sampleRate;
+		if (sounddata->soundinfo->isStereo()) ret = ret / 2;
 		return ret;
 	} else {
 		return 0;
@@ -774,7 +775,11 @@
 		sound_data* sounddata = handler->m_sound_data[i];
 		for(uint32_t j = 0; j < sounddata->m_active_sounds.size(); j++) {
 
+			// Temp variables to make the code simpler and easier to read
 			active_sound* sound = sounddata->m_active_sounds[j];
+			format_type soundFormat = sounddata->soundinfo->getFormat();
+			bool soundStereo = sounddata->soundinfo->isStereo();
+			uint32_t soundSampleRate = sounddata->soundinfo->getSampleRate();
 
 			// When the current sound dont have enough decoded data to fill the buffer, 
 			// we first mix what is already decoded, then decode some more data, and
@@ -795,7 +800,7 @@
 
 				// If this isn't MP3 (which means its NATIVE16) there is nothing to decode,
 				// reusing the available data is the only option.
-				if (sounddata->format != 2) {
+				if (soundFormat != FORMAT_MP3) {
 					if (index < buffer_length) {
 						sound->loop_count--;
 						sound->raw_position = 0;
@@ -902,7 +907,7 @@
 
 					mad_synth_frame (&sound->synth, &sound->frame);
 					
-					outsize = sound->synth.pcm.length * ((sounddata->stereo == true) ? 4 : 2);
+					outsize = sound->synth.pcm.length * ((soundStereo() == true) ? 4 : 2);
 
 					tmp_raw_buffer = new Uint8[outsize];
 					int sample;
@@ -913,7 +918,7 @@
 					// scaling while we're at it.
 					for(int f = 0; f < sound->synth.pcm.length; f++)
 					{
-						for (int e = 0; e < ((sounddata->stereo == true) ? 2 : 1); e++){ // channels (stereo/mono)
+						for (int e = 0; e < ((soundStereo() == true) ? 2 : 1); e++){ // channels (stereo/mono)
 
 							mad_fixed_t mad_sample = sound->synth.pcm.samples[e][f];
 
@@ -935,15 +940,15 @@
 #endif
 
 					// If we need to convert samplerate or/and from mono to stereo...
-					if (outsize > 0 && (sounddata->sample_rate != handler->audioSpec.freq || !sounddata->stereo)) {
+					if (outsize > 0 && (static_cast<int>(soundSampleRate) != handler->audioSpec.freq || !soundStereo)) {
 
 						int16_t* adjusted_data = 0;
 						int	adjusted_size = 0;
-						int sample_count = outsize / ((sounddata->stereo == true) ? 4 : 2);
+						int sample_count = outsize / ((soundStereo == true) ? 4 : 2);
 
 						// Convert to needed samplerate
 						convert_raw_data(&adjusted_data, &adjusted_size, tmp_raw_buffer, sample_count, 0, 
-								sounddata->sample_rate, sounddata->stereo,
+								soundSampleRate, soundStereo,
 								handler->audioSpec.freq, (handler->audioSpec.channels == 2 ? true : false));
 
 						// Hopefully this wont happen
@@ -1011,7 +1016,7 @@
 			} 
 
 			// Sound is done, remove it from the active list (mp3)
-			if (sound->position == sound->data_size && sound->loop_count == 0 && sounddata->format == 2) {
+			if (sound->position == sound->data_size && sound->loop_count == 0 && soundFormat == FORMAT_MP3) {
 #ifdef USE_FFMPEG
 				avcodec_close(sound->cc);
 				av_parser_close(sound->parser);
@@ -1026,7 +1031,7 @@
 
 
 			// Sound is done, remove it from the active list (adpcm/native16)
-			} else if (sound->loop_count == 0 && sounddata->format == 7 && sound->raw_position >= sound->raw_data_size && sound->raw_data_size != 0) {
+			} else if (sound->loop_count == 0 && soundFormat == FORMAT_NATIVE16 && sound->raw_position >= sound->raw_data_size && sound->raw_data_size != 0) {
 				sounddata->m_active_sounds.erase(sounddata->m_active_sounds.begin() + j);
 				handler->soundsPlaying--;
 			} else if (sound->raw_position == 0 && sound->raw_data_size == 0) {

Index: backend/sound_handler_sdl.h
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_sdl.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- backend/sound_handler_sdl.h	27 Jul 2007 15:09:41 -0000	1.31
+++ backend/sound_handler_sdl.h	10 Aug 2007 10:24:11 -0000	1.32
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-// $Id: sound_handler_sdl.h,v 1.31 2007/07/27 15:09:41 tgc Exp $
+// $Id: sound_handler_sdl.h,v 1.32 2007/08/10 10:24:11 tgc Exp $
 
 #ifndef SOUND_HANDLER_SDL_H
 #define SOUND_HANDLER_SDL_H
@@ -123,20 +123,11 @@
 	/// TODO: use boost::scoped_array
 	uint8_t* data;
 
-	/// Format of the sound (MP3, raw, etc).
-	int format;
+	/// Object holding information about the sound
+	std::auto_ptr<SoundInfo> soundinfo;
 
 	/// The size of the undecoded data
-	long data_size;
-
-	/// Stereo or not
-	bool stereo;
-
-	/// Number of samples
-	int sample_count;
-
-	/// Sample rate
-	int sample_rate;
+	unsigned int data_size;
 
 	/// Volume for AS-sounds, range: 0-100.
 	/// It's the SWF range that is represented here.
@@ -187,13 +178,11 @@
 	virtual ~SDL_sound_handler();
 
 	/// Called to create a sound.
-	virtual int	create_sound(void* data, int data_bytes,
-				     int sample_count, format_type format,
-				     int sample_rate, bool stereo);
+	virtual int	create_sound(void* data, unsigned int data_bytes, std::auto_ptr<SoundInfo> sinfo);
 
 	/// this gets called when a stream gets more data
-	virtual long	fill_stream_data(void* data, int data_bytes,
-					 int sample_count, int handle_id);
+	virtual long	fill_stream_data(void* data, unsigned int data_bytes,
+					 unsigned int sample_count, int handle_id);
 
 	/// Play the index'd sample.
 	virtual void	play_sound(int sound_handle, int loop_count, int offset,
@@ -215,7 +204,7 @@
 	virtual void	set_volume(int sound_handle, int volume);
 		
 	/// Gnash uses this to get info about a sound. Used when a stream needs more data.
-	virtual void	get_info(int sound_handle, int* format, bool* stereo);
+	virtual SoundInfo* get_sound_info(int sound_handle);
 
 	/// Gnash calls this to mute audio.
 	virtual void	mute();

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -b -r1.127 -r1.128
--- server/swf/tag_loaders.cpp	10 Aug 2007 03:54:16 -0000	1.127
+++ server/swf/tag_loaders.cpp	10 Aug 2007 10:24:11 -0000	1.128
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: tag_loaders.cpp,v 1.127 2007/08/10 03:54:16 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.128 2007/08/10 10:24:11 tgc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1339,7 +1339,8 @@
 
 	uint16_t	character_id = in->read_u16();
 
-	sound_handler::format_type	format = (sound_handler::format_type) in->read_uint(4);
+	sound_handler::format_type	format = static_cast<sound_handler::format_type>(in->read_uint(4));
+	sound_handler::format_type	orgFormat = format;
 	int	sample_rate = in->read_uint(2);	// multiples of 5512.5
 	bool	sample_16bit = in->read_uint(1) ? true : false;
 	bool	stereo = in->read_uint(1) ? true : false;
@@ -1376,13 +1377,13 @@
 	    // and modifies 3 parameters: format, data and data_bytes.
 	    sound_expand(in, format, sample_16bit, stereo, sample_count, data, data_bytes);
 
-	    int	handler_id = handler->create_sound(
-		data,
-		data_bytes,
-		sample_count,
-		format,
-		s_sample_rate_table[sample_rate],
-		stereo);
+	    // Store all the data in a SoundInfo object
+	    std::auto_ptr<SoundInfo> sinfo;
+	    sinfo.reset(new SoundInfo(format, orgFormat, stereo, s_sample_rate_table[sample_rate], sample_count, sample_16bit));
+
+	    // Stores the sounddata in the soundhandler, and the ID returned
+		// can be used to starting, stopping and deleting that sound
+	    int	handler_id = handler->create_sound(data, data_bytes, sinfo);
 
 	    if (handler_id >= 0)
 	    {
@@ -1436,14 +1437,6 @@
     }
 }
 
-// There is only one soundstream active per movie, so we cache the extra data
-// we need to be able to decode subsequent soundstreamblocks here.
-//
-static sound_handler::format_type stream_input_format;
-static bool stream_input_is16bit;
-static bool stream_input_stereo;
-static unsigned int stream_input_sample_count;
-
 // Load a SoundStreamHead(2) tag.
 void
 sound_stream_head_loader(stream* in, tag_type tag, movie_definition* m)
@@ -1466,6 +1459,7 @@
     int	garbage = in->read_uint(8);
 
     sound_handler::format_type format = static_cast<sound_handler::format_type>(in->read_uint(4));
+	sound_handler::format_type orgFormat = format;
     int sample_rate = in->read_uint(2);	// multiples of 5512.5
     bool sample_16bit = in->read_uint(1) ? true : false;
     bool stereo = in->read_uint(1) ? true : false;
@@ -1500,13 +1494,6 @@
 	return;
     }
 
-    // Remember settings for decoding of subsequent blocks.
-    // "stereo" is also in the sound object, 16bit no, format get stomped.
-    stream_input_format = format;
-    stream_input_is16bit = sample_16bit;
-    stream_input_stereo = stereo;
-	stream_input_sample_count = sample_count;
-
     // Tell create_sound what format it will be receiving, in case it cares
     // at this stage.
     switch (format) {
@@ -1523,13 +1510,13 @@
 	break;
     }
 
-    int	handler_id = handler->create_sound(
-	NULL,
-	data_bytes,
-	sample_count,
-	format,
-	s_sample_rate_table[sample_rate],
-	stereo);
+	// Store all the data in a SoundInfo object
+	std::auto_ptr<SoundInfo> sinfo;
+	sinfo.reset(new SoundInfo(format, orgFormat, stereo, s_sample_rate_table[sample_rate], sample_count, sample_16bit));
+
+	// Stores the sounddata in the soundhandler, and the ID returned
+	// can be used to starting, stopping and deleting that sound
+	int	handler_id = handler->create_sound(NULL, data_bytes, sinfo);
 
     m->set_loading_sound_stream_id(handler_id);
 }
@@ -1539,30 +1526,34 @@
 void
 sound_stream_block_loader(stream* in, tag_type tag, movie_definition* m)
 {
-    sound_handler* handler = get_sound_handler();
-
     assert(tag == SWF::SOUNDSTREAMBLOCK); // 19
 
-    // discard garbage data (MP3 only)
-    // TODO: stop using statics (stream_input_format) for stream sounds..
-    //       tgc should be working on this
-    if ( stream_input_format == sound_handler::FORMAT_MP3) in->skip_bytes(4);
+    sound_handler* handler = get_sound_handler();
 
     // If we don't have a sound_handler registered stop here
     if (!handler) return;
 
+	// Get the ID of the sound stream currently being loaded
     int handle_id = m->get_loading_sound_stream_id();
 
-    unsigned char *data;	// Storage is allocated by sound_expand()
-    unsigned data_bytes = in->get_tag_end_position() - in->get_position();
+	// Get the SoundInfo object that contains info about the sound stream.
+	// Ownership of the object is in the soundhandler
+	SoundInfo* sinfo = handler->get_sound_info(handle_id);
 
-    // The format in the input file is in stream_input_*
-    sound_handler::format_type format = stream_input_format;
+    // If there is no SoundInfo something is wrong...
+    if (!sinfo) return;
 
-    unsigned int sample_count = stream_input_sample_count;
+    sound_handler::format_type format = sinfo->getOrgFormat();
+    unsigned int sample_count = sinfo->getSampleCount();
+
+	// discard garbage data if format is MP3
+    if (format == sound_handler::FORMAT_MP3) in->skip_bytes(4);
+
+    unsigned char *data;	// Storage is allocated by sound_expand()
+    unsigned int data_bytes = in->get_tag_end_position() - in->get_position();
 
     sound_expand(in, format,
-		 stream_input_is16bit, stream_input_stereo, sample_count,
+		 sinfo->is16bit(), sinfo->isStereo(), sample_count,
 		 data, data_bytes);
     // "format" now reflects what we hand(ed) to the sound drivers.
     // "data_bytes" now reflects the size of the uncompressed data.
@@ -1591,7 +1582,7 @@
 static void
 sound_expand(stream *in, sound_handler::format_type &format,
 	bool sample_16bit, bool stereo, unsigned int &sample_count,
-	unsigned char* &data, unsigned &data_bytes)
+	unsigned char* &data, unsigned int &data_bytes)
 {
 
     // Make sure that an unassigned pointer cannot get through



From MAILER-DAEMON Fri Aug 10 06:28:15 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJRj5-0004JK-CF
	for mharc-gnash-commit@gnu.org; Fri, 10 Aug 2007 06:28:15 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJRj2-0004IQ-Hs
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 06:28:12 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJRiy-0004G1-Al
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 06:28:09 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJRix-0004Fr-PX
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 06:28:08 -0400
Received: from welcomehome.org ([69.15.127.230] helo=darkstar.welcomehome.org)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60)
	(envelope-from <rob@welcomehome.org>) id 1IJRiu-00008h-Gz
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 06:28:04 -0400
Received: from macbook.welcomehome.org (camp.chaos.de [81.163.57.163])
	by darkstar.welcomehome.org (8.13.8/8.13.8) with ESMTP id
	l7AARbkH030660; Fri, 10 Aug 2007 04:27:37 -0600
Message-ID: <46BC3D8F.9080106@welcomehome.org>
Date: Fri, 10 Aug 2007 12:27:27 +0200
From: Rob Savoye <rob@welcomehome.org>
User-Agent: Thunderbird 2.0.0.6 (X11/20070728)
MIME-Version: 1.0
To: Sandro Santilli <strk@keybit.net>
Subject: Re: [Gnash-commit] gnash ChangeLog backend/Makefile.am libamf/Make...
References: <E1IJMEQ-0004k6-06@cvs.savannah.gnu.org>
In-Reply-To: <E1IJMEQ-0004k6-06@cvs.savannah.gnu.org>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
X-Detected-Kernel: Linux 2.6 (newer, 3)
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Aug 2007 10:28:13 -0000

Sandro Santilli wrote:
> CVSROOT:	/sources/gnash
> Module name:	gnash
> Changes by:	Sandro Santilli <strk>	07/08/10 04:36:13
>
> Modified files:
> 	.              : ChangeLog 
> 	backend        : Makefile.am 
> 	libamf         : Makefile.am 
> 	libbase        : Makefile.am 
> 	libgeometry    : Makefile.am 
> 	plugin/mozilla-sdk: Makefile.am 
> 	server         : Makefile.am 
>
> Log message:
> 	Applied patch from bug #20665 by Alexander Sack <asac@jwsdot.com>:
> 	
> 	        * backend/Makefile.am, libamf/Makefile.am, libbase/Makefile.am,
> 	          libgeometry/Makefile.am, plugin/mozilla-sdk/Makefile.am,
> 	          server/Makefile.am: use $pkglibdir for unversioned libs.
>   

  Like I said yesterday, this is not a bug, please back this patch out, 
All Gnash releases have version numbers, so this doesn't really apply. 
As packagers shouldn't be building from CVS, this doesn't really apply. 
In the near future we'll be statically linking the gnash libs into the 
player, at which point this won't effect us at all anymore. I got mos of 
the changes made, and just need to find the time to finish. (hard when 
at a conference)

    - rob -




From MAILER-DAEMON Fri Aug 10 09:36:45 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJUfV-0003hO-P2
	for mharc-gnash-commit@gnu.org; Fri, 10 Aug 2007 09:36:45 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJUfU-0003hJ-3t
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 09:36:44 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJUfO-0003gy-A3
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 09:36:42 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJUfN-0003gp-Uz
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 09:36:38 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1IJUfN-0000G7-7m
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 09:36:37 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l7ADaUo25100;
	Fri, 10 Aug 2007 15:36:30 +0200 (CEST)
	(envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Fri, 10 Aug 2007 15:36:30 +0200
To: Zou Lunkai <zoulunkai@gmail.com>, Udo Giacomozzi <udo.gnu@nova-sys.net>
Subject: Re: [Gnash-commit] gnash ChangeLog server/dlist.cpp [release_0_8_1]
Message-ID: <20070810133630.GB13154@keybit.net>
Mail-Followup-To: Zou Lunkai <zoulunkai@gmail.com>,
	Udo Giacomozzi <udo.gnu@nova-sys.net>, gnash-commit@gnu.org
References: <E1IJNWE-0007u3-UP@cvs.savannah.gnu.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1IJNWE-0007u3-UP@cvs.savannah.gnu.org>
X-Detected-Kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Aug 2007 13:36:44 -0000

On Fri, Aug 10, 2007 at 05:58:42AM +0000, Zou Lunkai wrote:
> CVSROOT:	/sources/gnash
> Module name:	gnash
> Branch:		release_0_8_1
> Changes by:	Zou Lunkai <zoulunkai>	07/08/10 05:58:42
> 
> Modified files:
> 	.              : ChangeLog 
> 	server         : dlist.cpp 
> 
> Log message:
> 	* server/dlist.cpp: revert mask related code, fix bug#20655, which is a blocker.

I belive we want this in head too..

--strk;



From MAILER-DAEMON Fri Aug 10 10:03:17 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJV5A-00027b-Rq
	for mharc-gnash-commit@gnu.org; Fri, 10 Aug 2007 10:03:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJV59-00025F-Dq
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 10:03:15 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJV58-00024I-Jc
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 10:03:15 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJV58-00024A-ED
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 10:03:14 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJV57-0004W9-W5
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 10:03:14 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJV57-0006AJ-1T
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 14:03:13 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJV56-0006AG-UA
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 14:03:12 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJV56-0006AG-UA@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 10 Aug 2007 14:03:12 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/parser/Timeline.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Aug 2007 14:03:15 -0000

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

Modified files:
	.              : ChangeLog 
	server/parser  : Timeline.h 

Log message:
	        * server/parser/Timeline.h (getFrameDepths): lock the mutex, as
	          documented in method description.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3982&r2=1.3983
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/Timeline.h?cvsroot=gnash&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3982
retrieving revision 1.3983
diff -u -b -r1.3982 -r1.3983
--- ChangeLog	10 Aug 2007 10:24:10 -0000	1.3982
+++ ChangeLog	10 Aug 2007 14:03:12 -0000	1.3983
@@ -1,3 +1,8 @@
+2007-08-10 Sandro Santilli <strk@keybit.net>
+
+	* server/parser/Timeline.h (getFrameDepths): lock the mutex, as
+	  documented in method description.
+
 2007-08-10 Tomas Groth Christensen <tomasgroth@yahoo.dk>
 
 	* backend/sound_handler.h, backend/sound_handler_{sdl,gst}.{h,cpp},

Index: server/parser/Timeline.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/Timeline.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/parser/Timeline.h	10 Aug 2007 08:34:18 -0000	1.7
+++ server/parser/Timeline.h	10 Aug 2007 14:03:12 -0000	1.8
@@ -165,6 +165,8 @@
 	///
 	void getFrameDepths(size_t frameno, std::vector<int>& depths)
 	{
+		boost::mutex::scoped_lock lock(_frameDepthsMutex);
+
 		assert(frameno < _frameDepths.size());
 
 		DepthSet& from = _frameDepths[frameno];



From MAILER-DAEMON Fri Aug 10 10:06:40 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJV8R-0004Qa-TU
	for mharc-gnash-commit@gnu.org; Fri, 10 Aug 2007 10:06:39 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJV8Q-0004QE-MQ
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 10:06:38 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJV8Q-0004Q2-2Y
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 10:06:38 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJV8P-0004Pz-Ve
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 10:06:38 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJV8P-00056B-Gy
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 10:06:37 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJV8P-0006Dp-1n
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 14:06:37 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJV8O-0006Dl-S3
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 14:06:36 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJV8O-0006Dl-S3@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 10 Aug 2007 14:06:36 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog libbase/URL.cpp libbase/contain...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Aug 2007 14:06:38 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/10 14:06:36

Modified files:
	.              : ChangeLog 
	libbase        : URL.cpp container.h network.cpp network.h 
	                 tu_config.h tu_timer.cpp 
	server         : shm.cpp shm.h 
	server/vm      : ASHandlers.cpp 
	utilities      : dumpshm.cpp 

Log message:
	Patch from bug #20741 by Paul Smedley <paul@smedley.info>:
	
	        * libbase/URL.cpp, libbase/container.h, libbase/network.cpp,
	          libbase/network.h, libbase/tu_config.h, libbase/tu_timer.cpp,
	          server/shm.cpp, server/shm.h, server/vm/ASHandlers.cpp,
	          utilities/dumpshm.cpp: Build support for OS/2.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3983&r2=1.3984
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/URL.cpp?cvsroot=gnash&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/container.h?cvsroot=gnash&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/network.cpp?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/network.h?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_config.h?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_timer.cpp?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/server/shm.cpp?cvsroot=gnash&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/gnash/server/shm.h?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.118&r2=1.119
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/dumpshm.cpp?cvsroot=gnash&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3983
retrieving revision 1.3984
diff -u -b -r1.3983 -r1.3984
--- ChangeLog	10 Aug 2007 14:03:12 -0000	1.3983
+++ ChangeLog	10 Aug 2007 14:06:34 -0000	1.3984
@@ -1,3 +1,10 @@
+2007-08-10 Paul Smedley <paul@smedley.info>
+
+	* libbase/URL.cpp, libbase/container.h, libbase/network.cpp,
+	  libbase/network.h, libbase/tu_config.h, libbase/tu_timer.cpp,
+	  server/shm.cpp, server/shm.h, server/vm/ASHandlers.cpp,
+	  utilities/dumpshm.cpp: Build support for OS/2.
+
 2007-08-10 Sandro Santilli <strk@keybit.net>
 
 	* server/parser/Timeline.h (getFrameDepths): lock the mutex, as

Index: libbase/URL.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/URL.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- libbase/URL.cpp	1 Jul 2007 10:54:07 -0000	1.39
+++ libbase/URL.cpp	10 Aug 2007 14:06:35 -0000	1.40
@@ -148,7 +148,7 @@
 URL::normalize_path(std::string& path)
 {
 
-#if defined(_WIN32) || defined(WIN32) 
+#if defined(_WIN32) || defined(WIN32) || defined(__OS2__)
 	return;
 #endif
 
@@ -277,9 +277,11 @@
 
 		assert(basedir[0] == '/'
 			|| basedir[1] == ':');	// for WIN32
+#ifndef __OS2__
+		// On OS/2 - a filepath such as x:file.swf is acceptable.......
 		assert(*(basedir.rbegin()) == '/' 
 			|| *(basedir.rbegin()) == '\\'); 	// for WIN32
-
+#endif
 		string::size_type lpos =  basedir.size()-1;
 		for (int i=0; i<dirsback; ++i)
 		{

Index: libbase/container.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/container.h,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- libbase/container.h	1 Jul 2007 10:54:07 -0000	1.59
+++ libbase/container.h	10 Aug 2007 14:06:35 -0000	1.60
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: container.h,v 1.59 2007/07/01 10:54:07 bjacques Exp $ */
+/* $Id: container.h,v 1.60 2007/08/10 14:06:35 strk Exp $ */
 
 #ifndef __CONTAINER_H__
 #define __CONTAINER_H__
@@ -40,7 +40,7 @@
 // corrent paths supplied, this one file barfs with GCC 3.3.3 on
 // NetBSD, so screw it, and just hack it for now. We hope this entire
 // file will be gone soon anyway.
-#ifndef HAVE_WINSOCK_H
+#if !defined(HAVE_WINSOCK_H) || defined(__OS2__)
 #define _LIB_PTHREAD_ 1
 #ifndef _LIB_PTHREAD_TYPES_H
 #  define _LIB_PTHREAD_TYPES_H 1

Index: libbase/network.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/network.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- libbase/network.cpp	1 Jul 2007 10:54:09 -0000	1.28
+++ libbase/network.cpp	10 Aug 2007 14:06:35 -0000	1.29
@@ -30,7 +30,7 @@
 #include <cstdio>
 #include <cerrno>
 #include <fcntl.h>
-#ifdef HAVE_WINSOCK_H
+#if defined(HAVE_WINSOCK_H) && !defined(__OS2__)
 # include <winsock2.h>
 # include <windows.h>
 # include <sys/stat.h>
@@ -74,7 +74,7 @@
 	_timeout(5)
 {
     //GNASH_REPORT_FUNCTION;
-#ifdef HAVE_WINSOCK_H
+#if defined(HAVE_WINSOCK_H) && !defined(__OS2__)
     WORD wVersionRequested;
     WSADATA wsaData;
     wVersionRequested = MAKEWORD(1, 1);		// Windows Sockets 1.1
@@ -89,7 +89,7 @@
 Network::~Network()
 {
     //GNASH_REPORT_FUNCTION;
-#ifdef HAVE_WINSOCK_H
+#if defined(HAVE_WINSOCK_H) && !defined(__OS2__)
     WSACleanup();
 #else
     closeNet();

Index: libbase/network.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/network.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- libbase/network.h	7 Jul 2007 12:02:45 -0000	1.19
+++ libbase/network.h	10 Aug 2007 14:06:35 -0000	1.20
@@ -26,7 +26,7 @@
 
 #include <string>
 
-#ifndef HAVE_WINSOCK_H
+#if !defined(HAVE_WINSOCK_H) || defined(__OS2__)
 # include <netinet/in.h>
 # include <arpa/inet.h>
 #else
@@ -46,7 +46,12 @@
 const short RTMPT = 80;
 const short RTMPTS = 443;
 
-#ifdef HAVE_WINSOCK_H
+#ifdef __OS2__
+	typedef int    socklen_t;
+	#define SHUT_RDWR 0x2
+#endif
+
+#if defined(HAVE_WINSOCK_H) && !defined(__OS2__)
 	typedef long   in_addr_t;
 #	define inet_lnaof(x) inet_addr(inet_ntoa(x))
 	typedef int    socklen_t;

Index: libbase/tu_config.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_config.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- libbase/tu_config.h	2 May 2007 18:19:02 -0000	1.15
+++ libbase/tu_config.h	10 Aug 2007 14:06:35 -0000	1.16
@@ -57,6 +57,16 @@
 	#endif
 
 	#define DSOLOCAL
+#elif defined(__OS2__)
+	#ifdef BUILDING_DLL
+		#define DSOEXPORT __declspec(dllexport)
+	#else
+		// Temporarily commented because of VC++ compiler problems 
+		#define DSOEXPORT // __declspec(dllimport)
+	#endif
+
+	#define DSOLOCAL
+
 #else
 	#ifdef HAVE_GNUC_VISIBILITY
 		#define DSOEXPORT __attribute__ ((visibility("default")))

Index: libbase/tu_timer.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_timer.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- libbase/tu_timer.cpp	19 May 2007 21:18:34 -0000	1.9
+++ libbase/tu_timer.cpp	10 Aug 2007 14:06:35 -0000	1.10
@@ -81,8 +81,10 @@
 	gettimeofday(&tv, 0);
 
 	uint64_t result = tv.tv_sec * 1000000;
+
 	result += tv.tv_usec;
 	// Time Unit: microsecond
+
 	return result;
 }
 

Index: server/shm.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/shm.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- server/shm.cpp	7 Jul 2007 12:02:45 -0000	1.33
+++ server/shm.cpp	10 Aug 2007 14:06:35 -0000	1.34
@@ -19,7 +19,7 @@
 //
 //
 
-/* $Id: shm.cpp,v 1.33 2007/07/07 12:02:45 martinwguy Exp $ */
+/* $Id: shm.cpp,v 1.34 2007/08/10 14:06:35 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -30,11 +30,11 @@
 #include <unistd.h>
 #include <dirent.h>
 #include <fcntl.h>
-#if !defined(HAVE_WINSOCK_H) && !defined(__riscos__)
+#if !defined(HAVE_WINSOCK_H) && !defined(__riscos__) && !defined(__OS2__)
 #include <sys/mman.h>
 #include <sys/shm.h>
 #include <sys/ipc.h>
-#elif !defined(__riscos__)
+#elif !defined(__riscos__) && !defined(__OS2__)
 #include <windows.h>
 #include <process.h>
 #include <io.h>

Index: server/shm.h
===================================================================
RCS file: /sources/gnash/gnash/server/shm.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- server/shm.h	7 Jul 2007 12:02:45 -0000	1.18
+++ server/shm.h	10 Aug 2007 14:06:36 -0000	1.19
@@ -32,10 +32,10 @@
 #include "as_object.h" // for inheritance
 
 #include <sys/types.h>
-#if !defined(HAVE_WINSOCK_H) && !defined(__riscos__)
+#if !defined(HAVE_WINSOCK_H) && !defined(__riscos__) && !defined(__OS2__)
 # include <sys/ipc.h>
 # include <sys/shm.h>
-#elif !defined(__riscos__)
+#elif !defined(__riscos__) && !defined(__OS2__)
 # include <windows.h>
 # include <process.h>
 # include <fcntl.h>
@@ -90,7 +90,7 @@
     long        _alloced;
     size_t      _size;
     char        _filespec[MAX_SHM_NAME_SIZE];
-#ifndef HAVE_WINSOCK_H
+#if !defined(HAVE_WINSOCK_H) || defined(__OS2__)
     key_t	_shmkey;
 #else
     long	_shmkey;

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -b -r1.118 -r1.119
--- server/vm/ASHandlers.cpp	6 Aug 2007 20:42:57 -0000	1.118
+++ server/vm/ASHandlers.cpp	10 Aug 2007 14:06:36 -0000	1.119
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ASHandlers.cpp,v 1.118 2007/08/06 20:42:57 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.119 2007/08/10 14:06:36 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1887,7 +1887,18 @@
 				sendVarsMethod);
 		}
 
+#ifndef __OS2__x
 		string command = "firefox -remote \"openurl(";
+#else
+static char browserExe[ 255 ] = "";
+
+    if ( browserExe[0] == 0 ) {
+        PrfQueryProfileString( HINI_USER, (PSZ) "WPURLDEFAULTSETTINGS", (PSZ) "DefaultBrowserExe", NULL,
+                               (PVOID) browserExe, (LONG)sizeof(browserExe) );
+    }
+		string command = browserExe;
+		command += " -remote \"openurl(";
+#endif
 		command += url.str();
 #if 0 // target testing
 		if ( ! target_string.empty() )

Index: utilities/dumpshm.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/dumpshm.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- utilities/dumpshm.cpp	1 Jul 2007 10:55:16 -0000	1.12
+++ utilities/dumpshm.cpp	10 Aug 2007 14:06:36 -0000	1.13
@@ -20,7 +20,7 @@
 //
 
 
-/* $Id: dumpshm.cpp,v 1.12 2007/07/01 10:55:16 bjacques Exp $ */
+/* $Id: dumpshm.cpp,v 1.13 2007/08/10 14:06:36 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -28,6 +28,7 @@
 
 #include <stdarg.h>
 #include <sys/stat.h>
+
 extern "C"{
 	#include <unistd.h>
 #ifdef HAVE_GETOPT_H
@@ -40,11 +41,11 @@
 }
 #include <dirent.h>
 #include <sys/types.h>
-#if !defined(HAVE_WINSOCK_H) && !defined(__riscos__)
+#if !defined(HAVE_WINSOCK_H) && !defined(__riscos__) && !defined(__OS2__)
 #include <sys/mman.h>
 #include <sys/shm.h>
 #include <sys/ipc.h>
-#elif !defined(__riscos__)
+#elif !defined(__riscos__) && !defined(__OS2__)
 #include <windows.h>
 #include <process.h>
 #include <io.h>



From MAILER-DAEMON Fri Aug 10 10:24:57 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJVQ8-0000Dm-RL
	for mharc-gnash-commit@gnu.org; Fri, 10 Aug 2007 10:24:56 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJVQ7-0000Dh-1Q
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 10:24:55 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJVQ6-0000DV-8R
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 10:24:54 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJVQ6-0000DS-6H
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 10:24:54 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJVQ5-0008SZ-UH
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 10:24:54 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJVQ5-0007zf-EM
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 14:24:53 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJVQ5-0007zc-9z
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 14:24:53 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJVQ5-0007zc-9z@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 10 Aug 2007 14:24:53 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/vm/ActionExec.cpp
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Aug 2007 14:24:55 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/10 14:24:53

Modified files:
	.              : ChangeLog 
	server/vm      : ActionExec.cpp 

Log message:
	        * server/vm/ActionExec.cpp (cleanupAfterRun): don't assume the call
	          stack should be empty at the end of global code execution. Still
	          print an error as we need further investigation about it. Fixes
	          bug #20740.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.9&r2=1.3971.2.10
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.39&r2=1.39.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.9
retrieving revision 1.3971.2.10
diff -u -b -r1.3971.2.9 -r1.3971.2.10
--- ChangeLog	10 Aug 2007 05:58:42 -0000	1.3971.2.9
+++ ChangeLog	10 Aug 2007 14:24:51 -0000	1.3971.2.10
@@ -1,3 +1,10 @@
+2007-08-10 Sandro Santilli <strk@keybit.net>
+
+	* server/vm/ActionExec.cpp (cleanupAfterRun): don't assume the call
+	  stack should be empty at the end of global code execution. Still
+	  print an error as we need further investigation about it. Fixes
+	  bug #20740.
+
 2007-08-10 Zou Lunkai <zoulunkai@gmail.com>
 	
 	* server/dlist.cpp: revert mask related code, fix bug#20655, which is

Index: server/vm/ActionExec.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ActionExec.cpp,v
retrieving revision 1.39
retrieving revision 1.39.2.1
diff -u -b -r1.39 -r1.39.2.1
--- server/vm/ActionExec.cpp	1 Jul 2007 10:54:36 -0000	1.39
+++ server/vm/ActionExec.cpp	10 Aug 2007 14:24:52 -0000	1.39.2.1
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ActionExec.cpp,v 1.39 2007/07/01 10:54:36 bjacques Exp $ */
+/* $Id: ActionExec.cpp,v 1.39.2.1 2007/08/10 14:24:52 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -288,7 +288,15 @@
     if ( ! isFunction() && env.callStackDepth() > 0 )
     {
 	log_error(_("Call stack non-empty at end of ExecutableCode run (limits hit?)"));
-	env.clearCallFrames();
+	// TOOD:
+	// bug #20740 contains a movie that fails an assertion if we clean the call stack here
+	// maybe global code was executed as effect of a function code (think gotoFrame, attachMovie ?)
+	// We'll keep the verbose error for now, but let's not clean the call frame, shouldn't
+	// hurt anyway..
+	// A better implementation would likely be taking note of the callStackDepth at startup
+	// (like for _initial_stack_size) and check it here for consistency (and proper cleanup
+	// on limits hit).
+	//env.clearCallFrames();
     }
 
     // check if the stack was smashed



From MAILER-DAEMON Fri Aug 10 10:25:01 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJVQC-0000Fb-Ve
	for mharc-gnash-commit@gnu.org; Fri, 10 Aug 2007 10:25:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJVQB-0000F3-Bi
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 10:24:59 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJVQA-0000En-Uu
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 10:24:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJVQA-0000Eh-LP
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 10:24:58 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJVQA-0008TH-Cs
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 10:24:58 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJVQ9-000802-RZ
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 14:24:57 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJVQ9-0007zz-IO
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 14:24:57 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJVQ9-0007zz-IO@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 10 Aug 2007 14:24:57 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/vm/ActionExec.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Aug 2007 14:24:59 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/10 14:24:57

Modified files:
	.              : ChangeLog 
	server/vm      : ActionExec.cpp 

Log message:
	        * server/vm/ActionExec.cpp (cleanupAfterRun): don't assume the call
	          stack should be empty at the end of global code execution. Still
	          print an error as we need further investigation about it. Fixes
	          bug #20740.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3984&r2=1.3985
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.cpp?cvsroot=gnash&r1=1.39&r2=1.40

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3984
retrieving revision 1.3985
diff -u -b -r1.3984 -r1.3985
--- ChangeLog	10 Aug 2007 14:06:34 -0000	1.3984
+++ ChangeLog	10 Aug 2007 14:24:56 -0000	1.3985
@@ -1,3 +1,10 @@
+2007-08-10 Sandro Santilli <strk@keybit.net>
+
+	* server/vm/ActionExec.cpp (cleanupAfterRun): don't assume the call
+	  stack should be empty at the end of global code execution. Still
+	  print an error as we need further investigation about it. Fixes
+	  bug #20740.
+
 2007-08-10 Paul Smedley <paul@smedley.info>
 
 	* libbase/URL.cpp, libbase/container.h, libbase/network.cpp,

Index: server/vm/ActionExec.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ActionExec.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- server/vm/ActionExec.cpp	1 Jul 2007 10:54:36 -0000	1.39
+++ server/vm/ActionExec.cpp	10 Aug 2007 14:24:57 -0000	1.40
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ActionExec.cpp,v 1.39 2007/07/01 10:54:36 bjacques Exp $ */
+/* $Id: ActionExec.cpp,v 1.40 2007/08/10 14:24:57 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -288,7 +288,15 @@
     if ( ! isFunction() && env.callStackDepth() > 0 )
     {
 	log_error(_("Call stack non-empty at end of ExecutableCode run (limits hit?)"));
-	env.clearCallFrames();
+	// TOOD:
+	// bug #20740 contains a movie that fails an assertion if we clean the call stack here
+	// maybe global code was executed as effect of a function code (think gotoFrame, attachMovie ?)
+	// We'll keep the verbose error for now, but let's not clean the call frame, shouldn't
+	// hurt anyway..
+	// A better implementation would likely be taking note of the callStackDepth at startup
+	// (like for _initial_stack_size) and check it here for consistency (and proper cleanup
+	// on limits hit).
+	//env.clearCallFrames();
     }
 
     // check if the stack was smashed



From MAILER-DAEMON Fri Aug 10 10:29:44 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJVUm-0003XI-Kt
	for mharc-gnash-commit@gnu.org; Fri, 10 Aug 2007 10:29:44 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJVUk-0003Uc-U4
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 10:29:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJVUk-0003Th-Bk
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 10:29:42 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJVUk-0003TQ-2y
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 10:29:42 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1IJVUj-0000ph-FR
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 10:29:41 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l7AETbL26361;
	Fri, 10 Aug 2007 16:29:37 +0200 (CEST)
	(envelope-from strk@keybit.net)
Date: Fri, 10 Aug 2007 16:29:37 +0200
From: Sandro Santilli <strk@keybit.net>
To: zou lunkai <zoulunkai@gmail.com>
Subject: Re: [Gnash-commit] gnash ChangeLog server/as_value.cpp server/as_v...
Message-ID: <20070810142937.GC13154@keybit.net>
Mail-Followup-To: zou lunkai <zoulunkai@gmail.com>, gnash-commit@gnu.org
References: <E1II9Pl-000622-Ra@cvs.savannah.gnu.org>
	<ca4b43ff0708090356r25e64153oc0081329ed084fda@mail.gmail.com>
	<ca4b43ff0708090443p3366cf96y14ac2792c2dcd9e8@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <ca4b43ff0708090443p3366cf96y14ac2792c2dcd9e8@mail.gmail.com>
X-Detected-Kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Aug 2007 14:29:43 -0000

On Thu, Aug 09, 2007 at 07:43:09PM +0800, zou lunkai wrote:
> On 8/9/07, zou lunkai <zoulunkai@gmail.com> wrote:
> > "Make check" failed here today with cvs head.  Can anyone confirm me?
> > BTW, I'm still using Ming0.4.beta4, but I didn't get this before.
> >
> > Here are the reports:
> > (1)
> > cd testsuite/actionscript.all
> > make check
> >
> > FAIL: astests-v6-Runner: ! mc.hasOwnProperty('onEnterFrame')
> > [./MovieClip.as:192]
> > FAIL: astests-v7-Runner: ! mc.hasOwnProperty('onEnterFrame')
> > [./MovieClip.as:192]
> >
> These are reproduceable.

weird, I'm pretty sure onEnterFrame is NOT a proper property.
whatever Ming version you have, check if results are comparable
with the PP. It might be your Ming version messes up with the 
NOT operator ?

> > (2)
> >  cd testsuite/misc-ming.all
> >  make check
> >
> > FAIL: intervalTestRunner: tmp.to_number() == '1' (expected: 2)
> > [intervalTestRunner.cpp:94]
> > FAIL: intervalTestRunner: tmp.to_number() == '2' (expected: 3)
> > [intervalTestRunner.cpp:101]
> > FAIL: intervalTestRunner: tmp.to_number() == '3' (expected: 4)
> > [intervalTestRunner.cpp:108]
> > FAIL: intervalTestRunner: tmp.to_number() == '4' (expected: 5)
> > [intervalTestRunner.cpp:113]
> > FAIL: intervalTestRunner: tmp.to_number() == '3' (expected: 4)
> > [intervalTestRunner.cpp:115]
> > FAIL: intervalTestRunner: tmp.to_number() == '8' (expected: 1)
> > [intervalTestRunner.cpp:122]
> >
> Ah, I can not reproduce these every time.

intervals...  time based... maybe the test Runner should just sleep 
some more..

--strk; 

 ()   ASCII Ribbon Campaign
 /\   Keep it simple! 




From MAILER-DAEMON Fri Aug 10 10:39:29 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJVeC-00086o-V2
	for mharc-gnash-commit@gnu.org; Fri, 10 Aug 2007 10:39:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJVeB-00084y-Qa
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 10:39:27 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJVeA-00082N-Gg
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 10:39:27 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJVeA-00081y-9h
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 10:39:26 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJVeA-0002Ct-0N
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 10:39:26 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJVe9-0008AU-FR
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 14:39:25 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJVe9-0008AR-C6
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 14:39:25 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJVe9-0008AR-C6@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 10 Aug 2007 14:39:25 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/testsuite/misc-mtasc.all .cvsignore
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Aug 2007 14:39:28 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/10 14:39:25

Modified files:
	testsuite/misc-mtasc.all: .cvsignore 

Log message:
	add pp_*.as

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-mtasc.all/.cvsignore?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3&r2=1.3.6.1

Patches:
Index: .cvsignore
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-mtasc.all/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -u -b -r1.3 -r1.3.6.1
--- .cvsignore	4 May 2007 09:49:00 -0000	1.3
+++ .cvsignore	10 Aug 2007 14:39:25 -0000	1.3.6.1
@@ -9,3 +9,4 @@
 testrun.*
 alltests-runner
 gmon.out
+pp_*.as



From MAILER-DAEMON Fri Aug 10 10:39:56 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJVee-0000Qb-3r
	for mharc-gnash-commit@gnu.org; Fri, 10 Aug 2007 10:39:56 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJVec-0000NL-74
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 10:39:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJVeb-0000MK-Ii
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 10:39:53 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJVeb-0000Lz-7B
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 10:39:53 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJVea-0002Hp-VP
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 10:39:53 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJVeZ-0008Au-W6
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 14:39:52 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJVeZ-0008Ar-SK
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 14:39:51 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJVeZ-0008Ar-SK@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 10 Aug 2007 14:39:51 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/testsuite/misc-mtasc.all .cvsignore
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Aug 2007 14:39:54 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/10 14:39:51

Modified files:
	testsuite/misc-mtasc.all: .cvsignore 

Log message:
	add pp_*.as

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-mtasc.all/.cvsignore?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: .cvsignore
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-mtasc.all/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- .cvsignore	4 May 2007 09:49:00 -0000	1.3
+++ .cvsignore	10 Aug 2007 14:39:51 -0000	1.4
@@ -9,3 +9,4 @@
 testrun.*
 alltests-runner
 gmon.out
+pp_*.as



From MAILER-DAEMON Fri Aug 10 10:44:03 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJVic-00032R-UZ
	for mharc-gnash-commit@gnu.org; Fri, 10 Aug 2007 10:44:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJVib-00031R-AS
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 10:44:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJVia-00030l-AN
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 10:44:00 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJVia-00030f-3H
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 10:44:00 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJViZ-000391-O0
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 10:43:59 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJViZ-0000OZ-63
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 14:43:59 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJViZ-0000OT-0p
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 14:43:59 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJViZ-0000OT-0p@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 10 Aug 2007 14:43:59 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/gui .cvsignore [release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Aug 2007 14:44:01 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/10 14:43:59

Modified files:
	gui            : .cvsignore 

Log message:
	updated

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/.cvsignore?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3&r2=1.3.6.1

Patches:
Index: .cvsignore
===================================================================
RCS file: /sources/gnash/gnash/gui/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -u -b -r1.3 -r1.3.6.1
--- .cvsignore	29 Nov 2006 09:08:20 -0000	1.3
+++ .cvsignore	10 Aug 2007 14:43:58 -0000	1.3.6.1
@@ -5,3 +5,6 @@
 *.lo
 *.la
 gnash
+.configline
+*-gnash
+klash.moc



From MAILER-DAEMON Fri Aug 10 10:44:10 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJVik-00035t-3L
	for mharc-gnash-commit@gnu.org; Fri, 10 Aug 2007 10:44:10 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJVii-00035M-Lw
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 10:44:08 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJVih-00034t-UO
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 10:44:08 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJVih-00034l-Qo
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 10:44:07 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJVih-0003AN-Fn
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 10:44:07 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJVig-0000RQ-TH
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 14:44:06 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJVig-0000RL-OT
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 14:44:06 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJVig-0000RL-OT@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 10 Aug 2007 14:44:06 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/gui .cvsignore
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Aug 2007 14:44:09 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/10 14:44:06

Modified files:
	gui            : .cvsignore 

Log message:
	updated

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/.cvsignore?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: .cvsignore
===================================================================
RCS file: /sources/gnash/gnash/gui/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- .cvsignore	29 Nov 2006 09:08:20 -0000	1.3
+++ .cvsignore	10 Aug 2007 14:44:06 -0000	1.4
@@ -5,3 +5,6 @@
 *.lo
 *.la
 gnash
+.configline
+*-gnash
+klash.moc



From MAILER-DAEMON Fri Aug 10 11:17:50 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJWFK-0002kk-JC
	for mharc-gnash-commit@gnu.org; Fri, 10 Aug 2007 11:17:50 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJWFI-0002jb-LG
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 11:17:48 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJWFH-0002j1-DK
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 11:17:48 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJWFH-0002iy-AO
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 11:17:47 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJWFH-0003Cj-2K
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 11:17:47 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJWFF-0003AS-HB
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 15:17:45 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJWFF-0003AP-5P
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 15:17:45 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJWFF-0003AP-5P@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 10 Aug 2007 15:17:45 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/vm/ActionExec.cpp server...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Aug 2007 15:17:49 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/10 15:17:45

Modified files:
	.              : ChangeLog 
	server/vm      : ActionExec.cpp ActionExec.h 

Log message:
	        * server/vm/ActionExec.{cpp,h}: refactor the check for call stack
	          depth at end of execution to take depth at *start* of execution
	          into account.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3985&r2=1.3986
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.cpp?cvsroot=gnash&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.h?cvsroot=gnash&r1=1.19&r2=1.20

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3985
retrieving revision 1.3986
diff -u -b -r1.3985 -r1.3986
--- ChangeLog	10 Aug 2007 14:24:56 -0000	1.3985
+++ ChangeLog	10 Aug 2007 15:17:44 -0000	1.3986
@@ -1,5 +1,11 @@
 2007-08-10 Sandro Santilli <strk@keybit.net>
 
+	* server/vm/ActionExec.{cpp,h}: refactor the check for call stack
+	  depth at end of execution to take depth at *start* of execution
+	  into account.
+
+2007-08-10 Sandro Santilli <strk@keybit.net>
+
 	* server/vm/ActionExec.cpp (cleanupAfterRun): don't assume the call
 	  stack should be empty at the end of global code execution. Still
 	  print an error as we need further investigation about it. Fixes

Index: server/vm/ActionExec.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ActionExec.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- server/vm/ActionExec.cpp	10 Aug 2007 14:24:57 -0000	1.40
+++ server/vm/ActionExec.cpp	10 Aug 2007 15:17:44 -0000	1.41
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ActionExec.cpp,v 1.40 2007/08/10 14:24:57 strk Exp $ */
+/* $Id: ActionExec.cpp,v 1.41 2007/08/10 15:17:44 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -145,6 +145,8 @@
 
     _initial_stack_size = env.stack_size();
 
+    _initialCallStackDepth = env.callStackDepth();
+
 #if DEBUG_STACK
 	IF_VERBOSE_ACTION (
         	log_action(_("at ActionExec operator() start, pc=" SIZET_FMT
@@ -284,19 +286,32 @@
     env.set_target(_original_target);
     _original_target = NULL;
 
-    // check the call stack if not in a function context
-    if ( ! isFunction() && env.callStackDepth() > 0 )
+    // Check the call stack depth to be the same as the one we started with
+    // TODO: should this check be switched off based on GNASH_TRUST_SWF_INPUT ?
+    size_t currCallStackDepth = env.callStackDepth();
+    if ( currCallStackDepth != _initialCallStackDepth )
+    {
+	if ( currCallStackDepth > _initialCallStackDepth )
+	{
+		// TODO: try to produce this error hitting script limits
+		log_error(_("Call stack at end of ActionScript execution "
+			"(" SIZET_FMT ") exceeds call stack depth at start "
+			"of it (" SIZET_FMT ") - limits hit ?"),
+			 currCallStackDepth, _initialCallStackDepth);
+		size_t diff = currCallStackDepth-_initialCallStackDepth;
+		while (diff--)
+		{
+			env.popCallFrame();
+		}
+	}
+	else
     {
-	log_error(_("Call stack non-empty at end of ExecutableCode run (limits hit?)"));
-	// TOOD:
-	// bug #20740 contains a movie that fails an assertion if we clean the call stack here
-	// maybe global code was executed as effect of a function code (think gotoFrame, attachMovie ?)
-	// We'll keep the verbose error for now, but let's not clean the call frame, shouldn't
-	// hurt anyway..
-	// A better implementation would likely be taking note of the callStackDepth at startup
-	// (like for _initial_stack_size) and check it here for consistency (and proper cleanup
-	// on limits hit).
-	//env.clearCallFrames();
+		// TODO: make this an assertion ?
+		log_error(_("Call stack at end of ActionScript execution "
+			"(" SIZET_FMT ") less then call stack depth at start "
+			"of it (" SIZET_FMT ") - bad bug !"),
+			 currCallStackDepth, _initialCallStackDepth);
+	}
     }
 
     // check if the stack was smashed

Index: server/vm/ActionExec.h
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ActionExec.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/vm/ActionExec.h	1 Jul 2007 10:54:36 -0000	1.19
+++ server/vm/ActionExec.h	10 Aug 2007 15:17:44 -0000	1.20
@@ -100,8 +100,12 @@
 	/// The 'this' pointer, if this is a function call
 	boost::intrusive_ptr<as_object> _this_ptr;
 
+	/// Stack size at start of execution
 	size_t _initial_stack_size;
 
+	/// Call stack depth at start of execution
+	size_t _initialCallStackDepth;
+
 	character* _original_target;
 
 	/// Warn about a stack underrun and fix it 



From MAILER-DAEMON Fri Aug 10 11:17:57 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJWFR-0002pR-PL
	for mharc-gnash-commit@gnu.org; Fri, 10 Aug 2007 11:17:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJWFQ-0002oH-W7
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 11:17:57 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJWFQ-0002nS-9P
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 11:17:56 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJWFQ-0002nI-5j
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 11:17:56 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJWFP-0003Ej-QI
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 11:17:55 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJWFP-0003B4-2a
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 15:17:55 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJWFO-0003B0-Qf
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 15:17:54 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJWFO-0003B0-Qf@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 10 Aug 2007 15:17:54 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/vm/ActionExec.cpp server...
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Aug 2007 15:17:57 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/10 15:17:54

Modified files:
	.              : ChangeLog 
	server/vm      : ActionExec.cpp ActionExec.h 

Log message:
	        * server/vm/ActionExec.{cpp,h}: refactor the check for call stack
	          depth at end of execution to take depth at *start* of execution
	          into account.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.10&r2=1.3971.2.11
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.39.2.1&r2=1.39.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.h?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.19&r2=1.19.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.10
retrieving revision 1.3971.2.11
diff -u -b -r1.3971.2.10 -r1.3971.2.11
--- ChangeLog	10 Aug 2007 14:24:51 -0000	1.3971.2.10
+++ ChangeLog	10 Aug 2007 15:17:53 -0000	1.3971.2.11
@@ -1,5 +1,11 @@
 2007-08-10 Sandro Santilli <strk@keybit.net>
 
+	* server/vm/ActionExec.{cpp,h}: refactor the check for call stack
+	  depth at end of execution to take depth at *start* of execution
+	  into account.
+
+2007-08-10 Sandro Santilli <strk@keybit.net>
+
 	* server/vm/ActionExec.cpp (cleanupAfterRun): don't assume the call
 	  stack should be empty at the end of global code execution. Still
 	  print an error as we need further investigation about it. Fixes

Index: server/vm/ActionExec.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ActionExec.cpp,v
retrieving revision 1.39.2.1
retrieving revision 1.39.2.2
diff -u -b -r1.39.2.1 -r1.39.2.2
--- server/vm/ActionExec.cpp	10 Aug 2007 14:24:52 -0000	1.39.2.1
+++ server/vm/ActionExec.cpp	10 Aug 2007 15:17:54 -0000	1.39.2.2
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ActionExec.cpp,v 1.39.2.1 2007/08/10 14:24:52 strk Exp $ */
+/* $Id: ActionExec.cpp,v 1.39.2.2 2007/08/10 15:17:54 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -145,6 +145,8 @@
 
     _initial_stack_size = env.stack_size();
 
+    _initialCallStackDepth = env.callStackDepth();
+
 #if DEBUG_STACK
 	IF_VERBOSE_ACTION (
         	log_action(_("at ActionExec operator() start, pc=" SIZET_FMT
@@ -284,19 +286,32 @@
     env.set_target(_original_target);
     _original_target = NULL;
 
-    // check the call stack if not in a function context
-    if ( ! isFunction() && env.callStackDepth() > 0 )
+    // Check the call stack depth to be the same as the one we started with
+    // TODO: should this check be switched off based on GNASH_TRUST_SWF_INPUT ?
+    size_t currCallStackDepth = env.callStackDepth();
+    if ( currCallStackDepth != _initialCallStackDepth )
+    {
+	if ( currCallStackDepth > _initialCallStackDepth )
+	{
+		// TODO: try to produce this error hitting script limits
+		log_error(_("Call stack at end of ActionScript execution "
+			"(" SIZET_FMT ") exceeds call stack depth at start "
+			"of it (" SIZET_FMT ") - limits hit ?"),
+			 currCallStackDepth, _initialCallStackDepth);
+		size_t diff = currCallStackDepth-_initialCallStackDepth;
+		while (diff--)
+		{
+			env.popCallFrame();
+		}
+	}
+	else
     {
-	log_error(_("Call stack non-empty at end of ExecutableCode run (limits hit?)"));
-	// TOOD:
-	// bug #20740 contains a movie that fails an assertion if we clean the call stack here
-	// maybe global code was executed as effect of a function code (think gotoFrame, attachMovie ?)
-	// We'll keep the verbose error for now, but let's not clean the call frame, shouldn't
-	// hurt anyway..
-	// A better implementation would likely be taking note of the callStackDepth at startup
-	// (like for _initial_stack_size) and check it here for consistency (and proper cleanup
-	// on limits hit).
-	//env.clearCallFrames();
+		// TODO: make this an assertion ?
+		log_error(_("Call stack at end of ActionScript execution "
+			"(" SIZET_FMT ") less then call stack depth at start "
+			"of it (" SIZET_FMT ") - bad bug !"),
+			 currCallStackDepth, _initialCallStackDepth);
+	}
     }
 
     // check if the stack was smashed

Index: server/vm/ActionExec.h
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ActionExec.h,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -u -b -r1.19 -r1.19.2.1
--- server/vm/ActionExec.h	1 Jul 2007 10:54:36 -0000	1.19
+++ server/vm/ActionExec.h	10 Aug 2007 15:17:54 -0000	1.19.2.1
@@ -100,8 +100,12 @@
 	/// The 'this' pointer, if this is a function call
 	boost::intrusive_ptr<as_object> _this_ptr;
 
+	/// Stack size at start of execution
 	size_t _initial_stack_size;
 
+	/// Call stack depth at start of execution
+	size_t _initialCallStackDepth;
+
 	character* _original_target;
 
 	/// Warn about a stack underrun and fix it 



From MAILER-DAEMON Fri Aug 10 11:50:51 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJWlG-0000pk-Qx
	for mharc-gnash-commit@gnu.org; Fri, 10 Aug 2007 11:50:50 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJWlF-0000o5-6X
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 11:50:49 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJWlD-0000mF-Ld
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 11:50:48 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJWlD-0000ly-CI
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 11:50:47 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJWlC-0002ZM-TW
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 11:50:47 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJWlB-00050s-U4
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 15:50:46 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJWlB-00050p-QA
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 15:50:45 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJWlB-00050p-QA@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 10 Aug 2007 15:50:45 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/FreetypeGlyphsProvider.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Aug 2007 15:50:49 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/10 15:50:45

Modified files:
	.              : ChangeLog 
	server         : FreetypeGlyphsProvider.cpp 

Log message:
	By David Rorex:
	
	        * server/FreetypeGlyphsProvider.cpp: minor change to print the
	          freetype glyph format in human readable form. patch #6148.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3986&r2=1.3987
http://cvs.savannah.gnu.org/viewcvs/gnash/server/FreetypeGlyphsProvider.cpp?cvsroot=gnash&r1=1.8&r2=1.9

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3986
retrieving revision 1.3987
diff -u -b -r1.3986 -r1.3987
--- ChangeLog	10 Aug 2007 15:17:44 -0000	1.3986
+++ ChangeLog	10 Aug 2007 15:50:45 -0000	1.3987
@@ -1,3 +1,8 @@
+2007-08-09 David Rorex  <drorex@gmail.com>
+
+	* server/FreetypeGlyphsProvider.cpp: minor change to print the
+	  freetype glyph format in human readable form. patch #6148.
+
 2007-08-10 Sandro Santilli <strk@keybit.net>
 
 	* server/vm/ActionExec.{cpp,h}: refactor the check for call stack

Index: server/FreetypeGlyphsProvider.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/FreetypeGlyphsProvider.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/FreetypeGlyphsProvider.cpp	9 Aug 2007 23:29:53 -0000	1.8
+++ server/FreetypeGlyphsProvider.cpp	10 Aug 2007 15:50:45 -0000	1.9
@@ -410,8 +410,9 @@
 
 	if ( m_face->glyph->format != FT_GLYPH_FORMAT_OUTLINE )
 	{
-		log_unimpl("FT_Load_Char() returned a glyph format != FT_GLYPH_FORMAT_OUTLINE (%d)",
-			m_face->glyph->format);
+		unsigned long gf = m_face->glyph->format;
+		log_unimpl("FT_Load_Char() returned a glyph format != FT_GLYPH_FORMAT_OUTLINE (%c%c%c%c)",
+			(gf>>24)&0xff, (gf>>16)&0xff, (gf>>8)&0xff, gf&0xff);
 		return 0;
 	}
 	//assert(m_face->glyph->format == FT_GLYPH_FORMAT_OUTLINE);



From MAILER-DAEMON Fri Aug 10 11:51:01 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJWlR-00011K-46
	for mharc-gnash-commit@gnu.org; Fri, 10 Aug 2007 11:51:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJWlO-0000yf-8g
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 11:50:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJWlM-0000wN-80
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 11:50:56 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJWlL-0000wA-OZ
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 11:50:55 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJWlL-0002bi-EB
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 11:50:55 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJWlK-000519-Vb
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 15:50:55 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJWlK-000516-SH
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 15:50:54 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJWlK-000516-SH@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 10 Aug 2007 15:50:54 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/FreetypeGlyphsProvider.cpp
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Aug 2007 15:50:59 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/10 15:50:54

Modified files:
	.              : ChangeLog 
	server         : FreetypeGlyphsProvider.cpp 

Log message:
	By David Rorex:
	
	        * server/FreetypeGlyphsProvider.cpp: minor change to print the
	          freetype glyph format in human readable form. patch #6148.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.11&r2=1.3971.2.12
http://cvs.savannah.gnu.org/viewcvs/gnash/server/FreetypeGlyphsProvider.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.7.2.1&r2=1.7.2.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.11
retrieving revision 1.3971.2.12
diff -u -b -r1.3971.2.11 -r1.3971.2.12
--- ChangeLog	10 Aug 2007 15:17:53 -0000	1.3971.2.11
+++ ChangeLog	10 Aug 2007 15:50:53 -0000	1.3971.2.12
@@ -1,3 +1,8 @@
+2007-08-09 David Rorex  <drorex@gmail.com>
+
+	* server/FreetypeGlyphsProvider.cpp: minor change to print the
+	  freetype glyph format in human readable form. patch #6148.
+
 2007-08-10 Sandro Santilli <strk@keybit.net>
 
 	* server/vm/ActionExec.{cpp,h}: refactor the check for call stack

Index: server/FreetypeGlyphsProvider.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/FreetypeGlyphsProvider.cpp,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -b -r1.7.2.1 -r1.7.2.2
--- server/FreetypeGlyphsProvider.cpp	9 Aug 2007 23:31:06 -0000	1.7.2.1
+++ server/FreetypeGlyphsProvider.cpp	10 Aug 2007 15:50:54 -0000	1.7.2.2
@@ -410,8 +410,9 @@
 
 	if ( m_face->glyph->format != FT_GLYPH_FORMAT_OUTLINE )
 	{
-		log_unimpl("FT_Load_Char() returned a glyph format != FT_GLYPH_FORMAT_OUTLINE (%d)",
-			m_face->glyph->format);
+		unsigned long gf = m_face->glyph->format;
+		log_unimpl("FT_Load_Char() returned a glyph format != FT_GLYPH_FORMAT_OUTLINE (%c%c%c%c)",
+			(gf>>24)&0xff, (gf>>16)&0xff, (gf>>8)&0xff, gf&0xff);
 		return 0;
 	}
 	//assert(m_face->glyph->format == FT_GLYPH_FORMAT_OUTLINE);



From MAILER-DAEMON Fri Aug 10 14:31:07 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJZGN-0004Dz-Mz
	for mharc-gnash-commit@gnu.org; Fri, 10 Aug 2007 14:31:07 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJZGL-00049x-GF
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 14:31:05 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJZGJ-00047l-TQ
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 14:31:04 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJZGJ-00047U-On
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 14:31:03 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJZGJ-0005yF-Bd
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 14:31:03 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJZGI-0006MS-Ab
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 18:31:02 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJZGI-0006MN-6N
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 18:31:02 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJZGI-0006MN-6N@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 10 Aug 2007 18:31:02 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog Makefile.am configure.ac testsu...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Aug 2007 18:31:05 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/10 18:31:02

Modified files:
	.              : ChangeLog Makefile.am configure.ac 
	testsuite      : Makefile.am 
	testsuite/misc-swfc.all: Makefile.am 

Log message:
	        * Makefile.am, configure.ac, testsuite/Makefile.am,
	          testsuite/misc-swfc.all/Makefile.am:
	          Enable swfc testsuite if 'swfc' is found on the system.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3987&r2=1.3988
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.87&r2=1.88
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.396&r2=1.397
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/Makefile.am?cvsroot=gnash&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/Makefile.am?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3987
retrieving revision 1.3988
diff -u -b -r1.3987 -r1.3988
--- ChangeLog	10 Aug 2007 15:50:45 -0000	1.3987
+++ ChangeLog	10 Aug 2007 18:31:01 -0000	1.3988
@@ -1,4 +1,10 @@
-2007-08-09 David Rorex  <drorex@gmail.com>
+2007-08-10 Sandro Santilli <strk@keybit.net>
+
+	* Makefile.am, configure.ac, testsuite/Makefile.am,
+	  testsuite/misc-swfc.all/Makefile.am:
+	  Enable swfc testsuite if 'swfc' is found on the system.
+
+2007-08-10 David Rorex  <drorex@gmail.com>
 
 	* server/FreetypeGlyphsProvider.cpp: minor change to print the
 	  freetype glyph format in human readable form. patch #6148.

Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- Makefile.am	7 Aug 2007 20:53:09 -0000	1.87
+++ Makefile.am	10 Aug 2007 18:31:01 -0000	1.88
@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # 
 
-# $Id: Makefile.am,v 1.87 2007/08/07 20:53:09 strk Exp $
+# $Id: Makefile.am,v 1.88 2007/08/10 18:31:01 strk Exp $
 
 ## Process this file with automake to produce Makefile.in
 AUTOMAKE_OPTIONS = 1.6.0
@@ -186,6 +186,9 @@
 if ENABLE_SWFMILL
 	@echo "	SWFMILL $(SWFMILL) "
 endif
+if ENABLE_SWFC
+	@echo "	SWFC $(SWFC) "
+endif
 if ENABLE_SWFDEC_TESTSUITE
 	@echo "	SWFDEC_TESTSUITE $(SWFDEC_TESTSUITE)"
 endif

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -b -r1.396 -r1.397
--- configure.ac	3 Aug 2007 20:25:30 -0000	1.396
+++ configure.ac	10 Aug 2007 18:31:01 -0000	1.397
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.396 2007/08/03 20:25:30 strk Exp $
+dnl $Id: configure.ac,v 1.397 2007/08/10 18:31:01 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -952,14 +952,16 @@
 AM_CONDITIONAL(ENABLE_SWFDEC_TESTSUITE, [ test x"$SWFDEC_TESTSUITE" != x ])
 
 dnl
-dnl See if we can use the swfmill and mtasc based testsuites 
+dnl See if we can use the swfmill, mtasc and swfc based testsuites 
 dnl
 if test x$cross_compiling = xno; then
   AC_PATH_PROG(SWFMILL, swfmill)
+  AC_PATH_PROG(SWFC, swfc)
   AC_PATH_MTASC
 fi
 AM_CONDITIONAL(ENABLE_SWFMILL, [ test x"$SWFMILL" != x ])
 AM_CONDITIONAL(ENABLE_MTASC, [ test x"$MTASC" != x ])
+AM_CONDITIONAL(ENABLE_SWFC, [ test x"$SWFC" != x ])
 
 AC_PATH_PROG(DOXYGEN, doxygen)
 AM_CONDITIONAL(ENABLE_DOXYGEN, [ test x"$DOXYGEN" != x ])
@@ -1376,6 +1378,7 @@
 testsuite/misc-ming.all/Makefile
 testsuite/misc-mtasc.all/Makefile
 testsuite/misc-swfmill.all/Makefile
+testsuite/misc-swfc.all/Makefile
 testsuite/movies.all/Makefile
 testsuite/server/Makefile
 testsuite/libamf.all/Makefile
@@ -1997,6 +2000,15 @@
     echo "                 to run some of the tests in Gnash testsuite."
     echo "                 You can install it from http://iterative.org/swfmill/"
   fi
+
+  if test x"$SWFC" != x; then
+    echo "        SWFC is $SWFC"
+  else
+    echo "        WARNING: You need to have 'swfc' from SWFTools installed"
+    echo "                 to run some of the tests in Gnash testsuite."
+    echo "                 You can install it from http://www.swftools.org/"
+  fi
+
 fi
 
 if test x"$Z_LIBS" != x; then

Index: testsuite/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/Makefile.am,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- testsuite/Makefile.am	20 Jul 2007 14:28:34 -0000	1.40
+++ testsuite/Makefile.am	10 Aug 2007 18:31:01 -0000	1.41
@@ -12,6 +12,7 @@
 	misc-ming.all \
 	misc-mtasc.all \
 	misc-swfmill.all \
+	misc-swfc.all \
 	movies.all \
 	actionscript.all \
 	$(NULL)

Index: testsuite/misc-swfc.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/misc-swfc.all/Makefile.am	9 Aug 2007 06:38:16 -0000	1.1
+++ testsuite/misc-swfc.all/Makefile.am	10 Aug 2007 18:31:01 -0000	1.2
@@ -34,7 +34,7 @@
 
 #if ENABLE_SWFC
 
-SWFC = swfc
+#SWFC = swfc # this is set by ./configure
 SWFC_FLAGS = 
 SWFC_CPP = cpp -P -I$(srcdir)
 



From MAILER-DAEMON Fri Aug 10 14:59:40 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJZi0-0007Ah-6I
	for mharc-gnash-commit@gnu.org; Fri, 10 Aug 2007 14:59:40 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJZhz-0007AY-4N
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 14:59:39 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJZhx-0007AL-Ku
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 14:59:38 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJZhx-0007AH-Fo
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 14:59:37 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJZhx-0001rc-2d
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 14:59:37 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJZhv-0008CN-FX
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 18:59:35 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJZhv-0008CK-BG
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 18:59:35 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJZhv-0008CK-BG@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 10 Aug 2007 18:59:35 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/media/README testsuit...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Aug 2007 18:59:39 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/10 18:59:35

Modified files:
	.              : ChangeLog 
	testsuite/media: README 
	testsuite/misc-swfc.all: Makefile.am check.sc sound.sc 
Added files:
	testsuite/media: sound1.wav 
Removed files:
	testsuite/misc-swfc.all: sound.wav 

Log message:
	        * testsuite/media/: README, sound1.wav:
	          Moved sound1.wav data from swfc dir to media dir,
	          add some info about it and sound1.mp3.
	        * testsuite/misc-swfc.all/sound.wav: moved to
	          media/sound1.wav
	        * testsuite/misc-swfc.all/Makefile.am: define MEDIADIR
	        * testsuite/misc-swfc.all/check.sc: define a MEDIA
	          macro
	        * testsuite/misc-swfc.all/sound.sc: use the MEDIA macro
	          to find media stuff.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3988&r2=1.3989
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/media/README?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/media/sound1.wav?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/Makefile.am?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/check.sc?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/sound.sc?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/sound.wav?cvsroot=gnash&r1=1.1&r2=0

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3988
retrieving revision 1.3989
diff -u -b -r1.3988 -r1.3989
--- ChangeLog	10 Aug 2007 18:31:01 -0000	1.3988
+++ ChangeLog	10 Aug 2007 18:59:34 -0000	1.3989
@@ -1,5 +1,18 @@
 2007-08-10 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/media/: README, sound1.wav:
+	  Moved sound1.wav data from swfc dir to media dir,
+	  add some info about it and sound1.mp3.
+	* testsuite/misc-swfc.all/sound.wav: moved to
+	  media/sound1.wav
+	* testsuite/misc-swfc.all/Makefile.am: define MEDIADIR
+	* testsuite/misc-swfc.all/check.sc: define a MEDIA
+	  macro
+	* testsuite/misc-swfc.all/sound.sc: use the MEDIA macro
+	  to find media stuff.
+
+2007-08-10 Sandro Santilli <strk@keybit.net>
+
 	* Makefile.am, configure.ac, testsuite/Makefile.am,
 	  testsuite/misc-swfc.all/Makefile.am:
 	  Enable swfc testsuite if 'swfc' is found on the system.

Index: testsuite/media/README
===================================================================
RCS file: /sources/gnash/gnash/testsuite/media/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/media/README	13 Jun 2006 10:06:03 -0000	1.1
+++ testsuite/media/README	10 Aug 2007 18:59:34 -0000	1.2
@@ -7,3 +7,20 @@
 	Font Definition Block (fdb) for embedding in SWF.
 	Taken from http://ming.sf.net. Copyright is in
 	Bitstream.COPYRIGHT
+
+sound1.wav
+
+	(tick, tick)
+	Sample Size    : 16-bits
+	Sample Encoding: signed (2's complement)
+	Channels       : 1
+	Sample Rate    : 8000
+
+sound1.mp3
+
+	(bip bip)
+	Sample Size    : 16-bits
+	Sample Encoding: MPEG audio (layer I, II or III)
+	Channels       : 1
+	Sample Rate    : 22050
+

Index: testsuite/misc-swfc.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/misc-swfc.all/Makefile.am	10 Aug 2007 18:31:01 -0000	1.2
+++ testsuite/misc-swfc.all/Makefile.am	10 Aug 2007 18:59:34 -0000	1.3
@@ -36,7 +36,7 @@
 
 #SWFC = swfc # this is set by ./configure
 SWFC_FLAGS = 
-SWFC_CPP = cpp -P -I$(srcdir)
+SWFC_CPP = cpp -P -I$(srcdir) -DMEDIADIR='$(srcdir)/../media'
 
 SCTESTS_OUT = $(SCTESTS:.sc=.swf)
 

Index: testsuite/misc-swfc.all/check.sc
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/check.sc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/misc-swfc.all/check.sc	9 Aug 2007 06:38:16 -0000	1.1
+++ testsuite/misc-swfc.all/check.sc	10 Aug 2007 18:59:34 -0000	1.2
@@ -44,5 +44,6 @@
 
 #define note(text) Dejagnu.note(text + _INFO_);
 
+#define MEDIA(x) MEDIADIR/x
 
 #endif

Index: testsuite/misc-swfc.all/sound.sc
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/sound.sc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/misc-swfc.all/sound.sc	9 Aug 2007 06:38:16 -0000	1.1
+++ testsuite/misc-swfc.all/sound.sc	10 Aug 2007 18:59:34 -0000	1.2
@@ -1,6 +1,8 @@
 .flash bbox=200x200 filename="sound_test.swf" version=6 fps=30
 
-.sound audio "sound.wav"
+#include "check.sc"
+
+.sound audio MEDIA(sound1.wav)
 
 .box b1 100 100 color=yellow fill=red
 

Index: testsuite/media/sound1.wav
===================================================================
RCS file: testsuite/media/sound1.wav
diff -N testsuite/media/sound1.wav
Binary files /dev/null and /tmp/cvsxBZExn differ

Index: testsuite/misc-swfc.all/sound.wav
===================================================================
RCS file: testsuite/misc-swfc.all/sound.wav
diff -N testsuite/misc-swfc.all/sound.wav
Binary files /tmp/cvsUo5Hzq and /dev/null differ



From MAILER-DAEMON Fri Aug 10 15:38:22 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJaJS-0006SG-9j
	for mharc-gnash-commit@gnu.org; Fri, 10 Aug 2007 15:38:22 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJaJQ-0006Qv-KY
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 15:38:20 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJaJP-0006Pe-Qe
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 15:38:20 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJaJP-0006PP-Gc
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 15:38:19 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJaJP-0008EI-77
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 15:38:19 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJaJO-0001xV-4i
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 19:38:18 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJaJO-0001xS-0d
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 19:38:18 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJaJO-0001xS-0d@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 10 Aug 2007 19:38:18 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog configure.ac [release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Aug 2007 19:38:20 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/10 19:38:17

Modified files:
	.              : ChangeLog configure.ac 

Log message:
	        * configure.ac: FLTK/OGL isn't supported, while SDL/OGL is !

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.12&r2=1.3971.2.13
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.396.2.1&r2=1.396.2.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.12
retrieving revision 1.3971.2.13
diff -u -b -r1.3971.2.12 -r1.3971.2.13
--- ChangeLog	10 Aug 2007 15:50:53 -0000	1.3971.2.12
+++ ChangeLog	10 Aug 2007 19:38:17 -0000	1.3971.2.13
@@ -1,3 +1,7 @@
+2007-08-10 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac: FLTK/OGL isn't supported, while SDL/OGL is !
+
 2007-08-09 David Rorex  <drorex@gmail.com>
 
 	* server/FreetypeGlyphsProvider.cpp: minor change to print the

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.396.2.1
retrieving revision 1.396.2.2
diff -u -b -r1.396.2.1 -r1.396.2.2
--- configure.ac	9 Aug 2007 12:40:10 -0000	1.396.2.1
+++ configure.ac	10 Aug 2007 19:38:17 -0000	1.396.2.2
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.396.2.1 2007/08/09 12:40:10 strk Exp $
+dnl $Id: configure.ac,v 1.396.2.2 2007/08/10 19:38:17 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, 0.8.1)
@@ -330,8 +330,8 @@
 
 if test x$build_ogl = xyes; then
 dnl   if test x$build_fb = xyes -o x$build_fltk = xyes; then
-   if test x$build_gtk != xyes -a x$build_fltk != xyes -a x$build_kde != xyes -a x$build_aqua != xyes; then
-     AC_MSG_ERROR([OpenGL renderer needs one of gtk,fltk or kde guis. Try enabling any of them ( --enable-gui=gtk|kde|fltk ) or using AGG ( --enable-renderer=AGG ).]);
+   if test x$build_gtk != xyes -a x$build_sdl != xyes -a x$build_kde != xyes -a x$build_aqua != xyes; then
+     AC_MSG_ERROR([OpenGL renderer needs one of gtk,sdl or kde guis. Try enabling any of them ( --enable-gui=gtk|kde|sdl ) or using AGG ( --enable-renderer=AGG ).]);
    fi
    AC_DEFINE([RENDERER_OPENGL], [], [Use OpenGL renderer])
 fi



From MAILER-DAEMON Fri Aug 10 15:38:29 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJaJZ-0006VB-P3
	for mharc-gnash-commit@gnu.org; Fri, 10 Aug 2007 15:38:29 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJaJY-0006Ur-P6
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 15:38:28 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJaJX-0006UZ-GD
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 15:38:27 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJaJX-0006UW-Cc
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 15:38:27 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJaJX-0008GA-1g
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 15:38:27 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJaJW-0001xk-Hk
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 19:38:26 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJaJW-0001xh-DA
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 19:38:26 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJaJW-0001xh-DA@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 10 Aug 2007 19:38:26 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog configure.ac
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Aug 2007 19:38:28 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/10 19:38:26

Modified files:
	.              : ChangeLog configure.ac 

Log message:
	        * configure.ac: FLTK/OGL isn't supported, while SDL/OGL is !

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3989&r2=1.3990
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.397&r2=1.398

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3989
retrieving revision 1.3990
diff -u -b -r1.3989 -r1.3990
--- ChangeLog	10 Aug 2007 18:59:34 -0000	1.3989
+++ ChangeLog	10 Aug 2007 19:38:25 -0000	1.3990
@@ -1,5 +1,6 @@
 2007-08-10 Sandro Santilli <strk@keybit.net>
 
+	* configure.ac: FLTK/OGL isn't supported, while SDL/OGL is !
 	* testsuite/media/: README, sound1.wav:
 	  Moved sound1.wav data from swfc dir to media dir,
 	  add some info about it and sound1.mp3.

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -b -r1.397 -r1.398
--- configure.ac	10 Aug 2007 18:31:01 -0000	1.397
+++ configure.ac	10 Aug 2007 19:38:26 -0000	1.398
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.397 2007/08/10 18:31:01 strk Exp $
+dnl $Id: configure.ac,v 1.398 2007/08/10 19:38:26 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -330,8 +330,8 @@
 
 if test x$build_ogl = xyes; then
 dnl   if test x$build_fb = xyes -o x$build_fltk = xyes; then
-   if test x$build_gtk != xyes -a x$build_fltk != xyes -a x$build_kde != xyes -a x$build_aqua != xyes; then
-     AC_MSG_ERROR([OpenGL renderer needs one of gtk,fltk or kde guis. Try enabling any of them ( --enable-gui=gtk|kde|fltk ) or using AGG ( --enable-renderer=AGG ).]);
+   if test x$build_gtk != xyes -a x$build_sdl != xyes -a x$build_kde != xyes -a x$build_aqua != xyes; then
+     AC_MSG_ERROR([OpenGL renderer needs one of gtk,sdl or kde guis. Try enabling any of them ( --enable-gui=gtk|kde|sdl ) or using AGG ( --enable-renderer=AGG ).]);
    fi
    AC_DEFINE([RENDERER_OPENGL], [], [Use OpenGL renderer])
 fi



From MAILER-DAEMON Fri Aug 10 17:28:50 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJc2M-0004Ez-Oj
	for mharc-gnash-commit@gnu.org; Fri, 10 Aug 2007 17:28:50 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJc2K-0004Es-Hc
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 17:28:48 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJc2I-0004EG-Vy
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 17:28:47 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJc2I-0004EA-QA
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 17:28:46 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJc2I-0002vw-He
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 17:28:46 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJc2H-0001Ia-8W
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 21:28:45 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJc2H-0001IX-5U
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 21:28:45 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJc2H-0001IX-5U@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 10 Aug 2007 21:28:45 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/FreetypeGlyphsProvider.c...
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Aug 2007 21:28:49 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/10 21:28:45

Modified files:
	.              : ChangeLog 
	server         : FreetypeGlyphsProvider.cpp 
	                 FreetypeGlyphsProvider.h 

Log message:
	        * server/FreetypeGlyphsProvider.{cpp,h}: add a destructor getting
	          rid of the resources associated with a face.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.13&r2=1.3971.2.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/FreetypeGlyphsProvider.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.7.2.2&r2=1.7.2.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/FreetypeGlyphsProvider.h?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3&r2=1.3.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.13
retrieving revision 1.3971.2.14
diff -u -b -r1.3971.2.13 -r1.3971.2.14
--- ChangeLog	10 Aug 2007 19:38:17 -0000	1.3971.2.13
+++ ChangeLog	10 Aug 2007 21:28:44 -0000	1.3971.2.14
@@ -1,5 +1,7 @@
 2007-08-10 Sandro Santilli <strk@keybit.net>
 
+	* server/FreetypeGlyphsProvider.{cpp,h}: add a destructor getting
+	  rid of the resources associated with a face.
 	* configure.ac: FLTK/OGL isn't supported, while SDL/OGL is !
 
 2007-08-09 David Rorex  <drorex@gmail.com>

Index: server/FreetypeGlyphsProvider.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/FreetypeGlyphsProvider.cpp,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -b -r1.7.2.2 -r1.7.2.3
--- server/FreetypeGlyphsProvider.cpp	10 Aug 2007 15:50:54 -0000	1.7.2.2
+++ server/FreetypeGlyphsProvider.cpp	10 Aug 2007 21:28:44 -0000	1.7.2.3
@@ -457,5 +457,18 @@
 }
 #endif // ndef(HAVE_FREETYPE2)
 
+FreetypeGlyphsProvider::~FreetypeGlyphsProvider()
+{
+#ifdef HAVE_FREETYPE2 
+	if ( m_face )
+	{
+		if ( FT_Done_Face(m_face) != 0 )
+		{
+			log_error("Could not release FT face resources");
+		}
+	}
+#endif // ndef(HAVE_FREETYPE2)
+}
+
 } // namespace gnash
 

Index: server/FreetypeGlyphsProvider.h
===================================================================
RCS file: /sources/gnash/gnash/server/FreetypeGlyphsProvider.h,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -b -r1.3 -r1.3.2.1
--- server/FreetypeGlyphsProvider.h	1 Jul 2007 10:54:18 -0000	1.3
+++ server/FreetypeGlyphsProvider.h	10 Aug 2007 21:28:44 -0000	1.3.2.1
@@ -88,6 +88,13 @@
 	///
 	static std::auto_ptr<FreetypeGlyphsProvider> createFace(const std::string& name, bool bold, bool italic);
 
+	/// Destructor
+	//
+	/// Release face resources
+	///
+	~FreetypeGlyphsProvider();
+
+
 	/// Return the given character glyph as a shape character definition in 1024 EM coordinates.
 	//
 	///



From MAILER-DAEMON Fri Aug 10 17:28:55 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJc2Q-0004Hv-Sx
	for mharc-gnash-commit@gnu.org; Fri, 10 Aug 2007 17:28:54 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJc2P-0004Ge-7O
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 17:28:53 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJc2O-0004Fj-Dc
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 17:28:52 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJc2O-0004Fe-5r
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 17:28:52 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJc2N-0002xE-N0
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 17:28:51 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJc2N-0001Iu-5x
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 21:28:51 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJc2N-0001Ir-20
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 21:28:51 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJc2N-0001Ir-20@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 10 Aug 2007 21:28:51 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/FreetypeGlyphsProvider.c...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Aug 2007 21:28:53 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/10 21:28:50

Modified files:
	.              : ChangeLog 
	server         : FreetypeGlyphsProvider.cpp 
	                 FreetypeGlyphsProvider.h 

Log message:
	        * server/FreetypeGlyphsProvider.{cpp,h}: add a destructor getting
	          rid of the resources associated with a face.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3990&r2=1.3991
http://cvs.savannah.gnu.org/viewcvs/gnash/server/FreetypeGlyphsProvider.cpp?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/server/FreetypeGlyphsProvider.h?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3990
retrieving revision 1.3991
diff -u -b -r1.3990 -r1.3991
--- ChangeLog	10 Aug 2007 19:38:25 -0000	1.3990
+++ ChangeLog	10 Aug 2007 21:28:50 -0000	1.3991
@@ -1,5 +1,7 @@
 2007-08-10 Sandro Santilli <strk@keybit.net>
 
+	* server/FreetypeGlyphsProvider.{cpp,h}: add a destructor getting
+	  rid of the resources associated with a face.
 	* configure.ac: FLTK/OGL isn't supported, while SDL/OGL is !
 	* testsuite/media/: README, sound1.wav:
 	  Moved sound1.wav data from swfc dir to media dir,

Index: server/FreetypeGlyphsProvider.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/FreetypeGlyphsProvider.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/FreetypeGlyphsProvider.cpp	10 Aug 2007 15:50:45 -0000	1.9
+++ server/FreetypeGlyphsProvider.cpp	10 Aug 2007 21:28:50 -0000	1.10
@@ -457,5 +457,18 @@
 }
 #endif // ndef(HAVE_FREETYPE2)
 
+FreetypeGlyphsProvider::~FreetypeGlyphsProvider()
+{
+#ifdef HAVE_FREETYPE2 
+	if ( m_face )
+	{
+		if ( FT_Done_Face(m_face) != 0 )
+		{
+			log_error("Could not release FT face resources");
+		}
+	}
+#endif // ndef(HAVE_FREETYPE2)
+}
+
 } // namespace gnash
 

Index: server/FreetypeGlyphsProvider.h
===================================================================
RCS file: /sources/gnash/gnash/server/FreetypeGlyphsProvider.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/FreetypeGlyphsProvider.h	1 Jul 2007 10:54:18 -0000	1.3
+++ server/FreetypeGlyphsProvider.h	10 Aug 2007 21:28:50 -0000	1.4
@@ -88,6 +88,13 @@
 	///
 	static std::auto_ptr<FreetypeGlyphsProvider> createFace(const std::string& name, bool bold, bool italic);
 
+	/// Destructor
+	//
+	/// Release face resources
+	///
+	~FreetypeGlyphsProvider();
+
+
 	/// Return the given character glyph as a shape character definition in 1024 EM coordinates.
 	//
 	///



From MAILER-DAEMON Fri Aug 10 18:53:21 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJdM9-0004bn-5v
	for mharc-gnash-commit@gnu.org; Fri, 10 Aug 2007 18:53:21 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJdM7-0004Xi-7w
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 18:53:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJdM5-0004VB-TS
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 18:53:18 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJdM5-0004Uz-Ot
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 18:53:17 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJdM5-0004ig-Ez
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 18:53:17 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJdM4-0006ua-2o
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 22:53:16 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJdM3-0006uX-Ts
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 22:53:15 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJdM3-0006uX-Ts@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 10 Aug 2007 22:53:15 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog gui/Makefile.am [release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Aug 2007 22:53:19 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/10 22:53:15

Modified files:
	.              : ChangeLog 
	gui            : Makefile.am 

Log message:
	        * gui/Makefile.am: typo preventing gtk/cairo combination from building

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.14&r2=1.3971.2.15
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.102&r2=1.102.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.14
retrieving revision 1.3971.2.15
diff -u -b -r1.3971.2.14 -r1.3971.2.15
--- ChangeLog	10 Aug 2007 21:28:44 -0000	1.3971.2.14
+++ ChangeLog	10 Aug 2007 22:53:14 -0000	1.3971.2.15
@@ -1,5 +1,6 @@
 2007-08-10 Sandro Santilli <strk@keybit.net>
 
+	* gui/Makefile.am: typo preventing gtk/cairo combination from building
 	* server/FreetypeGlyphsProvider.{cpp,h}: add a destructor getting
 	  rid of the resources associated with a face.
 	* configure.ac: FLTK/OGL isn't supported, while SDL/OGL is !

Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.102
retrieving revision 1.102.2.1
diff -u -b -r1.102 -r1.102.2.1
--- gui/Makefile.am	7 Aug 2007 21:01:06 -0000	1.102
+++ gui/Makefile.am	10 Aug 2007 22:53:15 -0000	1.102.2.1
@@ -330,7 +330,7 @@
 gtk_gnash_CPPFLAGS += $(CAIRO_CFLAGS)
 gtk_gnash_SOURCES += gtk_glue_cairo.cpp gtk_glue_cairo.h \
 		gtk.cpp gtksup.h gtk_glue.h
-gtk_gnash_LDADD = $(top_builddir)/backend/libgnashcairo.la
+gtk_gnash_LDADD = $(top_builddir)/backend/libgnashcairo.la \
 		$(GNASH_LIBS) $(GTK_LIBS) $(CAIRO_LIBS)
 endif				# BUILD_CAIRO_RENDERER
 endif				# BUILD_GTK_GUI



From MAILER-DAEMON Fri Aug 10 18:53:26 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJdME-0004kV-BB
	for mharc-gnash-commit@gnu.org; Fri, 10 Aug 2007 18:53:26 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJdMC-0004iA-Ry
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 18:53:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJdMC-0004h3-Cy
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 18:53:24 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJdMB-0004gd-Tt
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 18:53:24 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJdMB-0004jk-Jt
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 18:53:23 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJdMA-0006ur-VP
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 22:53:23 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJdMA-0006uo-R9
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 22:53:22 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJdMA-0006uo-R9@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 10 Aug 2007 22:53:22 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog gui/Makefile.am
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Aug 2007 22:53:25 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/10 22:53:22

Modified files:
	.              : ChangeLog 
	gui            : Makefile.am 

Log message:
	        * gui/Makefile.am: typo preventing gtk/cairo combination from building

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3991&r2=1.3992
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.102&r2=1.103

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3991
retrieving revision 1.3992
diff -u -b -r1.3991 -r1.3992
--- ChangeLog	10 Aug 2007 21:28:50 -0000	1.3991
+++ ChangeLog	10 Aug 2007 22:53:22 -0000	1.3992
@@ -1,5 +1,6 @@
 2007-08-10 Sandro Santilli <strk@keybit.net>
 
+	* gui/Makefile.am: typo preventing gtk/cairo combination from building
 	* server/FreetypeGlyphsProvider.{cpp,h}: add a destructor getting
 	  rid of the resources associated with a face.
 	* configure.ac: FLTK/OGL isn't supported, while SDL/OGL is !

Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- gui/Makefile.am	7 Aug 2007 21:01:06 -0000	1.102
+++ gui/Makefile.am	10 Aug 2007 22:53:22 -0000	1.103
@@ -330,7 +330,7 @@
 gtk_gnash_CPPFLAGS += $(CAIRO_CFLAGS)
 gtk_gnash_SOURCES += gtk_glue_cairo.cpp gtk_glue_cairo.h \
 		gtk.cpp gtksup.h gtk_glue.h
-gtk_gnash_LDADD = $(top_builddir)/backend/libgnashcairo.la
+gtk_gnash_LDADD = $(top_builddir)/backend/libgnashcairo.la \
 		$(GNASH_LIBS) $(GTK_LIBS) $(CAIRO_LIBS)
 endif				# BUILD_CAIRO_RENDERER
 endif				# BUILD_GTK_GUI



From MAILER-DAEMON Fri Aug 10 21:43:48 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJg16-0005zV-N2
	for mharc-gnash-commit@gnu.org; Fri, 10 Aug 2007 21:43:48 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJg15-0005zK-8g
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 21:43:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJg14-0005z1-55
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 21:43:46 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJg14-0005yy-22
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 21:43:46 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJg13-0004nK-OD
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 21:43:45 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJg13-0000va-9p
	for gnash-commit@gnu.org; Sat, 11 Aug 2007 01:43:45 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJg13-0000vU-5j
	for gnash-commit@gnu.org; Sat, 11 Aug 2007 01:43:45 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJg13-0000vU-5j@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 11 Aug 2007 01:43:45 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog configure.ac gui/fltk.cpp
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Aug 2007 01:43:47 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/11 01:43:45

Modified files:
	.              : ChangeLog configure.ac 
	gui            : fltk.cpp 

Log message:
	        * configure.ac: abort if a requested renderer/gui combination
	          isn't supported (checked for gtk/kde/sdl/fb/fltk)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.15&r2=1.3971.2.16
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.396.2.2&r2=1.396.2.3
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/fltk.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.15&r2=1.15.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.15
retrieving revision 1.3971.2.16
diff -u -b -r1.3971.2.15 -r1.3971.2.16
--- ChangeLog	10 Aug 2007 22:53:14 -0000	1.3971.2.15
+++ ChangeLog	11 Aug 2007 01:43:43 -0000	1.3971.2.16
@@ -1,5 +1,10 @@
 2007-08-10 Sandro Santilli <strk@keybit.net>
 
+	* configure.ac: abort if a requested renderer/gui combination
+	  isn't supported (checked for gtk/kde/sdl/fb/fltk)
+
+2007-08-10 Sandro Santilli <strk@keybit.net>
+
 	* gui/Makefile.am: typo preventing gtk/cairo combination from building
 	* server/FreetypeGlyphsProvider.{cpp,h}: add a destructor getting
 	  rid of the resources associated with a face.

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.396.2.2
retrieving revision 1.396.2.3
diff -u -b -r1.396.2.2 -r1.396.2.3
--- configure.ac	10 Aug 2007 19:38:17 -0000	1.396.2.2
+++ configure.ac	11 Aug 2007 01:43:44 -0000	1.396.2.3
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.396.2.2 2007/08/10 19:38:17 strk Exp $
+dnl $Id: configure.ac,v 1.396.2.3 2007/08/11 01:43:44 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, 0.8.1)
@@ -329,9 +329,11 @@
 dnl fi
 
 if test x$build_ogl = xyes; then
-dnl   if test x$build_fb = xyes -o x$build_fltk = xyes; then
-   if test x$build_gtk != xyes -a x$build_sdl != xyes -a x$build_kde != xyes -a x$build_aqua != xyes; then
-     AC_MSG_ERROR([OpenGL renderer needs one of gtk,sdl or kde guis. Try enabling any of them ( --enable-gui=gtk|kde|sdl ) or using AGG ( --enable-renderer=AGG ).]);
+  if test x$build_fb = xyes; then
+    AC_MSG_ERROR([OpenGL renderer is not supported by FB gui. Use --enable-renderer=AGG]);
+  fi
+  if test x$build_fltk = xyes; then
+    AC_MSG_ERROR([OpenGL renderer is not supported by FLTK gui. Use --enable-renderer=AGG]);
    fi
    AC_DEFINE([RENDERER_OPENGL], [], [Use OpenGL renderer])
 fi
@@ -1143,9 +1145,15 @@
 dnl      CAIRO_CFLAGS=`echo ${CAIRO_CFLAGS} | sed -e 's/ *//'`
 dnl      CAIRO_CFLAGS="${CAIRO_CFLAGS} ${CAIRO_CFLAGS}/cairo"
 dnl   fi
-dnl  if test x$build_fb = xyes; then
-dnl   AC_MSG_ERROR([cairo renderer is not supported by fb gui]);
-dnl  fi
+  if test x$build_fb = xyes; then
+    AC_MSG_ERROR([Cairo renderer is not supported by FB gui. Use --enable-renderer=AGG]);
+  fi
+  if test x$build_fltk = xyes; then
+    AC_MSG_ERROR([Cairo renderer is not supported by FLTK gui. Use --enable-renderer=AGG]);
+  fi
+  if test x$build_kde = xyes; then
+    AC_MSG_ERROR([Cairo renderer is not supported by KDE gui. Use --enable-renderer=AGG]);
+  fi
   AC_DEFINE([RENDERER_CAIRO], [], [Use cairo renderer])
 fi
 

Index: gui/fltk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/fltk.cpp,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -b -r1.15 -r1.15.2.1
--- gui/fltk.cpp	1 Jul 2007 10:54:00 -0000	1.15
+++ gui/fltk.cpp	11 Aug 2007 01:43:44 -0000	1.15.2.1
@@ -249,6 +249,9 @@
 #elif defined(RENDERER_CAIRO)
 #error FLTK/Cairo is currently broken. Please try again soon... 
     FltkCairoGlue _glue;
+#elif defined(RENDERER_OPENGL)
+#error FLTK/OpenGL is currently broken. Please try again soon... 
+    FltkCairoGlue _glue;
 #endif
     createMenu();
     end();



From MAILER-DAEMON Fri Aug 10 21:44:20 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJg1c-00068N-0M
	for mharc-gnash-commit@gnu.org; Fri, 10 Aug 2007 21:44:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJg1Z-00066q-Vh
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 21:44:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJg1Z-00066b-Er
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 21:44:17 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJg1Z-00066Y-9H
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 21:44:17 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJg1Y-0004rZ-VS
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 21:44:17 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJg1Y-00014d-GD
	for gnash-commit@gnu.org; Sat, 11 Aug 2007 01:44:16 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJg1Y-00014X-9N
	for gnash-commit@gnu.org; Sat, 11 Aug 2007 01:44:16 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJg1Y-00014X-9N@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 11 Aug 2007 01:44:16 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog configure.ac gui/fltk.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Aug 2007 01:44:18 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/11 01:44:16

Modified files:
	.              : ChangeLog configure.ac 
	gui            : fltk.cpp 

Log message:
	        * configure.ac: abort if a requested renderer/gui combination
	          isn't supported (checked for gtk/kde/sdl/fb/fltk)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3992&r2=1.3993
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.398&r2=1.399
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/fltk.cpp?cvsroot=gnash&r1=1.15&r2=1.16

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3992
retrieving revision 1.3993
diff -u -b -r1.3992 -r1.3993
--- ChangeLog	10 Aug 2007 22:53:22 -0000	1.3992
+++ ChangeLog	11 Aug 2007 01:44:15 -0000	1.3993
@@ -1,5 +1,10 @@
 2007-08-10 Sandro Santilli <strk@keybit.net>
 
+	* configure.ac: abort if a requested renderer/gui combination
+	  isn't supported (checked for gtk/kde/sdl/fb/fltk)
+
+2007-08-10 Sandro Santilli <strk@keybit.net>
+
 	* gui/Makefile.am: typo preventing gtk/cairo combination from building
 	* server/FreetypeGlyphsProvider.{cpp,h}: add a destructor getting
 	  rid of the resources associated with a face.

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.398
retrieving revision 1.399
diff -u -b -r1.398 -r1.399
--- configure.ac	10 Aug 2007 19:38:26 -0000	1.398
+++ configure.ac	11 Aug 2007 01:44:15 -0000	1.399
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.398 2007/08/10 19:38:26 strk Exp $
+dnl $Id: configure.ac,v 1.399 2007/08/11 01:44:15 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -329,9 +329,11 @@
 dnl fi
 
 if test x$build_ogl = xyes; then
-dnl   if test x$build_fb = xyes -o x$build_fltk = xyes; then
-   if test x$build_gtk != xyes -a x$build_sdl != xyes -a x$build_kde != xyes -a x$build_aqua != xyes; then
-     AC_MSG_ERROR([OpenGL renderer needs one of gtk,sdl or kde guis. Try enabling any of them ( --enable-gui=gtk|kde|sdl ) or using AGG ( --enable-renderer=AGG ).]);
+  if test x$build_fb = xyes; then
+    AC_MSG_ERROR([OpenGL renderer is not supported by FB gui. Use --enable-renderer=AGG]);
+  fi
+  if test x$build_fltk = xyes; then
+    AC_MSG_ERROR([OpenGL renderer is not supported by FLTK gui. Use --enable-renderer=AGG]);
    fi
    AC_DEFINE([RENDERER_OPENGL], [], [Use OpenGL renderer])
 fi
@@ -1145,9 +1147,15 @@
 dnl      CAIRO_CFLAGS=`echo ${CAIRO_CFLAGS} | sed -e 's/ *//'`
 dnl      CAIRO_CFLAGS="${CAIRO_CFLAGS} ${CAIRO_CFLAGS}/cairo"
 dnl   fi
-dnl  if test x$build_fb = xyes; then
-dnl   AC_MSG_ERROR([cairo renderer is not supported by fb gui]);
-dnl  fi
+  if test x$build_fb = xyes; then
+    AC_MSG_ERROR([Cairo renderer is not supported by FB gui. Use --enable-renderer=AGG]);
+  fi
+  if test x$build_fltk = xyes; then
+    AC_MSG_ERROR([Cairo renderer is not supported by FLTK gui. Use --enable-renderer=AGG]);
+  fi
+  if test x$build_kde = xyes; then
+    AC_MSG_ERROR([Cairo renderer is not supported by KDE gui. Use --enable-renderer=AGG]);
+  fi
   AC_DEFINE([RENDERER_CAIRO], [], [Use cairo renderer])
 fi
 

Index: gui/fltk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/fltk.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- gui/fltk.cpp	1 Jul 2007 10:54:00 -0000	1.15
+++ gui/fltk.cpp	11 Aug 2007 01:44:15 -0000	1.16
@@ -249,6 +249,9 @@
 #elif defined(RENDERER_CAIRO)
 #error FLTK/Cairo is currently broken. Please try again soon... 
     FltkCairoGlue _glue;
+#elif defined(RENDERER_OPENGL)
+#error FLTK/OpenGL is currently broken. Please try again soon... 
+    FltkCairoGlue _glue;
 #endif
     createMenu();
     end();



From MAILER-DAEMON Fri Aug 10 23:12:11 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJhOd-0007Di-LV
	for mharc-gnash-commit@gnu.org; Fri, 10 Aug 2007 23:12:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJhOc-0007DL-DA
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 23:12:10 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJhOb-0007Cj-FM
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 23:12:10 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJhOb-0007Cf-Cv
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 23:12:09 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJhOb-0007vp-4c
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 23:12:09 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJhOZ-0006YM-Lp
	for gnash-commit@gnu.org; Sat, 11 Aug 2007 03:12:07 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJhOZ-0006YG-Hk
	for gnash-commit@gnu.org; Sat, 11 Aug 2007 03:12:07 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJhOZ-0006YG-Hk@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 11 Aug 2007 03:12:07 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog gui/Makefile.am
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Aug 2007 03:12:10 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/11 03:12:07

Modified files:
	.              : ChangeLog 
	gui            : Makefile.am 

Log message:
	        * gui/Makefile.am: fix build of sdl/cairo

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3993&r2=1.3994
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.103&r2=1.104

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3993
retrieving revision 1.3994
diff -u -b -r1.3993 -r1.3994
--- ChangeLog	11 Aug 2007 01:44:15 -0000	1.3993
+++ ChangeLog	11 Aug 2007 03:12:06 -0000	1.3994
@@ -1,5 +1,6 @@
 2007-08-10 Sandro Santilli <strk@keybit.net>
 
+	* gui/Makefile.am: fix build of sdl/cairo
 	* configure.ac: abort if a requested renderer/gui combination
 	  isn't supported (checked for gtk/kde/sdl/fb/fltk)
 

Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -b -r1.103 -r1.104
--- gui/Makefile.am	10 Aug 2007 22:53:22 -0000	1.103
+++ gui/Makefile.am	11 Aug 2007 03:12:07 -0000	1.104
@@ -219,26 +219,34 @@
 bin_PROGRAMS += sdl-gnash
 sdl_gnash_CPPFLAGS = -DGUI_SDL -DGUI_CONFIG=\"SDL\" \
 	 $(AM_CPPFLAGS) $(SDL_CFLAGS) 
-sdl_gnash_SOURCES = $(GUI_SRCS) gui_sdl.cpp
+sdl_gnash_SOURCES = $(GUI_SRCS) gui_sdl.cpp sdl.cpp sdlsup.h sdl_glue.h
 sdl_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic 
 #sdl_gnash_DEPENDENCIES = .configline
 sdl_gnash_LDADD = \
 	$(MYSQL_LIBS) \
 	$(GNASH_LIBS) \
-	$(AM_LDFLAGS)
+	$(AM_LDFLAGS) \
+	$(SDL_LIBS)
+
 if BUILD_OGL_RENDERER
 sdl_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
 sdl_gnash_LDADD += $(top_builddir)/backend/libgnashogl.la \
-	$(SDL_LIBS) $(OPENGL_LIBS)
-sdl_gnash_SOURCES += sdl_ogl_glue.cpp sdl_ogl_glue.h \
-	 	sdl.cpp sdlsup.h sdl_glue.h
+	$(OPENGL_LIBS)
+sdl_gnash_SOURCES += sdl_ogl_glue.cpp sdl_ogl_glue.h 
 endif
+
 if BUILD_AGG_RENDERER
 sdl_gnash_CPPFLAGS += $(AGG_CFLAGS)
 sdl_gnash_LDADD += $(top_builddir)/backend/libgnashagg.la \
-	$(SDL_LIBS) $(AGG_LIBS)
-sdl_gnash_SOURCES += sdl_agg_glue.cpp sdl_agg_glue.h \
-	 	sdl.cpp sdlsup.h sdl_glue.h
+	$(AGG_LIBS)
+sdl_gnash_SOURCES += sdl_agg_glue.cpp sdl_agg_glue.h 
+endif
+
+if BUILD_CAIRO_RENDERER
+sdl_gnash_CPPFLAGS += $(CAIRO_CFLAGS)
+sdl_gnash_LDADD += $(top_builddir)/backend/libgnashcairo.la \
+	$(CAIRO_LIBS) 
+sdl_gnash_SOURCES += sdl_cairo_glue.cpp sdl_cairo_glue.h 
 endif
 endif
 



From MAILER-DAEMON Fri Aug 10 23:12:17 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJhOj-0007G5-RS
	for mharc-gnash-commit@gnu.org; Fri, 10 Aug 2007 23:12:17 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJhOj-0007G0-4n
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 23:12:17 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJhOi-0007Fo-Kw
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 23:12:16 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJhOi-0007Fl-Fz
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 23:12:16 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJhOi-0007xP-8t
	for gnash-commit@gnu.org; Fri, 10 Aug 2007 23:12:16 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJhOh-0006am-Ki
	for gnash-commit@gnu.org; Sat, 11 Aug 2007 03:12:15 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJhOh-0006ah-HN
	for gnash-commit@gnu.org; Sat, 11 Aug 2007 03:12:15 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJhOh-0006ah-HN@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 11 Aug 2007 03:12:15 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog gui/Makefile.am [release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Aug 2007 03:12:17 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/11 03:12:15

Modified files:
	.              : ChangeLog 
	gui            : Makefile.am 

Log message:
	        * gui/Makefile.am: fix build of sdl/cairo

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.16&r2=1.3971.2.17
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.102.2.1&r2=1.102.2.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.16
retrieving revision 1.3971.2.17
diff -u -b -r1.3971.2.16 -r1.3971.2.17
--- ChangeLog	11 Aug 2007 01:43:43 -0000	1.3971.2.16
+++ ChangeLog	11 Aug 2007 03:12:14 -0000	1.3971.2.17
@@ -1,5 +1,6 @@
 2007-08-10 Sandro Santilli <strk@keybit.net>
 
+	* gui/Makefile.am: fix build of sdl/cairo
 	* configure.ac: abort if a requested renderer/gui combination
 	  isn't supported (checked for gtk/kde/sdl/fb/fltk)
 

Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.102.2.1
retrieving revision 1.102.2.2
diff -u -b -r1.102.2.1 -r1.102.2.2
--- gui/Makefile.am	10 Aug 2007 22:53:15 -0000	1.102.2.1
+++ gui/Makefile.am	11 Aug 2007 03:12:15 -0000	1.102.2.2
@@ -219,26 +219,34 @@
 bin_PROGRAMS += sdl-gnash
 sdl_gnash_CPPFLAGS = -DGUI_SDL -DGUI_CONFIG=\"SDL\" \
 	 $(AM_CPPFLAGS) $(SDL_CFLAGS) 
-sdl_gnash_SOURCES = $(GUI_SRCS) gui_sdl.cpp
+sdl_gnash_SOURCES = $(GUI_SRCS) gui_sdl.cpp sdl.cpp sdlsup.h sdl_glue.h
 sdl_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic 
 #sdl_gnash_DEPENDENCIES = .configline
 sdl_gnash_LDADD = \
 	$(MYSQL_LIBS) \
 	$(GNASH_LIBS) \
-	$(AM_LDFLAGS)
+	$(AM_LDFLAGS) \
+	$(SDL_LIBS)
+
 if BUILD_OGL_RENDERER
 sdl_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
 sdl_gnash_LDADD += $(top_builddir)/backend/libgnashogl.la \
-	$(SDL_LIBS) $(OPENGL_LIBS)
-sdl_gnash_SOURCES += sdl_ogl_glue.cpp sdl_ogl_glue.h \
-	 	sdl.cpp sdlsup.h sdl_glue.h
+	$(OPENGL_LIBS)
+sdl_gnash_SOURCES += sdl_ogl_glue.cpp sdl_ogl_glue.h 
 endif
+
 if BUILD_AGG_RENDERER
 sdl_gnash_CPPFLAGS += $(AGG_CFLAGS)
 sdl_gnash_LDADD += $(top_builddir)/backend/libgnashagg.la \
-	$(SDL_LIBS) $(AGG_LIBS)
-sdl_gnash_SOURCES += sdl_agg_glue.cpp sdl_agg_glue.h \
-	 	sdl.cpp sdlsup.h sdl_glue.h
+	$(AGG_LIBS)
+sdl_gnash_SOURCES += sdl_agg_glue.cpp sdl_agg_glue.h 
+endif
+
+if BUILD_CAIRO_RENDERER
+sdl_gnash_CPPFLAGS += $(CAIRO_CFLAGS)
+sdl_gnash_LDADD += $(top_builddir)/backend/libgnashcairo.la \
+	$(CAIRO_LIBS) 
+sdl_gnash_SOURCES += sdl_cairo_glue.cpp sdl_cairo_glue.h 
 endif
 endif
 



From MAILER-DAEMON Sat Aug 11 01:06:58 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJjBh-0000z5-FF
	for mharc-gnash-commit@gnu.org; Sat, 11 Aug 2007 01:06:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJjBe-0000vx-AD
	for gnash-commit@gnu.org; Sat, 11 Aug 2007 01:06:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJjBd-0000uT-C4
	for gnash-commit@gnu.org; Sat, 11 Aug 2007 01:06:53 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJjBc-0000u7-Ur
	for gnash-commit@gnu.org; Sat, 11 Aug 2007 01:06:53 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJjBc-0007Eq-HV
	for gnash-commit@gnu.org; Sat, 11 Aug 2007 01:06:52 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJjBb-0003dX-UZ
	for gnash-commit@gnu.org; Sat, 11 Aug 2007 05:06:52 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJjBb-0003dU-OK
	for gnash-commit@gnu.org; Sat, 11 Aug 2007 05:06:51 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJjBb-0003dU-OK@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 11 Aug 2007 05:06:51 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/shape.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Aug 2007 05:06:54 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/11 05:06:51

Modified files:
	.              : ChangeLog 
	server         : shape.cpp 

Log message:
	        * server/shape.cpp: remove useless include of hash_wrapper.h

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3994&r2=1.3995
http://cvs.savannah.gnu.org/viewcvs/gnash/server/shape.cpp?cvsroot=gnash&r1=1.37&r2=1.38

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3994
retrieving revision 1.3995
diff -u -b -r1.3994 -r1.3995
--- ChangeLog	11 Aug 2007 03:12:06 -0000	1.3994
+++ ChangeLog	11 Aug 2007 05:06:51 -0000	1.3995
@@ -1,5 +1,6 @@
 2007-08-10 Sandro Santilli <strk@keybit.net>
 
+	* server/shape.cpp: remove useless include of hash_wrapper.h
 	* gui/Makefile.am: fix build of sdl/cairo
 	* configure.ac: abort if a requested renderer/gui combination
 	  isn't supported (checked for gtk/kde/sdl/fb/fltk)

Index: server/shape.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/shape.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- server/shape.cpp	1 Jul 2007 10:54:24 -0000	1.37
+++ server/shape.cpp	11 Aug 2007 05:06:51 -0000	1.38
@@ -23,9 +23,6 @@
 #include "tu_file.h"
 #include "tesselate.h"
 
-#include "hash_wrapper.h"
-#include "tu_file.h"
-
 #include <cfloat>
 #include <map>
 
@@ -618,7 +615,6 @@
 
 	// strips-in-progress.
 	typedef std::map<int, tri_stripper*> StripsMap;
-	//typedef hash_wrapper<int, tri_stripper*> StripsMap; 
 	StripsMap m_strips;
 
 	collect_traps(mesh_set* set) : m(set) {}



From MAILER-DAEMON Sat Aug 11 01:25:09 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IJjTJ-0007I4-5W
	for mharc-gnash-commit@gnu.org; Sat, 11 Aug 2007 01:25:09 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IJjTH-0007GR-FL
	for gnash-commit@gnu.org; Sat, 11 Aug 2007 01:25:07 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IJjTG-0007FJ-CG
	for gnash-commit@gnu.org; Sat, 11 Aug 2007 01:25:06 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IJjTG-0007FC-60
	for gnash-commit@gnu.org; Sat, 11 Aug 2007 01:25:06 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IJjTF-0001Mb-US
	for gnash-commit@gnu.org; Sat, 11 Aug 2007 01:25:06 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IJjTF-0005HV-8K
	for gnash-commit@gnu.org; Sat, 11 Aug 2007 05:25:05 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IJjTF-0005HS-1R
	for gnash-commit@gnu.org; Sat, 11 Aug 2007 05:25:05 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IJjTF-0005HS-1R@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 11 Aug 2007 05:25:05 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog backend/sound_handler_sdl.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Aug 2007 05:25:07 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/11 05:25:04

Modified files:
	.              : ChangeLog 
	backend        : sound_handler_sdl.cpp 

Log message:
	* backend/sound_handler_sdl.cpp: fix build for MAD media handler.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3995&r2=1.3996
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_sdl.cpp?cvsroot=gnash&r1=1.80&r2=1.81

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3995
retrieving revision 1.3996
diff -u -b -r1.3995 -r1.3996
--- ChangeLog	11 Aug 2007 05:06:51 -0000	1.3995
+++ ChangeLog	11 Aug 2007 05:25:04 -0000	1.3996
@@ -1,5 +1,6 @@
 2007-08-10 Sandro Santilli <strk@keybit.net>
 
+	* backend/sound_handler_sdl.cpp: fix build for MAD media handler.
 	* server/shape.cpp: remove useless include of hash_wrapper.h
 	* gui/Makefile.am: fix build of sdl/cairo
 	* configure.ac: abort if a requested renderer/gui combination

Index: backend/sound_handler_sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_sdl.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- backend/sound_handler_sdl.cpp	10 Aug 2007 10:24:11 -0000	1.80
+++ backend/sound_handler_sdl.cpp	11 Aug 2007 05:25:04 -0000	1.81
@@ -18,7 +18,7 @@
 // Based on sound_handler_sdl.cpp by Thatcher Ulrich http://tulrich.com 2003
 // which has been donated to the Public Domain.
 
-// $Id: sound_handler_sdl.cpp,v 1.80 2007/08/10 10:24:11 tgc Exp $
+// $Id: sound_handler_sdl.cpp,v 1.81 2007/08/11 05:25:04 strk Exp $
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -907,7 +907,7 @@
 
 					mad_synth_frame (&sound->synth, &sound->frame);
 					
-					outsize = sound->synth.pcm.length * ((soundStereo() == true) ? 4 : 2);
+					outsize = sound->synth.pcm.length * ((soundStereo == true) ? 4 : 2);
 
 					tmp_raw_buffer = new Uint8[outsize];
 					int sample;
@@ -918,7 +918,7 @@
 					// scaling while we're at it.
 					for(int f = 0; f < sound->synth.pcm.length; f++)
 					{
-						for (int e = 0; e < ((soundStereo() == true) ? 2 : 1); e++){ // channels (stereo/mono)
+						for (int e = 0; e < ((soundStereo == true) ? 2 : 1); e++){ // channels (stereo/mono)
 
 							mad_fixed_t mad_sample = sound->synth.pcm.samples[e][f];
 
@@ -937,7 +937,7 @@
 							*dst++ = sample;
 						}
 					}
-#endif
+#endif // defined(USE_MAD)
 
 					// If we need to convert samplerate or/and from mono to stereo...
 					if (outsize > 0 && (static_cast<int>(soundSampleRate) != handler->audioSpec.freq || !soundStereo)) {



From MAILER-DAEMON Sun Aug 12 19:39:06 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IKN1W-0003TF-8s
	for mharc-gnash-commit@gnu.org; Sun, 12 Aug 2007 19:39:06 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IKN1V-0003SI-8A
	for gnash-commit@gnu.org; Sun, 12 Aug 2007 19:39:05 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IKN1U-0003Rn-48
	for gnash-commit@gnu.org; Sun, 12 Aug 2007 19:39:04 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IKN1T-0003Rk-VQ
	for gnash-commit@gnu.org; Sun, 12 Aug 2007 19:39:04 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IKN1T-0006EL-LI
	for gnash-commit@gnu.org; Sun, 12 Aug 2007 19:39:03 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IKN1M-0007kv-Iv
	for gnash-commit@gnu.org; Sun, 12 Aug 2007 23:38:56 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IKN1M-0007ks-FC
	for gnash-commit@gnu.org; Sun, 12 Aug 2007 23:38:56 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IKN1M-0007ks-FC@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sun, 12 Aug 2007 23:38:56 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/edit_text_character.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 12 Aug 2007 23:39:05 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/12 23:38:56

Modified files:
	.              : ChangeLog 
	server         : edit_text_character.h 

Log message:
	        * server/edit_text_character.h (getBounds): add TODO item
	          (I belive is a fix for bug #20760)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3996&r2=1.3997
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.h?cvsroot=gnash&r1=1.42&r2=1.43

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3996
retrieving revision 1.3997
diff -u -b -r1.3996 -r1.3997
--- ChangeLog	11 Aug 2007 05:25:04 -0000	1.3996
+++ ChangeLog	12 Aug 2007 23:38:55 -0000	1.3997
@@ -1,3 +1,8 @@
+2007-08-12 Sandro Santilli <strk@keybit.net>
+
+	* server/edit_text_character.h (getBounds): add TODO item
+	  (I belive is a fix for bug #20760)
+
 2007-08-10 Sandro Santilli <strk@keybit.net>
 
 	* backend/sound_handler_sdl.cpp: fix build for MAD media handler.

Index: server/edit_text_character.h
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- server/edit_text_character.h	24 Jul 2007 19:43:30 -0000	1.42
+++ server/edit_text_character.h	12 Aug 2007 23:38:56 -0000	1.43
@@ -96,6 +96,10 @@
 
 	geometry::Range2d<float> getBounds() const
 	{
+		// TODO: keep an instance member for encoding
+		//       the bounding box, as it might be 
+		//       dynamically updated if the textfield
+		//       is editable and auto-resizes.
 		return m_def->get_bounds().getRange();
 	}
 



From MAILER-DAEMON Sun Aug 12 22:48:02 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IKPyM-0004LX-GB
	for mharc-gnash-commit@gnu.org; Sun, 12 Aug 2007 22:48:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IKPyK-0004Hi-SM
	for gnash-commit@gnu.org; Sun, 12 Aug 2007 22:48:00 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IKPyK-0004Fe-3x
	for gnash-commit@gnu.org; Sun, 12 Aug 2007 22:48:00 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IKPyJ-0004FM-R3
	for gnash-commit@gnu.org; Sun, 12 Aug 2007 22:47:59 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IKPyJ-0008VO-FI
	for gnash-commit@gnu.org; Sun, 12 Aug 2007 22:47:59 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IKPyJ-0003ap-0R
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 02:47:59 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IKPyI-0003am-RN
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 02:47:58 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IKPyI-0003am-RN@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 13 Aug 2007 02:47:58 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/as_value.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Aug 2007 02:48:01 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/13 02:47:58

Modified files:
	.              : ChangeLog 
	server         : as_value.h 

Log message:
	        * server/as_value.h: add is_bool()

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3997&r2=1.3998
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.h?cvsroot=gnash&r1=1.62&r2=1.63

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3997
retrieving revision 1.3998
diff -u -b -r1.3997 -r1.3998
--- ChangeLog	12 Aug 2007 23:38:55 -0000	1.3997
+++ ChangeLog	13 Aug 2007 02:47:57 -0000	1.3998
@@ -1,5 +1,6 @@
 2007-08-12 Sandro Santilli <strk@keybit.net>
 
+	* server/as_value.h: add is_bool()
 	* server/edit_text_character.h (getBounds): add TODO item
 	  (I belive is a fix for bug #20760)
 

Index: server/as_value.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.h,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- server/as_value.h	6 Aug 2007 20:42:57 -0000	1.62
+++ server/as_value.h	13 Aug 2007 02:47:58 -0000	1.63
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: as_value.h,v 1.62 2007/08/06 20:42:57 strk Exp $ */
+/* $Id: as_value.h,v 1.63 2007/08/13 02:47:58 strk Exp $ */
 
 #ifndef GNASH_AS_VALUE_H
 #define GNASH_AS_VALUE_H
@@ -532,6 +532,8 @@
 
 	bool	is_null() const { return (m_type == NULLTYPE); }
 
+	bool	is_bool() const { return (m_type == BOOLEAN); }
+
 	/// Return true if this value is strictly equal to the given one
 	//
 	/// Strict equality is defined as the two values being of the



From MAILER-DAEMON Sun Aug 12 22:53:15 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IKQ3P-0001M8-GY
	for mharc-gnash-commit@gnu.org; Sun, 12 Aug 2007 22:53:15 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IKQ3N-0001KH-So
	for gnash-commit@gnu.org; Sun, 12 Aug 2007 22:53:13 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IKQ3M-0001Ih-Cr
	for gnash-commit@gnu.org; Sun, 12 Aug 2007 22:53:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IKQ3M-0001Ib-9U
	for gnash-commit@gnu.org; Sun, 12 Aug 2007 22:53:12 -0400
Received: from wa-out-1112.google.com ([209.85.146.177])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1IKQ3L-0000yJ-82
	for gnash-commit@gnu.org; Sun, 12 Aug 2007 22:53:12 -0400
Received: by wa-out-1112.google.com with SMTP id k34so1626528wah
	for <gnash-commit@gnu.org>; Sun, 12 Aug 2007 19:53:09 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=bh+FFNy/9Z/Paa5VhNt0rsnyUUCk+wTDRjN7Rb/RuFbCE46Vo3z/0QSl3ozyGs1gf8Hl7hPFep4JAbhapQ28uYFwU4n99SSCqTPznNG1qf1yyuuXSv/PdvWCa9DFhGh9xLuu7FYnHw9jCDYTssXEdBJHZmZr38EkR3xadlOGMsc=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=cy2+yHxIQsyi1xDEZPSs9UGmwKdwjQDMYfLlfYgnt+xRldX3Xwlyf2mpL8MNyToGE+I4BXdxi/2Jqeo3d5FCesL1qkrC/fw0cOpsw1ieMEHvXnJs49O8ryZQLR8BHzDz1H7ZlHum19Uyanql6Yqhvx4akHky05AOFNfn+MIqNcU=
Received: by 10.115.32.1 with SMTP id k1mr4805994waj.1186973587774;
	Sun, 12 Aug 2007 19:53:07 -0700 (PDT)
Received: by 10.114.110.5 with HTTP; Sun, 12 Aug 2007 19:53:07 -0700 (PDT)
Message-ID: <ca4b43ff0708121953v3fae59b5yeeec12765a75b807@mail.gmail.com>
Date: Mon, 13 Aug 2007 10:53:07 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: meteoryte@yahoo.com.au
Subject: Re: [Gnash-commit] gnash ChangeLog server/array.cpp server/array.h...
In-Reply-To: <E1IF8KT-0005di-RS@cvs.savannah.gnu.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1IF8KT-0005di-RS@cvs.savannah.gnu.org>
X-Detected-Kernel: Linux 2.6 (newer, 2)
Cc: gnash-commit@gnu.org, Sandro Santilli <strk@keybit.net>
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Aug 2007 02:53:14 -0000

>+       unsigned int optnum = props->size();
>+       as_cmp_fn cmp[optnum];
>+       as_cmp_fn eq[optnum];

>+       uint8_t flgs[optnum];

A question, is it good practice to rely on VLA(variable length array)?
 Note that even VC8 compiler does not support this feature.

I guess we should not rely on it, which is compiler dependent(based on
google search) and only occurs in array.cpp.  What about replace it
with some STL containers?



On 7/29/07, Sandro Santilli <strk@keybit.net> wrote:
> CVSROOT:        /sources/gnash
> Module name:    gnash
> Changes by:     Sandro Santilli <strk>  07/07/29 12:57:01
>
> Modified files:
>        .              : ChangeLog
>        server         : array.cpp array.h
>        testsuite/actionscript.all: array.as
>
> Log message:
>        Patch #6124 by meteoryte@yahoo.com.au:
>
>                * server/array.{cpp,h}: implement remaining array.sort(..) functionality
>                  (flags UNIQUE and RETURNINDEXEDARRAY) all of array.sortOn(...)
>                * testsuite/actionscript.all/array.as: test for Array.sort and
>                  Array.sortOn
>
> CVSWeb URLs:
> http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3858&r2=1.3859
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/array.cpp?cvsroot=gnash&r1=1.66&r2=1.67
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/array.h?cvsroot=gnash&r1=1.30&r2=1.31
> http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/array.as?cvsroot=gnash&r1=1.21&r2=1.22
>
> Patches:
> Index: ChangeLog
> ===================================================================
> RCS file: /sources/gnash/gnash/ChangeLog,v
> retrieving revision 1.3858
> retrieving revision 1.3859
> diff -u -b -r1.3858 -r1.3859
> --- ChangeLog   29 Jul 2007 12:45:24 -0000      1.3858
> +++ ChangeLog   29 Jul 2007 12:57:00 -0000      1.3859
> @@ -1,5 +1,12 @@
>  2007-07-29 <meteoryte@yahoo.com.au>
>
> +       * server/array.{cpp,h}: implement remaining array.sort(..) functionality
> +         (flags UNIQUE and RETURNINDEXEDARRAY) all of array.sortOn(...)
> +       * testsuite/actionscript.all/array.as: test for Array.sort and
> +         Array.sortOn
> +
> +2007-07-29 <meteoryte@yahoo.com.au>
> +
>        * server/array.cpp: Fix bug in the array.splice(index) method to
>          prevent an incorrect number of elements being spliced; fix bug
>          in the array.slice(startindex, endindex) method for certain
>
> Index: server/array.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/server/array.cpp,v
> retrieving revision 1.66
> retrieving revision 1.67
> diff -u -b -r1.66 -r1.67
> --- server/array.cpp    29 Jul 2007 12:45:25 -0000      1.66
> +++ server/array.cpp    29 Jul 2007 12:57:01 -0000      1.67
> @@ -29,6 +29,7 @@
>  #include "fn_call.h"
>  #include "GnashException.h"
>  #include "action.h" // for call_method
> +#include "VM.h" // for PROPNAME macro to work
>
>  #include <string>
>  #include <algorithm>
> @@ -40,91 +41,239 @@
>
>  namespace gnash {
>
> +typedef bool (* as_cmp_fn) (const as_value&, const as_value&);
> +
>  static as_object* getArrayInterface();
>  static void attachArrayProperties(as_object& proto);
>  static void attachArrayInterface(as_object& proto);
>
> -// Default as_value strict weak comparator (string based)
> -class AsValueLessThen
> +inline static bool int_lt_or_eq (int a)
> +{
> +       return a <= 0;
> +}
> +
> +inline static bool int_gt (int a)
> +{
> +       return a > 0;
> +}
> +
> +// simple as_value strict-weak-ordering comparison functions:
> +inline static bool
> +as_value_lt (const as_value& a, const as_value& b)
>  {
> -public:
> -       bool operator() (const as_value& a, const as_value& b)
> -       {
>                return a.to_string().compare(b.to_string()) < 0;
> -       }
> -};
> +}
>
> -// Default descending as_value strict weak comparator (string based)
> -class AsValueLessThenDesc
> +inline static bool
> +as_value_gt (const as_value& a, const as_value& b)
>  {
> -public:
> -       bool operator() (const as_value& a, const as_value& b)
> -       {
>                return a.to_string().compare(b.to_string()) > 0;
> -       }
> -};
> +}
>
> -// Case-insensitive as_value strict weak comparator (string)
> -class AsValueLessThenNoCase
> +inline static bool
> +as_value_eq (const as_value& a, const as_value& b)
> +{
> +       return a.to_string().compare(b.to_string()) == 0;
> +}
> +
> +inline static int
> +as_value_StrNoCaseCmp (const as_value& a, const as_value& b)
>  {
> -public:
> -       bool operator() (const as_value& a, const as_value& b)
> -       {
>                using namespace boost::algorithm;
>
>                std::string strA = to_upper_copy(a.to_string());
>                std::string strB = to_upper_copy(b.to_string());
>
> -               return strA.compare(strB) < 0;
> -       }
> -};
> +       return strA.compare(strB);
> +}
>
> -// Descending Case-insensitive as_value strict weak comparator (string)
> -class AsValueLessThenDescNoCase
> +inline static bool
> +as_value_nocase_lt (const as_value& a, const as_value& b)
>  {
> -public:
> -       bool operator() (const as_value& a, const as_value& b)
> -       {
> -               using namespace boost::algorithm;
> +       return as_value_StrNoCaseCmp(a, b) < 0;
> +}
>
> -               std::string strA = to_upper_copy(a.to_string());
> -               std::string strB = to_upper_copy(b.to_string());
> +inline static bool
> +as_value_nocase_gt (const as_value& a, const as_value& b)
> +{
> +       return as_value_StrNoCaseCmp(a, b) > 0;
> +}
>
> -               return strA.compare(strB) > 0;
> -       }
> -};
> +inline static bool
> +as_value_nocase_eq (const as_value& a, const as_value& b)
> +{
> +       return as_value_StrNoCaseCmp(a, b) == 0;
> +}
>
> -// Numeric as_value strict weak comparator
> -class AsValueLessThenNumeric
> +inline static bool
> +as_value_numLT (const as_value& a, const as_value& b)
>  {
> -public:
> -       bool operator() (const as_value& a, const as_value& b)
> +       if (a.is_undefined()) return false;
> +       if (b.is_undefined()) return true;
> +       if (a.is_null()) return false;
> +       if (b.is_null()) return true;
> +       double aval = a.to_number();
> +       double bval = b.to_number();
> +       if (isnan(aval)) return false;
> +       if (isnan(bval)) return true;
> +       return aval < bval;
> +}
> +
> +inline static bool
> +as_value_numGT (const as_value& a, const as_value& b)
> +{
> +       if (b.is_undefined()) return false;
> +       if (a.is_undefined()) return true;
> +       if (b.is_null()) return false;
> +       if (a.is_null()) return true;
> +       double aval = a.to_number();
> +       double bval = b.to_number();
> +       if (isnan(bval)) return false;
> +       if (isnan(aval)) return true;
> +       return aval > bval;
> +}
> +
> +inline static bool
> +as_value_numEQ (const as_value& a, const as_value& b)
> +{
> +       if (a.is_undefined() && b.is_undefined()) return true;
> +       if (a.is_null() && b.is_null()) return true;
> +       double aval = a.to_number();
> +       double bval = b.to_number();
> +       if (isnan(aval) && isnan(bval)) return true;
> +       return aval == bval;
> +}
> +
> +inline static bool
> +as_value_num_lt (const as_value& a, const as_value& b)
> +{
> +       if (a.is_string() || b.is_string())
> +               return as_value_lt(a, b);
> +       return as_value_numLT(a, b);
> +}
> +
> +inline static bool
> +as_value_num_gt (const as_value& a, const as_value& b)
> +{
> +       if (a.is_string() || b.is_string())
> +               return as_value_gt(a, b);
> +       return as_value_numGT(a, b);
> +}
> +
> +inline static bool
> +as_value_num_eq (const as_value& a, const as_value& b)
> +{
> +       if (a.is_string() || b.is_string())
> +               return as_value_eq(a, b);
> +       return as_value_numEQ(a, b);
> +}
> +
> +inline static bool
> +as_value_num_nocase_lt (const as_value& a, const as_value& b)
> +{
> +       if (a.is_string() || b.is_string())
> +               return as_value_nocase_lt(a, b);
> +       return as_value_numLT(a, b);
> +}
> +
> +inline static bool
> +as_value_num_nocase_gt (const as_value& a, const as_value& b)
> +{
> +       if (a.is_string() || b.is_string())
> +               return as_value_nocase_gt(a, b);
> +       return as_value_numGT(a, b);
> +}
> +
> +inline static bool
> +as_value_num_nocase_eq (const as_value& a, const as_value& b)
> +{
> +       if (a.is_string() || b.is_string())
> +               return as_value_nocase_eq(a, b);
> +       return as_value_numEQ(a, b);
> +}
> +
> +// Return basic as_value comparison function for corresponding sort flag
> +// Note:
> +// fUniqueSort and fReturnIndexedArray must first be stripped from the flag
> +static as_cmp_fn
> +get_basic_cmp(uint8_t flags)
> +{
> +       switch ( flags )
>        {
> -               return ( a.to_number() < b.to_number() );
> +               case 0:
> +                       return &as_value_lt;
> +
> +               case as_array_object::fDescending:
> +                       return &as_value_gt;
> +
> +               case as_array_object::fCaseInsensitive:
> +                       return &as_value_nocase_lt;
> +
> +               case as_array_object::fCaseInsensitive |
> +                               as_array_object::fDescending:
> +                       return &as_value_nocase_gt;
> +
> +               case as_array_object::fNumeric:
> +                       return &as_value_num_lt;
> +
> +               case as_array_object::fNumeric | as_array_object::fDescending:
> +                       return &as_value_num_gt;
> +
> +               case as_array_object::fCaseInsensitive |
> +                               as_array_object::fNumeric:
> +                       return &as_value_num_nocase_lt;
> +
> +               case as_array_object::fCaseInsensitive |
> +                               as_array_object::fNumeric |
> +                               as_array_object::fDescending:
> +                       return &as_value_num_nocase_gt;
> +
> +               default:
> +                       log_error(_("Unhandled sort flags: %d (0x%X)"), flags, flags);
> +                       return &as_value_lt;
>        }
> -};
> +}
>
> -// Descending Numeric as_value strict weak comparator
> -class AsValueLessThenDescNumeric
> +// Return basic as_value equality function for corresponding sort flag
> +// Note:
> +// fUniqueSort and fReturnIndexedArray must first be stripped from the flag
> +static as_cmp_fn
> +get_basic_eq(uint8_t flags)
>  {
> -public:
> -       bool operator() (const as_value& a, const as_value& b)
> +       flags &= ~(as_array_object::fDescending);
> +       switch ( flags )
>        {
> -               return ( a.to_number() > b.to_number() );
> -       }
> -};
> +               case 0: // default string comparison
> +                       return &as_value_eq;
> +
> +               case as_array_object::fCaseInsensitive:
> +                       return &as_value_nocase_eq;
> +
> +               case as_array_object::fNumeric:
> +                       return &as_value_num_eq;
> +
> +               case as_array_object::fCaseInsensitive |
> +                               as_array_object::fNumeric:
> +                       return &as_value_num_nocase_eq;
>
> +               default:
> +                       return &as_value_eq;
> +       }
> +}
>
>  // Custom (ActionScript) comparator
> -class AsValueFuncComparator
> +class as_value_custom
>  {
>  public:
>        as_function& _comp;
>        as_object* _object;
> +       bool (*_zeroCmp)(const int);
>
> -       AsValueFuncComparator(as_function& comparator, boost::intrusive_ptr<as_object> this_ptr)
> +       as_value_custom(as_function& comparator, bool (*zc)(const int),
> +               boost::intrusive_ptr<as_object> this_ptr)
>                :
> -               _comp(comparator)
> +               _comp(comparator),
> +               _zeroCmp(zc)
>        {
>                _object = this_ptr.get();
>        }
> @@ -134,18 +283,152 @@
>                as_value cmp_method(&_comp);
>                as_environment env;
>                as_value ret(0);
> -               int retval;
>
>                env.push(a);
>                env.push(b);
>                ret = call_method(cmp_method, &env, _object, 2, 1);
> -               retval = (int)ret.to_number();
> -               if (retval > 0) return true;
> +               return (*_zeroCmp)((int)ret.to_number());
> +       }
> +};
> +
> +// Comparator for sorting on a single array property
> +class as_value_prop
> +{
> +public:
> +       as_cmp_fn _comp;
> +       const std::string& _prop;
> +
> +       // Note: cmpfn must implement a strict weak ordering
> +       as_value_prop(const std::string& name,
> +               as_cmp_fn cmpfn)
> +               :
> +               _comp(cmpfn),
> +               _prop(name)
> +       {
> +       }
> +
> +       bool operator() (const as_value& a, const as_value& b)
> +       {
> +               as_value av, bv;
> +               boost::intrusive_ptr<as_object> ao = a.to_object();
> +               boost::intrusive_ptr<as_object> bo = b.to_object();
> +
> +               ao->get_member(_prop, &av);
> +               bo->get_member(_prop, &bv);
> +               return (*_comp)(av, bv);
> +       }
> +};
> +
> +
> +// Comparator for sorting on multiple array properties
> +class as_value_multiprop
> +{
> +public:
> +       const as_cmp_fn* _cmps;
> +       std::deque<std::string>::const_iterator _pBegin, _pEnd, pit;
> +
> +       // Note: all as_cmp_fns in *cmps must implement strict weak ordering
> +       as_value_multiprop(std::deque<std::string>::const_iterator pBegin,
> +               std::deque<std::string>::const_iterator pEnd,
> +               as_cmp_fn* cmps)
> +               :
> +               _pBegin(pBegin), _pEnd(pEnd)
> +       {
> +               _cmps = cmps;
> +       }
> +
> +       bool operator() (const as_value& a, const as_value& b)
> +       {
> +               const as_cmp_fn* cmp = _cmps;
> +
> +               for (pit = _pBegin; pit != _pEnd; ++pit, ++cmp)
> +               {
> +                       as_value av, bv;
> +                       boost::intrusive_ptr<as_object> ao = a.to_object();
> +                       boost::intrusive_ptr<as_object> bo = b.to_object();
> +                       ao->get_member(*pit, &av);
> +                       bo->get_member(*pit, &bv);
> +
> +                       if ( (*cmp)(av, bv) ) return true;
> +                       if ( (*cmp)(bv, av) ) return false;
> +                       // Note: for loop finishes only if a == b for
> +                       // each requested comparison
> +                       // (since *cmp(av,bv) == *cmp(bv,av) == false)
> +               }
> +
>                return false;
>        }
>  };
>
> -// @@ TODO : implement as_array_object's unimplemented functions
> +class as_value_multiprop_eq : public as_value_multiprop
> +{
> +public:
> +       as_value_multiprop_eq(std::deque<std::string>::const_iterator pBegin,
> +               std::deque<std::string>::const_iterator pEnd,
> +               as_cmp_fn* eq)
> +               : as_value_multiprop(pBegin, pEnd, eq)
> +       {
> +       }
> +
> +       bool operator() (const as_value& a, const as_value& b)
> +       {
> +               const as_cmp_fn* cmp = _cmps;
> +
> +               for (pit = _pBegin; pit != _pEnd; ++pit, ++cmp)
> +               {
> +                       as_value av, bv;
> +                       boost::intrusive_ptr<as_object> ao = a.to_object();
> +                       boost::intrusive_ptr<as_object> bo = b.to_object();
> +                       ao->get_member(*pit, &av);
> +                       bo->get_member(*pit, &bv);
> +
> +                       if ( !(*cmp)(av, bv) ) return false;
> +               }
> +
> +               return true;
> +       }
> +};
> +
> +// Convenience function to strip fUniqueSort and fReturnIndexedArray from sort
> +// flag. Presence of flags recorded in douniq and doindex.
> +static inline uint8_t
> +flag_preprocess(uint8_t flgs, bool* douniq, bool* doindex)
> +{
> +       *douniq = (flgs & as_array_object::fUniqueSort);
> +       *doindex = (flgs & as_array_object::fReturnIndexedArray);
> +       flgs &= ~(as_array_object::fReturnIndexedArray);
> +       flgs &= ~(as_array_object::fUniqueSort);
> +       return flgs;
> +}
> +
> +// Convenience function to process and extract flags from an as_value array
> +// of flags (as passed to sortOn when sorting on multiple properties)
> +static void
> +get_multi_flags(std::deque<as_value>::const_iterator itBegin,
> +       std::deque<as_value>::const_iterator itEnd,
> +       uint8_t* flgs, bool* uniq, bool* index)
> +{
> +       std::deque<as_value>::const_iterator it = itBegin;
> +       int i = 0;
> +
> +       // extract fUniqueSort and fReturnIndexedArray from first flag
> +       if (it != itEnd)
> +       {
> +               uint8_t flag = static_cast<uint8_t>((*it).to_number());
> +               flag = flag_preprocess(flag, uniq, index);
> +               flgs[i++] = flag;
> +               ++it;
> +       }
> +
> +       while (it != itEnd)
> +       {
> +               uint8_t flag = static_cast<uint8_t>((*it).to_number());
> +               flag &= ~(as_array_object::fReturnIndexedArray);
> +               flag &= ~(as_array_object::fUniqueSort);
> +               flgs[i++] = flag;
> +               ++it;
> +       }
> +}
>
>  as_array_object::as_array_object()
>        :
> @@ -172,6 +455,32 @@
>  {
>  }
>
> +std::deque<indexed_as_value>
> +as_array_object::get_indexed_elements()
> +{
> +       std::deque<indexed_as_value> indexed_elements;
> +       int i = 0;
> +
> +       for (std::deque<as_value>::const_iterator it = elements.begin();
> +               it != elements.end(); ++it)
> +       {
> +               indexed_elements.push_back(indexed_as_value(*it, i++));
> +       }
> +       return indexed_elements;
> +}
> +
> +std::deque<as_value>::const_iterator
> +as_array_object::begin()
> +{
> +       return elements.begin();
> +}
> +
> +std::deque<as_value>::const_iterator
> +as_array_object::end()
> +{
> +       return elements.end();
> +}
> +
>  int
>  as_array_object::index_requested(const std::string& name)
>  {
> @@ -422,91 +731,17 @@
>        as_object::set_member_default(name,val);
>  }
>
> -std::auto_ptr<as_array_object>
> -as_array_object::sorted_indexes(uint8_t flags)
> -{
> -       assert(flags & as_array_object::fReturnIndexedArray);
> -       log_unimpl("Array.sorted_index");
> -       return std::auto_ptr<as_array_object>(NULL);
> -}
> -
> -void
> -as_array_object::sort(uint8_t flags)
> +as_array_object*
> +as_array_object::get_indices(std::deque<indexed_as_value> elems)
>  {
> +       as_array_object* intIndexes = new as_array_object();
>
> -       // use sorted_index to use this flag
> -       assert( ! (flags & as_array_object::fReturnIndexedArray) );
> -
> -       bool do_unique = (flags & as_array_object::fUniqueSort);
> -
> -       // strip the UniqueSort flag, we'll use the do_unique later
> -       flags &= ~(as_array_object::fUniqueSort);
> -
> -       switch ( flags )
> +       for (std::deque<indexed_as_value>::const_iterator it = elems.begin();
> +               it != elems.end(); ++it)
>        {
> -               case 0: // default sorting
> -                       //log_msg(_("Default sorting"));
> -                       std::sort(elements.begin(), elements.end(),
> -                               AsValueLessThen());
> -                       break;
> -
> -               case as_array_object::fDescending:
> -                       //log_msg(_("Default descending"));
> -                       std::sort(elements.begin(), elements.end(),
> -                               AsValueLessThenDesc());
> -                       break;
> -
> -               case as_array_object::fCaseInsensitive:
> -                       //log_msg(_("case insensitive"));
> -                       std::sort(elements.begin(), elements.end(),
> -                               AsValueLessThenNoCase());
> -                       break;
> -
> -               case as_array_object::fCaseInsensitive | as_array_object::fDescending:
> -                       //log_msg(_("case insensitive descending"));
> -                       std::sort(elements.begin(), elements.end(),
> -                               AsValueLessThenDescNoCase());
> -                       break;
> -
> -               case as_array_object::fNumeric:
> -                       //log_msg(_("numeric"));
> -                       std::sort(elements.begin(), elements.end(),
> -                               AsValueLessThenNumeric());
> -                       break;
> -
> -               case as_array_object::fNumeric | as_array_object::fDescending:
> -                       //log_msg(_("numeric descending"));
> -                       std::sort(elements.begin(), elements.end(),
> -                               AsValueLessThenDescNumeric());
> -                       break;
> -
> -               default:
> -                       log_error(_("Unhandled sort flags: %d (0x%X)"), flags, flags);
> -                       break;
> +               intIndexes->push(as_value(it->vec_index));
>        }
> -
> -       // do the unique step afterwards to simplify code
> -       // (altought it's slower, but we can take care of this later)
> -       // TODO: use the do_unique variable inside the switch cases
> -       // to either use std::sort or std::uniq or similar
> -       if ( do_unique )
> -       {
> -               log_unimpl(_("array.sort with unique flag"));
> -       }
> -}
> -
> -void
> -as_array_object::sort(as_function& comparator, boost::intrusive_ptr<as_object> this_ptr, uint8_t flags)
> -{
> -
> -       // use sorted_index to use this flag
> -       assert( ! (flags & as_array_object::fReturnIndexedArray) );
> -
> -       // Other flags are simply NOT used
> -       // (or are them ? the descending one could be!)
> -       std::sort(elements.begin(), elements.end(),
> -               AsValueFuncComparator(comparator, this_ptr));
> -
> +       return intIndexes;
>  }
>
>  static as_value
> @@ -579,47 +814,198 @@
>  static as_value
>  array_sort(const fn_call& fn)
>  {
> -       boost::intrusive_ptr<as_array_object> array = ensureType<as_array_object>(fn.this_ptr);
> -
> +       boost::intrusive_ptr<as_array_object> array =
> +               ensureType<as_array_object>(fn.this_ptr);
>        uint8_t flags = 0;
>
>        if ( fn.nargs == 0 )
>        {
> -               array->sort(flags);
> +               array->sort(&as_value_lt);
> +               return as_value((boost::intrusive_ptr<as_object>)array);
>        }
>        else if ( fn.nargs == 1 && fn.arg(0).is_number() )
>        {
>                flags=static_cast<uint8_t>(fn.arg(0).to_number());
> -               array->sort(flags);
>        }
>        else if ( fn.arg(0).is_as_function() )
>        {
>                // Get comparison function
>                as_function* as_func = fn.arg(0).to_as_function();
> +               bool (*icmp)(int);
>
>                if ( fn.nargs == 2 && fn.arg(1).is_number() )
> -               {
>                        flags=static_cast<uint8_t>(fn.arg(1).to_number());
> -               }
> -               array->sort(*as_func, fn.this_ptr, flags);
> +
> +               if (flags & as_array_object::fDescending) icmp = &int_lt_or_eq;
> +               else icmp = &int_gt;
> +
> +               as_value_custom avc =
> +                       as_value_custom(*as_func, icmp, fn.this_ptr);
> +
> +               if ( (flags & as_array_object::fReturnIndexedArray) )
> +                       return as_value(array->sort_indexed(&avc));
> +               array->sort(&avc);
> +               return as_value((boost::intrusive_ptr<as_object>)array);
> +               // note: custom AS function sorting apparently ignores the
> +               // UniqueSort flag which is why it is also ignored here
>        }
>        else
>        {
>                IF_VERBOSE_ASCODING_ERRORS(
>                log_aserror(_("Sort called with invalid arguments."));
>                )
> +               return as_value();
>        }
> -
> -       return as_value(); // returns void
> +       bool do_unique, do_index;
> +       flags = flag_preprocess(flags, &do_unique, &do_index);
> +       as_cmp_fn comp = get_basic_cmp(flags);
> +
> +       if (do_unique)
> +       {
> +               as_cmp_fn eq =
> +                       get_basic_eq(flags);
> +               if (do_index) return array->sort_indexed(comp, eq);
> +               return array->sort(comp, eq);
> +       }
> +       if (do_index) return as_value(array->sort_indexed(comp));
> +       array->sort(comp);
> +       return as_value((boost::intrusive_ptr<as_object>)array);
>  }
>
>  static as_value
>  array_sortOn(const fn_call& fn)
>  {
> -       boost::intrusive_ptr<as_array_object> array = ensureType<as_array_object>(fn.this_ptr);
> -       UNUSED(array);
> +       boost::intrusive_ptr<as_array_object> array =
> +               ensureType<as_array_object>(fn.this_ptr);
> +
> +       // case: sortOn("prop")
> +       if ( fn.nargs == 1 && fn.arg(0).is_string() )
> +       {
> +               std::string propField = PROPNAME(fn.arg(0).to_string());
> +               as_value_prop avc = as_value_prop(propField, &as_value_lt);
> +               array->sort(&avc);
> +               return as_value((boost::intrusive_ptr<as_object>)array);
> +       }
> +
> +       // case: sortOn("prop", Array.FLAG)
> +       bool do_unique = false, do_index = false;
> +       if ( fn.nargs == 2 && fn.arg(0).is_string() )
> +       {
> +               std::string propField = PROPNAME(fn.arg(0).to_string());
> +               if ( fn.arg(1).is_number() )
> +               {
> +                       uint8_t flags =
> +                               static_cast<uint8_t>(fn.arg(1).to_number());
> +                       flags = flag_preprocess(flags, &do_unique, &do_index);
> +                       as_value_prop avc = as_value_prop(propField,
> +                                               get_basic_cmp(flags));
> +                       if (do_unique)
> +                       {
> +                               as_value_prop ave = as_value_prop(propField,
> +                                       get_basic_eq(flags));
> +                               if (do_index)
> +                                       return array->sort_indexed(&avc, &ave);
> +                               return array->sort(&avc, &ave);
> +                       }
> +                       if (do_index)
> +                               return as_value(array->sort_indexed(&avc));
> +                       array->sort(&avc);
> +                       return as_value((boost::intrusive_ptr<as_object>)array);
> +               }
> +       }
> +
> +       // case: sortOn(["prop1", "prop2"] ...)
> +       if (fn.nargs > 0 && fn.arg(0).is_object() )
> +       {
> +               boost::intrusive_ptr<as_array_object> props =
> +                       ensureType<as_array_object>(fn.arg(0).to_object());
> +               std::deque<std::string> prp;
> +               unsigned int optnum = props->size();
> +               as_cmp_fn cmp[optnum];
> +               as_cmp_fn eq[optnum];
>
> -       log_unimpl("Array.sortOn()");
> +               for (std::deque<as_value>::const_iterator it = props->begin();
> +                       it != props->end(); ++it)
> +               {
> +                       std::string s = PROPNAME((*it).to_string());
> +                       prp.push_back(s);
> +               }
> +
> +               // case: sortOn(["prop1", "prop2"])
> +               if (fn.nargs == 1)
> +               {       // assign each cmp function to the standard cmp fn
> +                       for (unsigned int i = 0; i < optnum; i++)
> +                               cmp[i] = &as_value_lt;
> +               }
> +               // case: sortOn(["prop1", "prop2"], [Array.FLAG1, Array.FLAG2])
> +               else if ( fn.arg(1).is_object() )
> +               {
> +                       boost::intrusive_ptr<as_array_object> farray =
> +                               ensureType<as_array_object>(fn.arg(1).to_object());
> +                       if (farray->size() == optnum)
> +                       {
> +                               uint8_t flgs[optnum];
> +                               std::deque<as_value>::const_iterator
> +                                       fBegin = farray->begin(),
> +                                       fEnd = farray->end();
> +
> +                               get_multi_flags(fBegin, fEnd, flgs,
> +                                       &do_unique, &do_index);
> +
> +                               for (unsigned int i = 0; i < optnum; i++)
> +                                       cmp[i] = get_basic_cmp(flgs[i]);
> +
> +                               if (do_unique)
> +                               {
> +                                       for (unsigned int i = 0; i < optnum; i++)
> +                                               eq[i] = get_basic_eq(flgs[i]);
> +                               }
> +                       }
> +                       else
> +                       {
> +                               for (unsigned int i = 0; i < optnum; i++)
> +                                       cmp[i] = &as_value_lt;
> +                       }
> +               }
> +               // case: sortOn(["prop1", "prop2"], Array.FLAG)
> +               else if ( fn.arg(1).is_number() )
> +               {
> +                       uint8_t flags =
> +                               static_cast<uint8_t>(fn.arg(1).to_number());
> +                       flag_preprocess(flags, &do_unique, &do_index);
> +                       as_cmp_fn c = get_basic_cmp(flags);
> +
> +                       for (unsigned int i = 0; i < optnum; i++)
> +                               cmp[i] = c;
> +
> +                       if (do_unique)
> +                       {
> +                               as_cmp_fn e = get_basic_eq(flags);
> +                               for (unsigned int i = 0; i < optnum; i++)
> +                                       eq[i] = e;
> +                       }
> +               }
> +
> +               as_value_multiprop avc =
> +                       as_value_multiprop(prp.begin(), prp.end(), cmp);
> +
> +               if (do_unique)
> +               {
> +                       as_value_multiprop_eq ave =
> +                               as_value_multiprop_eq(prp.begin(), prp.end(), eq);
> +                       if (do_index)
> +                               return array->sort_indexed(&avc, &ave);
> +                       return array->sort(&avc, &ave);
> +               }
> +               if (do_index)
> +                       return as_value(array->sort_indexed(&avc));
> +               array->sort(&avc);
> +               return as_value((boost::intrusive_ptr<as_object>)array);
> +
> +       }
> +       IF_VERBOSE_ASCODING_ERRORS(
> +       log_aserror(_("SortOn called with invalid arguments."));
> +       )
>        return as_value();
>  }
>
>
> Index: server/array.h
> ===================================================================
> RCS file: /sources/gnash/gnash/server/array.h,v
> retrieving revision 1.30
> retrieving revision 1.31
> diff -u -b -r1.30 -r1.31
> --- server/array.h      13 Jul 2007 01:13:46 -0000      1.30
> +++ server/array.h      29 Jul 2007 12:57:01 -0000      1.31
> @@ -38,6 +38,17 @@
>
>  namespace gnash {
>
> +struct indexed_as_value : public as_value
> +{
> +       int vec_index;
> +
> +       indexed_as_value(const as_value& val, int index)
> +       : as_value(val)
> +       {
> +               vec_index = index;
> +       }
> +};
> +
>  /// The Array ActionScript object
>  class as_array_object : public as_object
>  {
> @@ -53,7 +64,10 @@
>                /// Descending order (b precedes a)
>                fDescending             = (1<<1), // 2
>
> -               /// Remove consecutive equal elements
> +               /// If two or more elements in the array
> +               /// have identical sort fields, return 0
> +               /// and don't modify the array.
> +               /// Otherwise proceed to sort the array.
>                fUniqueSort             = (1<<2), // 4
>
>                /// Don't modify the array, rather return
> @@ -71,6 +85,12 @@
>
>        ~as_array_object();
>
> +       std::deque<indexed_as_value> get_indexed_elements();
> +
> +       std::deque<as_value>::const_iterator begin();
> +
> +       std::deque<as_value>::const_iterator end();
> +
>        void push(const as_value& val);
>
>        void unshift(const as_value& val);
> @@ -81,6 +101,8 @@
>
>        as_value at(unsigned int index);
>
> +       as_array_object* get_indices(std::deque<indexed_as_value> origElems);
> +
>        void reverse();
>
>        /// @param env
> @@ -152,17 +174,84 @@
>        std::auto_ptr<as_array_object> splice(unsigned start, unsigned len,
>                        const std::vector<as_value>& replacement);
>
> +       /// \brief
>        /// Sort the array, using given values comparator
> -       void sort(as_function& comparator, boost::intrusive_ptr<as_object> this_ptr, uint8_t flags=0);
> +       ///
> +       /// @param avc
> +       ///     boolean functor or function comparing two as_value& objects
> +       ///
> +       template <class AVCMP>
> +       void sort(AVCMP* avc)
> +       {
> +               std::sort(elements.begin(), elements.end(), *avc);
> +       }
> +
> +       /// \brief
> +       /// Attempt to sort the array using given values comparator, avc.
> +       /// If two or more elements in the array are equal, as determined
> +       /// by the equality comparator ave, then the array is not sorted
> +       /// and 0 is returned. Otherwise the array is sorted and returned.
> +       ///
> +       /// @param avc
> +       ///     boolean functor or function comparing two as_value& objects
> +       ///     used to determine sort-order
> +       ///
> +       /// @param ave
> +       ///     boolean functor or function comparing two as_value& objects
> +       ///     used to determine equality
> +       ///
> +       template <class AVCMP, class AVEQ>
> +       as_value sort(AVCMP* avc, AVEQ* ave)
> +       {
> +               std::deque<as_value> nelem = std::deque<as_value>(elements);
>
> -       void sort(uint8_t flags=0);
> +               std::sort(nelem.begin(), nelem.end(), *avc);
> +               if (adjacent_find(nelem.begin(), nelem.end(), *ave) != nelem.end() )
> +                       return as_value(0);
>
> +               elements = nelem;
> +               return as_value(this);
> +       }
> +
> +       /// \brief
>        /// Return a new array containing sorted index of this array
> -       //
> -       /// NOTE: assert(flags & Array::fReturnIndexedArray)
> -       std::auto_ptr<as_array_object> sorted_indexes(uint8_t flags);
> +       ///
> +       /// @param avc
> +       ///     boolean functor or function comparing two as_value& objects
> +       ///
> +       template <class AVCMP>
> +       as_array_object* sort_indexed(AVCMP* avc)
> +       {
> +               std::deque<indexed_as_value> ielem = get_indexed_elements();
> +               std::sort(ielem.begin(), ielem.end(), *avc);
> +               return get_indices(ielem);
> +       }
> +
> +       /// \brief
> +       /// Return a new array containing sorted index of this array.
> +       /// If two or more elements in the array are equal, as determined
> +       /// by the equality comparator ave, then 0 is returned instead.
> +       ///
> +       /// @param avc
> +       ///     boolean functor or function comparing two as_value& objects
> +       ///     used to determine sort-order
> +       ///
> +       /// @param ave
> +       ///     boolean functor or function comparing two as_value& objects
> +       ///     used to determine equality
> +       ///
> +       template <class AVCMP, class AVEQ>
> +       as_value sort_indexed(AVCMP* avc, AVEQ* ave)
> +       {
> +               std::deque<indexed_as_value> ielem = get_indexed_elements();
> +
> +               std::sort(ielem.begin(), ielem.end(), *avc);
>
> -       std::auto_ptr<as_array_object> sorted_indexes(as_function& comparator, uint8_t flags);
> +               if (adjacent_find(ielem.begin(), ielem.end(), *ave) != ielem.end() )
> +                       return as_value(0);
> +
> +               return get_indices(ielem);
> +       }
>
>        /// Overridden to provide 'length' member
>        //
>
> Index: testsuite/actionscript.all/array.as
> ===================================================================
> RCS file: /sources/gnash/gnash/testsuite/actionscript.all/array.as,v
> retrieving revision 1.21
> retrieving revision 1.22
> diff -u -b -r1.21 -r1.22
> --- testsuite/actionscript.all/array.as 29 Jul 2007 12:45:25 -0000      1.21
> +++ testsuite/actionscript.all/array.as 29 Jul 2007 12:57:01 -0000      1.22
> @@ -5,7 +5,7 @@
>  // Updated with sort functions, and to use check() macro
>  // by Mike Carlson Feb. 14th, 2006
>
> -rcsid="$Id: array.as,v 1.21 2007/07/29 12:45:25 strk Exp $";
> +rcsid="$Id: array.as,v 1.22 2007/07/29 12:57:01 strk Exp $";
>
>  #include "check.as"
>
> @@ -348,3 +348,430 @@
>  xcheck(c.hasOwnProperty('2'));
>  #endif
>
> +//-------------------------------
> +// Test sort
> +//-------------------------------
> +
> +function cmp_fn(x,y)
> +{
> +       if (x.length < y.length) { return -1; }
> +       if (x.length > y.length) { return 1; }
> +       return 0;
> +}
> +
> +function tolen(x)
> +{
> +       var i;
> +       str = "[";
> +       for (i = 0; i < x.length; i++)
> +       {
> +               str += String(x[i].length);
> +               if (i != x.length - 1) str += ", ";
> +       }
> +       str += "]";
> +       return str;
> +}
> +
> +a = ["ed", "emacs", "", "vi", "nano", "Jedit"];
> +b = [8, 1, -2, 5, -7, -9, 3, 0];
> +c = [7.2, 2.0, -0.5, 3/0, 0.0, 8.35, 0.001, -3.7];
> +d = [];
> +e = ["singleton"];
> +
> +trace(" -- Basic Sort Tests -- ");
> +
> +r = a.sort( Array.NUMERIC );
> +check_equals( r.toString(), ",Jedit,ed,emacs,nano,vi" );
> +check_equals( a.toString(), ",Jedit,ed,emacs,nano,vi" );
> +a.sort( Array.NUMERIC | Array.CASEINSENSITIVE );
> +check_equals( a.toString(), ",ed,emacs,Jedit,nano,vi" );
> +a.sort();
> +check_equals( a.toString(), ",Jedit,ed,emacs,nano,vi" );
> +a.sort( Array.CASEINSENSITIVE );
> +check_equals( a.toString(), ",ed,emacs,Jedit,nano,vi" );
> +a.sort( Array.UNIQUESORT );
> +check_equals( a.toString(), ",Jedit,ed,emacs,nano,vi" );
> +r = a.sort( Array.DESCENDING );
> +check_equals( r.toString(), "vi,nano,emacs,ed,Jedit," );
> +check_equals( a.toString(), "vi,nano,emacs,ed,Jedit," );
> +
> +r = b.sort();
> +check_equals( r.toString(), "-2,-7,-9,0,1,3,5,8" );
> +check_equals( b.toString(), "-2,-7,-9,0,1,3,5,8" );
> +b.sort( Array.NUMERIC );
> +check_equals( b.toString(), "-9,-7,-2,0,1,3,5,8" );
> +b.sort( Array.UNIQUESORT );
> +check_equals( b.toString(), "-2,-7,-9,0,1,3,5,8" );
> +b.sort( Array.DESCENDING );
> +check_equals( b.toString(), "8,5,3,1,0,-9,-7,-2" );
> +r = b.sort( Array.DESCENDING | Array.NUMERIC );
> +check_equals( r.toString(), "8,5,3,1,0,-2,-7,-9" );
> +check_equals( b.toString(), "8,5,3,1,0,-2,-7,-9" );
> +
> +r = c.sort();
> +check_equals( r.toString(), "-0.5,-3.7,0,0.001,2,7.2,8.35,Infinity" );
> +check_equals( c.toString(), "-0.5,-3.7,0,0.001,2,7.2,8.35,Infinity" );
> +c.sort( Array.CASEINSENSITIVE );
> +check_equals( c.toString(), "-0.5,-3.7,0,0.001,2,7.2,8.35,Infinity" );
> +c.sort( Array.NUMERIC );
> +check_equals( c.toString(), "-3.7,-0.5,0,0.001,2,7.2,8.35,Infinity" );
> +r = c.sort( Array.UNIQUESORT );
> +check_equals( c.toString(), "-0.5,-3.7,0,0.001,2,7.2,8.35,Infinity" );
> +r = c.sort( Array.DESCENDING | Array.NUMERIC );
> +check_equals( c.toString(), "Infinity,8.35,7.2,2,0.001,0,-0.5,-3.7" );
> +
> +r = d.sort();
> +check_equals( r.toString(), "" );
> +check_equals( d.toString(), "" );
> +d.sort( Array.UNIQUESORT );
> +check_equals( d.toString(), "" );
> +d.sort( Array.DESCENDING | Array.NUMERIC );
> +check_equals( d.toString(), "" );
> +
> +r = e.sort();
> +check_equals( r.toString(), "singleton" );
> +check_equals( e.toString(), "singleton" );
> +e.sort( Array.UNIQUESORT );
> +check_equals( e.toString(), "singleton" );
> +e.sort( Array.DESCENDING | Array.CASEINSENSITIVE );
> +check_equals( e.toString(), "singleton" );
> +
> +trace(" -- Return Indexed Array Tests -- ");
> +
> +r = a.sort( Array.RETURNINDEXEDARRAY );
> +check_equals( r.toString(), "5,4,3,2,1,0" );
> +check_equals( a.toString(), "vi,nano,emacs,ed,Jedit," );
> +r = a.sort( Array.RETURNINDEXEDARRAY | Array.DESCENDING | Array.CASEINSENSITIVE );
> +check_equals( r.toString(), "0,1,4,2,3,5" );
> +check_equals( a.toString(), "vi,nano,emacs,ed,Jedit," );
> +r = b.sort( Array.RETURNINDEXEDARRAY );
> +check_equals( r.toString(), "5,6,7,4,3,2,1,0" );
> +r = b.sort( Array.RETURNINDEXEDARRAY | Array.NUMERIC );
> +check_equals( r.toString(), "7,6,5,4,3,2,1,0" );
> +r = b.sort( Array.RETURNINDEXEDARRAY | Array.DESCENDING | Array.CASEINSENSITIVE );
> +check_equals( r.toString(), "0,1,2,3,4,7,6,5" );
> +r = c.sort( Array.RETURNINDEXEDARRAY );
> +check_equals( r.toString(), "6,7,5,4,3,2,1,0" );
> +r = c.sort( Array.RETURNINDEXEDARRAY | Array.NUMERIC );
> +check_equals( r.toString(), "7,6,5,4,3,2,1,0" );
> +r = c.sort( Array.RETURNINDEXEDARRAY | Array.DESCENDING | Array.CASEINSENSITIVE );
> +check_equals( r.toString(), "0,1,2,3,4,5,7,6" );
> +r = d.sort( Array.RETURNINDEXEDARRAY | Array.DESCENDING );
> +check_equals( r.toString(), "" );
> +check_equals( d.toString(), "" );
> +r = d.sort( Array.NUMERIC | Array.RETURNINDEXEDARRAY );
> +check_equals( r.toString(), "" );
> +check_equals( d.toString(), "" );
> +r = e.sort( Array.CASEINSENSITIVE | Array.RETURNINDEXEDARRAY );
> +check_equals( r.toString(), "0" );
> +check_equals( e.toString(), "singleton" );
> +r = e.sort( Array.NUMERIC | Array.RETURNINDEXEDARRAY | Array.DESCENDING );
> +check_equals( r.toString(), "0" );
> +
> +trace(" -- Custom AS function tests -- ");
> +r = a.sort( cmp_fn, Array.UNIQUE );
> +check_equals( r.toString(), ",vi,ed,nano,emacs,Jedit" );
> +check_equals( a.toString(), ",vi,ed,nano,emacs,Jedit" );
> +r = a.sort( something_undefined );
> +check_equals(typeof(r), 'undefined');
> +r = a.sort( cmp_fn, Array.DESCENDING );
> +check_equals( tolen(r), "[5, 5, 4, 2, 2, 0]" );
> +check_equals( tolen(a), "[5, 5, 4, 2, 2, 0]" );
> +a.sort( cmp_fn, Array.CASEINSENSITIVE | Array.NUMERIC );
> +check_equals( tolen(a), "[0, 2, 2, 4, 5, 5]" );
> +r = a.sort( cmp_fn, Array.RETURNINDEXEDARRAY );
> +check_equals( r.toString(), "0,1,2,3,4,5" );
> +r = a.sort( cmp_fn, Array.RETURNINDEXEDARRAY | Array.DESCENDING );
> +check_equals( r.toString(), "5,4,3,2,1,0" );
> +r = d.sort( cmp_fn );
> +check_equals( r.toString(), "" );
> +check_equals( d.toString(), "" );
> +r = d.sort( cmp_fn, Array.UNIQUESORT | Array.CASEINSENSITIVE );
> +check_equals( r.toString(), "" );
> +check_equals( d.toString(), "" );
> +r = e.sort( cmp_fn, Array.UNIQUESORT | Array.CASEINSENSITIVE );
> +check_equals( r.toString(), "singleton" );
> +check_equals( e.toString(), "singleton" );
> +
> +a.push("ED");
> +b.push(3.0);
> +c.push(9/0);
> +
> +trace(" -- UNIQUESORT tests -- ");
> +
> +r = a.sort( Array.UNIQUESORT );
> +check_equals( r.toString(), ",ED,Jedit,ed,emacs,nano,vi" );
> +check_equals( a.toString(), ",ED,Jedit,ed,emacs,nano,vi" );
> +r = a.sort( Array.UNIQUESORT | Array.CASEINSENSITIVE );
> +check_equals( r.toString(), "0" );
> +check_equals( a.toString(), ",ED,Jedit,ed,emacs,nano,vi" );
> +r = a.sort( Array.UNIQUESORT | Array.CASEINSENSITIVE | Array.DESCENDING );
> +check_equals( r.toString(), "0" );
> +check_equals( a.toString(), ",ED,Jedit,ed,emacs,nano,vi" );
> +r = a.sort( Array.UNIQUESORT | Array.RETURNINDEXEDARRAY );
> +check_equals( r.toString(), "0,1,2,3,4,5,6" );
> +r = a.sort( Array.UNIQUESORT | Array.CASEINSENSITIVE | Array.DESCENDING | Array.RETURNINDEXEDARRAY );
> +check_equals( r.toString(), "0" );
> +
> +r = b.sort( Array.UNIQUESORT );
> +check_equals( r.toString(), "0" );
> +check_equals( b.toString(), "8,5,3,1,0,-2,-7,-9,3" );
> +r = b.sort( Array.UNIQUESORT | Array.NUMERIC );
> +check_equals( r.toString(), "0" );
> +r = b.sort( Array.UNIQUESORT | Array.NUMERIC | Array.DESCENDING );
> +check_equals( r.toString(), "0" );
> +r = b.sort( Array.UNIQUESORT | Array.RETURNINDEXEDARRAY );
> +check_equals( r.toString(), "0" );
> +r = b.sort( Array.UNIQUESORT | Array.NUMERIC | Array.DESCENDING | Array.RETURNINDEXEDARRAY );
> +check_equals( r.toString(), "0" );
> +
> +r = c.sort( Array.UNIQUESORT );
> +check_equals( r.toString(), "0" );
> +check_equals( c.toString(), "Infinity,8.35,7.2,2,0.001,0,-0.5,-3.7,Infinity" );
> +r = c.sort( Array.UNIQUESORT | Array.NUMERIC );
> +check_equals( r.toString(), "0" );
> +r = c.sort( Array.UNIQUESORT | Array.NUMERIC | Array.DESCENDING );
> +check_equals( r.toString(), "0" );
> +r = c.sort( Array.UNIQUESORT | Array.RETURNINDEXEDARRAY );
> +check_equals( r.toString(), "0" );
> +r = c.sort( Array.UNIQUESORT | Array.NUMERIC | Array.DESCENDING | Array.RETURNINDEXEDARRAY );
> +check_equals( r.toString(), "0" );
> +r = a.sort( cmp_fn, Array.UNIQUE | Array.CASEINSENSITIVE );
> +check_equals( tolen(r), "[0, 2, 2, 2, 4, 5, 5]" );
> +check_equals( tolen(a), "[0, 2, 2, 2, 4, 5, 5]" );
> +r = a.sort( cmp_fn, Array.UNIQUE | Array.CASEINSENSITIVE | Array.RETURNINDEXEDARRAY );
> +check_equals( r.toString(), "0,1,2,3,4,5,6" );
> +r = a.sort( cmp_fn, Array.UNIQUE | Array.CASEINSENSITIVE | Array.RETURNINDEXEDARRAY | Array.DESCENDING );
> +check_equals( r.toString(), "6,5,4,3,2,1,0" );
> +
> +trace(" -- Array with null value  -- ");
> +c.push(null);
> +
> +r = c.sort();
> +check_equals( r.toString(), "-0.5,-3.7,0,0.001,2,7.2,8.35,Infinity,Infinity,null" );
> +check_equals( c.toString(), "-0.5,-3.7,0,0.001,2,7.2,8.35,Infinity,Infinity,null" );
> +c.sort( Array.NUMERIC );
> +check_equals( c.toString(), "-3.7,-0.5,0,0.001,2,7.2,8.35,Infinity,Infinity,null" );
> +c.sort( Array.DESCENDING | Array.NUMERIC );
> +check_equals( c.toString(), "null,Infinity,Infinity,8.35,7.2,2,0.001,0,-0.5,-3.7" );
> +r = c.sort( Array.RETURNINDEXEDARRAY | Array.NUMERIC );
> +check_equals( r.toString(), "9,8,7,6,5,4,3,1,2,0" );
> +r = c.sort( Array.RETURNINDEXEDARRAY | Array.DESCENDING | Array.CASEINSENSITIVE );
> +check_equals( r.toString(), "0,1,2,3,4,5,6,7,9,8" );
> +r = c.sort( Array.UNIQUESORT );
> +check_equals( r.toString(), "0" );
> +r = c.sort( Array.UNIQUESORT | Array.NUMERIC );
> +check_equals( r.toString(), "0" );
> +r = c.sort( Array.UNIQUESORT | Array.RETURNINDEXEDARRAY );
> +check_equals( r.toString(), "0" );
> +r = c.sort( Array.UNIQUESORT | Array.NUMERIC | Array.DESCENDING | Array.RETURNINDEXEDARRAY );
> +check_equals( r.toString(), "0" );
> +
> +trace(" -- Array with 2 null values  -- ");
> +c = [7.2, 2.0, null, -0.5, 3/0, 0.0, null, 8.35, 0.001, -3.7];
> +c.sort( Array.NUMERIC );
> +check_equals( c.toString(), "-3.7,-0.5,0,0.001,2,7.2,8.35,Infinity,null,null" );
> +c.sort( Array.DESCENDING | Array.NUMERIC );
> +check_equals( c.toString(), "null,null,Infinity,8.35,7.2,2,0.001,0,-0.5,-3.7" );
> +r = c.sort( Array.RETURNINDEXEDARRAY | Array.NUMERIC );
> +check_equals( r.toString(), "9,8,7,6,5,4,3,2,0,1" );
> +check_equals( c.toString(), "null,null,Infinity,8.35,7.2,2,0.001,0,-0.5,-3.7" );
> +r = c.sort( Array.UNIQUESORT );
> +check_equals( r.toString(), "0" );
> +r = c.sort( Array.UNIQUESORT | Array.NUMERIC );
> +check_equals( r.toString(), "0" );
> +
> +trace(" -- Array with 2 undefined values  -- ");
> +c = [7.2, 2.0, undefined, -0.5, 3/0, 0.0, undefined, 8.35, 0.001, -3.7];
> +r = c.sort( Array.UNIQUESORT );
> +check_equals( r.toString(), "0" );
> +r = c.sort( Array.UNIQUESORT | Array.NUMERIC );
> +check_equals( r.toString(), "0" );
> +
> +trace(" -- Array with 2 NaN values  -- ");
> +c = [7.2, 2.0, NaN, -0.5, 3/0, 0.0, NaN, 8.35, 0.001, -3.7];
> +r = c.sort( Array.UNIQUESORT );
> +check_equals( r.toString(), "0" );
> +r = c.sort( Array.UNIQUESORT | Array.NUMERIC );
> +check_equals( r.toString(), "0" );
> +
> +//-------------------------------
> +// Test sortOn
> +//-------------------------------
> +
> +a = [];
> +a.push({Name: "Zuse Z3", Year: 1941, Electronic: false});
> +a.push({Name: "Colossus", Year: 1943, Electronic: true});
> +a.push({Name: "ENIAC", Year: 1944, Electronic: true});
> +
> +function tostr(x)
> +{
> +       var i;
> +       str = "";
> +       for(i = 0; i < x.length; i++)
> +       {
> +               y = a[i];
> +               str += (y.Name + "," + y.Year + "," + y.Electronic );
> +               if (i != x.length - 1) str += " | ";
> +       }
> +       return str;
> +}
> +
> +trace("sortOn a single property ");
> +r = a.sortOn( "Name" );
> +check_equals( tostr(r), "Colossus,1943,true | ENIAC,1944,true | Zuse Z3,1941,false" );
> +check_equals( tostr(a), "Colossus,1943,true | ENIAC,1944,true | Zuse Z3,1941,false" );
> +
> +r = a.sortOn( "Year" );
> +check_equals( tostr(r), "Zuse Z3,1941,false | Colossus,1943,true | ENIAC,1944,true" );
> +check_equals( tostr(a), "Zuse Z3,1941,false | Colossus,1943,true | ENIAC,1944,true" );
> +
> +a.sortOn( "Electronic" );
> +check_equals( tostr(a), "Zuse Z3,1941,false | Colossus,1943,true | ENIAC,1944,true" );
> +
> +a.sortOn("Year", Array.NUMERIC );
> +check_equals( tostr(a), "Zuse Z3,1941,false | Colossus,1943,true | ENIAC,1944,true" );
> +
> +a.sortOn("Year", Array.NUMERIC | Array.DESCENDING );
> +check_equals ( tostr(a), "ENIAC,1944,true | Colossus,1943,true | Zuse Z3,1941,false" );
> +
> +r = a.sortOn("Year", Array.UNIQUESORT | Array.NUMERIC );
> +check_equals ( tostr(r), "Zuse Z3,1941,false | Colossus,1943,true | ENIAC,1944,true" );
> +check_equals ( tostr(a), "Zuse Z3,1941,false | Colossus,1943,true | ENIAC,1944,true" );
> +
> +r = a.sortOn("Year", Array.RETURNINDEXEDARRAY | Array.NUMERIC );
> +check_equals( r.toString(), "0,1,2" );
> +check_equals ( tostr(a), "Zuse Z3,1941,false | Colossus,1943,true | ENIAC,1944,true" );
> +
> +r = a.sortOn("Name", Array.UNIQUESORT );
> +check_equals( tostr(r), "Colossus,1943,true | ENIAC,1944,true | Zuse Z3,1941,false" );
> +check_equals( tostr(a), "Colossus,1943,true | ENIAC,1944,true | Zuse Z3,1941,false" );
> +
> +r = a.sortOn("Name", Array.UNIQUESORT | Array.DESCENDING );
> +check_equals( tostr(r), "Zuse Z3,1941,false | ENIAC,1944,true | Colossus,1943,true" );
> +
> +r = a.sortOn("Name", Array.UNIQUESORT | Array.RETURNINDEXEDARRAY );
> +check_equals( r.toString(), "2,1,0" );
> +
> +r = a.sortOn("Electronic", Array.UNIQUESORT | Array.RETURNINDEXEDARRAY );
> +check_equals( r.toString(), "0" );
> +check_equals( tostr(a), "Zuse Z3,1941,false | ENIAC,1944,true | Colossus,1943,true");
> +
> +trace("sortOn multiple properties");
> +a.push({Name: "Atanasoff-Berry", Year: 1941, Electronic: true, Mass: 320});
> +
> +r = a.sortOn( ["Name", "Year"] );
> +check_equals( tostr(r), "Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true | Zuse Z3,1941,false" );
> +check_equals( tostr(a), "Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true | Zuse Z3,1941,false" );
> +
> +a.sortOn( ["Electronic", "Year"] );
> +check_equals( tostr(a), "Zuse Z3,1941,false | Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true" );
> +
> +a.sortOn( ["Electronic", "Year"], [Array.DESCENDING, Array.NUMERIC] );
> +check_equals( tostr(a), "Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true | Zuse Z3,1941,false" );
> +
> +r = a.sortOn( ["Name", "Year"], [Array.UNIQUESORT, Array.NUMERIC] );
> +check_equals( tostr(r), "Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true | Zuse Z3,1941,false" );
> +
> +r = a.sortOn( ["Electronic", "Name"], [Array.UNIQUESORT, Array.NUMERIC] );
> +check_equals( tostr(r), "Zuse Z3,1941,false | Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true" );
> +
> +
> +trace("sortOn missing properties" );
> +r = a.sortOn(["Megaflops"] );
> +check_equals( tostr(r), "Zuse Z3,1941,false | Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true" );
> +check_equals( tostr(a), "Zuse Z3,1941,false | Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true" );
> +
> +a.sortOn(["Binary", "Turing complete"] );
> +check_equals( tostr(a), "Zuse Z3,1941,false | Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true" );
> +
> +a.sortOn(["Inventor", "Cost"], [Array.DESCENDING, 0] );
> +check_equals( tostr(a), "Zuse Z3,1941,false | Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true" );
> +
> +r = a.sortOn(["Name", "Year", "Cost"], [Array.DESCENDING, Array.NUMERIC, 0] );
> +check_equals( tostr(a), "Zuse Z3,1941,false | ENIAC,1944,true | Colossus,1943,true | Atanasoff-Berry,1941,true" );
> +
> +r = a.sortOn(["Name", "Cost", "Year"], [0, 0, Array.NUMERIC] );
> +check_equals( tostr(a), "Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true | Zuse Z3,1941,false" );
> +
> +r = a.sortOn(["Electronic", "Year", "Cost"], [Array.UNIQUESORT, Array.NUMERIC, Array.NUMERIC] );
> +check_equals( tostr(r), "Zuse Z3,1941,false | Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true" );
> +check_equals( tostr(a), "Zuse Z3,1941,false | Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true" );
> +
> +r = a.sortOn(["Electronic", "Cost" ], [Array.UNIQUESORT, Array.NUMERIC] );
> +check_equals( r.toString(), "0" );
> +
> +trace("sortOn with mismatching array lengths");
> +r = a.sortOn( ["Name", "Year"], [0] );
> +check_equals( tostr(r), "Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true | Zuse Z3,1941,false" );
> +check_equals( tostr(a), "Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true | Zuse Z3,1941,false" );
> +
> +r = a.sortOn( ["Name", "Year"], [Array.DESCENDING] );
> +check_equals( tostr(r), "Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true | Zuse Z3,1941,false" );
> +check_equals( tostr(a), "Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true | Zuse Z3,1941,false" );
> +
> +a.sortOn(["Name", "Electronic"], [Array.DESCENDING] );
> +check_equals( tostr(a), "Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true | Zuse Z3,1941,false" );
> +
> +r = a.sortOn(["Name", "Year"], [Array.RETURNINDEXEDARRAY] );
> +check_equals( tostr(r), "Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true | Zuse Z3,1941,false" );
> +
> +trace("sortOn, undocumented invocation");
> +r = a.sortOn( ["Name", "Year"], Array.DESCENDING );
> +check_equals( tostr(r), "Zuse Z3,1941,false | ENIAC,1944,true | Colossus,1943,true | Atanasoff-Berry,1941,true" );
> +check_equals( tostr(a), "Zuse Z3,1941,false | ENIAC,1944,true | Colossus,1943,true | Atanasoff-Berry,1941,true" );
> +
> +a.sortOn( ["Year", "Name"], Array.NUMERIC );
> +check_equals( tostr(a), "Atanasoff-Berry,1941,true | Zuse Z3,1941,false | Colossus,1943,true | ENIAC,1944,true" );
> +
> +a.sortOn( ["Electronic", "Year", "Name"], Array.NUMERIC | Array.DESCENDING );
> +check_equals( tostr(a), "ENIAC,1944,true | Colossus,1943,true | Atanasoff-Berry,1941,true | Zuse Z3,1941,false" );
> +
> +#if OUTPUT_VERSION > 6
> +trace("sortOn partially missing properties");
> +
> +r = a.sortOn(["Name", "Electronic"], [Array.DESCENDING] );
> +check_equals( tostr(r), "Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true | Zuse Z3,1941,false" );
> +check_equals( tostr(a), "Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true | Zuse Z3,1941,false" );
> +
> +r = a.sortOn(["Name", "Year"], [Array.RETURNINDEXEDARRAY]);
> +check_equals( tostr(r), "Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true | Zuse Z3,1941,false" );
> +check_equals( tostr(a), "Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true | Zuse Z3,1941,false" );
> +
> +trace("sortOn partially missing properties");
> +a.push({Name: "Harvard Mark I", Year: 1944, Mass: 4500});
> +
> +a.sortOn(["Electronic", "Year"], Array.DESCENDING | Array.IGNORECASE );
> +check_equals( tostr(a), "Harvard Mark I,1944,undefined | ENIAC,1944,true | Colossus,1943,true | Atanasoff-Berry,1941,true | Zuse Z3,1941,false" );
> +
> +a.sortOn( ["Electronic", "Name"], [Array.NUMERIC, Array.DESCENDING] );
> +check_equals( tostr(a), "Zuse Z3,1941,false | ENIAC,1944,true | Colossus,1943,true | Atanasoff-Berry,1941,true | Harvard Mark I,1944,undefined" );
> +
> +r = a.sortOn( ["Electronic", "Name"], [Array.UNIQUESORT, Array.NUMERIC] );
> +check_equals( tostr(r), "Zuse Z3,1941,false | Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true | Harvard Mark I,1944,undefined" );
> +check_equals( tostr(a), "Zuse Z3,1941,false | Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true | Harvard Mark I,1944,undefined" );
> +
> +a.sortOn( ["Mass", "Name"], [0, 0] );
> +check_equals( tostr(a), "Atanasoff-Berry,1941,true | Harvard Mark I,1944,undefined | Colossus,1943,true | ENIAC,1944,true | Zuse Z3,1941,false" );
> +
> +a.sortOn( ["Mass", "Year", "Name"], [Array.NUMERIC | Array.DESCENDING, Array.NUMERIC | Array.DESCENDING | 0] );
> +check_equals( tostr(a), "Atanasoff-Berry,1941,true | Harvard Mark I,1944,undefined | Zuse Z3,1941,false | Colossus,1943,true | ENIAC,1944,true" );
> +
> +a.sortOn( ["Mass", "Name"], [Array.UNIQUE, Array.DESCENDING] );
> +check_equals( tostr(a), "Atanasoff-Berry,1941,true | Harvard Mark I,1944,undefined | Zuse Z3,1941,false | ENIAC,1944,true | Colossus,1943,true" );
> +
> +a.sortOn( ["Electronic", "Mass", "Name"], [0, Array.NUMERIC | Array.DESCENDING, 0] );
> +check_equals( tostr(a), "Zuse Z3,1941,false | Colossus,1943,true | ENIAC,1944,true | Atanasoff-Berry,1941,true | Harvard Mark I,1944,undefined" );
> +
> +r = a.sortOn( ["Electronic", "Mass", "Year", "Name"], [Array.RETURNINDEXEDARRAY, Array.NUMERIC, Array.NUMERIC, Array.DESCENDING] );
> +check_equals( r.toString(), "0,3,1,2,4");
> +#endif // OUTPUT_VERSION > 6
> +
> +#if OUTPUT_VERSION < 7
> +trace("sortOn property name case-mismatch");
> +a.sortOn( ["name"] );
> +check_equals( tostr(a), "Atanasoff-Berry,1941,true | Colossus,1943,true | ENIAC,1944,true | Zuse Z3,1941,false" );
> +a.sortOn( ["year", "name"], Array.NUMERIC );
> +check_equals( tostr(a), "Atanasoff-Berry,1941,true | Zuse Z3,1941,false | Colossus,1943,true | ENIAC,1944,true" );
> +#endif // OUTPUT_VERSION < 7
> +
>
>
> _______________________________________________
> Gnash-commit mailing list
> Gnash-commit@gnu.org
> http://lists.gnu.org/mailman/listinfo/gnash-commit
>



From MAILER-DAEMON Sun Aug 12 23:26:15 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IKQZK-0000W6-TJ
	for mharc-gnash-commit@gnu.org; Sun, 12 Aug 2007 23:26:14 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IKQZJ-0000Vv-IA
	for gnash-commit@gnu.org; Sun, 12 Aug 2007 23:26:13 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IKQZH-0000Vi-Q4
	for gnash-commit@gnu.org; Sun, 12 Aug 2007 23:26:12 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IKQZH-0000Vf-KN
	for gnash-commit@gnu.org; Sun, 12 Aug 2007 23:26:11 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IKQZH-0006QX-8c
	for gnash-commit@gnu.org; Sun, 12 Aug 2007 23:26:11 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IKQZG-0005WN-Of
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 03:26:10 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IKQZG-0005WI-Fw
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 03:26:10 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IKQZG-0005WI-Fw@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 13 Aug 2007 03:26:10 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/edit_text_character.cpp ...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Aug 2007 03:26:13 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/13 03:26:10

Modified files:
	.              : ChangeLog 
	server         : edit_text_character.cpp edit_text_character.h 
	testsuite/actionscript.all: TextField.as 
	testsuite/misc-ming.all: DefineEditTextTest.c 

Log message:
	        * server/edit_text_character.{cpp,h}: add autoSize getter/setter
	          (still not used)
	        * testsuite/actionscript.all/TextField.as: add tests for autoSize
	          member.
	        * testsuite/misc-ming.all/DefineEditTextTest.c: add TODO items.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3998&r2=1.3999
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.96&r2=1.97
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.h?cvsroot=gnash&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/TextField.as?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DefineEditTextTest.c?cvsroot=gnash&r1=1.25&r2=1.26

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3998
retrieving revision 1.3999
diff -u -b -r1.3998 -r1.3999
--- ChangeLog	13 Aug 2007 02:47:57 -0000	1.3998
+++ ChangeLog	13 Aug 2007 03:26:09 -0000	1.3999
@@ -1,6 +1,14 @@
 2007-08-12 Sandro Santilli <strk@keybit.net>
 
+	* server/edit_text_character.{cpp,h}: add autoSize getter/setter
+	  (still not used)
+	* testsuite/actionscript.all/TextField.as: add tests for autoSize
+	  member.
+	* testsuite/misc-ming.all/DefineEditTextTest.c: add TODO items.
 	* server/as_value.h: add is_bool()
+
+2007-08-12 Sandro Santilli <strk@keybit.net>
+
 	* server/edit_text_character.h (getBounds): add TODO item
 	  (I belive is a fix for bug #20760)
 

Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -b -r1.96 -r1.97
--- server/edit_text_character.cpp	2 Aug 2007 21:23:42 -0000	1.96
+++ server/edit_text_character.cpp	13 Aug 2007 03:26:09 -0000	1.97
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: edit_text_character.cpp,v 1.96 2007/08/02 21:23:42 strk Exp $ */
+/* $Id: edit_text_character.cpp,v 1.97 2007/08/13 03:26:09 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -81,6 +81,7 @@
 static as_value textfield_borderColor_getset(const fn_call& fn);
 static as_value textfield_textColor_getset(const fn_call& fn);
 static as_value textfield_embedFonts_getset(const fn_call& fn);
+static as_value textfield_autoSize_getset(const fn_call& fn);
 
 
 //
@@ -326,6 +327,8 @@
 	o.init_property("textColor", *getset, *getset);
 	getset = new builtin_function(textfield_embedFonts_getset);
 	o.init_property("embedFonts", *getset, *getset);
+	getset = new builtin_function(textfield_autoSize_getset);
+	o.init_property("autoSize", *getset, *getset);
 
 
 	if ( target_version  < 7 ) return;
@@ -389,7 +392,8 @@
 	_drawBorder(m_def->has_border()),
 	_borderColor(0,0,0,255),
 	_textColor(m_def->get_text_color()),
-	_embedFonts(m_def->getUseEmbeddedGlyphs())
+	_embedFonts(m_def->getUseEmbeddedGlyphs()),
+	_autoSize(autoSizeNone)
 {
 	assert(parent);
 	assert(m_def);
@@ -1148,6 +1152,11 @@
 			// Whoops, we just exceeded the box width. 
 			// Do word-wrap if requested to do so.
 
+			// TODO: don't query the definition about wordWrap,
+			//       we should have a wordWrap getter/setter instead !
+			//       Also, we should check autoSize (getAutoSize) and
+			//       behave accordingly
+			//
 			if ( ! m_def->do_word_wrap() )
 			{
 				bool newlinefound = false;
@@ -1590,6 +1599,98 @@
 	return as_value();
 }
 
+static as_value
+textfield_autoSize_getset(const fn_call& fn)
+{
+	boost::intrusive_ptr<edit_text_character> ptr = ensureType<edit_text_character>(fn.this_ptr);
+
+	if ( fn.nargs == 0 ) // getter
+	{
+		return ptr->autoSizeValueName(ptr->getAutoSize());
+	}
+	else // setter
+	{
+		as_value& arg = fn.arg(0);
+		if ( arg.is_bool() )
+		{
+			if ( arg.to_bool() ) // true == left
+			{
+				ptr->setAutoSize( edit_text_character::autoSizeLeft );
+			}
+			else
+			{
+				ptr->setAutoSize( edit_text_character::autoSizeNone );
+			}
+		}
+		else
+		{
+			std::string strval = arg.to_string(&(fn.env()));
+			edit_text_character::AutoSizeValue val = ptr->parseAutoSizeValue(strval);
+			log_debug("%s => %d", strval.c_str(), val);
+			ptr->setAutoSize( val );
+		}
+	}
+
+	return as_value();
+}
+
+/* public static */
+edit_text_character::AutoSizeValue
+edit_text_character::parseAutoSizeValue(const string& val)
+{
+	if ( val == "left" )
+	{
+		return autoSizeLeft;
+	}
+	if ( val == "right" )
+	{
+		return autoSizeRight;
+	}
+	if ( val == "center" )
+	{
+		return autoSizeCenter;
+	}
+	return autoSizeNone;
+
+}
+
+/* public static */
+const char*
+edit_text_character::autoSizeValueName(AutoSizeValue val)
+{
+	switch (val)
+	{
+		case autoSizeLeft:
+			return "left";
+		case autoSizeRight:
+			return "right";
+		case autoSizeCenter:
+			return "center";
+		case autoSizeNone:
+		default:
+			return "none";
+	}
+
+}
+
+void
+edit_text_character::setAutoSize(AutoSizeValue val)
+{
+	if ( val == _autoSize ) return;
+
+	static bool warned = false;
+	if ( ! warned ) {
+		log_unimpl(_("TextField.autoSize unused"));
+		warned = true;
+	}
+
+	
+	set_invalidated();
+
+	_autoSize = val; 
+	format_text();
+}
+
 } // namespace gnash
 
 

Index: server/edit_text_character.h
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- server/edit_text_character.h	12 Aug 2007 23:38:56 -0000	1.43
+++ server/edit_text_character.h	13 Aug 2007 03:26:09 -0000	1.44
@@ -46,6 +46,22 @@
 
 public:
 
+	/// Possible autoSize values
+	enum AutoSizeValue {
+
+		/// Do not automatically resize TextField as text grow/shrink
+		autoSizeNone,
+
+		/// Expand TextField, anchor the top-left side
+		autoSizeLeft,
+
+		/// Expand TextField, anchor the horizontal center
+		autoSizeCenter,
+
+		/// Expand TextField, anchor the top-right side
+		autoSizeRight
+	};
+
 	edit_text_character(
 			character* parent,
 			edit_text_character_def* def,
@@ -162,6 +178,38 @@
 	/// @param use
 	void setEmbedFonts(bool use);
 
+	/// Get autoSize value 
+	AutoSizeValue getAutoSize() const
+	{
+		return _autoSize;
+	}
+
+	/// Set autoSize value 
+	//
+	/// @param val
+	/// 	The AutoSizeValue to use
+	///
+	void setAutoSize(AutoSizeValue val);
+
+	/// Parse autoSize string value
+	//
+	/// @param val
+	/// 	Auto size value as a string (one of none, left, center, right)
+	///
+	/// @return an AutoSizeValue identifier. autoSizeNone if invalid
+	///
+	static AutoSizeValue parseAutoSizeValue(const string& val);
+
+	/// Return autoSize value as a string
+	//
+	/// @param val
+	/// 	Auto size value 
+	///
+	/// @return a C-string representation of the autoSize value.
+	///	The returns is *never* NULL.
+	///
+	static const char* autoSizeValueName(AutoSizeValue val);
+
 private:
 
 	/// Return true if HTML text is allowed 
@@ -269,6 +317,8 @@
 
 	bool _embedFonts;
 
+	AutoSizeValue _autoSize;
+
 protected:
 
 #ifdef GNASH_USE_GC

Index: testsuite/actionscript.all/TextField.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/TextField.as,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- testsuite/actionscript.all/TextField.as	30 Jul 2007 18:38:15 -0000	1.13
+++ testsuite/actionscript.all/TextField.as	13 Aug 2007 03:26:10 -0000	1.14
@@ -19,7 +19,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: TextField.as,v 1.13 2007/07/30 18:38:15 strk Exp $";
+rcsid="$Id: TextField.as,v 1.14 2007/08/13 03:26:10 strk Exp $";
 
 #include "check.as"
 
@@ -40,7 +40,7 @@
 // NOTE: the following will be true after a call to createTextField ! Seek forward to see..
 xcheck( !TextField.prototype.hasOwnProperty('background'));
 xcheck( !TextField.prototype.hasOwnProperty('backgroundColor'));
-check( !TextField.prototype.hasOwnProperty('autoSize') );
+xcheck( !TextField.prototype.hasOwnProperty('autoSize') );
 xcheck( !TextField.prototype.hasOwnProperty('border') );
 xcheck( !TextField.prototype.hasOwnProperty('borderColor') );
 check( !TextField.prototype.hasOwnProperty('bottomScroll') );
@@ -109,7 +109,7 @@
 // NOTE: the following were false before the call to createTextField ! Seek backward to see..
 check( TextField.prototype.hasOwnProperty('background'));
 check( TextField.prototype.hasOwnProperty('backgroundColor'));
-xcheck( TextField.prototype.hasOwnProperty('autoSize') );
+check( TextField.prototype.hasOwnProperty('autoSize') );
 check( TextField.prototype.hasOwnProperty('border') );
 check( TextField.prototype.hasOwnProperty('borderColor') );
 xcheck( TextField.prototype.hasOwnProperty('bottomScroll') );
@@ -142,9 +142,28 @@
 
 // Check TextField.autoSize
 
-xcheck_equals(typeof(tf.autoSize), 'string');
-xcheck_equals(tf.autoSize, 'none'); // TODO: research which valid values we have
+check_equals(typeof(tf.autoSize), 'string');
+check_equals(tf.autoSize, 'none'); // TODO: research which valid values we have
 check(! tf.hasOwnProperty('autoSize'));
+tf.autoSize = false;
+check_equals(tf.autoSize, 'none'); // false is a synonim for 'none'
+tf.autoSize = true;
+check_equals(tf.autoSize, 'left'); // true is a synonim for 'left'
+tf.autoSize = 'true';
+check_equals(tf.autoSize, 'none'); // 'true' (as a string) is invalid, thus equivalent to 'none'
+tf.autoSize = 'center';
+check_equals(tf.autoSize, 'center'); // 'center' is a valid value
+tf.autoSize = 'right';
+check_equals(tf.autoSize, 'right'); // 'right' is a valid value
+o = new Object(); o.toString = function() { return 'center'; };
+tf.autoSize = o;
+check_equals(tf.autoSize, 'center'); // toString is called for object args
+tf.autoSize = 'lEft';
+xcheck_equals(tf.autoSize, 'left'); // arg is not case sensitive 
+tf.autoSize = new Boolean(true);
+check_equals(tf.autoSize, 'none'); // a Boolean is the same as any other object
+
+tf.autoSize = 'none';
 
 // Check TextField.background
 

Index: testsuite/misc-ming.all/DefineEditTextTest.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/DefineEditTextTest.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- testsuite/misc-ming.all/DefineEditTextTest.c	9 Aug 2007 08:46:44 -0000	1.25
+++ testsuite/misc-ming.all/DefineEditTextTest.c	13 Aug 2007 03:26:10 -0000	1.26
@@ -24,6 +24,7 @@
  * Text at the bottom is the one with embedded fonts.
  * 
  * TODO: add a testrunner for pixel checking.
+ * TODO: test autoSize and wordWrap interaction (what takes precedence?)
  *
  * run as ./DefineEditTextTest
  */



From MAILER-DAEMON Sun Aug 12 23:26:41 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IKQZl-0000bd-4R
	for mharc-gnash-commit@gnu.org; Sun, 12 Aug 2007 23:26:41 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IKQZj-0000aV-IA
	for gnash-commit@gnu.org; Sun, 12 Aug 2007 23:26:39 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IKQZi-0000aH-Vb
	for gnash-commit@gnu.org; Sun, 12 Aug 2007 23:26:39 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IKQZi-0000a6-QD
	for gnash-commit@gnu.org; Sun, 12 Aug 2007 23:26:38 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IKQZi-0006UB-8U
	for gnash-commit@gnu.org; Sun, 12 Aug 2007 23:26:38 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IKQZd-0005Wm-RV
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 03:26:33 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IKQZd-0005Wj-KA
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 03:26:33 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IKQZd-0005Wj-KA@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 13 Aug 2007 03:26:33 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/server edit_text_character.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Aug 2007 03:26:40 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/13 03:26:33

Modified files:
	server         : edit_text_character.cpp 

Log message:
	comment out debugging line

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.97&r2=1.98

Patches:
Index: edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -b -r1.97 -r1.98
--- edit_text_character.cpp	13 Aug 2007 03:26:09 -0000	1.97
+++ edit_text_character.cpp	13 Aug 2007 03:26:33 -0000	1.98
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: edit_text_character.cpp,v 1.97 2007/08/13 03:26:09 strk Exp $ */
+/* $Id: edit_text_character.cpp,v 1.98 2007/08/13 03:26:33 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1626,7 +1626,7 @@
 		{
 			std::string strval = arg.to_string(&(fn.env()));
 			edit_text_character::AutoSizeValue val = ptr->parseAutoSizeValue(strval);
-			log_debug("%s => %d", strval.c_str(), val);
+			//log_debug("%s => %d", strval.c_str(), val);
 			ptr->setAutoSize( val );
 		}
 	}



From MAILER-DAEMON Mon Aug 13 03:20:16 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IKUDo-0007gy-7I
	for mharc-gnash-commit@gnu.org; Mon, 13 Aug 2007 03:20:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IKUDl-0007gt-Sa
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 03:20:13 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IKUDk-0007gh-CL
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 03:20:12 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IKUDk-0007ge-6n
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 03:20:12 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IKUDj-0008DE-Uc
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 03:20:12 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IKUDj-0003Jg-0y
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 07:20:11 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IKUDi-0003Jd-Lm
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 07:20:10 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IKUDi-0003Jd-Lm@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Mon, 13 Aug 2007 07:20:10 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/sprite_instance.cpp serv...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Aug 2007 07:20:14 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/13 07:20:10

Modified files:
	.              : ChangeLog 
	server         : sprite_instance.cpp sprite_instance.h 
	testsuite/actionscript.all: ops.as 

Log message:
	* server/sprite_instance.{h,cpp}: deprecate clone_display_object(), use 
	 duplicateMovieClip() instead.
	* testsuite/actionscript.all/ops.as: more tests.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3999&r2=1.4000
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.307&r2=1.308
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.129&r2=1.130
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/ops.as?cvsroot=gnash&r1=1.14&r2=1.15

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3999
retrieving revision 1.4000
diff -u -b -r1.3999 -r1.4000
--- ChangeLog	13 Aug 2007 03:26:09 -0000	1.3999
+++ ChangeLog	13 Aug 2007 07:20:08 -0000	1.4000
@@ -1,14 +1,13 @@
-2007-08-12 Sandro Santilli <strk@keybit.net>
+2007-08-13 Zou Lunkai <zoulunkai@gmail.com>
+
+	* server/sprite_instance.{h,cpp}: deprecate clone_display_object(), use 
+	  duplicateMovieClip() instead.
+	* testsuite/actionscript.all/ops.as: more tests.
 
-	* server/edit_text_character.{cpp,h}: add autoSize getter/setter
-	  (still not used)
-	* testsuite/actionscript.all/TextField.as: add tests for autoSize
-	  member.
-	* testsuite/misc-ming.all/DefineEditTextTest.c: add TODO items.
-	* server/as_value.h: add is_bool()
 
 2007-08-12 Sandro Santilli <strk@keybit.net>
 
+	* server/as_value.h: add is_bool()
 	* server/edit_text_character.h (getBounds): add TODO item
 	  (I belive is a fix for bug #20760)
 

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -b -r1.307 -r1.308
--- server/sprite_instance.cpp	9 Aug 2007 12:18:06 -0000	1.307
+++ server/sprite_instance.cpp	13 Aug 2007 07:20:09 -0000	1.308
@@ -2080,6 +2080,7 @@
 	return newsprite;
 }
 
+#if 0
 void sprite_instance::clone_display_object(const std::string& name,
 	const std::string& newname, int depth)
 {
@@ -2110,6 +2111,7 @@
 			    name.c_str(), newname.c_str(), depth, name.c_str());
     }
 }
+#endif
 
 /* private */
 void

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -b -r1.129 -r1.130
--- server/sprite_instance.h	9 Aug 2007 12:18:06 -0000	1.129
+++ server/sprite_instance.h	13 Aug 2007 07:20:09 -0000	1.130
@@ -780,12 +780,12 @@
 	///	Member name. 
 	///
 	void checkForKeyOrMouseEvent(const std::string& name);
-
+#if 0
 	/// Duplicate the object with the specified name
 	/// and add it with a new name  at a new depth.
 	void clone_display_object(const std::string& name,
 		const std::string& newname, int depth);
-
+#endif
 	/// Reset the DisplayList for proper loop-back or goto_frame
 	//
 	/// The DisplayList is cleared by all but dynamic characters

Index: testsuite/actionscript.all/ops.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/ops.as,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- testsuite/actionscript.all/ops.as	7 Aug 2007 03:32:21 -0000	1.14
+++ testsuite/actionscript.all/ops.as	13 Aug 2007 07:20:09 -0000	1.15
@@ -20,7 +20,7 @@
  *  Test binary predicates (equal, less_then, greater_then, logical and bitwise ops)
  */
 
-rcsid="$Id: ops.as,v 1.14 2007/08/07 03:32:21 zoulunkai Exp $";
+rcsid="$Id: ops.as,v 1.15 2007/08/13 07:20:09 zoulunkai Exp $";
 
 #include "check.as"
 
@@ -362,7 +362,10 @@
 check_equals( (1|null), 1 );
 check_equals( (null|null), 0 );
 check_equals( (8|4), 12 );
-// TODO ... 
+
+// The check below will fail if Ming converts the long int to a double
+// (only with Gnash, it works fine with the proprietary player)
+check_equals((0xffffffff|0), -1); 
 
 //------------------------------------------------
 // Bitwise XOR operator (ACTION_BITWISEOR : 0x62)
@@ -376,11 +379,30 @@
 check_equals( (null^null), 0 );
 check_equals( (8^12), 4 );
 
-// The check below will fail if Ming converts the long int to a double
-// (only with Gnash, it works fine with the proprietary player)
-check_equals((0xffffffff|0), -1);
+x = 1;
+y = 2;
+check_equals(x^y, 3);
+
+x = 1.1;
+y = 2.1;
+check_equals(x^y, 3);
+
+x = 1.999;
+y = 2.999;
+check_equals(x^y, 3);
+
+x = new String("1.999");
+y = new String("2.999");
+xcheck_equals(x^y, 3);
+
+x = new String("1.999");
+y = 2.999;
+xcheck_equals(x^y, 3);
+
+x = 1.999;
+y = new String("2.999");
+xcheck_equals(x^y, 3);
 
-// TODO ... 
 
 //------------------------------------------------
 // Shift left operator (ACTION_SHIFTLEFT : 0x63)
@@ -492,3 +514,57 @@
 //-------------------------------------------------
 
 // TODO ...  
+
+
+//------------------------------------------------
+// Decrement Operator (ACTION_DECREMENT: 0x51)
+//------------------------------------------------
+
+x = 1;
+y = --x;
+check_equals(y, 0);
+
+x = 0;
+y = --x;
+check_equals(y, -1);
+
+x = new String("1.9");
+y = --x;
+//xcheck_equals(y, 0.9);
+xcheck( (y-0.9) < 0.001 );
+
+x = new String("0.0");
+y = --x;
+//xcheck_equals(y, -1.0);
+xcheck( (y+1.0) < 0.001 );
+
+x = new String("a");
+y = --x;
+xcheck(y!=NaN);
+check(isNaN(y));
+
+//------------------------------------------------
+// Increment Operator (ACTION_DECREMENT: 0x50)
+//------------------------------------------------
+
+x = 0;
+y = ++x;
+check_equals(y, 1);
+
+x = -1;
+y = ++x;
+check_equals(y, 0);
+
+x = new String("1.9");
+y = ++x;
+//xcheck_equals(y, 2.9);
+check( (y-2.9) < 0.001 );
+
+x = new String("0.0");
+y = ++x;
+xcheck_equals(y, 1);
+
+x = new String("a");
+y = ++x;
+xcheck(y!=NaN);
+check(isNaN(y));



From MAILER-DAEMON Mon Aug 13 03:27:00 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IKUKK-0001jH-Jk
	for mharc-gnash-commit@gnu.org; Mon, 13 Aug 2007 03:27:00 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IKUKH-0001gM-1a
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 03:26:57 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IKUKG-0001gA-Ca
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 03:26:56 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IKUKG-0001g5-6Q
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 03:26:56 -0400
Received: from wa-out-1112.google.com ([209.85.146.179])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1IKUKF-000158-Kd
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 03:26:55 -0400
Received: by wa-out-1112.google.com with SMTP id k34so1689325wah
	for <gnash-commit@gnu.org>; Mon, 13 Aug 2007 00:26:54 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=irBo342jXl+YGpexX810CaH4qyOuRWa+WI4QLNGADyGAzBumUFJ3QDfGYUCzd2KUZmJY0/oYAIWZYkqMEGO1pjPprEqGJC0URKdTaQ0IHx2i9PXgHNp3RMSx6iICmchpLn+4jRckClJiGrCHH0tx0/8VHcvJZjwrIFeCSWTJCS0=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=D5Wf1gpTHD3VoRvmLnzisk70ufhPfBZtNRAML6GODvtbH0HlEz7FUwytpCvv9FTV7SvAu6s3D8Lfc1VWfMfEREa9xuQZ5bS0GyERVetY6Ehb0ORcM31F5MXHcwILZkg8RoO3NQ+C21TxBZJpuu6lya8zwm9lLYgcSyOUJAlzayQ=
Received: by 10.114.77.1 with SMTP id z1mr501620waa.1186990013906;
	Mon, 13 Aug 2007 00:26:53 -0700 (PDT)
Received: by 10.114.110.5 with HTTP; Mon, 13 Aug 2007 00:26:53 -0700 (PDT)
Message-ID: <ca4b43ff0708130026k6247586di13f3bb4ef72ab308@mail.gmail.com>
Date: Mon, 13 Aug 2007 15:26:53 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "Sandro Santilli" <strk@keybit.net>
Subject: Re: [Gnash-commit] gnash ChangeLog server/sprite_instance.cpp serv...
In-Reply-To: <E1IKUDi-0003Jd-Lm@cvs.savannah.gnu.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1IKUDi-0003Jd-Lm@cvs.savannah.gnu.org>
X-Detected-Kernel: Linux 2.6 (newer, 2)
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Aug 2007 07:26:57 -0000

> -       * server/edit_text_character.{cpp,h}: add autoSize getter/setter
> -         (still not used)
> -       * testsuite/actionscript.all/TextField.as: add tests for autoSize
> -         member.
> -       * testsuite/misc-ming.all/DefineEditTextTest.c: add TODO items.
> -       * server/as_value.h: add is_bool()
>
>  2007-08-12 Sandro Santilli <strk@keybit.net>
>
> +       * server/as_value.h: add is_bool()

Ops, I guess  these are cvs conflicts. I didn't mean to remove strk's
ChangeLog entry.



On 8/13/07, Zou Lunkai <zoulunkai@gmail.com> wrote:
> CVSROOT:        /sources/gnash
> Module name:    gnash
> Changes by:     Zou Lunkai <zoulunkai>  07/08/13 07:20:10
>
> Modified files:
>         .              : ChangeLog
>         server         : sprite_instance.cpp sprite_instance.h
>         testsuite/actionscript.all: ops.as
>
> Log message:
>         * server/sprite_instance.{h,cpp}: deprecate clone_display_object(), use
>          duplicateMovieClip() instead.
>         * testsuite/actionscript.all/ops.as: more tests.
>
> CVSWeb URLs:
> http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3999&r2=1.4000
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.307&r2=1.308
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.129&r2=1.130
> http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/ops.as?cvsroot=gnash&r1=1.14&r2=1.15
>
> Patches:
> Index: ChangeLog
> ===================================================================
> RCS file: /sources/gnash/gnash/ChangeLog,v
> retrieving revision 1.3999
> retrieving revision 1.4000
> diff -u -b -r1.3999 -r1.4000
> --- ChangeLog   13 Aug 2007 03:26:09 -0000      1.3999
> +++ ChangeLog   13 Aug 2007 07:20:08 -0000      1.4000
> @@ -1,14 +1,13 @@
> -2007-08-12 Sandro Santilli <strk@keybit.net>
> +2007-08-13 Zou Lunkai <zoulunkai@gmail.com>
> +
> +       * server/sprite_instance.{h,cpp}: deprecate clone_display_object(), use
> +         duplicateMovieClip() instead.
> +       * testsuite/actionscript.all/ops.as: more tests.
>
> -       * server/edit_text_character.{cpp,h}: add autoSize getter/setter
> -         (still not used)
> -       * testsuite/actionscript.all/TextField.as: add tests for autoSize
> -         member.
> -       * testsuite/misc-ming.all/DefineEditTextTest.c: add TODO items.
> -       * server/as_value.h: add is_bool()
>
>  2007-08-12 Sandro Santilli <strk@keybit.net>
>
> +       * server/as_value.h: add is_bool()
>         * server/edit_text_character.h (getBounds): add TODO item
>           (I belive is a fix for bug #20760)
>
>
> Index: server/sprite_instance.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
> retrieving revision 1.307
> retrieving revision 1.308
> diff -u -b -r1.307 -r1.308
> --- server/sprite_instance.cpp  9 Aug 2007 12:18:06 -0000       1.307
> +++ server/sprite_instance.cpp  13 Aug 2007 07:20:09 -0000      1.308
> @@ -2080,6 +2080,7 @@
>         return newsprite;
>  }
>
> +#if 0
>  void sprite_instance::clone_display_object(const std::string& name,
>         const std::string& newname, int depth)
>  {
> @@ -2110,6 +2111,7 @@
>                             name.c_str(), newname.c_str(), depth, name.c_str());
>      }
>  }
> +#endif
>
>  /* private */
>  void
>
> Index: server/sprite_instance.h
> ===================================================================
> RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
> retrieving revision 1.129
> retrieving revision 1.130
> diff -u -b -r1.129 -r1.130
> --- server/sprite_instance.h    9 Aug 2007 12:18:06 -0000       1.129
> +++ server/sprite_instance.h    13 Aug 2007 07:20:09 -0000      1.130
> @@ -780,12 +780,12 @@
>         ///     Member name.
>         ///
>         void checkForKeyOrMouseEvent(const std::string& name);
> -
> +#if 0
>         /// Duplicate the object with the specified name
>         /// and add it with a new name  at a new depth.
>         void clone_display_object(const std::string& name,
>                 const std::string& newname, int depth);
> -
> +#endif
>         /// Reset the DisplayList for proper loop-back or goto_frame
>         //
>         /// The DisplayList is cleared by all but dynamic characters
>
> Index: testsuite/actionscript.all/ops.as
> ===================================================================
> RCS file: /sources/gnash/gnash/testsuite/actionscript.all/ops.as,v
> retrieving revision 1.14
> retrieving revision 1.15
> diff -u -b -r1.14 -r1.15
> --- testsuite/actionscript.all/ops.as   7 Aug 2007 03:32:21 -0000       1.14
> +++ testsuite/actionscript.all/ops.as   13 Aug 2007 07:20:09 -0000      1.15
> @@ -20,7 +20,7 @@
>   *  Test binary predicates (equal, less_then, greater_then, logical and bitwise ops)
>   */
>
> -rcsid="$Id: ops.as,v 1.14 2007/08/07 03:32:21 zoulunkai Exp $";
> +rcsid="$Id: ops.as,v 1.15 2007/08/13 07:20:09 zoulunkai Exp $";
>
>  #include "check.as"
>
> @@ -362,7 +362,10 @@
>  check_equals( (1|null), 1 );
>  check_equals( (null|null), 0 );
>  check_equals( (8|4), 12 );
> -// TODO ...
> +
> +// The check below will fail if Ming converts the long int to a double
> +// (only with Gnash, it works fine with the proprietary player)
> +check_equals((0xffffffff|0), -1);
>
>  //------------------------------------------------
>  // Bitwise XOR operator (ACTION_BITWISEOR : 0x62)
> @@ -376,11 +379,30 @@
>  check_equals( (null^null), 0 );
>  check_equals( (8^12), 4 );
>
> -// The check below will fail if Ming converts the long int to a double
> -// (only with Gnash, it works fine with the proprietary player)
> -check_equals((0xffffffff|0), -1);
> +x = 1;
> +y = 2;
> +check_equals(x^y, 3);
> +
> +x = 1.1;
> +y = 2.1;
> +check_equals(x^y, 3);
> +
> +x = 1.999;
> +y = 2.999;
> +check_equals(x^y, 3);
> +
> +x = new String("1.999");
> +y = new String("2.999");
> +xcheck_equals(x^y, 3);
> +
> +x = new String("1.999");
> +y = 2.999;
> +xcheck_equals(x^y, 3);
> +
> +x = 1.999;
> +y = new String("2.999");
> +xcheck_equals(x^y, 3);
>
> -// TODO ...
>
>  //------------------------------------------------
>  // Shift left operator (ACTION_SHIFTLEFT : 0x63)
> @@ -492,3 +514,57 @@
>  //-------------------------------------------------
>
>  // TODO ...
> +
> +
> +//------------------------------------------------
> +// Decrement Operator (ACTION_DECREMENT: 0x51)
> +//------------------------------------------------
> +
> +x = 1;
> +y = --x;
> +check_equals(y, 0);
> +
> +x = 0;
> +y = --x;
> +check_equals(y, -1);
> +
> +x = new String("1.9");
> +y = --x;
> +//xcheck_equals(y, 0.9);
> +xcheck( (y-0.9) < 0.001 );
> +
> +x = new String("0.0");
> +y = --x;
> +//xcheck_equals(y, -1.0);
> +xcheck( (y+1.0) < 0.001 );
> +
> +x = new String("a");
> +y = --x;
> +xcheck(y!=NaN);
> +check(isNaN(y));
> +
> +//------------------------------------------------
> +// Increment Operator (ACTION_DECREMENT: 0x50)
> +//------------------------------------------------
> +
> +x = 0;
> +y = ++x;
> +check_equals(y, 1);
> +
> +x = -1;
> +y = ++x;
> +check_equals(y, 0);
> +
> +x = new String("1.9");
> +y = ++x;
> +//xcheck_equals(y, 2.9);
> +check( (y-2.9) < 0.001 );
> +
> +x = new String("0.0");
> +y = ++x;
> +xcheck_equals(y, 1);
> +
> +x = new String("a");
> +y = ++x;
> +xcheck(y!=NaN);
> +check(isNaN(y));
>
>
> _______________________________________________
> Gnash-commit mailing list
> Gnash-commit@gnu.org
> http://lists.gnu.org/mailman/listinfo/gnash-commit
>



From MAILER-DAEMON Mon Aug 13 03:31:26 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IKUOc-0006zv-78
	for mharc-gnash-commit@gnu.org; Mon, 13 Aug 2007 03:31:26 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IKUOa-0006zp-D9
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 03:31:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IKUOZ-0006zd-0w
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 03:31:23 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IKUOY-0006za-SS
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 03:31:22 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IKUOY-0001pY-KB
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 03:31:22 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IKUOY-0003WL-6W
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 07:31:22 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IKUOY-0003WI-1K
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 07:31:22 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IKUOY-0003WI-1K@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Mon, 13 Aug 2007 07:31:22 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Aug 2007 07:31:25 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/13 07:31:21

Modified files:
	.              : ChangeLog 

Log message:
	recover strk's ChangLog entry.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4000&r2=1.4001

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4000
retrieving revision 1.4001
diff -u -b -r1.4000 -r1.4001
--- ChangeLog	13 Aug 2007 07:20:08 -0000	1.4000
+++ ChangeLog	13 Aug 2007 07:31:21 -0000	1.4001
@@ -4,6 +4,13 @@
 	  duplicateMovieClip() instead.
 	* testsuite/actionscript.all/ops.as: more tests.
 
+2007-08-12 Sandro Santilli <strk@keybit.net>
+
+	* server/edit_text_character.{cpp,h}: add autoSize getter/setter
+	  (still not used)
+	* testsuite/actionscript.all/TextField.as: add tests for autoSize
+    member.
+	* testsuite/misc-ming.all/DefineEditTextTest.c: add TODO items.
 
 2007-08-12 Sandro Santilli <strk@keybit.net>
 



From MAILER-DAEMON Mon Aug 13 04:00:50 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IKUr3-0000De-W6
	for mharc-gnash-commit@gnu.org; Mon, 13 Aug 2007 04:00:50 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IKUr2-0000Bk-AO
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 04:00:48 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IKUqz-00009t-O5
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 04:00:47 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IKUqz-00009c-GB
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 04:00:45 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IKUqz-00087Y-34
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 04:00:45 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IKUqy-0005TJ-JN
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 08:00:44 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IKUqy-0005TG-EJ
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 08:00:44 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IKUqy-0005TG-EJ@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Mon, 13 Aug 2007 08:00:44 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/testsuite/actionscript.all ops.as
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Aug 2007 08:00:49 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/13 08:00:44

Modified files:
	testsuite/actionscript.all: ops.as 

Log message:
	check->xcheck

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/ops.as?cvsroot=gnash&r1=1.15&r2=1.16

Patches:
Index: ops.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/ops.as,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- ops.as	13 Aug 2007 07:20:09 -0000	1.15
+++ ops.as	13 Aug 2007 08:00:44 -0000	1.16
@@ -20,7 +20,7 @@
  *  Test binary predicates (equal, less_then, greater_then, logical and bitwise ops)
  */
 
-rcsid="$Id: ops.as,v 1.15 2007/08/13 07:20:09 zoulunkai Exp $";
+rcsid="$Id: ops.as,v 1.16 2007/08/13 08:00:44 zoulunkai Exp $";
 
 #include "check.as"
 
@@ -558,7 +558,7 @@
 x = new String("1.9");
 y = ++x;
 //xcheck_equals(y, 2.9);
-check( (y-2.9) < 0.001 );
+xcheck( (y-2.9) < 0.001 );
 
 x = new String("0.0");
 y = ++x;



From MAILER-DAEMON Mon Aug 13 04:40:28 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IKVTQ-0004dm-B5
	for mharc-gnash-commit@gnu.org; Mon, 13 Aug 2007 04:40:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IKVTN-0004cR-KQ
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 04:40:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IKVTM-0004bj-9C
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 04:40:24 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IKVTL-0004be-Pi
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 04:40:23 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IKVTL-0007tg-Db
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 04:40:23 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IKVTK-0007RX-Rt
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 08:40:22 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IKVTK-0007RU-Mk
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 08:40:22 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IKVTK-0007RU-Mk@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Mon, 13 Aug 2007 08:40:22 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/samples/gotoFrameOnKe...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Aug 2007 08:40:26 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/13 08:40:22

Modified files:
	.              : ChangeLog 
	testsuite/samples: gotoFrameOnKeyEvent-TestRunner.cpp 

Log message:
	* testsuite/samples/gotoFrameOnKeyEvent-TestRunner.cpp: finish the test runner.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4001&r2=1.4002
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/samples/gotoFrameOnKeyEvent-TestRunner.cpp?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4001
retrieving revision 1.4002
diff -u -b -r1.4001 -r1.4002
--- ChangeLog	13 Aug 2007 07:31:21 -0000	1.4001
+++ ChangeLog	13 Aug 2007 08:40:21 -0000	1.4002
@@ -3,6 +3,7 @@
 	* server/sprite_instance.{h,cpp}: deprecate clone_display_object(), use 
 	  duplicateMovieClip() instead.
 	* testsuite/actionscript.all/ops.as: more tests.
+	* testsuite/samples/gotoFrameOnKeyEvent-TestRunner.cpp: finish the test runner.
 
 2007-08-12 Sandro Santilli <strk@keybit.net>
 

Index: testsuite/samples/gotoFrameOnKeyEvent-TestRunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/samples/gotoFrameOnKeyEvent-TestRunner.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- testsuite/samples/gotoFrameOnKeyEvent-TestRunner.cpp	1 Jul 2007 10:55:11 -0000	1.4
+++ testsuite/samples/gotoFrameOnKeyEvent-TestRunner.cpp	13 Aug 2007 08:40:22 -0000	1.5
@@ -69,14 +69,74 @@
 	tester.advance();
 	check_equals(root->get_current_frame(), 0);
 
+  // press key 1 four times
+  for(int i=1; i<=4; i++)
+  {
+    tester.pressKey(key::_1);
+    tester.releaseKey(key::_1);
+    check_equals(root->get_current_frame(), i);
+    tester.advance();
+    check_equals(root->get_current_frame(), i);
+  }
+  
+  // press key 0 four times
+  for(int i=3; i>=0; i--)
+  {
+    tester.pressKey(key::_0);
+    tester.releaseKey(key::_0);
+    check_equals(root->get_current_frame(), i);
+    tester.advance();
+    check_equals(root->get_current_frame(), i);
+  }
+
+  // press key 1 two times
+  for(int i=1; i<=2; i++)
+  {
 	tester.pressKey(key::_1);
+    tester.releaseKey(key::_1);
+    check_equals(root->get_current_frame(), i);
+    tester.advance();
+    check_equals(root->get_current_frame(), i);
+  }
 
-	// TODO: check if it is correct to wait for next ::advance before expecting gotoFrame actions
-	//       execution !!
+  // press key DOWN two times
+  {
+    tester.pressKey(key::DOWN);
+    tester.releaseKey(key::DOWN);
+    check_equals(root->get_current_frame(), 5);
+    tester.advance();
+    check_equals(root->get_current_frame(), 5);
+
+    tester.pressKey(key::DOWN);
+    tester.releaseKey(key::DOWN);
+    check_equals(root->get_current_frame(), 6);
+    tester.advance();
+    check_equals(root->get_current_frame(), 6);
+  }
+
+  // press key UP two times
+  {
+    tester.pressKey(key::UP);
+    tester.releaseKey(key::UP);
+    check_equals(root->get_current_frame(), 5);
+    tester.advance();
+    check_equals(root->get_current_frame(), 5);
 
-	check_equals(root->get_current_frame(), 1);
+    tester.pressKey(key::UP);
+    tester.releaseKey(key::UP);
+    check_equals(root->get_current_frame(), 2);
 	tester.advance();
-	check_equals(root->get_current_frame(), 1);
+    check_equals(root->get_current_frame(), 2);
+  }
 
+  // press key 0 two times, now should be back to the first frame
+  for(int i=1; i>=0; i--)
+  {
+    tester.pressKey(key::_0);
+    tester.releaseKey(key::_0);
+    check_equals(root->get_current_frame(), i);
+    tester.advance();
+    check_equals(root->get_current_frame(), i);
+  }
 }
 



From MAILER-DAEMON Mon Aug 13 08:33:09 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IKZ6b-0007eZ-7t
	for mharc-gnash-commit@gnu.org; Mon, 13 Aug 2007 08:33:09 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IKZ6Z-0007d7-Ae
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 08:33:07 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IKZ6X-0007c8-Lu
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 08:33:06 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IKZ6X-0007bi-9K
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 08:33:05 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IKZ6W-0003n1-SA
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 08:33:04 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IKZ6U-0006bp-Ef
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 12:33:02 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IKZ6U-0006bm-9y
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 12:33:02 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IKZ6U-0006bm-9y@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 13 Aug 2007 12:33:02 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Aug 2007 12:33:07 -0000

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

Modified files:
	.              : ChangeLog 

Log message:
	indent

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4002&r2=1.4003

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4002
retrieving revision 1.4003
diff -u -b -r1.4002 -r1.4003



From MAILER-DAEMON Mon Aug 13 23:04:45 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IKmi5-0002TR-96
	for mharc-gnash-commit@gnu.org; Mon, 13 Aug 2007 23:04:45 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IKmi3-0002Rm-J7
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 23:04:43 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IKmi2-0002Qh-DS
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 23:04:42 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IKmi2-0002Qd-7p
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 23:04:42 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IKmi1-00050h-RH
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 23:04:41 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IKmhp-0006KX-DP
	for gnash-commit@gnu.org; Tue, 14 Aug 2007 03:04:29 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IKmhp-0006KU-81
	for gnash-commit@gnu.org; Tue, 14 Aug 2007 03:04:29 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IKmhp-0006KU-81@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 14 Aug 2007 03:04:29 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/Text...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Aug 2007 03:04:43 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/14 03:04:29

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: TextField.as 

Log message:
	        * testsuite/actionscript.all/TextField.as: add more tests for
	          background, backgroundColor and interaction between _width and
	          autoSize.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4003&r2=1.4004
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/TextField.as?cvsroot=gnash&r1=1.14&r2=1.15

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4003
retrieving revision 1.4004
diff -u -b -r1.4003 -r1.4004
--- ChangeLog	13 Aug 2007 12:33:01 -0000	1.4003
+++ ChangeLog	14 Aug 2007 03:04:28 -0000	1.4004
@@ -1,3 +1,9 @@
+2007-08-13 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/actionscript.all/TextField.as: add more tests for
+	  background, backgroundColor and interaction between _width and
+	  autoSize.
+
 2007-08-13 Zou Lunkai <zoulunkai@gmail.com>
 
 	* server/sprite_instance.{h,cpp}: deprecate clone_display_object(), use 

Index: testsuite/actionscript.all/TextField.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/TextField.as,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- testsuite/actionscript.all/TextField.as	13 Aug 2007 03:26:10 -0000	1.14
+++ testsuite/actionscript.all/TextField.as	14 Aug 2007 03:04:29 -0000	1.15
@@ -19,7 +19,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: TextField.as,v 1.14 2007/08/13 03:26:10 strk Exp $";
+rcsid="$Id: TextField.as,v 1.15 2007/08/14 03:04:29 strk Exp $";
 
 #include "check.as"
 
@@ -169,11 +169,38 @@
 
 check_equals(typeof(tf.background), 'boolean');
 check(!tf.hasOwnProperty('background'));
+check_equals(tf.background, false);
+tf.background = true;
+check_equals(tf.background, true);
+tf.background = 0;
+check_equals(tf.background, false);
+check_equals(typeof(tf.background), 'boolean');
+tf.background = 54.3;
+check_equals(typeof(tf.background), 'boolean');
+check_equals(tf.background, true);
+o = new Object; o.valueOf = function() { return 0x0000FF; };
+tf.background = o;
+check_equals(tf.background, true);
+o = new Object; o.valueOf = function() { return 'string'; };
+tf.background = o;
+check_equals(typeof(tf.background), 'boolean');
+check_equals(tf.background, true); // 'string' evaluates to true
+tf.background = new Boolean(false);
+check_equals(typeof(tf.background), 'boolean');
+check_equals(tf.background, true);  // dunno why, but Boolean evaluates to false 
+tf.background = false;
 
 // Check TextField.backgroundColor
 
 check_equals(typeof(tf.backgroundColor), 'number');
 check(!tf.hasOwnProperty('backgroundColor'));
+tf.backgroundColor = 0x00FF00;
+check_equals(tf.backgroundColor, 0x00FF00);
+tf.backgroundColor = 'red';
+check_equals(tf.backgroundColor, 0x000000); // string value evaluates to NaN thus 0
+o = new Object; o.valueOf = function() { return 0x0000FF; };
+tf.backgroundColor = o;
+check_equals(tf.backgroundColor, 0x0000FF); // valueOf is invoked
 
 // Check TextField.border
 
@@ -588,5 +615,12 @@
 xcheck_equals(tf._height, currHeight*2);
 tf._yscale = 100;
 
+// Check interaction between autoSize and _width
+tf._width = 10; // "hello world" text should overflow this
+tf.text = "Hello world";
+tf.autoSize = 'none';
+xcheck_equals(tf._width, 10);
+tf.autoSize = 'center';
+check(tf._width > 10);
 
 #endif // OUTPUT_VERSION > 5



From MAILER-DAEMON Mon Aug 13 23:08:10 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IKmlN-00034d-V2
	for mharc-gnash-commit@gnu.org; Mon, 13 Aug 2007 23:08:09 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IKmlM-00034Y-Ka
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 23:08:08 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IKmlJ-00031u-88
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 23:08:08 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IKmlJ-00031q-2L
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 23:08:05 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1IKmlI-0005oq-9M
	for gnash-commit@gnu.org; Mon, 13 Aug 2007 23:08:04 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l7E37tQ13286;
	Tue, 14 Aug 2007 05:07:55 +0200 (CEST)
	(envelope-from strk@keybit.net)
Date: Tue, 14 Aug 2007 05:07:55 +0200
From: Sandro Santilli <strk@keybit.net>
To: zou lunkai <zoulunkai@gmail.com>
Subject: Re: [Gnash-commit] gnash ChangeLog server/array.cpp server/array.h...
Message-ID: <20070814030755.GA8979@keybit.net>
Mail-Followup-To: zou lunkai <zoulunkai@gmail.com>, meteoryte@yahoo.com.au,
	gnash-commit@gnu.org
References: <E1IF8KT-0005di-RS@cvs.savannah.gnu.org>
	<ca4b43ff0708121953v3fae59b5yeeec12765a75b807@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <ca4b43ff0708121953v3fae59b5yeeec12765a75b807@mail.gmail.com>
X-Detected-Kernel: FreeBSD 2.0-4.2
Cc: meteoryte@yahoo.com.au, gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Aug 2007 03:08:08 -0000

On Mon, Aug 13, 2007 at 10:53:07AM +0800, zou lunkai wrote:
> >+       unsigned int optnum = props->size();
> >+       as_cmp_fn cmp[optnum];
> >+       as_cmp_fn eq[optnum];
> 
> >+       uint8_t flgs[optnum];
> 
> A question, is it good practice to rely on VLA(variable length array)?
>  Note that even VC8 compiler does not support this feature.
> 
> I guess we should not rely on it, which is compiler dependent(based on
> google search) and only occurs in array.cpp.  What about replace it
> with some STL containers?

Just for the record:
http://savannah.gnu.org/patch/index.php?6149
"Replace VLAs in array.cpp with std containers"

--strk;




From MAILER-DAEMON Tue Aug 14 02:07:09 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IKpYb-0007Q8-9X
	for mharc-gnash-commit@gnu.org; Tue, 14 Aug 2007 02:07:09 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IKpYY-0007Pd-O6
	for gnash-commit@gnu.org; Tue, 14 Aug 2007 02:07:06 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IKpYX-0007PR-JK
	for gnash-commit@gnu.org; Tue, 14 Aug 2007 02:07:05 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IKpYX-0007PO-EG
	for gnash-commit@gnu.org; Tue, 14 Aug 2007 02:07:05 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IKpYX-0002ZU-2D
	for gnash-commit@gnu.org; Tue, 14 Aug 2007 02:07:05 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IKpYV-0003VR-Sq
	for gnash-commit@gnu.org; Tue, 14 Aug 2007 06:07:03 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IKpYV-0003VN-Os
	for gnash-commit@gnu.org; Tue, 14 Aug 2007 06:07:03 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IKpYV-0003VN-Os@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Tue, 14 Aug 2007 06:07:03 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/array.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Aug 2007 06:07:07 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/14 06:07:03

Modified files:
	.              : ChangeLog 
	server         : array.cpp 

Log message:
	apply patch#6149 
	* server/array.cpp: replace VLAs with std containers.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4004&r2=1.4005
http://cvs.savannah.gnu.org/viewcvs/gnash/server/array.cpp?cvsroot=gnash&r1=1.72&r2=1.73

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4004
retrieving revision 1.4005
diff -u -b -r1.4004 -r1.4005
--- ChangeLog	14 Aug 2007 03:04:28 -0000	1.4004
+++ ChangeLog	14 Aug 2007 06:07:02 -0000	1.4005
@@ -1,3 +1,7 @@
+2007-08-14 Ivor Blockley <meteoryte@yahoo.com.au>
+
+	* server/array.cpp: replace VLAs with std containers.
+	  
 2007-08-13 Sandro Santilli <strk@keybit.net>
 
 	* testsuite/actionscript.all/TextField.as: add more tests for

Index: server/array.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/array.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- server/array.cpp	4 Aug 2007 04:23:32 -0000	1.72
+++ server/array.cpp	14 Aug 2007 06:07:03 -0000	1.73
@@ -399,20 +399,21 @@
 class as_value_multiprop
 {
 public:
-	const as_cmp_fn* _cmps;
+	std::deque<as_cmp_fn>& _cmps;
 	std::deque<std::string>& _prps;
 
 	// Note: all as_cmp_fns in *cmps must implement strict weak ordering
-	as_value_multiprop(std::deque<std::string>& prps, as_cmp_fn* cmps)
+	as_value_multiprop(std::deque<std::string>& prps, 
+		std::deque<as_cmp_fn>& cmps)
 		:
+		_cmps(cmps),
 		_prps(prps)
 	{
-		_cmps = cmps;
 	}
 
 	bool operator() (const as_value& a, const as_value& b)
 	{
-		const as_cmp_fn* cmp = _cmps;
+		std::deque<as_cmp_fn>::iterator cmp = _cmps.begin();
 		std::deque<std::string>::iterator pit;
 		
 		for (pit = _prps.begin(); pit != _prps.end(); ++pit, ++cmp)
@@ -437,14 +438,15 @@
 class as_value_multiprop_eq : public as_value_multiprop
 {
 public:
-	as_value_multiprop_eq(std::deque<std::string>& prps, as_cmp_fn* eq)
-		: as_value_multiprop(prps, eq)
+	as_value_multiprop_eq(std::deque<std::string>& prps, 
+		std::deque<as_cmp_fn>& cmps)
+		: as_value_multiprop(prps, cmps)
 	{
 	}
 
 	bool operator() (const as_value& a, const as_value& b)
 	{
-		const as_cmp_fn* cmp = _cmps;
+		std::deque<as_cmp_fn>::iterator cmp = _cmps.begin();
 		std::deque<std::string>::iterator pit;
 		
 		for (pit = _prps.begin(); pit != _prps.end(); ++pit, ++cmp)
@@ -476,20 +478,19 @@
 
 // Convenience function to process and extract flags from an as_value array
 // of flags (as passed to sortOn when sorting on multiple properties)
-static void
+std::deque<uint8_t> 
 get_multi_flags(std::deque<as_value>::const_iterator itBegin, 
-	std::deque<as_value>::const_iterator itEnd, 
-	uint8_t* flgs, bool* uniq, bool* index)
+	std::deque<as_value>::const_iterator itEnd, bool* uniq, bool* index)
 {
 	std::deque<as_value>::const_iterator it = itBegin;
-	int i = 0;
+	std::deque<uint8_t> flgs;
 
 	// extract fUniqueSort and fReturnIndexedArray from first flag
 	if (it != itEnd)
 	{
 		uint8_t flag = static_cast<uint8_t>((*it).to_number());
 		flag = flag_preprocess(flag, uniq, index);
-		flgs[i++] = flag;
+		flgs.push_back(flag);
 		++it;
 	}
 
@@ -498,9 +499,10 @@
 		uint8_t flag = static_cast<uint8_t>((*it).to_number());
 		flag &= ~(as_array_object::fReturnIndexedArray);
 		flag &= ~(as_array_object::fUniqueSort);
-		flgs[i++] = flag;
+		flgs.push_back(flag);
 		++it;
 	}
+	return flgs;
 }
 
 as_array_object::as_array_object()
@@ -992,8 +994,8 @@
 			ensureType<as_array_object>(fn.arg(0).to_object());
 		std::deque<std::string> prp;
 		unsigned int optnum = props->size();
-		as_cmp_fn cmp[optnum];
-		as_cmp_fn eq[optnum];
+		std::deque<as_cmp_fn> cmp;
+		std::deque<as_cmp_fn> eq;
 
 		for (std::deque<as_value>::const_iterator it = props->begin();
 			it != props->end(); ++it)
@@ -1008,8 +1010,7 @@
 		{
 			// assign each cmp function to the standard cmp fn
 			as_cmp_fn c = get_basic_cmp(0, env);
-			for (unsigned int i = 0; i < optnum; i++)
-				cmp[i] = c;
+			cmp.assign(optnum, c);
 		}
 		// case: sortOn(["prop1", "prop2"], [Array.FLAG1, Array.FLAG2])
 		else if ( fn.arg(1).is_object() )
@@ -1018,28 +1019,31 @@
 				ensureType<as_array_object>(fn.arg(1).to_object());
 			if (farray->size() == optnum)
 			{
-				uint8_t flgs[optnum];
 				std::deque<as_value>::const_iterator 
 					fBegin = farray->begin(),
 					fEnd = farray->end();
 
-				get_multi_flags(fBegin, fEnd, flgs, 
+				std::deque<uint8_t> flgs = 
+					get_multi_flags(fBegin, fEnd, 
 					&do_unique, &do_index);
 
-				for (unsigned int i = 0; i < optnum; i++)
-					cmp[i] = get_basic_cmp(flgs[i], env);
+				std::deque<uint8_t>::const_iterator it = 
+					flgs.begin();
+
+				while (it != flgs.end())
+					cmp.push_back(get_basic_cmp(*it++, env));
 
 				if (do_unique)
 				{
-					for (unsigned int i = 0; i < optnum; i++)
-						eq[i] = get_basic_eq(flgs[i], env);
+					it = flgs.begin();
+					while (it != flgs.end())
+						eq.push_back(get_basic_eq(*it++, env));
 				}
 			}
 			else
 			{
 				as_cmp_fn c = get_basic_cmp(0, env);
-				for (unsigned int i = 0; i < optnum; i++)
-					cmp[i] = c;
+				cmp.assign(optnum, c);
 			}
 		}
 		// case: sortOn(["prop1", "prop2"], Array.FLAG)
@@ -1050,14 +1054,12 @@
 			flag_preprocess(flags, &do_unique, &do_index);
 			as_cmp_fn c = get_basic_cmp(flags, env);
 
-			for (unsigned int i = 0; i < optnum; i++)
-				cmp[i] = c;
+			cmp.assign(optnum, c);
 			
 			if (do_unique)
 			{
 				as_cmp_fn e = get_basic_eq(flags, env);
-				for (unsigned int i = 0; i < optnum; i++)
-					eq[i] = e;
+				eq.assign(optnum, e);
 			}
 		}
 



From MAILER-DAEMON Tue Aug 14 05:29:17 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IKsiD-00006D-0e
	for mharc-gnash-commit@gnu.org; Tue, 14 Aug 2007 05:29:17 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IKsiA-0008WQ-VF
	for gnash-commit@gnu.org; Tue, 14 Aug 2007 05:29:15 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IKsi9-0008Vk-Up
	for gnash-commit@gnu.org; Tue, 14 Aug 2007 05:29:14 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IKsi9-0008Va-Mn
	for gnash-commit@gnu.org; Tue, 14 Aug 2007 05:29:13 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <tomasgroth@yahoo.dk>) id 1IKsi9-0003ot-B9
	for gnash-commit@gnu.org; Tue, 14 Aug 2007 05:29:13 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <tomasgroth@yahoo.dk>) id 1IKsi8-0000LS-Mw
	for gnash-commit@gnu.org; Tue, 14 Aug 2007 09:29:12 +0000
Received: from tgc by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <tgc@savannah.gnu.org>) id 1IKsi8-0000LP-CL
	for gnash-commit@gnu.org; Tue, 14 Aug 2007 09:29:12 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IKsi8-0000LP-CL@cvs.savannah.gnu.org>
From: Tomas Groth <tomasgroth@yahoo.dk>
Date: Tue, 14 Aug 2007 09:29:12 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog backend/sound_handler_sdl.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Aug 2007 09:29:15 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Tomas Groth <tgc>	07/08/14 09:29:12

Modified files:
	.              : ChangeLog 
	backend        : sound_handler_sdl.cpp 

Log message:
		* backend/sound_handler_sdl.cpp: Also count sounds who stops
		  because the reached the end. Fixes random eventSoundTest1
		  failures.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4005&r2=1.4006
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_sdl.cpp?cvsroot=gnash&r1=1.81&r2=1.82

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4005
retrieving revision 1.4006
diff -u -b -r1.4005 -r1.4006
--- ChangeLog	14 Aug 2007 06:07:02 -0000	1.4005
+++ ChangeLog	14 Aug 2007 09:29:11 -0000	1.4006
@@ -1,3 +1,9 @@
+2007-08-14 Tomas Groth Christensen <tomasgroth@yahoo.dk>
+
+	* backend/sound_handler_sdl.cpp: Also count sounds who stops
+	  because the reached the end. Fixes random eventSoundTest1
+	  failures.
+
 2007-08-14 Ivor Blockley <meteoryte@yahoo.com.au>
 
 	* server/array.cpp: replace VLAs with std containers.

Index: backend/sound_handler_sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_sdl.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- backend/sound_handler_sdl.cpp	11 Aug 2007 05:25:04 -0000	1.81
+++ backend/sound_handler_sdl.cpp	14 Aug 2007 09:29:12 -0000	1.82
@@ -18,7 +18,7 @@
 // Based on sound_handler_sdl.cpp by Thatcher Ulrich http://tulrich.com 2003
 // which has been donated to the Public Domain.
 
-// $Id: sound_handler_sdl.cpp,v 1.81 2007/08/11 05:25:04 strk Exp $
+// $Id: sound_handler_sdl.cpp,v 1.82 2007/08/14 09:29:12 tgc Exp $
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1028,15 +1028,18 @@
 				sound->delete_raw_data();
 				sounddata->m_active_sounds.erase(sounddata->m_active_sounds.begin() + j);
 				handler->soundsPlaying--;
+				handler->_soundsStopped++;
 
 
 			// Sound is done, remove it from the active list (adpcm/native16)
 			} else if (sound->loop_count == 0 && soundFormat == FORMAT_NATIVE16 && sound->raw_position >= sound->raw_data_size && sound->raw_data_size != 0) {
 				sounddata->m_active_sounds.erase(sounddata->m_active_sounds.begin() + j);
 				handler->soundsPlaying--;
+				handler->_soundsStopped++;
 			} else if (sound->raw_position == 0 && sound->raw_data_size == 0) {
 				sounddata->m_active_sounds.erase(sounddata->m_active_sounds.begin() + j);
 				handler->soundsPlaying--;
+				handler->_soundsStopped++;
 			}
 
 		} // active sounds loop



From MAILER-DAEMON Tue Aug 14 05:46:04 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IKsyR-0007UE-MJ
	for mharc-gnash-commit@gnu.org; Tue, 14 Aug 2007 05:46:03 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IKsyQ-0007Tn-51
	for gnash-commit@gnu.org; Tue, 14 Aug 2007 05:46:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IKsyO-0007TC-Mc
	for gnash-commit@gnu.org; Tue, 14 Aug 2007 05:46:01 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IKsyO-0007T4-DB
	for gnash-commit@gnu.org; Tue, 14 Aug 2007 05:46:00 -0400
Received: from wa-out-1112.google.com ([209.85.146.176])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1IKsyN-0007T9-OF
	for gnash-commit@gnu.org; Tue, 14 Aug 2007 05:46:00 -0400
Received: by wa-out-1112.google.com with SMTP id k34so2048113wah
	for <gnash-commit@gnu.org>; Tue, 14 Aug 2007 02:45:55 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=OrV8wSQp4cMeN3Fl2sit2MWt1aKyrHnAxzudZ2n4G7pUW00tieG965Rq7ByahpxyMI8+ROa5daBTszok8WiRQfF/XeoScuCqt6uDHtNJQki2kG+CxUDGUuMqzIAYNRPQOj/0XJ9JxBKVS7nHxu3LcRQ+S7Z9Lq+Eirk1rBHOV0k=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=mI9gW9eI7cxb+PiGx3BPxDCUu6MagomER4owsocfvRAdr9jKKKfSxuyQp7VwOknd+xdYN7M8gGH2dJ8/+ETi3ARXVUj2wKrZfhx5xU1zNrSeNzMVzERIohf+V67OBW31IPqIRYky+bPD17bGc0BHMuSvtzxpiZGwJhtMbkNiLao=
Received: by 10.114.171.1 with SMTP id t1mr2843229wae.1187084754972;
	Tue, 14 Aug 2007 02:45:54 -0700 (PDT)
Received: by 10.114.110.5 with HTTP; Tue, 14 Aug 2007 02:45:54 -0700 (PDT)
Message-ID: <ca4b43ff0708140245n2a120e0cv2447232aa82fda5@mail.gmail.com>
Date: Tue, 14 Aug 2007 17:45:54 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "Sandro Santilli" <strk@keybit.net>
Subject: Re: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/Text...
In-Reply-To: <E1IKmhp-0006KU-81@cvs.savannah.gnu.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1IKmhp-0006KU-81@cvs.savannah.gnu.org>
X-Detected-Kernel: Linux 2.6 (newer, 2)
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Aug 2007 09:46:02 -0000

> +o = new Object; o.valueOf = function() { return 'string'; };
> +tf.background = o;    --------------------------------------------------------->   [1]
> +check_equals(typeof(tf.background), 'boolean');   ------------------>  [2]
> +check_equals(tf.background, true); // 'string' evaluates to true

> +tf.background = new Boolean(false);     ---------------------------------> [3]
> +check_equals(typeof(tf.background), 'boolean');
> +check_equals(tf.background, true);  // dunno why, but Boolean evaluates to false  -------> [4]
> +tf.background = false;


I guess the only sane way to set the value of 'background' to false in
the above context is like this:

tf.background = false;
check_equals(typeof(tf.background), 'boolean'); // tested here
check_equals(tf.background, false); // tested here

Any other insane ways to change the value of 'background' will result
setting it to true. This explains why [2] succeeds, otherwise it
should be  'check_equals(typeof(tf.background), 'object');'  Note that
[3] trys to set  'background' to a new Boolean *object*, so it also
results setting it to true.

But surprisingly, Gnash already passed all:)






On 8/14/07, Sandro Santilli <strk@keybit.net> wrote:
> CVSROOT:        /sources/gnash
> Module name:    gnash
> Changes by:     Sandro Santilli <strk>  07/08/14 03:04:29
>
> Modified files:
>         .              : ChangeLog
>         testsuite/actionscript.all: TextField.as
>
> Log message:
>                 * testsuite/actionscript.all/TextField.as: add more tests for
>                   background, backgroundColor and interaction between _width and
>                   autoSize.
>
> CVSWeb URLs:
> http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4003&r2=1.4004
> http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/TextField.as?cvsroot=gnash&r1=1.14&r2=1.15
>
> Patches:
> Index: ChangeLog
> ===================================================================
> RCS file: /sources/gnash/gnash/ChangeLog,v
> retrieving revision 1.4003
> retrieving revision 1.4004
> diff -u -b -r1.4003 -r1.4004
> --- ChangeLog   13 Aug 2007 12:33:01 -0000      1.4003
> +++ ChangeLog   14 Aug 2007 03:04:28 -0000      1.4004
> @@ -1,3 +1,9 @@
> +2007-08-13 Sandro Santilli <strk@keybit.net>
> +
> +       * testsuite/actionscript.all/TextField.as: add more tests for
> +         background, backgroundColor and interaction between _width and
> +         autoSize.
> +
>  2007-08-13 Zou Lunkai <zoulunkai@gmail.com>
>
>         * server/sprite_instance.{h,cpp}: deprecate clone_display_object(), use
>
> Index: testsuite/actionscript.all/TextField.as
> ===================================================================
> RCS file: /sources/gnash/gnash/testsuite/actionscript.all/TextField.as,v
> retrieving revision 1.14
> retrieving revision 1.15
> diff -u -b -r1.14 -r1.15
> --- testsuite/actionscript.all/TextField.as     13 Aug 2007 03:26:10 -0000      1.14
> +++ testsuite/actionscript.all/TextField.as     14 Aug 2007 03:04:29 -0000      1.15
> @@ -19,7 +19,7 @@
>  // compile this test case with Ming makeswf, and then
>  // execute it like this gnash -1 -r 0 -v out.swf
>
> -rcsid="$Id: TextField.as,v 1.14 2007/08/13 03:26:10 strk Exp $";
> +rcsid="$Id: TextField.as,v 1.15 2007/08/14 03:04:29 strk Exp $";
>
>  #include "check.as"
>
> @@ -169,11 +169,38 @@
>
>  check_equals(typeof(tf.background), 'boolean');
>  check(!tf.hasOwnProperty('background'));
> +check_equals(tf.background, false);
> +tf.background = true;
> +check_equals(tf.background, true);
> +tf.background = 0;
> +check_equals(tf.background, false);
> +check_equals(typeof(tf.background), 'boolean');
> +tf.background = 54.3;
> +check_equals(typeof(tf.background), 'boolean');
> +check_equals(tf.background, true);
> +o = new Object; o.valueOf = function() { return 0x0000FF; };
> +tf.background = o;
> +check_equals(tf.background, true);
> +o = new Object; o.valueOf = function() { return 'string'; };
> +tf.background = o;
> +check_equals(typeof(tf.background), 'boolean');
> +check_equals(tf.background, true); // 'string' evaluates to true
> +tf.background = new Boolean(false);
> +check_equals(typeof(tf.background), 'boolean');
> +check_equals(tf.background, true);  // dunno why, but Boolean evaluates to false
> +tf.background = false;
>
>  // Check TextField.backgroundColor
>
>  check_equals(typeof(tf.backgroundColor), 'number');
>  check(!tf.hasOwnProperty('backgroundColor'));
> +tf.backgroundColor = 0x00FF00;
> +check_equals(tf.backgroundColor, 0x00FF00);
> +tf.backgroundColor = 'red';
> +check_equals(tf.backgroundColor, 0x000000); // string value evaluates to NaN thus 0
> +o = new Object; o.valueOf = function() { return 0x0000FF; };
> +tf.backgroundColor = o;
> +check_equals(tf.backgroundColor, 0x0000FF); // valueOf is invoked
>
>  // Check TextField.border
>
> @@ -588,5 +615,12 @@
>  xcheck_equals(tf._height, currHeight*2);
>  tf._yscale = 100;
>
> +// Check interaction between autoSize and _width
> +tf._width = 10; // "hello world" text should overflow this
> +tf.text = "Hello world";
> +tf.autoSize = 'none';
> +xcheck_equals(tf._width, 10);
> +tf.autoSize = 'center';
> +check(tf._width > 10);
>
>  #endif // OUTPUT_VERSION > 5
>
>
> _______________________________________________
> Gnash-commit mailing list
> Gnash-commit@gnu.org
> http://lists.gnu.org/mailman/listinfo/gnash-commit
>



From MAILER-DAEMON Wed Aug 15 02:52:23 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ILCjv-0005sP-Tg
	for mharc-gnash-commit@gnu.org; Wed, 15 Aug 2007 02:52:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ILCju-0005sK-QV
	for gnash-commit@gnu.org; Wed, 15 Aug 2007 02:52:22 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ILCju-0005s8-73
	for gnash-commit@gnu.org; Wed, 15 Aug 2007 02:52:22 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ILCju-0005s5-29
	for gnash-commit@gnu.org; Wed, 15 Aug 2007 02:52:22 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1ILCjt-0002lU-B9
	for gnash-commit@gnu.org; Wed, 15 Aug 2007 02:52:21 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1ILCjs-0004Q1-4Q
	for gnash-commit@gnu.org; Wed, 15 Aug 2007 06:52:20 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1ILCjr-0004Py-Ui
	for gnash-commit@gnu.org; Wed, 15 Aug 2007 06:52:20 +0000
To: gnash-commit@gnu.org
Message-Id: <E1ILCjr-0004Py-Ui@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Wed, 15 Aug 2007 06:52:19 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/Obje...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Aug 2007 06:52:23 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/15 06:52:19

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: Object.as 

Log message:
	more tests and new failures. Worthwhile to have a look:)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4006&r2=1.4007
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Object.as?cvsroot=gnash&r1=1.26&r2=1.27

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4006
retrieving revision 1.4007
diff -u -b -r1.4006 -r1.4007
--- ChangeLog	14 Aug 2007 09:29:11 -0000	1.4006
+++ ChangeLog	15 Aug 2007 06:52:19 -0000	1.4007
@@ -1,3 +1,7 @@
+2007-08-15 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/actionscript.all/Object.as: more tests and new failures.
+	  
 2007-08-14 Tomas Groth Christensen <tomasgroth@yahoo.dk>
 
 	* backend/sound_handler_sdl.cpp: Also count sounds who stops

Index: testsuite/actionscript.all/Object.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Object.as,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- testsuite/actionscript.all/Object.as	26 Jul 2007 03:41:19 -0000	1.26
+++ testsuite/actionscript.all/Object.as	15 Aug 2007 06:52:19 -0000	1.27
@@ -20,16 +20,67 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Object.as,v 1.26 2007/07/26 03:41:19 strk Exp $";
+rcsid="$Id: Object.as,v 1.27 2007/08/15 06:52:19 zoulunkai Exp $";
 
 #include "check.as"
 
 // Test existance of methods
 check_equals(typeof(Object), 'function');
 check_equals(typeof(Object.prototype), 'object');
+check_equals(typeof(Object.registerClass), 'function');
 check_equals(typeof(Object.prototype.toString), 'function');
 check_equals(typeof(Object.prototype.valueOf), 'function');
+check_equals(typeof(Object.prototype.constructor), 'function'); 
+check_equals(Object.prototype.prototype, undefined);
+xcheck_equals(Object.prototype.__proto__, undefined);
+xcheck_equals(Object.prototype.registerClass, undefined);
+
 #if OUTPUT_VERSION > 5
+
+// Through test of existance of methods!
+
+O = Object;
+check_equals(O, Object);
+
+// found 4 methods in Object
+xcheck(O.hasOwnProperty('__proto__'));
+check(O.hasOwnProperty('registerClass'));
+check(O.hasOwnProperty('constructor'));
+check(O.hasOwnProperty('prototype'));
+
+// fount 4 methods in Object.__proto__
+xcheck(O.__proto__.hasOwnProperty('__proto__'));
+check(O.__proto__.hasOwnProperty('apply'));
+check(O.__proto__.hasOwnProperty('call'));
+check(O.__proto__.hasOwnProperty('constructor'));
+
+check(O.__proto__ != Object.prototype);
+check(O.__proto__.__proto__ == Object.prototype);
+
+// found 3 methods in Object.constructor
+xcheck(O.constructor.hasOwnProperty('__proto__'));
+check(O.constructor.hasOwnProperty('constructor'));
+check(O.constructor.hasOwnProperty('prototype'));
+
+// found 9 methods in Object.prototype
+check(O.prototype.hasOwnProperty('addProperty'));
+check(O.prototype.hasOwnProperty('constructor'));
+check(O.prototype.hasOwnProperty('hasOwnProperty'));
+check(O.prototype.hasOwnProperty('isPropertyEnumerable'));
+check(O.prototype.hasOwnProperty('isPrototypeOf'));
+check(O.prototype.hasOwnProperty('toString'));
+check(O.prototype.hasOwnProperty('valueOf'));
+check(O.prototype.hasOwnProperty('unwatch'));
+check(O.prototype.hasOwnProperty('watch'));
+
+// found 3 methods in Object.prototype.constructor
+xcheck(O.prototype.constructor.hasOwnProperty('__proto__'));
+check(O.prototype.constructor.hasOwnProperty('constructor'));
+check(O.prototype.constructor.hasOwnProperty('prototype'));
+
+check_equals(O.prototype.constructor, Object);
+xcheck(O.constructor != Object);
+
 check_equals(typeof(Object.prototype.addProperty), 'function');
 check_equals(typeof(Object.prototype.hasOwnProperty), 'function');
 check_equals(typeof(Object.prototype.isPropertyEnumerable), 'function');
@@ -49,15 +100,37 @@
 var obj = new Object; // uses SWFACTION_NEWOBJECT
 check (obj != undefined);
 check (typeof(obj) == "object");
+
+check(obj.__proto__ == Object.prototype);
+check(obj.prototype == undefined);
+check(obj.__proto__.prototype == undefined);
+
+#if OUTPUT_VERSION == 5
+// Gnash fails on swf5 but succeeds on swf6,7,8
+xcheck(obj.__constructor__ == Object);
+#else
+check(obj.__constructor__ == Object);
+#endif
+
+check(obj.constructor == Object);
+check(Object.prototype.constructor == Object); 
 check (obj.__proto__.constructor == Object);
 
 // Test instantiated Object methods
 check_equals(typeof(obj.toString), 'function');
 check_equals(typeof(obj.valueOf), 'function');
 #if OUTPUT_VERSION > 5
-check_equals(typeof(obj.addProperty), 'function');
+  check_equals(typeof(obj.addProperty), 'function');
+  check(Object.hasOwnProperty('constructor')); 
+#if OUTPUT_VERSION == 6
+    // bug in swf6???
+    check(obj.hasOwnProperty('constructor')); 
+#else
+    check(!obj.hasOwnProperty('constructor')); 
+#endif
+  check(obj.hasOwnProperty('__constructor__')); 
 #else
-check_equals(typeof(obj.addProperty), 'undefined');
+  check_equals(typeof(obj.addProperty), 'undefined');
 #endif
 
 // Test instantiated Object members



From MAILER-DAEMON Wed Aug 15 11:02:46 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ILKOU-00019M-7Q
	for mharc-gnash-commit@gnu.org; Wed, 15 Aug 2007 11:02:46 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ILKOS-000160-Bm
	for gnash-commit@gnu.org; Wed, 15 Aug 2007 11:02:44 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ILKOR-00014s-Or
	for gnash-commit@gnu.org; Wed, 15 Aug 2007 11:02:43 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ILKOR-00014k-FO
	for gnash-commit@gnu.org; Wed, 15 Aug 2007 11:02:43 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <tomasgroth@yahoo.dk>) id 1ILKOQ-0004c8-Vh
	for gnash-commit@gnu.org; Wed, 15 Aug 2007 11:02:43 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <tomasgroth@yahoo.dk>) id 1ILKOQ-0002ox-9u
	for gnash-commit@gnu.org; Wed, 15 Aug 2007 15:02:42 +0000
Received: from tgc by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <tgc@savannah.gnu.org>) id 1ILKOQ-0002ou-4k
	for gnash-commit@gnu.org; Wed, 15 Aug 2007 15:02:42 +0000
To: gnash-commit@gnu.org
Message-Id: <E1ILKOQ-0002ou-4k@cvs.savannah.gnu.org>
From: Tomas Groth <tomasgroth@yahoo.dk>
Date: Wed, 15 Aug 2007 15:02:42 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog backend/sound_handler_gst.cpp b...
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Aug 2007 15:02:45 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Tomas Groth <tgc>	07/08/15 15:02:42

Modified files:
	.              : ChangeLog 
	backend        : sound_handler_gst.cpp sound_handler_sdl.cpp 

Log message:
		* backend/sound_handler_{sdl,gst}.cpp: Removed primitive
		  sync'ing code since it resulted in bad audio.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.17&r2=1.3971.2.18
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_gst.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.59&r2=1.59.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_sdl.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.79&r2=1.79.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.17
retrieving revision 1.3971.2.18
diff -u -b -r1.3971.2.17 -r1.3971.2.18
--- ChangeLog	11 Aug 2007 03:12:14 -0000	1.3971.2.17
+++ ChangeLog	15 Aug 2007 15:02:40 -0000	1.3971.2.18
@@ -1,3 +1,8 @@
+2007-08-15 Tomas Groth Christensen <tomasgroth@yahoo.dk>
+
+	* backend/sound_handler_{sdl,gst}.cpp: Removed primitive
+	  sync'ing code since it resulted in bad audio.
+
 2007-08-10 Sandro Santilli <strk@keybit.net>
 
 	* gui/Makefile.am: fix build of sdl/cairo

Index: backend/sound_handler_gst.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_gst.cpp,v
retrieving revision 1.59
retrieving revision 1.59.2.1
diff -u -b -r1.59 -r1.59.2.1
--- backend/sound_handler_gst.cpp	8 Aug 2007 10:39:50 -0000	1.59
+++ backend/sound_handler_gst.cpp	15 Aug 2007 15:02:41 -0000	1.59.2.1
@@ -20,7 +20,7 @@
 // Based on sound_handler_sdl.cpp by Thatcher Ulrich http://tulrich.com 2003
 // which has been donated to the Public Domain.
 
-/* $Id: sound_handler_gst.cpp,v 1.59 2007/08/08 10:39:50 tgc Exp $ */
+/* $Id: sound_handler_gst.cpp,v 1.59.2.1 2007/08/15 15:02:41 tgc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -275,13 +275,8 @@
 	sound_data* sounddata = m_sound_data[sound_handle];
 
 	// If this is called from a streamsoundblocktag, we only start if this
-	// sound isn't already playing. If a active_sound-struct is existing we
-	// assume it is also playing. If necessary we do some sync'ing
+	// sound isn't already playing.
 	if (start_position > 0 && sounddata->m_gst_elements.size() > 0) {
-		// This is the ugly sync'ing. If the renderer-sync'ing  to the timeline
-		// works, this should only be needed when we're position-jumping in streams.
-		int diff = abs(sounddata->m_gst_elements[0]->position - start_position);
-		if (diff > 2000) sounddata->m_gst_elements[0]->position = start_position;
 		return;
 	}
 	// Make sure sound actually got some data

Index: backend/sound_handler_sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_sdl.cpp,v
retrieving revision 1.79
retrieving revision 1.79.2.1
diff -u -b -r1.79 -r1.79.2.1
--- backend/sound_handler_sdl.cpp	8 Aug 2007 10:39:50 -0000	1.79
+++ backend/sound_handler_sdl.cpp	15 Aug 2007 15:02:41 -0000	1.79.2.1
@@ -18,7 +18,7 @@
 // Based on sound_handler_sdl.cpp by Thatcher Ulrich http://tulrich.com 2003
 // which has been donated to the Public Domain.
 
-// $Id: sound_handler_sdl.cpp,v 1.79 2007/08/08 10:39:50 tgc Exp $
+// $Id: sound_handler_sdl.cpp,v 1.79.2.1 2007/08/15 15:02:41 tgc Exp $
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -243,13 +243,8 @@
 	sound_data* sounddata = m_sound_data[sound_handle];
 
 	// If this is called from a streamsoundblocktag, we only start if this
-	// sound isn't already playing. If a active_sound-struct is existing we
-	// assume it is also playing. If necessary we do some sync'ing
+	// sound isn't already playing.
 	if (start_position > 0 && sounddata->m_active_sounds.size() > 0) {
-		// This is the ugly sync'ing. If the renderer-sync'ing  to the timeline
-		// works, this should only be needed when we're position-jumping in streams.
-		int diff = abs(sounddata->m_active_sounds[0]->position - start_position);
-		if (diff > 2000) sounddata->m_active_sounds[0]->position = start_position;
 		return;
 	}
 



From MAILER-DAEMON Wed Aug 15 19:00:27 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ILRql-0003rw-0H
	for mharc-gnash-commit@gnu.org; Wed, 15 Aug 2007 19:00:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ILRqj-0003rb-Br
	for gnash-commit@gnu.org; Wed, 15 Aug 2007 19:00:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ILRqi-0003rL-Q1
	for gnash-commit@gnu.org; Wed, 15 Aug 2007 19:00:25 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ILRqi-0003rB-H8
	for gnash-commit@gnu.org; Wed, 15 Aug 2007 19:00:24 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1ILRqi-0001Hg-3t
	for gnash-commit@gnu.org; Wed, 15 Aug 2007 19:00:24 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1ILRqa-0002Br-AK
	for gnash-commit@gnu.org; Wed, 15 Aug 2007 23:00:16 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1ILRqa-0002Bo-6d
	for gnash-commit@gnu.org; Wed, 15 Aug 2007 23:00:16 +0000
To: gnash-commit@gnu.org
Message-Id: <E1ILRqa-0002Bo-6d@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 15 Aug 2007 23:00:16 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/Text...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Aug 2007 23:00:25 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/15 23:00:16

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: TextField.as 

Log message:
	        * testsuite/actionscript.all/TextField.as: a few more tests for
	          interaction between _width, autoSize and wordWrap (more needed).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4007&r2=1.4008
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/TextField.as?cvsroot=gnash&r1=1.15&r2=1.16

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4007
retrieving revision 1.4008
diff -u -b -r1.4007 -r1.4008
--- ChangeLog	15 Aug 2007 06:52:19 -0000	1.4007
+++ ChangeLog	15 Aug 2007 23:00:15 -0000	1.4008
@@ -1,3 +1,8 @@
+2007-08-13 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/actionscript.all/TextField.as: a few more tests for
+	  interaction between _width, autoSize and wordWrap (more needed).
+
 2007-08-15 Zou Lunkai <zoulunkai@gmail.com>
 
 	* testsuite/actionscript.all/Object.as: more tests and new failures.

Index: testsuite/actionscript.all/TextField.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/TextField.as,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- testsuite/actionscript.all/TextField.as	14 Aug 2007 03:04:29 -0000	1.15
+++ testsuite/actionscript.all/TextField.as	15 Aug 2007 23:00:15 -0000	1.16
@@ -19,7 +19,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: TextField.as,v 1.15 2007/08/14 03:04:29 strk Exp $";
+rcsid="$Id: TextField.as,v 1.16 2007/08/15 23:00:15 strk Exp $";
 
 #include "check.as"
 
@@ -619,8 +619,17 @@
 tf._width = 10; // "hello world" text should overflow this
 tf.text = "Hello world";
 tf.autoSize = 'none';
+tf.wordWrap = false;
 xcheck_equals(tf._width, 10);
+origTextWidth = tf.textWidth;
 tf.autoSize = 'center';
 check(tf._width > 10);
+check_equals(origTextWidth, tf.textWidth); // textWidth isn't influenced by autoSize 
+tf.autoSize = 'none';
+tf.wordWrap = true;
+tf._width = 10;
+// Gnash ignores assigments to _width (should change TextField rendering area bounds instead)
+xcheck_equals(tf._width, 10);
+check_equals(origTextWidth, tf.textWidth); // textWidth isn't influenced by wordWrap
 
 #endif // OUTPUT_VERSION > 5



From MAILER-DAEMON Thu Aug 16 02:09:19 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ILYXn-0003VT-Bb
	for mharc-gnash-commit@gnu.org; Thu, 16 Aug 2007 02:09:19 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ILYXl-0003UM-Pd
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 02:09:17 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ILYXk-0003UA-PM
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 02:09:17 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ILYXk-0003U7-Kb
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 02:09:16 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1ILYXk-0006vM-81
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 02:09:16 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1ILYXj-0002Kw-I8
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 06:09:15 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1ILYXj-0002Ks-As
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 06:09:15 +0000
To: gnash-commit@gnu.org
Message-Id: <E1ILYXj-0002Ks-As@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Thu, 16 Aug 2007 06:09:15 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/Obje...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Aug 2007 06:09:18 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/16 06:09:15

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: Object.as toString_valueOf.as 
	testsuite/misc-ming.all: Makefile.am registerClassTest.c 
Added files:
	testsuite/misc-ming.all: registerClassTest2.c 

Log message:
	* testsuite/misc-ming.all/registerClassTest2.c, Makefile.am: new testcase
	  for Object.registerClass.
	* testsuite/misc-ming.all/registerClassTest.c, 
	  testsuite/actionscript.all/Object.as, toString_valueOf.as: testcases review,
	  minor comments or changes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4008&r2=1.4009
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Object.as?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/toString_valueOf.as?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.145&r2=1.146
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/registerClassTest.c?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/registerClassTest2.c?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4008
retrieving revision 1.4009
diff -u -b -r1.4008 -r1.4009
--- ChangeLog	15 Aug 2007 23:00:15 -0000	1.4008
+++ ChangeLog	16 Aug 2007 06:09:13 -0000	1.4009
@@ -1,4 +1,12 @@
-2007-08-13 Sandro Santilli <strk@keybit.net>
+2007-08-16 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/misc-ming.all/registerClassTest2.c, Makefile.am: new testcase
+	  for Object.registerClass.
+	* testsuite/misc-ming.all/registerClassTest.c, 
+	  testsuite/actionscript.all/Object.as, toString_valueOf.as: testcases review,
+	  minor comments or changes.
+	
+2007-08-15 Sandro Santilli <strk@keybit.net>
 
 	* testsuite/actionscript.all/TextField.as: a few more tests for
 	  interaction between _width, autoSize and wordWrap (more needed).

Index: testsuite/actionscript.all/Object.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Object.as,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- testsuite/actionscript.all/Object.as	15 Aug 2007 06:52:19 -0000	1.27
+++ testsuite/actionscript.all/Object.as	16 Aug 2007 06:09:14 -0000	1.28
@@ -20,13 +20,14 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Object.as,v 1.27 2007/08/15 06:52:19 zoulunkai Exp $";
+rcsid="$Id: Object.as,v 1.28 2007/08/16 06:09:14 zoulunkai Exp $";
 
 #include "check.as"
 
 // Test existance of methods
 check_equals(typeof(Object), 'function');
 check_equals(typeof(Object.prototype), 'object');
+// registerClass is a public static function of Object
 check_equals(typeof(Object.registerClass), 'function');
 check_equals(typeof(Object.prototype.toString), 'function');
 check_equals(typeof(Object.prototype.valueOf), 'function');
@@ -119,15 +120,16 @@
 // Test instantiated Object methods
 check_equals(typeof(obj.toString), 'function');
 check_equals(typeof(obj.valueOf), 'function');
+
 #if OUTPUT_VERSION > 5
   check_equals(typeof(obj.addProperty), 'function');
   check(Object.hasOwnProperty('constructor')); 
-#if OUTPUT_VERSION == 6
+  #if OUTPUT_VERSION == 6
     // bug in swf6???
     check(obj.hasOwnProperty('constructor')); 
-#else
+  #else
     check(!obj.hasOwnProperty('constructor')); 
-#endif
+  #endif
   check(obj.hasOwnProperty('__constructor__')); 
 #else
   check_equals(typeof(obj.addProperty), 'undefined');

Index: testsuite/actionscript.all/toString_valueOf.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/toString_valueOf.as,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- testsuite/actionscript.all/toString_valueOf.as	6 Aug 2007 21:08:45 -0000	1.4
+++ testsuite/actionscript.all/toString_valueOf.as	16 Aug 2007 06:09:14 -0000	1.5
@@ -43,7 +43,7 @@
 check(typeof(y) == "object");
 check(x == "[object Object]"); 
 check(y == obj); //true
-//trace(obj); //output [object Object]
+//trace(obj); //invoke obj.toString(), output [object Object]
 #if OUTPUT_VERSION > 5
   check(obj.toString == Object.prototype.toString);
   check(obj.valueOf == Object.prototype.valueOf);
@@ -65,7 +65,7 @@
 check(x=="TO_STRING");
 check(y=="TO_VALUE");
 check(typeof(obj)=="object"); 
-//trace(obj); // output TO_STRING
+//trace(obj); //invoke obj.toString(), output TO_STRING
 check(typeof(y) == "string");
 check(obj == y); 
 
@@ -107,6 +107,7 @@
 check(typeof(y)=="string"); 
 check(x=="TO_STRING"); 
 check(y=="TO_VALUE");  
+//trace(num1); // invoke num1.toString(), output TO_STRING
 
 //
 //Testing toString and valueOf of String
@@ -149,7 +150,8 @@
 xcheck(typeof(str3) == "string");
 //valueOf called
 check(str3 == "TO_VALUETO_VALUE"); 
-//trace a string won't invoke the toString method
+// trace a string Object won't invoke the toString method.
+// I don't think it's a bug.
 //trace(str1); //output 10 !
 
 x = str1.toString();
@@ -189,8 +191,8 @@
   check(y == undefined); 
 #endif
 check(y == _level0.mc1);  
-//trace a movieclip doesn't invoke the toString method
-//trace(mc1); //_level0.mc
+//trace a movieclip doesn't invoke the toString method, either.
+//trace(mc1); //output _level0.mc
 
 MovieClip.prototype.toString = function () {return "TO_STRING";};
 MovieClip.prototype.valueOf = function () {return "TO_VALUE";};
@@ -284,7 +286,7 @@
 xcheck(typeof(y.valueOf()) == "object");  
 xcheck(typeof(btn1) == "object");
 check(y == btn1);
-//trace(btn1); //output [object Object]
+//trace(btn1); // invoke btn1.toString(), output [object Object]
 
 //
 //Testing toString and valueOf of Boolean
@@ -306,6 +308,7 @@
 check(typeof(y) == "boolean");  
 check(x == "false");
 check(y == false);
+//trace(b1); // invoke b1.toString(), output false 
 
 b2 = new Boolean(true);
 b3 = b1 + b2;
@@ -373,6 +376,7 @@
 check(typeof(y) == "object");   
 check(x == "1,2,3,4");  
 check(y == a1);        
+//trace(a1); // invoke a1.toString(), output 1,2,3,4     
 
 a2 = new Array(2,3,4,5);
 a3 = a1 + a2;

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -b -r1.145 -r1.146
--- testsuite/misc-ming.all/Makefile.am	31 Jul 2007 04:01:33 -0000	1.145
+++ testsuite/misc-ming.all/Makefile.am	16 Aug 2007 06:09:14 -0000	1.146
@@ -107,6 +107,7 @@
 	attachMovieLoopingTestRunner \
 	registerClassTest \
 	registerClassTestRunner \
+	registerClassTest2 \
 	goto_frame_test \
 	consecutive_goto_frame_test \
 	matrix_test \
@@ -232,6 +233,7 @@
 	loop_test7runner \
 	loop_test8runner \
 	shape_testrunner \
+	registerClassTest2runner \
 	$(NULL)
 
 if MAKESWF_SUPPORTS_PREBUILT_CLIPS
@@ -1277,6 +1279,18 @@
 	$(top_builddir)/testsuite/libtestsuite.la \
 	$(NULL)
 
+registerClassTest2_SOURCES =	\
+	registerClassTest2.c	\
+	$(NULL)
+registerClassTest2_LDADD = libgnashmingutils.la
+
+registerClassTest2.swf: registerClassTest2
+	./registerClassTest2 $(top_srcdir)/testsuite/media
+
+registerClassTest2runner: $(srcdir)/../generic-testrunner.sh registerClassTest2.swf
+	sh $< $(top_builddir) registerClassTest2.swf > $@
+	chmod 755 $@
+
 spritehier.swf: spritehier
 	./spritehier
 
@@ -1652,6 +1666,7 @@
 	loop_test8runner \
 	shape_testrunner \
 	morph_test1runner \
+	registerClassTest2runner \
 	$(NULL)
 
 if MAKESWF_SUPPORTS_PREBUILT_CLIPS

Index: testsuite/misc-ming.all/registerClassTest.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/registerClassTest.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- testsuite/misc-ming.all/registerClassTest.c	1 Jul 2007 10:55:01 -0000	1.4
+++ testsuite/misc-ming.all/registerClassTest.c	16 Aug 2007 06:09:14 -0000	1.5
@@ -91,7 +91,6 @@
  
 	mo = newSWFMovie();
 	SWFMovie_setRate(mo, 12);
-	//SWFMovie_setDimension(mo, 6400, 4000);
 	SWFMovie_setDimension(mo, 640, 400);
 
 	/*********************************************

Index: testsuite/misc-ming.all/registerClassTest2.c
===================================================================
RCS file: testsuite/misc-ming.all/registerClassTest2.c
diff -N testsuite/misc-ming.all/registerClassTest2.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-ming.all/registerClassTest2.c	16 Aug 2007 06:09:15 -0000	1.1
@@ -0,0 +1,137 @@
+/* 
+ *   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *
+ */ 
+
+/*
+ *	zou lunkai,  zoulunkai@gmail.com
+ *  
+ *  Testcase for Object.registerClass().
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <ming.h>
+
+#include "ming_utils.h"
+
+#define OUTPUT_VERSION 6
+#define OUTPUT_FILENAME "registerClassTest2.swf"
+
+void addExport(SWFMovie mo, SWFMovieClip mc, const char * name);
+
+void
+addExport(SWFMovie mo, SWFMovieClip mc, const char * name)
+{
+  SWFMovie_addExport(mo, (SWFBlock)mc, name);
+  SWFMovie_writeExports(mo);
+}
+
+int
+main(int argc, char** argv)
+{
+  SWFMovie mo;
+  SWFMovieClip  mc1, mc2, dejagnuclip;
+  SWFShape  sh1, sh2;
+  SWFDisplayItem it1, it2;
+  const char *srcdir=".";
+
+  if ( argc>1 ) srcdir=argv[1];
+  else
+  {
+    fprintf(stderr, "Usage: %s\n", argv[0]);
+    return 1;
+  }
+
+  Ming_init();
+  Ming_useSWFVersion (OUTPUT_VERSION);
+  Ming_setScale(20.0); /* let's talk pixels */
+ 
+  mo = newSWFMovie();
+  SWFMovie_setRate(mo, 12);
+  SWFMovie_setDimension(mo, 640, 400);
+
+  // add the dejagnuclip for testing
+  dejagnuclip = get_dejagnu_clip((SWFBlock)get_default_font(srcdir), 10, 0, 80, 800, 600);
+  SWFMovie_add(mo, (SWFBlock)dejagnuclip);
+  
+  // define two movieClips
+  
+  mc1 = newSWFMovieClip();
+  sh1 = make_fill_square (100, 100, 60, 60, 255, 0, 0, 255, 0, 0);
+  SWFMovieClip_add(mc1, (SWFBlock)sh1); 
+  SWFMovieClip_nextFrame(mc1);
+  
+  mc2 = newSWFMovieClip();
+  sh2 = make_fill_square (100, 100, 60, 60, 255, 255, 0, 255, 255, 0);
+  SWFMovieClip_add(mc2, (SWFBlock)sh2); 
+  SWFMovieClip_nextFrame(mc2);
+  
+  // export them
+  addExport(mo, mc1, "libItem1");
+  addExport(mo, mc2, "libItem2");  
+  SWFMovie_nextFrame(mo);  /* end of frame1 */
+  
+
+  add_actions(mo,
+    "theClass1 = function() { this.x = 60;};"
+    "theClass1.prototype = new MovieClip();"
+    "theClass2 = function() { this.x = 600; this._x = 200;}; "
+    "Object.registerClass('libItem1', theClass1);"
+    "Object.registerClass('libItem2', theClass2);"
+    "_root.attachMovie('libItem1', 'clip1', 10);"
+    "_root.attachMovie('libItem2', 'clip2', 20);"
+    );
+
+  check_equals(mo, "typeof(clip1)", "'movieclip'");
+  check_equals(mo, "typeof(clip2)", "'movieclip'");
+  check_equals(mo, "clip1.__proto__", "theClass1.prototype");
+  check_equals(mo, "clip2.__proto__", "theClass2.prototype");
+#if OUTPUT_VERSION > 6
+  // succeed in swf7 and swf8
+  check_equals(mo, "clip1.constructor", "MovieClip");
+#else if OUTPUT_VERSION == 6
+  xcheck_equals(mo, "clip1.constructor", "theClass1");
+#endif
+  xcheck_equals(mo, "clip1.__constructor__", "theClass1");
+  check_equals(mo, "clip2.constructor", "theClass2");
+  xcheck_equals(mo, "clip2.__constructor__", "theClass2");
+  check_equals(mo, "clip1.x", "60");
+  check_equals(mo, "clip2.x", "600");
+  check_equals(mo, "clip1._x", "0");
+  check_equals(mo, "clip2._x", "200");
+  check_equals(mo, "typeof(MovieClip.prototype.getDepth)", "'function'");
+  check_equals(mo, "clip1.getDepth()", "10");
+  // clip2 does not inherit MovieClip
+  check_equals(mo, "clip2.getDepth()", "undefined");
+
+  add_actions(mo, "totals(); stop();");
+  SWFMovie_nextFrame(mo); /* end of frame2 */
+
+ /*****************************************************
+  *
+  * Output movie
+  *
+  *****************************************************/
+
+  puts("Saving " OUTPUT_FILENAME );
+
+  SWFMovie_save(mo, OUTPUT_FILENAME);
+
+  return 0;
+}



From MAILER-DAEMON Thu Aug 16 02:16:09 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ILYeP-0005gL-0F
	for mharc-gnash-commit@gnu.org; Thu, 16 Aug 2007 02:16:09 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ILYeN-0005g4-Ux
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 02:16:07 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ILYeN-0005fs-CL
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 02:16:07 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ILYeN-0005fp-64
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 02:16:07 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1ILYeM-0008Px-Vq
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 02:16:07 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1ILYeL-0003fE-5U
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 06:16:05 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1ILYeK-0003ew-7Z
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 06:16:04 +0000
To: gnash-commit@gnu.org
Message-Id: <E1ILYeK-0003ew-7Z@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Thu, 16 Aug 2007 06:16:04 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/testsuite/misc-ming.all registerClassTest2.c
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Aug 2007 06:16:08 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/16 06:16:04

Modified files:
	testsuite/misc-ming.all: registerClassTest2.c 

Log message:
	minor copyright changes

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/registerClassTest2.c?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: registerClassTest2.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/registerClassTest2.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- registerClassTest2.c	16 Aug 2007 06:09:15 -0000	1.1
+++ registerClassTest2.c	16 Aug 2007 06:16:03 -0000	1.2
@@ -1,5 +1,5 @@
 /* 
- *   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+ *   Copyright (C) 2007 Free Software Foundation, Inc.
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by



From MAILER-DAEMON Thu Aug 16 05:19:32 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ILbVs-0002s1-Km
	for mharc-gnash-commit@gnu.org; Thu, 16 Aug 2007 05:19:32 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ILbVq-0002qy-HT
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 05:19:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ILbVo-0002qT-Mj
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 05:19:29 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ILbVo-0002qH-EY
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 05:19:28 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1ILbVn-0003zg-8Y
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 05:19:27 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1ILbVl-00080l-Fi
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 09:19:25 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1ILbVl-00080i-2Y
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 09:19:25 +0000
To: gnash-commit@gnu.org
Message-Id: <E1ILbVl-00080i-2Y@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Thu, 16 Aug 2007 09:19:25 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/testsuite/actionscript.all Inheritance.as
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Aug 2007 09:19:31 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/16 09:19:24

Modified files:
	testsuite/actionscript.all: Inheritance.as 

Log message:
	* testsuite/actionscript.all/Inheritance.as: more tests. testing for inheritance
	  never stops:)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Inheritance.as?cvsroot=gnash&r1=1.32&r2=1.33

Patches:
Index: Inheritance.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Inheritance.as,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- Inheritance.as	26 Jul 2007 03:41:18 -0000	1.32
+++ Inheritance.as	16 Aug 2007 09:19:24 -0000	1.33
@@ -21,7 +21,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Inheritance.as,v 1.32 2007/07/26 03:41:18 strk Exp $";
+rcsid="$Id: Inheritance.as,v 1.33 2007/08/16 09:19:24 zoulunkai Exp $";
 
 #include "check.as"
 
@@ -263,11 +263,22 @@
 
 check_equals(typeof(DerivedClass1.prototype.constructor), 'function');
 check_equals(typeof(DerivedClass1.constructor), 'function');
-#if OUTPUT_VERSION > 6
-xcheck(! DerivedClass1.prototype.hasOwnProperty('constructor'));
+#if OUTPUT_VERSION >= 6
+xcheck(DerivedClass1.prototype.hasOwnProperty('__proto__'));
+check(DerivedClass1.prototype.hasOwnProperty('__constructor__'));
+check(DerivedClass1.prototype.__proto__.hasOwnProperty('var1'));
+
+check(! DerivedClass1.prototype.hasOwnProperty('var1'));
+check(! DerivedClass1.prototype.hasOwnProperty('var3'));
+check_equals(DerivedClass1.var3, undefined);
+check(! DerivedClass1.prototype.hasOwnProperty('toString'));
+check(! DerivedClass1.prototype.hasOwnProperty('valueOf'));
+
 check(DerivedClass1.hasOwnProperty('constructor'));
 #endif
-check_equals(DerivedClass1.prototype.constructor, BaseClass1);
+check_equals(DerivedClass1.constructor, Function);
+check_equals(DerivedClass1.prototype.__proto__.constructor, BaseClass1);
+//check_equals(DerivedClass1.prototype.constructor, BaseClass1);
 
 DerivedClass1.prototype.var2 = "var_in_Derived_prototype";
 var obj = new DerivedClass1;



From MAILER-DAEMON Thu Aug 16 05:29:42 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ILbfh-0007oa-VS
	for mharc-gnash-commit@gnu.org; Thu, 16 Aug 2007 05:29:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ILbfd-0007nB-9F
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 05:29:37 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ILbfb-0007mb-CJ
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 05:29:35 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ILbfa-0007mW-UR
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 05:29:35 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1ILbfa-0006AZ-GU
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 05:29:34 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1ILbfZ-0008AD-Kz
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 09:29:33 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1ILbfZ-0008AA-Hz
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 09:29:33 +0000
To: gnash-commit@gnu.org
Message-Id: <E1ILbfZ-0008AA-Hz@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Thu, 16 Aug 2007 09:29:33 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/Inhe...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Aug 2007 09:29:37 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/16 09:29:33

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: Inheritance.as 

Log message:
	Ops, update changeLog and add back an xcheck that was removed in last commit.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4009&r2=1.4010
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Inheritance.as?cvsroot=gnash&r1=1.33&r2=1.34

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4009
retrieving revision 1.4010
diff -u -b -r1.4009 -r1.4010
--- ChangeLog	16 Aug 2007 06:09:13 -0000	1.4009
+++ ChangeLog	16 Aug 2007 09:29:32 -0000	1.4010
@@ -5,6 +5,8 @@
 	* testsuite/misc-ming.all/registerClassTest.c, 
 	  testsuite/actionscript.all/Object.as, toString_valueOf.as: testcases review,
 	  minor comments or changes.
+	* testsuite/actionscript.all/Inheritance.as: more tests. testing for inheritance
+	  never stops:)
 	
 2007-08-15 Sandro Santilli <strk@keybit.net>
 

Index: testsuite/actionscript.all/Inheritance.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Inheritance.as,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- testsuite/actionscript.all/Inheritance.as	16 Aug 2007 09:19:24 -0000	1.33
+++ testsuite/actionscript.all/Inheritance.as	16 Aug 2007 09:29:33 -0000	1.34
@@ -21,7 +21,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Inheritance.as,v 1.33 2007/08/16 09:19:24 zoulunkai Exp $";
+rcsid="$Id: Inheritance.as,v 1.34 2007/08/16 09:29:33 zoulunkai Exp $";
 
 #include "check.as"
 
@@ -273,7 +273,7 @@
 check_equals(DerivedClass1.var3, undefined);
 check(! DerivedClass1.prototype.hasOwnProperty('toString'));
 check(! DerivedClass1.prototype.hasOwnProperty('valueOf'));
-
+xcheck(! DerivedClass1.prototype.hasOwnProperty('constructor'));
 check(DerivedClass1.hasOwnProperty('constructor'));
 #endif
 check_equals(DerivedClass1.constructor, Function);



From MAILER-DAEMON Thu Aug 16 06:31:59 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ILcdz-0003L1-5C
	for mharc-gnash-commit@gnu.org; Thu, 16 Aug 2007 06:31:59 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ILcdw-0003Kh-Jt
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 06:31:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ILcdu-0003KV-Hh
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 06:31:55 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ILcdu-0003KS-Cg
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 06:31:54 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1ILcdt-0000mi-VG
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 06:31:54 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1ILcds-0003ju-Dj
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:31:52 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1ILcds-0003jr-4D
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:31:52 +0000
To: gnash-commit@gnu.org
Message-Id: <E1ILcds-0003jr-4D@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 16 Aug 2007 10:31:52 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/edit_text_character.cpp ...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Aug 2007 10:31:56 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/16 10:31:51

Modified files:
	.              : ChangeLog 
	server         : edit_text_character.cpp edit_text_character.h 
	                 gnash.h 
	testsuite/actionscript.all: TextField.as 

Log message:
	        * server/edit_text_character.{cpp,h}: have a Range2d member to express
	          current TextField boundary (_width,_height). Implement _width and
	          _height setters. Add compile-time macro for debugging (still doesn't
	          work as expected).
	        * server/gnash.h: add more descriptions, a set() method and TODO items
	          for the 'point' class.
	        * testsuite/actionscript.all/TextField.as: more passes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4010&r2=1.4011
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.98&r2=1.99
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.h?cvsroot=gnash&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/gnash/server/gnash.h?cvsroot=gnash&r1=1.101&r2=1.102
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/TextField.as?cvsroot=gnash&r1=1.16&r2=1.17

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4010
retrieving revision 1.4011
diff -u -b -r1.4010 -r1.4011
--- ChangeLog	16 Aug 2007 09:29:32 -0000	1.4010
+++ ChangeLog	16 Aug 2007 10:31:50 -0000	1.4011
@@ -1,3 +1,13 @@
+2007-08-16 Sandro Santilli <strk@keybit.net>
+
+	* server/edit_text_character.{cpp,h}: have a Range2d member to express
+	  current TextField boundary (_width,_height). Implement _width and
+	  _height setters. Add compile-time macro for debugging (still doesn't
+	  work as expected).
+	* server/gnash.h: add more descriptions, a set() method and TODO items
+	  for the 'point' class.
+	* testsuite/actionscript.all/TextField.as: more passes.
+
 2007-08-16 Zou Lunkai <zoulunkai@gmail.com>
 
 	* testsuite/misc-ming.all/registerClassTest2.c, Makefile.am: new testcase

Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- server/edit_text_character.cpp	13 Aug 2007 03:26:33 -0000	1.98
+++ server/edit_text_character.cpp	16 Aug 2007 10:31:51 -0000	1.99
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: edit_text_character.cpp,v 1.98 2007/08/13 03:26:33 strk Exp $ */
+/* $Id: edit_text_character.cpp,v 1.99 2007/08/16 10:31:51 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -393,7 +393,8 @@
 	_borderColor(0,0,0,255),
 	_textColor(m_def->get_text_color()),
 	_embedFonts(m_def->getUseEmbeddedGlyphs()),
-	_autoSize(autoSizeNone)
+	_autoSize(autoSizeNone),
+	_bounds(m_def->get_bounds().getRange())
 {
 	assert(parent);
 	assert(m_def);
@@ -450,21 +451,26 @@
 
 	registerTextVariable();
 
-	rect def_bounds = m_def->get_bounds();
+	//rect def_bounds = m_def->get_bounds();
 
 	bool drawBorder = getDrawBorder();
 	bool drawBackground = getDrawBackground();
 
-	if ( drawBorder || drawBackground )
+	if ( (drawBorder || drawBackground) && _bounds.isFinite() )
 	{
 		matrix	mat = get_world_matrix();
 		render::set_matrix(mat);
 
 		point	coords[4];
-		coords[0] = def_bounds.get_corner(0);
-		coords[1] = def_bounds.get_corner(1);
-		coords[2] = def_bounds.get_corner(2);
-		coords[3] = def_bounds.get_corner(3);
+		float xmin = _bounds.getMinX();
+		float xmax = _bounds.getMaxX();
+		float ymin = _bounds.getMinY();
+		float ymax = _bounds.getMaxY();
+
+		coords[0].set(xmin, ymin); // = def_bounds.get_corner(0);
+		coords[1].set(xmax, ymin); // = def_bounds.get_corner(1);
+		coords[2].set(xmax, ymax); // = def_bounds.get_corner(2);
+		coords[3].set(xmin, ymax); // = def_bounds.get_corner(3);
 
 		rgba borderColor = drawBorder ? getBorderColor() : rgba(0,0,0,0);
 		rgba backgroundColor = drawBackground ? getBackgroundColor() : rgba(0,0,0,0);
@@ -477,6 +483,11 @@
 		if (drawBackground)
 			backgroundColor = cx.transform(backgroundColor);
 		
+#ifdef GNASH_DEBUG_TEXTFIELDS
+	std::stringstream ss; ss << _bounds;
+	log_debug("rendering a Pol composed by corners %s", ss.str().c_str());
+#endif
+
 		render::draw_poly( &coords[0], 4, backgroundColor, borderColor );
 		
 	}
@@ -488,9 +499,9 @@
 	// Anyway, see bug #17954 for a testcase.
 	matrix m;
 
-	if ( ! def_bounds.is_null() && ! def_bounds.is_world() )
+	if ( _bounds.isFinite() ) // ! def_bounds.is_null() && ! def_bounds.is_world() 
 	{
-		m.concatenate_translation(def_bounds.get_x_min(), def_bounds.get_y_min());
+		m.concatenate_translation(_bounds.getMinX(), _bounds.getMinY()); // def_bounds.get_x_min(), def_bounds.get_y_min()
 	}
 	
 	
@@ -655,8 +666,9 @@
 	point	p;
 	m.transform_by_inverse(&p, point(x, y));
 
-	const rect& def_bounds = m_def->get_bounds();
-	if (def_bounds.point_test(p.m_x, p.m_y))
+	//const rect& def_bounds = m_def->get_bounds();
+	//if (def_bounds.point_test(p.m_x, p.m_y))
+	if ( _bounds.contains(p.m_x, p.m_y) )
 	{
 		return this;
 	}
@@ -749,6 +761,76 @@
 		
 		return;
 	}
+	case M_WIDTH: // _width
+	{
+		float nw = PIXELS_TO_TWIPS(val.to_number()); // TODO: pass an as_environment !
+		if ( _bounds.width() == nw )
+		{
+#ifdef GNASH_DEBUG_TEXTFIELDS
+			log_debug("TextField width already == %g, nothing to do to change it", nw);
+#endif
+			return; // nothing to do
+		}
+		if ( ! _bounds.isFinite() )
+		{
+#ifdef GNASH_DEBUG_TEXTFIELDS
+			stringstream ss; ss<<_bounds;
+			log_debug("Non-finite TextField bounds : %s", ss.str().c_str());
+#endif
+			return;
+		}
+
+#ifdef GNASH_DEBUG_TEXTFIELDS
+		log_debug("Chaging TextField width to %g", nw);
+#endif
+
+		set_invalidated();
+
+		// Modify TextField drawing rectangle
+		// TODO: check which anchor point we should use !
+		float xmin = _bounds.getMinX();
+		float ymin = _bounds.getMinY();
+		float ymax = _bounds.getMaxY();
+		_bounds.setTo(xmin, ymin, xmin+nw, ymax);
+		assert(_bounds.width() == nw);
+
+		return;
+	}
+	case M_HEIGHT: // _height
+	{
+		float nh = PIXELS_TO_TWIPS(val.to_number()); // TODO: pass an as_environment !
+		if ( _bounds.height() == nh )
+		{
+#ifdef GNASH_DEBUG_TEXTFIELDS
+			log_debug("TextField height already == %g, nothing to do to change it", nh);
+#endif // GNASH_DEBUG_TEXTFIELDS
+			return; // nothing to do
+		}
+		if ( ! _bounds.isFinite() )
+		{
+#ifdef GNASH_DEBUG_TEXTFIELDS
+			stringstream ss; ss<<_bounds;
+			log_debug("Non-finite TextField bounds : %s", ss.str().c_str());
+#endif // GNASH_DEBUG_TEXTFIELDS
+			return;
+		}
+
+#ifdef GNASH_DEBUG_TEXTFIELDS
+		log_debug("Chaging TextField height to %g", nh);
+#endif // GNASH_DEBUG_TEXTFIELDS
+		set_invalidated();
+
+		// Modify TextField drawing rectangle
+		// TODO: check which anchor point we should use !
+		float xmin = _bounds.getMinX();
+		float xmax = _bounds.getMaxX();
+		float ymin = _bounds.getMinY();
+		_bounds.setTo(xmin, ymin, xmax, ymin+nh);
+
+		assert(_bounds.height() == nh);
+
+		return;
+	}
 	case M_VISIBLE:
 		//else if (name == "_visible")
 	{
@@ -823,11 +905,17 @@
 	case M_WIDTH: // _width
 	{
 		val->set_double(TWIPS_TO_PIXELS(get_width()));
+#ifdef GNASH_DEBUG_TEXTFIELDS
+		log_debug("Got TextField width == %s", val->to_debug_string().c_str());
+#endif // GNASH_DEBUG_TEXTFIELDS
 		return true;
 	}
 	case M_HEIGHT: // _height
 	{
 		val->set_double(TWIPS_TO_PIXELS(get_height()));
+#ifdef GNASH_DEBUG_TEXTFIELDS
+		log_debug("Got TextField height == %s", val->to_debug_string().c_str());
+#endif // GNASH_DEBUG_TEXTFIELDS
 		return true;
 	}
 	case M_TEXTWIDTH:
@@ -856,15 +944,17 @@
 	//GNASH_REPORT_FUNCTION;
 	assert(m_def);
 
-	float	extra_space = (m_def->width() -
-			m_def->get_right_margin()) - x - PADDING_TWIPS;
+	float width = _bounds.width(); // m_def->width()
+	float right_margin = m_def->get_right_margin();
+
+	float	extra_space = (width - right_margin) - x - PADDING_TWIPS;
 
 	//assert(extra_space >= 0.0f);
 	if (extra_space <= 0.0f)
 	{
 		log_debug(_("TextField text doesn't fit in its boundaries: "
 			    "width %g, margin %d - nothing to align"),
-			    m_def->width(), m_def->get_right_margin());
+			    width, right_margin);
 		return 0.0f;
 	}
 
@@ -1147,7 +1237,10 @@
 		
 after_x_advance:
 
-		if (x >= m_def->width() - m_def->get_right_margin() - PADDING_TWIPS)
+		float width = _bounds.width(); // m_def->width()
+		float right_margin = m_def->get_right_margin();
+
+		if (x >= width - right_margin - PADDING_TWIPS)
 		{
 			// Whoops, we just exceeded the box width. 
 			// Do word-wrap if requested to do so.
@@ -1371,8 +1464,9 @@
 	matrix wm = get_world_matrix();
 	point lp(x, y);
 	wm.transform_by_inverse(lp);
-	const rect& def_bounds = m_def->get_bounds();
-	return def_bounds.point_test(lp.m_x, lp.m_y);
+	return _bounds.contains(lp.m_x, lp.m_y);
+	//const rect& def_bounds = m_def->get_bounds();
+	//return def_bounds.point_test(lp.m_x, lp.m_y);
 }
 
 bool

Index: server/edit_text_character.h
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- server/edit_text_character.h	13 Aug 2007 03:26:09 -0000	1.44
+++ server/edit_text_character.h	16 Aug 2007 10:31:51 -0000	1.45
@@ -112,11 +112,7 @@
 
 	geometry::Range2d<float> getBounds() const
 	{
-		// TODO: keep an instance member for encoding
-		//       the bounding box, as it might be 
-		//       dynamically updated if the textfield
-		//       is editable and auto-resizes.
-		return m_def->get_bounds().getRange();
+		return _bounds;
 	}
 
 	// See dox in character.h
@@ -319,6 +315,14 @@
 
 	AutoSizeValue _autoSize;
 
+	/// Area in which the text is drawn. 
+	//
+	/// This area encloses all the text, can be automatically
+	/// extended to fit text or hide text overflowing it.
+	/// See the setAutoSize() method to change that.
+	///
+	geometry::Range2d<float> _bounds;
+
 protected:
 
 #ifdef GNASH_USE_GC

Index: server/gnash.h
===================================================================
RCS file: /sources/gnash/gnash/server/gnash.h,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -b -r1.101 -r1.102
--- server/gnash.h	24 Jul 2007 14:19:31 -0000	1.101
+++ server/gnash.h	16 Aug 2007 10:31:51 -0000	1.102
@@ -352,21 +352,38 @@
 //
 
 
+/// Point class
+//
+/// TODO: move in libgeometry/point2d.{cpp,h}, provide a gnash::point2d typedef
+/// TODO: make m_x and m_y members private ? (or rename to x,y)
+/// TODO: provide a toString() and an output operator
+///
 class DSOLOCAL point
 {
 public:
 	float	m_x, m_y;
 
+	/// Construct a point with X and Y values set to 0
 	point() : m_x(0), m_y(0) {}
+
+	/// Construct a point with X and Y values set to the given values
 	point(float x, float y) : m_x(x), m_y(y) {}
 
+	/// Set X and Y values of the point
+	void set(float x, float y)
+	{
+		m_x = x;
+		m_y = y;
+	}
+
+	/// Set to a + (b - a) * t
 	void	set_lerp(const point& a, const point& b, float t)
-		// Set to a + (b - a) * t
 		{
 			m_x = a.m_x + (b.m_x - a.m_x) * t;
 			m_y = a.m_y + (b.m_y - a.m_y) * t;
 		}
 
+	/// Compare two points for 2d equality
 	bool operator==(const point& p) const { return m_x == p.m_x && m_y == p.m_y; }
 
 	/// Return the square of the distance between this and other point.
@@ -375,6 +392,10 @@
 	/// Return the distance between this and other point.
 	float distance(const point& other) const;
 
+	/// Compare two points for bitwise equality
+	//
+	/// TODO: (should this really be different by normal equality?)
+	///
 	bool	bitwise_equal(const point& p) const;
 };
 

Index: testsuite/actionscript.all/TextField.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/TextField.as,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- testsuite/actionscript.all/TextField.as	15 Aug 2007 23:00:15 -0000	1.16
+++ testsuite/actionscript.all/TextField.as	16 Aug 2007 10:31:51 -0000	1.17
@@ -19,7 +19,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: TextField.as,v 1.16 2007/08/15 23:00:15 strk Exp $";
+rcsid="$Id: TextField.as,v 1.17 2007/08/16 10:31:51 strk Exp $";
 
 #include "check.as"
 
@@ -252,7 +252,7 @@
 check(!tf.__proto__.hasOwnProperty('_height'));
 check_equals(tf._height, 500); // as we created it, see createTextField call
 tf._height = 99999;
-xcheck_equals(tf._height, 99999); 
+check_equals(tf._height, 99999); 
 tf._height = 500;
 
 // Check TextField.hscroll
@@ -538,7 +538,7 @@
 check( ! tf.__proto__.hasOwnProperty('_width') ); 
 check_equals(tf._width, 500); // as it was set by createTextField, see above
 tf._width = 99999;
-xcheck_equals(tf._width, 99999); 
+check_equals(tf._width, 99999); 
 tf._width = 500;
 
 // Check TextField.wordWrap (should text wrap when bbox limit is hit?)
@@ -620,16 +620,16 @@
 tf.text = "Hello world";
 tf.autoSize = 'none';
 tf.wordWrap = false;
-xcheck_equals(tf._width, 10);
+check_equals(tf._width, 10);
 origTextWidth = tf.textWidth;
 tf.autoSize = 'center';
-check(tf._width > 10);
+xcheck(tf._width > 10);
 check_equals(origTextWidth, tf.textWidth); // textWidth isn't influenced by autoSize 
 tf.autoSize = 'none';
 tf.wordWrap = true;
 tf._width = 10;
 // Gnash ignores assigments to _width (should change TextField rendering area bounds instead)
-xcheck_equals(tf._width, 10);
+check_equals(tf._width, 10);
 check_equals(origTextWidth, tf.textWidth); // textWidth isn't influenced by wordWrap
 
 #endif // OUTPUT_VERSION > 5



From MAILER-DAEMON Thu Aug 16 10:17:54 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ILgAc-00055B-NG
	for mharc-gnash-commit@gnu.org; Thu, 16 Aug 2007 10:17:54 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ILgAb-000522-A9
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:17:53 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ILgAa-00050O-J4
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:17:52 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ILgAa-000504-BK
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:17:52 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mgoldin@lulu.com>) id 1ILgAZ-0007C3-Dx
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:17:51 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <mgoldin@lulu.com>) id 1ILgAP-0003DE-7w
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 14:17:41 +0000
Received: from mushi by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <mushi@savannah.gnu.org>) id 1ILgAO-0003DA-RY
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 14:17:41 +0000
To: gnash-commit@gnu.org
Message-Id: <E1ILgAO-0003DA-RY@cvs.savannah.gnu.org>
From: Melissa Goldin <mgoldin@lulu.com>
Date: Thu, 16 Aug 2007 14:17:40 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/doc/C/usermanual bugreport.xml
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Aug 2007 14:17:53 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Melissa Goldin <mushi>	07/08/16 14:17:40

Modified files:
	doc/C/usermanual: bugreport.xml 

Log message:
	Committing a small, basic upgrade to the voice of this file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/bugreport.xml?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: bugreport.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/usermanual/bugreport.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- bugreport.xml	1 Aug 2007 04:55:29 -0000	1.3
+++ bugreport.xml	16 Aug 2007 14:17:40 -0000	1.4
@@ -1,11 +1,14 @@
 <chapter id="bugreport">
   <title>Reporting Bugs</title>
 
+<para>
+The &app; project relies on the community to use and test the player; feedback is critical to any successful project.  Not only does it let us know that people use &app;, but it helps us understand the community's needs.  &app; uses a bug tracker on <ulink url="http://savannah.gnu.org" /> to manage these reports.
+</para>
+
   <para>
-    The better your bug report is, the easier it will be for the
+When filing a report, please follow the guidelines below. The better your bug report is, the easier it will be for the
     developers to address the issue.
-    Please follow the three steps described below before filing a bug
-    report:
+</para>
     <orderedlist>
       <listitem><para>
         <link linkend="bugstep_newcheckout">Compile the latest
@@ -20,7 +23,7 @@
         guidelines.</link>
       </para></listitem>
     </orderedlist>
-  </para>
+
 
   <sect1 id="bugstep_newcheckout">
     <title>Compile the latest &app; build</title>
@@ -31,23 +34,19 @@
       <link linkend="pre-configuration">configure</link> and 
       <link linkend="compile">compile</link> &app;.
     </para>
+
     <para>
-      If you are able to replicate the bug, 
-      <link linkend="bugstep_search">proceed to the next step</link>.
-    </para>
-    <para>
-      If the bug does not persist, the problem may have been solved, or
-      the issue may involve your environment.  By creating a fresh build
-      of your original version and trying to replicate the bug you
-      can determine if it is an environmental issue or a resolved bug.
-      If you are able to replicate the bug, the problem has been fixed
-      and there is no need to file a bug report.
+      If you are able to replicate the bug in the latest version, 
+      <link linkend="bugstep_search">proceed to the next step</link>.  If you cannot replicate the bug with the newer version, the problem may have been solved, or the issue may involve your environment
     </para>
+
     <para>
-      If the bug is no longer visible, the problem may be related to
-      your environment.  Try to determine the source of the conflict
-      so that you can include this information in your bug report.
-    </para>
+To check this, create a fresh build of the version in which you encountered the bug.  If you can reproduce the bug with the fresh copy of the original version, but cannot with the latest version, this is most likely a resolved bug.
+</para>
+
+<para>
+If you cannot reproduce the bug, it may still be unclear whether the bug is related to your environment or a &app; bug.  Try to determine the source of the problem.  &app; offers several helpful debugging options in the configure stage, and many verbosity options at the command line to help.
+</para>
   </sect1>
 
   <sect1 id="bugstep_search">
@@ -126,10 +125,9 @@
   <sect1 id="bugstep_file">
     <title>Filing a bug report</title>
     <para>
-      After following the steps described above, you can
+      After following the steps described above, you can file a bug report at 
       <ulink type="https"
-      url="https://savannah.gnu.org/bugs/?group=gnash">file a
-      bug report</ulink>.
+      url="https://savannah.gnu.org/bugs/?group=gnash" />.
     </para>
   </sect1>
 



From MAILER-DAEMON Thu Aug 16 10:18:22 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ILgB4-0005gh-TQ
	for mharc-gnash-commit@gnu.org; Thu, 16 Aug 2007 10:18:22 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ILgB3-0005gI-As
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:18:21 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ILgB1-0005dU-SF
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:18:21 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ILgB1-0005d5-LI
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:18:19 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mgoldin@lulu.com>) id 1ILgB1-0007LN-49
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:18:19 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <mgoldin@lulu.com>) id 1ILgB0-0003F4-Fb
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 14:18:18 +0000
Received: from mushi by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <mushi@savannah.gnu.org>) id 1ILgB0-0003F1-5k
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 14:18:18 +0000
To: gnash-commit@gnu.org
Message-Id: <E1ILgB0-0003F1-5k@cvs.savannah.gnu.org>
From: Melissa Goldin <mgoldin@lulu.com>
Date: Thu, 16 Aug 2007 14:18:18 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/doc/C/usermanual glossary.xml
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Aug 2007 14:18:22 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Melissa Goldin <mushi>	07/08/16 14:18:18

Modified files:
	doc/C/usermanual: glossary.xml 

Log message:
	This is now properly formatted as a true DocBook glossary.  Also, expanded the glossary to include most terms from the wiki.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/glossary.xml?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: glossary.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/usermanual/glossary.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- glossary.xml	1 Aug 2007 04:56:26 -0000	1.3
+++ glossary.xml	16 Aug 2007 14:18:17 -0000	1.4
@@ -1,66 +1,136 @@
-<chapter id="glossary">
-  <title>Glossary</title>
+<glossary id="glossary">
+<title>Glossary</title>
 
-  <variablelist>
-    <varlistentry>
-      <term>
+
+<glossdiv><title>A</title>
+
+ <glossentry>
+      <glossterm>
         ActionScript
-      </term>
-      <listitem>
+      </glossterm>
+      <glossdef>
         <para>
           <emphasis>ActionScript</emphasis>, or "AS", is the scripting 
           language for <emphasis>Flash</emphasis>
           applications.  It is compiled to bytecode, which is a subset of
           the <emphasis>SWF</emphasis> format.
         </para>
-      </listitem>
-    </varlistentry>
+      </glossdef>
+    </glossentry>
+
+<glossentry>
+      <glossterm>
+      AGG
+      </glossterm>
+      <glossdef>
+        <para>
+          AGG is the AntiGrain 2D graphics library, which can be used as a renderer in Gnash. It is faster than OpenGL on systems without hardware graphics acceleration. As of Gnash version 0.7.2 it is the more feature complete renderer.
+        </para>
+      </glossdef>
+    </glossentry>
 
-    <varlistentry>
-      <term>
+  <glossentry>
+      <glossterm>
         AMF
-      </term>
-      <listitem>
+      </glossterm>
+      <glossdef>
         <para>
           <emphasis>AMF</emphasis> 
           is the object format used by <emphasis>Flash</emphasis> 
           for shared objects and streaming video.
         </para>
-      </listitem>
-    </varlistentry>
+      </glossdef>
+    </glossentry>
+
+ <glossentry>
+      <glossterm>
+      as_environment
+      </glossterm>
+      <glossdef>
+        <para>
+          In Gnash terms, the as_environment, or ActionScript execution environment, contains a stack of objects, characters and values which are in the immediate environment of the current fn_call. Please refer to the Gnash ActionScript manual for more information.
+        </para>
+      </glossdef>
+    </glossentry>
 
-    <varlistentry>
-      <term>
+</glossdiv>
+
+<glossdiv><title>C</title>
+
+ <glossentry>
+      <glossterm>
+      Cairo
+      </glossterm>
+      <glossdef>
+        <para>
+          Cairo is a 2D graphics library with support for multiple output devices. Can be used as a renderer in Gnash. A useful feature of Cairo is that it will automatically use graphic card acceleration when available. Cairo has an experimental OpenGL backend.
+        </para>
+      </glossdef>
+    </glossentry>
+
+</glossdiv>
+
+<glossdiv><title>D</title>
+
+ <glossentry>
+      <glossterm>
+      DejaGNU
+      </glossterm>
+      <glossdef>
+        <para>
+          DejaGNU is a framework for testing software.
+        </para>
+      </glossdef>
+    </glossentry>
+
+ <glossentry>
+      <glossterm>
         DocBook
-      </term>
-      <listitem>
+      </glossterm>
+      <glossdef>
         <para>
           <emphasis>DocBook</emphasis>
            is a markup language for presentation-neutral 
           documentation, such as manuals.
         </para>
-      </listitem>
-    </varlistentry>
+      </glossdef>
+    </glossentry>
 
-    <varlistentry>
-      <term>
+ <glossentry>
+      <glossterm>
         Doxygen
-      </term>
-      <listitem>
+      </glossterm>
+      <glossdef>
         <para>
           <emphasis>Doxygen</emphasis> 
           is a documentation generator for for multiple languages 
           which uses comments in the source code to create stand-alone 
           documentation. 
         </para>
-      </listitem>
-    </varlistentry>
+      </glossdef>
+    </glossentry>
+
+ <glossentry>
+      <glossterm>
+      Drupal
+      </glossterm>
+      <glossdef>
+        <para>
+          Drupal is a CMS/blog system used for the main Gnash website.
+        </para>
+      </glossdef>
+    </glossentry>
+
+
+</glossdiv>
+
+<glossdiv><title>E</title>
 
-    <varlistentry>
-      <term>
+<glossentry>
+      <glossterm>
         extensions
-      </term>
-      <listitem>
+      </glossterm>
+      <glossdef>
         <para>
           A &app; <emphasis>extension</emphasis> is a plugin (not
           a browser plugin) which
@@ -69,28 +139,114 @@
           <emphasis>Flash</emphasis> specification. 
           These are shared libraries which are loaded at runtime.
         </para>
-      </listitem>
-    </varlistentry>
+      </glossdef>
+    </glossentry>
 
-    <varlistentry>
-      <term>
+
+</glossdiv>
+
+<glossdiv><title>F</title>
+
+ <glossentry>
+      <glossterm>
+      ffmpeg
+      </glossterm>
+      <glossdef>
+        <para>
+          ffmpeg is an audio and video decoding library which can be used by Gnash to decode mp3, FLV and other media types. 
+        </para>
+      </glossdef>
+    </glossentry>
+
+ <glossentry>
+      <glossterm>
         Flash
-      </term>
-      <listitem>
+      </glossterm>
+      <glossdef>
         <para>
-          The term <emphasis>Flash</emphasis> is used to describe both the 
+          The glossterm <emphasis>Flash</emphasis> is used to describe both the 
           Adobe IDE for creating <emphasis>SWF</emphasis>
            files, and the technology itself.  
           &app; documentation uses the latter definition.
         </para>
-      </listitem>
-    </varlistentry>
+      </glossdef>
+    </glossentry>
+
+ <glossentry>
+      <glossterm>
+      FLV
+      </glossterm>
+      <glossdef>
+        <para>
+          FLV is a proprietary file format used to deliver Flash video. It is used by YouTube, among others. 
+        </para>
+      </glossdef>
+    </glossentry>
+
+ <glossentry>
+      <glossterm>
+      FLTK
+      </glossterm>
+      <glossdef>
+        <para>
+          FLTK, or the 'Fast Light ToolKit', is a portable GUI library which is intended to replace the SDL GUI. Currently in Gnash, FLTK may be used with the Cairo and AGG renderers. FLTK has an experimental Cairo backend.
+        </para>
+      </glossdef>
+    </glossentry>
+
+ <glossentry>
+      <glossterm>
+      FrameBuffer
+      </glossterm>
+      <glossdef>
+        <para>
+          In Gnash, this is a GUI library that outputs directly to the Linux Frame Buffer and so does not need a window system to run. This makes it particularly suitable for use on small devices.
+        </para>
+      </glossdef>
+    </glossentry>
+
+</glossdiv>
+
+<glossdiv><title>G</title>
+
+ <glossentry>
+      <glossterm>
+      Gnash
+      </glossterm>
+      <glossdef>
+        <para>
+          Gnash is the GNU Flash movie player.
+        </para>
+      </glossdef>
+    </glossentry>
+
+ <glossentry>
+      <glossterm>
+      Gstreamer
+      </glossterm>
+      <glossdef>
+        <para>
+          Gstreamer is a multimedia framework which Gnash can use for decoding audio and video. Gstreamer itself cannot decode anything, so it needs some appropriate decoding-plugins to do the work for it. Remember to install them if you use Gnash with Gstreamer enabled. To get the best out of Gnashs gstreamer-parts, it is recommended to install the gst-plugins-good, gst-plugins-good and gst-ffmpeg plugins packages. 
+        </para>
+      </glossdef>
+    </glossentry>
 
-    <varlistentry>
-      <term>
+ <glossentry>
+      <glossterm>
+      GTK
+      </glossterm>
+      <glossdef>
+        <para>
+          GTK is the GIMP Toolkit GUI library. It is one of the GUI options for Gnash. As of Gnash 0.7.2, this is the more performant and feature-rich choice. GTK uses Cairo internally.
+        </para>
+      </glossdef>
+    </glossentry>
+
+ <glossentry>
+      <glossterm>
         GUI
-      </term>
-      <listitem>
+      </glossterm>
+      <glossdef>
         <para>
           A <emphasis>GUI</emphasis> is a 
           "graphical user interface". In &app;, the GUI 
@@ -99,14 +255,18 @@
           You must choose a GUI library during the
           <link linkend="pre-configuration">configuration</link> stage.
         </para>
-      </listitem>
-    </varlistentry>
+      </glossdef>
+    </glossentry>
+
+</glossdiv>
 
-    <varlistentry>
-      <term>
+<glossdiv><title>K</title>
+
+ <glossentry>
+      <glossterm>
         Klash
-      </term>
-      <listitem>
+      </glossterm>
+      <glossdef>
         <para>
           <emphasis>Klash</emphasis> was the name given to the stand-alone 
           instance of &app; which used the KDE GUI.  It has been replaced with 
@@ -114,56 +274,152 @@
           refer to the Konqueror plugin as <emphasis>Klash</emphasis>.
           The plugin was renamed <emphasis>Kpart</emphasis>.
         </para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>
+      </glossdef>
+    </glossentry>
+ <glossentry>
+      <glossterm>
         Kpart
-      </term>
-      <listitem>
+      </glossterm>
+      <glossdef>
         <para>
           <emphasis>Kpart</emphasis> is a plugin for Konqueror which is
           enabled with the <link linkend="features">configuration option</link>
           <emphasis>--enable-klash</emphasis>.
         </para>
-      </listitem>
-    </varlistentry>
+      </glossdef>
+    </glossentry>
+
+</glossdiv>
+
+<glossdiv><title>L</title>
 
-    <varlistentry>
-      <term>
+ <glossentry>
+      <glossterm>
+      libmad
+      </glossterm>
+      <glossdef>
+        <para>
+          libmad is a mp3-decoding library, which can be used by Gnash's sound handler to decode mp3-audio. 
+        </para>
+      </glossdef>
+    </glossentry>
+
+</glossdiv>
+
+
+<glossdiv><title>M</title>
+
+ <glossentry>
+      <glossterm>
         Mesa
-      </term>
-      <listitem>
+      </glossterm>
+      <glossdef>
         <para>
           <emphasis>Mesa</emphasis> is the free software OpenGL 
           implementation.  &app; documentation will sometimes use the
-          terms 'OpenGL' and 'Mesa' interchangeably.
+          glossterms 'OpenGL' and 'Mesa' interchangeably.
         </para>
-      </listitem>
-    </varlistentry>
+      </glossdef>
+    </glossentry>
 
-    <varlistentry>
-      <term>
+ <glossentry>
+      <glossterm>
+      Ming
+      </glossterm>
+      <glossdef>
+        <para>
+          Ming is a C library for generating SWF ("Flash") format movies, plus a set of wrappers for using the library. It is used by the Gnash project for generating testcases. 
+        </para>
+      </glossdef>
+    </glossentry>
+
+</glossdiv>
+
+<glossdiv><title>N</title>
+
+
+ <glossentry>
+      <glossterm>
+      Nellymoser
+      </glossterm>
+      <glossdef>
+        <para>
+          Nellymoser is a proprietary audio codec introduced in the Flash Player in version 6. For more information, please see Wikipedia.
+        </para>
+      </glossdef>
+    </glossentry>
+
+</glossdiv>
+
+<glossdiv><title>O</title>
+
+ <glossentry>
+      <glossterm>
+      OpenGL
+      </glossterm>
+      <glossdef>
+        <para>
+          OpenGL (Open Graphics Library) is a standard specification defining a cross-language cross-platform API for writing applications that produce 3D and 2D computer graphics. Accelerated graphic cards usually provide OpenGL at the hardware level. Please refer to Wikipedia for availability of free software OpenGL hardware drivers. A free software implementation of the API is available (Mesa). OpenGL can be used as a renderer in Gnash.
+        </para>
+      </glossdef>
+    </glossentry>
+
+ <glossentry>
+      <glossterm>
+      ORM
+      </glossterm>
+      <glossdef>
+        <para>
+          ORM is a system for ensuring the rights of the creator over a piece of digital content. It is more passive than DRM.
+        </para>
+      </glossdef>
+    </glossentry>
+
+</glossdiv>
+
+<glossdiv><title>P</title>
+
+ <glossentry>
+      <glossterm>
         plugin
-      </term>
-      <listitem>
+      </glossterm>
+      <glossdef>
         <para>
-          The term <emphasis>plugin</emphasis> is used in &app; to
+          The glossterm <emphasis>plugin</emphasis> is used in &app; to
           refer to both any &app; browser plugin, as well as the Firefox
           plugin specifically.  The Konqueror plugin is called
           <emphasis>Kpart</emphasis>.  Sometimes, the term is used in
           an even more generic sense to refer to 
           <emphasis>extensions</emphasis>.
         </para>
-      </listitem>
-    </varlistentry>
+      </glossdef>
+    </glossentry>
+
+
+</glossdiv>
+
+<glossdiv><title>Q</title>
+
+ <glossentry>
+      <glossterm>
+      Qt
+      </glossterm>
+      <glossdef>
+        <para>
+          Qt is a GUI library which is used by KDE. The plugin version of Gnash using this GUI library is Kpart. The standalone version is enabled with --enable-gui=kde.
+        </para>
+      </glossdef>
+    </glossentry>
 
-    <varlistentry>
-      <term>
+</glossdiv>
+
+<glossdiv><title>R</title>
+
+  <glossentry>
+      <glossterm>
         renderer
-      </term>
-      <listitem>
+      </glossterm>
+      <glossdef>
         <para>
           The <emphasis>renderer</emphasis> is the subsystem of &app;
           which renders content.  Only one renderer may be used; it is
@@ -177,14 +433,64 @@
           rendering (for example, when you have a very slow CPU but a very 
           fast graphics card). In this case OpenGL should be used.
         </para>
-      </listitem>
-    </varlistentry>
+      </glossdef>
+    </glossentry>
 
-    <varlistentry>
-      <term>
+ <glossentry>
+      <glossterm>
+      RTMP
+      </glossterm>
+      <glossdef>
+        <para>
+          RTMP is the Real Time Messaging Protocol primarily used with to stream audio and video over the internet to the Flash Player client.
+        </para>
+      </glossdef>
+    </glossentry>
+
+
+ <glossentry>
+      <glossterm>
+      RTMPT
+      </glossterm>
+      <glossdef>
+        <para>
+          RTMPT is basically a HTTP wrapper around the RTMP protocol that is sent using POST requests from the client to the server. Because of the non-persistent nature of HTTP connections, RTMPT requires the clients to poll for updates periodically in order to get notified about events that are generated by the server or other clients. 
+        </para>
+      </glossdef>
+    </glossentry>
+
+ <glossentry>
+      <glossterm>
+      RTMPTS
+      </glossterm>
+      <glossdef>
+        <para>
+          RTMPTS is the same as RTMPT, but instead of being a HTTP wrapper, it is a HTTPSSL wrapper (HTTP secure connection).
+        </para>
+      </glossdef>
+    </glossentry>
+
+</glossdiv>
+
+<glossdiv><title>S</title>
+
+ <glossentry>
+      <glossterm>
+      SDL
+      </glossterm>
+      <glossdef>
+        <para>
+          Simple DirectMedia Layer is a cross-platform multimedia free software library that creates an abstraction over various platforms' graphics, sound, and input APIs. Gnash can use it as a GUI and/or as a sound handler. Note that the two usages are independent of each other: you can use it for a task and not for the other if you wish. At time or writing (2007-01-11) the SDL GUI lacks menus and a performant input event architecture; the SDL sound handler is the most feature rich, supporting Video through ffmpeg.
+        </para>
+      </glossdef>
+    </glossentry>
+
+
+ <glossentry>
+      <glossterm>
         sound handler
-      </term>
-      <listitem>
+      </glossterm>
+      <glossdef>
         <para>
           The <emphasis>sound handler</emphasis> is the part of &app;
           which handles both event sounds and streaming sound.  Audio
@@ -201,21 +507,84 @@
           important plugins are missing.  The SDL sound handler is 
           recommended.  
         </para>
-      </listitem>
-    </varlistentry>
+      </glossdef>
+    </glossentry>
+
+ <glossentry>
+      <glossterm>
+      sprite
+      </glossterm>
+      <glossdef>
+        <para>
+          A sprite is an element of an Flash Movie. It's basically a Movie inside another, having its own timeline.
+        </para>
+      </glossdef>
+    </glossentry>
+
+ <glossentry>
+      <glossterm>
+      Stage
+      </glossterm>
+      <glossdef>
+        <para>
+          The visible area of a Flash movie. The name derives from a theater analogy. Graphical elements are referred to as characters. 
+        </para>
+      </glossdef>
+    </glossentry>
 
-    <varlistentry>
-      <term>
+ <glossentry>
+      <glossterm>
         SWF
-      </term>
-      <listitem>
+      </glossterm>
+      <glossdef>
         <para>
           <emphasis>SWF</emphasis> is the file format for 
           <emphasis>Flash</emphasis> movies.
         </para>
-      </listitem>
-    </varlistentry>
+      </glossdef>
+    </glossentry>
+
+</glossdiv>
+
+<glossdiv><title>T</title>
+
+ <glossentry>
+      <glossterm>
+      Tamarin
+      </glossterm>
+      <glossdef>
+        <para>
+          The Tamarin project seeks to create an open source implementation of the ECMAScript 4th edition language specification. The code is used by Adobe as part of the ActionScript Virtual Machine within the Adobe Flash Player. Gnash does not use Tamarin; it already has a working virtual server and most ActionScript classes are implemented.
+        </para>
+      </glossdef>
+    </glossentry>
+
+ <glossentry>
+      <glossterm>
+      timeline
+      </glossterm>
+      <glossdef>
+        <para>
+          In Flash technology, a timeline is a sequence of "frames". A single Flash movie can contain multiple timelines, each independently controlled (STOP or PLAY). At regular intervals (FPS) the player advances all timelines in PLAY mode to the next frame, looping back when last frame is reached.
+        </para>
+      </glossdef>
+    </glossentry>
+
+</glossdiv>
+
+<glossdiv><title>X</title>
+
+ <glossentry>
+      <glossterm>
+      X.org
+      </glossterm>
+      <glossdef>
+        <para>
+          X.org is the most commonly used X server; it was forked from XFree86.
+        </para>
+      </glossdef>
+    </glossentry>
 
-  </variablelist>
-</chapter>
+</glossdiv>
     
+</glossary>
\ No newline at end of file



From MAILER-DAEMON Thu Aug 16 10:19:24 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ILgC3-0007Gf-Qr
	for mharc-gnash-commit@gnu.org; Thu, 16 Aug 2007 10:19:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ILgC1-0007EP-Ue
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:19:22 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ILgC0-0007CX-QD
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:19:21 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ILgC0-0007C9-Ki
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:19:20 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mgoldin@lulu.com>) id 1ILgC0-0007Yc-2y
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:19:20 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <mgoldin@lulu.com>) id 1ILgBz-0003Gf-DB
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 14:19:19 +0000
Received: from mushi by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <mushi@savannah.gnu.org>) id 1ILgBz-0003Gc-8g
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 14:19:19 +0000
To: gnash-commit@gnu.org
Message-Id: <E1ILgBz-0003Gc-8g@cvs.savannah.gnu.org>
From: Melissa Goldin <mgoldin@lulu.com>
Date: Thu, 16 Aug 2007 14:19:19 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/doc/C/usermanual installation.xml
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Aug 2007 14:19:22 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Melissa Goldin <mushi>	07/08/16 14:19:19

Modified files:
	doc/C/usermanual: installation.xml 

Log message:
	Added a bit more explanatory text.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/installation.xml?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: installation.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/usermanual/installation.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- installation.xml	1 Aug 2007 04:58:21 -0000	1.4
+++ installation.xml	16 Aug 2007 14:19:19 -0000	1.5
@@ -14,31 +14,11 @@
 Before downloading and installing &app;, check that your hardware and software meet the following requirements.
 </para>
 
-<sect2 id="software">
-<title>Software Requirements</title>
-
-<para>
-The 0.8.0 release of &app; has been designed to run on UNIX/Linux variants, and has been run on most of the free ones.  However, &app; hassucessfully run on Windows, Darwin (Mac OS X), Iris, Solaris, BeOs, OS/2, and Haiku.  &app; has also run on the following 64-bit systems: PowerPC, Itanium, UltraSparc, and AMD64.   For now, it is important to be sure that the following code, testing, and documentation dependencies are met before installing &app;.  If you will be downloading &app; with a package manager, these dependencies may be solved by the pacakge manager.  Otherwise, you must first verify that each of these dependencies are installed on the target system.
-</para>
-
- <sect3 id="codedepend">
-       &codedependencies;
-    </sect3>
-
- <sect3 id="testdepend">
-       &testdependencies;
-    </sect3>
-
-<sect3 id="docdepend">
-       &docdependencies;
-    </sect3>
-</sect2>
-
 <sect2 id="hardware">
 <title>Hardware Requirements</title>
 
 <para>
-One of the goals of &app; is to make it portable enough to install on small devices.  As a result, the hardware requirements are minimal. &app; has even run on an ARM9 at 200 MHz with 64 MB of RAM ! (It ran without video support in this case.)   While firm minimums have not been established, &app; has been shown to run successfully with the following:
+One of the goals of &app; is to make it portable enough to install on small devices.  As a result, the hardware requirements are minimal. &app; has even run on an ARM9 at 200 MHz with 64 MB of RAM! (It ran without video support in this case.)   While firm minimums have not been established, &app; has been shown to run successfully with the following:
 </para>
 
 <itemizedlist>
@@ -58,6 +38,160 @@
 </para>
 </listitem>
 </itemizedlist>
+
+<para>
+The following table provides a list of the Operating System/CPU combinations on which &app; has been shown to run.
+</para>
+
+<table id="tb-os-cpu">
+<title>Build Matrix</title>
+<tgroup cols='2' align='left' colsep='1' rowsep='1'>
+<colspec colname='Operating System' />
+<colspec colname='CPU' />
+<thead>
+<row>
+  <entry>Render GUI</entry>
+  <entry>Virtual Memory</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry>FreeBSD</entry>
+<entry>Alpha AXP, AMD64, i386, Itanium, PC-98, PowerPC, SPARC64 
+</entry>
+</row>
+<row>
+<entry>GNU/Linux 
+</entry>
+<entry>CRIS</entry>
+</row>
+<row>
+<entry>GNU/Linux [OLPC] 
+</entry>
+<entry>Geode GX 
+</entry>
+</row>
+<row>
+<entry>GNU/Linux ALTLinux 
+</entry>
+<entry>i586</entry>
+</row>
+<row>
+<entry>GNU/Linux Arklinux 
+</entry>
+<entry>i586</entry>
+</row>
+<row>
+<entry>GNU/Linux Debian 
+</entry>
+<entry>Alpha AXP, AMD64, ARM, hppa, i386, Itanium, MIPS, PowerPC, IBM zSeries (s390), SPARC 
+</entry>
+</row>
+<row>
+<entry>GNU/Linux Fedora core 
+</entry>
+<entry>x86-32, x86-64 
+</entry>
+</row>
+<row>
+<entry>GNU/Linux Gentoo 
+</entry>
+<entry>AMD64, PowerPC, SPARC, x86 
+</entry>
+</row>
+<row>
+<entry>GNU/Linux Gentoo 
+</entry>
+<entry>AMD64, PowerPC, SPARC, x86 
+</entry>
+</row>
+<row>
+<entry>GNU/Linux Maemo 2.1 
+</entry>
+<entry>ARMv5t</entry>
+</row>
+<row>
+<entry>GNU/Linux Mandriva 2007 
+</entry>
+<entry></entry>
+</row>
+<row>
+<entry>GNU/Linux Open Zaurus 
+</entry>
+<entry>ARM 
+</entry>
+</row>
+<row>
+<entry>GNU/Linux OpenSuSE 10 
+</entry>
+<entry>i586, x86-64 
+</entry>
+</row>
+<row>
+<entry>GNU/Linux Red Hat 
+</entry>
+<entry>x86-32, x86-64 
+</entry>
+</row>
+<row>
+<entry>GNU/Linux Ubuntu 
+</entry>
+<entry>x86-64 reported working, also x86-32 and UltraSPARC 
+</entry>
+</row>
+<row>
+<entry>Haiku</entry>
+<entry></entry>
+</row>
+<row>
+<entry>Irix 6.5 
+</entry>
+<entry>MIPS R10K 
+</entry>
+</row>
+<row>
+<entry>MacOS X 
+</entry>
+<entry>PowerPC and x86-32 
+</entry>
+</row>
+<row>
+<entry>NetBSD</entry>
+<entry>many, including VAX
+</entry>
+</row>
+<row>
+<entry>OpenBSD</entry>
+<entry>many, including VAX, OS/2 and eComstation</entry>
+</row>
+<row>
+<entry>Windows</entry>
+<entry>x86-32</entry>
+</row>
+</tbody>
+</tgroup>
+</table>
+
+</sect2>
+
+<sect2 id="software">
+<title>Software Requirements</title>
+
+<para>
+The &appversion; release of &app; has been designed to run on UNIX/Linux variants, and has been run on most of the free ones.  However, &app; has successfully run on Windows, Darwin (Mac OS X), Irix, Solaris, BeOs, OS/2, and Haiku.  &app; has also run on the following 64-bit systems: PowerPC, Itanium, UltraSparc, and AMD64.   For now, it is important to be sure that the following code, testing, and documentation dependencies are met before installing &app;.  If you will be downloading &app; with a package manager, these dependencies may be solved by the package manager.  Otherwise, you must first verify that each of these dependencies are installed on the target system.
+</para>
+
+ <sect3 id="codedepend">
+       &codedependencies;
+    </sect3>
+
+ <sect3 id="testdepend">
+       &testdependencies;
+    </sect3>
+
+<sect3 id="docdepend">
+       &docdependencies;
+    </sect3>
 </sect2>
 
 </sect1>
@@ -66,7 +200,7 @@
 <title>Downloading &app;</title>
 
 <para>
-There are two ways to download &app;: using a package manager or by downloading the source code and building it on your system.  If a package exists for your operating system and you do not need the very latest version of &app;, it is advisable to use a package manager, which can resolve dependencies.  However, if you want the very latest features, or a &app; package is not available for your operating system, it is better to download the source code and build &app; locally.
+There are two ways to download &app;: using a package manager or by downloading the source code and building it on your system. If possible, it is advisable to use a package manager to download &app;, as it will resolve dependencies for you.  However, if you want the very latest features, or a &app; package is not available for your operating system, it is better to download the source code and build &app; locally.
 </para>
 
   <sect2 id="packagemanager">
@@ -108,23 +242,26 @@
 
     <para>
       The latest development sources are available via
-      anonymous CVS (leave the password blank).  This is recommended
+      anonymous CVS.  This is recommended
       if you need features or bug fixes which were introduced after
       the <link linkend="sourcereleases">last release</link>.  Look at
       the <link linkend="sourcesnapshot">daily snapshot</link> if you
       experience difficulty accessing the repository.
     </para>
     <para>
-      First set the
-      environment variable <emphasis>CVS_RSH</emphasis> to 'ssh', as shown
-      in this example, which uses the GNU Bourne-Again shell (bash):
-      <programlisting>
-  export CVS_RSH="ssh"
-  cvs -z3 -d:pserver:anonymous@cvs.sv.gnu.org:/sources/gnash co gnash
-      </programlisting>
-      It is also possible to
+To download via anonymous CVS, first set the
+      environment variable <command>CVS_RSH</command> to <command>ssh</command>, then check out the source code.  The example below uses the GNU Bourne-Again shell (bash):
+</para>
+
+<screen>
+export CVS_RSH="ssh"
+cvs -z3 -d:pserver:anonymous@cvs.sv.gnu.org:/sources/gnash co gnash
+</screen>
+
+<para>
+      It is also possible to browse the repository
       <ulink url="http://cvs.savannah.gnu.org/viewcvs/gnash/?root=gnash"
-      type="http">browse the repository</ulink> on the web.
+      type="http" /> on the web.
     </para>
   </sect3>
 



From MAILER-DAEMON Thu Aug 16 10:21:12 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ILgDo-0008Pq-Ju
	for mharc-gnash-commit@gnu.org; Thu, 16 Aug 2007 10:21:12 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ILgDn-0008P7-2Y
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:21:11 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ILgDm-0008Of-Gt
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:21:10 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ILgDm-0008Oc-Ad
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:21:10 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mgoldin@lulu.com>) id 1ILgDl-0007ym-VZ
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:21:10 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <mgoldin@lulu.com>) id 1ILgDl-0003LJ-Bj
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 14:21:09 +0000
Received: from mushi by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <mushi@savannah.gnu.org>) id 1ILgDl-0003LG-7f
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 14:21:09 +0000
To: gnash-commit@gnu.org
Message-Id: <E1ILgDl-0003LG-7f@cvs.savannah.gnu.org>
From: Melissa Goldin <mgoldin@lulu.com>
Date: Thu, 16 Aug 2007 14:21:09 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/doc/C/usermanual introduction.xml
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Aug 2007 14:21:11 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Melissa Goldin <mushi>	07/08/16 14:21:09

Modified files:
	doc/C/usermanual: introduction.xml 

Log message:
	Moved a few pieces of information around, added more explanatory text.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/introduction.xml?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: introduction.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/usermanual/introduction.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- introduction.xml	1 Aug 2007 04:59:35 -0000	1.2
+++ introduction.xml	16 Aug 2007 14:21:09 -0000	1.3
@@ -63,7 +63,7 @@
 <title>Audience</title>
 
 <para>
-This manual is primarily focused on developers interested in contributing to or building from the &app; project.  IT serves as a detailed reference guide, including a catalog and explanation of all options and features.  This level of detail may make this guide cumbersome for the average user, although advanced users may find it helpful.
+This manual is primarily focused on developers interested in contributing to or building from the &app; project.  It serves as a detailed reference guide, including a catalog and explanation of all options and features.  This level of detail may make this guide cumbersome for the average user, although advanced users may find it helpful.
 </para>
 
 <para>
@@ -71,15 +71,6 @@
 </para>
 </sect1>
 
-<sect1 id="Organization">
-<title>Organization of This Guide</title>
-
-<para>
-Written Last
-</para>
-
-</sect1>
-
 <sect1 id="guide-conventions">
 <title>Guide Conventions</title>
 
@@ -169,10 +160,10 @@
 </listitem>
 </varlistentry>
 <varlistentry>
-<term><replaceable>[replaceable]</replaceable></term>
+<term><replaceable>&lt;replaceable&gt;</replaceable></term>
 <listitem>
 <para>
-Whenever a general term is included in an example as a placeholder, it will be signaled by this formatting.  This formatting will usually appear inside other formatting.  For example, <filename>/home/<replaceable>[username]</replaceable></filename> indicates the home directory of a user, whose actual username would be substituted in for <replaceable>[username]</replaceable>.
+Whenever a general term is included in an example as a placeholder, it will be signaled by this formatting.  This formatting will usually appear inside other formatting.  For example, <filename>/home/<replaceable>&lt;username&gt;</replaceable></filename> indicates the home directory of a user, whose actual username would be substituted in for <replaceable>&lt;username&gt;</replaceable>.
 </para>
 </listitem>
 </varlistentry>
@@ -188,19 +179,19 @@
 
 </sect1>
 
-<sect1 id="Acknowledgements">
-<title>Acknowledgements</title>
+<sect1 id="Acknowledgments">
+<title>Acknowledgments</title>
 
 <para>
-The first version of this guide was written by Rob Savoye.  If not for his tireless efforst, this book - and this project - would never have come this far.
+The first version of this guide was written by Rob Savoye.  If not for his tireless efforts, this book - and this project - would never have come this far.
 </para>
 
 <para>
-John Gilmore has also been dedicated to the project from the beginning. I have shamelessly plagiarized one of his early announcement emails in the early part of this chapter.
+John Steinhart has also been dedicated to the project from the beginning. I have shamelessly plagiarized one of his early announcement emails in the early part of this chapter.
 </para>
 
 <para>
-Ann Barcomb was instrumental in taking this guide from the 0.3.0 to the 0.4.0 version, incorporating the many changes that came wth &app; version 0.8.0.
+Ann Barcomb was instrumental in taking this guide from the 0.3.0 to the 0.4.0 version, incorporating the many changes that came with &app; version 0.8.0.
 </para>
 
 <para>



From MAILER-DAEMON Thu Aug 16 10:23:58 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ILgGU-0001og-BN
	for mharc-gnash-commit@gnu.org; Thu, 16 Aug 2007 10:23:58 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ILgGS-0001mm-KN
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:23:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ILgGR-0001lm-Ro
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:23:56 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ILgGR-0001lf-MR
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:23:55 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mgoldin@lulu.com>) id 1ILgGR-0000Df-66
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:23:55 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <mgoldin@lulu.com>) id 1ILgGQ-0003Nf-Mx
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 14:23:54 +0000
Received: from mushi by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <mushi@savannah.gnu.org>) id 1ILgGQ-0003Nc-IM
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 14:23:54 +0000
To: gnash-commit@gnu.org
Message-Id: <E1ILgGQ-0003Nc-IM@cvs.savannah.gnu.org>
From: Melissa Goldin <mgoldin@lulu.com>
Date: Thu, 16 Aug 2007 14:23:54 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/doc/C/usermanual specification.xml
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Aug 2007 14:23:57 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Melissa Goldin <mushi>	07/08/16 14:23:54

Added files:
	doc/C/usermanual: specification.xml 

Log message:
	Brand new section designed to provide specific technical details, such as exactly how ActionScript is implemented, how security is handled, and how memory is handled.  I wanted to make sure there was some sort of text around the new garbage collector.  
	
	In future, I imagine this will be the section that needs udpating with every release.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/specification.xml?cvsroot=gnash&rev=1.1

Patches:
Index: specification.xml
===================================================================
RCS file: specification.xml
diff -N specification.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ specification.xml	16 Aug 2007 14:23:54 -0000	1.1
@@ -0,0 +1,319 @@
+<chapter id="specification">
+<title>Technical Specifications</title>
+
+<para>
+The information in this chapter may change quickly.  For the most current information about the following subjects, be sure the check the Developer's Wiki at <ulink url="http://www.gnashdev.org/wiki/index.php/Main_Page" />.
+</para>
+
+<sect1 id="spec-actionscript">
+<title>&AS;</title>
+
+<para>
+As stated in the section <xref linkend="flashsupport" />, &app; has implemented about 80% of &AS; v. 2.0, and has begun implementing &AS; v. 3.0.  &app; supports the majority of Flash opcodes up to SWF version 7, and a wide sampling of &AS; classes for SWF version 7.
+</para>
+
+<para>
+The following table indicates how fully various &AS; classes have been implemented:
+</para>
+
+<table id="tb-actionscript-classes">
+<title>&AS; Classes</title>
+<tgroup cols='2' align='left' colsep='1' rowsep='1'>
+<colspec colname='Class'/>
+<colspec colname='Status'/>
+<thead>
+<row>
+  <entry>Class</entry>
+  <entry>Status</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry>Actionscript/Date</entry>
+<entry>Implemented</entry>
+</row>
+<row>
+<entry>Actionscript/Function</entry>
+<entry>Implemented</entry>
+</row>
+<row>
+<entry>Actionscript/MovieClip</entry>
+<entry>Implemented</entry>
+</row>
+<row>
+<entry>Actionscript/MovieClipLoader</entry>
+<entry>Implemented</entry>
+</row>
+<row>
+<entry>Actionscript/Object</entry>
+<entry>Implemented</entry>
+</row>
+<row>
+<entry>Actionscript/Sound</entry>
+<entry>Implemented</entry>
+</row>
+<row>
+<entry>Actionscript/String</entry>
+<entry>Implemented</entry>
+</row>
+<row>
+<entry>Actionscript/XMLNode</entry>
+<entry>Implemented</entry>
+</row>
+<row>
+<entry>Actionscript/XMLSocket</entry>
+<entry>Implemented</entry>
+</row>
+<row>
+<entry>Actionscript/_global</entry>
+<entry>Partially Implemented</entry>
+</row>
+<row>
+<entry>Actionscript/Array</entry>
+<entry>Partially Implemented</entry>
+</row>
+<row>
+<entry>Actionscript/LocalConnection</entry>
+<entry>Partially Implemented</entry>
+</row>
+<row>
+<entry>Actionscript/NetConnection</entry>
+<entry>Partially Implemented</entry>
+</row>
+<row>
+<entry>Actionscript/NetStream</entry>
+<entry>Partially Implemented</entry>
+</row>
+<row>
+<entry>Actionscript/TextField</entry>
+<entry>Partially Implemented</entry>
+</row>
+<row>
+<entry>Actionscript/XML</entry>
+<entry>Partially Implemented</entry>
+</row>
+<row>
+<entry>Actionscript/Boolean</entry>
+<entry>Unimplemented</entry>
+</row>
+<row>
+<entry>Actionscript/Error</entry>
+<entry>Unimplemented</entry>
+</row>
+<row>
+<entry>Actionscript/LoadVars</entry>
+<entry>Unimplemented</entry>
+</row>
+<row>
+<entry>Actionscript/Number</entry>
+<entry>Unimplemented</entry>
+</row>
+<row>
+<entry>Actionscript/Selection</entry>
+<entry>Unimplemented</entry>
+</row>
+<row>
+<entry>Actionscript/TextFormat</entry>
+<entry>Unimplemented</entry>
+</row>
+<row>
+<entry>Actionscript/Unknown</entry>
+<entry>Unimplemented</entry>
+</row>
+</tbody>
+</tgroup>
+</table>
+
+<para>
+The next table indicates which opcodes have been implemented:
+</para>
+
+<table id="tb-opcodes">
+<title>Opcodes</title>
+<tgroup cols='2' align='left' colsep='1' rowsep='1'>
+<colspec colname='Opcode'/>
+<colspec colname='Status'/>
+<thead>
+<row>
+  <entry>Opcode</entry>
+  <entry>Status</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry>0x43 declare_obj</entry>
+<entry>Implemented</entry>
+</row>
+<row>
+<entry>0x2B cast</entry>
+<entry>Implemented</entry>
+</row>
+<row>
+<entry>0x3B delete2 - SWF::ACTION_DELETE</entry>
+<entry>Implemented</entry>
+</row>
+<row>
+<entry>0x53 new_method</entry>
+<entry>Implemented</entry>
+</row>
+<row>
+<entry>0x55 enum_object</entry>
+<entry>Implemented</entry>
+</row>
+<row>
+<entry>0x3A delete - SWF::ACTION_DELETEVAR</entry>
+<entry>Implemented</entry>
+</row>
+<row>
+<entry>0x69 Extends - SWF::ACTION_EXTENDS</entry>
+<entry>Implemented</entry>
+</row>
+<row>
+<entry>0x54 instance_of</entry>
+<entry>Partially Implemented</entry>
+</row>
+<row>
+<entry>0x2A Throw</entry>
+<entry>Unimplemented</entry>
+</row>
+<row>
+<entry>0x2C Implements</entry>
+<entry>Unimplemented</entry>
+</row>
+<row>
+<entry>0x8F Try</entry>
+<entry>Unimplemented</entry>
+</row>
+<row>
+<entry>0x31 md length</entry>
+<entry>Unimplemented</entry>
+</row>
+<row>
+<entry>0x35 md substring</entry>
+<entry>Unimplemented</entry>
+</row>
+<row>
+<entry>0x37 md chr</entry>
+<entry>Unimplemented</entry>
+</row>
+<row>
+<entry>0x45 get target</entry>
+<entry>Unimplemented</entry>
+</row>
+</tbody>
+</tgroup>
+</table>
+
+</sect1>
+
+<sect1 id="spec-memory">
+<title>Memory Management</title>
+
+<para>
+One of the new features of &app; &appversion; is the garbage collector.  The garbage collector manages complex &AS; variables, which are the only ones that are shared by references.  In &app;, these are <command>as_object</command> class instances created by &AS; (i.e. not those created by playhead control: <command>placeobject</command>/<command>removeobject</command>).
+</para>
+
+<para>
+Collected objects are those allocated due to &AS; explicit or implicit calls.  Explicit all are any user-defined statements that allocate new objects, such as arrays, Objects, or script-created movieclips.  Implicit calls are the built-in functions that can be deleted by arbitrary user calls.
+</para>
+
+<para>
+Any object that is a candidate for garbage collecting is stored in a list owned by the collector.  This list is filled by an executing action context whenever a collectible object is allocated on the heap.
+</para>
+
+<para>
+The garbage collector starts at the very end of an execution context, rather than using a threshold to trigger it.  At this point, the virtual machine is in a "stable" state; any still-reachable object has its roots in one of the currently live character instances (stage characters).
+</para>
+
+<para>
+The collector is a conservative collector.  Any object on the collectibles list is marked as <guilabel>UNREACHABLE</guilabel>, an iterative scan starting from the roots marks any still-reachable object, and a final purge releases all still-<guilabel>UNREACHABLE</guilabel> resources.
+</para>
+
+<para>
+This garbage collector has reduced the memory footprint of &app;.  However, the most current, available test data indicated the following runtime memory footprint:
+</para>
+
+<table id="tb-memory-footprint">
+<title>Memory Footprint</title>
+<tgroup cols='4' align='left' colsep='1' rowsep='1'>
+<colspec colname='Render GUI' />
+<colspec colname='Virtual Memory' />
+<colspec colname='Resident Set Size (physical RAM' />
+<colspec colname='Shared Memory (code size)' />
+<thead>
+<row>
+  <entry>Render GUI</entry>
+  <entry>Virtual Memory</entry>
+  <entry>Resident Set Size (physical RAM</entry>
+  <entry>Shared Memory (code size)</entry>
+</row>
+</thead>
+<tbody>
+<row>
+  <entry>agg-gtk</entry>
+  <entry>33372 KB</entry>
+  <entry>14 MB</entry>
+  <entry>8948 KB</entry>
+</row>
+<row>
+  <entry>agg-sdl</entry>
+  <entry>26564 KB</entry>
+  <entry>9396 KB</entry>
+  <entry>5124 KB</entry>
+</row>
+<row>
+  <entry>agg-fltk</entry>
+  <entry>24556 KB</entry>
+  <entry>8992 KB</entry>
+  <entry>4220 KB</entry>
+</row>
+<row>
+  <entry>cairo-fltk</entry>
+  <entry>184 MB</entry>
+  <entry>128 MB</entry>
+  <entry>4284 KB</entry>
+</row>
+<row>
+  <entry>cairo-gtk</entry>
+  <entry>192 MB</entry>
+  <entry>133 MB</entry>
+  <entry>8000 KB</entry>
+</row>
+<row>
+  <entry>cairo-sdl</entry>
+  <entry>187 MB</entry>
+  <entry>129 MB </entry>
+  <entry>5256 KB</entry>
+</row>
+<row>
+  <entry>opengl-gtk </entry>
+  <entry>62620 KB</entry>
+  <entry>15 MB</entry>
+  <entry>9336 KB</entry>
+</row>
+<row>
+  <entry>opengl-sdl </entry>
+  <entry>54932 KB</entry>
+  <entry>10 MB</entry>
+  <entry>5324 KB</entry>
+</row>
+</tbody>
+</tgroup>
+</table>
+
+</sect1>
+
+<sect1 id="spec-security">
+<title>Security</title>
+
+<para>
+Many Flash implementations contain potential security exploits that could compromise a viewer's system.  With &app;, an end-user has the ability to see "what's going on" &mdash; what types of data the application accesses, where it is found, and how it is used.  Many known Flash exploits are included in the &app; test suite that is used to check whether a release is ready for the public.  The &app; developers are also in the process of a security review, developing a security layer that will protect an end-user, no matter what operating system they use.
+</para>
+
+<para>
+One early security feature is the blacklist/whitelist.  Flash movies running in a browser can make outgoing network connections. This can be used, for example, to compromise a network device inside a company firewall via a Flash movie running on an employee's browser. &app; allows you to blacklist hosts that you know are insecure, or to whitelist hosts you know are secure, by editing a configuration file.
+</para>
+
+</sect1>
+
+</chapter>



From MAILER-DAEMON Thu Aug 16 10:25:30 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ILgHy-0003Cs-2i
	for mharc-gnash-commit@gnu.org; Thu, 16 Aug 2007 10:25:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ILgHw-0003Ab-Dd
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:25:28 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ILgHv-00039X-Mh
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:25:28 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ILgHv-00039N-Hi
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:25:27 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mgoldin@lulu.com>) id 1ILgHv-0000YJ-1A
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:25:27 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <mgoldin@lulu.com>) id 1ILgHu-0003PX-J8
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 14:25:26 +0000
Received: from mushi by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <mushi@savannah.gnu.org>) id 1ILgHu-0003PU-ED
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 14:25:26 +0000
To: gnash-commit@gnu.org
Message-Id: <E1ILgHu-0003PU-ED@cvs.savannah.gnu.org>
From: Melissa Goldin <mgoldin@lulu.com>
Date: Thu, 16 Aug 2007 14:25:26 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/doc/C/usermanual usage.xml
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Aug 2007 14:25:28 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Melissa Goldin <mushi>	07/08/16 14:25:26

Modified files:
	doc/C/usermanual: usage.xml 

Log message:
	Text improvements and changing <variablelist>s over to <table>s - where there's that much information, they're easier to read.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/usage.xml?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: usage.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/usermanual/usage.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- usage.xml	1 Aug 2007 05:00:08 -0000	1.3
+++ usage.xml	16 Aug 2007 14:25:26 -0000	1.4
@@ -2,292 +2,296 @@
     <title>Using &app;</title>
     
     <para>
-      &app; can be used as a standalone player or as a plugin.  Using it
-      as a standalone player, you
-      can execute any flash movie from the command line by just
-      supplying the file name. No command line options are required to
-      just play the movie using the default actions. So if you type:
+When used as a standalone player, you can play any Flash file from the command line by entering a command of the format:
+<programlisting>
+gnash <replaceable>&lt;option&gt; &lt;flashfile.swf&gt;</replaceable>
+</programlisting>
+The only required argument is the name (and location)of the file to be played.
     </para>
       
 <para>
-      <emphasis>gnash samples/car_smash.swf</emphasis>
+      The available options are listed in the following section, or you may view them in the terminal window by executing the following at the command line:
+<programlisting>
+gnash --help |less
+</programlisting>
     </para>
 
-    <para>
-      It will create a window and play the movie. In this case it's a
-      simple animation of a car driving, swerving, and finally
-      crashing.
+<para>
+The source code download of &app; includes several example .SWF files.  They are located in the <filename>testsuite/samples/</filename> directory of the &app; source directory.  If you have installed &app; correctly, issuing the a command similar to the following plays a short animation of a car swerving and crashing:
+<programlisting>
+gnash /home/<replaceable>&lt;username&gt;</replaceable>/gnash/testsuite/car_smash.swf
+</programlisting>
       <mediaobject>
 	<imageobject>
 	  <imagedata align="center" fileref="images/car_crash.png"/>
 	</imageobject>
       </mediaobject>
-      
     </para>
 
+<para>
+The above is useful for playing Flash files downloaded to your local system.  It is also possible to play Flash files directly from the web.  To do so, use the <option>-u</option> option along with the URL of the desired file.
+<programlisting>
+gnash -u http://example.domain.com/flashfile.swf
+</programlisting>
+Note that this will not work with every website; some embedded Flash files are difficult to play.
+</para>
+
     <sect1 id="options">
       <title>&app; Command Line Options</title>
 
       <para>
-	While by default no options are necessary, there are options
-	that can be used to change <emphasis>&app;'s</emphasis> basic
-	behavior.
-      </para>
-      
-      <para>
-	gnash [options] file
+	No options are required for  &app;'s default behavior.  However, there are many options that can be used to that behavior.
       </para>
       
-      <variablelist>
-	<varlistentry>
-	  <term>-h</term>
-	  <listitem>
 	    <para>
+<programlisting>
+	gnash <replaceable>&lt;options&gt;</replaceable> <filename>filename.swf</filename>
+</programlisting>
+      </para>
+
+      <table id="tb-command-line-options">
+<title>Gnash Command Line Options</title>
+<tgroup cols='2' align='left' colsep='1' rowsep='1'>
+<colspec colname='Option' />
+<colspec colname='Function' />
+<thead>
+<row>
+<entry>Option</entry>
+<entry>Function</entry>
+</row>
+</thead>
+<tbody>
+<row>
+     	<entry><option>-h</option></entry>
+	    <entry>
 	      Print usage information.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	
-	<varlistentry>
-	  <term>-s factor</term>
-	  <listitem>
-	    <para>
+	    </entry>
+	  </row>
+	<row>
+		<entry>
+	  <option>-s factor</option>
+	  </entry>
+	    <entry>
 	      Scale the movie up/down by the specified factor.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	
-	<varlistentry>
-	  <term>-c</term>
-	  <listitem>
-	    <para>
+	    </entry>
+	  </row>
+	<row>
+		<entry>
+	  <option>-c</option>
+	  </entry>
+	    <entry>
 	      Produce a core file instead of letting SDL trap it. By
 	      default, SDL traps all signals, but sometimes a core file
 	      is desired to assist with debugging.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	
-	<varlistentry>
-	  <term>-d num</term>
-	  <listitem>
-	    <para>
+	    </entry>
+	  </row>
+	<row>
+		<entry>
+	  <option>-d num</option>
+	  </entry>
+	    <entry>
 	      Number of milliseconds to delay in main loop. The main
 	      loop polls continuously with a delay to adjust how long
 	      <emphasis>&app;</emphasis> sleeps between iterations of the
 	      loop. The smaller the number, the higher the CPU load
 	      gets, and of course, the more iterations of the main
 	      command loop.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	
-	<varlistentry>
-	  <term>-p</term>
-	  <listitem>
-	    <para>
+	    </entry>
+	  </row>
+	<row>
+		<entry>
+	  <option>-p</option>
+	  </entry>
+	    <entry>
 	      Run full speed (no sleep) and log frame rate.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	
-	<varlistentry>
-	  <term>-a</term>
-	  <listitem>
-	    <para>
+	    </entry>
+	  </row>
+	<row>
+		<entry>
+	  <option>-a</option>
+	  </entry>
+	    <entry>
               Enable Actionscript debugging.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	
-	<varlistentry>
-	  <term>-v</term>
-	  <listitem>
-	    <para>
+	    </entry>
+	  </row>
+	<row>
+	<entry>
+	  <option>-v</option>
+	  </entry>
+	    <entry>
 	      Be verbose; i.e. print debug messages to stdout.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	
-	<varlistentry>
-	  <term>-va</term>
-	  <listitem>
-	    <para>
+	    </entry>
+	  </row>
+	<row>
+	<entry>
+	  <option>-va</option>
+	  </entry>
+	    <entry>
 	      Be verbose about movie Actions. 
-	    </para>
-	  </listitem>
-	</varlistentry>
-	
-	<varlistentry>
-	  <term>-vp</term>
-	  <listitem>
-	    <para>
+	    </entry>
+	  </row>
+<row>
+	<entry>
+	  <option>-vp</option>
+	  </entry>
+	    <entry>
 	      Be verbose about parsing the movie. Warning: this can
 	      generate a lot of text, and can affect the performance of
 	      the movie you are playing.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	
-	<varlistentry>
-	  <term>-ml bias</term>
-	  <listitem>
-	    <para>
+	    </entry>
+	  </row>
+	<row>
+	<entry>
+	  <option>-ml bias</option>
+	  </entry>
+	    <entry>
 	      Specify the texture LOD bias (float, default is -1) This
 	      affects the fuzziness of small objects, especially small
 	      text.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term>-w</term>
-	  <listitem>
-	    <para>
+	    </entry>
+	  </row>
+	<row>
+	<entry>
+	  <option>-w</option>
+	  </entry>
+	    <entry>
 	      Write a debug log called gnash-dbg.log. This will 
 	      record of all the debug messages whether they are printed
 	      to the screen or not.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term>-j</term>
-	  <listitem>
-	    <para>
+	    </entry>
+	  </row>
+	<row>
+	<entry>
+	  <option>-j</option>
+	  </entry>
+	    <entry>
 	      Specify the width of the window. This is mostly used
 	      only by the plugin.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term>-k</term>
-	  <listitem>
-	    <para>
+	    </entry>
+	  </row>
+	<row>
+	<entry>
+	  <option>-k</option>
+	  </entry>
+	    <entry>
 	      Specify the height of the window. This is mostly used
 	      only by the plugin.
-	    </para>
-	  </listitem>
-	</varlistentry>
+	    </entry>
+	  </row>
+	<row>
 <!--	
-	<varlistentry>
-	  <term>-e</term>
-	  <listitem>
-	    <para>
-	      Use SDL Event thread. This uses a separate thread to make
+	<entry>
+	  <option>-e</option>
+	  </entry>
+	    <entry>
+	      Use SDL Event thread. This uses a seentryte thread to make
 	      the event loop more event driven than polling. This can
 	      improve performance for some types of movies.
-	    </para>
-	  </listitem>
-	</varlistentry>
+	    </entry>
+	  </row>
+	<row>
 -->
-	<varlistentry>
-	  <term>-1</term>
-	  <listitem>
-	    <para>
+	<entry>
+	  <option>-1</option>
+	  </entry>
+	    <entry>
 	      Play once; exit when/if movie reaches the last
 	      frame. This is the default.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	
-	<varlistentry>
-	  <term>-r [0|1|2|3]</term>
-	  <listitem>
-	    <para>
+	    </entry>
+	  </row>
+	<row>
+	<entry>
+	  <option>-r [0|1|2|3]</option>
+	  </entry>
+	    <entry>
 	      0 disables rendering and sound (good for batch tests).
-	    </para>
-	    <para>
+	    </entry>
+	    <entry>
 	      1 enables rendering and disables sound (default setting).
-	    </para>
-	    <para>
+	    </entry>
+	    <entry>
 	      2 enables sound and disables rendering.
-	    </para>
-	    <para>
+	    </entry>
+	    <entry>
 	      3 enables rendering and sound.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	
-	<varlistentry>
-	  <term>-t sec</term>
-	  <listitem>
-	    <para>
+	    </entry>
+	  </row>
+	<row>
+	<entry>
+	  <option>-t sec</option>
+	  </entry>
+	    <entry>
 	      Timeout and exit after the specified number of
 	      seconds. This is useful for movies which repeat
 	      themselves.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	
-	<varlistentry>
-	  <term>-g</term>
-	  <listitem>
-	    <para>
+	    </entry>
+	  </row>
+	<row>
+		<entry>
+	  <option>-g</option>
+	  </entry>
+	    <entry>
 	      Start &app; with a Flash debugger console so one can set
 	      break points or watchpoints.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	
-	<varlistentry>
-	  <term>-x id</term>
-	  <listitem>
-	    <para>
+	    </entry>
+	  </row>
+	<row>
+	<entry>
+	  <option>-x id</option>
+	  </entry>
+	    <entry>
 	      This specifies the X11 window ID to display
 	      in; this is mainly used by plugins.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	
-	<varlistentry>
-	  <term>-b bits</term>
-	  <listitem>
-	    <para>
+	    </entry>
+	  </row>
+	<row>
+	<entry>
+	  <option>-b bits</option>
+	  </entry>
+	    <entry>
 	      Bit depth of output window (for example, 16 or 32). Appropriate
               bit depths depend on the renderer and GUI library used.
 <!--
               TODO: add information about which depths are suitable for each
               renderer.
 -->
-	    </para>
-	  </listitem>
-	</varlistentry>
-
-	<varlistentry>
-	  <term>-u url</term>
-	  <listitem>
-	    <para>
+	    </entry>
+	  </row>
+	<row>
+<entry>
+	  <option>-u url</option>
+	  </entry>
+	    <entry>
 	      Set the _url member of the root movie. This is useful 
               when you download a movie and play it from a different 
               location. See also the -U switch.
-	    </para>
-	  </listitem>
-	</varlistentry>
-
-	<varlistentry>
-	  <term>-U baseurl</term>
-	  <listitem>
-	    <para>
-	      Set base url for this run. URLs are resolved relative to 
+	    </entry>
+	  </row>
+	<row>
+	<entry>
+	  <option>-U baseurl</option>
+	  </entry>
+	    <entry>
+	      Set base URL for this run. URLs are resolved relative to 
               this base. If omitted defaults to the _url member of the 
               top-level movie (see the -u switch).
-	    </para>
-	  </listitem>
-	</varlistentry>
-
-	<varlistentry>
-	  <term>-P parameter</term>
-	  <listitem>
-	    <para>
+	    </entry>
+	  </row>
+	<row>
+	<entry>
+	  <option>-P entrymeter</option>
+	  </entry>
+	    <entry>
 		Parameters are given in ParamName=Value syntax and are mostly 
                 useful to the plugin to honour EMBED tags attributes 
                 or explicit OBJECT PARAM tags. A common use for -P 
                 is to provide FlashVars 
                 (ie: -P "FlashVars=home=http://www.gnu.org").
-	    </para>
-	  </listitem>
-	</varlistentry>
-	
-      </variablelist>
+	    </entry>
+	  </row>
+</tbody>
+</tgroup>
+	</table>
       
     </sect1>
 
@@ -300,117 +304,119 @@
 	playing, and control other actions.
       </para>
       
-      <variablelist>
-	<varlistentry>
-	  <term>CTRL-Q</term>
-	  <listitem>
-	    <para>
+      <table id="tb-control-keys">
+<title>Gnash Interactive Control Keys</title>
+<tgroup cols='2' align='left' colsep='1' rowsep='1'>
+<colspec colname='Key Combination' />
+<colspec colname='Function' />
+<thead>
+<row>
+<entry>Key Combination</entry>
+<entry>Function</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry>
+	  <option>CTRL-Q</option>
+	  </entry>
+	    <entry>
 	      Quit/Exit.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	
-	<varlistentry>
-	  <term>CTRL-W</term>
-	  <listitem>
-	    <para>
+	    </entry>
+	  </row>
+	<row>
+	<entry>
+	  <option>CTRL-W</option>
+	  </entry>
+	    <entry>
 	      Quit/Exit.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	
-	<varlistentry>
-	  <term>ESC</term>
-	  <listitem>
-	    <para>
+	    </entry>
+	  </row>
+	<row>
+	<entry>
+	  <option>ESC</option>
+	  </entry>
+	    <entry>
 	      Quit/Exit.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	
-	<varlistentry>
-	  <term>CTRL-P</term>
-	  <listitem>
-	    <para>
+	    </entry>
+	  </row>
+	<row>
+	<entry>
+	  <option>CTRL-P</option>
+	  </entry>
+	    <entry>
 	      Toggle Pause.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	
-	<varlistentry>
-	  <term>CTRL-R   </term>
-	  <listitem>
-	    <para>
+	    </entry>
+	  </row>
+	<row>
+	<entry>
+	  <option>CTRL-R   </option>
+	  </entry>
+	    <entry>
 	      Restart the movie.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	
-	<varlistentry>
-	  <term>CTRL-[ or kp-</term>
-	  <listitem>
-	    <para>
+	    </entry>
+	  </row>
+	<row>
+	<entry>
+	  <option>CTRL-[ or kp-</option>
+	  </entry>
+	    <entry>
 	      Step back one frame.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	
-	<varlistentry>
-	  <term>CTRL-] or kp+</term>
-	  <listitem>
-	    <para>
+	    </entry>
+	  </row>
+	<row>
+	<entry>
+	  <option>CTRL-] or kp+</option>
+	  </entry>
+	    <entry>
 	      Step forward one frame.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	
+	    </entry>
+	  </row>
+	<row>
 <!--
-	<varlistentry>
-	  <term>CTRL-A</term>
-	  <listitem>
-	    <para>
+	<entry>
+	  <option>CTRL-A</option>
+	  </entry>
+	    <entry>
 	      Toggle anti-aliasing (doesn't work).
-	    </para>
-	  </listitem>
-	</varlistentry>
+	    </entry>
+	  </row>
+	<row>
 -->
-	
-	<varlistentry>
-	  <term>CTRL-T</term>
-	  <listitem>
-	    <para>
+	<entry>
+	  <option>CTRL-T</option>
+	  </entry>
+	    <entry>
 	      Debug.  Test the set_variable() function.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	
-	<varlistentry>
-	  <term>CTRL-G</term>
-	  <listitem>
-	    <para>
+	    </entry>
+	  </row>
+	<row>
+	<entry>
+	  <option>CTRL-G</option>
+	  </entry>
+	    <entry>
 	      Debug.  Test the get_variable() function.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	
-	<varlistentry>
-	  <term>CTRL-M</term>
-	  <listitem>
-	    <para>
+	    </entry>
+	  </row>
+	<row>
+	<entry>
+	  <option>CTRL-M</option>
+	  </entry>
+	    <entry>
 	      Debug.  Test the call_method() function.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	
-	<varlistentry>
-	  <term>CTRL-B</term>
-	  <listitem>
-	    <para>
+	    </entry>
+	  </row>
+	<row>
+	<entry>
+	  <option>CTRL-B</option>
+	  </entry>
+	    <entry>
 	      Toggle the background color.
-	    </para>
-	  </listitem>
-	</varlistentry>
-      </variablelist>
+	    </entry>
+	  </row>
+</tbody>
+</tgroup>
+      </table>
     </sect1>
 
     &gnashrc;



From MAILER-DAEMON Thu Aug 16 10:26:02 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ILgIU-0003OG-Fj
	for mharc-gnash-commit@gnu.org; Thu, 16 Aug 2007 10:26:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ILgIS-0003Nf-RB
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:26:00 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ILgIS-0003ND-9u
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:26:00 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ILgIR-0003N9-V5
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:26:00 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mgoldin@lulu.com>) id 1ILgIR-0000gi-AG
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:25:59 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <mgoldin@lulu.com>) id 1ILgIQ-0003Py-OL
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 14:25:58 +0000
Received: from mushi by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <mushi@savannah.gnu.org>) id 1ILgIQ-0003Pv-K6
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 14:25:58 +0000
To: gnash-commit@gnu.org
Message-Id: <E1ILgIQ-0003Pv-K6@cvs.savannah.gnu.org>
From: Melissa Goldin <mgoldin@lulu.com>
Date: Thu, 16 Aug 2007 14:25:58 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/doc/C/usermanual/usage gnashrc.xml
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Aug 2007 14:26:01 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Melissa Goldin <mushi>	07/08/16 14:25:58

Modified files:
	doc/C/usermanual/usage: gnashrc.xml 

Log message:
	Added explanatory text for the example .gnashrc file

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/usage/gnashrc.xml?cvsroot=gnash&r1=1.5&r2=1.6

Patches:
Index: gnashrc.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/usermanual/usage/gnashrc.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gnashrc.xml	1 Aug 2007 05:00:45 -0000	1.5
+++ gnashrc.xml	16 Aug 2007 14:25:58 -0000	1.6
@@ -3,188 +3,146 @@
   <title>User Configuration File</title>
 
   <para>
-    Gnash supports a configuration file which lives in the users home
-    directory. This file is called <emphasis>.gnashrc</emphasis>. In
-    this you can have default settings which will be used by Gnash
-    when running standalone, or as a browser plugin. Any command line
-    options override these values.
-  </para>
+Individual user preferences may be set by editing variables with the <filename>.gnashrc</filename> file:
+<programlisting>
+~/.gnashrc
+</programlisting>
+</para>
+
+<para>
+The values in this configuration file apply only to an individual user, and become the default settings of the standalone player and the plugin.  Note that any command line options take precedence over <filename>.gnashrc</filename> settings.
+</para>
 
-  <para>
-    Gnash supports three types of configuration variables. The three
-    types are an on/off value, a numeric value, or in the case of the
+<para>
+The variables in the <filename>.gnashrc</filename> file support three types of arguments: on/off, numeric values, or in the case of the
     whitelist and blacklist, a list of hostnames as ASCII text.
   </para>
 
-   <variablelist>
-      <varlistentry>
-	<term>localdomain</term>
-	<listitem>
-	  <para>
-	    This value can be set to either <emphasis>on</emphasis> or
-	    <emphasis>off</emphasis>, and controls the loading of
-	    external Flash movies over a network. Traditionally this
-	    tells Gnash to only load Flash movies from the existing domain.
-	  </para>
-	</listitem>
-      </varlistentry>
 
-      <varlistentry>
-	<term>localhost</term>
-	<listitem>
-	  <para>
-	    This value can be set to either <emphasis>on</emphasis> or
+      <table id="tb-config-variables">
+<title>User Configuration Variables</title>
+<tgroup cols='3' align='left' colsep='1' rowsep='1'>
+<colspec colname='Variable' />
+<colspec colname='Value' />
+<colspec colname='Function' />
+<thead>
+<row>
+<entry>Variable</entry>
+<entry>Value</entry>
+<entry>Function</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry>localdomain</entry>
+<entry>on/off</entry>
+<entry>This value can be set to either <emphasis>on</emphasis> or
+	    <emphasis>off</emphasis>, and controls the loading of
+	    external Flash movies over a network. This option
+	    tells Gnash to only load Flash movies from the existing domain.</entry>
+</row>
+<row>
+<entry>localhost</entry>
+<entry>on/off</entry>
+<entry>This value can be set to either <emphasis>on</emphasis> or
 	    <emphasis>off</emphasis>, and controls the loading of
 	    external Flash movies over a network. This is a stricter
 	    version of the <emphasis>localdomain</emphasis> setting as
 	    this allows the loading of Flash movies to the same host
-	    Gnash is running on.
-	  </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>whitelist</term>
-	<listitem>
-	  <para>
-	    This is a list of hostnames, separated by a colon
-	    <emphasis>:</emphasis>. If this list is not empty,
-	    only external flash movies from these hosts are allowed to
-	    load.
-	  </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>blacklist</term>
-	<listitem>
-	  <para>
-	    This is a list of hostnames, separated by a colon
+	    that is running &app;.</entry>
+</row>
+<row>
+<entry>whitelist</entry>
+<entry>hostnames</entry>
+<entry>This is a list of hostnames, separated by a colon (:). If this list is populated, &app; will only load external Flash movies from the specified hosts.  The whitelist takes precedence over the blacklist.</entry>
+</row>
+<row>
+<entry>blacklist</entry>
+<entry>hostnames</entry>
+<entry>This is a list of hostnames, separated by a colon
 	    <emphasis>:</emphasis>.  External flash movies from these
             domains are never allowed to load. If whitelist is present
-	    and not empty, blacklist is not used.
-	  </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>delay</term>
-	<listitem>
-	  <para>
-	    Gnash uses a timer based event mechanism to advance frames
-	    at a steady rate. This lets one override the default
-	    setting in Gnash to play a movie slower or faster.
-	  </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>verbosity</term>
-	<listitem>
-	  <para>
-	    This is a numeric value which defines the default level of
-	    verbosity from the player.
-	  </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>MalformedSWFVerbosity</term>
-	<listitem>
-	  <para>
-	    This value can be set to either <emphasis>on</emphasis> or
+	    and not empty, blacklist is not used.</entry>
+</row>
+<row>
+<entry>delay</entry>
+<entry>Number</entry>
+<entry>&app; uses a timer-based event mechanism to advance frames
+	    at a steady rate. This option overrides the default
+	    setting in Gnash to play a movie slower or faster.</entry>
+</row>
+<row>
+<entry>verbosity</entry>
+<entry>Number</entry>
+<entry>This is a numeric value which defines the default level of
+	    verbosity from the player.</entry>
+</row>
+<row>
+<entry>MalformedSWFVerbosity</entry>
+<entry>on/off</entry>
+<entry>This value can be set to either <emphasis>on</emphasis> or
 	    <emphasis>off</emphasis>, and controls whether malformed SWF errors should
 	    be printed. If set to true, verbosity level is automatically incremented.
-	    Set 'verbosity' to 0 afterwards to hush.
-	  </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>ASCodingErrorsVerbosity</term>
-	<listitem>
-	  <para>
-	    This value can be set to either <emphasis>on</emphasis> or
+	    Set <option>verbosity</option> to 0 afterwards to hush.</entry>
+</row>
+<row>
+<entry>ASCodingErrorsVerbosity</entry>
+<entry>on/off</entry>
+<entry>This value can be set to either <emphasis>on</emphasis> or
 	    <emphasis>off</emphasis>, and controls whether ActionScript coding
 	    errors should be printed. If set to true, verbosity level is
-	    automatically incremented.  Set 'verbosity' to 0 afterwards to hush.
-	  </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>debuglog</term>
-	<listitem>
-	  <para>
-	    This is the full path and name of debug logfile as
-	    produced by Gnash.
-	  </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>writelog</term>
-	<listitem>
-	  <para>
-	    This value can be set to either <emphasis>on</emphasis> or
+	    automatically incremented.  Set <option>verbosity</option> to 0 afterwards to hush.</entry>
+</row>
+<row>
+<entry>debuglog</entry>
+<entry>Absolute path</entry>
+<entry>This is the full path and name of debug logfile as
+	    produced by &app;.</entry>
+</row>
+<row>
+<entry>writelog</entry>
+<entry>on/off</entry>
+<entry>This value can be set to either <emphasis>on</emphasis> or
 	    <emphasis>off</emphasis>, and controls whether a debug log
-	    is always written by Gnash, or not at all.
-	  </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry id="standalonesound">
-	<term>sound</term>
-	<listitem>
-	  <para>
-	    This value can be set to either <emphasis>on</emphasis> or
+	    is always written by Gnash, or not at all.</entry>
+</row>
+<row>
+<entry>sound</entry>
+<entry>on/off</entry>
+<entry>This value can be set to either <emphasis>on</emphasis> or
 	    <emphasis>off</emphasis>, and controls the sound of the
 	    standalone player. By default Gnash enables playing the
-	    sound in any Flash movie.  Refer to
-            <emphasis><link linkend="pluginsound">pluginsound</link></emphasis> 
-            to control sound for the browser plugin.
-	  </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry id="pluginsound">
-	<term>pluginsound</term>
-	<listitem>
-	  <para>
-	    This value can be set to either <emphasis>on</emphasis> or
+	    sound in any Flash movie.</entry>
+</row>
+<row>
+<entry>pluginsound</entry>
+<entry>on/off</entry>
+<entry>This value can be set to either <emphasis>on</emphasis> or
 	    <emphasis>off</emphasis>, and controls the sound of the
 	    player when running as a browser plugin. By default, sound
-	    is enabled when using Gnash as a browser plugin.  Refer to
-            <emphasis><link linkend="standalonesound">sound</link></emphasis> 
-            for information about standalone player sound control.
-	  </para>
-	</listitem>
-      </varlistentry>
+	    is enabled when using Gnash as a browser plugin.</entry>
+</row>
+<row>
+<entry>EnableExtensions</entry>
+<entry>on/off</entry>
+<entry>Set to <emphasis>on</emphasis> to enable extensions. This option is <emphasis>off</emphasis> by default</entry>
+</row>
+<row>
+<entry>StartStopped</entry>
+<entry>on/off</entry>
+<entry>Set to <emphasis>on</emphasis> to have the GUI start in "stop" mode. This is useful in particular
+	    for the plugin, so you have to explicitly start any movie on a webpage. This option is <emphasis>off</emphasis> by default.
+	  </entry>
+</row>
+</tbody>
+</tgroup>
+</table>
 
-      <varlistentry>
-	<term>EnableExtensions</term>
-	<listitem>
-	  <para>
-	    Set to ``on'' to enable extensions. Off by default.
-	  </para>
-	</listitem>
-      </varlistentry>
 
-      <varlistentry>
-	<term>StartStopped</term>
-	<listitem>
 	  <para>
-	    Set to ``on'' to have the GUI start in "stop" mode. This is useful in particular
-	    for the plugin, so you have to explicitly start any movie on a webpage. Off by default.
-	  </para>
-	</listitem>
-      </varlistentry>
-
-   </variablelist>
+The following example <filename>.gnashrc</filename> file allows a user to only play Flash files saved locally to the machine on which &app; is running.  It also specifically forbids content from doubleclick.com and mochibot.com.  &app;'s error output is set to be fairly verbose, with the debug log placed in a location convenient for the user.  Finally, sound is turned on for both the standalone player and the plugin.
+</para>
 
-  <para>
-    My current Gnash configuration file looks like this:
-  </para>
   <programlisting>
   
     #



From MAILER-DAEMON Thu Aug 16 10:27:39 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ILgK3-00042W-Kj
	for mharc-gnash-commit@gnu.org; Thu, 16 Aug 2007 10:27:39 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ILgK2-00042N-NV
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:27:38 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ILgK1-00041r-JE
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:27:38 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ILgK1-00041b-D7
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:27:37 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mgoldin@lulu.com>) id 1ILgK0-00015j-Ho
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:27:37 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <mgoldin@lulu.com>) id 1ILgK0-0003Sl-3L
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 14:27:36 +0000
Received: from mushi by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <mushi@savannah.gnu.org>) id 1ILgJz-0003Sh-Uw
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 14:27:36 +0000
To: gnash-commit@gnu.org
Message-Id: <E1ILgJz-0003Sh-Uw@cvs.savannah.gnu.org>
From: Melissa Goldin <mgoldin@lulu.com>
Date: Thu, 16 Aug 2007 14:27:35 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/doc/C/usermanual/installation building.xm...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Aug 2007 14:27:39 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Melissa Goldin <mushi>	07/08/16 14:27:35

Modified files:
	doc/C/usermanual/installation: building.xml 
	                               code_dependencies.xml 
	                               configuration.xml 
	                               cross_compiling.xml 
	                               custompath_configuration.xml 
	                               feature_configuration.xml 
	                               install.xml 

Log message:
	For most of these files, I've just added a bit more explanation, and more informatin from the wiki when I could.  Also, all <variablelist>s have been converted to <table>s here, too - it makes the volume of information easier to read.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/installation/building.xml?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/installation/code_dependencies.xml?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/installation/configuration.xml?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/installation/cross_compiling.xml?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/installation/custompath_configuration.xml?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/installation/feature_configuration.xml?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/installation/install.xml?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: building.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/usermanual/installation/building.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- building.xml	1 Aug 2007 05:02:12 -0000	1.3
+++ building.xml	16 Aug 2007 14:27:35 -0000	1.4
@@ -16,7 +16,7 @@
     </programlisting>
     If the compilation ends with an error, check the output of 
     <emphasis>configure</emphasis> and ensure that you are not missing 
-    any required prerequisites.
+    any required prerequisites.  The output of <command>make</command> can be verbose; you may wish to pipe the output to a file.
   </para>
 
   <para>
@@ -28,37 +28,37 @@
     <emphasis>-O2 -g</emphasis>.  A list of influential 
     environment variables can be seen in the configuration help:
 </para>
-<para><userinput>./configure --help</userinput></para>
+<programlisting>./configure --help</programlisting>
 <para>
     In the following example, debugging is enabled and optimization is
     disabled:
 </para>
-<para><userinput>make CFLAGS=-g CXXFLAGS=-g</userinput></para>
+<programlisting>make CFLAGS=-g CXXFLAGS=-g</programlisting>
 </sect2>
 
 <sect2 id="processdoc">
   <title>Creating the Documentation</title>
 
   <para>
-    By default, documentation isn't built, even when you
+    By default, documentation is not built when you
     <link linkend="install">install</link> &app;.  This is because
     there are a number of <link linkend="docdepend">dependencies 
     for the documentation</link>.  Documentation is built when it
     is specified with a specific target in the generated 
-    <emphasis>Makefile</emphasis> in the <filename>doc/C</filename>
-    sub-directory.  If you type <emphasis>make install</emphasis> in
+    <command>Makefile</command> in the <filename>doc/C</filename>
+    sub-directory.  If you type <command>make install</command> in
     this directory, all documents will be built.
   </para>
 
   <para>
-    You need to specify a target output format when you wish to create
-    documentation.  The available output formats are: <emphasis>html</emphasis>,
-    <emphasis>pdf</emphasis>, <emphasis>info</emphasis>, 
-    <emphasis>man</emphasis>, and <emphasis>alldocs</emphasis>.  
-    It is also possible to output <emphasis>GNOME help</emphasis> if
+    You must specify a target output format when you wish to create
+    documentation.  The available output formats are: <command>html</command>,
+    <command>pdf</command>, <command>info</command>, 
+    <command>man</command>, and <command>alldocs</command>.  
+    It is also possible to output <command>GNOME help</command> if
     the <link linkend="features">configure option</link>
-    <emphasis>--enable-ghelp</emphasis> was used.  
-    The <emphasis>alldocs</emphasis> target will build all output formats
+    <option>--enable-ghelp</option> was used.  
+    The <command>alldocs</command> target will build all output formats
     except <emphasis>GNOME help</emphasis>.
     For example, to create HTML output, type:
     <programlisting>
@@ -84,7 +84,7 @@
   <title>Running the Tests</title>
 
   <para>
-    If a test fails, please report it by following the
+    Before beginning the potentially lengthy install, it is wise to test the installation.  If a test fails, please report it by following the
     <link linkend="bugreport">instructions for reporting a bug</link>.
   </para>
 
@@ -112,8 +112,8 @@
         Additional details are visible when 
         <emphasis>RUNTESTFLAGS</emphasis> are used to add the 
         <emphasis>verbose</emphasis> and <emphasis>all</emphasis> options.
-        Verbose prints more information about the testing process, while
-        all includes details on passing tests.  
+        The <option>verbose</option> option prints more information about the testing process, while
+        the <option>all</option> option includes details on passing tests.  
         <programlisting>
   make check RUNTESTFLAGS="-v -a"
         </programlisting>
@@ -123,27 +123,27 @@
     <sect4 id="running_some_tests">
       <title>Running Some Tests</title>
       <para>
-        It is possible to run just a particular test, or 
-        subdirectory of tests, by specifying the directory or 
+        It is possible to run just a single test, or 
+        a subdirectory of tests, by specifying the directory or 
         compiled test file.
       </para>
       <para>
         Some tests rely on <emphasis>testsuite/Dejagnu.swf</emphasis>,
         which in turn relies on <emphasis>Ming</emphasis>.
-        This file is created when you run 'make check' for the entire
+        This file is created when you run <command>make check</command> for the entire
         testsuite, and can also be created on demand:
         <programlisting>
   make -C testsuite Dejagnu.swf 
         </programlisting>
       </para>
       <para>
-        In this example, the 'clip_as_button2' test is compiled and
+        In this example, the <command>clip_as_button2</command> test is compiled and
         run:
         <programlisting>
   make -C testsuite/samples clip_as_button2-TestRunner 
   cd testsuite/samples &amp;&amp; ./clip_as_button2-TestRunner
         </programlisting>
-        This would create and run all the tests in the directory
+        This creates and runs all the tests in the directory
         <filename>movies.all</filename>:
         <programlisting>
   make -C testsuite/movies.all check
@@ -187,7 +187,7 @@
     <sect4 id="manual_actionscript_tests">
       <title>ActionScript Unit Tests</title>
       <para>
-        Unit tests for ActionScript classes in 'testsuite/actionscript.all'
+        Unit tests for ActionScript classes in <command>testsuite/actionscript.all</command>
         are run without a graphical display:
         <programlisting>
   gprocessor -v XML-v6.swf

Index: code_dependencies.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/usermanual/installation/code_dependencies.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- code_dependencies.xml	7 Jun 2007 14:11:26 -0000	1.3
+++ code_dependencies.xml	16 Aug 2007 14:27:35 -0000	1.4
@@ -8,6 +8,13 @@
   the headers &app; needs to compile.
 </para>
 
+<note>
+<title>Note</title>
+<para>
+If you want to install the &app; plugin for one of the browsers listed in the <xref linkend="intro" />, be sure to install the development package for that browser before configuring.  The &app; <command>configure</command> script searches for the devel packages before building the plugin.
+</para>
+</note>
+
 <table frame='all'>
   <title>Code Dependency Table</title>
   <tgroup cols='7' align='left' colsep='1' rowsep='1'>

Index: configuration.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/usermanual/installation/configuration.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- configuration.xml	1 Aug 2007 05:02:47 -0000	1.5
+++ configuration.xml	16 Aug 2007 14:27:35 -0000	1.6
@@ -17,17 +17,17 @@
   autogen.
 </para>
 <para>
-  All the standard <emphasis>configure</emphasis> options
-  are avaiable.  In addition, &app; has two types of
-  options: those which <link linkend="features">enable or disable 
+  All the standard <command>configure</command> options
+  are available.  In addition, &app; has two types of
+  options: those that <link linkend="features">enable or disable 
   features</link>, and
-  those which <link linkend="custompath">specify custom paths for 
+  those that <link linkend="custompath">specify custom paths for 
   development packages</link>
-  which aren't found during the default search.  A complete
+  which are not found during the default search.  A complete
   list of <emphasis>all</emphasis> configuration options, including
   standard ones, can be seen by typing:
   <programlisting>
-  ./configure --help
+  ./configure --help |less
   </programlisting>
   Read further for a more detailed explanation of &app;-specific
   options.
@@ -35,20 +35,18 @@
 <para>
   The syntax for running <emphasis>configure</emphasis> is as follows:
   <programlisting>
-  configure &lt;options&gt;
+  configure <replaceable>&lt;options&gt;</replaceable>
   </programlisting>
-  The example below shows the <emphasis>configure</emphasis> options
+  The example below shows the <command>configure</command> options
   which create the smallest working standalone version of &app;.  In
-  this example, <emphasis>configure</emphasis> is being run from the
+  this example, <command>configure</command> is being run from the
   source root directory:
 </para>
 
-<screen>
-<userinput>
+<programlisting>
 ./configure --disable-debugger --disable-cygnal --disable-docbook \
 --disable-plugin --enable-media=mad --enable-gui=sdl
-</userinput>
-</screen>
+</programlisting>
 
 <sect2 id="features">
   &featureoptions;

Index: cross_compiling.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/usermanual/installation/cross_compiling.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- cross_compiling.xml	26 May 2007 16:55:34 -0000	1.2
+++ cross_compiling.xml	16 Aug 2007 14:27:35 -0000	1.3
@@ -67,6 +67,7 @@
   in <filename>/usr/arm</filename> and other required libraries were 
   cross compiled.
   <programlisting>
-  ./configure -target=arm-unknown-linux-gnu --prefix=/usr/arm --host=arm-unknown-linux-gnu --build=i686-pc-linux-gnu --disable-plugin
+./configure -target=arm-unknown-linux-gnu --prefix=/usr/arm \
+--host=arm-unknown-linux-gnu --build=i686-pc-linux-gnu --disable-plugin
   </programlisting>
 </para>

Index: custompath_configuration.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/usermanual/installation/custompath_configuration.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- custompath_configuration.xml	7 Jun 2007 14:11:26 -0000	1.3
+++ custompath_configuration.xml	16 Aug 2007 14:27:35 -0000	1.4
@@ -9,448 +9,365 @@
 </para>
 <para>
   The following custom path options are available:
-<!-- TODO - review this section -->
 </para>
 
-<variablelist>
 
-  <varlistentry>
-    <term>--x-includes=DIR</term>
-    <listitem>
-      <para>
+<table id="tb-configure-paths">
+<title>Custom Path Options</title>
+<tgroup cols='2' align='left' colsep='1' rowsep='1'>
+<colspec colname='Option' />
+<colspec colname='Function' />
+<thead>
+<row>
+  <entry>Option</entry>
+  <entry>Function</entry>
+</row>
+</thead>
+<tbody>
+<row>
+  <entry>
+    <option>--x-includes=DIR</option>
+    </entry>
+      <entry>
         X include files are in DIR.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--x-libraries=DIR</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--x-libraries=DIR</option>
+    </entry>
+      <entry>
         X library files are in DIR.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-libxml=PFX</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-libxml=PFX</option>
+    </entry>
+      <entry>
         Prefix to where libxml is installed.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-libxml-libraries=DIR</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-libxml-libraries=DIR</option>
+    </entry>
+      <entry>
         Directory where libxml library is installed.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-libxml-includes=DIR</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-libxml-includes=DIR</option>
+    </entry>
+      <entry>
         Directory where libxml header files are installed.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-docbook=DIR</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-docbook=DIR</option>
+    </entry>
+      <entry>
         Directory where the DocBook style-sheets are installed.        
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-sdl-prefix=PFX</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-sdl-prefix=PFX</option>
+    </entry>
+      <entry>
         Prefix where SDL is installed.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-zlib-incl</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-zlib-incl</option>
+    </entry>
+      <entry>
         Directory where zlib header is installed.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-zlib-lib</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-zlib-lib</option>
+    </entry>
+      <entry>
         Directory where zlib library is installed.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-jpeg-incl</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-jpeg-incl</option>
+    </entry>
+      <entry>
         Directory where jpeg header is installed.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-jpeg-lib</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-jpeg-lib</option>
+    </entry>
+      <entry>
         Directory where jpeg library is installed.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-png-incl</term>
-    <listitem>
-      <para>
+     </entry>
+  </row><row>
+  <entry>
+    <option>--with-png-incl</option>
+    </entry>
+      <entry>
         Directory where png header is installed.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-png-lib</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-png-lib</option>
+    </entry>
+      <entry>
         Directory where png library is installed.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-qt-dir</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-qt-dir</option>
+    </entry>
+      <entry>
         Directory where QT is installed. This is only used by
         the Klash plugin.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-qt-includes</term>
-    <listitem>
-      <para>
+    </entry>
+  </row><row>
+  <entry>
+    <option>--with-qt-includes</option>
+    </entry>
+      <entry>
         Directory where the QT header files are installed. This
         is only used by the Klash plugin.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-qt-libraries</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-qt-libraries</option>
+    </entry>
+      <entry>
         Directory where the QT libraries are installed. This is
         only used by the Klash plugin.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-plugindir</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-plugindir</option>
+    </entry>
+      <entry>
         This is the directory to install the Firefox plugin in.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-ming</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-ming</option>
+    </entry>
+      <entry>
         Ming is used to build test cases, but not by the Gnash
         player itself.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-mad_incl</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-mad_incl</option>
+    </entry>
+      <entry>
         Directory where libmad header is installed.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-mad_lib</term>
-    <listitem>
-      <para>
+      </entry>
+ </row><row>
+  <entry>
+    <option>--with-mad_lib</option>
+    </entry>
+      <entry>
         Directory where libmad library is installed.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-ogg_incl</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-ogg_incl</option>
+    </entry>
+      <entry>
         Directory where the libogg headers are installed.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-ogg_lib</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-ogg_lib</option>
+    </entry>
+      <entry>
         Directory where the libogg library is installed.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-gstreamer-incl</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-gstreamer-incl</option>
+    </entry>
+      <entry>
         Directory where the Gstreamer headers are
         installed. Gstreamer version 0.10 or greater must be used.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-gstreamer-lib</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-gstreamer-lib</option>
+    </entry>
+      <entry>
         Directory where the Gstreamer library is
         installed. Gstreamer version 0.10 or greater must be used.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-opengl-includes</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-opengl-includes</option>
+    </entry>
+      <entry>
         Directory where OpenGL (libMesa) headers are installed.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-opengl-lib</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-opengl-lib</option>
+    </entry>
+      <entry>
         Directory where the OpenGL (libMesa) library is installed.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-glext-incl</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-glext-incl</option>
+    </entry>
+      <entry>
         Directory where GtkGlExt headers are installed.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-glext-lib</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-glext-lib</option>
+    </entry>
+      <entry>
         Directory where the GtkGlExt library is installed.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-gtk2-incl</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-gtk2-incl</option>
+    </entry>
+      <entry>
         Directory where the Gtk2 headers are installed.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-gtk2-lib</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-gtk2-lib</option>
+    </entry>
+      <entry>
         Directory where the Gtk2 library is installed.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-cairo_incl</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-cairo_incl</option>
+    </entry>
+      <entry>
         Directory where the Cairo headers are installed.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-cairo-lib</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-cairo-lib</option>
+    </entry>
+      <entry>
         Directory where the Cairo library is installed.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-glib-incl</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-glib-incl</option>
+    </entry>
+      <entry>
         Directory where the Glib headers are installed.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-glib-lib</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-glib-lib</option>
+    </entry>
+      <entry>
         Directory where the Glib library is installed.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-pango-incl</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-pango-incl</option>
+    </entry>
+      <entry>
         Directory where the Pango headers are installed.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-pango-lib</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-pango-lib</option>
+    </entry>
+      <entry>
         Directory where the Pango library is installed.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-atk-incl</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-atk-incl</option>
+    </entry>
+      <entry>
         Directory where the ATK headers are installed.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-atk-lib</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-atk-lib</option>
+    </entry>
+      <entry>
         Directory where the ATK library is installed.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-pthread-incl</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-pthread-incl</option>
+    </entry>
+      <entry>
         Directory where the Pthread headers are installed.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-pthread-lib</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-pthread-lib</option>
+    </entry>
+      <entry>
         Directory where the Pthread library is installed.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-agg-incl</term>
-    <listitem>
-      <para>
+   </entry>
+  </row><row>
+  <entry>
+    <option>--with-agg-incl</option>
+    </entry>
+      <entry>
         Directory where the AGG (Antigrain) headers are installed.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-agg-lib</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-agg-lib</option>
+    </entry>
+      <entry>
         Directory where the AGG (Antigrain) library is installed.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-ffmpeg-incl</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-ffmpeg-incl</option>
+    </entry>
+      <entry>
         Directory where the FFMPEG headers are installed.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-ffmpeg-lib</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-ffmpeg-lib</option>
+    </entry>
+      <entry>
         Directory where the FFMPEG library is installed.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-boost-incl</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-boost-incl</option>
+    </entry>
+      <entry>
         Directory where the Boost headers are installed.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-boost-lib</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-boost-lib</option>
+    </entry>
+      <entry>
         Directory where the Boost library is installed.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-curl-incl</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-curl-incl</option>
+    </entry>
+      <entry>
         Directory where the libCurl headers are installed.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--with-curl-lib</term>
-    <listitem>
-      <para>
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-curl-lib</option>
+    </entry>
+      <entry>
         Directory where the libCurl library is installed.
-      </para>
-    </listitem>
-  </varlistentry>
-
-</variablelist>
+      </entry>
+</row>
+</tbody>
+</tgroup>
+</table>
 

Index: feature_configuration.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/usermanual/installation/feature_configuration.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- feature_configuration.xml	1 Aug 2007 05:04:23 -0000	1.13
+++ feature_configuration.xml	16 Aug 2007 14:27:35 -0000	1.14
@@ -4,106 +4,84 @@
   Some switches can be used during configuration to enable or disable
   features of &app;.  Some of the most important configuration options
   are:
+</para>
+
   <itemizedlist mark="opencircle">
     <listitem>
     <para>
-<emphasis>--enable-gui</emphasis> lets you specify your GUI of choice.
+<option>--enable-gui</option> lets you specify your GUI of choice.
 The default option is GTK.
     </para>
     </listitem>
     <listitem>
     <para>
-<emphasis>--enable-renderer</emphasis> allows a renderer to be
+<option>--enable-renderer</option> allows a renderer to be
 chosen.  The default renderer is OpenGL.
     </para>
     </listitem>
     <listitem>
     <para>
-<emphasis>--enable-media</emphasis> permits a media handler to be
+<option>--enable-media</option> permits a media handler to be
 selected.  The default is FFMPEG with SDL sound.
     </para>
     </listitem>
   </itemizedlist>
+<para>
   A complete list of available features follows.
 </para>
 
-<variablelist>
-  <varlistentry>
-    <term>--enable-debugger</term>
-    <listitem>
-      <para>
-        Enable support for the Flash debugger. The debugger is
-        mainly of interest to Flash developers. 
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--enable-dmalloc</term>
-    <listitem>
-      <para>
-        Enable support for the DMalloc memory debugging tool.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--enable-docbook</term>
-    <listitem>
-      <para>
-        Enable the generation of html and pdf versions of the documentation
-	from the XML. You will then be able to use "make html" and "make pdf".
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--enable-embedded</term>
-    <listitem>
-      <para>
-        Link to Qt-embedded, don't use X. This is only used by
-        Klash.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--disable-fork</term>
-    <listitem>
-      <para>
-        Disable the plugin forking the standalone player, and
+<table id="tb-config-features">
+<title>Configuration Options - Features</title>
+<tgroup cols='2' align='left' colsep='1' rowsep='1'>
+<colspec colname='Option' />
+<colspec colname='Function' />
+<thead>
+<row>
+  <entry>Option</entry>
+  <entry>Function</entry>
+</row>
+</thead>
+<tbody>
+<row>
+  <entry><option>--enable-debugger</option></entry>
+  <entry>Enable support for the Flash debugger. The debugger is
+        mainly of interest to Flash developers.</entry>
+</row>
+<row>
+  <entry><option>--enable-dmalloc</option></entry>
+  <entry>Enable support for the DMalloc memory debugging tool.</entry>
+</row>
+<row>
+  <entry> <option>--enable-docbook</option></entry>
+  <entry>  Enable the generation of HTML and PDF versions of the documentation
+	from the XML. You will then be able to use <command>make html</command> and <command>make pdf</command>.</entry>
+</row>
+<row>
+  <entry>  <option>--enable-embedded</option></entry>
+  <entry> Link to Qt-embedded, do not use X. This is only used by
+        Klash</entry>
+</row>
+<row>
+  <entry> <option>--disable-fork</option></entry>
+  <entry>Disable the plugin from forking the standalone player, and
         using a thread for the player instead. Currently forking
-        the standalone player will give you the best results.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--enable-ghelp</term>
-    <listitem>
-      <para>
-        Enable support for the GNOME help system.
-      </para>
-    </listitem>
-  </varlistentry>
-  
-  <varlistentry>
-    <term>--disable-glext</term>
-    <listitem>
-      <para>
-        Disable using GtkGlExt, which forces the use of SDL
+        the standalone player gives you the best results.</entry>
+</row>
+<row>
+  <entry><option>--enable-ghelp</option>
+</entry>
+  <entry>Enable support for the GNOME help system.</entry>
+</row>
+<row>
+  <entry><option>--disable-glext</option>
+</entry>
+  <entry>Disable using GtkGlExt, which forces the use of SDL
         instead. By default if the GtkGL extension for Gtk is found
-        by configure, the GTK enabled GUI is built.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--enable-gui=gtk|sdl|kde|fltk|fb</term>
-    <listitem>
-      <para>
-        Select the Graphic User Interface to use (just one at a time please).
-      </para>
+        by the configure script, the GTK-enabled GUI is built.</entry>
+</row>
+<row>
+  <entry><option>--enable-gui=gtk|sdl|kde|fltk|fb</option></entry>
+  <entry><para>Select the Graphic User Interface to use (choose one).</para>
       <variablelist>
 	<varlistentry>
 	  <term>GTK</term>
@@ -120,7 +98,7 @@
 <para>
     Simple DirectMedia Layer, a simple and portable GUI.
     Its sound facilities are used when --enable-media=ffmpeg|mad
-    regoardless of whether it is also in charge of the GUI.
+    regardless of whether it is also in charge of the GUI.
 </para>
 	  </listitem>
 	</varlistentry>
@@ -156,168 +134,115 @@
 	  </listitem>
 	</varlistentry>
       </variablelist>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--enable-i810-lod-bias</term>
-    <listitem>
-      <para>
-        Enable fix for Intel 810 LOD bias problem. Older versions
+</entry>
+</row>
+<row>
+  <entry><option>--enable-i810-lod-bias</option>
+</entry>
+  <entry>Enable fix for Intel 810 LOD bias problem. Older versions
         of libMesa on the Intel i810 or i815 graphics processor
         need this flag or Gnash will core dump. This has been
-        fixed in newer versions (summer 2005) of libMesa.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--disable-klash</term>
-    <listitem>
-      <para>
-        Disable support for Konqueror plugin. If
-        <emphasis>--disable-plugin</emphasis> is not specified
+        fixed in newer versions (summer 2005) of libMesa.</entry>
+</row>
+<row>
+  <entry><option>--disable-klash</option></entry>
+  <entry>Disable support for Konqueror plugin. If
+        <option>--disable-plugin</option> is not specified
         and support for building KDE programs is found, Klash is
         built by default. This option limits the plugin to only
-        the Mozilla/Firefox one.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--enable-libsuffix</term>
-    <listitem>
-      <para>
-        /lib directory suffix (64,32,none=default). This is only
-        used by Klash.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--enable-mac</term>
-    <listitem>
-      <para>
-        Link to Qt/Mac (don't use X). This is only used by
-        Klash. 
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--enable-media=ffmpeg|mad|gst</term>
-    <listitem>
-      <para>
+        the Mozilla/Firefox one.</entry>
+</row>
+<row>
+  <entry><option>--enable-libsuffix</option>
+</entry>
+  <entry><filename>/lib</filename> directory suffix (64,32,none=default). This is only
+        used by Klash.</entry>
+</row>
+<row>
+  <entry><option>--enable-mac</option>
+</entry>
+  <entry>Link to Qt/Mac (don't use X). This is only used by
+        Klash.</entry>
+</row>
+<row>
+  <entry><option>--enable-media=ffmpeg|mad|gst</option>
+</entry>
+  <entry>  <para>
         Select the specified media decoder and sound engine.
         FFMPEG and MAD use the SDL sound engine; GST uses its own.
 	MAD only decodes MP3 sounds and uses integer arithmetic while
 	the others also decode video files and use floating point.
-        <emphasis>FFMPEG</emphasis> is the default decoder.
+        <option>FFMPEG</option> is the default decoder.
       </para>
       <para>
         You should only select one media decoder.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--disable-plugin</term>
-    <listitem>
-      <para>
-        Enable building the plugin. By default the
+      </para></entry>
+</row>
+<row>
+  <entry><option>--disable-plugin</option>
+</entry>
+  <entry>Enable building the plugin. By default the
         Mozilla Firefox plugin is built if all the required
-        files are found by configure. Configure
-        <emphasis>--with-plugindir=</emphasis> to specify where the
-        plugin should be installed.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--enable-qtopia</term>
-    <listitem>
-      <para>
-        Link to Qt-embedded, link to the Qtopia
-        Environment. This is only used by Klash.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--enable-renderer=opengl|cairo|agg</term>
-    <listitem>
-      <para>
-        Enable support for the a graphics backend. Currently
-        only <emphasis>opengl</emphasis> and
-        <emphasis>agg</emphasis> work sufficiently. OpenGL is
+        files are found by configure. Specify the 
+        <option>--with-plugindir=</option> option to specify where the
+        plugin should be installed.</entry>
+</row>
+<row>
+  <entry>    <option>--enable-qtopia</option>
+</entry>
+  <entry>  Link to Qt-embedded, link to the Qtopia
+        Environment. This is only used by Klash.</entry>
+</row>
+<row>
+  <entry><option>--enable-renderer=opengl|cairo|agg</option>
+</entry>
+  <entry>Enable support for the a graphics backend. Currently
+        only <option>opengl</option> and
+        <option>agg</option> work sufficiently. OpenGL is
         used when you have hardware accelerated graphics. AGG i
-        used when you don't have hardware accelerated
+        used when you do not have hardware accelerated
         graphics. Typically most desktop machines have OpenGL
-        support, and most embedded systems don't. OpenGl is the
+        support, and most embedded systems do not. OpenGl is the
         default when building Gnash, although the quality of AGG's
-        rendering is currently superior to OpenGL.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--enable-sdk-install</term>
-    <listitem>
-      <para>
-        Enable installing the libraries and headers as an SDK.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--disable-shared</term>
-    <listitem>
-      <para>
-        Enable installing the shared libraries and headers.
+        rendering is currently superior to OpenGL.</entry>
+</row>
+<row>
+  <entry><option>--enable-sdk-install</option>
+</entry>
+  <entry>Enable installing the libraries and headers as an SDK.
+</entry>
+</row>
+<row>
+  <entry><option>--disable-shared</option>
+</entry>
+  <entry>Enable installing the shared libraries and headers.
         Note that the extensions mechanism may not work if shared
-        libraries are disabled.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--enable-strict</term>
-    <listitem>
-      <para>
-        Turn on tons of GCC compiler warnings. By default only
-        <emphasis>-Wall</emphasis> is used with GCC.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--enable-fps-debug</term>
-    <listitem>
-      <para>
-	Enable FPS debugging code. When this feature is compiled in you can use the -f switch of gnash
-	to have FPS printed at regular intervals.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--enable-write</term>
-    <listitem>
-      <para>
-	Makes the Mozilla plugin write the currently playing SWF movie to /tmp.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>--enable-mit-shm</term>
-    <listitem>
-      <para>
-	Add support for using the MIT-SHM X extensions when available. 
+        libraries are disabled.</entry>
+</row>
+<row>
+  <entry><option>--enable-strict</option>
+</entry>
+  <entry>Turn verbose GCC compiler warnings. By default only
+        <option>-Wall</option> is used with GCC.</entry>
+</row>
+<row>
+  <entry><option>--enable-fps-debug</option>
+</entry>
+  <entry>Enable FPS debugging code. When this feature is compiled in you can use the -f switch of &app;
+	to have FPS printed at regular intervals.</entry>
+</row>
+<row>
+  <entry><option>--enable-write</option></entry>
+  <entry>Makes the Mozilla plugin write the currently playing SWF movie to <filename>/tmp</filename>.
+</entry>
+</row>
+<row>
+  <entry><option>--enable-mit-shm</option>
+</entry>
+  <entry>Add support for using the MIT-SHM X extensions when available. 
 	Currently only available using GTK gui and AGG renderer, and known to be
-	bogus in handling of expose events (http://savannah.gnu.org/bugs/?20301).
-      </para>
-    </listitem>
-  </varlistentry>
-
-</variablelist>
+	bogus in handling of expose events (http://savannah.gnu.org/bugs/?20301).</entry>
+</row>
+</tbody>
+</tgroup>
+</table>

Index: install.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/usermanual/installation/install.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- install.xml	1 Aug 2007 05:04:58 -0000	1.4
+++ install.xml	16 Aug 2007 14:27:35 -0000	1.5
@@ -1,10 +1,11 @@
 <title>Installation</title>
 
 <para>
-  Installation is done with the command:
+Now that &app; has been compiled and tested, use the following command to install it:
   <programlisting>
   make install
   </programlisting>
+The above command installs the standalone player.  If the correct files were found by <command>configure</command> and if the <option>--disable-plugin</option> option was not specified, the &app; browser plugin is also installed.
 </para>
 
 <para>
@@ -40,7 +41,7 @@
     <link linkend="pre-configuration">configuration</link>, the libraries will
     be installed in the directory <filename>lib</filename> inside the
     path you specified.  If the libraries are stored in a non-standard
-    location, you need to identify the path in one of two ways.
+    location, you must identify the path in one of two ways.
   </para>
 
   <para>
@@ -65,18 +66,14 @@
   <title>Executables</title>
 
   <para>
-    The Mozilla plugin is installed into the <filename>plugins</filename>
-    directory of the system
-    installed <emphasis>Firefox</emphasis> or <emphasis>Mozilla</emphasis>, 
-    if development packages are installed for either of them.
-    Otherwise, the default is <filename>~/.firefox/plugins</filename>. 
+   The Mozilla plugin is installed in the <filename>plugins/</filename> subdirectory of the Mozilla or Firefox application location if development packages are installed for either browser.  For example, if Firefox is installed in the <filename>/usr/lib/firefox-<replaceable>&lt;version&gt;</replaceable></filename> directory, the plugin will be installed in <filename>/usr/lib/firefox-<replaceable>&lt;version&gt;</replaceable>/plugins/</filename> directory.  If development packages are not installed for either, the default location is <filename>~/.firefox/plugins</filename>. 
     You may also specify the plugin installation directory by using the 
-    <emphasis>--with-plugindir</emphasis> <link linkend="custompath">option 
-    to configure</link>.
+    <option>--with-plugindir</option> <link linkend="custompath">option 
+    at configuration time</link>.
   </para>
 
   <para>
-    The remaining executables will be installed in the <filename>bin</filename>
+    The remaining executables are installed in the <filename>bin</filename>
     subdirectory of the directory specified by during configuration.
     If no path was specified, the default is 
     <filename>/usr/local/bin</filename>.
@@ -93,10 +90,10 @@
   </para>
 
   <para>
-    <emphasis>man</emphasis> and <emphasis>info</emphasis> 
-    will be installed in <filename>/usr/local/share/man</filename>
+    <command>man</command> and <command>info</command> 
+    are installed in <filename>/usr/local/share/man</filename>
     and <filename>/usr/local/share/info</filename> respectively, unless
-    the <emphasis>--mandif</emphasis> or <emphasis>--infodir</emphasis>
+    the <option>--mandif</option> or <option>--infodir</option>
     <link linkend="custompath">configuration options</link> are used.
   </para>
 



From MAILER-DAEMON Thu Aug 16 10:28:14 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ILgKb-0004O1-VK
	for mharc-gnash-commit@gnu.org; Thu, 16 Aug 2007 10:28:13 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ILgKa-0004Mn-UM
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:28:13 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ILgKZ-0004Kc-Vp
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:28:12 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ILgKZ-0004KU-SV
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:28:11 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mgoldin@lulu.com>) id 1ILgKZ-0001CV-H0
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:28:11 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <mgoldin@lulu.com>) id 1ILgKY-0003Tf-Uz
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 14:28:11 +0000
Received: from mushi by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <mushi@savannah.gnu.org>) id 1ILgKY-0003Tc-Qy
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 14:28:10 +0000
To: gnash-commit@gnu.org
Message-Id: <E1ILgKY-0003Tc-Qy@cvs.savannah.gnu.org>
From: Melissa Goldin <mgoldin@lulu.com>
Date: Thu, 16 Aug 2007 14:28:10 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/doc/C gnash.xml
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Aug 2007 14:28:13 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Melissa Goldin <mushi>	07/08/16 14:28:10

Modified files:
	doc/C          : gnash.xml 

Log message:
	Updating to pull in the new 'specification' chapter

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/gnash.xml?cvsroot=gnash&r1=1.46&r2=1.47

Patches:
Index: gnash.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/gnash.xml,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- gnash.xml	1 Aug 2007 04:53:26 -0000	1.46
+++ gnash.xml	16 Aug 2007 14:28:10 -0000	1.47
@@ -2,18 +2,22 @@
 
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-    <!ENTITY legal SYSTEM "legal.xml">
-    <!ENTITY fdl-app SYSTEM "fdl-appendix.xml">
-    <!ENTITY appversion "0.8.0">
-    <!ENTITY manrevision "0.4.0">
-    <!ENTITY date "June 2007">
+    
+    <!ENTITY appversion "0.8.1">
+    <!ENTITY manrevision "0.4.1">
+    <!ENTITY date "August 2007">
     <!ENTITY app "<application>Gnash</application>">
     <!ENTITY appname "Gnash">
+    <!ENTITY AS "ActionScript">
+
+    <!ENTITY legal           SYSTEM "legal.xml">
+    <!ENTITY fdl-app         SYSTEM "fdl-appendix.xml"> 
 
     <!ENTITY programmers     SYSTEM "app_authors.xml">
     <!ENTITY writers         SYSTEM "usermanual/doc_authors.xml">
     <!ENTITY revisionhistory SYSTEM "usermanual/revisions.xml">
     <!ENTITY introduction    SYSTEM "usermanual/introduction.xml">
+    <!ENTITY specification   SYSTEM "usermanual/specification.xml">
     <!ENTITY installation    SYSTEM "usermanual/installation.xml">
     <!ENTITY usage           SYSTEM "usermanual/usage.xml">
     <!ENTITY glossary        SYSTEM "usermanual/glossary.xml">
@@ -69,6 +73,8 @@
   
 <!-- ============= Introduction ============================== -->
   &introduction;
+  &specification;    
+
 
 <!-- ============= Document Body ============================= -->
 



From MAILER-DAEMON Thu Aug 16 10:47:14 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ILgd0-00031N-Le
	for mharc-gnash-commit@gnu.org; Thu, 16 Aug 2007 10:47:14 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ILgcz-0002zx-4r
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:47:13 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ILgcy-0002zg-2i
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:47:12 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ILgcx-0002zd-Sv
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:47:11 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <chadmusick@msbx.net>) id 1ILgcx-00062e-8h
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:47:11 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <chadmusick@msbx.net>) id 1ILgcw-0004zH-88
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 14:47:10 +0000
Received: from cmusick by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <cmusick@savannah.gnu.org>) id 1ILgcw-0004zE-2r
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 14:47:10 +0000
To: gnash-commit@gnu.org
Message-Id: <E1ILgcw-0004zE-2r@cvs.savannah.gnu.org>
From: Chad Musick <chadmusick@msbx.net>
Date: Thu, 16 Aug 2007 14:47:10 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/server AS3_OPCODES
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Aug 2007 14:47:13 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Chad Musick <cmusick>	07/08/16 14:47:10

Added files:
	server         : AS3_OPCODES 

Log message:
	This file contains my current understanding of the opcodes for the new Abc
	code blocks in Flash 9+ files.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/AS3_OPCODES?cvsroot=gnash&rev=1.1

Patches:
Index: AS3_OPCODES
===================================================================
RCS file: AS3_OPCODES
diff -N AS3_OPCODES
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ AS3_OPCODES	16 Aug 2007 14:47:09 -0000	1.1
@@ -0,0 +1,1531 @@
+These are the opcodes for Actionscript ByteCode in AS3. They are executed
+in the Abc block of a V9+ .swf file.
+
+The following opcodes were summarized from the Tamarin code base, used under
+the GPL. 
+
+Codes may have the following attributes:
+
+Hex: The hexadecimal value of the code. Note that many of these codes changed
+ from AS2 to AS3 -- the code numbers are not comparable between the two.
+Name: The name, as given in the Tamarin source, plus my speculation of just
+ what may have been the thought behind the name, when it didn't seem obvious
+ to me.
+StacK In: The entries expected on the stack, with the top of the stack being
+ the last entry listed.
+Stack Out: The stack as it leaves the operation, compared to how it entered.
+ If it doesn't appear on the Stack In list, it won't be touched by the
+ operation. Only operations 0x2A (swap) and 0x2B (dup) leave more than one
+ value on the stack.
+Stream: The state of the bytestream as it is known to be. The bytestream is
+ used to store some values, and the order in which these are listed (left to
+ right) is the order in which they should appear in the stream.
+ The types V32 and UV32 are the variable encoding scheme 30 bit numbers,
+ stored in a 32 bit signed integer (unsigned for UV32).
+ The type S24 is a signed 3 byte number stored in 3 bytes in the stream.
+ Stream reads should always advance the stream point, unless otherwise noted.
+Frame: Accesses of the frame pointer are listed here.
+Names: Some operators have [ns [n]] on the stack. Some names read from the
+ stream need additional context information, and these optional atoms can
+ provide that information.
+See: Some operations are either identical to others or so similar that they
+ are best described in terms of those operations.
+Do: If the intent of the opcode is not obvious from the stack and stream
+ entries, this says what side effects the operation should have.
+NB: Things that are either unusual about this opcode or that I thought worth
+ noting in particular.
+
+See http://www.ecma-international.org/publications/files/ecma-st/ECMA-262.pdf
+ for how these things ought to work, ideally. This document tries to describe
+ how things work in there Tamarin, even if they are incorrect.
+ This file is based on my best understanding, and there is no warranty of
+ correctness or any other kind.
+
+Hex: 0x01
+Name: OP_bkpt
+Do: Enter the debugger if one has been invoked.
+
+Hex: 0x02
+Name: OP_nop
+Do: Nothing.
+
+Hex: 0x03
+Name: OP_throw
+Stack In:
+ obj -- an object
+Stack Out:
+ .
+Do: Throw obj as an exception
+
+Hex: 0x04
+Name: OP_getsuper
+Stream:
+ name_id -- V32 index to multiname 'name'
+Stack In:
+ obj -- an object
+ [ns [n]] -- Namespace stuff.
+Stack Out:
+ super -- if obj.name is a method, the super of that method.
+       -- if obj.name is write-only data, throw ReferenceError.
+       -- if obj.name is readable, the return of the getter of super.
+
+Hex: 0x05
+Name: OP_setsuper
+Stream: UV32 index to multiname 'name'
+Stack In:
+ obj -- an object
+ val -- an object
+ [ns [n]] -- Namespace stuff.
+Stack Out:
+ .
+Do: Make val the super of obj.name ; throw ReferenceError if obj.name is
+ not writable.
+
+Hex: 0x06
+Name: OP_dxns (Dynamically eXtend Name Space?)
+Stream: UV32 index to string pool 'nsname'
+Do: Create a new public namespace with name nsname, enter the namespace.
+
+Hex: 0x07
+Name: OP_dxnslate (Dynamically eXtend Name Space late?)
+Stack In:
+ nsname -- a string object
+Stack Out:
+ .
+Do: Create a new public namespace with name nsname, but don't enter it.
+
+Hex: 0x08
+Name: OP_kill
+Stream: UV32 frame pointer offset 'offset'
+Frame: 
+ Kill at offset
+
+Hex: 0x09
+Name: OP_label
+Do: Unknown purpose, Tamarin does nothing.
+
+Hex: 0x0A
+Name: UNUSED
+
+Hex: 0x0B
+Name: UNUSED
+
+Hex: 0x0C
+Name: OP_ifnlt
+Stream: S24 jump offset 'jump'
+Stack In:
+ a -- an object
+ b -- an object
+Stack Out:
+ .
+Do: If !(a < b) move by jump in stream, as OP_jump does.
+
+Hex: 0x0D
+Name: OP_ifnle
+Stream: S24 jump offset 'jump'
+Stack In:
+ a -- an object
+ b -- an object
+Stack Out:
+ .
+Do: If !(a <= b) move by jump in stream, as OP_jump does.
+
+Hex: 0x0E
+Name: OP_ifngt
+Stream: S24 jump offset 'jump'
+Stack In:
+ a -- an object
+ b -- an object
+Stack Out:
+ .
+Do: If !(a > b) move by jump in stream, as OP_jump does.
+
+Hex: 0x0F
+Name: OP_ifnge
+Stream: S24 jump offset 'jump'
+Stack In:
+ a -- an object
+ b -- an object
+Stack Out:
+ .
+Do: If !(a >= b) move by jump in stream, as OP_jump does.
+
+Hex: 0x10
+Name: OP_jump
+Stream: S24 jump offset 'jump'
+Do: If jump is negative, check for interrupts. Move by jump in stream.
+
+Hex: 0x11
+Name: OP_iftrue
+Stream: S24 jump offset 'jump'
+Stack In:
+ a -- an object
+Stack Out:
+ .
+Do: If a has a 'true' value, move by jump in stream, as OP_jump does.
+
+Hex: 0x12
+Name: OP_iffalse
+Stream: S24 jump offset 'jump'
+Stack In:
+ a -- an object
+Stack Out:
+ .
+Do: If a has a 'false' value, move by jump in stream, as OP_jump does.
+
+Hex: 0x13
+Name: OP_ifeq
+Stream: S24 jump offset 'jump'
+Stack In:
+ a -- an object
+ b -- an object
+Stack Out:
+ .
+Do: If a == b (weakly), move by jump in stream, as OP_jump does.
+
+Hex: 0x14
+Name: OP_ifne
+Stream: S24 jump offset 'jump'
+Stack In:
+ a -- an object
+ b -- an object
+Stack Out:
+ .
+Do: If a != b (weakly), move by jump in stream, as OP_jump does.
+
+Hex: 0x15
+Name: OP_iflt
+Stream: S24 jump offset 'jump'
+Stack In:
+ a -- an object
+ b -- an object
+Stack Out:
+ .
+Do: If a < b move by jump in stream, as OP_jump does.
+
+Hex: 0x16
+Name: OP_ifle
+Stream: S24 jump offset 'jump'
+Stack In:
+ a -- an object
+ b -- an object
+Stack Out:
+ .
+Do: If a <= b move by jump in stream, as OP_jump does.
+
+Hex: 0x17
+Name: OP_ifgt
+Stream: S24 jump offset 'jump'
+Stack In:
+ a -- an object
+ b -- an object
+Stack Out:
+ .
+Do: If a > b move by jump in stream, as OP_jump does.
+
+Hex: 0x18
+Name: OP_ifge
+Stream: S24 jump offset 'jump'
+Stack In:
+ a -- an object
+ b -- an object
+Stack Out:
+ .
+Do: If a >= b move by jump in stream, as OP_jump does.
+
+Hex: 0x19
+Name: OP_ifstricteq
+Stream: S24 jump offset 'jump'
+Stack In:
+ a -- an object
+ b -- an object
+Stack Out:
+ .
+Do: If a == b (strictly), move by jump in stream, as OP_jump does.
+
+Hex: 0x1A
+Name: OP_ifstrictne
+Stream: S24 jump offset 'jump'
+Stack In:
+ a -- an object
+ b -- an object
+Stack Out:
+ .
+Do: If a != b (strongly), move by jump in stream, as OP_jump does.
+
+Hex: 0x1B
+Name: OP_lookupswitch
+Stream: 3 bytes unknown use | V32 count as 'case_count - 1' | case_count of S24
+ as 'cases'
+Stack In:
+ index -- an integer object
+Stack Out:
+ .
+Do: If index >= case_count, reset stream pointer to position on op entry.
+ Otherwise, move by cases[index] - 1 from stream position on op entry.
+
+Hex: 0x1C
+Name: OP_pushwith
+Stack In:
+ scope -- a scope
+Stack Out:
+ .
+Do: Enter scope with previous scope as its base, unless it already had a base,
+ in which case leave that alone.
+
+Hex: 0x1D
+Name: OP_popscope
+Do: Leave current scope. Clear the base if the depth is now shallower than the
+ base's depth.
+
+Hex: 0x1E
+Name: OP_nextname
+Stack In:
+ obj -- an object
+ index -- an integer object
+Stack Out:
+ name -- the key name at index in obj (not next after index).
+Do: If obj is a namespace index 1 is the uri of the namespace, index 2 is
+ the prefix of the namespace, and any other value is a null string object. If
+ obj is an immutable object, like a number, operate on its prototype instead.
+ If there is no such index, name is null.
+
+Hex: 0x1F
+Name: OP_hasnext
+Stack In:
+ obj -- an object
+ index -- an integer object
+Stack Out:
+ next_index -- a raw integer of the next index after index in obj, or 0 if none.
+Do: If there is a key value pair after the one at index, make next_index as it.
+ Otherwise, make next_index 0.
+
+Hex: 0x20
+Name: OP_pushnull
+Stack Out:
+ n -- a Null object.
+
+Hex: 0x21
+Name: OP_pushundefined
+ n -- an Undefined object.
+
+Hex: 0x22
+Name: UNUSED
+
+Hex: 0x23
+Name: OP_nextvalue
+Stack In:
+ obj -- an object (namespaces okay)
+ index -- an integer object
+Stack Out:
+ value -- the value of the key value pair in obj at index.
+
+Hex: 0x24
+Name: OP_pushbyte
+Stream: S8 as 'byte'
+Stack Out:
+ byte -- as a raw byte
+
+Hex: 0x25
+Name: OP_pushshort
+Stream: V32 as 'value'
+Stack Out:
+ value -- as a raw integer
+
+Hex: 0x26
+Name: OP_pushtrue
+Stack Out:
+ true -- the True object
+
+Hex: 0x27
+Name: OP_pushfalse
+Stack Out:
+ false -- the False object
+
+Hex: 0x28
+Name: OP_pushnan
+Stack Out:
+ NaN -- the NaN object
+
+Hex: 0x29
+Name: OP_pop
+Stack In:
+ a -- anything
+Stack Out:
+ .
+
+Hex: 0x2A
+Name: OP_dup
+Stack In:
+ a -- anything
+Stack Out:
+ a
+ a
+
+Hex: 0x2B
+Name: OP_swap
+Stack In:
+ a -- anything
+ b -- anything
+Stack Out:
+ b
+ a
+
+Hex: 0x2C
+Name: OP_pushstring
+Stream: V32 string pool index 'index'
+Stack Out:
+ value -- String object from string_pool[index]
+
+Hex: 0x2D
+Name: OP_pushint
+Stream: V32 int pool index 'index'
+Stack Out:
+ value -- Integer object from integer_pool[index]
+
+Hex: 0x2E
+Name: OP_pushuint
+Stream: V32 uint pool index 'index'
+Stack Out:
+ value -- Unsigned Integer object from unsigned_integer_pool[index]
+
+Hex: 0x2F
+Name: OP_pushdouble
+Stream: V32 double pool index 'index'
+Stack Out:
+ value -- Double object from double_pool[index]
+
+Hex: 0x30
+Name: OP_pushscope
+Stack In:
+ scope -- a scope
+Stack Out:
+ .
+Do: Enter scope without altering base.
+
+Hex: 0x31
+Name: OP_pushnamespace
+Stream: V32 namespace pool index 'index'
+Stack Out:
+ ns -- Namespace object from namespace_pool[index]
+
+Hex: 0x32
+Name: OP_hasnext2
+Stream: V32 frame location 'objloc' | V32 frame location 'indexloc'
+Stack Out:
+ truth -- True if frame[objloc] has a key/value pair after frame[indexloc],
+  following delagates (__proto__) objects if needed. False, otherwise.
+Frame:
+ Change at objloc to object which possessed next value.
+ Change at indexloc to index (as object) of the next value.
+
+Hex: 0x33
+Name: UNUSED
+
+Hex: 0x34
+Name: UNUSED
+
+Hex: 0x35
+Name: UNUSED
+
+Hex: 0x36
+Name: UNUSED
+
+Hex: 0x37
+Name: UNUSED
+
+Hex: 0x38
+Name: UNUSED
+
+Hex: 0x39
+Name: UNUSED
+
+Hex: 0x3A
+Name: UNUSED
+
+Hex: 0x3B
+Name: UNUSED
+
+Hex: 0x3C
+Name: UNUSED
+
+Hex: 0x3D
+Name: UNUSED
+
+Hex: 0x3E
+Name: UNUSED
+
+Hex: 0x3F
+Name: UNUSED
+
+Hex: 0x40
+Name: OP_newfunction
+Stream: V32 'index'
+Stack Out:
+ func -- the function object
+Do: Information about the function is in the pool at index. Construct the
+ function from this information, the current scope, and the base of the scope.
+
+Hex: 0x41
+Name: OP_call
+Stream: V32 'arg_count'
+Stack In:
+ func -- the function to be called
+ obj -- the object to which the function belongs
+ arg1 ... argN -- the arg_count arguments to pass
+Stack Out:
+ value -- the value returned by obj->func(arg1, ...., argN)
+
+Hex: 0x42
+Name: OP_construct
+Stream: V32 'arg_count'
+Stack In:
+ obj -- the object to be constructed
+ arg1 ... argN -- the arg_count arguments to pass
+Stack Out:
+ value -- obj after it has been constructed as obj(arg1, ..., argN)
+
+Hex: 0x43
+Name: OP_callmethod
+Stream: V32 'method_id + 1' | V32 'arg_count'
+Stack In:
+ obj -- the object to be called
+ arg1 ... argN -- the arg_count arguments to pass
+Stack Out:
+ value -- the value returned by obj::'method_id'(arg1, ..., argN)
+
+Hex: 0x44
+Name: OP_callstatic
+Stream: V32 'method_id' | V32 'arg_count'
+Stack In:
+ obj -- the object to act as a receiver for the static call
+ arg1 ... argN -- the arg_count arguments to pass
+Stack Out:
+ value -- the value returned by obj->ABC::'method_id'(arg1, ..., argN)
+
+Hex: 0x45
+Name: OP_callsuper
+Stream: V32 'name_offset' | V32 'arg_count'
+Stack In:
+ obj -- the object whose super is to be called
+ [ns [n]] -- Namespace stuff
+ arg1 ... argN -- the arg_count arguments to pass
+Stack Out:
+ value -- the value returned by obj::(resolve)'name_offset'::super(arg1,
+  ..., argN)
+
+Hex: 0x46
+Name: OP_callproperty
+Stream: V32 'name_offset' | V32 'arg_count'
+Stack In:
+ obj -- The object whose property is to be accessed.
+ [ns [n]] -- Namespace stuff
+ arg1 ... argN -- the arg_count arguments to pass
+Stack Out:
+ value -- the value returned by obj::(resolve)'name_offset'(arg1, ..., argN)
+NB: Calls getter/setter if they exist.
+
+Hex: 0x47
+Name: OP_returnvoid
+Do: Return an Undefined object up the callstack.
+
+Hex: 0x48
+Name: OP_returnvalue
+Stack In:
+ value -- value to be returned
+Stack Out:
+ .
+Do: Return value up the callstack.
+
+Hex: 0x49
+Name: OP_constructsuper
+Stream: V32 'arg_count'
+Stack In:
+ obj -- the object whose super's constructor should be invoked
+ arg1 ... argN -- the arg_count arguments
+Stack Out:
+ value -- obj after obj::super(arg1, ..., argN) has been invoked
+
+Hex: 0x4A
+Name: OP_constructprop
+Stream: V32 'name_offset' | V32 'arg_count'
+Stack In:
+ obj -- the object whose property should be constructed
+ [ns [n]] -- Namespace stuff
+ arg1 ... argN -- the arg_count arguments to pass
+Stack Out:
+ value -- the newly constructed prop from obj::(resolve)'name_offset'(arg1,
+  ..., argN)
+
+Hex: 0x4B
+Name: OP_callsuperid
+Do: Nothing, this is an intermediate code op, should not appear in ABC.
+
+Hex: 0x4C
+Name: OP_callproplex
+Stream: V32 'name_offset' | V32 'arg_count'
+Stack In:
+ obj -- The object whose property is to be accessed.
+ [ns [n]] -- Namespace stuff
+ arg1 ... argN -- the arg_count arguments to pass
+Stack Out:
+ value -- the value returned by obj::(resolve)'name_offset'(arg1, ..., argN)
+NB: As nearly as I can tell, this does _not_ call getter/setter if they exist,
+ but is otherwise identical to OP_callproperty
+
+Hex: 0x4D
+Name: OP_callinterface
+Do: Nothing, this is an intermediate code op, should not appear in ABC.
+
+Hex: 0x4E
+Name: OP_callsupervoid
+See: 0x45 (OP_callsuper), but
+Stack Out:
+ .
+
+Hex: 0x4F
+Name: OP_callpropvoid
+See: 0x46 (OP_callproperty), but
+Stack Out:
+ .
+
+Hex: 0x50
+Name: UNUSED
+
+Hex: 0x51
+Name: UNUSED
+
+Hex: 0x52
+Name: UNUSED
+
+Hex: 0x53
+Name: UNUSED
+
+Hex: 0x54
+Name: UNUSED
+
+Hex: 0x55
+Name: OP_newobject
+Stream: V32 'arg_count'
+Stack In:
+ prop_name_1 -- a string
+ prop_value_1 -- a value object
+ .
+ . (arg_count name/value pairs in all)
+ .
+ prop_name_n -- a string
+ prop_value_n -- a value object
+Stack Out:
+ obj -- A new object which contains all of the given properties.
+NB: This builds an object from its properties, it's not a constructor.
+
+Hex: 0x56
+Name: OP_newarray
+Stream: V32 'array_size'
+Stack In:
+ value_1 -- a value
+ .
+ . (array_size of these)
+ .
+ value_n -- a value
+Stack Out:
+ array -- an array { value_1, value_2, ..., value_n }
+
+Hex: 0x57
+Name: OP_newactivation
+Stack Out:
+ vtable -- A new virtual table, which has the previous one as a parent.
+
+Hex: 0x58
+Name: OP_newclass
+Stream: V32 'class_id'
+Stack In:
+ obj -- An object to be turned into a class
+Stack Out:
+ class -- The newly made class, made from obj and the information at
+  cinits_pool[class_id]
+NB: This depends on scope and scope base (to determine base class)
+
+Hex: 0x59
+Name: OP_getdescendants
+Stream: V32 'name_id'
+Stack In:
+ value -- Whose descendants to get
+ [ns [n]] -- Namespace stuff
+Stack Out:
+ ?
+NB: This op seems to always throw a TypeError in Tamarin, though I assume that
+ it ought to do something to yield a list of descendants of a class.
+
+Hex: 0x5A
+Name: OP_newcatch
+Stream: V32 'catch_id'
+Stack Out:
+ vtable -- A new vtable suitable to catch an exception of the type in catch_id.
+NB: Need more information on how exceptions are set up.
+
+Hex: 0x5B
+Name: UNUSED
+
+Hex: 0x5C
+Name: UNUSED
+
+Hex: 0x5D
+Name: OP_findpropstrict
+Stream: V32 'name_id'
+Stack In:
+ [ns [n]] -- Namespace stuff
+Stack Out:
+ owner -- The object which owns the property given by looking up the name_id,
+  or throw a ReferenceError if none exists.
+
+Hex: 0x5E
+Name: OP_findproperty
+Stream: V32 'name_id'
+Stack In:
+ [ns [n]] -- Namespace stuff
+Stack Out:
+ owner -- The object which owns the property given by looking up the name_id,
+  or an Undefined object if none exists.
+
+Hex: 0x5F
+Name: OP_finddef
+Stream: V32 'name_id' (no ns expansion)
+Stack Out:
+ def -- The definition of the name at name_id.
+
+Hex: 0x60
+Name: OP_getlex
+Stream: V32 'name_id' (no ns expansion)
+Stack Out:
+ property -- The result of 0x5D (OP_findpropstrict) + 0x66 (OP_getproperty)
+
+Hex: 0x61
+Name: OP_setproperty
+Stream: V32 'name_id'
+Stack In:
+ obj -- The object whose property is to be set
+ [ns [n]] -- Namespace stuff
+ [key] -- Key name for the property. Will not have both Namespace and key.
+ value -- The value to be used
+Stack Out:
+ .
+Do: Set obj::(resolve)'name_id' to value, or set obj::key to value.
+NB: I'm not yet clear which should be used when. (Chad)
+
+Hex: 0x62
+Name: OP_getlocal
+Stream: V32 'frame_index'
+Frame: value at frame_index is needed
+Stack Out:
+ value
+
+Hex: 0x63
+Name: OP_setlocal
+Stream: V32 'frame_index'
+Frame: obj at frame_index is set to value
+Stack In:
+ value
+Stack Out:
+ .
+
+Hex: 0x64
+Name: OP_getglobalscope
+Stack Out:
+ global -- The global scope object
+
+Hex: 0x65
+Name: OP_getscopeobject
+Stream: S8 'depth'
+Stack Out:
+ scope -- The scope object at depth
+
+Hex: 0x66
+Name: OP_getproperty
+Stream: V32 'name_id'
+Stack In:
+ obj -- The object whose property is to be retrieved
+ [ns [n]] -- Namespace stuff
+ [key] -- Key name for the property. Will not have both Namespace and key.
+Stack Out:
+ prop -- The requested property.
+NB: As with 0x61 (OP_setproperty) it's unclear to me when key gets used and
+ when the namespace (or nothing) is used.
+
+Hex: 0x67
+Name: UNUSED
+
+Hex: 0x68
+Name: OP_initproperty
+Stream V32 'name_id'
+Stack In:
+ obj -- The object whose property is to be initialized
+ [ns [n]] -- Namespace stuff
+ value -- The value to be put into the property.
+Stack Out:
+ .
+Do:
+ Set obj::(resolve)'name_id' to value, and set the bindings from the context.
+
+Hex: 0x69
+Name: UNUSED
+
+Hex: 0x6A
+Name: OP_deleteproperty
+Stream: V32 'name_id'
+Stack In:
+ obj -- The object whose property should be deleted.
+ [ns [n]] -- Namespace stuff
+Stack Out:
+ truth -- True if the property was deleted or did not exist, otherwise False.
+
+Hex: 0x6B
+Name: UNUSED
+
+Hex: 0x6C
+Name: OP_getslot
+Stream: V32 'slot_index + 1'
+Stack In:
+ obj -- The object which owns the desired slot.
+Stack Out:
+ slot -- obj.slots[slot_index]
+
+Hex: 0x6D
+Name: OP_setslot
+Stream: V32 'slot_index + 1'
+Stack In:
+ obj -- The object whose slot should be set.
+ value -- The value intended for the slot.
+Stack Out:
+ .
+Do: obj.slots[slot_index] = value
+
+Hex: 0x6E
+Name: OP_getglobalslot
+Stream: V32 'slot_index + 1'
+Stack In:
+ .
+Stack Out:
+ slot -- globals.slots[slot_index]
+NB: Deprecated
+
+Hex: 0x6F
+Name: OP_setglobalslot
+Stream: V32 'slot_index + 1'
+Stack In:
+ value -- The value to be placed into the slot.
+Stack Out:
+ .
+Do: globals[slot_index] = value
+NB: Deprecated
+
+Hex: 0x70
+Name: OP_convert_s
+Stack In:
+ value -- An object
+Stack Out:
+ str_value -- value as a string
+
+Hex: 0x71
+Name: OP_esc_xelem
+Stack In:
+ value -- An object to be escaped
+Stack Out:
+ str_value -- value as a string, escaped suitably to be put in an XML element.
+
+Hex: 0x72
+Name: OP_esc_xattr
+Stack In:
+ value -- An object to be escaped
+Stack Out:
+ str_value -- value as a string, escaped suitably to be put in an XML attribute.
+
+Hex: 0x73
+Name: OP_convert_i
+Stack In:
+ value -- An object to be converted to Integer
+Stack Out:
+ int_value -- value as an integer object
+
+Hex: 0x74
+Name: OP_convert_u
+Stack In:
+ value -- An object to be converted to unsigned integer
+Stack Out:
+ int_value -- value as an unsigned integer object
+
+Hex: 0x75
+Name: OP_convert_d
+Stack In:
+ value -- An object to be converted to a double
+Stack Out:
+ double_value -- value as a double object
+
+Hex: 0x76
+Name: OP_convert_b
+Stack In:
+ value -- An object to be converted to a boolean
+Stack Out:
+ bool_value -- value as a boolean object
+
+Hex: 0x77
+Name: OP_convert_o
+Stack In:
+ obj -- An object
+Stack Out:
+ obj -- An object
+Do: If obj is Undefined or Null, throw TypeError
+
+Hex: 0x78
+Name: OP_checkfilter
+Stack In:
+ obj -- An object
+Stack Out:
+ obj -- An object
+Do: If obj is not XML based, throw TypeError
+
+Hex: 0x79
+Name: UNUSED
+
+Hex: 0x7A
+Name: UNUSED
+
+Hex: 0x7B
+Name: UNUSED
+
+Hex: 0x7C
+Name: UNUSED
+
+Hex: 0x7D
+Name: UNUSED
+
+Hex: 0x7E
+Name: UNUSED
+
+Hex: 0x7F
+Name: UNUSED
+
+Hex: 0x80
+Name: OP_coerce
+Stream: V32 'name_index'
+Stack In:
+ obj -- An object to be converted
+Stack Out:
+ coerced_obj -- The object as the desired (resolve)'name_index' type.
+
+Hex: 0x81
+Name: OP_coerce_b
+See: 0x76 (OP_convert_b)
+NB: Deprecated
+
+Hex: 0x82
+Name: OP_coerce_a
+Stack In:
+ obj -- An object to be converted
+Stack Out:
+ obj
+Do: Nothing. (The 'a' is for atom, and this already is.)
+
+Hex: 0x83
+Name: OP_coerce_i
+See: 0x73 OP_convert_i
+NB: Deprecated
+
+Hex: 0x84
+Name: OP_coerce_d
+See: 0x75 OP_convert_d
+NB: Deprecated
+
+Hex: 0x85
+Name: OP_coerce_s
+Stack In:
+ obj -- An object to be converted
+Stack Out:
+ str_obj -- The converted object. nullString object if obj is Null or Undefined
+
+Hex: 0x86
+Name: OP_astype
+Stream: V32 'name_index' (no namespace)
+Stack In:
+ obj -- An object to be checked
+Stack Out:
+ cobj -- obj if obj is of type (resolve)'name_index', otherwise Null
+
+Hex: 0x87
+Name: OP_astypelate
+Stack In:
+ obj -- An object to be checked
+ valid -- The object whose type is to be matched
+Stack Out:
+ cobj -- obj if type of obj is type of valid, otherwise Null
+
+Hex: 0x88
+Name: OP_coerce_u
+See: 0x74 (OP_convert_u)
+NB: Deprecated
+
+Hex: 0x89
+Name: OP_coerce_o
+Stack In:
+ obj -- An object
+Stack Out:
+ cobj -- obj if obj is not Undefined, otherwise Null
+
+Hex: 0x8A
+Name: UNUSED
+
+Hex: 0x8B
+Name: UNUSED
+
+Hex: 0x8C
+Name: UNUSED
+
+Hex: 0x8D
+Name: UNUSED
+
+Hex: 0x8E
+Name: UNUSED
+
+Hex: 0x8F
+Name: UNUSED
+
+Hex: 0x90
+Name: OP_negate
+Stack In:
+ obj -- An object
+Stack Out:
+ negdouble -- -1.0 * (double) obj
+
+Hex: 0x91
+Name: OP_increment
+Stack In:
+ num -- A number, integer or double
+Stack Out:
+ num2 -- The same value, but new object.
+Do:
+ num = num + 1 (post-increment)
+
+Hex: 0x92
+Name: OP_inclocal
+Stream: V32 'frame_addr'
+Frame: Load i from frame_addr. Store clone(i) at frame_addr. i = i + 1
+ (post-increment in frame)
+
+Hex: 0x93
+Name: OP_decrement
+Stack In:
+ num -- A number, integer or double
+Stack Out:
+ num2 -- The same value, but new object.
+Do:
+ num = num - 1 (post-decrement)
+
+Hex: 0x94
+Name: OP_declocal
+Stream: V32 'frame_addr'
+Frame: Load i from frame_addr. Store clone(i) at frame_addr. i = i - 1
+ (post-decrement in frame)
+
+Hex: 0x95
+Name: OP_typeof
+Stack In:
+ obj -- An object
+Stack Out:
+ type -- typeof(obj)
+
+Hex: 0x96
+Name: OP_not
+Stack In:
+ obj -- An object
+Stack Out:
+ nobj -- A truth object with value !((Boolean) obj)
+
+Hex: 0x97
+Name: OP_bitnot
+Stack In:
+ obj -- An object
+Stack Out:
+ nint -- ~((Int) obj)
+
+Hex: 0x98
+Name: UNUSED
+
+Hex: 0x99
+Name: UNUSED
+
+Hex: 0x9A
+Name: OP_concat
+NB: It is an error for this to appear.
+
+Hex: 0x9B
+Name: OP_add_d
+NB: It is an error for this to appear.
+
+Hex: 0x9C
+Name: UNUSED
+
+Hex: 0x9D
+Name: UNUSED
+
+Hex: 0x9E
+Name: UNUSED
+
+Hex: 0x9F
+Name: UNUSED
+
+Hex: 0xA0
+Name: OP_add
+Stack In:
+ a
+ b
+Stack Out:
+ a + b (double if numeric)
+
+Hex: 0xA1
+Name: OP_subtract
+Stack In:
+ a
+ b
+Stack Out:
+ a - b (double)
+
+Hex: 0xA2
+Name: OP_multiply
+Stack In:
+ a
+ b
+Stack Out:
+ a * b (double)
+
+Hex: 0xA3
+Name: OP_divide
+Stack In:
+ a
+ b
+Stack Out:
+ a / b (double)
+
+Hex: 0xA4
+Name: OP_modulo
+Stack In:
+ a
+ b
+Stack Out:
+ a % b
+
+Hex: 0xA5
+Name: OP_lshift
+Stack In:
+ a
+ b
+Stack Out:
+ a << b
+
+Hex: 0xA6
+Name: OP_rshift
+Stack In:
+ a
+ b
+Stack Out:
+ a >> b
+
+Hex: 0xA7
+Name: OP_urshift
+Stack In:
+ a
+ b
+Stack Out:
+ ((unsigned) a) >> b
+
+Hex: 0xA8
+Name: OP_bitand
+Stack In:
+ a
+ b
+Stack Out:
+ a & b
+
+Hex: 0xA9
+Name: OP_bitor
+Stack In:
+ a
+ b
+Stack Out:
+ a | b
+
+Hex: 0xAA
+Name: OP_bitxor
+Stack In:
+ a
+ b
+Stack Out:
+ a ^ b
+
+Hex: 0xAB
+Name: OP_equals
+Stack In:
+ a
+ b
+Stack Out:
+ truth -- Truth of (a == b) (weakly)
+
+Hex: 0xAC
+Name: OP_strictequals
+Stack In:
+ a
+ b
+Stack Out:
+ truth -- Truth of (a == b) (strongly, as in 0x19 (OP_ifstricteq))
+
+Hex: 0xAD
+Name: OP_lessthan
+Stack In:
+ a
+ b
+Stack Out:
+ truth -- Truth of (a < b)
+
+Hex: 0xAE
+Name: OP_lessequals
+Stack In:
+ a
+ b
+Stack Out:
+ truth -- Truth of (a <= b)
+
+Hex: 0xAF
+Name: OP_greaterthan
+Stack In:
+ a
+ b
+Stack Out:
+ truth -- Truth of (a > b)
+
+Hex: 0xB0
+Name: OP_greaterequals
+Stack In:
+ a
+ b
+Stack Out:
+ truth -- Truth of (a >= b)
+
+Hex: 0xB1
+Name: OP_instanceof
+Stack In:
+ val -- An object
+ super -- An object
+Stack Out:
+ truth -- Truth of "val is an instance of super"
+
+Hex: 0xB2
+Name: OP_istype
+Stream: V32 'name_id'
+Stack In:
+ obj -- An object
+Stack Out:
+ truth -- Truth of "obj is of the type given in (resolve)'name_id'"
+
+Hex: 0xB3
+Name: OP_istypelate
+Stack In:
+ obj -- An object
+ type -- A type to match
+Stack Out:
+ truth -- Truth of "obj is of type"
+
+Hex: 0xB4
+Name: OP_in
+Stack In:
+ name -- The name to find
+ obj -- The object to search for it
+Stack Out:
+ truth -- True if name is in the current namespace or anywhere in object.
+  Don't look in the namespace if obj is a dictionary.
+
+Hex: 0xB5
+Name: UNUSED
+
+Hex: 0xB6
+Name: UNUSED
+
+Hex: 0xB7
+Name: UNUSED
+
+Hex: 0xB8
+Name: UNUSED
+
+Hex: 0xB9
+Name: UNUSED
+
+Hex: 0xBA
+Name: UNUSED
+
+Hex: 0xBB
+Name: UNUSED
+
+Hex: 0xBC
+Name: UNUSED
+
+Hex: 0xBD
+Name: UNUSED
+
+Hex: 0xBE
+Name: UNUSED
+
+Hex: 0xBF
+Name: UNUSED
+
+Hex: 0xC0
+Name: OP_increment_i
+See: 0x91 (OP_increment), but forces types to int, not double
+
+Hex: 0xC1
+Name: OP_decrement_i
+See: 0x93 (OP_decrement), but forces types to int, not double
+
+Hex: 0xC2
+Name: OP_inclocal_i
+See: 0x92 (OP_inclocal), but forces types to int, not double
+
+Hex: 0xC3
+Name: OP_declocal_i
+See: 0x94 (OP_declocal), but forces types to int, not double
+
+Hex: 0xC4
+Name: OP_negate_i
+See: 0x90 (OP_negate), but forces type to int, not double
+
+Hex: 0xC5
+Name: OP_add_i
+See: 0xA0 (OP_add), but forces type to int
+
+Hex: 0xC6
+Name: OP_subtract_i
+See: 0xA1 (OP_subtract), but forces type to int
+
+Hex: 0xC7
+Name: OP_multiply_i
+See: 0xA2 (OP_multiply), but forces type to int
+
+Hex: 0xC8
+Name: UNUSED
+
+Hex: 0xC9
+Name: UNUSED
+
+Hex: 0xCA
+Name: UNUSED
+
+Hex: 0xCB
+Name: UNUSED
+
+Hex: 0xCC
+Name: UNUSED
+
+Hex: 0xCD
+Name: UNUSED
+
+Hex: 0xCE
+Name: UNUSED
+
+Hex: 0xCF
+Name: UNUSED
+
+Hex: 0xD0
+Name: OP_getlocal0
+Frame: Load frame[0] as val
+Stack Out:
+ val
+
+Hex: 0xD1
+Name: OP_getlocal1
+Frame: Load frame[1] as val
+Stack Out:
+ val
+
+Hex: 0xD2
+Name: OP_getlocal2
+Frame: Load frame[2] as val
+Stack Out:
+ val
+
+Hex: 0xD3
+Name: OP_getlocal3
+Frame: Load frame[3] as val
+Stack Out:
+ val
+
+Hex: 0xD4
+Name: OP_setlocal0
+Frame: Store val as frame[0]
+Stack In:
+ val
+Stack Out:
+ .
+
+Hex: 0xD5
+Name: OP_setlocal1
+Frame: Store val as frame[1]
+Stack In:
+ val
+Stack Out:
+ .
+
+Hex: 0xD6
+Name: OP_setlocal2
+Frame: Store val as frame[2]
+Stack In:
+ val
+Stack Out:
+ .
+
+Hex: 0xD7
+Name: OP_setlocal3
+Frame: Store val as frame[3]
+Stack In:
+ val
+Stack Out:
+ .
+
+Hex: 0xD8
+Name: UNUSED
+
+Hex: 0xD9
+Name: UNUSED
+
+Hex: 0xDA
+Name: UNUSED
+
+Hex: 0xDB
+Name: UNUSED
+
+Hex: 0xDC
+Name: UNUSED
+
+Hex: 0xDD
+Name: UNUSED
+
+Hex: 0xDE
+Name: UNUSED
+
+Hex: 0xDF
+Name: UNUSED
+
+Hex: 0xE0
+Name: UNUSED
+
+Hex: 0xE1
+Name: UNUSED
+
+Hex: 0xE2
+Name: UNUSED
+
+Hex: 0xE3
+Name: UNUSED
+
+Hex: 0xE4
+Name: UNUSED
+
+Hex: 0xE5
+Name: UNUSED
+
+Hex: 0xE6
+Name: UNUSED
+
+Hex: 0xE7
+Name: UNUSED
+
+Hex: 0xE8
+Name: UNUSED
+
+Hex: 0xE9
+Name: UNUSED
+
+Hex: 0xEA
+Name: UNUSED
+
+Hex: 0xEB
+Name: UNUSED
+
+Hex: 0xEC
+Name: UNUSED
+
+Hex: 0xED
+Name: UNUSED
+
+Hex: 0xEE
+Name: OP_abs_jump
+NB: It is an error for this to appear.
+
+Hex: 0xEF
+Name: OP_debug
+Stream: 7 bytes of unknown stuff to be skipped
+Do: skip ahead 7 bytes in stream
+
+Hex: 0xF0
+Name: OP_debugline
+Stream: V32 'line_number'
+Do: Nothing, but line_number is for the debugger if wanted.
+
+Hex: 0xF1
+Name: OP_debugfile
+Stream: V32 'name_offset'
+Do: Nothing, but 'name_offset' into string pool is the file name if wanted.
+
+Hex: 0xF2
+Name: OP_bkptline
+Stream: V32 'line_number'
+Do: Enter debugger if present, line_number is the line number in source.
+
+Hex: 0xF3
+Name: OP_timestamp
+Do: Nothing.
+
+Hex: 0xF4
+Name: UNUSED
+
+Hex: 0xF5
+Name: OP_verifypass
+NB: It seems an error for this to appear.
+
+Hex: 0xF6
+Name: OP_alloc
+NB: Error to appear in ABC
+
+Hex: 0xF7
+Name: OP_mark
+NB: Error to appear in ABC
+
+Hex: 0xF8
+Name: OP_wb
+NB: Error to appear in ABC
+
+Hex: 0xF9
+Name: OP_prologue
+NB: Error to appear in ABC
+
+Hex: 0xFA
+Name: OP_sendenter
+NB: Error to appear in ABC
+
+Hex: 0xFB
+Name: OP_doubletoatom
+NB: Error to appear in ABC
+
+Hex: 0xFC
+Name: OP_sweep
+NB: Error to appear in ABC
+
+Hex: 0xFD
+Name: OP_codegenop
+NB: Error to appear in ABC
+
+Hex: 0xFE
+Name: OP_verifyop
+NB: Error to appear in ABC
+
+Hex: 0xFF
+Name: OP_decode
+NB: Error to appear in ABC
+~                                                                                                                                                                                                              
+~                                                                                                                                                                                                            



From MAILER-DAEMON Thu Aug 16 10:50:23 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ILgg3-0003ta-Db
	for mharc-gnash-commit@gnu.org; Thu, 16 Aug 2007 10:50:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ILgg2-0003t9-8n
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:50:22 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ILgg1-0003sq-5I
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:50:21 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ILgg1-0003sn-1X
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:50:21 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mgoldin@lulu.com>) id 1ILgfz-0006rK-NQ
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 10:50:20 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <mgoldin@lulu.com>) id 1ILgfy-0005FY-AX
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 14:50:18 +0000
Received: from mushi by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <mushi@savannah.gnu.org>) id 1ILgfy-0005FV-6X
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 14:50:18 +0000
To: gnash-commit@gnu.org
Message-Id: <E1ILgfy-0005FV-6X@cvs.savannah.gnu.org>
From: Melissa Goldin <mgoldin@lulu.com>
Date: Thu, 16 Aug 2007 14:50:18 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/doc/C/usermanual usage.xml
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Aug 2007 14:50:22 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Melissa Goldin <mushi>	07/08/16 14:50:18

Modified files:
	doc/C/usermanual: usage.xml 

Log message:
	Fixing an error in the table

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/usage.xml?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: usage.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/usermanual/usage.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- usage.xml	16 Aug 2007 14:25:26 -0000	1.4
+++ usage.xml	16 Aug 2007 14:50:17 -0000	1.5
@@ -204,16 +204,28 @@
 	  <option>-r [0|1|2|3]</option>
 	  </entry>
 	    <entry>
+<itemizedlist>
+<listitem>
+<para>
 	      0 disables rendering and sound (good for batch tests).
-	    </entry>
-	    <entry>
+</para>
+</listitem>
+<listitem>
+<para>
 	      1 enables rendering and disables sound (default setting).
-	    </entry>
-	    <entry>
+</para>
+</listitem>
+<listitem>
+<para>
 	      2 enables sound and disables rendering.
-	    </entry>
-	    <entry>
+</para>
+</listitem>
+<listitem>
+<para>
 	      3 enables rendering and sound.
+</para>
+</listitem>
+</itemizedlist>
 	    </entry>
 	  </row>
 	<row>



From MAILER-DAEMON Thu Aug 16 11:11:33 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ILh0X-0007Y8-Ez
	for mharc-gnash-commit@gnu.org; Thu, 16 Aug 2007 11:11:33 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ILh0W-0007Xm-Nw
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 11:11:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ILh0U-0007Wk-MB
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 11:11:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ILh0U-0007Wh-JG
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 11:11:30 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mgoldin@lulu.com>) id 1ILh0U-0002pL-9z
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 11:11:30 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <mgoldin@lulu.com>) id 1ILh0T-0006Fu-Q3
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 15:11:29 +0000
Received: from mushi by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <mushi@savannah.gnu.org>) id 1ILh0T-0006Fr-LJ
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 15:11:29 +0000
To: gnash-commit@gnu.org
Message-Id: <E1ILh0T-0006Fr-LJ@cvs.savannah.gnu.org>
From: Melissa Goldin <mgoldin@lulu.com>
Date: Thu, 16 Aug 2007 15:11:29 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/doc/C/usermanual specification.xml
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Aug 2007 15:11:33 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Melissa Goldin <mushi>	07/08/16 15:11:29

Modified files:
	doc/C/usermanual: specification.xml 

Log message:
	Tracking down a problem with the tables in PDF. They're find in HTML, but some reason they're looking a might weird in PDF.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/specification.xml?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: specification.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/usermanual/specification.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- specification.xml	16 Aug 2007 14:23:54 -0000	1.1
+++ specification.xml	16 Aug 2007 15:11:29 -0000	1.2
@@ -16,9 +16,9 @@
 The following table indicates how fully various &AS; classes have been implemented:
 </para>
 
-<table id="tb-actionscript-classes">
+<table frame='all'>
 <title>&AS; Classes</title>
-<tgroup cols='2' align='left' colsep='1' rowsep='1'>
+<tgroup cols='2' align='left' colsep='5' rowsep='1'>
 <colspec colname='Class'/>
 <colspec colname='Status'/>
 <thead>
@@ -128,7 +128,7 @@
 The next table indicates which opcodes have been implemented:
 </para>
 
-<table id="tb-opcodes">
+<table frame='all'>
 <title>Opcodes</title>
 <tgroup cols='2' align='left' colsep='1' rowsep='1'>
 <colspec colname='Opcode'/>
@@ -233,7 +233,7 @@
 This garbage collector has reduced the memory footprint of &app;.  However, the most current, available test data indicated the following runtime memory footprint:
 </para>
 
-<table id="tb-memory-footprint">
+<table frame='all'>
 <title>Memory Footprint</title>
 <tgroup cols='4' align='left' colsep='1' rowsep='1'>
 <colspec colname='Render GUI' />



From MAILER-DAEMON Thu Aug 16 12:58:57 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ILigT-0005w1-O2
	for mharc-gnash-commit@gnu.org; Thu, 16 Aug 2007 12:58:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ILigS-0005uM-OQ
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 12:58:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ILigO-0005pl-5E
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 12:58:56 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ILigO-0005pc-13
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 12:58:52 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mgoldin@lulu.com>) id 1ILigN-000734-IY
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 12:58:51 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <mgoldin@lulu.com>) id 1ILigN-0008MI-0z
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 16:58:51 +0000
Received: from mushi by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <mushi@savannah.gnu.org>) id 1ILigM-0008MF-Tw
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 16:58:50 +0000
To: gnash-commit@gnu.org
Message-Id: <E1ILigM-0008MF-Tw@cvs.savannah.gnu.org>
From: Melissa Goldin <mgoldin@lulu.com>
Date: Thu, 16 Aug 2007 16:58:50 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/doc/C/usermanual specification.xml
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Aug 2007 16:58:57 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Melissa Goldin <mushi>	07/08/16 16:58:50

Modified files:
	doc/C/usermanual: specification.xml 

Log message:
	That colsep argument is boolean, not a scale. Changing back to 1.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/specification.xml?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: specification.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/usermanual/specification.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- specification.xml	16 Aug 2007 15:11:29 -0000	1.2
+++ specification.xml	16 Aug 2007 16:58:50 -0000	1.3
@@ -18,7 +18,7 @@
 
 <table frame='all'>
 <title>&AS; Classes</title>
-<tgroup cols='2' align='left' colsep='5' rowsep='1'>
+<tgroup cols='2' align='left' colsep='1' rowsep='1'>
 <colspec colname='Class'/>
 <colspec colname='Status'/>
 <thead>



From MAILER-DAEMON Thu Aug 16 13:19:10 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ILj02-0005aN-Gp
	for mharc-gnash-commit@gnu.org; Thu, 16 Aug 2007 13:19:10 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ILj01-0005Zb-EQ
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 13:19:09 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ILj00-0005ZC-QC
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 13:19:09 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ILj00-0005Z5-G6
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 13:19:08 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1ILizz-0002Gy-QH
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 13:19:08 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l7GHInf82873;
	Thu, 16 Aug 2007 19:18:49 +0200 (CEST)
	(envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Thu, 16 Aug 2007 19:18:49 +0200
To: Melissa Goldin <mgoldin@lulu.com>, Rob Savoye <rob@welcomehome.org>
Subject: Re: [Gnash-commit] gnash/doc/C/usermanual introduction.xml
Message-ID: <20070816171849.GC77726@keybit.net>
Mail-Followup-To: Melissa Goldin <mgoldin@lulu.com>,
	Rob Savoye <rob@welcomehome.org>, gnash-commit@gnu.org
References: <E1ILgDl-0003LG-7f@cvs.savannah.gnu.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1ILgDl-0003LG-7f@cvs.savannah.gnu.org>
X-Detected-Kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Aug 2007 17:19:09 -0000

On Thu, Aug 16, 2007 at 02:21:09PM +0000, Melissa Goldin wrote:

>  <para>
> -John Gilmore has also been dedicated to the project from the beginning. I have shamelessly plagiarized one of his early announcement emails in the early part of this chapter.
> +John Steinhart has also been dedicated to the project from the beginning. I have shamelessly plagiarized one of his early announcement emails in the early part of this chapter.
>  </para>

I guess Gilmore was the correct one.
--strk;



From MAILER-DAEMON Thu Aug 16 13:27:55 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ILj8V-0001A1-Ng
	for mharc-gnash-commit@gnu.org; Thu, 16 Aug 2007 13:27:55 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ILj8U-00019r-VF
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 13:27:55 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ILj8T-00019e-Hn
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 13:27:54 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ILj8T-00019b-EF
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 13:27:53 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1ILj8S-0003im-NQ
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 13:27:53 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l7GHRhF83061;
	Thu, 16 Aug 2007 19:27:43 +0200 (CEST)
	(envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Thu, 16 Aug 2007 19:27:42 +0200
To: Melissa Goldin <mgoldin@lulu.com>
Subject: Re: [Gnash-commit] gnash/doc/C/usermanual specification.xml
Message-ID: <20070816172742.GD77726@keybit.net>
Mail-Followup-To: Melissa Goldin <mgoldin@lulu.com>, gnash-commit@gnu.org
References: <E1ILgGQ-0003Nc-IM@cvs.savannah.gnu.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1ILgGQ-0003Nc-IM@cvs.savannah.gnu.org>
X-Detected-Kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Aug 2007 17:27:55 -0000

On Thu, Aug 16, 2007 at 02:23:54PM +0000, Melissa Goldin wrote:

> +<sect1 id="spec-memory">
> +<title>Memory Management</title>
> +
> +<para>
> +One of the new features of &app; &appversion; is the garbage collector.  The garbage collector manages complex &AS; variables, which are the only ones that are shared by references.  In &app;, these are <command>as_object</command> class instances created by &AS; (i.e. not those created by playhead control: <command>placeobject</command>/<command>removeobject</command>).
> +</para>

I understand this is taken by the wiki, and I did write this, but today
the above information is not exact. In fact, character instances, being subclasses
of as_object are also managed by the garbage collector.

--strk;



From MAILER-DAEMON Thu Aug 16 13:30:56 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ILjBP-00020B-SM
	for mharc-gnash-commit@gnu.org; Thu, 16 Aug 2007 13:30:55 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ILjBN-0001zx-WC
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 13:30:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ILjBL-0001zQ-E1
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 13:30:53 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ILjBL-0001zN-7f
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 13:30:51 -0400
Received: from zimbra.lulu.com ([216.27.62.14])
	by monty-python.gnu.org with smtp (Exim 4.60)
	(envelope-from <mgoldin@lulu.com>) id 1ILjBK-0004Bg-QI
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 13:30:51 -0400
Received: from localhost (localhost.localdomain [127.0.0.1])
	by zimbra.lulu.com (Postfix) with ESMTP id 660D4123466A;
	Thu, 16 Aug 2007 13:30:50 -0400 (EDT)
X-Virus-Scanned: amavisd-new at 
X-Spam-Score: -0.567
Received: from zimbra.lulu.com ([127.0.0.1])
	by localhost (zimbra1.dur.lulu.com [127.0.0.1]) (amavisd-new,
	port 10024)
	with ESMTP id V3irT3VP8b-G; Thu, 16 Aug 2007 13:30:48 -0400 (EDT)
Received: from [172.31.0.4] (75-161-15-84.albq.qwest.net [75.161.15.84])
	by zimbra.lulu.com (Postfix) with ESMTP id 91C911234645;
	Thu, 16 Aug 2007 13:30:47 -0400 (EDT)
In-Reply-To: <46C488A1.3090303@lysator.liu.se>
References: <E1ILgDl-0003LG-7f@cvs.savannah.gnu.org>
	<20070816171849.GC77726@keybit.net>
	<46C488A1.3090303@lysator.liu.se>
Mime-Version: 1.0 (Apple Message framework v752.3)
Content-Type: multipart/alternative; boundary=Apple-Mail-2-672331675
Message-Id: <99C44BF1-0230-4975-A4A7-3DE221AF38CD@lulu.com>
From: Melissa Goldin <mgoldin@lulu.com>
Subject: Re: [Gnash-commit] gnash/doc/C/usermanual introduction.xml
Date: Thu, 16 Aug 2007 11:30:45 -0600
To: Markus Gothe <nietzsche@lysator.liu.se>
X-Mailer: Apple Mail (2.752.3)
X-Detected-Kernel: Linux 2.6, seldom 2.4 (older, 4)
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Aug 2007 17:30:54 -0000


--Apple-Mail-2-672331675
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
	charset=US-ASCII;
	delsp=yes;
	format=flowed

D'Oh! Fixing.


On Aug 16, 2007, at 11:25 AM, Markus Gothe wrote:

> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA256
>
> Indeed, and I think Steinhart spells his name 'Jon'.
>
> strk wrote:
>> On Thu, Aug 16, 2007 at 02:21:09PM +0000, Melissa Goldin wrote:
>>
>>>  <para>
>>> -John Gilmore has also been dedicated to the project from the
> beginning. I have shamelessly plagiarized one of his early  
> announcement
> emails in the early part of this chapter.
>>> +John Steinhart has also been dedicated to the project from the
> beginning. I have shamelessly plagiarized one of his early  
> announcement
> emails in the early part of this chapter.
>>>  </para>
>>
>> I guess Gilmore was the correct one.
>> --strk;
>>
>>
>> _______________________________________________
>> Gnash-commit mailing list
>> Gnash-commit@gnu.org
>> http://lists.gnu.org/mailman/listinfo/gnash-commit
>
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.6 (GNU/Linux)
>
> iD8DBQFGxIig6I0XmJx2NrwRCDt7AKCuknV+p8YXTidY4TmRRBfCcvlCxwCfXi3p
> yvOJYR1pOTRUR5yDeTTJmBQ=
> =el80
> -----END PGP SIGNATURE-----
>

Melissa Goldin
Technical Writer
mgoldin@lulu.com
505.517.0200




--Apple-Mail-2-672331675
Content-Transfer-Encoding: quoted-printable
Content-Type: text/html;
	charset=ISO-8859-1

<HTML><BODY style=3D"word-wrap: break-word; -khtml-nbsp-mode: space; =
-khtml-line-break: after-white-space; ">D'Oh! Fixing.<DIV><BR =
class=3D"khtml-block-placeholder"></DIV><DIV><BR><DIV><DIV>On Aug 16, =
2007, at 11:25 AM, Markus Gothe wrote:</DIV><BR =
class=3D"Apple-interchange-newline"><BLOCKQUOTE type=3D"cite"><DIV =
style=3D"margin-top: 0px; margin-right: 0px; margin-bottom: 0px; =
margin-left: 0px; ">-----BEGIN PGP SIGNED MESSAGE-----</DIV><DIV =
style=3D"margin-top: 0px; margin-right: 0px; margin-bottom: 0px; =
margin-left: 0px; ">Hash: SHA256</DIV><DIV style=3D"margin-top: 0px; =
margin-right: 0px; margin-bottom: 0px; margin-left: 0px; min-height: =
14px; "><BR></DIV><DIV style=3D"margin-top: 0px; margin-right: 0px; =
margin-bottom: 0px; margin-left: 0px; ">Indeed, and I think Steinhart =
spells his name 'Jon'.</DIV><DIV style=3D"margin-top: 0px; margin-right: =
0px; margin-bottom: 0px; margin-left: 0px; min-height: 14px; =
"><BR></DIV><DIV style=3D"margin-top: 0px; margin-right: 0px; =
margin-bottom: 0px; margin-left: 0px; ">strk wrote:</DIV> <BLOCKQUOTE =
type=3D"cite"><DIV style=3D"margin-top: 0px; margin-right: 0px; =
margin-bottom: 0px; margin-left: 0px; ">On Thu, Aug 16, 2007 at =
02:21:09PM +0000, Melissa Goldin wrote:</DIV><DIV style=3D"margin-top: =
0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; =
min-height: 14px; "><BR></DIV> <BLOCKQUOTE type=3D"cite"><DIV =
style=3D"margin-top: 0px; margin-right: 0px; margin-bottom: 0px; =
margin-left: 0px; "><SPAN =
class=3D"Apple-converted-space">=A0</SPAN>&lt;para&gt;</DIV><DIV =
style=3D"margin-top: 0px; margin-right: 0px; margin-bottom: 0px; =
margin-left: 0px; ">-John Gilmore has also been dedicated to the project =
from the</DIV> </BLOCKQUOTE></BLOCKQUOTE><DIV style=3D"margin-top: 0px; =
margin-right: 0px; margin-bottom: 0px; margin-left: 0px; ">beginning. I =
have shamelessly plagiarized one of his early announcement</DIV><DIV =
style=3D"margin-top: 0px; margin-right: 0px; margin-bottom: 0px; =
margin-left: 0px; ">emails in the early part of this chapter.</DIV> =
<BLOCKQUOTE type=3D"cite"><BLOCKQUOTE type=3D"cite"><DIV =
style=3D"margin-top: 0px; margin-right: 0px; margin-bottom: 0px; =
margin-left: 0px; ">+John Steinhart has also been dedicated to the =
project from the</DIV> </BLOCKQUOTE></BLOCKQUOTE><DIV style=3D"margin-top:=
 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; =
">beginning. I have shamelessly plagiarized one of his early =
announcement</DIV><DIV style=3D"margin-top: 0px; margin-right: 0px; =
margin-bottom: 0px; margin-left: 0px; ">emails in the early part of this =
chapter.</DIV> <BLOCKQUOTE type=3D"cite"><BLOCKQUOTE type=3D"cite"><DIV =
style=3D"margin-top: 0px; margin-right: 0px; margin-bottom: 0px; =
margin-left: 0px; "><SPAN =
class=3D"Apple-converted-space">=A0</SPAN>&lt;/para&gt;</DIV> =
</BLOCKQUOTE><DIV style=3D"margin-top: 0px; margin-right: 0px; =
margin-bottom: 0px; margin-left: 0px; min-height: 14px; "><BR></DIV><DIV =
style=3D"margin-top: 0px; margin-right: 0px; margin-bottom: 0px; =
margin-left: 0px; ">I guess Gilmore was the correct one.</DIV><DIV =
style=3D"margin-top: 0px; margin-right: 0px; margin-bottom: 0px; =
margin-left: 0px; ">--strk;</DIV><DIV style=3D"margin-top: 0px; =
margin-right: 0px; margin-bottom: 0px; margin-left: 0px; min-height: =
14px; "><BR></DIV><DIV style=3D"margin-top: 0px; margin-right: 0px; =
margin-bottom: 0px; margin-left: 0px; min-height: 14px; "><BR></DIV><DIV =
style=3D"margin-top: 0px; margin-right: 0px; margin-bottom: 0px; =
margin-left: 0px; =
">_______________________________________________</DIV><DIV =
style=3D"margin-top: 0px; margin-right: 0px; margin-bottom: 0px; =
margin-left: 0px; ">Gnash-commit mailing list</DIV><DIV =
style=3D"margin-top: 0px; margin-right: 0px; margin-bottom: 0px; =
margin-left: 0px; "><A =
href=3D"mailto:Gnash-commit@gnu.org">Gnash-commit@gnu.org</A></DIV><DIV =
style=3D"margin-top: 0px; margin-right: 0px; margin-bottom: 0px; =
margin-left: 0px; "><A =
href=3D"http://lists.gnu.org/mailman/listinfo/gnash-commit">http://lists.g=
nu.org/mailman/listinfo/gnash-commit</A></DIV> </BLOCKQUOTE><DIV =
style=3D"margin-top: 0px; margin-right: 0px; margin-bottom: 0px; =
margin-left: 0px; min-height: 14px; "><BR></DIV><DIV style=3D"margin-top: =
0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; =
">-----BEGIN PGP SIGNATURE-----</DIV><DIV style=3D"margin-top: 0px; =
margin-right: 0px; margin-bottom: 0px; margin-left: 0px; ">Version: =
GnuPG v1.4.6 (GNU/Linux)</DIV><DIV style=3D"margin-top: 0px; =
margin-right: 0px; margin-bottom: 0px; margin-left: 0px; min-height: =
14px; "><BR></DIV><DIV style=3D"margin-top: 0px; margin-right: 0px; =
margin-bottom: 0px; margin-left: 0px; =
">iD8DBQFGxIig6I0XmJx2NrwRCDt7AKCuknV+p8YXTidY4TmRRBfCcvlCxwCfXi3p</DIV><D=
IV style=3D"margin-top: 0px; margin-right: 0px; margin-bottom: 0px; =
margin-left: 0px; ">yvOJYR1pOTRUR5yDeTTJmBQ=3D</DIV><DIV =
style=3D"margin-top: 0px; margin-right: 0px; margin-bottom: 0px; =
margin-left: 0px; ">=3Del80</DIV><DIV style=3D"margin-top: 0px; =
margin-right: 0px; margin-bottom: 0px; margin-left: 0px; ">-----END PGP =
SIGNATURE-----</DIV><DIV style=3D"margin-top: 0px; margin-right: 0px; =
margin-bottom: 0px; margin-left: 0px; min-height: 14px; "><BR></DIV> =
</BLOCKQUOTE></DIV><BR><DIV> <SPAN class=3D"Apple-style-span" =
style=3D"border-collapse: separate; border-spacing: 0px 0px; color: =
rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: =
normal; font-variant: normal; font-weight: normal; letter-spacing: =
normal; line-height: normal; text-align: auto; =
-khtml-text-decorations-in-effect: none; text-indent: 0px; =
-apple-text-size-adjust: auto; text-transform: none; orphans: 2; =
white-space: normal; widows: 2; word-spacing: 0px; "><SPAN =
class=3D"Apple-style-span" style=3D"border-collapse: separate; =
border-spacing: 0px 0px; color: rgb(0, 0, 0); font-family: Helvetica; =
font-size: 12px; font-style: normal; font-variant: normal; font-weight: =
normal; letter-spacing: normal; line-height: normal; text-align: auto; =
-khtml-text-decorations-in-effect: none; text-indent: 0px; =
-apple-text-size-adjust: auto; text-transform: none; orphans: 2; =
white-space: normal; widows: 2; word-spacing: 0px; "><DIV>Melissa =
Goldin</DIV><DIV>Technical Writer</DIV><DIV><A =
href=3D"mailto:mgoldin@lulu.com">mgoldin@lulu.com</A></DIV><DIV>505.517.02=
00</DIV><DIV><BR class=3D"khtml-block-placeholder"></DIV><BR =
class=3D"Apple-interchange-newline"></SPAN></SPAN> =
</DIV><BR></DIV></BODY></HTML>=

--Apple-Mail-2-672331675--



From MAILER-DAEMON Thu Aug 16 13:32:11 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ILjCd-0002JV-8W
	for mharc-gnash-commit@gnu.org; Thu, 16 Aug 2007 13:32:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ILjCb-0002IF-JT
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 13:32:09 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ILjCa-0002Gw-O2
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 13:32:08 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1ILjCa-0002GR-Hp; Thu, 16 Aug 2007 13:32:08 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>)
	id 1ILjCZ-0004NA-M8; Thu, 16 Aug 2007 13:32:08 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l7GHVtv83211;
	Thu, 16 Aug 2007 19:31:55 +0200 (CEST)
	(envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Thu, 16 Aug 2007 19:31:55 +0200
To: Melissa Goldin <mgoldin@lulu.com>, gnash-dev@gnu.org
Subject: Specifications (was: [Gnash-commit] gnash/doc/C gnash.xml)
Message-ID: <20070816173155.GE77726@keybit.net>
Mail-Followup-To: Melissa Goldin <mgoldin@lulu.com>, gnash-dev@gnu.org,
	gnash-commit@gnu.org
References: <E1ILgKY-0003Tc-Qy@cvs.savannah.gnu.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1ILgKY-0003Tc-Qy@cvs.savannah.gnu.org>
X-Detected-Kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: gnash-dev@gnu.org
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Aug 2007 17:32:10 -0000

[ Please keep this discussion in gnash-dev ]

On Thu, Aug 16, 2007 at 02:28:10PM +0000, Melissa Goldin wrote:
> CVSROOT:	/sources/gnash
> Module name:	gnash
> Changes by:	Melissa Goldin <mushi>	07/08/16 14:28:10
> 
> Modified files:
> 	doc/C          : gnash.xml 
> 
> Log message:
> 	Updating to pull in the new 'specification' chapter

Happy to read this :)
I'm waiting for instructions on how to proceed in filing dox that belong
to the "specification".
Do you have a plan for it ?

In my vision there are two kind of specs:
	- Gnash specs (what gnash can do and how it does it)
	- Flash specs (what we would want by a Flash player)

I think Gnash specs and Flash specs might be the same document, with
Gnash specs being a subset of it (ie: every entry in the Flash specs would
contain Gnash-specific behaviours explained), anyway this would likely make
it harder for third parties to help out with it (Benjamin from swfdec, for
example).

Ideas ?

In general, the specs would be divided in :
	- ActionScript syntax (Gnash doesn't have to do with this really)
	- Player API
	- SWF tags

Comments ?

--strk;






From MAILER-DAEMON Thu Aug 16 13:51:39 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ILjVT-0000mw-Dh
	for mharc-gnash-commit@gnu.org; Thu, 16 Aug 2007 13:51:39 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ILjVR-0000m1-Kh
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 13:51:37 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ILjVQ-0000kt-A3
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 13:51:37 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ILjVQ-0000kq-50
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 13:51:36 -0400
Received: from welcomehome.org ([69.15.127.230] helo=darkstar.welcomehome.org)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60)
	(envelope-from <rob@welcomehome.org>) id 1ILjVP-0007xS-48
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 13:51:35 -0400
Received: from deal.welcomehome.org (linksys.welcomehome.org [10.0.1.2])
	by darkstar.welcomehome.org (8.13.8/8.13.8) with ESMTP id
	l7GHpXUh017686; Thu, 16 Aug 2007 11:51:33 -0600
Message-ID: <46C48E9F.1000705@welcomehome.org>
Date: Thu, 16 Aug 2007 11:51:27 -0600
From: Rob Savoye <rob@welcomehome.org>
User-Agent: Thunderbird 2.0.0.5 (X11/20070719)
MIME-Version: 1.0
To: Melissa Goldin <mgoldin@lulu.com>, gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash/doc/C/usermanual introduction.xml
References: <E1ILgDl-0003LG-7f@cvs.savannah.gnu.org>
	<20070816171849.GC77726@keybit.net>
In-Reply-To: <20070816171849.GC77726@keybit.net>
X-Enigmail-Version: 0.95.2
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
X-Detected-Kernel: Linux 2.6 (newer, 3)
Cc: 
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Aug 2007 17:51:38 -0000

strk wrote:

> I guess Gilmore was the correct one.

 Yes, Gilmore is correct.

	- rob -




From MAILER-DAEMON Thu Aug 16 14:10:14 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ILjnS-00073M-Gk
	for mharc-gnash-commit@gnu.org; Thu, 16 Aug 2007 14:10:14 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ILjnR-000737-6S
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 14:10:13 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ILjnP-00072v-Lp
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 14:10:11 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ILjnP-00072s-Gl
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 14:10:11 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1ILjnP-00043e-97
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 14:10:11 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1ILjnN-0004ba-Mo
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 18:10:09 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1ILjnN-0004bX-Fd
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 18:10:09 +0000
To: gnash-commit@gnu.org
Message-Id: <E1ILjnN-0004bX-Fd@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 16 Aug 2007 18:10:09 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog libbase/network.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Aug 2007 18:10:13 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/16 18:10:09

Modified files:
	.              : ChangeLog 
	libbase        : network.cpp 

Log message:
	Patch by Takashi Iwai <tiwai@suse.de>:
	
	        * libbase/network.cpp (Network::createServer): fix a bug making
	          the test for DEFAULTPROTO == "udp" always fail.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4011&r2=1.4012
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/network.cpp?cvsroot=gnash&r1=1.29&r2=1.30

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4011
retrieving revision 1.4012
diff -u -b -r1.4011 -r1.4012
--- ChangeLog	16 Aug 2007 10:31:50 -0000	1.4011
+++ ChangeLog	16 Aug 2007 18:10:08 -0000	1.4012
@@ -1,3 +1,8 @@
+2007-08-16 Takashi Iwai <tiwai@suse.de>
+
+	* libbase/network.cpp (Network::createServer): fix a bug making
+	  the test for DEFAULTPROTO == "udp" always fail.
+
 2007-08-16 Sandro Santilli <strk@keybit.net>
 
 	* server/edit_text_character.{cpp,h}: have a Range2d member to express

Index: libbase/network.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/network.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- libbase/network.cpp	10 Aug 2007 14:06:35 -0000	1.29
+++ libbase/network.cpp	16 Aug 2007 18:10:08 -0000	1.30
@@ -149,7 +149,7 @@
     }
 
     // set protocol type
-    if (DEFAULTPROTO == "udp") {
+    if ( strcmp(DEFAULTPROTO, "udp") == 0) {
         type = SOCK_DGRAM;
     } else {
         type = SOCK_STREAM;



From MAILER-DAEMON Thu Aug 16 14:10:27 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ILjnf-00078F-O4
	for mharc-gnash-commit@gnu.org; Thu, 16 Aug 2007 14:10:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ILjnd-00076N-J1
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 14:10:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ILjnc-00076B-6Y
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 14:10:24 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ILjnc-000768-1M
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 14:10:24 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1ILjnb-00046D-If
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 14:10:23 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1ILjna-0004cN-On
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 18:10:22 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1ILjna-0004cJ-Ji
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 18:10:22 +0000
To: gnash-commit@gnu.org
Message-Id: <E1ILjna-0004cJ-Ji@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 16 Aug 2007 18:10:22 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog libbase/network.cpp [release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Aug 2007 18:10:26 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/16 18:10:22

Modified files:
	.              : ChangeLog 
	libbase        : network.cpp 

Log message:
	Patch by Takashi Iwai <tiwai@suse.de>:
	
	        * libbase/network.cpp (Network::createServer): fix a bug making
	          the test for DEFAULTPROTO == "udp" always fail.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.18&r2=1.3971.2.19
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/network.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.28&r2=1.28.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.18
retrieving revision 1.3971.2.19
diff -u -b -r1.3971.2.18 -r1.3971.2.19
--- ChangeLog	15 Aug 2007 15:02:40 -0000	1.3971.2.18
+++ ChangeLog	16 Aug 2007 18:10:21 -0000	1.3971.2.19
@@ -1,3 +1,8 @@
+2007-08-16 Takashi Iwai <tiwai@suse.de>
+
+	* libbase/network.cpp (Network::createServer): fix a bug making
+	  the test for DEFAULTPROTO == "udp" always fail.
+
 2007-08-15 Tomas Groth Christensen <tomasgroth@yahoo.dk>
 
 	* backend/sound_handler_{sdl,gst}.cpp: Removed primitive

Index: libbase/network.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/network.cpp,v
retrieving revision 1.28
retrieving revision 1.28.2.1
diff -u -b -r1.28 -r1.28.2.1
--- libbase/network.cpp	1 Jul 2007 10:54:09 -0000	1.28
+++ libbase/network.cpp	16 Aug 2007 18:10:22 -0000	1.28.2.1
@@ -149,7 +149,7 @@
     }
 
     // set protocol type
-    if (DEFAULTPROTO == "udp") {
+    if ( strcmp(DEFAULTPROTO, "udp") == 0) {
         type = SOCK_DGRAM;
     } else {
         type = SOCK_STREAM;



From MAILER-DAEMON Thu Aug 16 19:25:58 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ILoj0-0007bk-3K
	for mharc-gnash-commit@gnu.org; Thu, 16 Aug 2007 19:25:58 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ILoiy-0007Xq-Jd
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 19:25:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ILoiy-0007Wv-2K
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 19:25:56 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ILoix-0007WS-S7
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 19:25:55 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1ILoix-00027r-K6
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 19:25:55 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1ILoix-00018X-2m
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 23:25:55 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1ILoiw-00018T-UQ
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 23:25:54 +0000
To: gnash-commit@gnu.org
Message-Id: <E1ILoiw-00018T-UQ@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 16 Aug 2007 23:25:54 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog configure.ac [release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Aug 2007 23:25:56 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/16 23:25:54

Modified files:
	.              : ChangeLog configure.ac 

Log message:
	Patch by  Alfred M. Szmidt  <ams@gnu.org>:
	
	        * configure.ac: State that a <= 2.4 version of AGG is an error.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.19&r2=1.3971.2.20
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.396.2.3&r2=1.396.2.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.19
retrieving revision 1.3971.2.20
diff -u -b -r1.3971.2.19 -r1.3971.2.20
--- ChangeLog	16 Aug 2007 18:10:21 -0000	1.3971.2.19
+++ ChangeLog	16 Aug 2007 23:25:53 -0000	1.3971.2.20
@@ -1,3 +1,7 @@
+2007-08-13  Alfred M. Szmidt  <ams@gnu.org>
+
+	* configure.ac: State that a <= 2.4 version of AGG is an error.
+
 2007-08-16 Takashi Iwai <tiwai@suse.de>
 
 	* libbase/network.cpp (Network::createServer): fix a bug making

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.396.2.3
retrieving revision 1.396.2.4
diff -u -b -r1.396.2.3 -r1.396.2.4
--- configure.ac	11 Aug 2007 01:43:44 -0000	1.396.2.3
+++ configure.ac	16 Aug 2007 23:25:54 -0000	1.396.2.4
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.396.2.3 2007/08/11 01:43:44 strk Exp $
+dnl $Id: configure.ac,v 1.396.2.4 2007/08/16 23:25:54 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, 0.8.1)
@@ -1923,7 +1923,7 @@
   echo "        AGG Pixel format is: $pixelformat"
     if test x"$AGG_LIBS" != x; then # {
       if test x"${agg25}" != xyes; then # {
-        echo "        WARNING: Your installation of AGG appears to be version 2.4 or older."
+        echo "        ERROR: Your installation of AGG appears to be version 2.4 or older."
         echo "                 Please upgrade to AGG 2.5 or greater"
         echo "                 or .deb users: apt-get install libagg-dev"
         echo "                 or .rpm users: yum install agg-devel"



From MAILER-DAEMON Thu Aug 16 19:26:06 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ILoj8-0007tC-8I
	for mharc-gnash-commit@gnu.org; Thu, 16 Aug 2007 19:26:06 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ILoj6-0007oq-Jh
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 19:26:04 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ILoj6-0007nr-4J
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 19:26:04 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ILoj5-0007nZ-QF
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 19:26:03 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1ILoj5-00028h-KE
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 19:26:03 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1ILoj5-000193-2x
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 23:26:03 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1ILoj4-000190-VD
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 23:26:03 +0000
To: gnash-commit@gnu.org
Message-Id: <E1ILoj4-000190-VD@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 16 Aug 2007 23:26:02 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog configure.ac
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Aug 2007 23:26:05 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/16 23:26:02

Modified files:
	.              : ChangeLog configure.ac 

Log message:
	Patch by  Alfred M. Szmidt  <ams@gnu.org>:
	
	        * configure.ac: State that a <= 2.4 version of AGG is an error.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4012&r2=1.4013
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.399&r2=1.400

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4012
retrieving revision 1.4013
diff -u -b -r1.4012 -r1.4013
--- ChangeLog	16 Aug 2007 18:10:08 -0000	1.4012
+++ ChangeLog	16 Aug 2007 23:26:02 -0000	1.4013
@@ -1,3 +1,7 @@
+2007-08-13  Alfred M. Szmidt  <ams@gnu.org>
+
+	* configure.ac: State that a <= 2.4 version of AGG is an error.
+
 2007-08-16 Takashi Iwai <tiwai@suse.de>
 
 	* libbase/network.cpp (Network::createServer): fix a bug making

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.399
retrieving revision 1.400
diff -u -b -r1.399 -r1.400
--- configure.ac	11 Aug 2007 01:44:15 -0000	1.399
+++ configure.ac	16 Aug 2007 23:26:02 -0000	1.400
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.399 2007/08/11 01:44:15 strk Exp $
+dnl $Id: configure.ac,v 1.400 2007/08/16 23:26:02 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -1926,7 +1926,7 @@
   echo "        AGG Pixel format is: $pixelformat"
     if test x"$AGG_LIBS" != x; then # {
       if test x"${agg25}" != xyes; then # {
-        echo "        WARNING: Your installation of AGG appears to be version 2.4 or older."
+        echo "        ERROR: Your installation of AGG appears to be version 2.4 or older."
         echo "                 Please upgrade to AGG 2.5 or greater"
         echo "                 or .deb users: apt-get install libagg-dev"
         echo "                 or .rpm users: yum install agg-devel"



From MAILER-DAEMON Thu Aug 16 23:21:51 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ILsPG-0003Lh-Vn
	for mharc-gnash-commit@gnu.org; Thu, 16 Aug 2007 23:21:50 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ILsPF-0003K1-MC
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 23:21:49 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ILsPE-0003Jg-Vo
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 23:21:49 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ILsPE-0003Ja-Q9
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 23:21:48 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1ILsPE-0000e0-FA
	for gnash-commit@gnu.org; Thu, 16 Aug 2007 23:21:48 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1ILsPD-0007kB-Qb
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 03:21:47 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1ILsPD-0007k7-Im
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 03:21:47 +0000
To: gnash-commit@gnu.org
Message-Id: <E1ILsPD-0007k7-Im@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Fri, 17 Aug 2007 03:21:47 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/as_function.cpp testsuit...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Aug 2007 03:21:50 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/17 03:21:47

Modified files:
	.              : ChangeLog 
	server         : as_function.cpp 
	testsuite/actionscript.all: Inheritance.as 

Log message:
	* server/as_function.cpp: initialize '__proto__' instead of 'constructor'.
	* testsuite/actionscript.all/Inheritance.as: more passes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4013&r2=1.4014
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_function.cpp?cvsroot=gnash&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Inheritance.as?cvsroot=gnash&r1=1.34&r2=1.35

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4013
retrieving revision 1.4014
diff -u -b -r1.4013 -r1.4014
--- ChangeLog	16 Aug 2007 23:26:02 -0000	1.4013
+++ ChangeLog	17 Aug 2007 03:21:46 -0000	1.4014
@@ -1,4 +1,9 @@
-2007-08-13  Alfred M. Szmidt  <ams@gnu.org>
+2007-08-17 Zou Lunkai <zoulunkai@gmail.com>
+	
+	* server/as_function.cpp: initialize '__proto__' instead of 'constructor'.
+	* testsuite/actionscript.all/Inheritance.as: more passes.
+
+2007-08-17  Alfred M. Szmidt  <ams@gnu.org>
 
 	* configure.ac: State that a <= 2.4 version of AGG is an error.
 

Index: server/as_function.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_function.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- server/as_function.cpp	2 Aug 2007 21:14:35 -0000	1.36
+++ server/as_function.cpp	17 Aug 2007 03:21:47 -0000	1.37
@@ -124,7 +124,7 @@
 as_function::extends(as_function& superclass)
 {
 	_properties = new as_object(superclass.getPrototype());
-	_properties->init_member("constructor", &superclass); 
+	_properties->init_member("__proto__", superclass.getPrototype());
 	if ( VM::get().getSWFVersion() > 5 )
 	{
 		_properties->init_member("__constructor__", &superclass); 

Index: testsuite/actionscript.all/Inheritance.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Inheritance.as,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- testsuite/actionscript.all/Inheritance.as	16 Aug 2007 09:29:33 -0000	1.34
+++ testsuite/actionscript.all/Inheritance.as	17 Aug 2007 03:21:47 -0000	1.35
@@ -21,7 +21,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Inheritance.as,v 1.34 2007/08/16 09:29:33 zoulunkai Exp $";
+rcsid="$Id: Inheritance.as,v 1.35 2007/08/17 03:21:47 zoulunkai Exp $";
 
 #include "check.as"
 
@@ -264,7 +264,7 @@
 check_equals(typeof(DerivedClass1.prototype.constructor), 'function');
 check_equals(typeof(DerivedClass1.constructor), 'function');
 #if OUTPUT_VERSION >= 6
-xcheck(DerivedClass1.prototype.hasOwnProperty('__proto__'));
+check(DerivedClass1.prototype.hasOwnProperty('__proto__'));
 check(DerivedClass1.prototype.hasOwnProperty('__constructor__'));
 check(DerivedClass1.prototype.__proto__.hasOwnProperty('var1'));
 
@@ -273,12 +273,12 @@
 check_equals(DerivedClass1.var3, undefined);
 check(! DerivedClass1.prototype.hasOwnProperty('toString'));
 check(! DerivedClass1.prototype.hasOwnProperty('valueOf'));
-xcheck(! DerivedClass1.prototype.hasOwnProperty('constructor'));
+check(! DerivedClass1.prototype.hasOwnProperty('constructor'));
 check(DerivedClass1.hasOwnProperty('constructor'));
 #endif
 check_equals(DerivedClass1.constructor, Function);
 check_equals(DerivedClass1.prototype.__proto__.constructor, BaseClass1);
-//check_equals(DerivedClass1.prototype.constructor, BaseClass1);
+check_equals(DerivedClass1.prototype.__proto__, BaseClass1.prototype);
 
 DerivedClass1.prototype.var2 = "var_in_Derived_prototype";
 var obj = new DerivedClass1;



From MAILER-DAEMON Fri Aug 17 09:12:25 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IM1cn-0007sH-Ca
	for mharc-gnash-commit@gnu.org; Fri, 17 Aug 2007 09:12:25 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IM1cl-0007qV-0O
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 09:12:23 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IM1ch-0007nF-59
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 09:12:19 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IM1ch-0007nA-0e
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 09:12:19 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1IM1cg-00020g-BT
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 09:12:18 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l7HDCER06104;
	Fri, 17 Aug 2007 15:12:14 +0200 (CEST)
	(envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Fri, 17 Aug 2007 15:12:13 +0200
To: Chad Musick <chadmusick@msbx.net>
Subject: Re: [Gnash-commit] gnash/server AS3_OPCODES
Message-ID: <20070817131213.GK84206@keybit.net>
Mail-Followup-To: Chad Musick <chadmusick@msbx.net>, gnash-commit@gnu.org
References: <E1ILgcw-0004zE-2r@cvs.savannah.gnu.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1ILgcw-0004zE-2r@cvs.savannah.gnu.org>
X-Detected-Kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Aug 2007 13:12:23 -0000

On Thu, Aug 16, 2007 at 02:47:10PM +0000, Chad Musick wrote:
> CVSROOT:	/sources/gnash
> Module name:	gnash
> Changes by:	Chad Musick <cmusick>	07/08/16 14:47:10
> 
> Added files:
> 	server         : AS3_OPCODES 
> 
> Log message:
> 	This file contains my current understanding of the opcodes for the new Abc
> 	code blocks in Flash 9+ files.

FYI, Klaus just committed ABC header files in Ming CVS...
We want to use compatible names (Ming defines => gnash enum values).

See gnash/server/swf.h and ming/src/actiontypes.h for current mappings
and ming/src/abctypes.h for ABC ones (to be replicated in Gnash).


--strk;



From MAILER-DAEMON Fri Aug 17 09:39:44 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IM23D-0000zn-U7
	for mharc-gnash-commit@gnu.org; Fri, 17 Aug 2007 09:39:43 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IM23C-0000zf-4Y
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 09:39:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IM236-0000zH-Vb
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 09:39:40 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IM236-0000zE-OA
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 09:39:36 -0400
Received: from g78.mailsnare.net ([209.236.228.78] helo=mail.mailsnare.net)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <chadmusick@msbx.net>) id 1IM236-0007kO-Ef
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 09:39:36 -0400
X-Virus-Scanned: by ClamAV at mailsnare.net
X-Message-ID: 00ff702db0dc1113dba21d7ff9204a39d6a357911d59be81
Received: from [192.168.1.100] (unknown [222.229.211.188])
	by mail.mailsnare.net (Postfix) with ESMTP id AEB3B7A853;
	Fri, 17 Aug 2007 13:39:30 +0000 (UTC)
Subject: Re: [Gnash-commit] gnash/server AS3_OPCODES
From: Chad Musick <chadmusick@msbx.net>
To: strk <strk@keybit.net>
In-Reply-To: <20070817131213.GK84206@keybit.net>
References: <E1ILgcw-0004zE-2r@cvs.savannah.gnu.org>
	<20070817131213.GK84206@keybit.net>
Content-Type: text/plain
Date: Fri, 17 Aug 2007 22:39:34 +0900
Message-Id: <1187357974.6191.64.camel@ubuntu.sys76.lan>
Mime-Version: 1.0
X-Mailer: Evolution 2.10.1 
Content-Transfer-Encoding: 7bit
X-Detected-Kernel: Linux 2.6 (newer, 3)
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Aug 2007 13:39:42 -0000

Thanks Strk,

I'll take care of this next week -- glad to know it.

Chad
> FYI, Klaus just committed ABC header files in Ming CVS...
> We want to use compatible names (Ming defines => gnash enum values).
> 
> See gnash/server/swf.h and ming/src/actiontypes.h for current mappings
> and ming/src/abctypes.h for ABC ones (to be replicated in Gnash).
> 
> 
> --strk;




From MAILER-DAEMON Fri Aug 17 09:57:41 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IM2Kb-0006Cm-6S
	for mharc-gnash-commit@gnu.org; Fri, 17 Aug 2007 09:57:41 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IM2KZ-00069g-VD
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 09:57:40 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IM2KZ-00067H-2n
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 09:57:39 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IM2KY-00066b-OX
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 09:57:38 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IM2KY-0003N7-6u
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 09:57:38 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IM2KX-0008Vy-1w
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 13:57:37 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IM2KW-0008Vv-Ta
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 13:57:36 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IM2KW-0008Vv-Ta@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 17 Aug 2007 13:57:36 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog plugin/plugin.cpp server/vm/VM.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Aug 2007 13:57:40 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/17 13:57:36

Modified files:
	.              : ChangeLog 
	plugin         : plugin.cpp 
	server/vm      : VM.cpp 

Log message:
	Patch #6151 by Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>:
	
	        * server/vm/VM.cpp (getPlayerVersion): define FLASH_VERSION as
	          a compatibility version for use by $version or
	          System.capabilities.version based version detection kits.
	          (TODO items added for a cleaner handling of this).
	        * plugin/plugin.cpp: define FLASH_VERSION as a compatibility version
	          for use by javascript-based flash version detection kits.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4014&r2=1.4015
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/plugin.cpp?cvsroot=gnash&r1=1.81&r2=1.82
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/VM.cpp?cvsroot=gnash&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4014
retrieving revision 1.4015
diff -u -b -r1.4014 -r1.4015
--- ChangeLog	17 Aug 2007 03:21:46 -0000	1.4014
+++ ChangeLog	17 Aug 2007 13:57:36 -0000	1.4015
@@ -1,3 +1,12 @@
+2007-08-17 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
+
+	* server/vm/VM.cpp (getPlayerVersion): define FLASH_VERSION as
+	  a compatibility version for use by $version or
+	  System.capabilities.version based version detection kits.
+	  (TODO items added for a cleaner handling of this).
+	* plugin/plugin.cpp: define FLASH_VERSION as a compatibility version
+	  for use by javascript-based flash version detection kits.
+
 2007-08-17 Zou Lunkai <zoulunkai@gmail.com>
 	
 	* server/as_function.cpp: initialize '__proto__' instead of 'constructor'.

Index: plugin/plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/plugin.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- plugin/plugin.cpp	8 Aug 2007 20:51:39 -0000	1.81
+++ plugin/plugin.cpp	17 Aug 2007 13:57:36 -0000	1.82
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: plugin.cpp,v 1.81 2007/08/08 20:51:39 strk Exp $ */
+/* $Id: plugin.cpp,v 1.82 2007/08/17 13:57:36 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -27,15 +27,22 @@
 #define PLUGIN_NAME     "Shockwave Flash"
 #define MIME_TYPES_DESCRIPTION  MIME_TYPES_HANDLED":swf:"PLUGIN_NAME
 
+//Some javascript plugin detectors use the description
+//to decide the flash version to display. They expect the
+//form (major version).(minor version) r(revision).
+#define FLASH_VERSION "8.0 r99."
+
 #define PLUGIN_DESCRIPTION \
-  "Shockwave Flash 8.0 - Gnash " VERSION ", the GNU Flash Player. Copyright   \
-  &copy; 2006 <a href=\"http://www.fsf.org\">Free Software Foundation</a>,    \
-  Inc.<br> Gnash comes with NO WARRANTY, to the extent permitted by law.  You \
-  may redistribute copies of Gnash under the terms of the                     \
-  <a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public License \
-  </a>. For more information about Gnash, see <a \
+  "Shockwave Flash "FLASH_VERSION" Gnash "VERSION", the GNU Flash Player. \
+  Copyright &copy; 2006 <a href=\"http://www.fsf.org\">Free Software \
+  Foundation</a>, Inc. <br> \
+  Gnash comes with NO WARRANTY, to the extent permitted by law. \
+  You may redistribute copies of Gnash under the terms of the \
+  <a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public \
+  License</a>. For more information about Gnash, see <a \
   href=\"http://www.gnu.org/software/gnash/\"> \
-  http://www.gnu.org/software/gnash</a>. Compatible Shockwave Flash 8.0 r99."
+  http://www.gnu.org/software/gnash</a>. \
+  Compatible Shockwave Flash "FLASH_VERSION
 
 #include <sys/param.h>
 #include "plugin.h" //Fixes Warning on redef of MIN/MAX

Index: server/vm/VM.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/VM.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/vm/VM.cpp	1 Aug 2007 15:56:54 -0000	1.12
+++ server/vm/VM.cpp	17 Aug 2007 13:57:36 -0000	1.13
@@ -16,7 +16,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: VM.cpp,v 1.12 2007/08/01 15:56:54 strk Exp $ */
+/* $Id: VM.cpp,v 1.13 2007/08/17 13:57:36 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -104,11 +104,16 @@
 const std::string&
 VM::getPlayerVersion() const
 {
-	// TODO: find a "compatible" representation so that
-	//       player version checkers (javascript or similar)
-	//       will accept Gnash as a working player.
+	// Expected Form: UNIX|WIN|WINCE|MAC (major version),(minor version),(revision),0
+	//    Used in _ActionScript_ version detection, not Javascript
+	//    ActionScript detection often looks for the commas, so
+	//    the last ,0 is necessary, even if it doesn't appear
+	//    to mean anything.
 	//       
-	static const std::string version("Gnash-" VERSION);
+	// TODO: use config.h for the default, query RcInit file for an override
+	//
+#define FLASH_VERSION "GSH 8,0,99,0"
+	static const std::string version(FLASH_VERSION);
 	return version;
 }
 



From MAILER-DAEMON Fri Aug 17 10:02:44 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IM2PU-0002BO-EU
	for mharc-gnash-commit@gnu.org; Fri, 17 Aug 2007 10:02:44 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IM2PS-00028P-W7
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 10:02:43 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IM2PS-00026t-0q
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 10:02:42 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IM2PR-00026i-UT
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 10:02:41 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IM2PR-0004YK-Bb
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 10:02:41 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IM2PQ-0000I3-Uq
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 14:02:41 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IM2PQ-0000I0-OT
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 14:02:40 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IM2PQ-0000I0-OT@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 17 Aug 2007 14:02:40 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog plugin/plugin.cpp server/vm/VM.cpp
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Aug 2007 14:02:43 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/17 14:02:40

Modified files:
	.              : ChangeLog 
	plugin         : plugin.cpp 
	server/vm      : VM.cpp 

Log message:
	Patch #6151 by Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>:
	
	        * server/vm/VM.cpp (getPlayerVersion): define FLASH_VERSION as
	          a compatibility version for use by $version or
	          System.capabilities.version based version detection kits.
	          (TODO items added for a cleaner handling of this).
	        * plugin/plugin.cpp: define FLASH_VERSION as a compatibility version
	          for use by javascript-based flash version detection kits.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.20&r2=1.3971.2.21
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/plugin.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.81&r2=1.81.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/VM.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.12&r2=1.12.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.20
retrieving revision 1.3971.2.21
diff -u -b -r1.3971.2.20 -r1.3971.2.21
--- ChangeLog	16 Aug 2007 23:25:53 -0000	1.3971.2.20
+++ ChangeLog	17 Aug 2007 14:02:38 -0000	1.3971.2.21
@@ -1,3 +1,12 @@
+2007-08-17 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
+
+	* server/vm/VM.cpp (getPlayerVersion): define FLASH_VERSION as
+	  a compatibility version for use by $version or
+	  System.capabilities.version based version detection kits.
+	  (TODO items added for a cleaner handling of this).
+	* plugin/plugin.cpp: define FLASH_VERSION as a compatibility version
+	  for use by javascript-based flash version detection kits.
+
 2007-08-13  Alfred M. Szmidt  <ams@gnu.org>
 
 	* configure.ac: State that a <= 2.4 version of AGG is an error.

Index: plugin/plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/plugin.cpp,v
retrieving revision 1.81
retrieving revision 1.81.2.1
diff -u -b -r1.81 -r1.81.2.1
--- plugin/plugin.cpp	8 Aug 2007 20:51:39 -0000	1.81
+++ plugin/plugin.cpp	17 Aug 2007 14:02:39 -0000	1.81.2.1
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: plugin.cpp,v 1.81 2007/08/08 20:51:39 strk Exp $ */
+/* $Id: plugin.cpp,v 1.81.2.1 2007/08/17 14:02:39 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -27,15 +27,22 @@
 #define PLUGIN_NAME     "Shockwave Flash"
 #define MIME_TYPES_DESCRIPTION  MIME_TYPES_HANDLED":swf:"PLUGIN_NAME
 
+//Some javascript plugin detectors use the description
+//to decide the flash version to display. They expect the
+//form (major version).(minor version) r(revision).
+#define FLASH_VERSION "8.0 r99."
+
 #define PLUGIN_DESCRIPTION \
-  "Shockwave Flash 8.0 - Gnash " VERSION ", the GNU Flash Player. Copyright   \
-  &copy; 2006 <a href=\"http://www.fsf.org\">Free Software Foundation</a>,    \
-  Inc.<br> Gnash comes with NO WARRANTY, to the extent permitted by law.  You \
-  may redistribute copies of Gnash under the terms of the                     \
-  <a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public License \
-  </a>. For more information about Gnash, see <a \
+  "Shockwave Flash "FLASH_VERSION" Gnash "VERSION", the GNU Flash Player. \
+  Copyright &copy; 2006 <a href=\"http://www.fsf.org\">Free Software \
+  Foundation</a>, Inc. <br> \
+  Gnash comes with NO WARRANTY, to the extent permitted by law. \
+  You may redistribute copies of Gnash under the terms of the \
+  <a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public \
+  License</a>. For more information about Gnash, see <a \
   href=\"http://www.gnu.org/software/gnash/\"> \
-  http://www.gnu.org/software/gnash</a>. Compatible Shockwave Flash 8.0 r99."
+  http://www.gnu.org/software/gnash</a>. \
+  Compatible Shockwave Flash "FLASH_VERSION
 
 #include <sys/param.h>
 #include "plugin.h" //Fixes Warning on redef of MIN/MAX

Index: server/vm/VM.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/VM.cpp,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -b -r1.12 -r1.12.2.1
--- server/vm/VM.cpp	1 Aug 2007 15:56:54 -0000	1.12
+++ server/vm/VM.cpp	17 Aug 2007 14:02:40 -0000	1.12.2.1
@@ -16,7 +16,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: VM.cpp,v 1.12 2007/08/01 15:56:54 strk Exp $ */
+/* $Id: VM.cpp,v 1.12.2.1 2007/08/17 14:02:40 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -104,11 +104,16 @@
 const std::string&
 VM::getPlayerVersion() const
 {
-	// TODO: find a "compatible" representation so that
-	//       player version checkers (javascript or similar)
-	//       will accept Gnash as a working player.
+	// Expected Form: UNIX|WIN|WINCE|MAC (major version),(minor version),(revision),0
+	//    Used in _ActionScript_ version detection, not Javascript
+	//    ActionScript detection often looks for the commas, so
+	//    the last ,0 is necessary, even if it doesn't appear
+	//    to mean anything.
 	//       
-	static const std::string version("Gnash-" VERSION);
+	// TODO: use config.h for the default, query RcInit file for an override
+	//
+#define FLASH_VERSION "GSH 8,0,99,0"
+	static const std::string version(FLASH_VERSION);
 	return version;
 }
 



From MAILER-DAEMON Fri Aug 17 10:08:45 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IM2VJ-0007Gq-5V
	for mharc-gnash-commit@gnu.org; Fri, 17 Aug 2007 10:08:45 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IM2VH-0007GI-Rr
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 10:08:43 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IM2VG-0007Fn-OF
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 10:08:43 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IM2VG-0007Fi-Ic
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 10:08:42 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IM2VG-00067i-8p
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 10:08:42 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IM2VF-0000Ou-89
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 14:08:41 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IM2VF-0000Oq-3E
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 14:08:41 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IM2VF-0000Oq-3E@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 17 Aug 2007 14:08:41 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog NEWS [release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Aug 2007 14:08:44 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/17 14:08:41

Modified files:
	.              : ChangeLog NEWS 

Log message:
	        * NEWS: Better support for flash player detection

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.21&r2=1.3971.2.22
http://cvs.savannah.gnu.org/viewcvs/gnash/NEWS?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.4.6.1&r2=1.4.6.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.21
retrieving revision 1.3971.2.22
diff -u -b -r1.3971.2.21 -r1.3971.2.22
--- ChangeLog	17 Aug 2007 14:02:38 -0000	1.3971.2.21
+++ ChangeLog	17 Aug 2007 14:08:40 -0000	1.3971.2.22
@@ -1,3 +1,7 @@
+2007-08-17 Sandro Santilli <strk@keybit.net>
+
+	* NEWS: Better support for flash player detection
+
 2007-08-17 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
 
 	* server/vm/VM.cpp (getPlayerVersion): define FLASH_VERSION as

Index: NEWS
===================================================================
RCS file: /sources/gnash/gnash/NEWS,v
retrieving revision 1.4.6.1
retrieving revision 1.4.6.2
diff -u -b -r1.4.6.1 -r1.4.6.2
--- NEWS	9 Aug 2007 14:52:42 -0000	1.4.6.1
+++ NEWS	17 Aug 2007 14:08:40 -0000	1.4.6.2
@@ -15,6 +15,7 @@
 	- Layout change : we'll now build <gui>-gnash and 'gnash' is a shell
 	  script with gui selection capabilities (-G)
 	- More robust parser 
+	- Better support for flash player detection
 
 07-06-XX  Rob Savoye  <rob@darkstar.welcomehome.org>
 



From MAILER-DAEMON Fri Aug 17 14:02:49 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IM69p-0001zv-3w
	for mharc-gnash-commit@gnu.org; Fri, 17 Aug 2007 14:02:49 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IM69n-0001yz-At
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 14:02:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IM69l-0001xb-04
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 14:02:46 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IM69k-0001xU-Rw
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 14:02:44 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IM69j-0004q2-SC
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 14:02:44 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IM69c-0007kL-FK
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 18:02:36 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IM69c-0007kI-Ba
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 18:02:36 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IM69c-0007kI-Ba@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 17 Aug 2007 18:02:36 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/sprite_instance.cpp test...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Aug 2007 18:02:47 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/17 18:02:36

Modified files:
	.              : ChangeLog 
	server         : sprite_instance.cpp 
	testsuite/misc-ming.all: FlashVarsTest.as FlashVarsTest.html 
	                         Makefile.am 

Log message:
	        * server/sprite_instance.cpp (setVariables):
	          Convert variable names to lowercase when needed.
	        * testsuite/misc-ming.all/: Makefile.am, FlashVarsTest.{as,html}:
	          Test that parameter names are converted to lowercase when target
	          SWF is < 7.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4015&r2=1.4016
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.308&r2=1.309
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/FlashVarsTest.as?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/FlashVarsTest.html?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.146&r2=1.147

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4015
retrieving revision 1.4016
diff -u -b -r1.4015 -r1.4016
--- ChangeLog	17 Aug 2007 13:57:36 -0000	1.4015
+++ ChangeLog	17 Aug 2007 18:02:35 -0000	1.4016
@@ -1,3 +1,11 @@
+2007-08-17 Sandro Santilli <strk@keybit.net>
+
+	* server/sprite_instance.cpp (setVariables):
+	  Convert variable names to lowercase when needed.
+	* testsuite/misc-ming.all/: Makefile.am, FlashVarsTest.{as,html}:
+	  Test that parameter names are converted to lowercase when target
+	  SWF is < 7.
+
 2007-08-17 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
 
 	* server/vm/VM.cpp (getPlayerVersion): define FLASH_VERSION as

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -b -r1.308 -r1.309
--- server/sprite_instance.cpp	13 Aug 2007 07:20:09 -0000	1.308
+++ server/sprite_instance.cpp	17 Aug 2007 18:02:35 -0000	1.309
@@ -3563,7 +3563,7 @@
 	{
 		const string& name = it->first;
 		const string& val = it->second;
-		set_member(name, val.c_str());
+		set_member(PROPNAME(name), val.c_str());
 	}
 }
 

Index: testsuite/misc-ming.all/FlashVarsTest.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/FlashVarsTest.as,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- testsuite/misc-ming.all/FlashVarsTest.as	26 Jul 2007 03:41:21 -0000	1.3
+++ testsuite/misc-ming.all/FlashVarsTest.as	17 Aug 2007 18:02:36 -0000	1.4
@@ -19,8 +19,8 @@
 // and url querystring.
 //
 // execute the movie by passing:
-//	QueryString="?a=a_in_qstring&q=q_in_qstring"
-//	FlashVars="?a=a_in_fvars&q=q_in_fvars"
+//	QueryString="?a=a_in_qstring&q=q_in_qstring&MixCaseQstr=mixQstr"
+//	FlashVars="?a=a_in_fvars&q=q_in_fvars&MixCaseFvars=mixFvars"
 //
 // QueryString is what appears embedded in the url,
 // FlashVars can be given as an attribute of the <embed> tag
@@ -28,7 +28,8 @@
 //
 // Example:
 //
-// gnash -P "FlashVars=?a=a_in_fvars&v=v_in_fvars" "FlashParamTest.swf?a=a_in_qstring&q=q_in_qstring"
+// gnash -P "FlashVars=?a=a_in_fvars&v=v_in_fvars&MixCaseFvars=mixFvars"  
+//	"FlashParamTest.swf?a=a_in_qstring&q=q_in_qstring&MixCaseQstr=mixQst"
 //
 // See FlashVarsTest.html for a way to test with a plugin
 //
@@ -51,4 +52,18 @@
 check(_root.hasOwnProperty('v'));
 check_equals(_root.v, "v_in_fvars");
 
+#if OUTPUT_VERSION < 7
+	// The following tests assume target SWF version is < 7
+	check_equals(_root.mixcaseqstr, "mixQstr");
+	check_equals(_root.mixcasefvars, "mixFvars");
+#else // OUTPUT_VERSION >= 7
+	// This is currently not used, would need a bit of work
+	// in the Makefile.am to be used
+	// (build both v6 and v7 versions of this test)
+	check_equals(typeof(_root.mixcaseqstr), "undefined");
+	check_equals(typeof(_root.mixcasefvars), "undefined");
+	check_equals(_root.MixCaseQstr, "mixQstr");
+	check_equals(_root.MixCaseFvars, "mixFvars");
+#endif // OUTPUT_VERSION >= 7
+
 totals();

Index: testsuite/misc-ming.all/FlashVarsTest.html
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/FlashVarsTest.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/misc-ming.all/FlashVarsTest.html	28 Mar 2007 10:52:34 -0000	1.1
+++ testsuite/misc-ming.all/FlashVarsTest.html	17 Aug 2007 18:02:36 -0000	1.2
@@ -7,5 +7,7 @@
 
 -->
 
-<embed type="application/x-shockwave-flash" src="FlashVarsTest.swf?a=a_in_qstring&q=q_in_qstring" FlashVars="&a=a_in_fvars&v=v_in_fvars"
+<embed type="application/x-shockwave-flash"
+ src="FlashVarsTest.swf?a=a_in_qstring&q=q_in_qstring&MixCaseQstr=mixQstr"
+ FlashVars="&a=a_in_fvars&v=v_in_fvars&MixCaseFvars=mixFvars"
  height="600" width="800">

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -b -r1.146 -r1.147
--- testsuite/misc-ming.all/Makefile.am	16 Aug 2007 06:09:14 -0000	1.146
+++ testsuite/misc-ming.all/Makefile.am	17 Aug 2007 18:02:36 -0000	1.147
@@ -1402,9 +1402,9 @@
 
 # This will only work with Ming-0.4.0beta2 (support for prebuilt clips inclusion)
 FlashVarsTest.swf: Dejagnu.swf $(srcdir)/FlashVarsTest.as 
-	$(MAKESWF) -o $@ Dejagnu.swf $(srcdir)/FlashVarsTest.as
+	$(MAKESWF) -DOUTPUT_VERSION=6 -v6 -o $@ Dejagnu.swf $(srcdir)/FlashVarsTest.as
 FlashVarsTest-Runner: $(srcdir)/../generic-testrunner.sh FlashVarsTest.swf
-	echo "$(top_builddir)/gui/gnash -1 -r0 -v -P 'FlashVars=?a=a_in_fvars&v=v_in_fvars' 'FlashVarsTest.swf?a=a_in_qstring&q=q_in_qstring'" > $@
+	echo "$(top_builddir)/gui/gnash -1 -r0 -v -P 'FlashVars=?a=a_in_fvars&v=v_in_fvars&MixCaseFvars=mixFvars' 'FlashVarsTest.swf?a=a_in_qstring&q=q_in_qstring&MixCaseQstr=mixQstr'" > $@
 	chmod 755 $@
 
 init_action_test_SOURCES =	\



From MAILER-DAEMON Fri Aug 17 14:19:03 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IM6PX-0003HE-ON
	for mharc-gnash-commit@gnu.org; Fri, 17 Aug 2007 14:19:03 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IM6PW-0003EQ-9h
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 14:19:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IM6PU-0003CG-NN
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 14:19:01 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IM6PU-0003By-Dv
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 14:19:00 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IM6PU-0008VC-8C
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 14:19:00 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IM6PS-0001Fc-M9
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 18:18:58 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IM6PS-0001FX-6t
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 18:18:58 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IM6PS-0001FX-6t@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 17 Aug 2007 18:18:58 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/sprite_instance.cpp test...
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Aug 2007 18:19:02 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/17 18:18:58

Modified files:
	.              : ChangeLog 
	server         : sprite_instance.cpp 
	testsuite/misc-ming.all: FlashVarsTest.as FlashVarsTest.html 
	                         Makefile.am 

Log message:
	 * server/sprite_instance.cpp (setVariables):
	   Convert variable names to lowercase when needed.
	 * testsuite/misc-ming.all/: Makefile.am, FlashVarsTest.{as,html}:
	   Test that parameter names are converted to lowercase when target
	   SWF is < 7.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.22&r2=1.3971.2.23
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.306&r2=1.306.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/FlashVarsTest.as?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3&r2=1.3.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/FlashVarsTest.html?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.1&r2=1.1.6.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.145&r2=1.145.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.22
retrieving revision 1.3971.2.23
diff -u -b -r1.3971.2.22 -r1.3971.2.23
--- ChangeLog	17 Aug 2007 14:08:40 -0000	1.3971.2.22
+++ ChangeLog	17 Aug 2007 18:18:56 -0000	1.3971.2.23
@@ -1,5 +1,13 @@
 2007-08-17 Sandro Santilli <strk@keybit.net>
 
+	* server/sprite_instance.cpp (setVariables):
+	  Convert variable names to lowercase when needed.
+	* testsuite/misc-ming.all/: Makefile.am, FlashVarsTest.{as,html}:
+	  Test that parameter names are converted to lowercase when target
+	  SWF is < 7.
+
+2007-08-17 Sandro Santilli <strk@keybit.net>
+
 	* NEWS: Better support for flash player detection
 
 2007-08-17 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.306
retrieving revision 1.306.2.1
diff -u -b -r1.306 -r1.306.2.1
--- server/sprite_instance.cpp	8 Aug 2007 20:08:58 -0000	1.306
+++ server/sprite_instance.cpp	17 Aug 2007 18:18:57 -0000	1.306.2.1
@@ -3828,7 +3828,7 @@
 	{
 		const string& name = it->first;
 		const string& val = it->second;
-		set_member(name, val.c_str());
+		set_member(PROPNAME(name), val.c_str());
 	}
 }
 

Index: testsuite/misc-ming.all/FlashVarsTest.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/FlashVarsTest.as,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -b -r1.3 -r1.3.2.1
--- testsuite/misc-ming.all/FlashVarsTest.as	26 Jul 2007 03:41:21 -0000	1.3
+++ testsuite/misc-ming.all/FlashVarsTest.as	17 Aug 2007 18:18:57 -0000	1.3.2.1
@@ -19,8 +19,8 @@
 // and url querystring.
 //
 // execute the movie by passing:
-//	QueryString="?a=a_in_qstring&q=q_in_qstring"
-//	FlashVars="?a=a_in_fvars&q=q_in_fvars"
+//	QueryString="?a=a_in_qstring&q=q_in_qstring&MixCaseQstr=mixQstr"
+//	FlashVars="?a=a_in_fvars&q=q_in_fvars&MixCaseFvars=mixFvars"
 //
 // QueryString is what appears embedded in the url,
 // FlashVars can be given as an attribute of the <embed> tag
@@ -28,7 +28,8 @@
 //
 // Example:
 //
-// gnash -P "FlashVars=?a=a_in_fvars&v=v_in_fvars" "FlashParamTest.swf?a=a_in_qstring&q=q_in_qstring"
+// gnash -P "FlashVars=?a=a_in_fvars&v=v_in_fvars&MixCaseFvars=mixFvars"  
+//	"FlashParamTest.swf?a=a_in_qstring&q=q_in_qstring&MixCaseQstr=mixQst"
 //
 // See FlashVarsTest.html for a way to test with a plugin
 //
@@ -51,4 +52,18 @@
 check(_root.hasOwnProperty('v'));
 check_equals(_root.v, "v_in_fvars");
 
+#if OUTPUT_VERSION < 7
+	// The following tests assume target SWF version is < 7
+	check_equals(_root.mixcaseqstr, "mixQstr");
+	check_equals(_root.mixcasefvars, "mixFvars");
+#else // OUTPUT_VERSION >= 7
+	// This is currently not used, would need a bit of work
+	// in the Makefile.am to be used
+	// (build both v6 and v7 versions of this test)
+	check_equals(typeof(_root.mixcaseqstr), "undefined");
+	check_equals(typeof(_root.mixcasefvars), "undefined");
+	check_equals(_root.MixCaseQstr, "mixQstr");
+	check_equals(_root.MixCaseFvars, "mixFvars");
+#endif // OUTPUT_VERSION >= 7
+
 totals();

Index: testsuite/misc-ming.all/FlashVarsTest.html
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/FlashVarsTest.html,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -u -b -r1.1 -r1.1.6.1
--- testsuite/misc-ming.all/FlashVarsTest.html	28 Mar 2007 10:52:34 -0000	1.1
+++ testsuite/misc-ming.all/FlashVarsTest.html	17 Aug 2007 18:18:57 -0000	1.1.6.1
@@ -7,5 +7,7 @@
 
 -->
 
-<embed type="application/x-shockwave-flash" src="FlashVarsTest.swf?a=a_in_qstring&q=q_in_qstring" FlashVars="&a=a_in_fvars&v=v_in_fvars"
+<embed type="application/x-shockwave-flash"
+ src="FlashVarsTest.swf?a=a_in_qstring&q=q_in_qstring&MixCaseQstr=mixQstr"
+ FlashVars="&a=a_in_fvars&v=v_in_fvars&MixCaseFvars=mixFvars"
  height="600" width="800">

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.145
retrieving revision 1.145.2.1
diff -u -b -r1.145 -r1.145.2.1
--- testsuite/misc-ming.all/Makefile.am	31 Jul 2007 04:01:33 -0000	1.145
+++ testsuite/misc-ming.all/Makefile.am	17 Aug 2007 18:18:57 -0000	1.145.2.1
@@ -1388,9 +1388,9 @@
 
 # This will only work with Ming-0.4.0beta2 (support for prebuilt clips inclusion)
 FlashVarsTest.swf: Dejagnu.swf $(srcdir)/FlashVarsTest.as 
-	$(MAKESWF) -o $@ Dejagnu.swf $(srcdir)/FlashVarsTest.as
+	$(MAKESWF) -DOUTPUT_VERSION=6 -v6 -o $@ Dejagnu.swf $(srcdir)/FlashVarsTest.as
 FlashVarsTest-Runner: $(srcdir)/../generic-testrunner.sh FlashVarsTest.swf
-	echo "$(top_builddir)/gui/gnash -1 -r0 -v -P 'FlashVars=?a=a_in_fvars&v=v_in_fvars' 'FlashVarsTest.swf?a=a_in_qstring&q=q_in_qstring'" > $@
+	echo "$(top_builddir)/gui/gnash -1 -r0 -v -P 'FlashVars=?a=a_in_fvars&v=v_in_fvars&MixCaseFvars=mixFvars' 'FlashVarsTest.swf?a=a_in_qstring&q=q_in_qstring&MixCaseQstr=mixQstr'" > $@
 	chmod 755 $@
 
 init_action_test_SOURCES =	\



From MAILER-DAEMON Fri Aug 17 22:54:27 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMESJ-0006OW-4Q
	for mharc-gnash-commit@gnu.org; Fri, 17 Aug 2007 22:54:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMESH-0006OD-RD
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 22:54:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMESG-0006O1-WA
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 22:54:25 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMESG-0006Ny-Qh
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 22:54:24 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMESG-0004F9-Fs
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 22:54:24 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMES8-0000eY-SH
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 02:54:16 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMES8-0000eV-NW
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 02:54:16 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMES8-0000eV-NW@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 18 Aug 2007 02:54:16 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog macros/firefox.m4 plugin/Makefi...
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2007 02:54:25 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/18 02:54:16

Modified files:
	.              : ChangeLog 
	macros         : firefox.m4 
	plugin         : Makefile.am 
	plugin/klash   : Makefile.am 

Log message:
	        * macros/firefox.m4: drop --with-gnashexe and GNASHEXE macro
	        * plugin/Makefile.am: define GNASHBINDIR based on ${bindir}
	        * plugin/klash/Makefile.am: define GNASHBINDIR based on ${bindir}

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.23&r2=1.3971.2.24
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/firefox.m4?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.25&r2=1.25.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/Makefile.am?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.63&r2=1.63.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/Makefile.am?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.34&r2=1.34.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.23
retrieving revision 1.3971.2.24
diff -u -b -r1.3971.2.23 -r1.3971.2.24
--- ChangeLog	17 Aug 2007 18:18:56 -0000	1.3971.2.23
+++ ChangeLog	18 Aug 2007 02:54:15 -0000	1.3971.2.24
@@ -1,3 +1,9 @@
+2007-08-18 Sandro Santilli <strk@keybit.net>
+
+	* macros/firefox.m4: drop --with-gnashexe and GNASHEXE macro
+	* plugin/Makefile.am: define GNASHBINDIR based on ${bindir}
+	* plugin/klash/Makefile.am: define GNASHBINDIR based on ${bindir}
+
 2007-08-17 Sandro Santilli <strk@keybit.net>
 
 	* server/sprite_instance.cpp (setVariables):

Index: macros/firefox.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/firefox.m4,v
retrieving revision 1.25
retrieving revision 1.25.2.1
diff -u -b -r1.25 -r1.25.2.1
--- macros/firefox.m4	3 Aug 2007 03:01:16 -0000	1.25
+++ macros/firefox.m4	18 Aug 2007 02:54:16 -0000	1.25.2.1
@@ -41,19 +41,20 @@
       [FIREFOX_PLUGINS=$withval]
     )
 
-    dnl Allow setting a path for the Gnash executable to be different from the prefix. This
-    dnl is mostly only used for cross compiling.
-    AC_ARG_WITH(gnashexe, AC_HELP_STRING([--with-gnashexe=DIR], [Directory to where the gnash executable is]),
-      [gnashbindir=$withval]
-    )
+dnl     dnl Allow setting a path for the Gnash executable to be different from the prefix. This
+dnl     dnl is mostly only used for cross compiling.
+dnl     AC_ARG_WITH(gnashexe, AC_HELP_STRING([--with-gnashexe=DIR], [Directory to where the gnash executable is]),
+dnl       [gnashbindir=$withval]
+dnl     )
+dnl 
+dnl     dnl default to the prefix if no path is specified. As $prefix isn't set at this time by
+dnl     dnl configure, we set this to the variable itself so it gets resolved at make time.
+dnl     if test x"${gnashbindir}" = "x" ; then
+dnl       GNASHEXE="\${prefix}/bin"
+dnl     else
+dnl       GNASHEXE=${gnashbindir}
+dnl     fi
 
-    dnl default to the prefix if no path is specified. As $prefix isn't set at this time by
-    dnl configure, we set this to the variable itself so it gets resolved at make time.
-    if test x"${gnashbindir}" = "x" ; then
-      GNASHEXE="\${prefix}/bin"
-    else
-      GNASHEXE=${gnashbindir}
-    fi
     dnl Always install the plugin in the users home directory. We
     dnl always use .mozilla instead of .firefox, as this directoryis
     dnl used by all mozilla derived browsers.

Index: plugin/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/Makefile.am,v
retrieving revision 1.63
retrieving revision 1.63.2.1
diff -u -b -r1.63 -r1.63.2.1
--- plugin/Makefile.am	3 Aug 2007 04:27:39 -0000	1.63
+++ plugin/Makefile.am	18 Aug 2007 02:54:16 -0000	1.63.2.1
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.63 2007/08/03 04:27:39 strk Exp $
+# $Id: Makefile.am,v 1.63.2.1 2007/08/18 02:54:16 strk Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -31,7 +31,7 @@
 # XP_UNIX	This needs to get defined for npapi.h on unix platforms.
 # PLUGIN_TRACE	Enable this define to get debug prints whenever the plugin
 #		api gets control.
-AM_CPPFLAGS = -DPLUGIN_TRACE -DXP_UNIX -DMOZ_X11 -DGNASHBINDIR=\"$(GNASHEXE)\" \
+AM_CPPFLAGS = -DPLUGIN_TRACE -DXP_UNIX -DMOZ_X11 -DGNASHBINDIR=\"${bindir}\" \
         -I.. \
         -I$(srcdir) \
         -I$(top_srcdir)/server \

Index: plugin/klash/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/Makefile.am,v
retrieving revision 1.34
retrieving revision 1.34.2.1
diff -u -b -r1.34 -r1.34.2.1
--- plugin/klash/Makefile.am	3 Aug 2007 04:22:55 -0000	1.34
+++ plugin/klash/Makefile.am	18 Aug 2007 02:54:16 -0000	1.34.2.1
@@ -15,12 +15,12 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.34 2007/08/03 04:22:55 strk Exp $
+# $Id: Makefile.am,v 1.34.2.1 2007/08/18 02:54:16 strk Exp $
 
 AUTOMAKE_OPTIONS = 
 
 if KPARTS
-AM_CPPFLAGS= $(KDE_CFLAGS) $(QT_CFLAGS) -DGNASHBINDIR=\"$(GNASHEXE)\"
+AM_CPPFLAGS= $(KDE_CFLAGS) $(QT_CFLAGS) -DGNASHBINDIR=\"${bindir}\"
 
 plugindir   = $(libdir)/kde3
 kde_servicesdir = $(prefix)/share/services



From MAILER-DAEMON Fri Aug 17 22:54:32 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMESO-0006Qo-BR
	for mharc-gnash-commit@gnu.org; Fri, 17 Aug 2007 22:54:32 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMESM-0006Px-6m
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 22:54:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMESL-0006PW-CB
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 22:54:29 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMESL-0006PQ-6U
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 22:54:29 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMESK-0004G5-RD
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 22:54:28 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMESE-0000fJ-Ed
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 02:54:22 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMESE-0000fG-Aq
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 02:54:22 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMESE-0000fG-Aq@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 18 Aug 2007 02:54:22 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog macros/firefox.m4 plugin/Makefi...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2007 02:54:30 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/18 02:54:22

Modified files:
	.              : ChangeLog 
	macros         : firefox.m4 
	plugin         : Makefile.am 
	plugin/klash   : Makefile.am 

Log message:
	        * macros/firefox.m4: drop --with-gnashexe and GNASHEXE macro
	        * plugin/Makefile.am: define GNASHBINDIR based on ${bindir}
	        * plugin/klash/Makefile.am: define GNASHBINDIR based on ${bindir}

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4016&r2=1.4017
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/firefox.m4?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/Makefile.am?cvsroot=gnash&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/Makefile.am?cvsroot=gnash&r1=1.34&r2=1.35

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4016
retrieving revision 1.4017
diff -u -b -r1.4016 -r1.4017
--- ChangeLog	17 Aug 2007 18:02:35 -0000	1.4016
+++ ChangeLog	18 Aug 2007 02:54:21 -0000	1.4017
@@ -1,3 +1,9 @@
+2007-08-18 Sandro Santilli <strk@keybit.net>
+
+	* macros/firefox.m4: drop --with-gnashexe and GNASHEXE macro
+	* plugin/Makefile.am: define GNASHBINDIR based on ${bindir}
+	* plugin/klash/Makefile.am: define GNASHBINDIR based on ${bindir}
+
 2007-08-17 Sandro Santilli <strk@keybit.net>
 
 	* server/sprite_instance.cpp (setVariables):

Index: macros/firefox.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/firefox.m4,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- macros/firefox.m4	3 Aug 2007 03:01:16 -0000	1.25
+++ macros/firefox.m4	18 Aug 2007 02:54:21 -0000	1.26
@@ -41,19 +41,20 @@
       [FIREFOX_PLUGINS=$withval]
     )
 
-    dnl Allow setting a path for the Gnash executable to be different from the prefix. This
-    dnl is mostly only used for cross compiling.
-    AC_ARG_WITH(gnashexe, AC_HELP_STRING([--with-gnashexe=DIR], [Directory to where the gnash executable is]),
-      [gnashbindir=$withval]
-    )
+dnl     dnl Allow setting a path for the Gnash executable to be different from the prefix. This
+dnl     dnl is mostly only used for cross compiling.
+dnl     AC_ARG_WITH(gnashexe, AC_HELP_STRING([--with-gnashexe=DIR], [Directory to where the gnash executable is]),
+dnl       [gnashbindir=$withval]
+dnl     )
+dnl 
+dnl     dnl default to the prefix if no path is specified. As $prefix isn't set at this time by
+dnl     dnl configure, we set this to the variable itself so it gets resolved at make time.
+dnl     if test x"${gnashbindir}" = "x" ; then
+dnl       GNASHEXE="\${prefix}/bin"
+dnl     else
+dnl       GNASHEXE=${gnashbindir}
+dnl     fi
 
-    dnl default to the prefix if no path is specified. As $prefix isn't set at this time by
-    dnl configure, we set this to the variable itself so it gets resolved at make time.
-    if test x"${gnashbindir}" = "x" ; then
-      GNASHEXE="\${prefix}/bin"
-    else
-      GNASHEXE=${gnashbindir}
-    fi
     dnl Always install the plugin in the users home directory. We
     dnl always use .mozilla instead of .firefox, as this directoryis
     dnl used by all mozilla derived browsers.

Index: plugin/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/Makefile.am,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- plugin/Makefile.am	3 Aug 2007 04:27:39 -0000	1.63
+++ plugin/Makefile.am	18 Aug 2007 02:54:22 -0000	1.64
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.63 2007/08/03 04:27:39 strk Exp $
+# $Id: Makefile.am,v 1.64 2007/08/18 02:54:22 strk Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -31,7 +31,7 @@
 # XP_UNIX	This needs to get defined for npapi.h on unix platforms.
 # PLUGIN_TRACE	Enable this define to get debug prints whenever the plugin
 #		api gets control.
-AM_CPPFLAGS = -DPLUGIN_TRACE -DXP_UNIX -DMOZ_X11 -DGNASHBINDIR=\"$(GNASHEXE)\" \
+AM_CPPFLAGS = -DPLUGIN_TRACE -DXP_UNIX -DMOZ_X11 -DGNASHBINDIR=\"${bindir}\" \
         -I.. \
         -I$(srcdir) \
         -I$(top_srcdir)/server \

Index: plugin/klash/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/Makefile.am,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- plugin/klash/Makefile.am	3 Aug 2007 04:22:55 -0000	1.34
+++ plugin/klash/Makefile.am	18 Aug 2007 02:54:22 -0000	1.35
@@ -15,12 +15,12 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.34 2007/08/03 04:22:55 strk Exp $
+# $Id: Makefile.am,v 1.35 2007/08/18 02:54:22 strk Exp $
 
 AUTOMAKE_OPTIONS = 
 
 if KPARTS
-AM_CPPFLAGS= $(KDE_CFLAGS) $(QT_CFLAGS) -DGNASHBINDIR=\"$(GNASHEXE)\"
+AM_CPPFLAGS= $(KDE_CFLAGS) $(QT_CFLAGS) -DGNASHBINDIR=\"${bindir}\"
 
 plugindir   = $(libdir)/kde3
 kde_servicesdir = $(prefix)/share/services



From MAILER-DAEMON Fri Aug 17 23:02:34 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMEa9-00011u-VL
	for mharc-gnash-commit@gnu.org; Fri, 17 Aug 2007 23:02:33 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMEa8-0000zb-Hg
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 23:02:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMEa7-0000yP-Ob
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 23:02:32 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMEa7-0000xx-Iq
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 23:02:31 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMEa7-0005bS-6t
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 23:02:31 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMEa6-0000pG-Ok
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 03:02:30 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMEa6-0000pD-KZ
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 03:02:30 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMEa6-0000pD-KZ@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 18 Aug 2007 03:02:30 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog plugin/klash/klash_part.cpp
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2007 03:02:32 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/18 03:02:30

Modified files:
	.              : ChangeLog 
	plugin/klash   : klash_part.cpp 

Log message:
	Patch from bug #20608 by Nick Warne <nick@ukfsn.org>:
	
	 * plugin/klash/klash_part.cpp: use the -u switch when invoking
	   the standalone gnash. Fixes youtube playback for konqueror.
	   Still missing -U and -P switches.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.24&r2=1.3971.2.25
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/klash_part.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.17&r2=1.17.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.24
retrieving revision 1.3971.2.25
diff -u -b -r1.3971.2.24 -r1.3971.2.25
--- ChangeLog	18 Aug 2007 02:54:15 -0000	1.3971.2.24
+++ ChangeLog	18 Aug 2007 03:02:29 -0000	1.3971.2.25
@@ -1,3 +1,9 @@
+2007-08-18 Nick Warne <nick@ukfsn.org>
+
+	* plugin/klash/klash_part.cpp: use the -u switch when invoking
+	  the standalone gnash. Fixes youtube playback for konqueror.
+	  Still missing -U and -P switches.
+
 2007-08-18 Sandro Santilli <strk@keybit.net>
 
 	* macros/firefox.m4: drop --with-gnashexe and GNASHEXE macro

Index: plugin/klash/klash_part.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/klash_part.cpp,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -u -b -r1.17 -r1.17.2.1
--- plugin/klash/klash_part.cpp	31 Jul 2007 20:09:44 -0000	1.17
+++ plugin/klash/klash_part.cpp	18 Aug 2007 03:02:30 -0000	1.17.2.1
@@ -178,9 +178,14 @@
     if (m_width > 0 && m_height > 0)
         dim = QString ("-j ") + QString::number (m_width) +
             QString (" -k ") + QString::number (m_height);
+    QString url = m_url.url();
+    QString url_param;
+    if (!url.isEmpty())
+        url_param = QString ("-u ") + KProcess::quote (url);
     QString cmd = procname + QString (" -x ") +
         QString::number (static_cast <KlashView *> (widget ())->embedId()) +
         QChar (' ') + dim +
+        QChar (' ') + url_param +
         QChar (' ') + KProcess::quote (m_src_url);
     kdDebug () << cmd << endl;
     *m_process << cmd;



From MAILER-DAEMON Fri Aug 17 23:02:44 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMEaK-0001Ec-3x
	for mharc-gnash-commit@gnu.org; Fri, 17 Aug 2007 23:02:44 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMEaI-0001BF-H1
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 23:02:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMEaH-0001AD-FY
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 23:02:42 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMEaH-00019y-9I
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 23:02:41 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMEaG-0005ce-UN
	for gnash-commit@gnu.org; Fri, 17 Aug 2007 23:02:41 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMEaG-0000pZ-FN
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 03:02:40 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMEaG-0000pW-B5
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 03:02:40 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMEaG-0000pW-B5@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 18 Aug 2007 03:02:40 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog plugin/klash/klash_part.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2007 03:02:42 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/18 03:02:40

Modified files:
	.              : ChangeLog 
	plugin/klash   : klash_part.cpp 

Log message:
	Patch from bug #20608 by Nick Warne <nick@ukfsn.org>:
	
	 * plugin/klash/klash_part.cpp: use the -u switch when invoking
	   the standalone gnash. Fixes youtube playback for konqueror.
	   Still missing -U and -P switches.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4017&r2=1.4018
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/klash_part.cpp?cvsroot=gnash&r1=1.17&r2=1.18

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4017
retrieving revision 1.4018
diff -u -b -r1.4017 -r1.4018
--- ChangeLog	18 Aug 2007 02:54:21 -0000	1.4017
+++ ChangeLog	18 Aug 2007 03:02:39 -0000	1.4018
@@ -1,3 +1,9 @@
+2007-08-18 Nick Warne <nick@ukfsn.org>
+
+	* plugin/klash/klash_part.cpp: use the -u switch when invoking
+	  the standalone gnash. Fixes youtube playback for konqueror.
+	  Still missing -U and -P switches.
+
 2007-08-18 Sandro Santilli <strk@keybit.net>
 
 	* macros/firefox.m4: drop --with-gnashexe and GNASHEXE macro

Index: plugin/klash/klash_part.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/klash_part.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- plugin/klash/klash_part.cpp	31 Jul 2007 20:09:44 -0000	1.17
+++ plugin/klash/klash_part.cpp	18 Aug 2007 03:02:40 -0000	1.18
@@ -178,9 +178,14 @@
     if (m_width > 0 && m_height > 0)
         dim = QString ("-j ") + QString::number (m_width) +
             QString (" -k ") + QString::number (m_height);
+    QString url = m_url.url();
+    QString url_param;
+    if (!url.isEmpty())
+        url_param = QString ("-u ") + KProcess::quote (url);
     QString cmd = procname + QString (" -x ") +
         QString::number (static_cast <KlashView *> (widget ())->embedId()) +
         QChar (' ') + dim +
+        QChar (' ') + url_param +
         QChar (' ') + KProcess::quote (m_src_url);
     kdDebug () << cmd << endl;
     *m_process << cmd;



From MAILER-DAEMON Sat Aug 18 01:04:04 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMGTk-0008Nc-Lt
	for mharc-gnash-commit@gnu.org; Sat, 18 Aug 2007 01:04:04 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMGTj-0008Md-Ob
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 01:04:03 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMGTi-0008MA-LJ
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 01:04:03 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMGTi-0008M4-GJ
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 01:04:02 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMGTi-0001WD-3H
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 01:04:02 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMGTg-00077b-No
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 05:04:00 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMGTg-00077Y-Ip
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 05:04:00 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMGTg-00077Y-Ip@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 18 Aug 2007 05:04:00 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog libbase/jpeg.cpp server/swf/tag...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2007 05:04:03 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/18 05:04:00

Modified files:
	.              : ChangeLog 
	libbase        : jpeg.cpp 
	server/swf     : tag_loaders.cpp 

Log message:
	 * libbase/jpeg.cpp (jpeg_error_exit): only print SWF errors if
	   configured to do so; (input_impl): throw an exception if
	   jpeg_read_header detected errors.
	 * server/swf/tag_loaders.cpp (jpeg_tables_loader,
	   define_bits_jpeg_loader): early exception checking to avoid
	   parser interruption on malformed embedded jpeg.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4018&r2=1.4019
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/jpeg.cpp?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.128&r2=1.129

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4018
retrieving revision 1.4019
diff -u -b -r1.4018 -r1.4019
--- ChangeLog	18 Aug 2007 03:02:39 -0000	1.4018
+++ ChangeLog	18 Aug 2007 05:03:59 -0000	1.4019
@@ -1,3 +1,12 @@
+2007-08-18 Sandro Santilli <strk@keybit.net>
+
+	* libbase/jpeg.cpp (jpeg_error_exit): only print SWF errors if
+	  configured to do so; (input_impl): throw an exception if
+	  jpeg_read_header detected errors.
+	* server/swf/tag_loaders.cpp (jpeg_tables_loader,
+	  define_bits_jpeg_loader): early exception checking to avoid
+	  parser interruption on malformed embedded jpeg.
+
 2007-08-18 Nick Warne <nick@ukfsn.org>
 
 	* plugin/klash/klash_part.cpp: use the -u switch when invoking

Index: libbase/jpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/jpeg.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- libbase/jpeg.cpp	7 Aug 2007 20:53:09 -0000	1.17
+++ libbase/jpeg.cpp	18 Aug 2007 05:04:00 -0000	1.18
@@ -349,7 +349,28 @@
 			setup_rw_source(&m_cinfo, in);
 
 			// Read the encoding tables.
-			jpeg_read_header(&m_cinfo, FALSE);
+			int ret = jpeg_read_header(&m_cinfo, FALSE);
+			switch (ret)
+			{
+				case JPEG_SUSPENDED: // suspended due to lack of data
+					throw gnash::ParserException("lack of data during JPEG header parsing");
+					//log_debug("jpeg_read_header returned JPEG_SUSPENDED");
+					break;
+				case JPEG_HEADER_OK: // Found valid image datastream
+					//gnash::log_debug("unexpected: jpeg_read_header returned JPEG_HEADER_OK [%s:%d]", __FILE__, __LINE__);
+					break;
+				case JPEG_HEADER_TABLES_ONLY: // Found valid table-specs-only datastream
+					//log_debug("jpeg_read_header returned JPEG_HEADER_TABLES_ONLY");
+					break;
+				default:
+					gnash::log_debug("unexpected: jpeg_read_header returned %d [%s:%d]", ret, __FILE__, __LINE__);
+					break;
+			}
+
+			if ( errorOccurred )
+			{
+				throw gnash::ParserException("errors during JPEG header parsing");
+			}
 
 			// Don't start reading any image data!
 			// App does that manually using start_image.
@@ -409,10 +430,10 @@
 						//log_debug("jpeg_read_header returned JPEG_HEADER_OK");
 						break;
 					case JPEG_HEADER_TABLES_ONLY: // Found valid table-specs-only datastream
-						//log_debug("jpeg_read_header returned JPEG_HEADER_TABLES_ONLY");
+						//gnash::log_debug("unexpected: jpeg_read_header returned JPEG_HEADER_TABLES_ONLY [%s:%d]", __FILE__, __LINE__);
 						break;
 					default:
-						//log_debug("jpeg_read_header returned %d", ret);
+						gnash::log_debug("unexpected: jpeg_read_header returned %d [%s:%d]", ret, __FILE__, __LINE__);
 						break;
 				}
 			}
@@ -495,7 +516,9 @@
 
 	static void	jpeg_error_exit(j_common_ptr cinfo)
 	{
+        IF_VERBOSE_MALFORMED_SWF(
 		gnash::log_swferror("Internal jpeg error: %s", cinfo->err->jpeg_message_table[cinfo->err->msg_code]);
+        );
 
 		// Set a flag to stop parsing 
 		input_impl* impl = static_cast<input_impl*>(cinfo->client_data);

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -b -r1.128 -r1.129
--- server/swf/tag_loaders.cpp	10 Aug 2007 10:24:11 -0000	1.128
+++ server/swf/tag_loaders.cpp	18 Aug 2007 05:04:00 -0000	1.129
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: tag_loaders.cpp,v 1.128 2007/08/10 10:24:11 tgc Exp $ */
+/* $Id: tag_loaders.cpp,v 1.129 2007/08/18 05:04:00 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -476,6 +476,7 @@
 void
 jpeg_tables_loader(stream* in, tag_type tag, movie_definition* m)
 {
+    //GNASH_REPORT_FUNCTION;
     assert(tag == SWF::JPEGTABLES);
 
     IF_VERBOSE_PARSE
@@ -483,9 +484,21 @@
 	log_parse(_("  jpeg_tables_loader"));
     );
 
-    std::auto_ptr<jpeg::input> j_in(jpeg::input::create_swf_jpeg2_header_only(in->get_underlying_stream()));
-    assert(j_in.get());
+    std::auto_ptr<jpeg::input> j_in;
 
+    try
+    {
+        j_in.reset(jpeg::input::create_swf_jpeg2_header_only(in->get_underlying_stream()));
+    }
+    catch (std::exception& e)
+    {
+        IF_VERBOSE_MALFORMED_SWF(
+        log_swferror("Error creating header-only jpeg2 input: %s", e.what());
+        );
+        return;
+    }
+
+    log_debug("Setting jpeg loader to %p", j_in.get());
     m->set_jpeg_loader(j_in);
 }
 
@@ -504,18 +517,33 @@
     // Read the image data.
     //
 
-    if (m->get_create_bitmaps() == DO_LOAD_BITMAPS)
-    {
-	//bitmap_info*	bi = NULL;
+    if (m->get_create_bitmaps() != DO_LOAD_BITMAPS) return;
+
 	jpeg::input*	j_in = m->get_jpeg_loader();
+    if ( ! j_in )
+    {
+        IF_VERBOSE_MALFORMED_SWF(
+        log_swferror(_("DEFINEBITS: No jpeg loader registered in movie definition - discarding bitmap character %d"), character_id);
+        );
+        return;
+    }
+
 	assert(j_in);
 	j_in->discard_partial_buffer();
 
-	std::auto_ptr<image::rgb> im ( image::read_swf_jpeg2_with_tables(j_in) );
-	//bi = render::create_bitmap_info_rgb(im);
-	//delete im;
+    std::auto_ptr<image::rgb> im;
+    try
+    {
+        im.reset ( image::read_swf_jpeg2_with_tables(j_in) );
+    }
+    catch (std::exception& e)
+    {
+        IF_VERBOSE_MALFORMED_SWF(
+        log_swferror("Error reading jpeg2 with headers for character id %d: %s", character_id, e.what());
+        );
+        return;
+    }
 
-	//assert(im->get_ref_count() == 0);
 
 	bitmap_character_def* ch = new bitmap_character_def(im);
 
@@ -529,7 +557,6 @@
 	{
 	    m->add_bitmap_character_def(character_id, ch);
 	}
-    }
 }
 
 



From MAILER-DAEMON Sat Aug 18 01:05:20 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMGUy-0000AX-Pk
	for mharc-gnash-commit@gnu.org; Sat, 18 Aug 2007 01:05:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMGUx-0000AS-IL
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 01:05:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMGUw-0000AD-Tf
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 01:05:19 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMGUw-0000AA-PZ
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 01:05:18 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMGUw-0001ji-Aw
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 01:05:18 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMGUv-00078y-Tn
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 05:05:18 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMGUv-00078v-N5
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 05:05:17 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMGUv-00078v-N5@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 18 Aug 2007 05:05:17 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog libbase/jpeg.cpp server/swf/tag...
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2007 05:05:19 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/18 05:05:17

Modified files:
	.              : ChangeLog 
	libbase        : jpeg.cpp 
	server/swf     : tag_loaders.cpp 

Log message:
	 * libbase/jpeg.cpp (jpeg_error_exit): only print SWF errors if
	   configured to do so; (input_impl): throw an exception if
	   jpeg_read_header detected errors.
	 * server/swf/tag_loaders.cpp (jpeg_tables_loader,
	   define_bits_jpeg_loader): early exception checking to avoid
	   parser interruption on malformed embedded jpeg.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.25&r2=1.3971.2.26
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/jpeg.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.17&r2=1.17.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.123.2.4&r2=1.123.2.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.25
retrieving revision 1.3971.2.26
diff -u -b -r1.3971.2.25 -r1.3971.2.26
--- ChangeLog	18 Aug 2007 03:02:29 -0000	1.3971.2.25
+++ ChangeLog	18 Aug 2007 05:05:16 -0000	1.3971.2.26
@@ -1,3 +1,12 @@
+2007-08-18 Sandro Santilli <strk@keybit.net>
+
+	* libbase/jpeg.cpp (jpeg_error_exit): only print SWF errors if
+	  configured to do so; (input_impl): throw an exception if
+	  jpeg_read_header detected errors.
+	* server/swf/tag_loaders.cpp (jpeg_tables_loader,
+	  define_bits_jpeg_loader): early exception checking to avoid
+	  parser interruption on malformed embedded jpeg.
+
 2007-08-18 Nick Warne <nick@ukfsn.org>
 
 	* plugin/klash/klash_part.cpp: use the -u switch when invoking

Index: libbase/jpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/jpeg.cpp,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -u -b -r1.17 -r1.17.2.1
--- libbase/jpeg.cpp	7 Aug 2007 20:53:09 -0000	1.17
+++ libbase/jpeg.cpp	18 Aug 2007 05:05:17 -0000	1.17.2.1
@@ -349,7 +349,28 @@
 			setup_rw_source(&m_cinfo, in);
 
 			// Read the encoding tables.
-			jpeg_read_header(&m_cinfo, FALSE);
+			int ret = jpeg_read_header(&m_cinfo, FALSE);
+			switch (ret)
+			{
+				case JPEG_SUSPENDED: // suspended due to lack of data
+					throw gnash::ParserException("lack of data during JPEG header parsing");
+					//log_debug("jpeg_read_header returned JPEG_SUSPENDED");
+					break;
+				case JPEG_HEADER_OK: // Found valid image datastream
+					//gnash::log_debug("unexpected: jpeg_read_header returned JPEG_HEADER_OK [%s:%d]", __FILE__, __LINE__);
+					break;
+				case JPEG_HEADER_TABLES_ONLY: // Found valid table-specs-only datastream
+					//log_debug("jpeg_read_header returned JPEG_HEADER_TABLES_ONLY");
+					break;
+				default:
+					gnash::log_debug("unexpected: jpeg_read_header returned %d [%s:%d]", ret, __FILE__, __LINE__);
+					break;
+			}
+
+			if ( errorOccurred )
+			{
+				throw gnash::ParserException("errors during JPEG header parsing");
+			}
 
 			// Don't start reading any image data!
 			// App does that manually using start_image.
@@ -409,10 +430,10 @@
 						//log_debug("jpeg_read_header returned JPEG_HEADER_OK");
 						break;
 					case JPEG_HEADER_TABLES_ONLY: // Found valid table-specs-only datastream
-						//log_debug("jpeg_read_header returned JPEG_HEADER_TABLES_ONLY");
+						//gnash::log_debug("unexpected: jpeg_read_header returned JPEG_HEADER_TABLES_ONLY [%s:%d]", __FILE__, __LINE__);
 						break;
 					default:
-						//log_debug("jpeg_read_header returned %d", ret);
+						gnash::log_debug("unexpected: jpeg_read_header returned %d [%s:%d]", ret, __FILE__, __LINE__);
 						break;
 				}
 			}
@@ -495,7 +516,9 @@
 
 	static void	jpeg_error_exit(j_common_ptr cinfo)
 	{
+        IF_VERBOSE_MALFORMED_SWF(
 		gnash::log_swferror("Internal jpeg error: %s", cinfo->err->jpeg_message_table[cinfo->err->msg_code]);
+        );
 
 		// Set a flag to stop parsing 
 		input_impl* impl = static_cast<input_impl*>(cinfo->client_data);

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.123.2.4
retrieving revision 1.123.2.5
diff -u -b -r1.123.2.4 -r1.123.2.5
--- server/swf/tag_loaders.cpp	10 Aug 2007 03:54:11 -0000	1.123.2.4
+++ server/swf/tag_loaders.cpp	18 Aug 2007 05:05:17 -0000	1.123.2.5
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: tag_loaders.cpp,v 1.123.2.4 2007/08/10 03:54:11 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.123.2.5 2007/08/18 05:05:17 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -476,6 +476,7 @@
 void
 jpeg_tables_loader(stream* in, tag_type tag, movie_definition* m)
 {
+    //GNASH_REPORT_FUNCTION;
     assert(tag == SWF::JPEGTABLES);
 
     IF_VERBOSE_PARSE
@@ -483,9 +484,21 @@
 	log_parse(_("  jpeg_tables_loader"));
     );
 
-    std::auto_ptr<jpeg::input> j_in(jpeg::input::create_swf_jpeg2_header_only(in->get_underlying_stream()));
-    assert(j_in.get());
+    std::auto_ptr<jpeg::input> j_in;
 
+    try
+    {
+        j_in.reset(jpeg::input::create_swf_jpeg2_header_only(in->get_underlying_stream()));
+    }
+    catch (std::exception& e)
+    {
+        IF_VERBOSE_MALFORMED_SWF(
+        log_swferror("Error creating header-only jpeg2 input: %s", e.what());
+        );
+        return;
+    }
+
+    log_debug("Setting jpeg loader to %p", j_in.get());
     m->set_jpeg_loader(j_in);
 }
 
@@ -504,18 +517,33 @@
     // Read the image data.
     //
 
-    if (m->get_create_bitmaps() == DO_LOAD_BITMAPS)
-    {
-	//bitmap_info*	bi = NULL;
+    if (m->get_create_bitmaps() != DO_LOAD_BITMAPS) return;
+
 	jpeg::input*	j_in = m->get_jpeg_loader();
+    if ( ! j_in )
+    {
+        IF_VERBOSE_MALFORMED_SWF(
+        log_swferror(_("DEFINEBITS: No jpeg loader registered in movie definition - discarding bitmap character %d"), character_id);
+        );
+        return;
+    }
+
 	assert(j_in);
 	j_in->discard_partial_buffer();
 
-	std::auto_ptr<image::rgb> im ( image::read_swf_jpeg2_with_tables(j_in) );
-	//bi = render::create_bitmap_info_rgb(im);
-	//delete im;
+    std::auto_ptr<image::rgb> im;
+    try
+    {
+        im.reset ( image::read_swf_jpeg2_with_tables(j_in) );
+    }
+    catch (std::exception& e)
+    {
+        IF_VERBOSE_MALFORMED_SWF(
+        log_swferror("Error reading jpeg2 with headers for character id %d: %s", character_id, e.what());
+        );
+        return;
+    }
 
-	//assert(im->get_ref_count() == 0);
 
 	bitmap_character_def* ch = new bitmap_character_def(im);
 
@@ -529,7 +557,6 @@
 	{
 	    m->add_bitmap_character_def(character_id, ch);
 	}
-    }
 }
 
 



From MAILER-DAEMON Sat Aug 18 02:20:10 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMHfO-0008Ib-HN
	for mharc-gnash-commit@gnu.org; Sat, 18 Aug 2007 02:20:10 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMHfL-0008II-K6
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 02:20:07 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMHfJ-0008GM-Kg
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 02:20:07 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMHfJ-0008G3-AV
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 02:20:05 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMHfJ-0005Oc-2f
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 02:20:05 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMHfH-0004Bl-1o
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 06:20:03 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMHfF-0004Bc-VL
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 06:20:02 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMHfF-0004Bc-VL@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 18 Aug 2007 06:20:01 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/parser/text_character_de...
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2007 06:20:08 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/18 06:20:01

Modified files:
	.              : ChangeLog 
	server/parser  : text_character_def.cpp 

Log message:
	 * server/parser/text_character_def.cpp: use symbolic names for
	   tag types, more verbose parsing.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.26&r2=1.3971.2.27
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/text_character_def.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.4&r2=1.4.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.26
retrieving revision 1.3971.2.27
diff -u -b -r1.3971.2.26 -r1.3971.2.27
--- ChangeLog	18 Aug 2007 05:05:16 -0000	1.3971.2.26
+++ ChangeLog	18 Aug 2007 06:20:00 -0000	1.3971.2.27
@@ -1,5 +1,10 @@
 2007-08-18 Sandro Santilli <strk@keybit.net>
 
+	* server/parser/text_character_def.cpp: use symbolic names for
+	  tag types, more verbose parsing.
+
+2007-08-18 Sandro Santilli <strk@keybit.net>
+
 	* libbase/jpeg.cpp (jpeg_error_exit): only print SWF errors if
 	  configured to do so; (input_impl): throw an exception if
 	  jpeg_read_header detected errors.

Index: server/parser/text_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/text_character_def.cpp,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -b -r1.4 -r1.4.2.1
--- server/parser/text_character_def.cpp	24 Jul 2007 19:43:30 -0000	1.4
+++ server/parser/text_character_def.cpp	18 Aug 2007 06:20:01 -0000	1.4.2.1
@@ -10,6 +10,7 @@
 #include "stream.h"
 #include "log.h"
 #include "text_character_def.h"
+#include "swf.h"
 
 namespace gnash {
 
@@ -17,7 +18,7 @@
 		movie_definition* m)
 {
 	assert(m != NULL);
-	assert(tag_type == 11 || tag_type == 33);
+	assert(tag_type == SWF::DEFINETEXT || tag_type == SWF::DEFINETEXT2);
 
 	m_rect.read(in);
 	m_matrix.read(in);
@@ -26,7 +27,7 @@
 	int	advance_bits = in->read_u8();
 
 	IF_VERBOSE_PARSE(
-	log_parse(_("begin text records"));
+	log_parse(_("begin text records for text_character_def %p"), (void*)this);
 	);
 
 	bool	last_record_was_style_change = false;
@@ -34,7 +35,7 @@
 	text_style	style;
 	for (;;)
 	{
-		int	first_byte = in->read_u8();
+		unsigned int first_byte = in->read_u8();
 		
 		if (first_byte == 0)
 		{
@@ -73,13 +74,13 @@
 			}
 			if (has_color)
 			{
-				if (tag_type == 11)
+				if (tag_type == SWF::DEFINETEXT)
 				{
 					style.m_color.read_rgb(in);
 				}
 				else
 				{
-					assert(tag_type == 33);
+					assert(tag_type == SWF::DEFINETEXT2);
 					style.m_color.read_rgba(in);
 				}
 				IF_VERBOSE_PARSE(
@@ -126,7 +127,7 @@
 
 			last_record_was_style_change = false;
 
-			int	glyph_count = first_byte;
+			unsigned int glyph_count = first_byte;
 
 // 					if (! last_record_was_style_change)
 // 					{
@@ -135,11 +136,17 @@
 // 					// else { Don't mask the top bit; the first record is allowed to have > 127 glyphs. }
 
 			m_text_glyph_records.resize(m_text_glyph_records.size() + 1);
-			m_text_glyph_records.back().m_style = style;
-			m_text_glyph_records.back().read(in, glyph_count, glyph_bits, advance_bits);
+			text_glyph_record& grecord = m_text_glyph_records.back();
+			grecord.m_style = style;
+			grecord.read(in, glyph_count, glyph_bits, advance_bits);
 
 			IF_VERBOSE_PARSE(
 			log_parse(_("  glyph_records: count = %d"), glyph_count);
+			for (unsigned int i = 0; i < glyph_count; i++)
+			{
+				text_glyph_record::glyph_entry& ge = grecord.m_glyphs[i];
+				log_parse(_("   glyph%d: index=%d, advance=%g"), i, ge.m_glyph_index, ge.m_glyph_advance);
+			}
 			);
 		}
 	}



From MAILER-DAEMON Sat Aug 18 02:20:11 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMHfP-0008JI-N2
	for mharc-gnash-commit@gnu.org; Sat, 18 Aug 2007 02:20:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMHfO-0008If-H7
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 02:20:10 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMHfO-0008IQ-1F
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 02:20:10 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMHfN-0008IN-Ri
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 02:20:09 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMHfN-0005PJ-JH
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 02:20:09 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMHfM-0004CJ-Vx
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 06:20:09 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMHfM-0004CF-Bl
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 06:20:08 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMHfM-0004CF-Bl@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 18 Aug 2007 06:20:08 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/parser/text_character_de...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2007 06:20:10 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/18 06:20:07

Modified files:
	.              : ChangeLog 
	server/parser  : text_character_def.cpp 

Log message:
	 * server/parser/text_character_def.cpp: use symbolic names for
	   tag types, more verbose parsing.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4019&r2=1.4020
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/text_character_def.cpp?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4019
retrieving revision 1.4020
diff -u -b -r1.4019 -r1.4020
--- ChangeLog	18 Aug 2007 05:03:59 -0000	1.4019
+++ ChangeLog	18 Aug 2007 06:20:06 -0000	1.4020
@@ -1,5 +1,10 @@
 2007-08-18 Sandro Santilli <strk@keybit.net>
 
+	* server/parser/text_character_def.cpp: use symbolic names for
+	  tag types, more verbose parsing.
+
+2007-08-18 Sandro Santilli <strk@keybit.net>
+
 	* libbase/jpeg.cpp (jpeg_error_exit): only print SWF errors if
 	  configured to do so; (input_impl): throw an exception if
 	  jpeg_read_header detected errors.

Index: server/parser/text_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/text_character_def.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/parser/text_character_def.cpp	24 Jul 2007 19:43:30 -0000	1.4
+++ server/parser/text_character_def.cpp	18 Aug 2007 06:20:07 -0000	1.5
@@ -10,6 +10,7 @@
 #include "stream.h"
 #include "log.h"
 #include "text_character_def.h"
+#include "swf.h"
 
 namespace gnash {
 
@@ -17,7 +18,7 @@
 		movie_definition* m)
 {
 	assert(m != NULL);
-	assert(tag_type == 11 || tag_type == 33);
+	assert(tag_type == SWF::DEFINETEXT || tag_type == SWF::DEFINETEXT2);
 
 	m_rect.read(in);
 	m_matrix.read(in);
@@ -26,7 +27,7 @@
 	int	advance_bits = in->read_u8();
 
 	IF_VERBOSE_PARSE(
-	log_parse(_("begin text records"));
+	log_parse(_("begin text records for text_character_def %p"), (void*)this);
 	);
 
 	bool	last_record_was_style_change = false;
@@ -34,7 +35,7 @@
 	text_style	style;
 	for (;;)
 	{
-		int	first_byte = in->read_u8();
+		unsigned int first_byte = in->read_u8();
 		
 		if (first_byte == 0)
 		{
@@ -73,13 +74,13 @@
 			}
 			if (has_color)
 			{
-				if (tag_type == 11)
+				if (tag_type == SWF::DEFINETEXT)
 				{
 					style.m_color.read_rgb(in);
 				}
 				else
 				{
-					assert(tag_type == 33);
+					assert(tag_type == SWF::DEFINETEXT2);
 					style.m_color.read_rgba(in);
 				}
 				IF_VERBOSE_PARSE(
@@ -126,7 +127,7 @@
 
 			last_record_was_style_change = false;
 
-			int	glyph_count = first_byte;
+			unsigned int glyph_count = first_byte;
 
 // 					if (! last_record_was_style_change)
 // 					{
@@ -135,11 +136,17 @@
 // 					// else { Don't mask the top bit; the first record is allowed to have > 127 glyphs. }
 
 			m_text_glyph_records.resize(m_text_glyph_records.size() + 1);
-			m_text_glyph_records.back().m_style = style;
-			m_text_glyph_records.back().read(in, glyph_count, glyph_bits, advance_bits);
+			text_glyph_record& grecord = m_text_glyph_records.back();
+			grecord.m_style = style;
+			grecord.read(in, glyph_count, glyph_bits, advance_bits);
 
 			IF_VERBOSE_PARSE(
 			log_parse(_("  glyph_records: count = %d"), glyph_count);
+			for (unsigned int i = 0; i < glyph_count; i++)
+			{
+				text_glyph_record::glyph_entry& ge = grecord.m_glyphs[i];
+				log_parse(_("   glyph%d: index=%d, advance=%g"), i, ge.m_glyph_index, ge.m_glyph_advance);
+			}
 			);
 		}
 	}



From MAILER-DAEMON Sat Aug 18 03:00:05 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMII0-0003Dl-S8
	for mharc-gnash-commit@gnu.org; Sat, 18 Aug 2007 03:00:04 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMIHz-0003Dg-Hu
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 03:00:03 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMIHx-0003DQ-EF
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 03:00:02 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMIHx-0003DN-C1
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 03:00:01 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMIHw-0003GC-OJ
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 03:00:00 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMIHv-0006ff-Lf
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 06:59:59 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMIHv-0006fc-HO
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 06:59:59 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMIHv-0006fc-HO@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 18 Aug 2007 06:59:59 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog [release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2007 07:00:04 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/18 06:59:59

Modified files:
	.              : ChangeLog 

Log message:
	Ops, proper attribute the klash_part.cpp patch

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.27&r2=1.3971.2.28

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.27
retrieving revision 1.3971.2.28
diff -u -b -r1.3971.2.27 -r1.3971.2.28
--- ChangeLog	18 Aug 2007 06:20:00 -0000	1.3971.2.27
+++ ChangeLog	18 Aug 2007 06:59:58 -0000	1.3971.2.28
@@ -12,7 +12,7 @@
 	  define_bits_jpeg_loader): early exception checking to avoid
 	  parser interruption on malformed embedded jpeg.
 
-2007-08-18 Nick Warne <nick@ukfsn.org>
+2007-08-18 Felix Eckhofer <tribut>
 
 	* plugin/klash/klash_part.cpp: use the -u switch when invoking
 	  the standalone gnash. Fixes youtube playback for konqueror.



From MAILER-DAEMON Sat Aug 18 03:00:10 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMII6-0003ID-3t
	for mharc-gnash-commit@gnu.org; Sat, 18 Aug 2007 03:00:10 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMII4-0003Gt-CJ
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 03:00:08 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMII4-0003GO-0m
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 03:00:08 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMII3-0003GE-NX
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 03:00:07 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMII3-0003Hh-5b
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 03:00:07 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMII2-0006ig-Ig
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 07:00:06 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMII2-0006ic-Av
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 07:00:06 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMII2-0006ic-Av@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 18 Aug 2007 07:00:06 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2007 07:00:08 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/18 07:00:06

Modified files:
	.              : ChangeLog 

Log message:
	Ops, proper attribute the klash_part.cpp patch

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4020&r2=1.4021

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4020
retrieving revision 1.4021
diff -u -b -r1.4020 -r1.4021
--- ChangeLog	18 Aug 2007 06:20:06 -0000	1.4020
+++ ChangeLog	18 Aug 2007 07:00:05 -0000	1.4021
@@ -12,7 +12,7 @@
 	  define_bits_jpeg_loader): early exception checking to avoid
 	  parser interruption on malformed embedded jpeg.
 
-2007-08-18 Nick Warne <nick@ukfsn.org>
+2007-08-18 Felix Eckhofer <tribut>
 
 	* plugin/klash/klash_part.cpp: use the -u switch when invoking
 	  the standalone gnash. Fixes youtube playback for konqueror.



From MAILER-DAEMON Sat Aug 18 03:19:31 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMIap-0003WJ-0u
	for mharc-gnash-commit@gnu.org; Sat, 18 Aug 2007 03:19:31 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMIan-0003Vz-Pn
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 03:19:29 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMIan-0003VX-1Q
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 03:19:29 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMIam-0003VT-SW
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 03:19:28 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMIam-0006qY-Rb
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 03:19:28 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMIal-0008OL-DW
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 07:19:27 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMIal-0008OI-4c
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 07:19:27 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMIal-0008OI-4c@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 18 Aug 2007 07:19:27 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2007 07:19:30 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/18 07:19:27

Modified files:
	.              : ChangeLog 

Log message:
	Proper attribute the klash_part.cpp patch

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4021&r2=1.4022

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4021
retrieving revision 1.4022
diff -u -b -r1.4021 -r1.4022
--- ChangeLog	18 Aug 2007 07:00:05 -0000	1.4021
+++ ChangeLog	18 Aug 2007 07:19:26 -0000	1.4022
@@ -12,7 +12,7 @@
 	  define_bits_jpeg_loader): early exception checking to avoid
 	  parser interruption on malformed embedded jpeg.
 
-2007-08-18 Felix Eckhofer <tribut>
+2007-08-18 Felix Eckhofer <felix@tribut.de>
 
 	* plugin/klash/klash_part.cpp: use the -u switch when invoking
 	  the standalone gnash. Fixes youtube playback for konqueror.



From MAILER-DAEMON Sat Aug 18 03:19:34 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMIas-0003YG-7h
	for mharc-gnash-commit@gnu.org; Sat, 18 Aug 2007 03:19:34 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMIaq-0003XA-Iu
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 03:19:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMIap-0003Wl-N4
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 03:19:32 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMIap-0003We-Bj
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 03:19:31 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMIap-0006r2-A6
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 03:19:31 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMIao-0008OX-Lc
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 07:19:30 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMIao-0008OU-Gz
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 07:19:30 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMIao-0008OU-Gz@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 18 Aug 2007 07:19:30 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog [release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2007 07:19:32 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/18 07:19:30

Modified files:
	.              : ChangeLog 

Log message:
	Proper attribute the klash_part.cpp patch

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.28&r2=1.3971.2.29

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.28
retrieving revision 1.3971.2.29
diff -u -b -r1.3971.2.28 -r1.3971.2.29
--- ChangeLog	18 Aug 2007 06:59:58 -0000	1.3971.2.28
+++ ChangeLog	18 Aug 2007 07:19:29 -0000	1.3971.2.29
@@ -12,7 +12,7 @@
 	  define_bits_jpeg_loader): early exception checking to avoid
 	  parser interruption on malformed embedded jpeg.
 
-2007-08-18 Felix Eckhofer <tribut>
+2007-08-18 Felix Eckhofer <felix@tribut.de>
 
 	* plugin/klash/klash_part.cpp: use the -u switch when invoking
 	  the standalone gnash. Fixes youtube playback for konqueror.



From MAILER-DAEMON Sat Aug 18 04:05:06 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMJIw-0007r4-2Z
	for mharc-gnash-commit@gnu.org; Sat, 18 Aug 2007 04:05:06 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMJIu-0007qF-Dg
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 04:05:04 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMJIs-0007q3-Rc
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 04:05:03 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMJIs-0007q0-NB
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 04:05:02 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMJIs-0007OZ-Ad
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 04:05:02 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMJIq-00029i-UP
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 08:05:01 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMJIq-00029e-M2
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 08:05:00 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMJIq-00029e-M2@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 18 Aug 2007 08:05:00 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/edit_text_character.cpp ...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2007 08:05:04 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/18 08:05:00

Modified files:
	.              : ChangeLog 
	server         : edit_text_character.cpp text.cpp text.h 
	server/parser  : movie_def_impl.cpp movie_def_impl.h 
	                 movie_definition.h sprite_definition.h 
	                 text_character_def.cpp 

Log message:
	        * server/text.{cpp,h}: make text_style class store only the font
	          pointer, w/out the font_id, provide setFont and getFont
	          methods, the former always performing a lookup.
	        * server/parser/text_character_def.cpp (read): use
	          text_style::setFont() to set the font this properly updates
	          the actual font pointer in the text_format, fixing bug #20812.
	        * server/edit_text_character.cpp: use text_style::setFont() to
	          set font by pointer.
	        * server/parser/: movie_definition.h, movie_def_impl.{h,cpp},
	          sprite_definition.h: const-correct get_font() method.
	        * server/parser/movie_def_impl.{h,cpp}: const-corrected
	          in_import_table(), made private and re-activated assertion
	          checking temporarly removed during to GC layout changes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4022&r2=1.4023
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.99&r2=1.100
http://cvs.savannah.gnu.org/viewcvs/gnash/server/text.cpp?cvsroot=gnash&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/gnash/server/text.h?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.cpp?cvsroot=gnash&r1=1.79&r2=1.80
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.h?cvsroot=gnash&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_definition.h?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/sprite_definition.h?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/text_character_def.cpp?cvsroot=gnash&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4022
retrieving revision 1.4023
diff -u -b -r1.4022 -r1.4023
--- ChangeLog	18 Aug 2007 07:19:26 -0000	1.4022
+++ ChangeLog	18 Aug 2007 08:04:59 -0000	1.4023
@@ -1,5 +1,21 @@
 2007-08-18 Sandro Santilli <strk@keybit.net>
 
+	* server/text.{cpp,h}: make text_style class store only the font
+	  pointer, w/out the font_id, provide setFont and getFont
+	  methods, the former always performing a lookup.
+	* server/parser/text_character_def.cpp (read): use
+	  text_style::setFont() to set the font this properly updates
+	  the actual font pointer in the text_format, fixing bug #20812.
+	* server/edit_text_character.cpp: use text_style::setFont() to
+	  set font by pointer.
+	* server/parser/: movie_definition.h, movie_def_impl.{h,cpp},
+	  sprite_definition.h: const-correct get_font() method.
+	* server/parser/movie_def_impl.{h,cpp}: const-corrected
+	  in_import_table(), made private and re-activated assertion
+	  checking temporarly removed during to GC layout changes.
+
+2007-08-18 Sandro Santilli <strk@keybit.net>
+
 	* server/parser/text_character_def.cpp: use symbolic names for
 	  tag types, more verbose parsing.
 

Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -b -r1.99 -r1.100
--- server/edit_text_character.cpp	16 Aug 2007 10:31:51 -0000	1.99
+++ server/edit_text_character.cpp	18 Aug 2007 08:04:59 -0000	1.100
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: edit_text_character.cpp,v 1.99 2007/08/16 10:31:51 strk Exp $ */
+/* $Id: edit_text_character.cpp,v 1.100 2007/08/18 08:04:59 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1019,7 +1019,7 @@
 	float	scale = m_def->get_font_height() / 1024.0f;	// the EM square is 1024 x 1024
 
 	text_glyph_record	rec;	// one to work on
-	rec.m_style.m_font = _font;
+	rec.m_style.setFont(_font);
 	rec.m_style.m_color = getTextColor(); 
 	rec.m_style.m_x_offset = PADDING_TWIPS + std::max(0, m_def->get_left_margin() + m_def->get_indent());
 	rec.m_style.m_y_offset = PADDING_TWIPS + m_def->get_font_height()
@@ -1092,7 +1092,7 @@
 
 			// Start a new record on the next line.
 			rec.m_glyphs.resize(0);
-			rec.m_style.m_font = _font;
+			rec.m_style.setFont(_font); 
 			rec.m_style.m_color = getTextColor();
 			rec.m_style.m_x_offset = x;
 			rec.m_style.m_y_offset = y;
@@ -1274,7 +1274,7 @@
 
 			// Start a new record on the next line.
 			rec.m_glyphs.resize(0);
-			rec.m_style.m_font = _font;
+			rec.m_style.setFont(_font);
 			rec.m_style.m_color = getTextColor();
 			rec.m_style.m_x_offset = x;
 			rec.m_style.m_y_offset = y;

Index: server/text.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/text.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- server/text.cpp	24 Jul 2007 19:57:10 -0000	1.35
+++ server/text.cpp	18 Aug 2007 08:04:59 -0000	1.36
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: text.cpp,v 1.35 2007/07/24 19:57:10 strk Exp $ */
+/* $Id: text.cpp,v 1.36 2007/08/18 08:04:59 strk Exp $ */
 
 // Based on the public domain work of Thatcher Ulrich <tu@tulrich.com> 2003
 
@@ -45,20 +45,23 @@
 
 namespace gnash {
 
-	void text_style::resolve_font(movie_definition* root_def) const
+	bool text_style::setFont(int id, movie_definition& root_def) 
 	{
-		if (m_font == NULL)
+		return resolve_font(id, root_def);
+	}
+
+	bool text_style::resolve_font(int id, const movie_definition& root_def)
 		{
-			assert(m_font_id >= 0);
+		assert(id >= 0);
 
-			m_font = root_def->get_font(m_font_id);
+		m_font = root_def.get_font(id);
 			if (m_font == NULL)
 			{
 				IF_VERBOSE_MALFORMED_SWF(
 	log_error(_("text style references unknown font (id = %d)"),
-		m_font_id);
+				id);
 				);
-			}
+			return false;
 		}
 	}
 
@@ -112,7 +115,7 @@
 
 			//rec.m_style.resolve_font(root_def);
 
-			const font*	fnt = rec.m_style.m_font;
+			const font*	fnt = rec.m_style.getFont();
 			if (fnt == NULL)
 			{
 #ifdef GNASH_DEBUG_TEXT_RENDERING
@@ -130,6 +133,7 @@
 
 #ifdef GNASH_DEBUG_TEXT_RENDERING
 			log_debug("text_screen_height for record %u == %g", i, text_screen_height);
+			log_debug("font for record %u == %p", i, (const void*)rec.m_style.getFont());
 #endif
 
 			int	nominal_glyph_height = fnt->get_texture_glyph_nominal_size();

Index: server/text.h
===================================================================
RCS file: /sources/gnash/gnash/server/text.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- server/text.h	24 Jul 2007 19:43:30 -0000	1.18
+++ server/text.h	18 Aug 2007 08:05:00 -0000	1.19
@@ -40,8 +40,6 @@
 	class text_style
 	{
 	public:
-		int	m_font_id;
-		mutable const font*	m_font;
 		rgba	m_color;
 		float	m_x_offset;
 		float	m_y_offset;
@@ -51,17 +49,67 @@
 
 		text_style()
 			:
-			m_font_id(-1),
-			m_font(NULL),
 			m_x_offset(0),
 			m_y_offset(0),
 			m_text_height(1.0f),
 			m_has_x_offset(false),
-			m_has_y_offset(false)
+			m_has_y_offset(false),
+			m_font(NULL)
 		{
 		}
 
-		void	resolve_font(movie_definition* root_def) const;
+		/// Set font by id and movie_definition
+		//
+		/// This method will perform a lookup from the movie_definition
+		/// and appropriately set the m_font member.
+		///
+		/// @param id
+		///	The font id.
+		///
+		/// @param root_def
+		///	The movie_definition used for looking up font by id
+		///
+		/// @return true on success, false on error (unknown font id)
+		///
+		bool setFont(int id, movie_definition& def);
+
+		/// Set font by font pointer.
+		//
+		/// @param fnt
+		///	The font pointer.
+		///	Must not be NULL or an assertion will fail.
+		///
+		bool setFont(const font* fnt)
+		{
+			assert(fnt);
+			m_font = fnt;
+		}
+
+		/// Return the associated font (possibly NULL).
+		//
+		/// @return 
+		///	The font associated with this style. 
+		///	NOTE: it may be NULL if a font set by id/movie_definition
+		///	      could not be resolved.
+		///
+		const font* getFont() const
+		{
+			return m_font;
+		}
+
+	private:
+
+		const font* m_font;
+
+		/// Set m_font based on m_font_id.
+		//
+		/// @param root_def
+		///	The movie_definition used for looking up font by id
+		///
+		/// @return true on success, false on error
+		///	(unknown font id, would print an swferror about it)
+		///
+		bool	resolve_font(int id, const movie_definition& root_def);
 	};
 
 

Index: server/parser/movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- server/parser/movie_def_impl.cpp	10 Jul 2007 16:21:40 -0000	1.79
+++ server/parser/movie_def_impl.cpp	18 Aug 2007 08:05:00 -0000	1.80
@@ -249,7 +249,7 @@
 	//assert(m_jpeg_in.get() == NULL);
 }
 
-bool movie_def_impl::in_import_table(int character_id)
+bool movie_def_impl::in_import_table(int character_id) const
 {
     for (size_t i = 0, n = m_imports.size(); i < n; i++)
         {
@@ -356,7 +356,7 @@
     m_fonts.insert(make_pair(font_id, boost::intrusive_ptr<font>(f)));
 }
 
-font* movie_def_impl::get_font(int font_id)
+font* movie_def_impl::get_font(int font_id) const
 {
 #ifndef NDEBUG
     // make sure font_id is resolved
@@ -367,12 +367,10 @@
         }
 #endif // not NDEBUG
 
-    FontMap::iterator it = m_fonts.find(font_id);
+    FontMap::const_iterator it = m_fonts.find(font_id);
     if ( it == m_fonts.end() ) return NULL;
     boost::intrusive_ptr<font> f = it->second;
-#ifndef GNASH_USE_GC
     assert(f->get_ref_count() > 1);
-#endif // ndef GNASH_USE_GC
     return f.get();
 }
 

Index: server/parser/movie_def_impl.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- server/parser/movie_def_impl.h	9 Aug 2007 12:18:07 -0000	1.51
+++ server/parser/movie_def_impl.h	18 Aug 2007 08:05:00 -0000	1.52
@@ -321,6 +321,10 @@
 	/// A flag set to true when load cancelation is requested
 	bool _loadingCanceled;
 
+	/// Debug helper; returns true if the given
+	/// character_id is listed in the import table.
+	bool in_import_table(int character_id) const;
+
 public:
 
 	movie_def_impl(create_bitmaps_flag cbf, create_font_shapes_flag cfs);
@@ -425,10 +429,6 @@
 	    m_imports.push_back(import_info(source_url, id, symbol));
 	}
 
-	/// Debug helper; returns true if the given
-	/// character_id is listed in the import table.
-	bool in_import_table(int character_id);
-
 	/// \brief
 	/// Calls back the visitor for each movie that we
 	/// import symbols from.
@@ -453,7 +453,7 @@
 
 	void	add_font(int font_id, font* f);
 
-	font*	get_font(int font_id);
+	font*	get_font(int font_id) const;
 
 	// See dox in movie_definition.h
 	bitmap_character_def*	get_bitmap_character_def(int character_id);

Index: server/parser/movie_definition.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_definition.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- server/parser/movie_definition.h	9 Aug 2007 12:18:07 -0000	1.28
+++ server/parser/movie_definition.h	18 Aug 2007 08:05:00 -0000	1.29
@@ -326,7 +326,7 @@
 	///
 	/// @see add_font
 	///
-	virtual font* get_font(int /*id*/)
+	virtual font* get_font(int /*id*/) const
 	{
 		return NULL;
 	}

Index: server/parser/sprite_definition.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/sprite_definition.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/parser/sprite_definition.h	9 Aug 2007 12:18:07 -0000	1.27
+++ server/parser/sprite_definition.h	18 Aug 2007 08:05:00 -0000	1.28
@@ -189,7 +189,7 @@
 	}
 
 	/// Delegate call to associated root movie
-	virtual font* get_font(int id)
+	virtual font* get_font(int id) const
 	{
 		return m_movie_def->get_font(id);
 	}

Index: server/parser/text_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/text_character_def.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/parser/text_character_def.cpp	18 Aug 2007 06:20:07 -0000	1.5
+++ server/parser/text_character_def.cpp	18 Aug 2007 08:05:00 -0000	1.6
@@ -66,10 +66,13 @@
 			if (has_font)
 			{
 				uint16_t	font_id = in->read_u16();
-				style.m_font_id = font_id;
-				style.resolve_font(m);
+				if ( ! style.setFont(font_id, *m) )
+				{
+					// setFont would have already printed an swferror on failure
+				}
+
 				IF_VERBOSE_PARSE(
-				log_parse(_("  has_font: font id = %d"), font_id);
+				log_parse(_("  has_font: font id = %d (%p)"), font_id, (void*)style.getFont());
 				);
 			}
 			if (has_color)
@@ -137,7 +140,7 @@
 
 			m_text_glyph_records.resize(m_text_glyph_records.size() + 1);
 			text_glyph_record& grecord = m_text_glyph_records.back();
-			grecord.m_style = style;
+			grecord.m_style = style; // copy current style
 			grecord.read(in, glyph_count, glyph_bits, advance_bits);
 
 			IF_VERBOSE_PARSE(



From MAILER-DAEMON Sat Aug 18 04:06:28 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMJKG-0000mZ-91
	for mharc-gnash-commit@gnu.org; Sat, 18 Aug 2007 04:06:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMJKE-0000m7-Uc
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 04:06:26 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMJKC-0000lv-U8
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 04:06:26 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMJKC-0000ls-Pg
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 04:06:24 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMJKC-0007e4-GM
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 04:06:24 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMJKB-0002C0-Ov
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 08:06:23 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMJKB-0002Bx-Kv
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 08:06:23 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMJKB-0002Bx-Kv@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 18 Aug 2007 08:06:23 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/edit_text_character.cpp ...
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2007 08:06:27 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/18 08:06:23

Modified files:
	.              : ChangeLog 
	server         : edit_text_character.cpp text.cpp text.h 
	server/parser  : movie_def_impl.cpp movie_def_impl.h 
	                 movie_definition.h sprite_definition.h 
	                 text_character_def.cpp 

Log message:
	        * server/text.{cpp,h}: make text_style class store only the font
	          pointer, w/out the font_id, provide setFont and getFont
	          methods, the former always performing a lookup.
	        * server/parser/text_character_def.cpp (read): use
	          text_style::setFont() to set the font this properly updates
	          the actual font pointer in the text_format, fixing bug #20812.
	        * server/edit_text_character.cpp: use text_style::setFont() to
	          set font by pointer.
	        * server/parser/: movie_definition.h, movie_def_impl.{h,cpp},
	          sprite_definition.h: const-correct get_font() method.
	        * server/parser/movie_def_impl.{h,cpp}: const-corrected
	          in_import_table(), made private and re-activated assertion
	          checking temporarly removed during to GC layout changes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.29&r2=1.3971.2.30
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.96&r2=1.96.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/text.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.35&r2=1.35.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/text.h?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.18&r2=1.18.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.79&r2=1.79.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.h?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.50&r2=1.50.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_definition.h?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.27&r2=1.27.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/sprite_definition.h?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.26&r2=1.26.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/text_character_def.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.4.2.1&r2=1.4.2.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.29
retrieving revision 1.3971.2.30
diff -u -b -r1.3971.2.29 -r1.3971.2.30
--- ChangeLog	18 Aug 2007 07:19:29 -0000	1.3971.2.29
+++ ChangeLog	18 Aug 2007 08:06:21 -0000	1.3971.2.30
@@ -1,5 +1,21 @@
 2007-08-18 Sandro Santilli <strk@keybit.net>
 
+	* server/text.{cpp,h}: make text_style class store only the font
+	  pointer, w/out the font_id, provide setFont and getFont
+	  methods, the former always performing a lookup.
+	* server/parser/text_character_def.cpp (read): use
+	  text_style::setFont() to set the font this properly updates
+	  the actual font pointer in the text_format, fixing bug #20812.
+	* server/edit_text_character.cpp: use text_style::setFont() to
+	  set font by pointer.
+	* server/parser/: movie_definition.h, movie_def_impl.{h,cpp},
+	  sprite_definition.h: const-correct get_font() method.
+	* server/parser/movie_def_impl.{h,cpp}: const-corrected
+	  in_import_table(), made private and re-activated assertion
+	  checking temporarly removed during to GC layout changes.
+
+2007-08-18 Sandro Santilli <strk@keybit.net>
+
 	* server/parser/text_character_def.cpp: use symbolic names for
 	  tag types, more verbose parsing.
 

Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.96
retrieving revision 1.96.2.1
diff -u -b -r1.96 -r1.96.2.1
--- server/edit_text_character.cpp	2 Aug 2007 21:23:42 -0000	1.96
+++ server/edit_text_character.cpp	18 Aug 2007 08:06:22 -0000	1.96.2.1
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: edit_text_character.cpp,v 1.96 2007/08/02 21:23:42 strk Exp $ */
+/* $Id: edit_text_character.cpp,v 1.96.2.1 2007/08/18 08:06:22 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -925,7 +925,7 @@
 	float	scale = m_def->get_font_height() / 1024.0f;	// the EM square is 1024 x 1024
 
 	text_glyph_record	rec;	// one to work on
-	rec.m_style.m_font = _font;
+	rec.m_style.setFont(_font);
 	rec.m_style.m_color = getTextColor(); 
 	rec.m_style.m_x_offset = PADDING_TWIPS + std::max(0, m_def->get_left_margin() + m_def->get_indent());
 	rec.m_style.m_y_offset = PADDING_TWIPS + m_def->get_font_height()
@@ -998,7 +998,7 @@
 
 			// Start a new record on the next line.
 			rec.m_glyphs.resize(0);
-			rec.m_style.m_font = _font;
+			rec.m_style.setFont(_font); 
 			rec.m_style.m_color = getTextColor();
 			rec.m_style.m_x_offset = x;
 			rec.m_style.m_y_offset = y;
@@ -1172,7 +1172,7 @@
 
 			// Start a new record on the next line.
 			rec.m_glyphs.resize(0);
-			rec.m_style.m_font = _font;
+			rec.m_style.setFont(_font);
 			rec.m_style.m_color = getTextColor();
 			rec.m_style.m_x_offset = x;
 			rec.m_style.m_y_offset = y;

Index: server/text.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/text.cpp,v
retrieving revision 1.35
retrieving revision 1.35.2.1
diff -u -b -r1.35 -r1.35.2.1
--- server/text.cpp	24 Jul 2007 19:57:10 -0000	1.35
+++ server/text.cpp	18 Aug 2007 08:06:22 -0000	1.35.2.1
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: text.cpp,v 1.35 2007/07/24 19:57:10 strk Exp $ */
+/* $Id: text.cpp,v 1.35.2.1 2007/08/18 08:06:22 strk Exp $ */
 
 // Based on the public domain work of Thatcher Ulrich <tu@tulrich.com> 2003
 
@@ -45,20 +45,23 @@
 
 namespace gnash {
 
-	void text_style::resolve_font(movie_definition* root_def) const
+	bool text_style::setFont(int id, movie_definition& root_def) 
 	{
-		if (m_font == NULL)
+		return resolve_font(id, root_def);
+	}
+
+	bool text_style::resolve_font(int id, const movie_definition& root_def)
 		{
-			assert(m_font_id >= 0);
+		assert(id >= 0);
 
-			m_font = root_def->get_font(m_font_id);
+		m_font = root_def.get_font(id);
 			if (m_font == NULL)
 			{
 				IF_VERBOSE_MALFORMED_SWF(
 	log_error(_("text style references unknown font (id = %d)"),
-		m_font_id);
+				id);
 				);
-			}
+			return false;
 		}
 	}
 
@@ -112,7 +115,7 @@
 
 			//rec.m_style.resolve_font(root_def);
 
-			const font*	fnt = rec.m_style.m_font;
+			const font*	fnt = rec.m_style.getFont();
 			if (fnt == NULL)
 			{
 #ifdef GNASH_DEBUG_TEXT_RENDERING
@@ -130,6 +133,7 @@
 
 #ifdef GNASH_DEBUG_TEXT_RENDERING
 			log_debug("text_screen_height for record %u == %g", i, text_screen_height);
+			log_debug("font for record %u == %p", i, (const void*)rec.m_style.getFont());
 #endif
 
 			int	nominal_glyph_height = fnt->get_texture_glyph_nominal_size();

Index: server/text.h
===================================================================
RCS file: /sources/gnash/gnash/server/text.h,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -u -b -r1.18 -r1.18.2.1
--- server/text.h	24 Jul 2007 19:43:30 -0000	1.18
+++ server/text.h	18 Aug 2007 08:06:22 -0000	1.18.2.1
@@ -40,8 +40,6 @@
 	class text_style
 	{
 	public:
-		int	m_font_id;
-		mutable const font*	m_font;
 		rgba	m_color;
 		float	m_x_offset;
 		float	m_y_offset;
@@ -51,17 +49,67 @@
 
 		text_style()
 			:
-			m_font_id(-1),
-			m_font(NULL),
 			m_x_offset(0),
 			m_y_offset(0),
 			m_text_height(1.0f),
 			m_has_x_offset(false),
-			m_has_y_offset(false)
+			m_has_y_offset(false),
+			m_font(NULL)
 		{
 		}
 
-		void	resolve_font(movie_definition* root_def) const;
+		/// Set font by id and movie_definition
+		//
+		/// This method will perform a lookup from the movie_definition
+		/// and appropriately set the m_font member.
+		///
+		/// @param id
+		///	The font id.
+		///
+		/// @param root_def
+		///	The movie_definition used for looking up font by id
+		///
+		/// @return true on success, false on error (unknown font id)
+		///
+		bool setFont(int id, movie_definition& def);
+
+		/// Set font by font pointer.
+		//
+		/// @param fnt
+		///	The font pointer.
+		///	Must not be NULL or an assertion will fail.
+		///
+		bool setFont(const font* fnt)
+		{
+			assert(fnt);
+			m_font = fnt;
+		}
+
+		/// Return the associated font (possibly NULL).
+		//
+		/// @return 
+		///	The font associated with this style. 
+		///	NOTE: it may be NULL if a font set by id/movie_definition
+		///	      could not be resolved.
+		///
+		const font* getFont() const
+		{
+			return m_font;
+		}
+
+	private:
+
+		const font* m_font;
+
+		/// Set m_font based on m_font_id.
+		//
+		/// @param root_def
+		///	The movie_definition used for looking up font by id
+		///
+		/// @return true on success, false on error
+		///	(unknown font id, would print an swferror about it)
+		///
+		bool	resolve_font(int id, const movie_definition& root_def);
 	};
 
 

Index: server/parser/movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.cpp,v
retrieving revision 1.79
retrieving revision 1.79.2.1
diff -u -b -r1.79 -r1.79.2.1
--- server/parser/movie_def_impl.cpp	10 Jul 2007 16:21:40 -0000	1.79
+++ server/parser/movie_def_impl.cpp	18 Aug 2007 08:06:22 -0000	1.79.2.1
@@ -249,7 +249,7 @@
 	//assert(m_jpeg_in.get() == NULL);
 }
 
-bool movie_def_impl::in_import_table(int character_id)
+bool movie_def_impl::in_import_table(int character_id) const
 {
     for (size_t i = 0, n = m_imports.size(); i < n; i++)
         {
@@ -356,7 +356,7 @@
     m_fonts.insert(make_pair(font_id, boost::intrusive_ptr<font>(f)));
 }
 
-font* movie_def_impl::get_font(int font_id)
+font* movie_def_impl::get_font(int font_id) const
 {
 #ifndef NDEBUG
     // make sure font_id is resolved
@@ -367,12 +367,10 @@
         }
 #endif // not NDEBUG
 
-    FontMap::iterator it = m_fonts.find(font_id);
+    FontMap::const_iterator it = m_fonts.find(font_id);
     if ( it == m_fonts.end() ) return NULL;
     boost::intrusive_ptr<font> f = it->second;
-#ifndef GNASH_USE_GC
     assert(f->get_ref_count() > 1);
-#endif // ndef GNASH_USE_GC
     return f.get();
 }
 

Index: server/parser/movie_def_impl.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.h,v
retrieving revision 1.50
retrieving revision 1.50.2.1
diff -u -b -r1.50 -r1.50.2.1
--- server/parser/movie_def_impl.h	1 Jul 2007 17:34:59 -0000	1.50
+++ server/parser/movie_def_impl.h	18 Aug 2007 08:06:23 -0000	1.50.2.1
@@ -321,6 +321,10 @@
 	/// A flag set to true when load cancelation is requested
 	bool _loadingCanceled;
 
+	/// Debug helper; returns true if the given
+	/// character_id is listed in the import table.
+	bool in_import_table(int character_id) const;
+
 public:
 
 	movie_def_impl(create_bitmaps_flag cbf, create_font_shapes_flag cfs);
@@ -425,10 +429,6 @@
 	    m_imports.push_back(import_info(source_url, id, symbol));
 	}
 
-	/// Debug helper; returns true if the given
-	/// character_id is listed in the import table.
-	bool in_import_table(int character_id);
-
 	/// \brief
 	/// Calls back the visitor for each movie that we
 	/// import symbols from.
@@ -453,7 +453,7 @@
 
 	void	add_font(int font_id, font* f);
 
-	font*	get_font(int font_id);
+	font*	get_font(int font_id) const;
 
 	// See dox in movie_definition.h
 	bitmap_character_def*	get_bitmap_character_def(int character_id);

Index: server/parser/movie_definition.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_definition.h,v
retrieving revision 1.27
retrieving revision 1.27.2.1
diff -u -b -r1.27 -r1.27.2.1
--- server/parser/movie_definition.h	1 Jul 2007 10:54:34 -0000	1.27
+++ server/parser/movie_definition.h	18 Aug 2007 08:06:23 -0000	1.27.2.1
@@ -326,7 +326,7 @@
 	///
 	/// @see add_font
 	///
-	virtual font* get_font(int /*id*/)
+	virtual font* get_font(int /*id*/) const
 	{
 		return NULL;
 	}

Index: server/parser/sprite_definition.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/sprite_definition.h,v
retrieving revision 1.26
retrieving revision 1.26.2.1
diff -u -b -r1.26 -r1.26.2.1
--- server/parser/sprite_definition.h	5 Jul 2007 19:29:10 -0000	1.26
+++ server/parser/sprite_definition.h	18 Aug 2007 08:06:23 -0000	1.26.2.1
@@ -189,7 +189,7 @@
 	}
 
 	/// Delegate call to associated root movie
-	virtual font* get_font(int id)
+	virtual font* get_font(int id) const
 	{
 		return m_movie_def->get_font(id);
 	}

Index: server/parser/text_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/text_character_def.cpp,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -b -r1.4.2.1 -r1.4.2.2
--- server/parser/text_character_def.cpp	18 Aug 2007 06:20:01 -0000	1.4.2.1
+++ server/parser/text_character_def.cpp	18 Aug 2007 08:06:23 -0000	1.4.2.2
@@ -66,10 +66,13 @@
 			if (has_font)
 			{
 				uint16_t	font_id = in->read_u16();
-				style.m_font_id = font_id;
-				style.resolve_font(m);
+				if ( ! style.setFont(font_id, *m) )
+				{
+					// setFont would have already printed an swferror on failure
+				}
+
 				IF_VERBOSE_PARSE(
-				log_parse(_("  has_font: font id = %d"), font_id);
+				log_parse(_("  has_font: font id = %d (%p)"), font_id, (void*)style.getFont());
 				);
 			}
 			if (has_color)
@@ -137,7 +140,7 @@
 
 			m_text_glyph_records.resize(m_text_glyph_records.size() + 1);
 			text_glyph_record& grecord = m_text_glyph_records.back();
-			grecord.m_style = style;
+			grecord.m_style = style; // copy current style
 			grecord.read(in, glyph_count, glyph_bits, advance_bits);
 
 			IF_VERBOSE_PARSE(



From MAILER-DAEMON Sat Aug 18 05:53:43 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IML02-0001Oe-SC
	for mharc-gnash-commit@gnu.org; Sat, 18 Aug 2007 05:53:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IML00-0001I7-70
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 05:53:40 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMKzy-0001Ee-3J
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 05:53:38 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMKzx-0001EB-ST
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 05:53:37 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMKzx-0006pW-GS
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 05:53:37 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMKzv-00012Z-OX
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 09:53:35 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMKzv-00012V-G1
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 09:53:35 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMKzv-00012V-G1@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 18 Aug 2007 09:53:35 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog macros/firefox.m4
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2007 09:53:40 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/18 09:53:35

Modified files:
	.              : ChangeLog 
	macros         : firefox.m4 

Log message:
	        * macros/firefox.m4: don't substitute GNASHEXE at all, it's not
	          used anymore.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4023&r2=1.4024
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/firefox.m4?cvsroot=gnash&r1=1.26&r2=1.27

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4023
retrieving revision 1.4024
diff -u -b -r1.4023 -r1.4024
--- ChangeLog	18 Aug 2007 08:04:59 -0000	1.4023
+++ ChangeLog	18 Aug 2007 09:53:34 -0000	1.4024
@@ -1,5 +1,10 @@
 2007-08-18 Sandro Santilli <strk@keybit.net>
 
+	* macros/firefox.m4: don't substitute GNASHEXE at all, it's not
+	  used anymore.
+
+2007-08-18 Sandro Santilli <strk@keybit.net>
+
 	* server/text.{cpp,h}: make text_style class store only the font
 	  pointer, w/out the font_id, provide setFont and getFont
 	  methods, the former always performing a lookup.

Index: macros/firefox.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/firefox.m4,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- macros/firefox.m4	18 Aug 2007 02:54:21 -0000	1.26
+++ macros/firefox.m4	18 Aug 2007 09:53:35 -0000	1.27
@@ -34,13 +34,13 @@
 dnl   esac], plugin=yes)
 
   FIREFOX_PLUGINS=""
-  GNASHEXE=""
   if test x"${nsapi}" = x"yes"; then
 
     AC_ARG_WITH(plugindir, AC_HELP_STRING([--with-plugindir=DIR], [Directory to install Firefox plugin in]),
       [FIREFOX_PLUGINS=$withval]
     )
 
+dnl  GNASHEXE=""
 dnl     dnl Allow setting a path for the Gnash executable to be different from the prefix. This
 dnl     dnl is mostly only used for cross compiling.
 dnl     AC_ARG_WITH(gnashexe, AC_HELP_STRING([--with-gnashexe=DIR], [Directory to where the gnash executable is]),
@@ -54,6 +54,7 @@
 dnl     else
 dnl       GNASHEXE=${gnashbindir}
 dnl     fi
+dnl  AC_SUBST(GNASHEXE)
 
     dnl Always install the plugin in the users home directory. We
     dnl always use .mozilla instead of .firefox, as this directoryis
@@ -63,7 +64,6 @@
     fi
   fi
 
-  AC_SUBST(GNASHEXE)
   AC_SUBST(FIREFOX_PLUGINS)
 
 ])dnl end of GNASH_PATH_FIREFOX



From MAILER-DAEMON Sat Aug 18 05:53:46 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IML06-0001VI-1W
	for mharc-gnash-commit@gnu.org; Sat, 18 Aug 2007 05:53:46 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IML04-0001So-NS
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 05:53:44 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IML03-0001QI-El
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 05:53:44 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IML03-0001Pc-7G
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 05:53:43 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IML02-0006rQ-RD
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 05:53:42 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IML02-00012p-55
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 09:53:42 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IML01-00012m-QP
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 09:53:41 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IML01-00012m-QP@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 18 Aug 2007 09:53:41 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog macros/firefox.m4 [release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2007 09:53:45 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/18 09:53:41

Modified files:
	.              : ChangeLog 
	macros         : firefox.m4 

Log message:
	        * macros/firefox.m4: don't substitute GNASHEXE at all, it's not
	          used anymore.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.30&r2=1.3971.2.31
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/firefox.m4?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.25.2.1&r2=1.25.2.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.30
retrieving revision 1.3971.2.31
diff -u -b -r1.3971.2.30 -r1.3971.2.31
--- ChangeLog	18 Aug 2007 08:06:21 -0000	1.3971.2.30
+++ ChangeLog	18 Aug 2007 09:53:40 -0000	1.3971.2.31
@@ -1,5 +1,10 @@
 2007-08-18 Sandro Santilli <strk@keybit.net>
 
+	* macros/firefox.m4: don't substitute GNASHEXE at all, it's not
+	  used anymore.
+
+2007-08-18 Sandro Santilli <strk@keybit.net>
+
 	* server/text.{cpp,h}: make text_style class store only the font
 	  pointer, w/out the font_id, provide setFont and getFont
 	  methods, the former always performing a lookup.

Index: macros/firefox.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/firefox.m4,v
retrieving revision 1.25.2.1
retrieving revision 1.25.2.2
diff -u -b -r1.25.2.1 -r1.25.2.2
--- macros/firefox.m4	18 Aug 2007 02:54:16 -0000	1.25.2.1
+++ macros/firefox.m4	18 Aug 2007 09:53:41 -0000	1.25.2.2
@@ -34,13 +34,13 @@
 dnl   esac], plugin=yes)
 
   FIREFOX_PLUGINS=""
-  GNASHEXE=""
   if test x"${nsapi}" = x"yes"; then
 
     AC_ARG_WITH(plugindir, AC_HELP_STRING([--with-plugindir=DIR], [Directory to install Firefox plugin in]),
       [FIREFOX_PLUGINS=$withval]
     )
 
+dnl  GNASHEXE=""
 dnl     dnl Allow setting a path for the Gnash executable to be different from the prefix. This
 dnl     dnl is mostly only used for cross compiling.
 dnl     AC_ARG_WITH(gnashexe, AC_HELP_STRING([--with-gnashexe=DIR], [Directory to where the gnash executable is]),
@@ -54,6 +54,7 @@
 dnl     else
 dnl       GNASHEXE=${gnashbindir}
 dnl     fi
+dnl  AC_SUBST(GNASHEXE)
 
     dnl Always install the plugin in the users home directory. We
     dnl always use .mozilla instead of .firefox, as this directoryis
@@ -63,7 +64,6 @@
     fi
   fi
 
-  AC_SUBST(GNASHEXE)
   AC_SUBST(FIREFOX_PLUGINS)
 
 ])dnl end of GNASH_PATH_FIREFOX



From MAILER-DAEMON Sat Aug 18 07:58:04 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMMwO-0006h9-AD
	for mharc-gnash-commit@gnu.org; Sat, 18 Aug 2007 07:58:04 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMMwM-0006gq-8g
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 07:58:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMMwK-0006fk-91
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 07:58:00 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMMwK-0006ff-3N
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 07:58:00 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMMwJ-0001zc-LX
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 07:57:59 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMMwI-0000tk-7W
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 11:57:58 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMMwI-0000th-3x
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 11:57:58 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMMwI-0000th-3x@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 18 Aug 2007 11:57:58 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/as_object.h [release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2007 11:58:02 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/18 11:57:58

Modified files:
	.              : ChangeLog 
	server         : as_object.h 

Log message:
	        * server/as_object.h (ensureType): fix printing of *source* type
	          name.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.31&r2=1.3971.2.32
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_object.h?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.62&r2=1.62.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.31
retrieving revision 1.3971.2.32
diff -u -b -r1.3971.2.31 -r1.3971.2.32
--- ChangeLog	18 Aug 2007 09:53:40 -0000	1.3971.2.31
+++ ChangeLog	18 Aug 2007 11:57:57 -0000	1.3971.2.32
@@ -1,5 +1,7 @@
 2007-08-18 Sandro Santilli <strk@keybit.net>
 
+	* server/as_object.h (ensureType): fix printing of *source* type
+	  name.
 	* macros/firefox.m4: don't substitute GNASHEXE at all, it's not
 	  used anymore.
 

Index: server/as_object.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_object.h,v
retrieving revision 1.62
retrieving revision 1.62.2.1
diff -u -b -r1.62 -r1.62.2.1
--- server/as_object.h	24 Jul 2007 13:08:56 -0000	1.62
+++ server/as_object.h	18 Aug 2007 11:57:57 -0000	1.62.2.1
@@ -557,7 +557,7 @@
 
 	if (!ret) {
 		std::string     target = typeid(T).name(),
-				source = typeid(obj.get()).name();
+				source = typeid(*obj.get()).name();
 #if defined(__GNUC__) && __GNUC__ > 2
 		int status;
 		char* target_unmangled = 



From MAILER-DAEMON Sat Aug 18 07:58:11 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMMwV-0006jH-OV
	for mharc-gnash-commit@gnu.org; Sat, 18 Aug 2007 07:58:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMMwT-0006iz-AM
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 07:58:09 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMMwS-0006in-Sl
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 07:58:08 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMMwS-0006ik-Ml
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 07:58:08 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMMwS-00021S-6H
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 07:58:08 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMMwR-0000uF-Ju
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 11:58:07 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMMwR-0000uC-Fe
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 11:58:07 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMMwR-0000uC-Fe@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 18 Aug 2007 11:58:07 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/as_object.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2007 11:58:09 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/18 11:58:07

Modified files:
	.              : ChangeLog 
	server         : as_object.h 

Log message:
	        * server/as_object.h (ensureType): fix printing of *source* type
	          name.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4024&r2=1.4025
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_object.h?cvsroot=gnash&r1=1.62&r2=1.63

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4024
retrieving revision 1.4025
diff -u -b -r1.4024 -r1.4025
--- ChangeLog	18 Aug 2007 09:53:34 -0000	1.4024
+++ ChangeLog	18 Aug 2007 11:58:06 -0000	1.4025
@@ -1,5 +1,7 @@
 2007-08-18 Sandro Santilli <strk@keybit.net>
 
+	* server/as_object.h (ensureType): fix printing of *source* type
+	  name.
 	* macros/firefox.m4: don't substitute GNASHEXE at all, it's not
 	  used anymore.
 

Index: server/as_object.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_object.h,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- server/as_object.h	24 Jul 2007 13:08:56 -0000	1.62
+++ server/as_object.h	18 Aug 2007 11:58:07 -0000	1.63
@@ -557,7 +557,7 @@
 
 	if (!ret) {
 		std::string     target = typeid(T).name(),
-				source = typeid(obj.get()).name();
+				source = typeid(*obj.get()).name();
 #if defined(__GNUC__) && __GNUC__ > 2
 		int status;
 		char* target_unmangled = 



From MAILER-DAEMON Sat Aug 18 08:24:44 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMNMC-0002QP-OX
	for mharc-gnash-commit@gnu.org; Sat, 18 Aug 2007 08:24:44 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMNMB-0002Ow-VE
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 08:24:43 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMNMB-0002Nv-4u
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 08:24:43 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMNMA-0002Nm-U7
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 08:24:42 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMNMA-0000yf-Ji
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 08:24:42 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMNM9-0003Cj-Fb
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 12:24:41 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMNM9-0003Cg-9P
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 12:24:41 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMNM9-0003Cg-9P@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 18 Aug 2007 12:24:41 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog configure.ac plugin/plugin.cpp ...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2007 12:24:44 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/18 12:24:41

Modified files:
	.              : ChangeLog configure.ac 
	plugin         : plugin.cpp 
	server/vm      : VM.cpp 

Log message:
	Patch #6154 by Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
	
	 * configure.ac: define flash player version macros
	   for compatibility detectors.
	 * plugin/plugin.cpp: build the flash player version
	   using provided macros.
	 * server/vm/VM.cpp: buil flash player version using
	   provided macros.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4025&r2=1.4026
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.400&r2=1.401
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/plugin.cpp?cvsroot=gnash&r1=1.82&r2=1.83
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/VM.cpp?cvsroot=gnash&r1=1.13&r2=1.14

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4025
retrieving revision 1.4026
diff -u -b -r1.4025 -r1.4026
--- ChangeLog	18 Aug 2007 11:58:06 -0000	1.4025
+++ ChangeLog	18 Aug 2007 12:24:40 -0000	1.4026
@@ -1,3 +1,12 @@
+2007-08-18 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
+
+	* configure.ac: define flash player version macros
+	  for compatibility detectors.
+	* plugin/plugin.cpp: build the flash player version
+	  using provided macros.
+	* server/vm/VM.cpp: buil flash player version using
+	  provided macros.
+
 2007-08-18 Sandro Santilli <strk@keybit.net>
 
 	* server/as_object.h (ensureType): fix printing of *source* type

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.400
retrieving revision 1.401
diff -u -b -r1.400 -r1.401
--- configure.ac	16 Aug 2007 23:26:02 -0000	1.400
+++ configure.ac	18 Aug 2007 12:24:40 -0000	1.401
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.400 2007/08/16 23:26:02 strk Exp $
+dnl $Id: configure.ac,v 1.401 2007/08/18 12:24:40 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -26,6 +26,13 @@
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 
+dnl Set the default values for Flash Version. These are converted into
+dnl various strings to make JavaScript or ActionScript detectors
+dnl recognize Gnash as a Flash Player.
+AC_DEFINE([DEFAULT_FLASH_MAJOR_VERSION], ["8"], [Default Flash major version])
+AC_DEFINE([DEFAULT_FLASH_MINOR_VERSION], ["0"], [Default Flash minor version])
+AC_DEFINE([DEFAULT_FLASH_REV_NUMBER], ["99"], [Default Flash revision number])
+
 dnl Some things you can only do by looking at the platform name.
 case "${host}" in
   powerpc-apple-darwin*)

Index: plugin/plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/plugin.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- plugin/plugin.cpp	17 Aug 2007 13:57:36 -0000	1.82
+++ plugin/plugin.cpp	18 Aug 2007 12:24:40 -0000	1.83
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: plugin.cpp,v 1.82 2007/08/17 13:57:36 strk Exp $ */
+/* $Id: plugin.cpp,v 1.83 2007/08/18 12:24:40 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -30,7 +30,9 @@
 //Some javascript plugin detectors use the description
 //to decide the flash version to display. They expect the
 //form (major version).(minor version) r(revision).
-#define FLASH_VERSION "8.0 r99."
+//e.g. "8.0 r99."
+#define FLASH_VERSION DEFAULT_FLASH_MAJOR_VERSION"."\
+	DEFAULT_FLASH_MINOR_VERSION" r"DEFAULT_FLASH_REV_NUMBER"."
 
 #define PLUGIN_DESCRIPTION \
   "Shockwave Flash "FLASH_VERSION" Gnash "VERSION", the GNU Flash Player. \
@@ -59,6 +61,7 @@
 #include <vector>
 #include <iostream>
 
+
 // Mozilla SDK headers
 #include "prinit.h"
 #include "prlock.h"

Index: server/vm/VM.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/VM.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/vm/VM.cpp	17 Aug 2007 13:57:36 -0000	1.13
+++ server/vm/VM.cpp	18 Aug 2007 12:24:41 -0000	1.14
@@ -16,7 +16,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: VM.cpp,v 1.13 2007/08/17 13:57:36 strk Exp $ */
+/* $Id: VM.cpp,v 1.14 2007/08/18 12:24:41 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -110,9 +110,11 @@
 	//    the last ,0 is necessary, even if it doesn't appear
 	//    to mean anything.
 	//    
-	// TODO: use config.h for the default, query RcInit file for an override
+	// TODO: query RcInit file for an override
 	//
-#define FLASH_VERSION "GSH 8,0,99,0"
+#define FLASH_VERSION "GSH "DEFAULT_FLASH_MAJOR_VERSION","\
+        DEFAULT_FLASH_MINOR_VERSION","DEFAULT_FLASH_REV_NUMBER",0"
+
 	static const std::string version(FLASH_VERSION);
 	return version;
 }



From MAILER-DAEMON Sat Aug 18 08:37:23 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMNYR-0003tS-0S
	for mharc-gnash-commit@gnu.org; Sat, 18 Aug 2007 08:37:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMNYP-0003tJ-Oh
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 08:37:21 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMNYO-0003sy-La
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 08:37:21 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMNYO-0003sv-HY
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 08:37:20 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMNYO-00040k-7D
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 08:37:20 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMNYN-0003Nc-4h
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 12:37:19 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMNYN-0003NZ-0f
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 12:37:19 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMNYN-0003NZ-0f@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 18 Aug 2007 12:37:19 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog configure.ac plugin/plugin.cpp ...
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2007 12:37:21 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/18 12:37:18

Modified files:
	.              : ChangeLog configure.ac 
	plugin         : plugin.cpp 
	server/vm      : VM.cpp 

Log message:
	Patch #6154 by Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
	
	 * configure.ac: define flash player version macros
	   for compatibility detectors.
	 * plugin/plugin.cpp: build the flash player version
	   using provided macros.
	 * server/vm/VM.cpp: buil flash player version using
	   provided macros.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.32&r2=1.3971.2.33
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.396.2.4&r2=1.396.2.5
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/plugin.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.81.2.1&r2=1.81.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/VM.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.12.2.1&r2=1.12.2.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.32
retrieving revision 1.3971.2.33
diff -u -b -r1.3971.2.32 -r1.3971.2.33
--- ChangeLog	18 Aug 2007 11:57:57 -0000	1.3971.2.32
+++ ChangeLog	18 Aug 2007 12:37:17 -0000	1.3971.2.33
@@ -1,3 +1,12 @@
+2007-08-18 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
+
+	* configure.ac: define flash player version macros
+	  for compatibility detectors.
+	* plugin/plugin.cpp: build the flash player version
+	  using provided macros.
+	* server/vm/VM.cpp: buil flash player version using
+	  provided macros.
+
 2007-08-18 Sandro Santilli <strk@keybit.net>
 
 	* server/as_object.h (ensureType): fix printing of *source* type

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.396.2.4
retrieving revision 1.396.2.5
diff -u -b -r1.396.2.4 -r1.396.2.5
--- configure.ac	16 Aug 2007 23:25:54 -0000	1.396.2.4
+++ configure.ac	18 Aug 2007 12:37:18 -0000	1.396.2.5
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.396.2.4 2007/08/16 23:25:54 strk Exp $
+dnl $Id: configure.ac,v 1.396.2.5 2007/08/18 12:37:18 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, 0.8.1)
@@ -26,6 +26,13 @@
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 
+dnl Set the default values for Flash Version. These are converted into
+dnl various strings to make JavaScript or ActionScript detectors
+dnl recognize Gnash as a Flash Player.
+AC_DEFINE([DEFAULT_FLASH_MAJOR_VERSION], ["8"], [Default Flash major version])
+AC_DEFINE([DEFAULT_FLASH_MINOR_VERSION], ["0"], [Default Flash minor version])
+AC_DEFINE([DEFAULT_FLASH_REV_NUMBER], ["99"], [Default Flash revision number])
+
 dnl Some things you can only do by looking at the platform name.
 case "${host}" in
   powerpc-apple-darwin*)

Index: plugin/plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/plugin.cpp,v
retrieving revision 1.81.2.1
retrieving revision 1.81.2.2
diff -u -b -r1.81.2.1 -r1.81.2.2
--- plugin/plugin.cpp	17 Aug 2007 14:02:39 -0000	1.81.2.1
+++ plugin/plugin.cpp	18 Aug 2007 12:37:18 -0000	1.81.2.2
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: plugin.cpp,v 1.81.2.1 2007/08/17 14:02:39 strk Exp $ */
+/* $Id: plugin.cpp,v 1.81.2.2 2007/08/18 12:37:18 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -30,7 +30,9 @@
 //Some javascript plugin detectors use the description
 //to decide the flash version to display. They expect the
 //form (major version).(minor version) r(revision).
-#define FLASH_VERSION "8.0 r99."
+//e.g. "8.0 r99."
+#define FLASH_VERSION DEFAULT_FLASH_MAJOR_VERSION"."\
+	DEFAULT_FLASH_MINOR_VERSION" r"DEFAULT_FLASH_REV_NUMBER"."
 
 #define PLUGIN_DESCRIPTION \
   "Shockwave Flash "FLASH_VERSION" Gnash "VERSION", the GNU Flash Player. \
@@ -59,6 +61,7 @@
 #include <vector>
 #include <iostream>
 
+
 // Mozilla SDK headers
 #include "prinit.h"
 #include "prlock.h"

Index: server/vm/VM.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/VM.cpp,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -b -r1.12.2.1 -r1.12.2.2
--- server/vm/VM.cpp	17 Aug 2007 14:02:40 -0000	1.12.2.1
+++ server/vm/VM.cpp	18 Aug 2007 12:37:18 -0000	1.12.2.2
@@ -16,7 +16,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: VM.cpp,v 1.12.2.1 2007/08/17 14:02:40 strk Exp $ */
+/* $Id: VM.cpp,v 1.12.2.2 2007/08/18 12:37:18 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -110,9 +110,11 @@
 	//    the last ,0 is necessary, even if it doesn't appear
 	//    to mean anything.
 	//    
-	// TODO: use config.h for the default, query RcInit file for an override
+	// TODO: query RcInit file for an override
 	//
-#define FLASH_VERSION "GSH 8,0,99,0"
+#define FLASH_VERSION "GSH "DEFAULT_FLASH_MAJOR_VERSION","\
+        DEFAULT_FLASH_MINOR_VERSION","DEFAULT_FLASH_REV_NUMBER",0"
+
 	static const std::string version(FLASH_VERSION);
 	return version;
 }



From MAILER-DAEMON Sat Aug 18 09:08:21 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMO2P-0000Jc-1p
	for mharc-gnash-commit@gnu.org; Sat, 18 Aug 2007 09:08:21 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMO2M-0000JD-VY
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 09:08:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMO2L-0000Il-Tb
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 09:08:18 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMO2L-0000Ii-MF
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 09:08:17 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMO2L-0001ob-22
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 09:08:17 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMO2K-0005GJ-0F
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 13:08:16 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMO2J-0005GF-SB
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 13:08:15 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMO2J-0005GF-SB@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 18 Aug 2007 13:08:15 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog gui/gtk.cpp gui/gtksup.h gui/gu...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2007 13:08:19 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/18 13:08:15

Modified files:
	.              : ChangeLog 
	gui            : gtk.cpp gtksup.h gui.cpp gui.h 

Log message:
	        * gui/gui.{cpp,h}: add a getMovieInfo() function as a quick hack
	          to print movie information.
	        * gui/: gtk.cpp, gtksup.h: add a View->movieInfo menu item.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4026&r2=1.4027
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.102&r2=1.103
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtksup.h?cvsroot=gnash&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.cpp?cvsroot=gnash&r1=1.90&r2=1.91
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.h?cvsroot=gnash&r1=1.58&r2=1.59

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4026
retrieving revision 1.4027
diff -u -b -r1.4026 -r1.4027
--- ChangeLog	18 Aug 2007 12:24:40 -0000	1.4026
+++ ChangeLog	18 Aug 2007 13:08:15 -0000	1.4027
@@ -1,3 +1,9 @@
+2007-08-18 Sandro Santilli <strk@keybit.net>
+
+	* gui/gui.{cpp,h}: add a getMovieInfo() function as a quick hack
+	  to print movie information.
+	* gui/: gtk.cpp, gtksup.h: add a View->movieInfo menu item.
+
 2007-08-18 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
 
 	* configure.ac: define flash player version macros

Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- gui/gtk.cpp	1 Aug 2007 13:16:39 -0000	1.102
+++ gui/gtk.cpp	18 Aug 2007 13:08:15 -0000	1.103
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: gtk.cpp,v 1.102 2007/08/01 13:16:39 udog Exp $ */
+/* $Id: gtk.cpp,v 1.103 2007/08/18 13:08:15 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -31,6 +31,7 @@
 #include "sound_handler.h"
 #include "gnash.h" // for get_sound_handler
 #include "render_handler.h"
+#include "VM.h"
 
 #include <iostream>
 #include <X11/keysym.h>
@@ -162,6 +163,7 @@
 
     createFileMenu(_menubar);
     createEditMenu(_menubar);
+    createViewMenu(_menubar);
     createControlMenu(_menubar);
     createHelpMenu(_menubar);
     
@@ -391,6 +393,7 @@
 #ifdef USE_MENUS
     createFileMenu(GTK_WIDGET(_popup_menu));
     createEditMenu(GTK_WIDGET(_popup_menu));
+    createViewMenu(GTK_WIDGET(_popup_menu));
     createControlMenu(GTK_WIDGET(_popup_menu));
 #endif
     createHelpMenu(GTK_WIDGET(_popup_menu));
@@ -939,6 +942,71 @@
                    NULL);
 }
 
+void
+GtkGui::menuitem_movieinfo_callback(GtkMenuItem* /*menuitem*/, gpointer data)
+{
+//    GNASH_REPORT_FUNCTION;
+
+    Gui* gui = static_cast<Gui*>(data);
+    assert(gui);
+
+    GtkWidget* label;
+
+    GtkWidget* window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+    gtk_window_set_title (GTK_WINDOW (window), _("Movie info"));
+    gtk_widget_show (window);
+
+    std::auto_ptr<InfoTable> infoptr = gui->getMovieInfo();
+    if ( ! infoptr.get() )
+    {
+            label = gtk_label_new (_("VM not initialized yet"));
+            gtk_widget_show (label);
+            gtk_table_attach_defaults (GTK_TABLE (window), label, 0, 1, 0, 1);
+            return;
+    }
+
+    InfoTable& info = *infoptr;
+    
+#if 1
+    size_t size = info.size();
+    GtkWidget* table1 = gtk_table_new (size, 2, TRUE);
+    gtk_widget_show (table1);
+    gtk_container_add (GTK_CONTAINER (window), table1);
+
+    for (InfoTable::reverse_iterator i=info.rbegin(), e=info.rend(); i!=e; ++i)
+    {
+        StringPair& p = *i;
+        guint up = size;
+        guint bot = size-1;
+
+        label = gtk_label_new (p.first.c_str());
+        gtk_widget_show (label);
+        gtk_table_attach_defaults (GTK_TABLE (table1), label, 0, 1, bot, up);
+
+        label = gtk_label_new (p.second.c_str());
+        gtk_widget_show (label);
+        gtk_table_attach_defaults (GTK_TABLE (table1), label, 1, 2, bot, up);
+
+        --size;
+    }
+#else
+    GtkWidget* box = gtk_vbox_new (FALSE, 2);
+    gtk_widget_show (box);
+    gtk_container_add (GTK_CONTAINER (window), box);
+
+    for (InfoTable::reverse_iterator i=info.rbegin(), e=info.rend(); i!=e; ++i)
+    {
+        StringPair& p = *i;
+
+        string text = p.first + string(" = ") + p.second;
+        label = gtk_label_new (text.c_str());
+        gtk_widget_show (label);
+        gtk_box_pack_start (GTK_BOX (box), label, TRUE, FALSE, 3);
+    }
+#endif
+    
+}
+
 
 // This pops up the menu when the right mouse button is clicked
 gint
@@ -1405,6 +1473,27 @@
                       this);
 }
 
+// Create a View menu that can be used from the menu bar or the popup.
+void
+GtkGui::createViewMenu(GtkWidget *obj)
+{
+//    GNASH_REPORT_FUNCTION;
+    GtkWidget *menuitem = gtk_menu_item_new_with_label (_("View"));
+    gtk_widget_show (menuitem);
+    gtk_container_add (GTK_CONTAINER (obj), menuitem);
+    
+    GtkWidget *menu = gtk_menu_new ();
+    gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menu);
+
+    GtkMenuItem *menuitem_movieinfo = 
+ 	GTK_MENU_ITEM(gtk_menu_item_new_with_label(_("Movie info")));
+    gtk_menu_append(menu, GTK_WIDGET(menuitem_movieinfo));
+    gtk_widget_show(GTK_WIDGET(menuitem_movieinfo));
+    g_signal_connect ((gpointer) menuitem_movieinfo, "activate",
+                      G_CALLBACK (&menuitem_movieinfo_callback),
+                      this);
+}
+
 // Create a Help menu that can be used from the menu bar or the popup.
 void
 GtkGui::createControlMenu(GtkWidget *obj)

Index: gui/gtksup.h
===================================================================
RCS file: /sources/gnash/gnash/gui/gtksup.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- gui/gtksup.h	1 Aug 2007 13:16:40 -0000	1.48
+++ gui/gtksup.h	18 Aug 2007 13:08:15 -0000	1.49
@@ -63,6 +63,7 @@
     bool createMenuBar();
     void createFileMenu(GtkWidget *obj);
     void createEditMenu(GtkWidget *obj);
+    void createViewMenu(GtkWidget *obj);
     void createHelpMenu(GtkWidget *obj);
     void createControlMenu(GtkWidget *obj);
 
@@ -95,6 +96,10 @@
     static void menuitem_preferences_callback(GtkMenuItem *menuitem,
                                               gpointer instance);
  
+    /// Show info about the movie currently being played
+    static void menuitem_movieinfo_callback(GtkMenuItem *menuitem,
+                                              gpointer instance);
+ 
     // GTK Event handlers
     static gboolean unrealize_event(GtkWidget *widget, GdkEvent *event,
                                     gpointer data);

Index: gui/gui.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.cpp,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -b -r1.90 -r1.91
--- gui/gui.cpp	1 Aug 2007 13:16:40 -0000	1.90
+++ gui/gui.cpp	18 Aug 2007 13:08:15 -0000	1.91
@@ -571,6 +571,38 @@
 	setInvalidatedRegion(bounds);
 }
 
+std::auto_ptr<Gui::InfoTable>
+Gui::getMovieInfo() const
+{
+    std::auto_ptr<InfoTable> ret;
+
+    if ( ! VM::isInitialized() )
+    {
+        return ret;
+    }
+
+    ret.reset(new InfoTable());
+
+    VM& vm = VM::get();
+
+    // Print VM version
+    int vmSWFVersion = vm.getSWFVersion();
+    char buf[16];
+    snprintf(buf, 16, "SWF%d", vmSWFVersion); buf[15] = '\0';
+    ret->push_back(StringPair("VM", buf));
+
+    // Print info about levels (only level0 for now, then will be extended)
+    movie_root& stage = vm.getRoot();
+    boost::intrusive_ptr<movie_instance> level0 = stage.getLevel(0);
+    movie_definition* def0 = level0->get_movie_definition();
+    assert(def0);
+    snprintf(buf, 16, "SWF%d", def0->get_version()); buf[15] = '\0';
+    ret->push_back(StringPair("_level0 SWFVersion", string(buf)));
+    ret->push_back(StringPair("_level0 URL", def0->get_url()));
+
+    return ret;
+}
+
 #ifdef GNASH_FPS_DEBUG
 void 
 Gui::fpsCounterTick()

Index: gui/gui.h
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.h,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- gui/gui.h	1 Aug 2007 13:16:40 -0000	1.58
+++ gui/gui.h	18 Aug 2007 13:08:15 -0000	1.59
@@ -245,6 +245,16 @@
     }
 #endif // def GNASH_FPS_DEBUG
 
+    // TODO: use a tree-like structure (tree.hh?)
+    typedef std::pair<std::string,std::string> StringPair;
+    typedef std::vector<StringPair> InfoTable;
+
+    /// \brief
+    /// Return a table containing informations about the movie
+    /// currently being played (or NULL, if the VM isn't initialized yet)
+    ///
+    std::auto_ptr<InfoTable> getMovieInfo() const;
+
 protected:
 
     /// Default constructor. Initialises members to safe defaults.



From MAILER-DAEMON Sat Aug 18 09:24:19 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMOHr-0003pZ-LO
	for mharc-gnash-commit@gnu.org; Sat, 18 Aug 2007 09:24:19 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMOHp-0003nc-Ni
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 09:24:17 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMOHp-0003n3-4E
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 09:24:17 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMOHo-0003n0-Uq
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 09:24:16 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMOHo-0004f9-Do
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 09:24:16 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMOHn-0006wM-8j
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 13:24:15 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMOHn-0006wJ-1r
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 13:24:15 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMOHn-0006wJ-1r@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 18 Aug 2007 13:24:15 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/text.cpp server/parser/t...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2007 13:24:18 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/18 13:24:14

Modified files:
	.              : ChangeLog 
	server         : text.cpp 
	server/parser  : text_character_def.cpp 

Log message:
	        * server/text.cpp (resolve_font): fix missing return.
	        * server/parser/text_character_def.cpp: fix compiler warnings.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4027&r2=1.4028
http://cvs.savannah.gnu.org/viewcvs/gnash/server/text.cpp?cvsroot=gnash&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/text_character_def.cpp?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4027
retrieving revision 1.4028
diff -u -b -r1.4027 -r1.4028
--- ChangeLog	18 Aug 2007 13:08:15 -0000	1.4027
+++ ChangeLog	18 Aug 2007 13:24:14 -0000	1.4028
@@ -1,5 +1,10 @@
 2007-08-18 Sandro Santilli <strk@keybit.net>
 
+	* server/text.cpp (resolve_font): fix missing return.
+	* server/parser/text_character_def.cpp: fix compiler warnings.
+
+2007-08-18 Sandro Santilli <strk@keybit.net>
+
 	* gui/gui.{cpp,h}: add a getMovieInfo() function as a quick hack
 	  to print movie information.
 	* gui/: gtk.cpp, gtksup.h: add a View->movieInfo menu item.

Index: server/text.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/text.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- server/text.cpp	18 Aug 2007 08:04:59 -0000	1.36
+++ server/text.cpp	18 Aug 2007 13:24:14 -0000	1.37
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: text.cpp,v 1.36 2007/08/18 08:04:59 strk Exp $ */
+/* $Id: text.cpp,v 1.37 2007/08/18 13:24:14 strk Exp $ */
 
 // Based on the public domain work of Thatcher Ulrich <tu@tulrich.com> 2003
 
@@ -63,6 +63,8 @@
 			);
 			return false;
 		}
+
+		return true;
 	}
 
 	void text_glyph_record::read(stream* in, int glyph_count,

Index: server/parser/text_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/text_character_def.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/parser/text_character_def.cpp	18 Aug 2007 08:05:00 -0000	1.6
+++ server/parser/text_character_def.cpp	18 Aug 2007 13:24:14 -0000	1.7
@@ -72,7 +72,7 @@
 				}
 
 				IF_VERBOSE_PARSE(
-				log_parse(_("  has_font: font id = %d (%p)"), font_id, (void*)style.getFont());
+				log_parse(_("  has_font: font id = %d (%p)"), font_id, (const void*)style.getFont());
 				);
 			}
 			if (has_color)



From MAILER-DAEMON Sat Aug 18 09:24:35 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMOI7-0003uU-HB
	for mharc-gnash-commit@gnu.org; Sat, 18 Aug 2007 09:24:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMOI4-0003tk-Mc
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 09:24:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMOI3-0003tY-A7
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 09:24:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMOI3-0003tV-4M
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 09:24:31 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMOI2-0004i3-8b
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 09:24:30 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMOI1-0006wq-Mn
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 13:24:29 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMOI1-0006wm-FR
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 13:24:29 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMOI1-0006wm-FR@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 18 Aug 2007 13:24:29 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/text.cpp server/parser/t...
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2007 13:24:32 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/18 13:24:29

Modified files:
	.              : ChangeLog 
	server         : text.cpp 
	server/parser  : text_character_def.cpp 

Log message:
	        * server/text.cpp (resolve_font): fix missing return.
	        * server/parser/text_character_def.cpp: fix compiler warnings.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.33&r2=1.3971.2.34
http://cvs.savannah.gnu.org/viewcvs/gnash/server/text.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.35.2.1&r2=1.35.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/text_character_def.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.4.2.2&r2=1.4.2.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.33
retrieving revision 1.3971.2.34
diff -u -b -r1.3971.2.33 -r1.3971.2.34
--- ChangeLog	18 Aug 2007 12:37:17 -0000	1.3971.2.33
+++ ChangeLog	18 Aug 2007 13:24:28 -0000	1.3971.2.34
@@ -1,3 +1,8 @@
+2007-08-18 Sandro Santilli <strk@keybit.net>
+
+	* server/text.cpp (resolve_font): fix missing return.
+	* server/parser/text_character_def.cpp: fix compiler warnings.
+
 2007-08-18 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
 
 	* configure.ac: define flash player version macros

Index: server/text.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/text.cpp,v
retrieving revision 1.35.2.1
retrieving revision 1.35.2.2
diff -u -b -r1.35.2.1 -r1.35.2.2
--- server/text.cpp	18 Aug 2007 08:06:22 -0000	1.35.2.1
+++ server/text.cpp	18 Aug 2007 13:24:29 -0000	1.35.2.2
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: text.cpp,v 1.35.2.1 2007/08/18 08:06:22 strk Exp $ */
+/* $Id: text.cpp,v 1.35.2.2 2007/08/18 13:24:29 strk Exp $ */
 
 // Based on the public domain work of Thatcher Ulrich <tu@tulrich.com> 2003
 
@@ -63,6 +63,8 @@
 			);
 			return false;
 		}
+
+		return true;
 	}
 
 	void text_glyph_record::read(stream* in, int glyph_count,

Index: server/parser/text_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/text_character_def.cpp,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -b -r1.4.2.2 -r1.4.2.3
--- server/parser/text_character_def.cpp	18 Aug 2007 08:06:23 -0000	1.4.2.2
+++ server/parser/text_character_def.cpp	18 Aug 2007 13:24:29 -0000	1.4.2.3
@@ -72,7 +72,7 @@
 				}
 
 				IF_VERBOSE_PARSE(
-				log_parse(_("  has_font: font id = %d (%p)"), font_id, (void*)style.getFont());
+				log_parse(_("  has_font: font id = %d (%p)"), font_id, (const void*)style.getFont());
 				);
 			}
 			if (has_color)



From MAILER-DAEMON Sat Aug 18 09:45:24 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMOcG-0000eI-Tl
	for mharc-gnash-commit@gnu.org; Sat, 18 Aug 2007 09:45:24 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMOcG-0000dE-4T
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 09:45:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMOcF-0000cE-2G
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 09:45:23 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMOcE-0000c4-Tl
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 09:45:22 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMOcE-0008O2-Bj
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 09:45:22 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMOcD-0008E4-5z
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 13:45:21 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMOcD-0008Dz-0L
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 13:45:21 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMOcD-0008Dz-0L@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 18 Aug 2007 13:45:21 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog libbase/log.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2007 13:45:24 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/18 13:45:20

Modified files:
	.              : ChangeLog 
	libbase        : log.cpp 

Log message:
	        * libbase/log.cpp: change the log_unimpl label to UNIMPLEMENTED.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4028&r2=1.4029
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.cpp?cvsroot=gnash&r1=1.54&r2=1.55

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4028
retrieving revision 1.4029
diff -u -b -r1.4028 -r1.4029
--- ChangeLog	18 Aug 2007 13:24:14 -0000	1.4028
+++ ChangeLog	18 Aug 2007 13:45:20 -0000	1.4029
@@ -1,5 +1,6 @@
 2007-08-18 Sandro Santilli <strk@keybit.net>
 
+	* libbase/log.cpp: change the log_unimpl label to UNIMPLEMENTED.
 	* server/text.cpp (resolve_font): fix missing return.
 	* server/parser/text_character_def.cpp: fix compiler warnings.
 

Index: libbase/log.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- libbase/log.cpp	1 Jul 2007 10:54:09 -0000	1.54
+++ libbase/log.cpp	18 Aug 2007 13:45:20 -0000	1.55
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: log.cpp,v 1.54 2007/07/01 10:54:09 bjacques Exp $ */
+/* $Id: log.cpp,v 1.55 2007/08/18 13:45:20 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -265,7 +265,7 @@
     vsnprintf (tmp, BUFFER_SIZE-1, fmt, ap);
     tmp[BUFFER_SIZE-1] = '\0';
 
-    dbglogfile.log(_("ERROR: Unimplemented"), tmp);
+    dbglogfile.log(_("UNIMPLEMENTED"), tmp);
 
     va_end (ap);
 }



From MAILER-DAEMON Sat Aug 18 09:48:44 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMOfU-0002jI-Cu
	for mharc-gnash-commit@gnu.org; Sat, 18 Aug 2007 09:48:44 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMOfR-0002g2-Po
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 09:48:41 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMOfI-0002Zq-6l
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 09:48:41 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMOfI-0002Zn-1Y
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 09:48:32 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMOfG-0000XP-Li
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 09:48:31 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMOfG-0000Jz-4s
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 13:48:30 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMOfF-0000Jw-VI
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 13:48:30 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMOfF-0000Jw-VI@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 18 Aug 2007 13:48:29 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog po/cs.po
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2007 13:48:42 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/18 13:48:29

Modified files:
	.              : ChangeLog 
	po             : cs.po 

Log message:
	Patch #6137 by Petr Pisar <petr.pisar@atlas.cz>:
	
	        * po/cs.po: updated to version of 20070804

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4029&r2=1.4030
http://cvs.savannah.gnu.org/viewcvs/gnash/po/cs.po?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4029
retrieving revision 1.4030
diff -u -b -r1.4029 -r1.4030
--- ChangeLog	18 Aug 2007 13:45:20 -0000	1.4029
+++ ChangeLog	18 Aug 2007 13:48:29 -0000	1.4030
@@ -1,3 +1,7 @@
+2007-08-18 Petr Pisar <petr.pisar@atlas.cz>
+
+	* po/cs.po: updated to version of 20070804
+
 2007-08-18 Sandro Santilli <strk@keybit.net>
 
 	* libbase/log.cpp: change the log_unimpl label to UNIMPLEMENTED.

Index: po/cs.po
===================================================================
RCS file: /sources/gnash/gnash/po/cs.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- po/cs.po	1 Jul 2007 10:54:17 -0000	1.2
+++ po/cs.po	18 Aug 2007 13:48:29 -0000	1.3
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnash cvs20070612\n"
+"Project-Id-Version: gnash cvs20070804\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-06-12 13:24+0200\n"
-"PO-Revision-Date: 2007-06-25 14:34+0200\n"
+"PO-Revision-Date: 2007-08-04 17:00+0200\n"
 "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 #: ../libbase/curl_adapter.cpp:333 ../libbase/curl_adapter.cpp:577
 #, c-format
 msgid "404 response from url %s"
-msgstr "Na URL %s přišla odpověd 404"
+msgstr "Na URL %s přišla odpověď 404"
 
 #: ../libbase/extension.cpp:126
 #, c-format
@@ -114,11 +114,11 @@
 #: ../libbase/network.cpp:233
 #, c-format
 msgid "Trying to accept net traffic on fd %d"
-msgstr "Pojouším se přijmout síťové spojení na deskriptor %d"
+msgstr "Pokouším se přijmout síťové spojení na deskriptor %d"
 
 #: ../libbase/network.cpp:262
 msgid "There is data at the console for stdin"
-msgstr "Na standardním vtupu konzole jsou data"
+msgstr "Na standardním vstupu konzole jsou data"
 
 #: ../libbase/network.cpp:268
 #, c-format
@@ -128,12 +128,12 @@
 #: ../libbase/network.cpp:272
 #, c-format
 msgid "The accept() socket for fd %d never was available for writing"
-msgstr "accept() socket na descriptoru č. %d nikdy nebyl připraven pro zápis"
+msgstr "accept() socket na deskriptoru č. %d nikdy nebyl připraven pro zápis"
 
 #: ../libbase/network.cpp:279
 #, c-format
 msgid "The accept() socket for fd %d timed out waiting to write"
-msgstr "Limit čekání accept() socketu na descriptoru č. %d na zápis vypršel"
+msgstr "Limit čekání accept() socketu na deskriptoru č. %d na zápis vypršel"
 
 #: ../libbase/network.cpp:291
 #, c-format
@@ -162,7 +162,7 @@
 
 #: ../libbase/network.cpp:355
 msgid "Couldn't get the hostname for this machine"
-msgstr "Nemohu zístak jméno tohoto stroje"
+msgstr "Nemohu získat jméno tohoto stroje"
 
 #: ../libbase/network.cpp:369
 #, c-format
@@ -242,7 +242,7 @@
 #: ../libbase/network.cpp:710
 #, c-format
 msgid "wrote %d bytes to fd %d, expected %d"
-msgstr "na deskriptor %2$d zappsáno %1$d bajtů, očekáváno %3$d"
+msgstr "na deskriptor %2$d zapsáno %1$d bajtů, očekáváno %3$d"
 
 #: ../libbase/network.cpp:716
 #, c-format
@@ -281,7 +281,7 @@
 
 #: ../backend/sound_handler_gst.cpp:78
 msgid "Could not allocate memory for sound data"
-msgstr "Pro zvuková data nelze vyhradit pamět"
+msgstr "Pro zvuková data nelze vyhradit paměť"
 
 #: ../backend/sound_handler_gst.cpp:94 ../backend/sound_handler_gst.cpp:104
 msgid "Could not allocate space for data in sound handler"
@@ -293,12 +293,12 @@
 
 #: ../backend/sound_handler_gst.cpp:120
 msgid "Nellymoser sound format requested; gnash does not handle it"
-msgstr "Požadován zuvkový formát nellymoser; gnash jej neumí zpracovat"
+msgstr "Požadován zvukový formát nellymoser; gnash jej neumí zpracovat"
 
 #: ../backend/sound_handler_gst.cpp:125
 #, c-format
 msgid "Unknown sound format %d requested; gnash does not handle it"
-msgstr "Požadován neznámý zuvkový formát %d; gnash jej neumí zpracovat"
+msgstr "Požadován neznámý zvukový formát %d; gnash jej neumí zpracovat"
 
 #: ../backend/sound_handler_gst.cpp:261 ../backend/sound_handler_sdl.cpp:254
 msgid "Trying to play sound with size 0"
@@ -306,7 +306,7 @@
 
 #: ../backend/sound_handler_gst.cpp:269
 msgid "Could not allocate memory for gst_element"
-msgstr "Pro get_element nelze vyhradit pamět"
+msgstr "Pro get_element nelze vyhradit paměť"
 
 #: ../backend/sound_handler_gst.cpp:294
 msgid "The gstreamer pipeline element could not be created"
@@ -334,13 +334,13 @@
 "install a mp3-decoder plugin like gstreamer0.10-mad or gstreamer0.10-fluendo-"
 "mp3."
 msgstr ""
-"Nelze vytvořit gstreamovou jednotku pro demompresi MP3. Pravděpodobně "
+"Nelze vytvořit gstreamovou jednotku pro dekódování MP3. Pravděpodobně "
 "potřebujete nainstalovat zásuvný modul pro dekódování MP3, jako je "
 "gstreamer0.10-mad nebo gstreamer0.10-fluendo-mp3."
 
 #: ../backend/sound_handler_sdl.cpp:76
 msgid "could not allocate memory for sound data"
-msgstr "pro zvuková data nelze vyhradit pamět"
+msgstr "pro zvuková data nelze vyhradit paměť"
 
 #: ../backend/sound_handler_sdl.cpp:100
 msgid "Some kind of error occurred with sound data"
@@ -348,7 +348,7 @@
 
 #: ../backend/sound_handler_sdl.cpp:111
 msgid "gnash has not been compiled to handle mp3 audio"
-msgstr "gnash nebyl přeložen s podporout MP3 zvuku"
+msgstr "gnash nebyl přeložen s podporou MP3 zvuku"
 
 #: ../backend/sound_handler_sdl.cpp:117
 msgid "could not allocate space for data in sound handler"
@@ -357,7 +357,7 @@
 #: ../backend/sound_handler_sdl.cpp:139
 #, c-format
 msgid "unknown sound format %d requested; gnash does not handle it"
-msgstr "požadován neznámý zuvkový formát %d; gnash jej neumí zpracovat"
+msgstr "požadován neznámý zvukový formát %d; gnash jej neumí zpracovat"
 
 #: ../backend/sound_handler_sdl.cpp:175
 msgid "Some kind of error with resampling sound data"
@@ -389,7 +389,7 @@
 #: ../backend/sound_handler_sdl.cpp:686
 #, c-format
 msgid "Negative buffer length in sdl_audio_callback (%d)"
-msgstr "Záportná délka vyrovnávací paměti v sdl_audio_callback (%d)"
+msgstr "Záporná délka vyrovnávací paměti v sdl_audio_callback (%d)"
 
 #: ../backend/sound_handler_sdl.cpp:692
 msgid "Zero buffer length in sdl_audio_callback"
@@ -683,7 +683,7 @@
 "Second arg of Function.apply is %s (expected array) - considering as call "
 "with no args"
 msgstr ""
-"Druhý argument Funvtion.apply je %s (očekávano pole) – považuji za volání "
+"Druhý argument Funvtion.apply je %s (očekáváno pole) – považuji za volání "
 "bez argumentů"
 
 #: ../server/as_function.cpp:239
@@ -692,7 +692,7 @@
 "Second arg of Function.apply is of type %s, with value %s (expected array) - "
 "considering as call with no args"
 msgstr ""
-"Druhý argument Funvtion.apply je typu %s, s hodnotou %s (očekánáno pole) – "
+"Druhý argument Funvtion.apply je typu %s s hodnotou %s (očekáváno pole) – "
 "považuji za volání bez argumentů"
 
 #: ../server/as_function.cpp:289
@@ -706,7 +706,7 @@
 #: ../server/as_function.cpp:360
 #, c-format
 msgid "constructor prototype is %s"
-msgstr "protoyp konstruktoru je %s"
+msgstr "prototyp konstruktoru je %s"
 
 #: ../server/as_object.cpp:123
 #, c-format
@@ -808,7 +808,7 @@
 #: ../server/button_character_instance.cpp:618
 #, c-format
 msgid "Executing actions for button condition %d"
-msgstr "Provádám akci pro tlačítkovou podmínkku %d"
+msgstr "Provádím akci pro tlačítkovou podmínku %d"
 
 #: ../server/debugger.cpp:142
 msgid "Debugger enabled >> "
@@ -832,7 +832,7 @@
 #: ../server/debugger.cpp:566 ../server/debugger.cpp:626
 #, c-format
 msgid "WARNING: environment not set in %s"
-msgstr "VAROVÁNÍ: prostředí nestastaveno v %s"
+msgstr "VAROVÁNÍ: prostředí nenastaveno v %s"
 
 #: ../server/debugger.cpp:570
 #, c-format
@@ -846,7 +846,7 @@
 
 #: ../server/debugger.cpp:631
 msgid "Global Registers Dump:"
-msgstr "Výpis globálník registrů:"
+msgstr "Výpis globálních registrů:"
 
 #: ../server/dlist.cpp:347
 #, c-format
@@ -923,21 +923,21 @@
 "possible that the character will be instantiated later in the SWF stream. "
 "Gnash will try to register again on next access."
 msgstr ""
-"VariableName spojená s texteovým polem ukazuje na neznámý cíl (%s). Je "
+"VariableName spojená s textovým polem ukazuje na neznámý cíl (%s). Je "
 "možné, že znak bude instanciován později v proudu SWF. Gnash se pokusí "
 "o registraci při příštím přístupu."
 
 #: ../server/edit_text_character.cpp:1300
 #, c-format
 msgid "target sprite (%p) does have a member named %s"
-msgstr "cílový sprit (%p) nemá člena pojmenenového %s"
+msgstr "cílový sprite (%p) má člena pojmenovaného %s"
 
 #: ../server/edit_text_character.cpp:1307
 #, c-format
 msgid ""
 "target sprite (%p) does NOT have a member named %s (no problem, we'll add it)"
 msgstr ""
-"cílový sprit (%p) NEMÁ člena pojmenenového %s (žádný problém, přidáme ho)"
+"cílový sprit (%p) NEMÁ člena pojmenenovaného %s (žádný problém, přidáme ho)"
 
 
 #: ../server/fill_style.cpp:133
@@ -956,7 +956,7 @@
 "character is not found in the Characters Dictionary. It seems common to find "
 "such  malformed SWF, so we'll only warn once about this."
 msgstr ""
-"Bitmapová výplň udává „%d“ jako příslučný identifikátor bitmapového znaku, "
+"Bitmapová výplň udává „%d“ jako identifikátor přislušného bitmapového znaku, "
 "jenže takový znak se v Slovníku znaků nenachází. U chybných SWF je toto "
 ";časté, takže budeme o tomto varovat jen jednou"
 
@@ -971,7 +971,7 @@
 "First gradient in a fill_style have position==%d (expected 0). This seems to "
 "be common, so will warn only once."
 msgstr ""
-"První přechod ve fill_style má pozici==%d (očákávana 0). Toto je běžné, "
+"První přechod ve fill_style má pozici==%d (očekávána 0). Toto je běžné, "
 "takže hlásíme jen poprvé."
 
 #: ../server/fill_style.cpp:319
@@ -1010,12 +1010,12 @@
 
 #: ../server/font.cpp:376
 msgid "DefineFontInfo2 partially implemented"
-msgstr "DefineFontInfo2 implemetnován částečně"
+msgstr "DefineFontInfo2 implementován částečně"
 
 #: ../server/font.cpp:407
 #, c-format
 msgid "reading code table at offset %lu"
-msgstr "čtu tabulků kódů na pozici %lu"
+msgstr "čtu tabulku kódů na pozici %lu"
 
 #: ../server/font.cpp:441
 #, c-format
@@ -1051,17 +1051,17 @@
 msgstr ""
 "Kód ActionScriptu se pokouší odkázat na neexistujícího rodiče pomocí „..“ "
 "(neexistující rodič se pravděpodobně vyskytuje jen u kořenového "
-"MovieClipu). Vracím odkaz na vrholového rodiče (nejspíše kořenový klip)."
+"MovieClipu). Vracím odkaz na vrcholového rodiče (nejspíše kořenový klip)."
 
 #: ../server/character.cpp:325
 #, c-format
 msgid "Attempt to set _xscale to %g, refused"
-msgstr "Pokus o nastavení _xscale na %g, odmítnoto"
+msgstr "Pokus o nastavení _xscale na %g, odmítnuto"
 
 #: ../server/character.cpp:361
 #, c-format
 msgid "Attempt to set _yscale to %g, refused"
-msgstr "Pokus o nastavení _yscale na %g, odmítnoto"
+msgstr "Pokus o nastavení _yscale na %g, odmítnuto"
 
 #: ../server/character.cpp:479
 msgid "FIXME: can't set _width on character with null or world bounds"
@@ -1096,14 +1096,14 @@
 #: ../server/impl.cpp:273
 #, c-format
 msgid "get_movie_info(): file '%s' does not start with a SWF header"
-msgstr "get_movie_info(): soubor „%s“ nezáčíná SWF hlavičkou"
+msgstr "get_movie_info(): soubor „%s“ nezačíná SWF hlavičkou"
 
 #: ../server/impl.cpp:283
 msgid ""
 "get_movie_info(): can't read zipped SWF data; gnash was compiled without "
 "zlib support"
 msgstr ""
-"get_movie_info(): nelze přečíst zazipovaná SWF data; gnash byl přeložen bez "
+"get_movie_info(): nelze přečíst zipem sbalená SWF data; gnash byl přeložen bez "
 "podpory zlib"
 
 #: ../server/impl.cpp:344
@@ -1140,7 +1140,7 @@
 #: ../server/impl.cpp:495
 #, c-format
 msgid "note: couldn't open cache file '%s'"
-msgstr "poznámka: nemohu otevřít kešový souborý „%s“"
+msgstr "poznámka: nemohu otevřít kešový soubor „%s“"
 
 #: ../server/impl.cpp:504
 #, c-format
@@ -1169,15 +1169,15 @@
 #: ../server/impl.cpp:766
 #, c-format
 msgid "%s: couldn't create instance"
-msgstr ""
+msgstr "%s: nelze vytvořit instanci"
 
 #: ../server/impl.cpp:818
 msgid "precompute_cached_data can't create instance of movie"
-msgstr ""
+msgstr "precompute_cached_data nemůže vytvořit instanci filmu"
 
 #: ../server/impl.cpp:867
 msgid "loop back; jumping to frame "
-msgstr ""
+msgstr "návrat ve smyčce; přeskakuji na snímek "
 
 #: ../server/movie_root.cpp:517 ../server/vm/ASHandlers.cpp:1900
 #, c-format
@@ -1187,7 +1187,7 @@
 #: ../server/PropertyList.cpp:93
 #, c-format
 msgid "Property %s is read-only, not setting it to %s"
-msgstr ""
+msgstr "Vlastnost %s je jen pro čtení, na %s nebude nastavena"
 
 #: ../server/sprite_instance.cpp:154
 #, c-format
@@ -1195,11 +1195,14 @@
 "attachMovie called with wrong number of arguments expected 3 to 4, got (%d) "
 "- returning undefined"
 msgstr ""
+"attachMovie zavolán se špatným počtem parametrů, očekávány 3 až 4, "
+"obdrženo %d – vracím nedefinováno"
 
 #: ../server/sprite_instance.cpp:168
 #, c-format
 msgid "attachMovie: '%s': no such exported resource - returning undefined"
-msgstr ""
+msgstr "attachMovie: „%s“: žádný takový exportovaný zdroj – vracím "
+"nedefinováno"
 
 #: ../server/sprite_instance.cpp:178
 #, c-format
@@ -1207,48 +1210,50 @@
 "attachMovie: exported resource '%s' is not a movie definition (%s) -- "
 "returning undefined"
 msgstr ""
-"attachMovie: expotovaný zdroj „%s“ není deinificí filmu (%s) – vracím "
+"attachMovie: exportovaný zdroj „%s“ není definicí filmu (%s) – vracím "
 "nedefinováno"
 
 #: ../server/sprite_instance.cpp:202
 #, c-format
 msgid "Could not attach character at depth %d"
-msgstr ""
+msgstr "V hloubce %d nelze připojit znak"
 
 #: ../server/sprite_instance.cpp:221
 #, c-format
 msgid "Fourth argument of attachMovie doesn't cast to an object (%s)"
-msgstr ""
+msgstr "Čtvrtý argument attachMovie nelze převést na objekt (%s)"
 
 #: ../server/sprite_instance.cpp:256
 #, c-format
 msgid "createEmptyMovieClip needs 2 args, but %d given, returning undefined"
-msgstr ""
+msgstr "createEmptyMovieClip potřebuje 2 argumenty, ale zadán(y/o) %d, "
+"vracím nedefinováno"
 
 #: ../server/sprite_instance.cpp:266
 #, c-format
 msgid "createEmptyMovieClip takes 2 args, but %d given, discarding the excess"
-msgstr ""
+msgstr "createEmptyMovieClip bere 2 argumenty, ale zadány(o) %d, přebývající "
+"přehlížím"
 
 #: ../server/sprite_instance.cpp:301
 #, c-format
 msgid "%s.swapDepths() needs one arg"
-msgstr ""
+msgstr "%s.swapDepths() potřebuje jeden argument"
 
 #: ../server/sprite_instance.cpp:311
 #, c-format
 msgid "%s.swapDepths(%s): won't swap a clip below depth %d (%d)"
-msgstr ""
+msgstr "%s.swapDepths(%s): nebudu prohazovat klip pod hloubkou %d (%d)"
 
 #: ../server/sprite_instance.cpp:323
 #, c-format
 msgid "%s.swapDepths(%s): this sprite has no parent, swapping depth of root?"
-msgstr ""
+msgstr "%s.swapping(%s): tento sprite nemá rodiče, prohodit s hloubku kořene?"
 
 #: ../server/sprite_instance.cpp:341
 #, c-format
 msgid "%s.swapDepths(%s): invalid call, swapping to self?"
-msgstr ""
+msgstr "%s.swapDepths(%s): neplatné volání, prohodit sám se sebou?"
 
 #: ../server/sprite_instance.cpp:351
 #, c-format
@@ -1256,35 +1261,39 @@
 "%s.swapDepths(%s): invalid call, the two characters don't have the same "
 "parent"
 msgstr ""
+"%s.swapDepths(%s): neplatné volání, tyto dva znaky nemají stejného rodiče"
 
 #: ../server/sprite_instance.cpp:369
 #, c-format
 msgid ""
 "%s.swapDepths(%s): first argument invalid (neither a sprite nor a number)"
 msgstr ""
+"%s.swapDepths(%s): neplatný první argument (ani sprite ani číslo)"
 
 #: ../server/sprite_instance.cpp:387
 #, c-format
 msgid "%s.swapDepths(%s): ignored, character already at depth %d"
-msgstr ""
+msgstr "%s.swapDepths(%s): ignorováno, znak již v hloubce %d"
 
 #: ../server/sprite_instance.cpp:417
 msgid "MovieClip.duplicateMovieClip() needs 2 or 3 args"
-msgstr ""
+msgstr "MovieClip.duplicateMovieClip() potřebuje 2 nebo 3 argumenty"
 
 #: ../server/sprite_instance.cpp:448
 msgid "sprite_goto_and_play needs one arg"
-msgstr ""
+msgstr "sprite_goto_and_play potřebuje jeden argument"
 
 #: ../server/sprite_instance.cpp:467
 msgid "sprite_goto_and_stop needs one arg"
-msgstr ""
+msgstr "sprite_goto_and_stop potřebuje jeden argument"
 
 #: ../server/sprite_instance.cpp:531
 #, c-format
 msgid ""
 "MovieClip.loadMovie() expected 1 or 2 args, got %d - returning undefined"
 msgstr ""
+"MovieClip.loadMovie() očekával 1 nebo 2 argumenty, obdržel %d – vracím "
+"nedefinováno"
 
 #: ../server/sprite_instance.cpp:543
 #, c-format
@@ -1292,18 +1301,24 @@
 "First argument of MovieClip.loadMovie(%s) evaluates to an empty string - "
 "returning undefined"
 msgstr ""
+"První argument MovieClip.loadMovie(%s) vyhodnocen jako prázdný řetězec – "
+"vracím nedefinováno"
 
 #: ../server/sprite_instance.cpp:556
 #, c-format
 msgid ""
 "second argument of MovieClip.loadMovie(%s, <variables>) will be discarded"
 msgstr ""
+"druhý argument MovieClip.loadMovie(%s, <proměnné>) bude smazán"
 
 #: ../server/sprite_instance.cpp:579
 #, c-format
 msgid ""
 "MovieClip.loadVariables() expected 1 or 2 args, got %d - returning undefined"
 msgstr ""
+"MovieClip.loadVariables() očekával 1 nebo 2 argumenty, obdržel %d – vracím "
+"nedefinováno"
+
 
 #: ../server/sprite_instance.cpp:591
 #, c-format
@@ -1311,102 +1326,112 @@
 "First argument passed to MovieClip.loadVariables(%s) evaluates to an empty "
 "string - returning undefined"
 msgstr ""
+"První argument předaný MovieClip.loadVariables(%s) vyhodnocen jako prázdný řetězec – "
+"vracím nedefinováno"
 
 #: ../server/sprite_instance.cpp:657
 #, c-format
 msgid "Can't find hitTest target %s"
-msgstr ""
+msgstr "Nelze nalézt cíl %s pro hitTest"
 
 #: ../server/sprite_instance.cpp:712
 #, c-format
 msgid "hitTest() called with %u args"
-msgstr ""
+msgstr "hitTest() zavolán s %u argumenty"
 
 #: ../server/sprite_instance.cpp:731
 #, c-format
 msgid "createTextField called with %d args, expected 6 - returning undefined"
-msgstr ""
+msgstr "createTextField zavolán s %d argumenty, 6 očekáváno – vracím "
+"nedefinováno"
 
 #: ../server/sprite_instance.cpp:740
 msgid "First argument of createTextField is not a string - returning undefined"
-msgstr ""
+msgstr "První argument createTextField není řetězec – vracím nedefinováno"
 
 #: ../server/sprite_instance.cpp:750
 msgid ""
 "Second argument of createTextField is not a number - returning undefined"
 msgstr ""
+"Druhý argument createTextField není číslo – vracím nedefinováno"
 
 #: ../server/sprite_instance.cpp:760
 msgid "Third argument of createTextField is not a number - returning undefined"
-msgstr ""
+msgstr "Třetí argument createTextField není číslo – vracím nedefinováno"
 
 #: ../server/sprite_instance.cpp:770
 msgid ""
 "Fourth argument of createTextField is not a number - returning undefined"
 msgstr ""
+"Čtvrtý argument createTextField není číslo – vracím nedefinováno"
 
 #: ../server/sprite_instance.cpp:780 ../server/sprite_instance.cpp:790
 msgid "Fifth argument of createTextField is not a number - returning undefined"
-msgstr ""
+msgstr "Pátý argument createTextField není číslo – vracím nedefinováno"
 
 #: ../server/sprite_instance.cpp:889
 #, c-format
 msgid "MovieClip.getBounds(%s): invalid call, first arg must be a sprite"
-msgstr ""
+msgstr "MovieClip.getBounds(%s): neplatné volání, první argument musí být "
+"sprite"
 
 #: ../server/sprite_instance.cpp:940
 msgid "MovieClip.globalToLocal() takes one arg"
-msgstr ""
+msgstr "MovieClip.globalToLocal() bere jeden argument"
 
 #: ../server/sprite_instance.cpp:949
 #, c-format
 msgid "MovieClip.globalToLocal(%s): first argument doesn't cast to an object"
-msgstr ""
+msgstr "MovieClip.globalToLocal(%s): první argument nelze převést na objekt"
 
 #: ../server/sprite_instance.cpp:963
 #, c-format
 msgid ""
 "MovieClip.globalToLocal(%s): object parameter doesn't have an 'x' member"
 msgstr ""
+"MovieClip.globalToLocal(%s): objekt z parametru nemá žádného člena „x“"
 
 #: ../server/sprite_instance.cpp:974
 #, c-format
 msgid ""
 "MovieClip.globalToLocal(%s): object parameter doesn't have an 'y' member"
 msgstr ""
+"MovieClip.globalToLocal(%s): objekt z parametru nemá žádného člena „y“"
 
 #: ../server/sprite_instance.cpp:1009
 msgid "MovieClip.localToGlobal() takes one arg"
-msgstr ""
+msgstr "MovieClip.localToGlobal() bere jeden argument"
 
 #: ../server/sprite_instance.cpp:1018
 #, c-format
 msgid "MovieClip.localToGlobal(%s): first argument doesn't cast to an object"
-msgstr ""
+msgstr "MovieClip.localToGlobal(%s): první argument nelze převést na objekt"
 
 #: ../server/sprite_instance.cpp:1032
 #, c-format
 msgid ""
 "MovieClip.localToGlobal(%s): object parameter doesn't have an 'x' member"
 msgstr ""
+"MovieClip.localToGlobal(%s): objekt z parametru nemá žádného člena „x“"
 
 #: ../server/sprite_instance.cpp:1043
 #, c-format
 msgid ""
 "MovieClip.localToGlobal(%s): object parameter doesn't have an 'y' member"
 msgstr ""
+"MovieClip.localToGlobal(%s): objekt z parametru nemá žádného člena „y“"
 
 #: ../server/sprite_instance.cpp:1100
 msgid "MovieClip.lineTo() takes two args"
-msgstr ""
+msgstr "MovieClip.lineTo() bere dva argumenty"
 
 #: ../server/sprite_instance.cpp:1121
 msgid "MovieClip.moveTo() takes two args"
-msgstr ""
+msgstr "MovieClip.moveTo() bere dva argumenty"
 
 #: ../server/sprite_instance.cpp:1186
 msgid "MovieClip.curveTo() takes four args"
-msgstr ""
+msgstr "MovieClip.curveTo() bere čtyři argumenty"
 
 #: ../server/sprite_instance.cpp:1858
 #, c-format
@@ -1414,25 +1439,27 @@
 "A sprite member (%s) clashes with the name of an existing character in its "
 "display list.  The member will hide the character"
 msgstr ""
+"Člen (%s), který je spritem, se bije s názvem existujícího znaku ve svém "
+"seznamu vyobrazení. Člen zakryje znak."
 
 #: ../server/sprite_instance.cpp:1909 ../server/sprite_instance.cpp:2726
 #: ../server/sprite_instance.cpp:2751
 msgid "Executing "
-msgstr ""
+msgstr "Provádím "
 
 #: ../server/sprite_instance.cpp:1959
 #, c-format
 msgid "call_frame('%s') -- invalid frame"
-msgstr ""
+msgstr "call_frame(„%s“) – neplatný snímek"
 
 #: ../server/sprite_instance.cpp:2077
 msgid "Can't clone root of the movie"
-msgstr ""
+msgstr "Nemohu naklonovat kořen filmu"
 
 #: ../server/sprite_instance.cpp:2083
 #, c-format
 msgid "%s parent is not a sprite, can't clone"
-msgstr ""
+msgstr "rodič %s není sprite, nelze klonovat"
 
 #: ../server/sprite_instance.cpp:2140
 #, c-format
@@ -1440,28 +1467,30 @@
 "clone_display_object(%s, %s, %d): could not find a character named %s to "
 "clone"
 msgstr ""
+"clone_display_object(%s, %s, %d): znak pojmenovaný %s, který se má "
+"klonovat, není k nalezení"
 
 #: ../server/sprite_instance.cpp:2228
 #, c-format
 msgid "sprite[%p]::set_member(%s, %s)"
-msgstr ""
+msgstr "sprite[%p]::set_member(%s, %s)"
 
 #: ../server/sprite_instance.cpp:2249
 msgid "it's a Text Variable"
-msgstr ""
+msgstr "je Textová proměnná"
 
 #: ../server/sprite_instance.cpp:2257
 msgid "it's NOT a Text Variable"
-msgstr ""
+msgstr "NENÍ Textová proměnná"
 
 #: ../server/sprite_instance.cpp:2271 ../server/sprite_instance.cpp:2297
 msgid "NULL path_to_var passed to set_variable()"
-msgstr ""
+msgstr "Nullový path_to_var byl předán set_variable()"
 
 #: ../server/sprite_instance.cpp:2276 ../server/sprite_instance.cpp:2302
 #, c-format
 msgid "NULL passed to set_variable('%s', NULL)"
-msgstr ""
+msgstr "NULL byl předán set_variable(„%s“, NULL)"
 
 #: ../server/sprite_instance.cpp:2330
 #, c-format
@@ -1469,32 +1498,34 @@
 "sprite '%s' ::advance_sprite is at frame %u/%u - onload called: %d - "
 "oldDIsplayList has %d elements"
 msgstr ""
+"sprite „%s“ ::advance_sprite je na snímku %u/%u – zavolán onload: %d – "
+"oldDIsplayList má %d prvků"
 
 #: ../server/sprite_instance.cpp:2340
 msgid "sprite_instance::advance_sprite we're in PLAY mode"
-msgstr ""
+msgstr "sprite_instance::advance_sprite jsme v režimu PLAY (přehrávání)"
 
 #: ../server/sprite_instance.cpp:2348
 msgid "on_event_load called, incrementing"
-msgstr ""
+msgstr "zavoláno on_event_load, navyšuji"
 
 #: ../server/sprite_instance.cpp:2352
 #, c-format
 msgid "after increment we are at frame %u/%u"
-msgstr ""
+msgstr "po navýšení jsme na snímku %u/%u"
 
 #: ../server/sprite_instance.cpp:2375
 msgid "sprite_instance::advance_sprite we're in STOP mode"
-msgstr ""
+msgstr "sprite_instance::advance_sprite jsme v režimu STOP"
 
 #: ../server/sprite_instance.cpp:2442
 msgid "Calling ONLOAD event"
-msgstr ""
+msgstr "Volám událost ONLOAD (při nahrávání)"
 
 #: ../server/sprite_instance.cpp:2780
 #, c-format
 msgid "sprite %s ::goto_frame("
-msgstr ""
+msgstr "sprite %s ::goto_frame("
 
 #: ../server/sprite_instance.cpp:2826
 msgid "GotoFrame("
@@ -1503,17 +1534,17 @@
 #: ../server/sprite_instance.cpp:2965
 #, c-format
 msgid "sprite_instance::goto_labeled_frame('%s') unknown label"
-msgstr ""
+msgstr "sprite_instance::goto_labeled_frame(„%s“) neznámá jmenovka"
 
 #: ../server/sprite_instance.cpp:3046
 #, c-format
 msgid "sprite_instance::add_display_object(): unknown cid = %d"
-msgstr ""
+msgstr "sprite_instance::add_display_object(): neznámý cid = %d"
 
 #: ../server/sprite_instance.cpp:3195
 #, c-format
 msgid "sprite::replace_display_object(): unknown cid = %d"
-msgstr ""
+msgstr "sprite::replace_display_object(): neznámý cid = %d"
 
 #: ../server/sprite_instance.cpp:3306
 #, c-format
@@ -1523,36 +1554,36 @@
 #: ../server/sprite_instance.cpp:3544
 #, c-format
 msgid "%s doesn't even check for a char"
-msgstr ""
+msgstr "%s dokonce ani nekontroluje znak"
 
 #: ../server/sprite_instance.cpp:3685
 #, c-format
 msgid "Constructing sprite '%s'"
-msgstr ""
+msgstr "Vyrábím sprite „%s“"
 
 #: ../server/sprite_instance.cpp:3736
 #, c-format
 msgid "Unloading sprite '%s'"
-msgstr ""
+msgstr "Uklízím sprite „%s“"
 
 #: ../server/sprite_instance.cpp:3758 ../server/vm/action.cpp:140
 #, c-format
 msgid "can't create movie_definition for %s"
-msgstr ""
+msgstr "pro %s nelze vytvořit movie_definition"
 
 #: ../server/sprite_instance.cpp:3767
 #, c-format
 msgid "can't create extern movie_instance for %s"
-msgstr ""
+msgstr "pro %s nelze vytvořit movie_instance"
 
 #: ../server/sprite_instance.cpp:3835
 msgid "MovieClip.loadVariables() with GET/POST won't append vars for now"
-msgstr ""
+msgstr "Pro tento krát MovieClip.loadVariables() s GET/POST nepřipojí proměnné"
 
 #: ../server/sprite_instance.cpp:3860
 #, c-format
 msgid "Setting variable '%s' to value '%s'"
-msgstr ""
+msgstr "Nastavuji proměnné „%s“ hodnotu „%s“"
 
 #: ../server/sprite_instance.cpp:3903
 #, c-format
@@ -1560,24 +1591,26 @@
 "removeMovieClip(%s): sprite depth (%d) out of the 'dynamic' zone "
 "[0..1048575], won't remove"
 msgstr ""
+"removeMovieClip(%s): hloubka spritu (%d) mimo „dynamickou“ zónu "
+"[0..1048575], neodstraním"
 
 #: ../server/sprite_instance.cpp:3920
 #, c-format
 msgid "Can't remove sprite %s as it has no parent"
-msgstr ""
+msgstr "Sprite %s nelze odstranit, neboť nemá žádného rodiče"
 
 #: ../server/stream.cpp:260
 msgid "Unexpected end of stream"
-msgstr ""
+msgstr "Neočekávaný konec proudu"
 
 #: ../server/StreamProvider.cpp:91 ../server/StreamProvider.cpp:132
 #, c-format
 msgid "Unsupported network connection %s"
-msgstr ""
+msgstr "Nepodporované síťové spojení %s"
 
 #: ../server/StreamProvider.cpp:105
 msgid "POST data discarded while getting a stream from file: uri"
-msgstr ""
+msgstr "Protože proud pochází z URI „file:“, zahazuji data z POST."
 
 #: ../server/text.cpp:50
 #, c-format
@@ -1599,115 +1632,121 @@
 #: ../server/textformat.cpp:124
 #, c-format
 msgid "Created New TextFormat object at %p.  Not fully implemented yet"
-msgstr ""
+msgstr "Vytvořen nový objekt TextFormat na %p. Ještě ne zcela implementováno"
 
 #: ../server/textformat.cpp:150
 msgid "TextFormat.setFormat() needs at least 3 arguments - ...me thinks"
-msgstr ""
+msgstr "TextFormat.setFormat() potřebuje nejméně 3 argumenty – … myslím"
 
 #: ../server/textformat.cpp:159
 msgid ""
 "Argument 3 given to TextFormat.setFormat() is not a TextFormat object - ... "
 "should it be?"
 msgstr ""
+"3. argument TextFormat.setFormat() není objektem TextFormat – … měl by?"
 
 #: ../server/textformat.cpp:237
 #, c-format
 msgid "%s: args=%d unfinished implementation"
-msgstr ""
+msgstr "%s: nedokončená implementace argumentů=%d"
 
 #: ../server/video_stream_instance.cpp:43
 msgid "attachVideo needs 1 arg"
-msgstr ""
+msgstr "attachVideo potřebuje 1 argument"
 
 #: ../server/video_stream_instance.cpp:56
 #, c-format
 msgid "attachVideo(%s) first arg is not a NetStream instance"
-msgstr ""
+msgstr "První argument funkce attachVideo(%s) není instancí NetStreamu" 
 
 #: ../server/video_stream_instance.cpp:109
 msgid "An error occured while decoding video frame"
-msgstr ""
+msgstr "Během dekódování snímku videa došlo k chybě"
 
 #: ../server/vm/action.cpp:152
 #, c-format
 msgid "can't create extern root sprite for %s"
-msgstr ""
+msgstr "pro %s nelze vytvořit vnější kořenový sprite"
 
 #: ../server/vm/action.cpp:169
 #, c-format
 msgid "can't create extern sprite for %s"
-msgstr ""
+msgstr "pro %s nelze vytvořit vnější sprite"
 
 #: ../server/vm/action.cpp:232
 msgid ""
 "Attempt to call a value which is neither a C nor an ActionScript function"
 msgstr ""
+"Pokus o zavolání funkce, která není funkcí ani z C, ani z ActionScriptu"
 
 #: ../server/vm/action.cpp:264
 #, c-format
 msgid "FIXME(%d): %s"
-msgstr ""
+msgstr "OPRAVMĚ(%d): %s"
 
 #: ../server/vm/action.cpp:308
 #, c-format
 msgid "call_method_parsed('%s','%s') -- invalid fmt '%%l%c'"
-msgstr ""
+msgstr "call_method_parsed(„%s“, „%s“) – neplatný tvar „%%l%c“"
 
 #: ../server/vm/action.cpp:317
 #, c-format
 msgid "call_method_parsed('%s','%s') -- invalid fmt '%%%c'"
-msgstr ""
+msgstr "call_method_parsed(„%s“, „%s“) – neplatný tvar „%%%c“"
 
 #: ../server/vm/action.cpp:333
 #, c-format
 msgid "call_method_parsed('%s','%s') -- invalid char '%c'"
-msgstr ""
+msgstr "call_method_parsed(„%s“, „%s“) – neplatný znak „%c“"
+
 
 #: ../server/vm/action.cpp:369
 msgid "-- start movie"
-msgstr ""
+msgstr "– začni film"
 
 #: ../server/vm/action.cpp:380
 #, c-format
 msgid "FIXME: %s"
-msgstr ""
+msgstr "OPRAVMĚ: %s"
 
 #: ../server/vm/ActionExec.cpp:150
 msgid "at ActionExec operator() start, pc="
-msgstr ""
+msgstr "v zahájení operator() ActionExecu, pc="
 
 #: ../server/vm/ActionExec.cpp:197
 #, c-format
 msgid "Length %u (%d) of action tag id %u at pc "
-msgstr ""
+msgstr "Délka %u (%d) id %u značky akce na pc "
 
 #: ../server/vm/ActionExec.cpp:230
 msgid " After execution, PC is "
-msgstr ""
+msgstr " Po provedením je PC "
 
 #: ../server/vm/ActionExec.cpp:254
 #, c-format
 msgid "Loop iterations count exceeded limit of %u"
-msgstr ""
+msgstr "Čítač opakování smyčky překročil omezení %u"
 
 #: ../server/vm/ActionExec.cpp:290
 msgid "Call stack non-empty at end of ExecutableCode run (limits hit?)"
-msgstr ""
+msgstr "Zásobník volání není na konci běhu ExecutableCode prázdný (dosaženo "
+"omezení)?"
 
 #: ../server/vm/ActionExec.cpp:296
 msgid ""
 "Stack smashed (ActionScript compiler bug?).Fixing by pushing undefined "
 "values to the missing slots,  but don't expect things to work afterwards"
 msgstr ""
+"Zásobník se rozbil (chyba překladače ActionScriptu?). Chybějící sloty "
+"zaplním nedefinovanými hodnotami, ale nečekejte, že po té bude něco fungovat."
 
 #: ../server/vm/ActionExec.cpp:306
 msgid " elements left on the stack after block execution.  Cleaning up"
-msgstr " po vykonání bloku zůstal na zásobnkíku prvek. Uklízím"
+msgstr " po vykonání bloku zůstal na zásobníku prvek. Uklízím."
 
 #: ../server/vm/ActionExec.cpp:324
 msgid "End of DoAction block hit while skipping "
-msgstr ""
+msgstr "Během přeskakování potkán konec bloku DoAction "
 
 #: ../server/vm/ActionExec.cpp:361
 msgid "'With' stack depth ("
@@ -1715,28 +1754,30 @@
 
 #: ../server/vm/ActionExec.cpp:500
 msgid "Stack underrun: "
-msgstr "Zásobnkík podtekl: "
+msgstr "Zásobník podtekl: "
 
 #: ../server/vm/ASHandlers.cpp:101
 #, c-format
 msgid "Unsupported action handler invoked, code at pc is %d"
-msgstr ""
+msgstr "Vyvolána obsluha nepodporované akce, kód v pc je %d"
 
 #: ../server/vm/ASHandlers.cpp:182
 msgid ""
 "FIXME: VM not initialized at SWFHandlers construction time, can't set action "
 "handlers based on SWF version"
 msgstr ""
+"OPRAVMĚ: Při konstrukci SWFHandlers není virtuální stroj ještě "
+"inicializován, a proto nelze nastavit obsluhy akcí na základě verze SWF"
 
 #: ../server/vm/ASHandlers.cpp:466
 #, c-format
 msgid "%s: CHECKME: was broken"
-msgstr ""
+msgstr "%s: ZKONTROLUJMĚ: bylo rozbito"
 
 #: ../server/vm/ASHandlers.cpp:609
 #, c-format
 msgid "GetUrl: target=%s url=%s"
-msgstr ""
+msgstr "GetUrl: cíl=%s url=%s"
 
 #: ../server/vm/ASHandlers.cpp:630
 #, c-format
@@ -1747,105 +1788,110 @@
 #: ../server/vm/ASHandlers.cpp:1478
 #, c-format
 msgid "%s: environment target is not a sprite_instance"
-msgstr ""
+msgstr "%s: cíl prostředí není sprite_instance"
 
 #: ../server/vm/ASHandlers.cpp:861
 msgid "Undefined or null string passed to ActionSubString, returning undefined"
-msgstr ""
+msgstr "Funkci ActionSubString byl předán nedefinovaný nebo nullový řetězec, "
+"vracím nedefinováno"
 
 #: ../server/vm/ASHandlers.cpp:876
 msgid "Negative size passed to ActionSubString, taking as whole length"
-msgstr ""
+msgstr "Funkci ActionSubString předána záporná velikost, považuji za celou "
+"délku"
 
 #: ../server/vm/ASHandlers.cpp:887
 msgid "Base is less then 1 in ActionSubString, setting to 1."
-msgstr ""
+msgstr "V ActionSubString je základ měnší než 1, nastavuji na 1."
 
 #: ../server/vm/ASHandlers.cpp:896
 msgid ""
 "base goes beyond input string in ActionSubString, returning the empty string."
 msgstr ""
+"v ActionSubStringu jde základ za vstupní řetězec, vracím prázdný řetězec."
 
 #: ../server/vm/ASHandlers.cpp:910
 msgid "base+size goes beyond input string in ActionSubString, adjusting size"
-msgstr ""
+msgstr "V ActionSubStringu jde základ+velikost za vstupná řetězec, upravuji "
+"velikost"
 
 #: ../server/vm/ASHandlers.cpp:978
 #, c-format
 msgid "-- get var: %s=%s"
-msgstr ""
+msgstr "– získat proměnnou: %s=%s"
 
 #: ../server/vm/ASHandlers.cpp:982
 #, c-format
 msgid "-- get var: %s=%s at %p"
-msgstr ""
+msgstr "– získat proměnnou: %s=%s na %p"
 
 #: ../server/vm/ASHandlers.cpp:1007
 #, c-format
 msgid "-- set var: %s = %s"
-msgstr ""
+msgstr "– nastavit proměnnou: %s = %s"
 
 #: ../server/vm/ASHandlers.cpp:1069
 msgid ""
 "ActionGetProperty(<empty>) called, but current target is not a character"
 msgstr ""
+"Zavoláno ActionGetProperty(<empty>), ale současný cíl není znakem"
 
 #: ../server/vm/ASHandlers.cpp:1092
 #, c-format
 msgid "invalid property query, property number %d"
-msgstr ""
+msgstr "neplatný dotaz na vlastnost, číslo vlastnosti %d"
 
 #: ../server/vm/ASHandlers.cpp:1101
 #, c-format
 msgid "Could not find GetProperty target (%s)"
-msgstr ""
+msgstr "Nemohu najít cíl GetProperty (%s)"
 
 #: ../server/vm/ASHandlers.cpp:1133
 #, c-format
 msgid "invalid set_property, property number %d"
-msgstr ""
+msgstr "neplatná set_property, číslo vlastnosti %d"
 
 #: ../server/vm/ASHandlers.cpp:1157
 #, c-format
 msgid "Path given to duplicateMovieClip(%s) doesn't point to a character"
-msgstr ""
+msgstr "Cesta zadaná funkcu duplicateMovieClip(%s) neukazuje na znak"
 
 #: ../server/vm/ASHandlers.cpp:1168
 #, c-format
 msgid "Path given to duplicateMovieClip(%s) is not a sprite"
-msgstr ""
+msgstr "Cesta zadaná funkci duplicateMovieClip(%s) není spritem"
 
 #: ../server/vm/ASHandlers.cpp:1193
 #, c-format
 msgid "Path given to removeMovieClip(%s) doesn't point to a character"
-msgstr ""
+msgstr "Cesta zadaná funkci removeMovieClip(%s) neukazuje na znak"
 
 #: ../server/vm/ASHandlers.cpp:1203
 #, c-format
 msgid "Path given to removeMovieClip(%s) is not a sprite"
-msgstr ""
+msgstr "Cesta zadaná funkci removeMovieClip(%s) není spritem"
 
 #: ../server/vm/ASHandlers.cpp:1242
 #, c-format
 msgid "start_drag of invalid target '%s'"
-msgstr ""
+msgstr "start_drag na neplatném cíly „%s“"
 
 #: ../server/vm/ASHandlers.cpp:1266
 msgid "Y values in ActionStartDrag swapped, fixing"
-msgstr ""
+msgstr "Hodnoty Y v ActionStartDrag prohozeny, opravuji"
 
 #: ../server/vm/ASHandlers.cpp:1274
 msgid "X values in ActionStartDrag swapped, fixing"
-msgstr ""
+msgstr "Hodnoty X v ActionStartDrag prohozeny, opravuji"
 
 #: ../server/vm/ASHandlers.cpp:1340
 #, c-format
 msgid "-- %s cast_to %s (invalid args?)"
-msgstr ""
+msgstr "– %s cast_to %s (neplatné argumenty?)"
 
 #: ../server/vm/ASHandlers.cpp:1360
 msgid "ActionCastOp TESTING"
-msgstr ""
+msgstr "TESTUJI ActionCastOp"
 
 #: ../server/vm/ASHandlers.cpp:1487
 #, c-format
@@ -1853,11 +1899,13 @@
 "Frame spec found on stack at ActionWaitForFrame doesn't evaluate to a valid "
 "frame: %s"
 msgstr ""
+"Určení snímku nalezené na zásobníku v ActionWaitForFrame se nevyhodnotí "
+"jako platný snímek: %s"
 
 #: ../server/vm/ASHandlers.cpp:1552
 #, c-format
 msgid "[push length=%d]"
-msgstr ""
+msgstr "[délka push = %d]"
 
 #: ../server/vm/ASHandlers.cpp:1571
 #, c-format
@@ -1865,58 +1913,62 @@
 "Unknown push type %d. Execution will continue but it is likely to fail due "
 "to lost sync."
 msgstr ""
+"Neznámý druh push %d. Provádění bude pokrčovat, ale kvůli ztrátě "
+"synchronizace je pravděpodobné selhání."
 
 #: ../server/vm/ASHandlers.cpp:1621
 #, c-format
 msgid "register %d out of bounds"
-msgstr ""
+msgstr "register %d mimo meze"
 
 #: ../server/vm/ASHandlers.cpp:1667 ../server/vm/ASHandlers.cpp:1686
 #, c-format
 msgid "dict_lookup %d is out of bounds"
-msgstr ""
+msgstr "dict_lookup %d je mimo meze"
 
 #: ../server/vm/ASHandlers.cpp:1698 ../server/vm/ASHandlers.cpp:1702
 msgid "\t"
-msgstr ""
+msgstr "\t"
 
 #: ../server/vm/ASHandlers.cpp:1753
 msgid "Bogus empty GetUrl url in SWF file, skipping"
-msgstr ""
+msgstr "Padělané prázdné URL z GetUrl v SWF souboru, přeskakuji"
 
 #: ../server/vm/ASHandlers.cpp:1768
 msgid ""
 "Bogus GetUrl2 send vars method  in SWF file (both GET and POST requested), "
 "set to 0"
 msgstr ""
+"Padělaná metoda GetUrl2 pro posílání proměnných v SWF souboru (požadován je "
+"jak GET, tak i POST), nastavuji na 0."
 
 #: ../server/vm/ASHandlers.cpp:1781
 #, c-format
 msgid "GetUrl with target %s unsupported"
-msgstr ""
+msgstr "GetUrl s cílem %s je nepodporovaná"
 
 #: ../server/vm/ASHandlers.cpp:1827
 #, c-format
 msgid "get url: target=%s, url=%s (%s), method=%x"
-msgstr ""
+msgstr "získat URL: cíl=%s, URL=%s (%s), metoda=%x"
 
 #: ../server/vm/ASHandlers.cpp:1835
 #, c-format
 msgid "get url: target %s not found"
-msgstr ""
+msgstr "získat URL: nenalezen cíl %s"
 
 #: ../server/vm/ASHandlers.cpp:1843
 #, c-format
 msgid "get url: target %s is not a sprite"
-msgstr ""
+msgstr "získat URL: cíl %s není spritem"
 
 #: ../server/vm/ASHandlers.cpp:1850
 msgid "getURL2 loadVariable"
-msgstr ""
+msgstr "getURL2 loadVariable"
 
 #: ../server/vm/ASHandlers.cpp:1857
 msgid "getURL2 target load"
-msgstr ""
+msgstr "nahrání cíle pro getURL2"
 
 #: ../server/vm/ASHandlers.cpp:1868
 #, c-format
@@ -1924,17 +1976,22 @@
 "Unhandled GetUrl2 sendVariableMethod (%d) with loadTargetFlag and ! "
 "loadVariablesFlag"
 msgstr ""
+"Neošetřená metoda sendVariableMethod (%d) z GetUrl2 s loadTargetFlag "
+"a ! loadVariablesFlag"
+
 
 #: ../server/vm/ASHandlers.cpp:1886
 #, c-format
 msgid "Unhandled GetUrl2 sendVariableMethod (%d) with no loadTargetFlag"
-msgstr ""
+msgstr "Neošetřená metoda sendVariableMethod (%d) z GetUrl2 "
+"bez loadTargetFlag"
 
 #: ../server/vm/ASHandlers.cpp:1925
 #, c-format
 msgid ""
 "Couldn't find movie \"%s\" to set target to! Not setting target at all..."
 msgstr ""
+"Nelze nalézt film „%s“, na který má být nastaven cíl! Cíl nenastavuji vůbec…"
 
 #: ../server/vm/ASHandlers.cpp:1953
 msgid "Undefined GetUrl2 url on stack, skipping"
@@ -1942,7 +1999,7 @@
 
 #: ../server/vm/ASHandlers.cpp:1990
 msgid "branch to offset "
-msgstr ""
+msgstr "větev má odsazení "
 
 #: ../server/vm/ASHandlers.cpp:2030
 #, c-format
@@ -1950,6 +2007,8 @@
 "Couldn't find target_sprite \"%s\" in ActionCallFrame! target frame actions "
 "will not be called..."
 msgstr ""
+"V ActionCallFrame nelze nalézt target_sprite „%s“! Akce cílového snímku "
+"nebudou volány…"
 
 #: ../server/vm/ASHandlers.cpp:2092
 #, c-format
@@ -1957,6 +2016,8 @@
 "Frame spec found on stack at ActionGotoExpression doesn't evaluate to a "
 "valid frame: %s"
 msgstr ""
+"Určení snímku nalezené na zásobníku v ActionGotoExpression se nevyhodnocuje "
+"na platný snímek: %s"
 
 #: ../server/vm/ASHandlers.cpp:2106
 #, c-format
@@ -1964,20 +2025,22 @@
 "Couldn't find target sprite \"%s\" in ActionGotoExpression.  Will not go to "
 "target frame..."
 msgstr ""
+"V ActionGotoExpression nelze nalézt cílový sprite „%s“. Na cílový snímek se "
+"nepřejde…"
 
 #: ../server/vm/ASHandlers.cpp:2173
 #, c-format
 msgid "-- set local var: %s = %s"
-msgstr ""
+msgstr "– nastavit místní proměnnou: %s = %s"
 
 #: ../server/vm/ASHandlers.cpp:2206
 #, c-format
 msgid "ActionCallFunction: %s is not an object"
-msgstr ""
+msgstr "ActionCallFunction: %s není objekt"
 
 #: ../server/vm/ASHandlers.cpp:2217
 msgid "Object doensn't have a constructor"
-msgstr ""
+msgstr "Objekt nemá konstruktor"
 
 #: ../server/vm/ASHandlers.cpp:2228
 #, c-format
@@ -1985,50 +2048,52 @@
 "Attempt to call a function with %u arguments while only %u are available on "
 "the stack."
 msgstr ""
+"Pokus o zavolání funkce o %u argumentech zatímco na zásobníku jsou pouze %u."
 
 #: ../server/vm/ASHandlers.cpp:2319
 #, c-format
 msgid "---new object: %s"
-msgstr ""
+msgstr "− nový objekt: %s"
 
 #: ../server/vm/ASHandlers.cpp:2332
 #, c-format
 msgid "ActionNew: '%s' is not a constructor"
-msgstr ""
+msgstr "ActionNew: „%s“ není konstruktor"
 
 #: ../server/vm/ASHandlers.cpp:2372
 msgid "The 'var whatever' syntax in timeline context is a no-op."
-msgstr ""
+msgstr "V kontextu timeline nemá zápis „var cokoliv“ žádný význam."
 
 #: ../server/vm/ASHandlers.cpp:2488
 #, c-format
 msgid "Argument to TargetPath(%s) doesn't cast to a MovieClip"
-msgstr ""
+msgstr "Argument funkce TargetPath(%s) nelze převést na MovieClip" 
 
 #: ../server/vm/ASHandlers.cpp:2526
 #, c-format
 msgid "Top of stack not an object (%s) at ActionEnumerate execution"
-msgstr ""
+msgstr "Při vykonávání ActionEnumerate se na vrcholu zásobníku objevil "
+"neobjekt (%s)"
 
 #: ../server/vm/ASHandlers.cpp:2684
 #, c-format
 msgid " ActionGetMember: target: %s (object %p)"
-msgstr ""
+msgstr " ActionGetMember: cíl: %s (objekt %p)"
 
 #: ../server/vm/ASHandlers.cpp:2700
 #, c-format
 msgid "-- get_member %s.%s=%s"
-msgstr ""
+msgstr "− get_member %s.%s=%s"
 
 #: ../server/vm/ASHandlers.cpp:2726
 #, c-format
 msgid "-- set_member %s.%s=%s"
-msgstr ""
+msgstr "– set_member %s.%s=%s"
 
 #: ../server/vm/ASHandlers.cpp:2738
 #, c-format
 msgid "-- set_member %s.%s=%s on invalid object!"
-msgstr ""
+msgstr "– set_member %s.%s=%s na neplatném objektu!"
 
 #: ../server/vm/ASHandlers.cpp:2793
 #, c-format
@@ -2036,55 +2101,61 @@
 "Attempt to call a method with %u arguments while only %u are available on "
 "the stack."
 msgstr ""
+"Pokus o zavolání metody o %u argumentech zatímco na zásobníku jsou jen %u."
 
 #: ../server/vm/ASHandlers.cpp:2802
 #, c-format
 msgid " method name: %s"
-msgstr ""
+msgstr " jméno metody: %s"
 
 #: ../server/vm/ASHandlers.cpp:2803
 #, c-format
 msgid " method object/func: %s"
-msgstr ""
+msgstr " objekt/funkce metody: %s"
 
 #: ../server/vm/ASHandlers.cpp:2804
 #, c-format
 msgid " method nargs: %d"
-msgstr ""
+msgstr " počet argumentů metody: %d"
 
 #: ../server/vm/ASHandlers.cpp:2819
 msgid ""
 "ActionCallMethod invoked with undefined method_name and non-object object/"
 "func"
 msgstr ""
+"ActionCallMethod vyvolána bez definovaného method_name a objektového "
+"objektu/funkce"
 
 #: ../server/vm/ASHandlers.cpp:2828
 msgid ""
 "Function object given to ActionCallMethod is not a function, will try to use "
 "its 'constructor' member"
 msgstr ""
+"Funkční objekt předaný ActionCallMethod není funkcí, zkusím použít jeho "
+"člena „constructor“"
 
 #: ../server/vm/ASHandlers.cpp:2838
 msgid "ActionCallMethod: object has no constructor"
-msgstr ""
+msgstr "ActionCallMethod: objekt nemá žádný konstruktor"
 
 #: ../server/vm/ASHandlers.cpp:2847
 msgid "ActionCallMethod: object constructor is not a function"
-msgstr ""
+msgstr "ActionCallMethod: konstruktor objektu není funkcí"
 
 #: ../server/vm/ASHandlers.cpp:2863
 #, c-format
 msgid "ActionCallMethod: Tried to invoke method '%s' on non-object value %s."
-msgstr ""
+msgstr "ActionCallMethod: Vyzkoušeno zavolání metody „%s“ na neobjektové "
+"hodnotě %s."
 
 #: ../server/vm/ASHandlers.cpp:2876
 #, c-format
 msgid "ActionCallMethod: Can't find method %s of object %s"
-msgstr ""
+msgstr "ActionCallMethod: Metodu %s objektu %s nelze nalézt"
 
 #: ../server/vm/ASHandlers.cpp:2899
 msgid "FIXME: debugger doesn't deal with anonymous function calls"
-msgstr ""
+msgstr "OPRAVMĚ: debugger se neumí vypořádat s voláními anonymních funkcí"
 
 #: ../server/vm/ASHandlers.cpp:2936
 #, c-format
@@ -2092,88 +2163,93 @@
 "Attempt to call a constructor with %u arguments while only %u are available "
 "on the stack."
 msgstr ""
+"Pokus zavolat konstruktor o %u argumentech zatímco jich je na zásobníku jen "
+"%u."
 
 #: ../server/vm/ASHandlers.cpp:2948
 msgid "On ActionNewMethod: no object found on stack on ActionMethod"
-msgstr ""
+msgstr "Při ActionNewMethod: při ActionMethod nenalezen žádný objekt na "
+"zásobníku"
 
 #: ../server/vm/ASHandlers.cpp:2966
 #, c-format
 msgid "ActionNewMethod: can't find method %s of object %s"
-msgstr ""
+msgstr "ActionNewMethod: metofu %s objektu %s nelze nalézt"
 
 #: ../server/vm/ASHandlers.cpp:2980
 msgid "ActionNewMethod: method name is undefined, and object is not a function"
-msgstr ""
+msgstr "ActionNewMethod: jméno metody není definováno a objekt není funkce"
 
 #: ../server/vm/ASHandlers.cpp:3019
 #, c-format
 msgid "-- %s instanceof %s (invalid args?)"
-msgstr ""
+msgstr "– %s instanceof %s (neplatné argumenty?)"
 
 #: ../server/vm/ASHandlers.cpp:3053
 #, c-format
 msgid "Top of stack not an object %s at ActionEnum2  execution"
-msgstr ""
+msgstr "Při výkonu ActionEnum2 nebyl na vrcholu zásobníku objekt %s"
 
 #: ../server/vm/ASHandlers.cpp:3230
 #, c-format
 msgid "ActionExtends: Super is not an as_function (%s)"
-msgstr ""
+msgstr "ActionExtends: Super není as_function (%s)"
 
 #: ../server/vm/ASHandlers.cpp:3235
 #, c-format
 msgid "ActionExtends: Sub is not an as_function (%s)"
-msgstr ""
+msgstr "ActionExtends: Sub není as_function (%s)"
 
 #: ../server/vm/ASHandlers.cpp:3324
 #, c-format
 msgid ""
 "function2 code len (%u) overflows DOACTION tag boundaries (DOACTION tag len="
 msgstr ""
+"délka kódu function2 (%u) přetekla hranice značky DOACTION (délka značky "
+"DOACTION = "
 
 #: ../server/vm/ASHandlers.cpp:3396
 msgid "ActionWith tag length != 2; skipping"
-msgstr ""
+msgstr "Délka značky ActionWith != 2, přeskakuji"
 
 #: ../server/vm/ASHandlers.cpp:3406
 msgid "Empty with() block..."
-msgstr ""
+msgstr "Prázdný blok with()…"
 
 #: ../server/vm/ASHandlers.cpp:3418
 #, c-format
 msgid "with(%s) : first argument doesn't cast to an object!"
-msgstr ""
+msgstr "with(%s): první argument nelze převést na objekt!"
 
 #: ../server/vm/ASHandlers.cpp:3546
 #, c-format
 msgid "-------------- local register[%d] = '%s'"
-msgstr ""
+msgstr "–––––––––––––– lokální registr[%d] = „%s“"
 
 #: ../server/vm/ASHandlers.cpp:3555
 #, c-format
 msgid "-------------- global register[%d] = '%s'"
-msgstr ""
+msgstr "–––––––––––––– globální registr[%d] = „%s“"
 
 #: ../server/vm/ASHandlers.cpp:3563
 #, c-format
 msgid "store_register[%d] -- register out of bounds!"
-msgstr ""
+msgstr "store_register[%d] – registr mimo meze!"
 
 #: ../server/vm/ASHandlers.cpp:3574
 #, c-format
 msgid "at SWFHandlers::action_name(%d) call time, _handlers size is "
-msgstr ""
+msgstr "v době vyvolání SWFHandlers:action_name(%d) je velikost _handlers "
 
 #: ../server/swf/DefineFontAlignZonesTag.cpp:52
 #, c-format
 msgid "DefineFontAlignZones tag references an undefined font %d"
-msgstr ""
+msgstr "Značka DefineFontAlignZones odkazuje na nedefinovaný fdnt %d"
 
 #: ../server/swf/DefineFontAlignZonesTag.cpp:66
 #, c-format
 msgid "  DefinFontAlignZones: font=%d, flags=%d"
-msgstr ""
+msgstr "  DefinFontAlignZones: font=%d, příznaky=%d"
 
 #: ../server/swf/DefineFontAlignZonesTag.cpp:70
 msgid "FIXME: DefineFontAlignZoneTag unfinished"
@@ -2196,12 +2272,12 @@
 #: ../server/swf/PlaceObject2Tag.cpp:73
 #, c-format
 msgid "Reserved field in PlaceObject actions == %u (expected 0)"
-msgstr ""
+msgstr "Vyhrazené pole v akcích PlaceObject == %u (očekávána 0)"
 
 #: ../server/swf/PlaceObject2Tag.cpp:81
 #, c-format
 msgid "  actions: flags = 0x%X"
-msgstr "  akce: příznakt = 0x%X"
+msgstr "  akce: příznaky = 0x%X"
 
 #: ../server/swf/PlaceObject2Tag.cpp:101
 #, c-format
@@ -2209,233 +2285,239 @@
 "swf_event::read(), even_length = %u, but only %lu bytes left to the end of "
 "current tag. Breaking for safety."
 msgstr ""
+"swf_event::read(), even_length = %u, ale jen %lu bajtů zbývá do konce "
+"současné značky. Z bezpečnostních důvodů nedokončuji."
 
 #: ../server/swf/PlaceObject2Tag.cpp:126 ../server/swf/PlaceObject2Tag.cpp:138
 #, c-format
 msgid "swf_event::read(), event_length = %d, but read "
-msgstr ""
+msgstr "swf_event::read(), event_length = %d, ale přečteno"
 
 #: ../server/swf/PlaceObject2Tag.cpp:150
 msgid "Bytes skipping failed."
-msgstr ""
+msgstr "Přeskakování bajtů selhalo."
 
 #: ../server/swf/PlaceObject2Tag.cpp:189
 #, c-format
 msgid ""
 "swf_event::read() -- unknown / unhandled event type received, flags = 0x%x"
 msgstr ""
+"swf_event""read() – obdržen neznámý/neobsluhovaný typ události, příznaky "
+"= 0x%x"
 
 #: ../server/swf/PlaceObject2Tag.cpp:274
 #, c-format
 msgid "  PLACEOBJECT2: depth = %d (%d)"
-msgstr ""
+msgstr " PLACEOBJECT2: hloubka = %d (%d)"
 
 #: ../server/swf/PlaceObject2Tag.cpp:275
 #, c-format
 msgid "  char id = %d"
-msgstr ""
+msgstr "  znak č. =  %d"
 
 #: ../server/swf/PlaceObject2Tag.cpp:278
 msgid "  mat:"
-msgstr ""
+msgstr "  mat:"
 
 #: ../server/swf/PlaceObject2Tag.cpp:286
 #, c-format
 msgid "  ratio: %f"
-msgstr ""
+msgstr "  poměr: %f"
 
 #: ../server/swf/PlaceObject2Tag.cpp:287
 #, c-format
 msgid "  name = %s"
-msgstr ""
+msgstr "  jméno = %s"
 
 #: ../server/swf/PlaceObject2Tag.cpp:288
 #, c-format
 msgid "  clip_depth = %d (%d)"
-msgstr ""
+msgstr "  clip_depth = %d (%d)"
 
 #: ../server/swf/PlaceObject2Tag.cpp:289
 #, c-format
 msgid " m_place_type: %d"
-msgstr ""
+msgstr " m_place_type: %d"
 
 #: ../server/swf/PlaceObject2Tag.cpp:370
 msgid "  place_object_2"
-msgstr ""
+msgstr "  place_object_2"
 
 #: ../server/swf/RemoveObjectTag.cpp:68
 #, c-format
 msgid "  remove_object_2(%d)"
-msgstr ""
+msgstr "  remove_object_2(%d)"
 
 #: ../server/swf/tag_loaders.cpp:129
 msgid "anchor-labeled frame not supported"
-msgstr ""
+msgstr "rámec pojmenovaný kotvou není podporován"
 
 #: ../server/swf/tag_loaders.cpp:134
 msgid "frame_label_loader end position "
-msgstr ""
+msgstr "koncová pozice frame_label_loader"
 
 #: ../server/swf/tag_loaders.cpp:173
 #, c-format
 msgid "  set_background_color: (%d %d %d)"
-msgstr ""
+msgstr "  set_background_color: (%d %d %d)"
 
 #: ../server/swf/tag_loaders.cpp:202
 msgid "  jpeg_tables_loader"
-msgstr ""
+msgstr "  jpeg_tables_loader"
 
 #: ../server/swf/tag_loaders.cpp:244
 #, c-format
 msgid "DEFINEBITS: Duplicate id (%d) for bitmap character - discarding it"
-msgstr ""
+msgstr "DEFINEBITS: duplicitní číslo (%d) bitmapového znaku – zahazuji ho"
 
 #: ../server/swf/tag_loaders.cpp:264
 #, c-format
 msgid "  define_bits_jpeg2_loader: charid = %d pos = %lx"
-msgstr ""
+msgstr "  define_bits_jpeg2_loader: čísloznaku = %d, pozice = %lx"
 
 #: ../server/swf/tag_loaders.cpp:284
 #, c-format
 msgid "DEFINEBITSJPEG2: Duplicate id (%d) for bitmap character - discarding it"
-msgstr ""
+msgstr "DEFINEBITSJPEG2: duplicitní číslo (%d) bitmapového znaku – zahazuji ho"
 
 #: ../server/swf/tag_loaders.cpp:321
 #, c-format
 msgid "inflate_wrapper() inflateInit() returned %d"
-msgstr ""
+msgstr "inflate_wrapper() inflateInit() vrátil %d"
 
 #: ../server/swf/tag_loaders.cpp:339
 #, c-format
 msgid "inflate_wrapper() inflate() returned %d"
-msgstr ""
+msgstr "inflate_wrapper() inflate() vrátil %d"
 
 #: ../server/swf/tag_loaders.cpp:348
 #, c-format
 msgid "inflate_wrapper() inflateEnd() return %d"
-msgstr ""
+msgstr "inflate_wrapper() inflateEnd() vrátil %d"
 
 #: ../server/swf/tag_loaders.cpp:365
 #, c-format
 msgid "  define_bits_jpeg3_loader: charid = %d pos = %lx"
-msgstr ""
+msgstr "  define_bits_jpeg3_loader: čísloznaku = %d pozice = %lx"
 
 #: ../server/swf/tag_loaders.cpp:376
 msgid "gnash is not linked to zlib -- can't load jpeg3 image data"
-msgstr ""
+msgstr "gnash není slinkován se zlib – nemohu nahrát obrázková data typu JPEG3"
 
 #: ../server/swf/tag_loaders.cpp:423
 #, c-format
 msgid "  defbitslossless2: tag = %d, id = %d, fmt = %d, w = %d, h = %d"
-msgstr ""
+msgstr "  defbitslossless2: značka = %d, id = %d, fmt = %d š = %d, v = %d"
 
 #: ../server/swf/tag_loaders.cpp:432
 msgid "gnash is not linked to zlib -- can't load zipped image data"
-msgstr ""
+msgstr "gnash není slinkován se zlib – nelze nahrát komprimovaná obrazová data"
 
 #: ../server/swf/tag_loaders.cpp:538
 #, c-format
 msgid ""
 "DEFINEBITSLOSSLESS: Duplicate id (%d) for bitmap character - discarding it"
 msgstr ""
+"DEFINEBITSLOSSLESS: Duplicitní číslo (%d) bitmapového znaku – zahazuji ho"
 
 #: ../server/swf/tag_loaders.cpp:668
 #, c-format
 msgid "  FIXME: tagtype = %d"
-msgstr ""
+msgstr "  OPRAVMĚ: tagtype = %d"
 
 #: ../server/swf/tag_loaders.cpp:680
 #, c-format
 msgid "  shape_loader: id = %d"
-msgstr ""
+msgstr "  shape_loader: id = %d"
 
 #: ../server/swf/tag_loaders.cpp:696
 #, c-format
 msgid "  shape_morph_loader: id = %d"
-msgstr ""
+msgstr "  shape_morph_loader: id = %d"
 
 #: ../server/swf/tag_loaders.cpp:745
 #, c-format
 msgid "define_font_info_loader: can't find font w/ id %d"
-msgstr ""
+msgstr "define_font_info_loader: nelze nalézt font s identifikátorem %d"
 
 #: ../server/swf/tag_loaders.cpp:761
 #, c-format
 msgid "  sprite:  char id = %d"
-msgstr ""
+msgstr "  sprite: číslo znaku = %d"
 
 #: ../server/swf/tag_loaders.cpp:769
 msgid "nested DEFINESPRITE tags"
-msgstr ""
+msgstr "zanořené značky DEFINESPRITE"
 
 #: ../server/swf/tag_loaders.cpp:818
 #, c-format
 msgid "  button character loader: char_id = %d"
-msgstr ""
+msgstr "  knačítadlo znaku tlačítka: char_id = %d"
 
 #: ../server/swf/tag_loaders.cpp:842
 #, c-format
 msgid "  export: count = %d"
-msgstr ""
+msgstr "  export: počet = %d"
 
 #: ../server/swf/tag_loaders.cpp:852
 #, c-format
 msgid "  export: id = %d, name = %s"
-msgstr ""
+msgstr "  export: id = %d, jméno = %s"
 
 #: ../server/swf/tag_loaders.cpp:871
 #, c-format
 msgid "don't know how to export resource '%s' with id %d (can't find that id)"
-msgstr ""
+msgstr "nevím, jak exportovat zdroj „%s“ s identifikátorem %d (takový "
+"identifikátor nelze nelézt)"
 
 #: ../server/swf/tag_loaders.cpp:908
 #, c-format
 msgid "  import: version = %u, source_url = %s (%s), count = %d"
-msgstr ""
+msgstr "  import: verze = %u. zdrojové_url = %s (%s), počet = %d"
 
 #: ../server/swf/tag_loaders.cpp:920
 #, c-format
 msgid "Exception: %s"
-msgstr ""
+msgstr "Výjimka: %s"
 
 #: ../server/swf/tag_loaders.cpp:926
 #, c-format
 msgid "can't import movie from url %s"
-msgstr ""
+msgstr "z URL %s nelze importovat film"
 
 #: ../server/swf/tag_loaders.cpp:935
 msgid "Movie attempts to import symbols from itself."
-msgstr ""
+msgstr "Film se pokouší importovat symboly sám ze sebe."
 
 #: ../server/swf/tag_loaders.cpp:948
 #, c-format
 msgid "  import: id = %d, name = %s"
-msgstr ""
+msgstr "  import: id = %d, jméno = %s"
 
 #: ../server/swf/tag_loaders.cpp:964
 #, c-format
 msgid "import error: could not find resource '%s' in movie '%s'"
-msgstr ""
+msgstr "chyba importu: ve flimu „%2$s“ nelze nalézt zdroj „%1$s“"
 
 #: ../server/swf/tag_loaders.cpp:979 ../server/parser/movie_def_impl.cpp:297
 #, c-format
 msgid "import error: resource '%s' from movie '%s' has unknown type"
-msgstr ""
+msgstr "chyba importu: zdroj „%s“ z filmu „%s“ je neznámého typu"
 
 #: ../server/swf/tag_loaders.cpp:1000
 #, c-format
 msgid "edit_text_char, id = %d"
-msgstr ""
+msgstr "edit_text_char, id = %d"
 
 #: ../server/swf/tag_loaders.cpp:1018
 #, c-format
 msgid "text_character, id = %d"
-msgstr ""
+msgstr "text_character, id = %d"
 
 #: ../server/swf/tag_loaders.cpp:1060
 #, c-format
 msgid "define sound: ch=%d, format=%d, rate=%d, 16=%d, stereo=%d, ct=%d"
-msgstr ""
+msgstr "definovat zvuk: k=%d, formát=%d, frekvence=%d, 16=%d, stereo=%d, ct=%d"
 
 #: ../server/swf/tag_loaders.cpp:1073 ../server/swf/tag_loaders.cpp:1206
 #, c-format
@@ -2448,38 +2530,40 @@
 "There is no sound handler currently active, so character with id %d will NOT "
 "be added to the dictionary"
 msgstr ""
+"V současnosti není žádná obsluha zvuku aktivní, takže znak s identifikátorem "
+"%d NEBUDE přidán do slovníku"
 
 #: ../server/swf/tag_loaders.cpp:1133
 #, c-format
 msgid "start_sound tag: id=%d, stop = %d, loop ct = %d"
-msgstr ""
+msgstr "značka start_sound : id=%d, stop = %d, čítač smyčky = %d"
 
 #: ../server/swf/tag_loaders.cpp:1142
 #, c-format
 msgid "start_sound_loader: sound_id %d is not defined"
-msgstr ""
+msgstr "start_sound_loader: sound_id %d není definován"
 
 #: ../server/swf/tag_loaders.cpp:1194
 #, c-format
 msgid "sound stream head: format=%d, rate=%d, 16=%d, stereo=%d, ct=%d"
-msgstr ""
+msgstr "hlavička proudu zvuku: formát=%d, fekv.=%d, 16=%d, stereo=%d, čítač=%d"
 
 #: ../server/swf/tag_loaders.cpp:1374
 msgid "Host endianness not detected in define_sound_loader"
-msgstr ""
+msgstr "Během define_sound_loader nebyla detekována endianita stroje"
 
 #: ../server/swf/tag_loaders.cpp:1451
 #, c-format
 msgid "  file attributes: has_metadata=%s use_network=%s"
-msgstr ""
+msgstr "  vlastnosti souboru: má_matadata=%s, používá_síť=%s"
 
 #: ../server/swf/tag_loaders.cpp:1452 ../server/swf/tag_loaders.cpp:1453
 msgid "true"
-msgstr ""
+msgstr "ano"
 
 #: ../server/swf/tag_loaders.cpp:1452 ../server/swf/tag_loaders.cpp:1453
 msgid "false"
-msgstr ""
+msgstr "ne"
 
 #: ../server/swf/tag_loaders.cpp:1458
 msgid ""
@@ -2487,6 +2571,9 @@
 "this movie (or application?). Anyway Gnash won't care; use white/black "
 "listing in your .gnashrc instead"
 msgstr ""
+"Značka FileAttributes v SWF požaduje, aby přístup na síť nebyl tomuto "
+"filmu (nebo aplikaci?) povolen. Každopádně Gnash toto nerespektuje. Místo "
+"toho použijte seznam povolených/zakázaných domén ve vašem .gnashrc."
 
 #: ../server/swf/tag_loaders.cpp:1476
 #, c-format
@@ -2495,11 +2582,14 @@
 "%s\n"
 "]]"
 msgstr ""
+"  metadata = [[\n"
+"%s\n"
+"]]"
 
 #: ../server/swf/tag_loaders.cpp:1479
 #, c-format
 msgid "METADATA tag unused: %s"
-msgstr ""
+msgstr "Značka METADATA nepoužita: %s"
 
 #: ../server/swf/tag_loaders.cpp:1497
 #, c-format
@@ -2508,36 +2598,39 @@
 "%s\n"
 "]]"
 msgstr ""
+"  sériové číslo = [[\n"
+"%s\n"
+"]]"
 
 #: ../server/swf/tag_loaders.cpp:1500
 #, c-format
 msgid "SERIALNUMBER: %s"
-msgstr ""
+msgstr "SÉRIOVÉČÍSLO: %s"
 
 #: ../server/parser/action_buffer.cpp:108
 msgid "process_decl_dict("
-msgstr ""
+msgstr "process_decl_dict("
 
 #: ../server/parser/action_buffer.cpp:136
 msgid "action buffer dict length exceeded"
-msgstr ""
+msgstr "překročena délka adresáře s akčními buffery"
 
 #: ../server/parser/action_buffer.cpp:451
 msgid "Native floating point format not recognised"
-msgstr ""
+msgstr "Nerozpoznán přirozený formát plovoucí desetinné čárky"
 
 #: ../server/parser/action_buffer.cpp:527
 msgid "Native double floating point format not recognised"
-msgstr ""
+msgstr "Nerozpoznán formát plovoucí desetinné čárky s dvojitou přesností"
 
 #: ../server/parser/BitmapMovieDefinition.cpp:64
 #, c-format
 msgid "Creating a shape_definition wrapping a %g x %g bitmap"
-msgstr ""
+msgstr "Vyrábím shape_definition ořezávající bitmapu o rozměrech %g×%g"
 
 #: ../server/parser/button_character_def.cpp:58
 msgid "-- actions in button\n"
-msgstr ""
+msgstr "– akce na tlačítku\n"
 
 #: ../server/parser/button_character_def.cpp:100
 #, c-format
@@ -2545,73 +2638,76 @@
 "button record refer to character with id %d, which is not found in the chars "
 "dictionary"
 msgstr ""
+"záznam tlačítka odkazuje na znak s identifikátorem %d, jenž nelze nalézt ve "
+"slovníku znaků"
 
 #: ../server/parser/button_character_def.cpp:227
 msgid "button sound options: "
-msgstr ""
+msgstr "volby zvuku tlačítka: "
 
 #: ../server/parser/button_character_def.cpp:277
 #, c-format
 msgid "Next Button2 actionOffset (%u) points past the end of tag"
-msgstr ""
+msgstr "Další Button2 actionOffset (%u) ukazuje za konec značky"
 
 #: ../server/parser/button_character_def.cpp:303
 #, c-format
 msgid ""
 "Next action offset (%u) in Button2ActionConditions points past the end of tag"
 msgstr ""
+"Poloha (%u) další akce v Button2ActionConditions ukazuje za konec značky" 
 
 #: ../server/parser/edit_text_character_def.cpp:120
 #, c-format
 msgid "error: text style with undefined font; font_id = %d"
-msgstr ""
+msgstr "chyba: styl textu s nedefinovaným fontem; font_id = %d"
 
 #: ../server/parser/morph2_character_def.cpp:243
 #, c-format
 msgid "morph fill style type = 0x%X"
-msgstr ""
+msgstr "druh vyplňovacího stylu morphu = 0x%X"
 
 #: ../server/parser/morph2_character_def.cpp:253
 msgid "morph fill style begin color: "
-msgstr ""
+msgstr "počáteční barva stylu výplně morphu: "
 
 #: ../server/parser/morph2_character_def.cpp:255
 msgid "morph fill style end color: "
-msgstr ""
+msgstr "koncová barva stylu výplně morphu: "
 
 #: ../server/parser/morph2_character_def.cpp:303
 #, c-format
 msgid "morph fsr: num_gradients = %d"
-msgstr ""
+msgstr "morph fsr: počet_stupňů = %d"
 
 #: ../server/parser/morph2_character_def.cpp:319
 #, c-format
 msgid "morph fsr bitmap_char = %d"
-msgstr ""
+msgstr "morph fsr bitmap_char = %d"
 
 #: ../server/parser/morph2_character_def.cpp:386
 msgid "Different number of paths in start ("
-msgstr ""
+msgstr "Odlišný počet cest v začátečním ("
 
 #: ../server/parser/morph2_character_def.cpp:394
 #, c-format
 msgid "Different number of edges in start (%u) and end (%u) shapes of a morph"
-msgstr ""
+msgstr "Rozdílný počet hran v začátečních (%u) a koncových (%u) tvarech morphu"
 
 #: ../server/parser/movie_def_impl.cpp:280
 #, c-format
 msgid "import error: resource '%s' is not exported from movie '%s'"
-msgstr ""
+msgstr "chyba importu: zdroj „%s“ není exportován z filmu „%s“"
 
 #: ../server/parser/movie_def_impl.cpp:326
 #, c-format
 msgid "get_character_def(): character_id %d is still waiting to be imported"
-msgstr ""
+msgstr "get_character_def(): identifikátor znaku %d stále čeká na svůj import"
 
 #: ../server/parser/movie_def_impl.cpp:348
 #, c-format
 msgid "get_font(): font_id %d is still waiting to be imported"
-msgstr ""
+msgstr "get_font(): identifikátor fontu %d stále čeká na svůj import"
 
 #: ../server/parser/movie_def_impl.cpp:395
 #, c-format
@@ -2620,117 +2716,125 @@
 
 #: ../server/parser/movie_def_impl.cpp:423
 msgid "gnash::movie_def_impl::read() -- file does not start with a SWF header"
-msgstr ""
+msgstr "gnash::movie_def_impl::read() – soubor nezačíná SWF hlavičkou"
 
 #: ../server/parser/movie_def_impl.cpp:430
 #, c-format
 msgid "version = %d, file_length = %d"
-msgstr ""
+msgstr "verze = %d, délka_soubor  = %d"
 
 #: ../server/parser/movie_def_impl.cpp:436
 #, c-format
 msgid "SWF%d is not fully supported, trying anyway but don't expect it to work"
-msgstr ""
+msgstr "SWF%d není plně podporován, pokračuji, ale nečekejte, že to bude fungovat"
 
 #: ../server/parser/movie_def_impl.cpp:443
 msgid ""
 "movie_def_impl::read(): unable to read zipped SWF data; gnash was compiled "
 "without zlib support"
 msgstr ""
+"movie_def_impl::read(): nelze číst zipem komprimovaná SWF data; gnash byl "
+"přeložen bez podpory zlib"
 
 #: ../server/parser/movie_def_impl.cpp:448
 msgid "file is compressed"
-msgstr ""
+msgstr "soubor je komprimovaný"
 
 #: ../server/parser/movie_def_impl.cpp:485
 #, c-format
 msgid "frame rate = %f, frames = "
-msgstr ""
+msgstr "snímková frekvence = %f, snímků = "
 
 #: ../server/parser/movie_def_impl.cpp:513
 msgid "Could not start loading thread"
-msgstr ""
+msgstr "Nemohu spustit načítací vlákno"
 
 #: ../server/parser/movie_def_impl.cpp:665
 msgid "cache file does not have the correct format; skipping"
-msgstr ""
+msgstr "soubor keše nemá správný formát, přeskakuji"
 
 #: ../server/parser/movie_def_impl.cpp:671
 #, c-format
 msgid "cached data is version %d, but we require version %d; skipping"
-msgstr ""
+msgstr "nakešovaná data jsou verze %d, ale my potřebujeme verzi %d; přeskakuji"
 
 #: ../server/parser/movie_def_impl.cpp:686
 msgid "error reading cache file (characters); skipping"
-msgstr ""
+msgstr "chyba při čtení kešového souboru (znaky); přeskakuji"
 
 #: ../server/parser/movie_def_impl.cpp:691
 msgid "unexpected eof reading cache file (characters); skipping"
-msgstr ""
+msgstr "neočekávaný konec kešového souboru (znaky); přeskakuji"
 
 #: ../server/parser/movie_def_impl.cpp:706
 msgid ""
 "sync error in cache file (reading characters).  Skipping rest of cache data."
 msgstr ""
+"chyba při synchronizaci kešového souboru (čtení znaků). Zbytek keše "
+"přeskakuji."
 
 #: ../server/parser/movie_def_impl.cpp:740
 #, c-format
 msgid "Character %d @ %p"
-msgstr ""
+msgstr "Znak %d na %p"
 
 #: ../server/parser/movie_def_impl.cpp:752
 #, c-format
 msgid "Could not find char %d, dump is:"
-msgstr ""
+msgstr "Nemohu nalézt znak %d, následuje výpis:"
 
 #: ../server/parser/movie_def_impl.cpp:790
 #, c-format
 msgid "Ensure load of frame %u/%u (last loaded is: %u)"
-msgstr ""
+msgstr "Zajistit načtení snímku %u/%u (poslední nahraný je: %u)"
 
 #: ../server/parser/movie_def_impl.cpp:795
 msgid "Could not advance to frame "
-msgstr ""
+msgstr "Nelze přejít do snímku "
 
 #: ../server/parser/movie_def_impl.cpp:804
 #, c-format
 msgid ""
 "No more frames to load. Framecount: %u, Lastloaded: %u, next to load: %u"
 msgstr ""
+"Žádné další snímky k nahrání. Počet snímků: %u, naposledy nahraný %u, "
+"příští k nahrání: %u"
 
 #: ../server/parser/movie_def_impl.cpp:849
 msgid ""
 "Hit stream-end tag, but not at the advertised SWF end; stopping for safety."
 msgstr ""
+"Dosažena značka konce proudu, ale mimo uvedený konec SWF; raději zastavuji."
 
 #: ../server/parser/movie_def_impl.cpp:875
 #, c-format
 msgid ""
 "last expected SHOWFRAME in SWF stream '%s' isn't followed by an END (%d)."
 msgstr ""
+"poslední očekávaný SHOWFRAME v SWF proudu „%s“ není následován ENDem (%d)."
 
 #: ../server/parser/movie_def_impl.cpp:894
 #, c-format
 msgid "*** no tag loader for type %d (movie)"
-msgstr ""
+msgstr "*** chybá načítač značky typu %d (film)"
 
 #: ../server/parser/movie_def_impl.cpp:913
 #, c-format
 msgid "Parsing exception: %s"
-msgstr ""
+msgstr "Výjimka rozebírání: %s"
 
 #: ../server/parser/movie_def_impl.cpp:919
 msgid " action blocks and "
-msgstr ""
+msgstr " akce blokuje a "
 
 #: ../server/parser/movie_def_impl.cpp:929
 msgid " frames advertised in header, but only "
-msgstr ""
+msgstr " oznámení snímků v hlavičce, ale jen "
 
 #: ../server/parser/movie_def_impl.cpp:959
 #, c-format
 msgid "number of SHOWFRAME tags in SWF stream '%s' ("
-msgstr ""
+msgstr "počet značek SHOWFRAME v SWF proudu „%s“ ("
 
 #: ../server/parser/movie_def_impl.cpp:972
 #, c-format
@@ -2740,11 +2844,11 @@
 #: ../server/parser/movie_def_impl.cpp:1002
 #, c-format
 msgid "get_exported_resource called, frame count=%u"
-msgstr ""
+msgstr "zavoláno get_exported_resource, počet snímků = %u"
 
 #: ../server/parser/movie_def_impl.cpp:1038
 msgid "frame load advancement (from "
-msgstr ""
+msgstr "pokrok v načítání snímků (z "
 
 #: ../server/parser/movie_def_impl.cpp:1048
 #, c-format
@@ -2752,16 +2856,18 @@
 "No frame progress in movie %s after %lu milliseconds (%lu microseconds = %lu "
 "iterations), giving up on get_exported_resource(%s): circular IMPORTS?"
 msgstr ""
+"Žádný postup snímků ve filmu %s po %lu milisekundách (%lu mikrosekund = %lu "
+"iterací), vzdávám to na get_exported_resource(%s): kruhové IMPORTS?"
 
 #: ../server/parser/movie_def_impl.cpp:1062
 #, c-format
 msgid "no frame progress at iteration %lu"
-msgstr ""
+msgstr "žádný postup snímků v iteraci %lu"
 
 #: ../server/parser/movie_def_impl.cpp:1069
 #, c-format
 msgid "At end of stream, still no '%s' symbol found in m_exports ("
-msgstr ""
+msgstr "Ať na konci proudu, žádný symbol „%s“ nebyl v m_exports dosud nalezen ("
 
 #: ../server/parser/movie_def_impl.cpp:1076
 #, c-format
@@ -2769,36 +2875,38 @@
 "We haven't finished loading (loading frame %u), and m_exports.get returned "
 "no entries, sleeping a bit and trying again"
 msgstr ""
+"Nedokončili jsme nahrávání (nahrávání snímku %u) a m_exports.get nevrátil "
+"žádné položky, trochu se prospím a zkusím to znovu."
 
 #: ../server/parser/shape_character_def.cpp:85
 #, c-format
 msgid "  read_fill_styles: count = %u"
-msgstr ""
+msgstr "  read_fill_styles: počet = %u"
 
 #: ../server/parser/shape_character_def.cpp:122
 #, c-format
 msgid "  read_line_styles: count = %d"
-msgstr ""
+msgstr "  read_line_styles: počet = %d"
 
 #: ../server/parser/shape_character_def.cpp:132
 #, c-format
 msgid "  read_line_styles: count2 = %d"
-msgstr ""
+msgstr "  read_line_styles: počet2 = %d"
 
 #: ../server/parser/shape_character_def.cpp:183
 #, c-format
 msgid "  bound rect: %s"
-msgstr ""
+msgstr "  ohraničující obdélník: %s"
 
 #: ../server/parser/shape_character_def.cpp:209
 #, c-format
 msgid "  shape_character_def read: nfillbits = %d, nlinebits = %d"
-msgstr ""
+msgstr "  shape_character_def přečten: početvýplňků = %d, početlinek = %d"
 
 #: ../server/parser/shape_character_def.cpp:267
 #, c-format
 msgid "  shape_character read: moveto %4g %4g"
-msgstr ""
+msgstr "  shape_character načten: přesun na %4g %4g"
 
 #: ../server/parser/shape_character_def.cpp:289
 #, c-format
@@ -2806,17 +2914,21 @@
 "Invalid fill style %d in fillStyle0Change record for font tag (0 or 1 "
 "valid). Set to 0."
 msgstr ""
+"Neplatný styl výplně %d v záznamu fillStyle0Change pro značku fontu (platný "
+"je 0 nebo 1). Nastavuji na 0."
 
 #: ../server/parser/shape_character_def.cpp:299
 #, c-format
 msgid ""
 "Invalid fill style %d in fillStyle0Change record - %u defined. Set to 0."
 msgstr ""
+"Neplatný styl výplně %d v záznamu fillStyle0Change – %u definováno. "
+"Nastavuji na 0."
 
 #: ../server/parser/shape_character_def.cpp:308
 #, c-format
 msgid "  shape_character read: fill0 (left) = %d"
-msgstr ""
+msgstr "  načten shape_character: fill0 (levý) = %d"
 
 #: ../server/parser/shape_character_def.cpp:332
 #, c-format
@@ -2824,17 +2936,21 @@
 "Invalid fill style %d in fillStyle1Change record for font tag (0 or 1 "
 "valid). Set to 0."
 msgstr ""
+"Neplatný styl výplně %d v záznamu fillStyle1Change pro značku fontu (platný "
+"je 0 nebo 1). Nastavuji na 0."
 
 #: ../server/parser/shape_character_def.cpp:342
 #, c-format
 msgid ""
 "Invalid fill style %d in fillStyle1Change record - %u defined. Set to 0."
 msgstr ""
+"Neplatný styl výplně %d v záznamu fillStyle+Change – %u definováno. "
+"Nastavuji na 0."
 
 #: ../server/parser/shape_character_def.cpp:350
 #, c-format
 msgid "  shape_character read: fill1 (right) = %d"
-msgstr ""
+msgstr "  načten shape_character: fill1 (pravý) = %d"
 
 #: ../server/parser/shape_character_def.cpp:372
 #, c-format
@@ -2842,107 +2958,113 @@
 "Invalid line style %d in lineStyleChange record for font tag (0 or 1 valid). "
 "Set to 0."
 msgstr ""
+"Neplatný styl čáry %d v záznamu lineStyleChange pro značku fontu (platný je "
+"0 nebo 1). Nastavuji na 0."
 
 #: ../server/parser/shape_character_def.cpp:382
 #, c-format
 msgid "Invalid fill style %d in lineStyleChange record - %u defined. Set to 0."
 msgstr ""
+"Neplatný styl výplně %d v záznamu lineStyleChange – %u definováno. "
+"Nastavuji na 0."
 
 #: ../server/parser/shape_character_def.cpp:391
 #, c-format
 msgid "  shape_character_read: line = %d"
-msgstr ""
+msgstr "  shape_character_read: čára = %d"
 
 #: ../server/parser/shape_character_def.cpp:408
 msgid "  shape_character read: more fill styles"
-msgstr ""
+msgstr "  načten shape_character: více stylů výplně"
 
 #: ../server/parser/shape_character_def.cpp:444
 #, c-format
 msgid "  shape_character read: curved edge   = %4g %4g - %4g %4g - %4g %4g"
-msgstr ""
+msgstr "  načten shape_character: zaoblená hrana = %4g %4g – %4g %4g – %4g %4g"
 
 #: ../server/parser/shape_character_def.cpp:475
 #, c-format
 msgid "  shape_character_read: straight edge = %4g %4g - %4g %4g"
-msgstr ""
+msgstr "  shape_character_read: rovná hrana = %4g %4g – %4g %4g"
 
 #: ../server/parser/sprite_definition.cpp:41
 #, c-format
 msgid "Instantiating sprite_def %p"
-msgstr ""
+msgstr "Vytvářím instanci sprite_def %p"
 
 #: ../server/parser/sprite_definition.cpp:80
 msgid "  frames = "
-msgstr ""
+msgstr "  snímků = "
 
 #: ../server/parser/sprite_definition.cpp:94
 msgid "DefineSprite tag inside sprite definition"
-msgstr ""
+msgstr "Značka DefineSprite uvnitř definice spritu"
 
 #: ../server/parser/sprite_definition.cpp:109
 msgid "  show_frame "
-msgstr ""
+msgstr "  show_frame "
 
 #: ../server/parser/sprite_definition.cpp:124
 msgid ""
 "last SHOWFRAME of a DEFINESPRITE tag isn't followed by an END. Seeking to "
 "next END tag."
 msgstr ""
+"Poslední SHOWFRAME značky DEFINESPRITE není následován ENDem. Přesunuji se "
+"na další značku END."
 
 #: ../server/parser/sprite_definition.cpp:145
 #, c-format
 msgid "*** no tag loader for type %d (sprite)"
-msgstr ""
+msgstr "*** žádný načítač značek typu %d (sprite)"
 
 #: ../server/parser/sprite_definition.cpp:153
 msgid "  -- sprite END --"
-msgstr ""
+msgstr "  –– sprite END ––"
 
 #: ../server/parser/sprite_definition.cpp:211
 #, c-format
 msgid "Registered class %p for sprite_def %p"
-msgstr ""
+msgstr "Pro sprite_def %2$p registrována třída %1$p"
 
 #: ../server/parser/sprite_definition.cpp:213
 msgid " Exported interface: "
-msgstr ""
+msgstr " Exportované rozhraní: "
 
 #: ../server/parser/text_character_def.cpp:29
 msgid "begin text records"
-msgstr ""
+msgstr "začít textové záznamy"
 
 #: ../server/parser/text_character_def.cpp:43
 msgid "end text records"
-msgstr ""
+msgstr "ukončit textové záznamy"
 
 #: ../server/parser/text_character_def.cpp:62
 msgid "  text style change"
-msgstr ""
+msgstr "  změna stylu textu"
 
 #: ../server/parser/text_character_def.cpp:71
 #, c-format
 msgid "  has_font: font id = %d"
-msgstr ""
+msgstr "  má_font: č. fontu = %d"
 
 #: ../server/parser/text_character_def.cpp:86
 msgid "  has_color"
-msgstr ""
+msgstr "  má_barvu"
 
 #: ../server/parser/text_character_def.cpp:94
 #, c-format
 msgid "  has_x_offset = %g"
-msgstr ""
+msgstr "  má_posun_x = %g"
 
 #: ../server/parser/text_character_def.cpp:107
 #, c-format
 msgid "  has_y_offset = %g"
-msgstr ""
+msgstr "  má_posun_y = %g"
 
 #: ../server/parser/text_character_def.cpp:119
 #, c-format
 msgid "  text_height = %g"
-msgstr ""
+msgstr "  výška_textu = %g"
 
 #: ../server/parser/text_character_def.cpp:142
 #, c-format
@@ -2953,138 +3075,142 @@
 msgid ""
 "Sorry, we can only list the files on systems with disk based shared memory"
 msgstr ""
+"Je nám líto, ale můžeme vypsat jen ty soubory, které jsou na systémech "
+"se sdílenou pamětí uloženou na disku"
 
 #: ../utilities/dumpshm.cpp:216
 msgid "No name specified, nuking everything..."
-msgstr ""
+msgstr "Neurčeno žádné jméno, vše likviduji…"
 
 #: ../utilities/dumpshm.cpp:223
 msgid "Removing segment: "
-msgstr ""
+msgstr "Odstraňuji segment: "
 
 #: ../utilities/dumpshm.cpp:231
 msgid "Nuking the shared memory segment "
-msgstr ""
+msgstr "Likviduji segment sdílené paměti "
 
 #: ../utilities/dumpshm.cpp:257
 msgid "ERROR: couldn't read!"
-msgstr ""
+msgstr "CHYBA: nemohu číst!"
 
 #: ../utilities/dumpshm.cpp:288
 msgid "This program dumps the internal data of a shared memory segment"
-msgstr ""
+msgstr "Tento program vypíše vnitřní data sdíleného segmentu paměti"
 
 #: ../utilities/dumpshm.cpp:290
 msgid "Usage: dumpmem [hdsanlif] filename"
-msgstr ""
+msgstr "Použití: dumpmem [hdsanlif] SOUBOR"
 
 #: ../utilities/dumpshm.cpp:291
 msgid "-h\tHelp"
-msgstr ""
+msgstr "-h\tNápověda"
 
 #: ../utilities/dumpshm.cpp:292
 msgid "-d\tDump data"
-msgstr ""
+msgstr "-d\tVypiš data"
 
 #: ../utilities/dumpshm.cpp:293
 msgid "-n [optional name]\tNuke everything"
-msgstr ""
+msgstr "-n [VOLITELNÉ_JMÉNO]\tZničit vše"
 
 #: ../utilities/dumpshm.cpp:294
 msgid "-l\tLength of segment"
-msgstr ""
+msgstr "-l\tDélka segmentu"
 
 #: ../utilities/dumpshm.cpp:295
 msgid "-i\tList segments"
-msgstr ""
+msgstr "-i\tVypíše seznam segmentů"
 
 #: ../utilities/dumpshm.cpp:296
 msgid "-f\tForce to use builtin names for nuke"
-msgstr ""
+msgstr "-f\tPro likvidaci vždy použije vestavěná jména"
 
 #: ../utilities/dumpshm.cpp:308
 msgid "\tBase address of this segment: "
-msgstr ""
+msgstr "\tPočáteční adresa tohoto segmentu: "
 
 #: ../utilities/dumpshm.cpp:310
 msgid "\tFilespec: "
-msgstr ""
+msgstr "\tSoubor: "
 
 #: ../utilities/dumpshm.cpp:311
 msgid "\t# Bytes allocated: "
-msgstr ""
+msgstr "\tPočet vyhrazených bajtů: "
 
 #: ../utilities/dumpshm.cpp:312
 msgid "\tTotal # of bytes: "
-msgstr ""
+msgstr "\tCelkový počet bajtů: "
 
 #: ../utilities/parser.cpp:143
 #, c-format
 msgid "has_scale = %d, has_rotate = %d\n"
-msgstr ""
+msgstr "je_zvětšeno = %d, je_otočeno = %d\n"
 
 #: ../utilities/parser.cpp:168
 #, c-format
 msgid "x_min: %i, x_max: %i,\twidth: %i twips, %4.0f pixels\n"
-msgstr ""
+msgstr "x_min: %i, x_max: %i,\tšířka: %i twipů, %4.0f pixelů\n"
 
 #: ../utilities/parser.cpp:169
 #, c-format
 msgid "y_min: %i, y_max: %i, height: %i twips, %4.0f pixels\n"
-msgstr ""
+msgstr "y_min: %i, y_max: %i, výška: %i twipů, %4.0f pixelů\n"
 
 #: ../utilities/parser.cpp:190
 #, c-format
 msgid "rgb: %d %d %d \n"
-msgstr ""
+msgstr "rgb: %d %d %d \n"
 
 #: ../utilities/parser.cpp:211
 #, c-format
 msgid "rgba: %d %d %d %d\n"
-msgstr ""
+msgstr "rgba: %d %d %d %d\n"
 
 #: ../utilities/parser.cpp:284
 msgid "cxform:\n"
-msgstr ""
+msgstr "cxform:\n"
 
 #: ../utilities/parser.cpp:285
 #, c-format
 msgid "has_add = %d, has_mult = %d\n"
-msgstr ""
+msgstr "má_sčítanec = %d, má_činitel = %d\n"
 
 #: ../utilities/parser.cpp:303
 msgid ""
 "Movie ended\n"
 "\n"
 msgstr ""
+"Film skončil\n"
+"\n"
 
 #: ../utilities/parser.cpp:627
 #, c-format
 msgid "Gnash gparser version: %s, Gnash version: %s"
-msgstr ""
+msgstr "Verze gnashového gparseru: %s, Verze gnashe: %s"
 
 #: ../utilities/parser.cpp:662 ../utilities/processor.cpp:196
 #: ../gui/gnash.cpp:235
 msgid "Setting debugger ON"
-msgstr ""
+msgstr "ZAPÍNÁM debugger"
 
 #: ../utilities/parser.cpp:664 ../utilities/processor.cpp:198
 msgid "The debugger has been disabled at configuration time"
-msgstr ""
+msgstr "Debugger byl zakázán při konfiguraci"
 
 #: ../utilities/parser.cpp:679
 msgid "No input files"
-msgstr ""
+msgstr "Žádné vstupní soubory"
 
 #: ../utilities/parser.cpp:691
 #, c-format
 msgid "Processing file: %s"
-msgstr ""
+msgstr "Zpracovávám soubor: %s"
 
 #: ../utilities/parser.cpp:693
 #, c-format
 msgid "Can't open file '%s' for input"
-msgstr ""
+msgstr "Soubor „%s“ nelze otevřít jako vstup"
 
 #: ../utilities/parser.cpp:708
 #, c-format
@@ -3096,23 +3222,29 @@
 "  --version   Print the version numbers.\n"
 "  -g          Start the Flash debugger.\n"
 msgstr ""
+"gparser – SWF parser pro Gnash.\n"
+"\n"
+"Použití: gparser [SWF_SOUBORY_KE_ZPRACOVÁNÍ…]\n"
+"  --help(-h)  Vypíše tyto informace.\n"
+"  --version   Vypíše čísla verzí.\n"
+"  -g          Spustí debugger Flashe.\n"
 
 #: ../utilities/processor.cpp:153
 #, c-format
 msgid "Gnash gprocessor version: %s, Gnash version: %s"
-msgstr ""
+msgstr "Verze Gnash gprocessoru: %s, verze Gnashe: %s"
 
 #: ../utilities/processor.cpp:190 ../gui/gnash.cpp:191
 msgid "Verbose output turned on"
-msgstr ""
+msgstr "Zapnut upovídaný výstup"
 
 #: ../utilities/processor.cpp:204
 msgid "Verbose actions disabled at compile time"
-msgstr ""
+msgstr "Upovídané akce zakázány při překladu"
 
 #: ../utilities/processor.cpp:211
 msgid "Verbose parsing disabled at compile time"
-msgstr ""
+msgstr "Upovídané rozebírání zakázáno při překladu"
 
 #: ../utilities/processor.cpp:460
 #, c-format
@@ -3128,6 +3260,15 @@
 "\n"
 "%s%s%s%s"
 msgstr ""
+"gprocessor – SWF preprocesor pro Gnash.\n"
+"\n"
+"Použití: %s [PŘEPÍNAČE] <SOUBOR>\n"
+"\n"
+"Předzpracuje zadaný SOUBOR se SWF filmem. Volitelně zapíše do souborů keše\n"
+"předzpracované tvary a fonty, takže související SWF soubory mohou být\n"
+"nahrány rychleji.\n"
+"\n"
+"%s%s%s%s"
 
 #: ../utilities/processor.cpp:469
 msgid ""
@@ -3139,14 +3280,21 @@
 "file.\n"
 "  -v          Be verbose; i.e. print log messages to stdout\n"
 msgstr ""
+"Přepínače:\n"
+"\n"
+"  --help(-h)  Vypíše tuto nápovědu.\n"
+"  --version   Vypíše čísla verzí.\n"
+"  -w          Zapíše .gsc soubor s předzpracovanými informacemi o každém\n"
+"              vstupním souboru.\n"
+"  -v          Bude upovídaný; tj. na standardní výstup vypisuje protokol\n"
 
 #: ../utilities/processor.cpp:477
 msgid "  -vp         Be verbose about movie parsing\n"
-msgstr ""
+msgstr "  -vp         Upovídané rozebírání filmu\n"
 
 #: ../utilities/processor.cpp:482
 msgid "  -va         Be verbose about ActionScript\n"
-msgstr ""
+msgstr "  -va         Upovídaný ActionScript\n"
 
 #: ../utilities/processor.cpp:487
 msgid ""
@@ -3158,6 +3306,13 @@
 "              Keep advancing untill any other stop condition\n"
 "              is encountered if set to 0 (default).\n"
 msgstr ""
+"  -r <POČET>  Umožní zadaný počet úplných běhů.\n"
+"              0 znamená nekonečné cyklení.\n"
+"              Implicitní je 1 (skončit jakmile je dosažen poslední snímek).\n"
+"  -f <POČET>  \n"
+"              Umožní zadaný počet vývojových kroků snímku.\n"
+"              Je-li nastavena 0 (implicitní), provádí kroky snímku dokud\n"
+"              nebude splněna jiní zastavující podmínka.\n"
 
 #: ../gui/gnash.cpp:73
 msgid ""
@@ -3185,7 +3340,7 @@
 "  -s <faktor> Zvětší/zmenší film podel zadaného faktoru\n"
 "  -c          Vyrobí core soubor namísto toho, aby nechal SDL jej zachytit\n"
 "  -d <číslo>  Počet milisekund, kterých se čeká v hlavní smyčce\n"
-"  -v          Být upovídaný; tj. vypisuje protokl na standardní výstup\n"
+"  -v          Být upovídaný; tj. vypisuje protokol na standardní výstup\n"
 
 #: ../gui/gnash.cpp:85
 msgid "  -va         Be verbose about movie Actions\n"
@@ -3193,7 +3348,7 @@
 
 #: ../gui/gnash.cpp:90
 msgid "  -vp         Be verbose about parsing the movie\n"
-msgstr "  -vp         Být upovídaný ihledně rozebírání filmu\n"
+msgstr "  -vp         Být upovídaný ohledně rozebírání filmu\n"
 
 #: ../gui/gnash.cpp:95
 msgid ""
@@ -3204,10 +3359,10 @@
 "  -k <height> Set window height\n"
 "  -1          Play once; exit when/if movie reaches the last frame\n"
 msgstr ""
-"  -m <posun>  Určuje LOD posun textur (reálné číslo, implictní je -1,0)\n"
+"  -m <posun>  Určuje LOD posun textur (reálné číslo, implicitní je -1,0)\n"
 "  -x <ID>     ID X11 okna, do kterého se bude kreslit\n"
 "  -w          Uloží ladící protokol na disk\n"
-"  -j <width>  Nastaví šírku okna\n"
+"  -j <width>  Nastaví šířku okna\n"
 "  -k <height> Nastaví výšku okna\n"
 "  -1          Přehraje jednou a ukončí se, když film dosáhne posledního "
 "okna\n"
@@ -3226,7 +3381,7 @@
 "              0 zakáže vykreslování i zvuk (dobré pro dávkové testování)\n"
 "              1 povolí vykreslování a zakáže zvuk\n"
 "              2 povolí zvuk a zakáže vykreslování\n"
-"              3 povolí jak vykreslování tak i zvuk (implictní)\n"
+"              3 povolí jak vykreslování tak i zvuk (implicitní)\n"
 
 #: ../gui/gnash.cpp:109
 msgid ""
@@ -3267,11 +3422,11 @@
 "klávesy:\n"
 "  CTRL-Q, CTRL-W, ESC  Konec\n"
 "  CTRL-P           Pauza/odpauzování\n"
-"  CTRL-R           Přehraje film od začítku\n"
+"  CTRL-R           Přehraje film od začátku\n"
 "  CTRL-[ nebo kp-  Vrátí se o 1 snímek zpět\n"
 "  CTRL-] nebo kp+  Posune se o 1 snímek dopředu\n"
 "  CTRL-B           Přepne barvu pozadí\n"
-"  CTRL-A           Přepsne vyhlazování [antialiasing] (nefunguje)\n"
+"  CTRL-A           Přepne vyhlazování [antialiasing] (nefunguje)\n"
 "  CTRL-T           Ladění. Vyzkouší funkci set_variable()\n"
 "  CTRL-G           Ladění. Vyzkouší funkci get_variable()\n"
 "  CTRL-M           Ladění. Vyzkouší funkci call_method()\n"
@@ -3302,7 +3457,7 @@
 
 #: ../gui/gnash.cpp:208
 msgid "No verbose parsing; disabled at compile time"
-msgstr "Žádné upovídáné rozebírání; zakázáno při překladu"
+msgstr "Žádné upovídané rozebírání; zakázáno při překladu"
 
 #: ../gui/gnash.cpp:219
 #, c-format
@@ -3389,12 +3544,12 @@
 
 #: ../gui/gtk.cpp:543
 msgid "Log File name"
-msgstr "Jméno protokolovacího souboru"
+msgstr "Jméno souboru protokolu"
 
 #: ../gui/gtk.cpp:557
 #, c-format
 msgid "Debug log filename: %s"
-msgstr "Jméno souboru s ladícímí informacemi: %s"
+msgstr "Jméno souboru s ladícími informacemi: %s"
 
 #: ../gui/gtk.cpp:564
 msgid "Parser output"
@@ -3458,7 +3613,7 @@
 
 #: ../gui/gtk.cpp:873
 msgid "GNASH flash movie player"
-msgstr "Přehrávač flasheových filmů GNASH"
+msgstr "Přehrávač flashových filmů GNASH"
 
 #: ../gui/gtk.cpp:875
 msgid "Copyright (C) 2005, 2006, 2007 The Free Software Foundation"
@@ -3481,7 +3636,7 @@
 msgstr ""
 "Tento program je svobodný software; můžete jej šířit a/nebo měnit\n"
 "pokud dodržíte podmínky GNU General Public License (GPL) vydané\n"
-"Free Software Foundation a to buď ve verzi 2 nebo (dle vaší volby)\n"
+"Free Software Foundation a to buď ve verzi 3 nebo (dle vaší volby)\n"
 "libovolné novější.\n"
 "\n"
 "Program je šířen v naději, že bude užitečný, ale BEZ JAKÉKOLIV\n"
@@ -3603,7 +3758,7 @@
 #: ../gui/Player.cpp:176
 #, c-format
 msgid "Timer delay set to %d milliseconds"
-msgstr "Spořdění časovače nastaveno na %d milisekund(u/y)"
+msgstr "Prodleva časovače nastaveno na %d milisekund(u/y)"
 
 #: ../gui/Player.cpp:196
 msgid "Sound requested but no sound support compiled in"
@@ -3612,7 +3767,7 @@
 #: ../gui/Player.cpp:325
 #, c-format
 msgid "Input movie has collapsed dimensions %d/%d. Giving up."
-msgstr "Vsupní film se zhroutil na rozměrech %d/%d. Vzdám to."
+msgstr "Vstupní film se zhroutil na rozměrech %d/%d. Vzdám to."
 
 #: ../gui/Player.cpp:384
 #, c-format



From MAILER-DAEMON Sat Aug 18 09:53:52 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMOkS-0003O2-P3
	for mharc-gnash-commit@gnu.org; Sat, 18 Aug 2007 09:53:52 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMOkQ-0003Nu-TV
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 09:53:50 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMOkQ-0003Ni-DT
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 09:53:50 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMOkQ-0003Nf-5u
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 09:53:50 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMOkP-0001Mm-JT
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 09:53:49 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMOkO-0000Ot-Q0
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 13:53:48 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMOkO-0000Oq-MU
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 13:53:48 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMOkO-0000Oq-MU@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 18 Aug 2007 13:53:48 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/testsuite/misc-ming.all masks_testrunner.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2007 13:53:51 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/18 13:53:48

Modified files:
	testsuite/misc-ming.all: masks_testrunner.cpp 

Log message:
	minor typos

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/masks_testrunner.cpp?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: masks_testrunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/masks_testrunner.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- masks_testrunner.cpp	1 Jul 2007 10:54:57 -0000	1.4
+++ masks_testrunner.cpp	18 Aug 2007 13:53:48 -0000	1.5
@@ -10,8 +10,8 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
+ * 
+ * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *



From MAILER-DAEMON Sat Aug 18 12:12:44 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMQup-0000FC-V7
	for mharc-gnash-commit@gnu.org; Sat, 18 Aug 2007 12:12:44 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMQuo-0000Dx-BM
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 12:12:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMQun-0000Cj-4Y
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 12:12:41 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMQum-0000CN-Sp
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 12:12:40 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMQum-0002g6-5f
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 12:12:40 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMQuk-0001Eh-OY
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 16:12:38 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMQuk-0001Eb-K6
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 16:12:38 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMQuk-0001Eb-K6@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 18 Aug 2007 16:12:38 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/character.h server/video...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2007 16:12:42 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/18 16:12:38

Modified files:
	.              : ChangeLog 
	server         : character.h video_stream_instance.cpp 

Log message:
	        * server/character.h (isDynamic): remove bogus assertion
	          failing for dynamically-loaded movies.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4030&r2=1.4031
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.87&r2=1.88
http://cvs.savannah.gnu.org/viewcvs/gnash/server/video_stream_instance.cpp?cvsroot=gnash&r1=1.34&r2=1.35

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4030
retrieving revision 1.4031
diff -u -b -r1.4030 -r1.4031
--- ChangeLog	18 Aug 2007 13:48:29 -0000	1.4030
+++ ChangeLog	18 Aug 2007 16:12:37 -0000	1.4031
@@ -1,3 +1,8 @@
+2007-08-18 Sandro Santilli <strk@keybit.net>
+
+	* server/character.h (isDynamic): remove bogus assertion
+	  failing for dynamically-loaded movies.
+
 2007-08-18 Petr Pisar <petr.pisar@atlas.cz>
 
 	* po/cs.po: updated to version of 20070804

Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- server/character.h	9 Aug 2007 12:18:05 -0000	1.87
+++ server/character.h	18 Aug 2007 16:12:38 -0000	1.88
@@ -19,7 +19,7 @@
 //
 //
 
-/* $Id: character.h,v 1.87 2007/08/09 12:18:05 zoulunkai Exp $ */
+/* $Id: character.h,v 1.88 2007/08/18 16:12:38 strk Exp $ */
 
 #ifndef GNASH_CHARACTER_H
 #define GNASH_CHARACTER_H
@@ -714,23 +714,32 @@
 
 	/// Was this character dynamically created ?
 	//
-	/// "Dynamically created" means created trough ActionScript
+	/// "Dynamically created" means created trough ActionScript.
+	///
+	/// NOTE, With current code:
+	///	- Characters created by means of a loadMovie are 
+	///	  NOT set as dynamic (should check if they should)
+	///	- Characters created by attachMovie ARE dynamic
+	///	- Characters created by duplicateMovieClip ARE dynamic
+	///	- Characters created by new Video ARE dynamic
+	///	- Characters created by createTextField ARE dynamic
+	///
 	///
 	bool isDynamic() const {
-		// TODO: return _timelineInfo.get() == NULL
+
 		// WARNING: cannot use _timelinInfo for this, unless 
 		// we'll provide a TimelineInfo object for top level movies
-		// (_level#) too... which would have no use except implementing
+		// (_level#) and dynamically loaded movies too...
+		// which would have no use except implementing
 		// isDynamic(). Note that we have NO automated test for this, but
 		// the "Magical Trevor 2" movie aborts due to a call to getBytesTotal
-		// against the root movie.
-#ifndef NDEBUG
-		if ( ! m_parent || _timelineInfo.get() ) assert(!_dynamicallyCreated);
-		else assert(_dynamicallyCreated);
-#endif
-		// TODO: _parent && !_timelineInfo.get() might work..
-		assert((m_parent && !_timelineInfo.get()) == _dynamicallyCreated);
-		//assert(_timelineInfo.get() ? !_dynamicallyCreated : _dynamicallyCreated);
+		// against the root movie, and bug #19844 show the effect with dynamically
+		// loaded movies.
+
+		// Anyway, any dynamically created character must NOT have a
+		// _timelineInfo object (see setDynamic)
+		assert(_dynamicallyCreated ? (_timelineInfo.get() == 0) : 1 );
+
 		return _dynamicallyCreated;
 	}
 

Index: server/video_stream_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/video_stream_instance.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- server/video_stream_instance.cpp	6 Aug 2007 18:28:41 -0000	1.34
+++ server/video_stream_instance.cpp	18 Aug 2007 16:12:38 -0000	1.35
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 
-// $Id: video_stream_instance.cpp,v 1.34 2007/08/06 18:28:41 strk Exp $
+// $Id: video_stream_instance.cpp,v 1.35 2007/08/18 16:12:38 strk Exp $
 
 #include "sprite_instance.h"
 #include "video_stream_instance.h"
@@ -147,7 +147,8 @@
 
 	// I'm not sure We can rely on the def and parent values being accepted  as NULL
 	// Not till we add some testing...
-	boost::intrusive_ptr<as_object> obj = new video_stream_instance(NULL, NULL, -1);
+	boost::intrusive_ptr<character> obj = new video_stream_instance(NULL, NULL, -1);
+	obj->setDynamic();
 	return as_value(obj.get()); // will keep alive
 }
 



From MAILER-DAEMON Sat Aug 18 12:13:40 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMQvk-0000dA-Bm
	for mharc-gnash-commit@gnu.org; Sat, 18 Aug 2007 12:13:40 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMQvi-0000cS-Kf
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 12:13:38 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMQvi-0000bk-5z
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 12:13:38 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMQvh-0000bh-QP
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 12:13:37 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMQvh-0002r7-6H
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 12:13:37 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMQvg-0001Y1-Oj
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 16:13:36 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMQvg-0001Xs-GL
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 16:13:36 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMQvg-0001Xs-GL@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 18 Aug 2007 16:13:36 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/character.h server/video...
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2007 16:13:38 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/18 16:13:36

Modified files:
	.              : ChangeLog 
	server         : character.h video_stream_instance.cpp 

Log message:
	        * server/video_stream_instance.cpp: mark characters created
	          using new Video as dynamic.
	        * server/character.h (isDynamic): remove bogus assertion
	          failing for dynamically-loaded movies.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.34&r2=1.3971.2.35
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.86&r2=1.86.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/video_stream_instance.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.34&r2=1.34.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.34
retrieving revision 1.3971.2.35
diff -u -b -r1.3971.2.34 -r1.3971.2.35
--- ChangeLog	18 Aug 2007 13:24:28 -0000	1.3971.2.34
+++ ChangeLog	18 Aug 2007 16:13:35 -0000	1.3971.2.35
@@ -1,5 +1,12 @@
 2007-08-18 Sandro Santilli <strk@keybit.net>
 
+	* server/video_stream_instance.cpp: mark characters created
+	  using new Video as dynamic.
+	* server/character.h (isDynamic): remove bogus assertion
+	  failing for dynamically-loaded movies.
+
+2007-08-18 Sandro Santilli <strk@keybit.net>
+
 	* server/text.cpp (resolve_font): fix missing return.
 	* server/parser/text_character_def.cpp: fix compiler warnings.
 

Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.86
retrieving revision 1.86.2.1
diff -u -b -r1.86 -r1.86.2.1
--- server/character.h	10 Jul 2007 21:43:00 -0000	1.86
+++ server/character.h	18 Aug 2007 16:13:36 -0000	1.86.2.1
@@ -19,7 +19,7 @@
 //
 //
 
-/* $Id: character.h,v 1.86 2007/07/10 21:43:00 strk Exp $ */
+/* $Id: character.h,v 1.86.2.1 2007/08/18 16:13:36 strk Exp $ */
 
 #ifndef GNASH_CHARACTER_H
 #define GNASH_CHARACTER_H
@@ -711,23 +711,32 @@
 
 	/// Was this character dynamically created ?
 	//
-	/// "Dynamically created" means created trough ActionScript
+	/// "Dynamically created" means created trough ActionScript.
+	///
+	/// NOTE, With current code:
+	///	- Characters created by means of a loadMovie are 
+	///	  NOT set as dynamic (should check if they should)
+	///	- Characters created by attachMovie ARE dynamic
+	///	- Characters created by duplicateMovieClip ARE dynamic
+	///	- Characters created by new Video ARE dynamic
+	///	- Characters created by createTextField ARE dynamic
+	///
 	///
 	bool isDynamic() const {
-		// TODO: return _timelineInfo.get() == NULL
+
 		// WARNING: cannot use _timelinInfo for this, unless 
 		// we'll provide a TimelineInfo object for top level movies
-		// (_level#) too... which would have no use except implementing
+		// (_level#) and dynamically loaded movies too...
+		// which would have no use except implementing
 		// isDynamic(). Note that we have NO automated test for this, but
 		// the "Magical Trevor 2" movie aborts due to a call to getBytesTotal
-		// against the root movie.
-#ifndef NDEBUG
-		if ( ! m_parent || _timelineInfo.get() ) assert(!_dynamicallyCreated);
-		else assert(_dynamicallyCreated);
-#endif
-		// TODO: _parent && !_timelineInfo.get() might work..
-		assert((m_parent && !_timelineInfo.get()) == _dynamicallyCreated);
-		//assert(_timelineInfo.get() ? !_dynamicallyCreated : _dynamicallyCreated);
+		// against the root movie, and bug #19844 show the effect with dynamically
+		// loaded movies.
+
+		// Anyway, any dynamically created character must NOT have a
+		// _timelineInfo object (see setDynamic)
+		assert(_dynamicallyCreated ? (_timelineInfo.get() == 0) : 1 );
+
 		return _dynamicallyCreated;
 	}
 

Index: server/video_stream_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/video_stream_instance.cpp,v
retrieving revision 1.34
retrieving revision 1.34.2.1
diff -u -b -r1.34 -r1.34.2.1
--- server/video_stream_instance.cpp	6 Aug 2007 18:28:41 -0000	1.34
+++ server/video_stream_instance.cpp	18 Aug 2007 16:13:36 -0000	1.34.2.1
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 
-// $Id: video_stream_instance.cpp,v 1.34 2007/08/06 18:28:41 strk Exp $
+// $Id: video_stream_instance.cpp,v 1.34.2.1 2007/08/18 16:13:36 strk Exp $
 
 #include "sprite_instance.h"
 #include "video_stream_instance.h"
@@ -147,7 +147,8 @@
 
 	// I'm not sure We can rely on the def and parent values being accepted  as NULL
 	// Not till we add some testing...
-	boost::intrusive_ptr<as_object> obj = new video_stream_instance(NULL, NULL, -1);
+	boost::intrusive_ptr<character> obj = new video_stream_instance(NULL, NULL, -1);
+	obj->setDynamic();
 	return as_value(obj.get()); // will keep alive
 }
 



From MAILER-DAEMON Sat Aug 18 12:14:05 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMQw9-0000vJ-Kj
	for mharc-gnash-commit@gnu.org; Sat, 18 Aug 2007 12:14:05 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMQw8-0000vE-Db
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 12:14:04 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMQw7-0000v2-2w
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 12:14:03 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMQw6-0000uz-Tm
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 12:14:02 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMQw6-0002ve-2r
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 12:14:02 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMQw5-0001fa-F1
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 16:14:01 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMQw5-0001fE-5x
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 16:14:01 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMQw5-0001fE-5x@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 18 Aug 2007 16:14:01 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2007 16:14:04 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/18 16:14:01

Modified files:
	.              : ChangeLog 

Log message:
	ops, forgot to mention the change in video_stream_instance

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4031&r2=1.4032

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4031
retrieving revision 1.4032
diff -u -b -r1.4031 -r1.4032
--- ChangeLog	18 Aug 2007 16:12:37 -0000	1.4031
+++ ChangeLog	18 Aug 2007 16:14:00 -0000	1.4032
@@ -1,5 +1,7 @@
 2007-08-18 Sandro Santilli <strk@keybit.net>
 
+	* server/video_stream_instance.cpp: mark characters created
+	  using new Video as dynamic.
 	* server/character.h (isDynamic): remove bogus assertion
 	  failing for dynamically-loaded movies.
 



From MAILER-DAEMON Sat Aug 18 12:48:46 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMRTi-0008Pk-QF
	for mharc-gnash-commit@gnu.org; Sat, 18 Aug 2007 12:48:46 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMRTh-0008OW-VF
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 12:48:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMRTh-0008NG-4R
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 12:48:45 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMRTh-0008N8-1U
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 12:48:45 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMRTg-0001aY-EM
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 12:48:44 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMRTf-0004sK-RX
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 16:48:43 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMRTf-0004sH-N6
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 16:48:43 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMRTf-0004sH-N6@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 18 Aug 2007 16:48:43 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog plugin/plugin.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2007 16:48:46 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/18 16:48:43

Modified files:
	.              : ChangeLog 
	plugin         : plugin.cpp 

Log message:
	        * plugin/plugin.cpp: Use the environmental variable
	          GNASH_PLUGIN_DESCRIPTION for the plugin description
	          (when set).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4032&r2=1.4033
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/plugin.cpp?cvsroot=gnash&r1=1.83&r2=1.84

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4032
retrieving revision 1.4033
diff -u -b -r1.4032 -r1.4033
--- ChangeLog	18 Aug 2007 16:14:00 -0000	1.4032
+++ ChangeLog	18 Aug 2007 16:48:43 -0000	1.4033
@@ -1,5 +1,11 @@
 2007-08-18 Sandro Santilli <strk@keybit.net>
 
+	* plugin/plugin.cpp: Use the environmental variable
+	  GNASH_PLUGIN_DESCRIPTION for the plugin description
+	  (when set).
+
+2007-08-18 Sandro Santilli <strk@keybit.net>
+
 	* server/video_stream_instance.cpp: mark characters created
 	  using new Video as dynamic.
 	* server/character.h (isDynamic): remove bogus assertion

Index: plugin/plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/plugin.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- plugin/plugin.cpp	18 Aug 2007 12:24:40 -0000	1.83
+++ plugin/plugin.cpp	18 Aug 2007 16:48:43 -0000	1.84
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: plugin.cpp,v 1.83 2007/08/18 12:24:40 strk Exp $ */
+/* $Id: plugin.cpp,v 1.84 2007/08/18 16:48:43 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -78,6 +78,8 @@
 
 static bool  waitforgdb = false;
 
+static const char* getPluginDescription();
+
 void
 PR_CALLBACK Destructor(void * /* data */)
 {
@@ -192,7 +194,7 @@
       // This becomes the description field you see below the opening
       // text when you type about:plugins
       case NPPVpluginDescriptionString:
-          *static_cast<char **>(aValue) = PLUGIN_DESCRIPTION;
+          *static_cast<const char **>(aValue) = getPluginDescription();
           break;
 
       case NPPVpluginNeedsXEmbed:
@@ -693,6 +695,17 @@
         return propValue.utf8characters; // const char *
 }
 
+static const char* getPluginDescription() 
+{
+	static const char* desc = NULL;
+	if ( ! desc )
+	{
+    		desc = getenv("GNASH_PLUGIN_DESCRIPTION");
+		if ( ! desc ) desc = PLUGIN_DESCRIPTION;
+	}
+	return desc;
+}
+
 // Local Variables:
 // mode: C++
 // indent-tabs-mode: t



From MAILER-DAEMON Sat Aug 18 12:48:59 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMRTu-0000D7-UQ
	for mharc-gnash-commit@gnu.org; Sat, 18 Aug 2007 12:48:58 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMRTt-0000BT-EE
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 12:48:57 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMRTs-0000AP-IM
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 12:48:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMRTs-0000AF-FB
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 12:48:56 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMRTr-0001dN-Q1
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 12:48:55 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMRTr-0004sd-AH
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 16:48:55 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMRTr-0004sa-6i
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 16:48:55 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMRTr-0004sa-6i@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 18 Aug 2007 16:48:55 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog plugin/plugin.cpp [release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2007 16:48:57 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/18 16:48:55

Modified files:
	.              : ChangeLog 
	plugin         : plugin.cpp 

Log message:
	        * plugin/plugin.cpp: Use the environmental variable
	          GNASH_PLUGIN_DESCRIPTION for the plugin description
	          (when set).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.35&r2=1.3971.2.36
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/plugin.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.81.2.2&r2=1.81.2.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.35
retrieving revision 1.3971.2.36
diff -u -b -r1.3971.2.35 -r1.3971.2.36
--- ChangeLog	18 Aug 2007 16:13:35 -0000	1.3971.2.35
+++ ChangeLog	18 Aug 2007 16:48:54 -0000	1.3971.2.36
@@ -1,5 +1,11 @@
 2007-08-18 Sandro Santilli <strk@keybit.net>
 
+	* plugin/plugin.cpp: Use the environmental variable
+	  GNASH_PLUGIN_DESCRIPTION for the plugin description
+	  (when set).
+
+2007-08-18 Sandro Santilli <strk@keybit.net>
+
 	* server/video_stream_instance.cpp: mark characters created
 	  using new Video as dynamic.
 	* server/character.h (isDynamic): remove bogus assertion

Index: plugin/plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/plugin.cpp,v
retrieving revision 1.81.2.2
retrieving revision 1.81.2.3
diff -u -b -r1.81.2.2 -r1.81.2.3
--- plugin/plugin.cpp	18 Aug 2007 12:37:18 -0000	1.81.2.2
+++ plugin/plugin.cpp	18 Aug 2007 16:48:54 -0000	1.81.2.3
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: plugin.cpp,v 1.81.2.2 2007/08/18 12:37:18 strk Exp $ */
+/* $Id: plugin.cpp,v 1.81.2.3 2007/08/18 16:48:54 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -78,6 +78,8 @@
 
 static bool  waitforgdb = false;
 
+static const char* getPluginDescription();
+
 void
 PR_CALLBACK Destructor(void * /* data */)
 {
@@ -192,7 +194,7 @@
       // This becomes the description field you see below the opening
       // text when you type about:plugins
       case NPPVpluginDescriptionString:
-          *static_cast<char **>(aValue) = PLUGIN_DESCRIPTION;
+          *static_cast<const char **>(aValue) = getPluginDescription();
           break;
 
       case NPPVpluginNeedsXEmbed:
@@ -693,6 +695,17 @@
         return propValue.utf8characters; // const char *
 }
 
+static const char* getPluginDescription() 
+{
+	static const char* desc = NULL;
+	if ( ! desc )
+	{
+    		desc = getenv("GNASH_PLUGIN_DESCRIPTION");
+		if ( ! desc ) desc = PLUGIN_DESCRIPTION;
+	}
+	return desc;
+}
+
 // Local Variables:
 // mode: C++
 // indent-tabs-mode: t



From MAILER-DAEMON Sat Aug 18 13:47:38 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMSOg-000721-5w
	for mharc-gnash-commit@gnu.org; Sat, 18 Aug 2007 13:47:38 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMSOd-0006zw-Ol
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 13:47:35 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMSOc-0006zR-NY
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 13:47:35 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMSOc-0006zJ-Jj
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 13:47:34 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMSOb-0004EW-JS
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 13:47:33 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMSOa-0008OQ-5s
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 17:47:32 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMSOZ-0008OJ-Tc
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 17:47:32 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMSOZ-0008OJ-Tc@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 18 Aug 2007 17:47:31 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/vm/ASHandlers.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2007 17:47:36 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/18 17:47:31

Modified files:
	.              : ChangeLog 
	server/vm      : ASHandlers.cpp 

Log message:
	        * server/vm/ASHandlers.cpp (CommonGetUrl): always check
	          for URL (security). Give precedence to loadVariable calls
	          even if target is _level#. Fixes load of uptoten.com.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4033&r2=1.4034
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.119&r2=1.120

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4033
retrieving revision 1.4034
diff -u -b -r1.4033 -r1.4034
--- ChangeLog	18 Aug 2007 16:48:43 -0000	1.4033
+++ ChangeLog	18 Aug 2007 17:47:30 -0000	1.4034
@@ -1,5 +1,8 @@
 2007-08-18 Sandro Santilli <strk@keybit.net>
 
+	* server/vm/ASHandlers.cpp (CommonGetUrl): always check
+	  for URL (security). Give precedence to loadVariable calls
+	  even if target is _level#. Fixes load of uptoten.com.
 	* plugin/plugin.cpp: Use the environmental variable
 	  GNASH_PLUGIN_DESCRIPTION for the plugin description
 	  (when set).

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -b -r1.119 -r1.120
--- server/vm/ASHandlers.cpp	10 Aug 2007 14:06:36 -0000	1.119
+++ server/vm/ASHandlers.cpp	18 Aug 2007 17:47:31 -0000	1.120
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ASHandlers.cpp,v 1.119 2007/08/10 14:06:36 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.120 2007/08/18 17:47:31 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1818,18 +1818,21 @@
 	const URL& baseurl = get_base_url();
 	URL url(url_s, baseurl);
 
-	log_msg(_("get url: target=%s, url=%s (%s), method=%x"), target_string.c_str(),
-		url.str().c_str(), url_c, method);
+	log_msg(_("get url: target=%s, url=%s (%s), method=%x (sendVars:%X, loadTarget:%d, loadVariable:%d)"), target_string.c_str(),
+		url.str().c_str(), url_c, method, sendVarsMethod, loadTargetFlag, loadVariableFlag);
 
-	if ( target_string.compare(0, 6, "_level") == 0 && target_string.find_first_not_of("0123456789", 7) == string::npos )
+	if ( ! URLAccessManager::allow(url) )
 	{
-		unsigned int levelno = atoi(target_string.c_str()+6);
-		log_debug(_("Testing _level loading (level %u)"), levelno);
-		VM::get().getRoot().loadLevel(levelno, url);
+		return;
 	}
-	else if ( loadTargetFlag )
-	{
+
 		character* target_ch = env.find_target(target);
+	sprite_instance* target_movie = target_ch ? target_ch->to_movie() : 0;
+
+	if ( loadVariableFlag )
+	{
+		log_msg(_("getURL2 loadVariable"));
+
 		if ( ! target_ch )
 		{
 			log_error(_("get url: target %s not found"),
@@ -1837,7 +1840,6 @@
 			return;
 		}
 
-		sprite_instance* target_movie = target_ch->to_movie();
 		if ( ! target_movie )
 		{
 			log_error(_("get url: target %s is not a sprite"),
@@ -1845,23 +1847,14 @@
 			return;
 		}
 
-		if ( loadVariableFlag )
-		{
-			log_msg(_("getURL2 loadVariable"));
-
-			//log_unimpl("Unhandled GetUrl2 loadVariable flag. loadTargetFlag=%d, target=%s (%s)", loadTargetFlag, target.typeOf(), target.to_string(&env).c_str());
 			target_movie->loadVariables(url, sendVarsMethod);
-		}
-		else
-		{
-			log_msg(_("getURL2 target load"));
 
-			// Check host security
-			if ( ! URLAccessManager::allow(url) )
-			{
 				return;
 			}
 
+	if ( loadTargetFlag )
+	{
+		log_msg(_("getURL2 target load"));
 
 			if ( sendVarsMethod )
 			{
@@ -1870,13 +1863,30 @@
 					sendVarsMethod);
 			}
 
-			target_movie->loadMovie(url);
+		if ( ! target_ch )
+		{
+			if ( target_string.compare(0, 6, "_level") == 0 && target_string.find_first_not_of("0123456789", 7) == string::npos )
+			{
+				unsigned int levelno = atoi(target_string.c_str()+6);
+				log_debug(_("Testing _level loading (level %u)"), levelno);
+				VM::get().getRoot().loadLevel(levelno, url);
+				return;
 		}
+
+			log_error(_("get url: target %s not found"),
+				target_string.c_str());
+			return;
 	}
-	else
-	{
-		if ( ! URLAccessManager::allow(url) )
+
+		if ( ! target_movie )
 		{
+			log_error(_("get url: target %s is not a sprite"),
+				target_string.c_str());
+			return;
+		}
+
+		target_movie->loadMovie(url);
+
 			return;
 		}
 
@@ -1889,18 +1899,23 @@
 
 #ifndef __OS2__x
 		string command = "firefox -remote \"openurl(";
-#else
-static char browserExe[ 255 ] = "";
+#else // def __OS2__x
+	static char browserExe[ 255 ] = "";
 
-    if ( browserExe[0] == 0 ) {
-        PrfQueryProfileString( HINI_USER, (PSZ) "WPURLDEFAULTSETTINGS", (PSZ) "DefaultBrowserExe", NULL,
+	if ( browserExe[0] == 0 )
+	{
+		PrfQueryProfileString( HINI_USER, (PSZ) "WPURLDEFAULTSETTINGS",
+			(PSZ) "DefaultBrowserExe", NULL,
                                (PVOID) browserExe, (LONG)sizeof(browserExe) );
     }
+
 		string command = browserExe;
 		command += " -remote \"openurl(";
-#endif
+#endif // def __OS2__x
+
 		command += url.str();
-#if 0 // target testing
+
+#if 0 // target testing TODO: should we enable this by default?
 		if ( ! target_string.empty() )
 		{
 			command += ", " + target_string;
@@ -1909,7 +1924,7 @@
 		command += ")\"";
 		log_msg (_("Launching URL... %s"), command.c_str());
 		system(command.c_str());
-	}
+
 }
 
 // Common code for SetTarget and SetTargetExpression. See:



From MAILER-DAEMON Sat Aug 18 17:52:41 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMWDp-00005r-Bx
	for mharc-gnash-commit@gnu.org; Sat, 18 Aug 2007 17:52:41 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMWDn-00005K-8m
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 17:52:39 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMWDl-0008WV-V3
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 17:52:38 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMWDl-0008WF-Qv
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 17:52:37 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMWDj-0004kq-Nt
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 17:52:35 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMWDi-0006v7-8Q
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 21:52:34 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMWDi-0006v4-4m
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 21:52:34 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMWDi-0006v4-4m@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 18 Aug 2007 21:52:34 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/vm/ASHandlers.cpp
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2007 21:52:39 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/18 21:52:34

Modified files:
	.              : ChangeLog 
	server/vm      : ASHandlers.cpp 

Log message:
	 * server/vm/ASHandlers.cpp (CommonGetUrl): always check
	   for URL (security). Give precedence to loadVariable
	   calls even if target is _level#. Fixes load of
	   uptoten.com.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.36&r2=1.3971.2.37
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.118&r2=1.118.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.36
retrieving revision 1.3971.2.37
diff -u -b -r1.3971.2.36 -r1.3971.2.37
--- ChangeLog	18 Aug 2007 16:48:54 -0000	1.3971.2.36
+++ ChangeLog	18 Aug 2007 21:52:33 -0000	1.3971.2.37
@@ -1,5 +1,9 @@
 2007-08-18 Sandro Santilli <strk@keybit.net>
 
+	* server/vm/ASHandlers.cpp (CommonGetUrl): always check
+	  for URL (security). Give precedence to loadVariable
+	  calls even if target is _level#. Fixes load of
+	  uptoten.com.
 	* plugin/plugin.cpp: Use the environmental variable
 	  GNASH_PLUGIN_DESCRIPTION for the plugin description
 	  (when set).

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.118
retrieving revision 1.118.2.1
diff -u -b -r1.118 -r1.118.2.1
--- server/vm/ASHandlers.cpp	6 Aug 2007 20:42:57 -0000	1.118
+++ server/vm/ASHandlers.cpp	18 Aug 2007 21:52:33 -0000	1.118.2.1
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ASHandlers.cpp,v 1.118 2007/08/06 20:42:57 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.118.2.1 2007/08/18 21:52:33 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1818,18 +1818,21 @@
 	const URL& baseurl = get_base_url();
 	URL url(url_s, baseurl);
 
-	log_msg(_("get url: target=%s, url=%s (%s), method=%x"), target_string.c_str(),
-		url.str().c_str(), url_c, method);
+	log_msg(_("get url: target=%s, url=%s (%s), method=%x (sendVars:%X, loadTarget:%d, loadVariable:%d)"), target_string.c_str(),
+		url.str().c_str(), url_c, method, sendVarsMethod, loadTargetFlag, loadVariableFlag);
 
-	if ( target_string.compare(0, 6, "_level") == 0 && target_string.find_first_not_of("0123456789", 7) == string::npos )
+	if ( ! URLAccessManager::allow(url) )
 	{
-		unsigned int levelno = atoi(target_string.c_str()+6);
-		log_debug(_("Testing _level loading (level %u)"), levelno);
-		VM::get().getRoot().loadLevel(levelno, url);
+		return;
 	}
-	else if ( loadTargetFlag )
-	{
+
 		character* target_ch = env.find_target(target);
+	sprite_instance* target_movie = target_ch ? target_ch->to_movie() : 0;
+
+	if ( loadVariableFlag )
+	{
+		log_msg(_("getURL2 loadVariable"));
+
 		if ( ! target_ch )
 		{
 			log_error(_("get url: target %s not found"),
@@ -1837,7 +1840,6 @@
 			return;
 		}
 
-		sprite_instance* target_movie = target_ch->to_movie();
 		if ( ! target_movie )
 		{
 			log_error(_("get url: target %s is not a sprite"),
@@ -1845,23 +1847,14 @@
 			return;
 		}
 
-		if ( loadVariableFlag )
-		{
-			log_msg(_("getURL2 loadVariable"));
-
-			//log_unimpl("Unhandled GetUrl2 loadVariable flag. loadTargetFlag=%d, target=%s (%s)", loadTargetFlag, target.typeOf(), target.to_string(&env).c_str());
 			target_movie->loadVariables(url, sendVarsMethod);
-		}
-		else
-		{
-			log_msg(_("getURL2 target load"));
 
-			// Check host security
-			if ( ! URLAccessManager::allow(url) )
-			{
 				return;
 			}
 
+	if ( loadTargetFlag )
+	{
+		log_msg(_("getURL2 target load"));
 
 			if ( sendVarsMethod )
 			{
@@ -1870,13 +1863,30 @@
 					sendVarsMethod);
 			}
 
-			target_movie->loadMovie(url);
+		if ( ! target_ch )
+		{
+			if ( target_string.compare(0, 6, "_level") == 0 && target_string.find_first_not_of("0123456789", 7) == string::npos )
+			{
+				unsigned int levelno = atoi(target_string.c_str()+6);
+				log_debug(_("Testing _level loading (level %u)"), levelno);
+				VM::get().getRoot().loadLevel(levelno, url);
+				return;
 		}
+
+			log_error(_("get url: target %s not found"),
+				target_string.c_str());
+			return;
 	}
-	else
-	{
-		if ( ! URLAccessManager::allow(url) )
+
+		if ( ! target_movie )
 		{
+			log_error(_("get url: target %s is not a sprite"),
+				target_string.c_str());
+			return;
+		}
+
+		target_movie->loadMovie(url);
+
 			return;
 		}
 
@@ -1886,19 +1896,6 @@
 				" with no loadTargetFlag"),
 				sendVarsMethod);
 		}
-
-		string command = "firefox -remote \"openurl(";
-		command += url.str();
-#if 0 // target testing
-		if ( ! target_string.empty() )
-		{
-			command += ", " + target_string;
-		}
-#endif
-		command += ")\"";
-		log_msg (_("Launching URL... %s"), command.c_str());
-		system(command.c_str());
-	}
 }
 
 // Common code for SetTarget and SetTargetExpression. See:



From MAILER-DAEMON Sat Aug 18 18:07:24 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMWS3-0001qs-VY
	for mharc-gnash-commit@gnu.org; Sat, 18 Aug 2007 18:07:24 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMWS2-0001qW-Id
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 18:07:22 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMWS1-0001ow-AU
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 18:07:21 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMWS1-0001oc-4Q
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 18:07:21 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMWRy-0007IY-W1
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 18:07:19 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMWRx-0007BN-SU
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 22:07:17 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMWRx-0007BK-OP
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 22:07:17 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMWRx-0007BK-OP@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 18 Aug 2007 22:07:17 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/swf/tag_loaders.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2007 22:07:22 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/18 22:07:17

Modified files:
	.              : ChangeLog 
	server/swf     : tag_loaders.cpp 

Log message:
	        * server/swf/tag_loaders.cpp (define_bits_lossless_2_loader):
	          ensure bytes, not bits!

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4034&r2=1.4035
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.129&r2=1.130

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4034
retrieving revision 1.4035
diff -u -b -r1.4034 -r1.4035
--- ChangeLog	18 Aug 2007 17:47:30 -0000	1.4034
+++ ChangeLog	18 Aug 2007 22:07:17 -0000	1.4035
@@ -1,5 +1,7 @@
 2007-08-18 Sandro Santilli <strk@keybit.net>
 
+	* server/swf/tag_loaders.cpp (define_bits_lossless_2_loader):
+	  ensure bytes, not bits!
 	* server/vm/ASHandlers.cpp (CommonGetUrl): always check
 	  for URL (security). Give precedence to loadVariable calls
 	  even if target is _level#. Fixes load of uptoten.com.

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -b -r1.129 -r1.130
--- server/swf/tag_loaders.cpp	18 Aug 2007 05:04:00 -0000	1.129
+++ server/swf/tag_loaders.cpp	18 Aug 2007 22:07:17 -0000	1.130
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: tag_loaders.cpp,v 1.129 2007/08/18 05:04:00 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.130 2007/08/18 22:07:17 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -721,7 +721,7 @@
     // tags 20 || 36
     assert(tag == SWF::DEFINELOSSLESS || tag == SWF::DEFINELOSSLESS2);
 
-    in->ensureBytes(16+16+16+8); // the initial header 
+    in->ensureBytes(2+2+2+1); // the initial header 
 
     uint16_t	character_id = in->read_u16();
     uint8_t	bitmap_format = in->read_u8();	// 3 == 8 bit, 4 == 16 bit, 5 == 32 bit



From MAILER-DAEMON Sat Aug 18 18:08:18 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMWSw-0001xk-7U
	for mharc-gnash-commit@gnu.org; Sat, 18 Aug 2007 18:08:18 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMWSv-0001xR-AJ
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 18:08:17 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMWSu-0001x7-0d
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 18:08:16 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMWSt-0001x4-Rb
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 18:08:15 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMWSr-0007Qj-Mz
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 18:08:13 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMWSr-0007CK-3D
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 22:08:13 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMWSr-0007CH-0J
	for gnash-commit@gnu.org; Sat, 18 Aug 2007 22:08:13 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMWSr-0007CH-0J@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 18 Aug 2007 22:08:13 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/swf/tag_loaders.cpp
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2007 22:08:17 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/18 22:08:12

Modified files:
	.              : ChangeLog 
	server/swf     : tag_loaders.cpp 

Log message:
	        * server/swf/tag_loaders.cpp (define_bits_lossless_2_loader):
	          ensure bytes, not bits!

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.37&r2=1.3971.2.38
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.123.2.5&r2=1.123.2.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.37
retrieving revision 1.3971.2.38
diff -u -b -r1.3971.2.37 -r1.3971.2.38
--- ChangeLog	18 Aug 2007 21:52:33 -0000	1.3971.2.37
+++ ChangeLog	18 Aug 2007 22:08:12 -0000	1.3971.2.38
@@ -1,5 +1,7 @@
 2007-08-18 Sandro Santilli <strk@keybit.net>
 
+	* server/swf/tag_loaders.cpp (define_bits_lossless_2_loader):
+	  ensure bytes, not bits!
 	* server/vm/ASHandlers.cpp (CommonGetUrl): always check
 	  for URL (security). Give precedence to loadVariable
 	  calls even if target is _level#. Fixes load of

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.123.2.5
retrieving revision 1.123.2.6
diff -u -b -r1.123.2.5 -r1.123.2.6
--- server/swf/tag_loaders.cpp	18 Aug 2007 05:05:17 -0000	1.123.2.5
+++ server/swf/tag_loaders.cpp	18 Aug 2007 22:08:12 -0000	1.123.2.6
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: tag_loaders.cpp,v 1.123.2.5 2007/08/18 05:05:17 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.123.2.6 2007/08/18 22:08:12 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -721,7 +721,7 @@
     // tags 20 || 36
     assert(tag == SWF::DEFINELOSSLESS || tag == SWF::DEFINELOSSLESS2);
 
-    in->ensureBytes(16+16+16+8); // the initial header 
+    in->ensureBytes(2+2+2+1); // the initial header 
 
     uint16_t	character_id = in->read_u16();
     uint8_t	bitmap_format = in->read_u8();	// 3 == 8 bit, 4 == 16 bit, 5 == 32 bit



From MAILER-DAEMON Sun Aug 19 15:54:55 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMqrP-0002PD-BL
	for mharc-gnash-commit@gnu.org; Sun, 19 Aug 2007 15:54:55 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMqrN-0002Oi-Nt
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 15:54:53 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMqrM-0002Na-24
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 15:54:53 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMqrL-0002NE-SH
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 15:54:51 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1IMqrL-00024U-FW
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 15:54:51 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <markus@unixrus.se>) id 1IMqrJ-0007qI-5g
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 19:54:49 +0000
Received: from nihilus by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <nihilus@savannah.gnu.org>) id 1IMqrJ-0007qF-0M
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 19:54:49 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMqrJ-0007qF-0M@cvs.savannah.gnu.org>
From: Markus Gothe <markus@unixrus.se>
Date: Sun, 19 Aug 2007 19:54:49 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/libbase/Makefile.am
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Aug 2007 19:54:53 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Markus Gothe <nihilus>	07/08/19 19:54:48

Modified files:
	.              : ChangeLog 
	testsuite/libbase: Makefile.am 

Log message:
	Added DEJAGNU_CFLAGS.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4035&r2=1.4036
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libbase/Makefile.am?cvsroot=gnash&r1=1.31&r2=1.32

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4035
retrieving revision 1.4036
diff -u -b -r1.4035 -r1.4036
--- ChangeLog	18 Aug 2007 22:07:17 -0000	1.4035
+++ ChangeLog	19 Aug 2007 19:54:48 -0000	1.4036
@@ -1,3 +1,7 @@
+2007-08-19 Markus Gothe <nietzsche@lysator.liu.se>
+
+	* testsuite/libbase/Makefile.am: Added DEJAGNU_CFLAGS.
+
 2007-08-18 Sandro Santilli <strk@keybit.net>
 
 	* server/swf/tag_loaders.cpp (define_bits_lossless_2_loader):

Index: testsuite/libbase/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libbase/Makefile.am,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- testsuite/libbase/Makefile.am	21 Jul 2007 01:38:39 -0000	1.31
+++ testsuite/libbase/Makefile.am	19 Aug 2007 19:54:48 -0000	1.32
@@ -34,6 +34,7 @@
         $(MING_CFLAGS) \
 	$(LIBXML_CFLAGS) \
 	$(BOOST_CFLAGS) \
+	$(DEJAGNU_CFLAGS) \
 	$(NULL)
 
 abs_builddir=`(cd $(top_builddir)/testsuite/libbase; pwd)`



From MAILER-DAEMON Sun Aug 19 16:01:18 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMqxZ-0005im-Rr
	for mharc-gnash-commit@gnu.org; Sun, 19 Aug 2007 16:01:17 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMqxY-0005iE-Ol
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 16:01:16 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMqxY-0005hw-2f
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 16:01:16 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMqxX-0005hp-SY
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 16:01:15 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMqxX-00034M-Eh
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 16:01:15 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMqxV-0008OZ-Qn
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 20:01:13 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMqxV-0008OW-NE
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 20:01:13 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMqxV-0008OW-NE@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sun, 19 Aug 2007 20:01:13 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog doc/C/usermanual/usage/gnashrc....
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Aug 2007 20:01:17 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/19 20:01:13

Modified files:
	.              : ChangeLog 
	doc/C/usermanual/usage: gnashrc.xml 
	libbase        : rc.cpp rc.h 
	server/vm      : VM.cpp 
	testsuite/libbase: TCXXRc.cpp gnashrc.in 

Log message:
	        * doc/C/usermanual/usage/gnashrc.xml: document
	          flashVersionString variable.
	
	Patch #6155 by Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>:
	
	        * libbase/rc.{cpp,h}: Avoid string copies in inspectors;
	          add getFlashVersionString (support for
	          "set flashVersionString Bla bla bla" in gnashrc).
	        * server/vm/VM.cpp (getPlayerVersion): Query RcInit for version
	          string
	        * testsuite/libbase/: TCXXRc.cpp, gnashrc.in:
	          Add test for

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4036&r2=1.4037
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/usage/gnashrc.xml?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.cpp?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.h?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/VM.cpp?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libbase/TCXXRc.cpp?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libbase/gnashrc.in?cvsroot=gnash&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4036
retrieving revision 1.4037
diff -u -b -r1.4036 -r1.4037
--- ChangeLog	19 Aug 2007 19:54:48 -0000	1.4036
+++ ChangeLog	19 Aug 2007 20:01:12 -0000	1.4037
@@ -1,3 +1,18 @@
+2007-08-19 Sandro Santilli <strk@keybit.net>
+
+	* doc/C/usermanual/usage/gnashrc.xml: document
+	  flashVersionString variable.
+
+2007-08-19 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
+
+	* libbase/rc.{cpp,h}: Avoid string copies in inspectors;
+	  add getFlashVersionString (support for
+	  "set flashVersionString Bla bla bla" in gnashrc).
+	* server/vm/VM.cpp (getPlayerVersion): Query RcInit for version
+	  string
+	* testsuite/libbase/: TCXXRc.cpp, gnashrc.in:
+	  Add test for 
+
 2007-08-19 Markus Gothe <nietzsche@lysator.liu.se>
 
 	* testsuite/libbase/Makefile.am: Added DEJAGNU_CFLAGS.

Index: doc/C/usermanual/usage/gnashrc.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/usermanual/usage/gnashrc.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- doc/C/usermanual/usage/gnashrc.xml	16 Aug 2007 14:25:58 -0000	1.6
+++ doc/C/usermanual/usage/gnashrc.xml	19 Aug 2007 20:01:12 -0000	1.7
@@ -134,6 +134,22 @@
 	    for the plugin, so you have to explicitly start any movie on a webpage. This option is <emphasis>off</emphasis> by default.
 	  </entry>
 </row>
+<row>
+<entry>flashVersionString</entry>
+<entry>string</entry>
+<entry>Set the string returned by $version and System.capabilities.version.
+       Useful to get around some flash version detection movies.
+       Note that the version advertised by the plugin is NOT affected by this setting,
+       instead you need to set the GNASH_FLASH_VERSION environment variable for
+       the latter (which doesn't affect $version and System.capabilities.version).</entry>
+</row>
+<row>
+<entry>StartStopped</entry>
+<entry>on/off</entry>
+<entry>Set to <emphasis>on</emphasis> to have the GUI start in "stop" mode. This is useful in particular
+	    for the plugin, so you have to explicitly start any movie on a webpage. This option is <emphasis>off</emphasis> by default.
+	  </entry>
+</row>
 </tbody>
 </tgroup>
 </table>

Index: libbase/rc.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- libbase/rc.cpp	12 Jul 2007 23:03:49 -0000	1.27
+++ libbase/rc.cpp	19 Aug 2007 20:01:13 -0000	1.28
@@ -53,6 +53,10 @@
                            _debug(false),
                            _debugger(false),
                            _verbosity(-1),
+                           _flashVersionString("GSH "\
+				DEFAULT_FLASH_MAJOR_VERSION","\
+				DEFAULT_FLASH_MINOR_VERSION","\
+				DEFAULT_FLASH_REV_NUMBER ",0"),
                            _actiondump(false),
                            _parserdump(false),
 			   _verboseASCodingErrors(false),
@@ -60,6 +64,7 @@
                            _splash_screen(true),
                            _localdomain_only(false),
                            _localhost_only(false),
+                           _log("gnash-dbg.log"),
                            _sound(true),
                            _plugin_sound(true),
 			   _extensionsEnabled(false),
@@ -128,8 +133,8 @@
 }
 
 int
-RcInitFile::extractNumber(int *num, const char *pattern, std::string &variable,
-                           std::string &value)
+RcInitFile::extractNumber(int *num, const char *pattern, string &variable,
+                           string &value)
 {      
 //    GNASH_REPORT_FUNCTION;
 //        log_msg ("%s: %s", variable.c_str(), value.c_str());
@@ -176,7 +181,11 @@
                 continue;
             }
             
-            in >> variable >> value;
+            in >> variable;
+            getline(in, value);
+            string::size_type position = value.find_first_not_of(' ');
+            if(position != string::npos) value.erase(0, position);
+
             //      log_msg ("%s %s %s", action, variable, value);
             
             if (action == "set") {
@@ -197,6 +206,14 @@
                 extractNumber(&_delay, "delay", variable, value);
                 extractNumber(&_verbosity, "verbosity", variable, value);
                 
+                if (variable == "flashVersionString") {
+                    _flashVersionString = value;
+                }
+
+                if (variable == "debuglog") {
+                    _log = value;
+                }
+
                 if (variable == "documentroot") {
                     _wwwroot = value;
                 }
@@ -335,6 +352,9 @@
     if (_log.size()) {
         cerr << "\tDebug Log name is: " << _log << endl;
     }
+    if (_flashVersionString.size()) {
+        cerr << "\tFlash Version String is: " << _flashVersionString << endl;
+    }
     
 //     std::vector<std::string> _whitelist;
 //     std::vector<std::string> _blacklist;

Index: libbase/rc.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- libbase/rc.h	12 Jul 2007 23:03:49 -0000	1.21
+++ libbase/rc.h	19 Aug 2007 20:01:13 -0000	1.22
@@ -76,7 +76,7 @@
     int verbosityLevel() const { return _verbosity; }
     void verbosityLevel(int value) { _verbosity = value; }
     
-    std::string getDebugLog() const { return _log; }
+    const std::string& getDebugLog() const { return _log; }
     std::string getDocumentRoot() { return _wwwroot; }
     
     bool useDebugger() const { return _debugger; }
@@ -105,6 +105,8 @@
     const std::vector<std::string>& getWhiteList() const { return _whitelist; }
     const std::vector<std::string>& getBlackList() const { return _blacklist; }
 
+    const std::string& getFlashVersionString() const { return _flashVersionString; }
+
     int getRetries() const { return _retries; }
     void setRetries(int x) { _retries = x; }
 
@@ -122,6 +124,7 @@
     bool _debug;                // enable debugging of this class
     bool _debugger;             // enable the Flash movie debugger
     int  _verbosity;
+    std::string  _flashVersionString;   //String to pass as $version in Actionscript
     bool _actiondump;           // enable dumping actionscript classes
     bool _parserdump;           // enable dumping parser data
 

Index: server/vm/VM.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/VM.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- server/vm/VM.cpp	18 Aug 2007 12:24:41 -0000	1.14
+++ server/vm/VM.cpp	19 Aug 2007 20:01:13 -0000	1.15
@@ -16,7 +16,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: VM.cpp,v 1.14 2007/08/18 12:24:41 strk Exp $ */
+/* $Id: VM.cpp,v 1.15 2007/08/19 20:01:13 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -28,9 +28,13 @@
 #include "movie_root.h"
 #include "Global.h"
 #include "tu_timer.h" // for tu_timer::get_ticks()
+#include "rc.h" //for overriding default version string with rcfile
 
 #include <memory>
 
+namespace {
+gnash::RcInitFile& rcfile = gnash::RcInitFile::getDefaultInstance();
+}
 
 namespace gnash {
 
@@ -104,18 +108,8 @@
 const std::string&
 VM::getPlayerVersion() const
 {
-	// Expected Form: UNIX|WIN|WINCE|MAC (major version),(minor version),(revision),0
-	//    Used in _ActionScript_ version detection, not Javascript
-	//    ActionScript detection often looks for the commas, so
-	//    the last ,0 is necessary, even if it doesn't appear
-	//    to mean anything.
-	//    
-	// TODO: query RcInit file for an override
-	//
-#define FLASH_VERSION "GSH "DEFAULT_FLASH_MAJOR_VERSION","\
-        DEFAULT_FLASH_MINOR_VERSION","DEFAULT_FLASH_REV_NUMBER",0"
-
-	static const std::string version(FLASH_VERSION);
+	//From rcfile
+	static const std::string version(rcfile.getFlashVersionString());
 	return version;
 }
 

Index: testsuite/libbase/TCXXRc.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libbase/TCXXRc.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- testsuite/libbase/TCXXRc.cpp	12 Jul 2007 23:03:49 -0000	1.14
+++ testsuite/libbase/TCXXRc.cpp	19 Aug 2007 20:01:13 -0000	1.15
@@ -158,6 +158,12 @@
         runtest.fail ("enableExtensions");
     }
 
+    if (rc.getFlashVersionString() == "GSH 9,0,99,0") {
+        runtest.pass ("getFlashVersionString");
+    } else {
+        runtest.fail ("getFlashVersionString");
+    }
+
     if (rc.startStopped() == 1) {
         runtest.pass ("startStopped");
     } else {
@@ -175,7 +181,7 @@
         }
         runtest.pass ("rc.getWhiteList() has elements");
     } else {
-        runtest.fail ("rc.getWhiteList() doesn't has elements");        
+        runtest.fail ("rc.getWhiteList() doesn't have elements");        
     }
         
     std::vector<std::string> blacklist = rc.getBlackList();
@@ -188,7 +194,7 @@
         }
         runtest.pass ("rc.getBlackList() has elements");
     } else {
-        runtest.fail ("rc.getBlackList() doesn't has elements");        
+        runtest.fail ("rc.getBlackList() doesn't have elements");        
     }
 }
 

Index: testsuite/libbase/gnashrc.in
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libbase/gnashrc.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- testsuite/libbase/gnashrc.in	1 Jun 2007 15:01:55 -0000	1.5
+++ testsuite/libbase/gnashrc.in	19 Aug 2007 20:01:13 -0000	1.6
@@ -28,6 +28,9 @@
 # The full path to the debug log
 set debuglog ~/gnash-dbg.log
 
+# Version string to pass to ActionScript
+set flashVersionString GSH 9,0,99,0
+
 # Enable the debugger
 set debugger off
 



From MAILER-DAEMON Sun Aug 19 16:07:51 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMr3v-00044A-Dp
	for mharc-gnash-commit@gnu.org; Sun, 19 Aug 2007 16:07:51 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMr3t-000435-8V
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 16:07:49 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMr3r-000422-Pu
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 16:07:48 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMr3r-00041k-DN
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 16:07:47 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1IMr3p-0004Lh-JF
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 16:07:46 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <markus@unixrus.se>) id 1IMr3m-0008TO-HT
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 20:07:42 +0000
Received: from nihilus by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <nihilus@savannah.gnu.org>) id 1IMr3m-0008TL-Dq
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 20:07:42 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMr3m-0008TL-Dq@cvs.savannah.gnu.org>
From: Markus Gothe <markus@unixrus.se>
Date: Sun, 19 Aug 2007 20:07:42 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/libamf.all/Makefile.am
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Aug 2007 20:07:49 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Markus Gothe <nihilus>	07/08/19 20:07:42

Modified files:
	.              : ChangeLog 
	testsuite/libamf.all: Makefile.am 

Log message:
	Added DEJAGNU_CFLAGS.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4037&r2=1.4038
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libamf.all/Makefile.am?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4037
retrieving revision 1.4038
diff -u -b -r1.4037 -r1.4038
--- ChangeLog	19 Aug 2007 20:01:12 -0000	1.4037
+++ ChangeLog	19 Aug 2007 20:07:41 -0000	1.4038
@@ -15,7 +15,8 @@
 
 2007-08-19 Markus Gothe <nietzsche@lysator.liu.se>
 
-	* testsuite/libbase/Makefile.am: Added DEJAGNU_CFLAGS.
+	* testsuite/libbase/Makefile.am, 
+	testsuite/libamf.all/Makefile.am: Added DEJAGNU_CFLAGS.
 
 2007-08-18 Sandro Santilli <strk@keybit.net>
 

Index: testsuite/libamf.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libamf.all/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- testsuite/libamf.all/Makefile.am	1 Jul 2007 10:54:43 -0000	1.4
+++ testsuite/libamf.all/Makefile.am	19 Aug 2007 20:07:42 -0000	1.5
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.4 2007/07/01 10:54:43 bjacques Exp $
+# $Id: Makefile.am,v 1.5 2007/08/19 20:07:42 nihilus Exp $
 
 AUTOMAKE_OPTIONS = dejagnu
 
@@ -27,6 +27,7 @@
 	$(LIBXML_LIBS) \
 	$(CURL_LIBS) \
 	$(BOOST_LIBS) \
+	$(DEJAGNU_CFLAGS) \
 	$(PTHREAD_LIBS)
 
 AM_CPPFLAGS = -DSRCDIR=\"$(srcdir)\"
@@ -40,6 +41,7 @@
 	$(DMALLOC_CFLAGS) \
 	$(CURL_CFLAGS) \
 	$(BOOST_CFLAGS) \
+	$(DEJAGNU_CFLAGS) \
 	$(PTHREAD_CFLAGS)
 
 # AM_LDFLAGS  = $(OPENGL_LIBNS) $(SDL_LIBS)



From MAILER-DAEMON Sun Aug 19 16:22:11 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMrHn-0004Hs-Je
	for mharc-gnash-commit@gnu.org; Sun, 19 Aug 2007 16:22:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMrHl-0004Hn-IL
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 16:22:09 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMrHi-0004Hb-RU
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 16:22:09 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMrHi-0004HY-OR
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 16:22:06 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMrHi-0006n3-6p
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 16:22:06 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMrHg-0001jN-MY
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 20:22:04 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMrHg-0001jK-FI
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 20:22:04 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMrHg-0001jK-FI@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sun, 19 Aug 2007 20:22:04 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog doc/C/usermanual/usage/gnashrc....
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Aug 2007 20:22:10 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/19 20:22:04

Modified files:
	.              : ChangeLog 
	doc/C/usermanual/usage: gnashrc.xml 
	libbase        : rc.cpp rc.h 
	server/vm      : VM.cpp 
	testsuite/libbase: TCXXRc.cpp gnashrc.in 

Log message:
	        * doc/C/usermanual/usage/gnashrc.xml: document
	          flashVersionString variable.
	
	Patch #6155 by Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>:
	
	        * libbase/rc.{cpp,h}: Avoid string copies in inspectors;
	          add getFlashVersionString (support for
	          "set flashVersionString Bla bla bla" in gnashrc).
	        * server/vm/VM.cpp (getPlayerVersion): Query RcInit for version
	          string
	        * testsuite/libbase/: TCXXRc.cpp, gnashrc.in:
	          Add test for

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.38&r2=1.3971.2.39
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/usage/gnashrc.xml?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.5&r2=1.5.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.27&r2=1.27.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.h?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.21&r2=1.21.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/VM.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.12.2.2&r2=1.12.2.3
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libbase/TCXXRc.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.14&r2=1.14.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libbase/gnashrc.in?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.5&r2=1.5.6.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.38
retrieving revision 1.3971.2.39
diff -u -b -r1.3971.2.38 -r1.3971.2.39
--- ChangeLog	18 Aug 2007 22:08:12 -0000	1.3971.2.38
+++ ChangeLog	19 Aug 2007 20:22:02 -0000	1.3971.2.39
@@ -1,3 +1,18 @@
+2007-08-19 Sandro Santilli <strk@keybit.net>
+
+	* doc/C/usermanual/usage/gnashrc.xml: document
+	  flashVersionString variable.
+
+2007-08-19 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
+
+	* libbase/rc.{cpp,h}: Avoid string copies in inspectors;
+	  add getFlashVersionString (support for
+	  "set flashVersionString Bla bla bla" in gnashrc).
+	* server/vm/VM.cpp (getPlayerVersion): Query RcInit for version
+	  string
+	* testsuite/libbase/: TCXXRc.cpp, gnashrc.in:
+	  Add test for 
+
 2007-08-18 Sandro Santilli <strk@keybit.net>
 
 	* server/swf/tag_loaders.cpp (define_bits_lossless_2_loader):

Index: doc/C/usermanual/usage/gnashrc.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/usermanual/usage/gnashrc.xml,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -b -r1.5 -r1.5.2.1
--- doc/C/usermanual/usage/gnashrc.xml	1 Aug 2007 05:00:45 -0000	1.5
+++ doc/C/usermanual/usage/gnashrc.xml	19 Aug 2007 20:22:03 -0000	1.5.2.1
@@ -134,6 +134,22 @@
       </varlistentry>
 
       <varlistentry id="standalonesound">
+<row>
+<entry>flashVersionString</entry>
+<entry>string</entry>
+<entry>Set the string returned by $version and System.capabilities.version.
+       Useful to get around some flash version detection movies.
+       Note that the version advertised by the plugin is NOT affected by this setting,
+       instead you need to set the GNASH_FLASH_VERSION environment variable for
+       the latter (which doesn't affect $version and System.capabilities.version).</entry>
+</row>
+<row>
+<entry>StartStopped</entry>
+<entry>on/off</entry>
+<entry>Set to <emphasis>on</emphasis> to have the GUI start in "stop" mode. This is useful in particular
+	    for the plugin, so you have to explicitly start any movie on a webpage. This option is <emphasis>off</emphasis> by default.
+	  </entry>
+</row>
 	<term>sound</term>
 	<listitem>
 	  <para>

Index: libbase/rc.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.cpp,v
retrieving revision 1.27
retrieving revision 1.27.2.1
diff -u -b -r1.27 -r1.27.2.1
--- libbase/rc.cpp	12 Jul 2007 23:03:49 -0000	1.27
+++ libbase/rc.cpp	19 Aug 2007 20:22:03 -0000	1.27.2.1
@@ -53,6 +53,10 @@
                            _debug(false),
                            _debugger(false),
                            _verbosity(-1),
+                           _flashVersionString("GSH "\
+				DEFAULT_FLASH_MAJOR_VERSION","\
+				DEFAULT_FLASH_MINOR_VERSION","\
+				DEFAULT_FLASH_REV_NUMBER ",0"),
                            _actiondump(false),
                            _parserdump(false),
 			   _verboseASCodingErrors(false),
@@ -60,6 +64,7 @@
                            _splash_screen(true),
                            _localdomain_only(false),
                            _localhost_only(false),
+                           _log("gnash-dbg.log"),
                            _sound(true),
                            _plugin_sound(true),
 			   _extensionsEnabled(false),
@@ -128,8 +133,8 @@
 }
 
 int
-RcInitFile::extractNumber(int *num, const char *pattern, std::string &variable,
-                           std::string &value)
+RcInitFile::extractNumber(int *num, const char *pattern, string &variable,
+                           string &value)
 {      
 //    GNASH_REPORT_FUNCTION;
 //        log_msg ("%s: %s", variable.c_str(), value.c_str());
@@ -176,7 +181,11 @@
                 continue;
             }
             
-            in >> variable >> value;
+            in >> variable;
+            getline(in, value);
+            string::size_type position = value.find_first_not_of(' ');
+            if(position != string::npos) value.erase(0, position);
+
             //      log_msg ("%s %s %s", action, variable, value);
             
             if (action == "set") {
@@ -197,6 +206,14 @@
                 extractNumber(&_delay, "delay", variable, value);
                 extractNumber(&_verbosity, "verbosity", variable, value);
                 
+                if (variable == "flashVersionString") {
+                    _flashVersionString = value;
+                }
+
+                if (variable == "debuglog") {
+                    _log = value;
+                }
+
                 if (variable == "documentroot") {
                     _wwwroot = value;
                 }
@@ -335,6 +352,9 @@
     if (_log.size()) {
         cerr << "\tDebug Log name is: " << _log << endl;
     }
+    if (_flashVersionString.size()) {
+        cerr << "\tFlash Version String is: " << _flashVersionString << endl;
+    }
     
 //     std::vector<std::string> _whitelist;
 //     std::vector<std::string> _blacklist;

Index: libbase/rc.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.h,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -u -b -r1.21 -r1.21.2.1
--- libbase/rc.h	12 Jul 2007 23:03:49 -0000	1.21
+++ libbase/rc.h	19 Aug 2007 20:22:03 -0000	1.21.2.1
@@ -76,7 +76,7 @@
     int verbosityLevel() const { return _verbosity; }
     void verbosityLevel(int value) { _verbosity = value; }
     
-    std::string getDebugLog() const { return _log; }
+    const std::string& getDebugLog() const { return _log; }
     std::string getDocumentRoot() { return _wwwroot; }
     
     bool useDebugger() const { return _debugger; }
@@ -105,6 +105,8 @@
     const std::vector<std::string>& getWhiteList() const { return _whitelist; }
     const std::vector<std::string>& getBlackList() const { return _blacklist; }
 
+    const std::string& getFlashVersionString() const { return _flashVersionString; }
+
     int getRetries() const { return _retries; }
     void setRetries(int x) { _retries = x; }
 
@@ -122,6 +124,7 @@
     bool _debug;                // enable debugging of this class
     bool _debugger;             // enable the Flash movie debugger
     int  _verbosity;
+    std::string  _flashVersionString;   //String to pass as $version in Actionscript
     bool _actiondump;           // enable dumping actionscript classes
     bool _parserdump;           // enable dumping parser data
 

Index: server/vm/VM.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/VM.cpp,v
retrieving revision 1.12.2.2
retrieving revision 1.12.2.3
diff -u -b -r1.12.2.2 -r1.12.2.3
--- server/vm/VM.cpp	18 Aug 2007 12:37:18 -0000	1.12.2.2
+++ server/vm/VM.cpp	19 Aug 2007 20:22:03 -0000	1.12.2.3
@@ -16,7 +16,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: VM.cpp,v 1.12.2.2 2007/08/18 12:37:18 strk Exp $ */
+/* $Id: VM.cpp,v 1.12.2.3 2007/08/19 20:22:03 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -28,9 +28,13 @@
 #include "movie_root.h"
 #include "Global.h"
 #include "tu_timer.h" // for tu_timer::get_ticks()
+#include "rc.h" //for overriding default version string with rcfile
 
 #include <memory>
 
+namespace {
+gnash::RcInitFile& rcfile = gnash::RcInitFile::getDefaultInstance();
+}
 
 namespace gnash {
 
@@ -104,18 +108,8 @@
 const std::string&
 VM::getPlayerVersion() const
 {
-	// Expected Form: UNIX|WIN|WINCE|MAC (major version),(minor version),(revision),0
-	//    Used in _ActionScript_ version detection, not Javascript
-	//    ActionScript detection often looks for the commas, so
-	//    the last ,0 is necessary, even if it doesn't appear
-	//    to mean anything.
-	//    
-	// TODO: query RcInit file for an override
-	//
-#define FLASH_VERSION "GSH "DEFAULT_FLASH_MAJOR_VERSION","\
-        DEFAULT_FLASH_MINOR_VERSION","DEFAULT_FLASH_REV_NUMBER",0"
-
-	static const std::string version(FLASH_VERSION);
+	//From rcfile
+	static const std::string version(rcfile.getFlashVersionString());
 	return version;
 }
 

Index: testsuite/libbase/TCXXRc.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libbase/TCXXRc.cpp,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -b -r1.14 -r1.14.2.1
--- testsuite/libbase/TCXXRc.cpp	12 Jul 2007 23:03:49 -0000	1.14
+++ testsuite/libbase/TCXXRc.cpp	19 Aug 2007 20:22:04 -0000	1.14.2.1
@@ -158,6 +158,12 @@
         runtest.fail ("enableExtensions");
     }
 
+    if (rc.getFlashVersionString() == "GSH 9,0,99,0") {
+        runtest.pass ("getFlashVersionString");
+    } else {
+        runtest.fail ("getFlashVersionString");
+    }
+
     if (rc.startStopped() == 1) {
         runtest.pass ("startStopped");
     } else {
@@ -175,7 +181,7 @@
         }
         runtest.pass ("rc.getWhiteList() has elements");
     } else {
-        runtest.fail ("rc.getWhiteList() doesn't has elements");        
+        runtest.fail ("rc.getWhiteList() doesn't have elements");        
     }
         
     std::vector<std::string> blacklist = rc.getBlackList();
@@ -188,7 +194,7 @@
         }
         runtest.pass ("rc.getBlackList() has elements");
     } else {
-        runtest.fail ("rc.getBlackList() doesn't has elements");        
+        runtest.fail ("rc.getBlackList() doesn't have elements");        
     }
 }
 

Index: testsuite/libbase/gnashrc.in
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libbase/gnashrc.in,v
retrieving revision 1.5
retrieving revision 1.5.6.1
diff -u -b -r1.5 -r1.5.6.1
--- testsuite/libbase/gnashrc.in	1 Jun 2007 15:01:55 -0000	1.5
+++ testsuite/libbase/gnashrc.in	19 Aug 2007 20:22:04 -0000	1.5.6.1
@@ -28,6 +28,9 @@
 # The full path to the debug log
 set debuglog ~/gnash-dbg.log
 
+# Version string to pass to ActionScript
+set flashVersionString GSH 9,0,99,0
+
 # Enable the debugger
 set debugger off
 



From MAILER-DAEMON Sun Aug 19 16:22:39 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMrIF-0004Km-Pz
	for mharc-gnash-commit@gnu.org; Sun, 19 Aug 2007 16:22:39 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMrID-0004Kh-TI
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 16:22:37 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMrIC-0004KS-9G
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 16:22:36 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMrIC-0004KP-4q
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 16:22:36 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMrIB-0006qp-NE
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 16:22:35 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMrIA-0001k3-V4
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 20:22:35 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMrIA-0001k0-RA
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 20:22:34 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMrIA-0001k0-RA@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sun, 19 Aug 2007 20:22:34 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/FreetypeGlyphsProvider.cpp
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Aug 2007 20:22:38 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/19 20:22:34

Modified files:
	.              : ChangeLog 
	server         : FreetypeGlyphsProvider.cpp 

Log message:
	 * server/FreetypeGlyphsProvider.cpp: remove compiler warnings.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.39&r2=1.3971.2.40
http://cvs.savannah.gnu.org/viewcvs/gnash/server/FreetypeGlyphsProvider.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.7.2.3&r2=1.7.2.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.39
retrieving revision 1.3971.2.40
diff -u -b -r1.3971.2.39 -r1.3971.2.40
--- ChangeLog	19 Aug 2007 20:22:02 -0000	1.3971.2.39
+++ ChangeLog	19 Aug 2007 20:22:33 -0000	1.3971.2.40
@@ -1,5 +1,6 @@
 2007-08-19 Sandro Santilli <strk@keybit.net>
 
+	* server/FreetypeGlyphsProvider.cpp: remove compiler warnings.
 	* doc/C/usermanual/usage/gnashrc.xml: document
 	  flashVersionString variable.
 

Index: server/FreetypeGlyphsProvider.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/FreetypeGlyphsProvider.cpp,v
retrieving revision 1.7.2.3
retrieving revision 1.7.2.4
diff -u -b -r1.7.2.3 -r1.7.2.4
--- server/FreetypeGlyphsProvider.cpp	10 Aug 2007 21:28:44 -0000	1.7.2.3
+++ server/FreetypeGlyphsProvider.cpp	19 Aug 2007 20:22:34 -0000	1.7.2.4
@@ -412,7 +412,10 @@
 	{
 		unsigned long gf = m_face->glyph->format;
 		log_unimpl("FT_Load_Char() returned a glyph format != FT_GLYPH_FORMAT_OUTLINE (%c%c%c%c)",
-			(gf>>24)&0xff, (gf>>16)&0xff, (gf>>8)&0xff, gf&0xff);
+			static_cast<char>((gf>>24)&0xff),
+			static_cast<char>((gf>>16)&0xff),
+			static_cast<char>((gf>>8)&0xff),
+			static_cast<char>(gf&0xff));
 		return 0;
 	}
 	//assert(m_face->glyph->format == FT_GLYPH_FORMAT_OUTLINE);



From MAILER-DAEMON Sun Aug 19 16:22:48 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMrIN-0004Mf-Us
	for mharc-gnash-commit@gnu.org; Sun, 19 Aug 2007 16:22:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMrIM-0004Ma-Cm
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 16:22:46 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMrIM-0004MO-0b
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 16:22:46 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMrIL-0004ML-QG
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 16:22:45 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMrIK-0006sR-Qg
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 16:22:45 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMrIK-0001kQ-5F
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 20:22:44 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMrIK-0001kN-1Y
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 20:22:44 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMrIK-0001kN-1Y@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sun, 19 Aug 2007 20:22:44 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/FreetypeGlyphsProvider.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Aug 2007 20:22:46 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/19 20:22:43

Modified files:
	.              : ChangeLog 
	server         : FreetypeGlyphsProvider.cpp 

Log message:
	 * server/FreetypeGlyphsProvider.cpp: remove compiler warnings.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4038&r2=1.4039
http://cvs.savannah.gnu.org/viewcvs/gnash/server/FreetypeGlyphsProvider.cpp?cvsroot=gnash&r1=1.10&r2=1.11

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4038
retrieving revision 1.4039
diff -u -b -r1.4038 -r1.4039
--- ChangeLog	19 Aug 2007 20:07:41 -0000	1.4038
+++ ChangeLog	19 Aug 2007 20:22:43 -0000	1.4039
@@ -1,5 +1,6 @@
 2007-08-19 Sandro Santilli <strk@keybit.net>
 
+	* server/FreetypeGlyphsProvider.cpp: remove compiler warnings.
 	* doc/C/usermanual/usage/gnashrc.xml: document
 	  flashVersionString variable.
 

Index: server/FreetypeGlyphsProvider.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/FreetypeGlyphsProvider.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/FreetypeGlyphsProvider.cpp	10 Aug 2007 21:28:50 -0000	1.10
+++ server/FreetypeGlyphsProvider.cpp	19 Aug 2007 20:22:43 -0000	1.11
@@ -412,7 +412,10 @@
 	{
 		unsigned long gf = m_face->glyph->format;
 		log_unimpl("FT_Load_Char() returned a glyph format != FT_GLYPH_FORMAT_OUTLINE (%c%c%c%c)",
-			(gf>>24)&0xff, (gf>>16)&0xff, (gf>>8)&0xff, gf&0xff);
+			static_cast<char>((gf>>24)&0xff),
+			static_cast<char>((gf>>16)&0xff),
+			static_cast<char>((gf>>8)&0xff),
+			static_cast<char>(gf&0xff));
 		return 0;
 	}
 	//assert(m_face->glyph->format == FT_GLYPH_FORMAT_OUTLINE);



From MAILER-DAEMON Sun Aug 19 16:28:40 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMrO4-0006CC-3x
	for mharc-gnash-commit@gnu.org; Sun, 19 Aug 2007 16:28:40 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMrO2-00069S-7l
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 16:28:38 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMrO1-00068u-Js
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 16:28:37 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMrO1-00068m-GW
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 16:28:37 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMrO0-0007i6-UH
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 16:28:37 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMrO0-0001sk-4p
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 20:28:36 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMrO0-0001sh-1Q
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 20:28:36 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMrO0-0001sh-1Q@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sun, 19 Aug 2007 20:28:36 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/vm/ASHandlers.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Aug 2007 20:28:38 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/19 20:28:35

Modified files:
	.              : ChangeLog 
	server/vm      : ASHandlers.cpp 

Log message:
	        * server/vm/ASHandlers.cpp (CommonGetUrl): check for _level#
	          loading even when loadTargetFlag is clear.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4039&r2=1.4040
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.120&r2=1.121

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4039
retrieving revision 1.4040
diff -u -b -r1.4039 -r1.4040
--- ChangeLog	19 Aug 2007 20:22:43 -0000	1.4039
+++ ChangeLog	19 Aug 2007 20:28:35 -0000	1.4040
@@ -1,5 +1,7 @@
 2007-08-19 Sandro Santilli <strk@keybit.net>
 
+	* server/vm/ASHandlers.cpp (CommonGetUrl): check for _level#
+	  loading even when loadTargetFlag is clear.
 	* server/FreetypeGlyphsProvider.cpp: remove compiler warnings.
 	* doc/C/usermanual/usage/gnashrc.xml: document
 	  flashVersionString variable.

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -b -r1.120 -r1.121
--- server/vm/ASHandlers.cpp	18 Aug 2007 17:47:31 -0000	1.120
+++ server/vm/ASHandlers.cpp	19 Aug 2007 20:28:35 -0000	1.121
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ASHandlers.cpp,v 1.120 2007/08/18 17:47:31 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.121 2007/08/19 20:28:35 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1731,6 +1731,9 @@
 //   NOTE: this is affected by the GetUrl bug reported with an excerpt
 //         from Colin Moock book, see below. (won't work, and won't fix)
 //
+// - http://www.uptoten.com
+//   Should load in _level0, with loadTargetFlag set.
+//
 void
 SWFHandlers::CommonGetUrl(as_environment& env,
 		as_value target, // the target window, or _level1..10
@@ -1897,6 +1900,14 @@
 			sendVarsMethod);
 	}
 
+	if ( target_string.compare(0, 6, "_level") == 0 && target_string.find_first_not_of("0123456789", 7) == string::npos )
+	{
+		unsigned int levelno = atoi(target_string.c_str()+6);
+		log_debug(_("Testing _level loading (level %u)"), levelno);
+		VM::get().getRoot().loadLevel(levelno, url);
+		return;
+	}
+
 #ifndef __OS2__x
 	string command = "firefox -remote \"openurl(";
 #else // def __OS2__x



From MAILER-DAEMON Sun Aug 19 16:31:36 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMrQu-0002iX-Mu
	for mharc-gnash-commit@gnu.org; Sun, 19 Aug 2007 16:31:36 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMrQs-0002fN-HH
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 16:31:34 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMrQr-0002dZ-2Z
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 16:31:34 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMrQq-0002dQ-Uh
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 16:31:33 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1IMrQq-000806-GD
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 16:31:32 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <markus@unixrus.se>) id 1IMrQj-0001vC-5b
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 20:31:25 +0000
Received: from nihilus by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <nihilus@savannah.gnu.org>) id 1IMrQj-0001v9-1J
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 20:31:25 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMrQj-0001v9-1J@cvs.savannah.gnu.org>
From: Markus Gothe <markus@unixrus.se>
Date: Sun, 19 Aug 2007 20:31:25 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/libamf.all/Makefile.a...
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Aug 2007 20:31:34 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Markus Gothe <nihilus>	07/08/19 20:31:24

Modified files:
	.              : ChangeLog 
	testsuite/libamf.all: Makefile.am 
	testsuite/libbase: Makefile.am 

Log message:
	Added DEJAGNU_CFLAGS

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.40&r2=1.3971.2.41
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libamf.all/Makefile.am?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.4&r2=1.4.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libbase/Makefile.am?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.31&r2=1.31.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.40
retrieving revision 1.3971.2.41
diff -u -b -r1.3971.2.40 -r1.3971.2.41
--- ChangeLog	19 Aug 2007 20:22:33 -0000	1.3971.2.40
+++ ChangeLog	19 Aug 2007 20:31:23 -0000	1.3971.2.41
@@ -1,3 +1,8 @@
+2007-08-19 Markus Gothe <nietzsche@lysator.liu.se>
+
+	* testsuite/libbase/Makefile.am,
+	testsuite/libamf.all/Makefile.am: Added DEJAGNU_CFLAGS.
+
 2007-08-19 Sandro Santilli <strk@keybit.net>
 
 	* server/FreetypeGlyphsProvider.cpp: remove compiler warnings.

Index: testsuite/libamf.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libamf.all/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -b -r1.4 -r1.4.2.1
--- testsuite/libamf.all/Makefile.am	1 Jul 2007 10:54:43 -0000	1.4
+++ testsuite/libamf.all/Makefile.am	19 Aug 2007 20:31:24 -0000	1.4.2.1
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.4 2007/07/01 10:54:43 bjacques Exp $
+# $Id: Makefile.am,v 1.4.2.1 2007/08/19 20:31:24 nihilus Exp $
 
 AUTOMAKE_OPTIONS = dejagnu
 
@@ -27,6 +27,7 @@
 	$(LIBXML_LIBS) \
 	$(CURL_LIBS) \
 	$(BOOST_LIBS) \
+	$(DEJAGNU_CFLAGS) \
 	$(PTHREAD_LIBS)
 
 AM_CPPFLAGS = -DSRCDIR=\"$(srcdir)\"
@@ -40,6 +41,7 @@
 	$(DMALLOC_CFLAGS) \
 	$(CURL_CFLAGS) \
 	$(BOOST_CFLAGS) \
+	$(DEJAGNU_CFLAGS) \
 	$(PTHREAD_CFLAGS)
 
 # AM_LDFLAGS  = $(OPENGL_LIBNS) $(SDL_LIBS)

Index: testsuite/libbase/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libbase/Makefile.am,v
retrieving revision 1.31
retrieving revision 1.31.2.1
diff -u -b -r1.31 -r1.31.2.1
--- testsuite/libbase/Makefile.am	21 Jul 2007 01:38:39 -0000	1.31
+++ testsuite/libbase/Makefile.am	19 Aug 2007 20:31:24 -0000	1.31.2.1
@@ -34,6 +34,7 @@
         $(MING_CFLAGS) \
 	$(LIBXML_CFLAGS) \
 	$(BOOST_CFLAGS) \
+	$(DEJAGNU_CFLAGS) \
 	$(NULL)
 
 abs_builddir=`(cd $(top_builddir)/testsuite/libbase; pwd)`



From MAILER-DAEMON Sun Aug 19 16:32:34 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMrRq-0003xX-1Q
	for mharc-gnash-commit@gnu.org; Sun, 19 Aug 2007 16:32:34 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMrRo-0003tm-1l
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 16:32:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMrRm-0003rO-D9
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 16:32:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMrRm-0003rD-2M
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 16:32:30 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMrRl-00086R-JW
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 16:32:29 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMrRk-0001wM-D7
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 20:32:28 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMrRk-0001wJ-9c
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 20:32:28 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMrRk-0001wJ-9c@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sun, 19 Aug 2007 20:32:28 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/vm/ASHandlers.cpp
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Aug 2007 20:32:32 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/19 20:32:28

Modified files:
	.              : ChangeLog 
	server/vm      : ASHandlers.cpp 

Log message:
	        * server/vm/ASHandlers.cpp (CommonGetUrl): backport a copy from
	          head.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.41&r2=1.3971.2.42
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.118.2.1&r2=1.118.2.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.41
retrieving revision 1.3971.2.42
diff -u -b -r1.3971.2.41 -r1.3971.2.42
--- ChangeLog	19 Aug 2007 20:31:23 -0000	1.3971.2.41
+++ ChangeLog	19 Aug 2007 20:32:27 -0000	1.3971.2.42
@@ -1,3 +1,8 @@
+2007-08-19 Sandro Santilli <strk@keybit.net>
+
+	* server/vm/ASHandlers.cpp (CommonGetUrl): backport a copy from
+	  head.
+
 2007-08-19 Markus Gothe <nietzsche@lysator.liu.se>
 
 	* testsuite/libbase/Makefile.am,

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.118.2.1
retrieving revision 1.118.2.2
diff -u -b -r1.118.2.1 -r1.118.2.2
--- server/vm/ASHandlers.cpp	18 Aug 2007 21:52:33 -0000	1.118.2.1
+++ server/vm/ASHandlers.cpp	19 Aug 2007 20:32:27 -0000	1.118.2.2
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ASHandlers.cpp,v 1.118.2.1 2007/08/18 21:52:33 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.118.2.2 2007/08/19 20:32:27 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1731,6 +1731,9 @@
 //   NOTE: this is affected by the GetUrl bug reported with an excerpt
 //         from Colin Moock book, see below. (won't work, and won't fix)
 //
+// - http://www.uptoten.com
+//   Should load in _level0, with loadTargetFlag set.
+//
 void
 SWFHandlers::CommonGetUrl(as_environment& env,
 		as_value target, // the target window, or _level1..10
@@ -1896,6 +1899,43 @@
 			" with no loadTargetFlag"),
 			sendVarsMethod);
 	}
+
+	if ( target_string.compare(0, 6, "_level") == 0 && target_string.find_first_not_of("0123456789", 7) == string::npos )
+	{
+		unsigned int levelno = atoi(target_string.c_str()+6);
+		log_debug(_("Testing _level loading (level %u)"), levelno);
+		VM::get().getRoot().loadLevel(levelno, url);
+		return;
+	}
+
+#ifndef __OS2__x
+	string command = "firefox -remote \"openurl(";
+#else // def __OS2__x
+	static char browserExe[ 255 ] = "";
+
+	if ( browserExe[0] == 0 )
+	{
+		PrfQueryProfileString( HINI_USER, (PSZ) "WPURLDEFAULTSETTINGS",
+			(PSZ) "DefaultBrowserExe", NULL,
+			(PVOID) browserExe, (LONG)sizeof(browserExe) );
+	}
+
+	string command = browserExe;
+	command += " -remote \"openurl(";
+#endif // def __OS2__x
+
+	command += url.str();
+
+#if 0 // target testing TODO: should we enable this by default?
+	if ( ! target_string.empty() )
+	{
+		command += ", " + target_string;
+	}
+#endif
+	command += ")\"";
+	log_msg (_("Launching URL... %s"), command.c_str());
+	system(command.c_str());
+
 }
 
 // Common code for SetTarget and SetTargetExpression. See:



From MAILER-DAEMON Sun Aug 19 18:50:23 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMtbD-0000B0-1c
	for mharc-gnash-commit@gnu.org; Sun, 19 Aug 2007 18:50:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMtbB-0000AP-96
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 18:50:21 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMtb9-00009x-NY
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 18:50:20 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMtb9-00009u-Kj
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 18:50:19 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMtb8-0006nk-6J
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 18:50:18 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMtb6-0002iM-N6
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 22:50:16 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMtb6-0002iJ-JC
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 22:50:16 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMtb6-0002iJ-JC@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sun, 19 Aug 2007 22:50:16 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/vm/ASHandlers.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Aug 2007 22:50:21 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/19 22:50:16

Modified files:
	.              : ChangeLog 
	server/vm      : ASHandlers.cpp 

Log message:
	        * server/vm/ASHandlers.cpp (ActionGetVariables): simplify debugging
	          output.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4040&r2=1.4041
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.121&r2=1.122

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4040
retrieving revision 1.4041
diff -u -b -r1.4040 -r1.4041
--- ChangeLog	19 Aug 2007 20:28:35 -0000	1.4040
+++ ChangeLog	19 Aug 2007 22:50:15 -0000	1.4041
@@ -1,5 +1,10 @@
 2007-08-19 Sandro Santilli <strk@keybit.net>
 
+	* server/vm/ASHandlers.cpp (ActionGetVariables): simplify debugging
+	  output.
+
+2007-08-19 Sandro Santilli <strk@keybit.net>
+
 	* server/vm/ASHandlers.cpp (CommonGetUrl): check for _level#
 	  loading even when loadTargetFlag is clear.
 	* server/FreetypeGlyphsProvider.cpp: remove compiler warnings.

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -b -r1.121 -r1.122
--- server/vm/ASHandlers.cpp	19 Aug 2007 20:28:35 -0000	1.121
+++ server/vm/ASHandlers.cpp	19 Aug 2007 22:50:16 -0000	1.122
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ASHandlers.cpp,v 1.121 2007/08/19 20:28:35 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.122 2007/08/19 22:50:16 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -973,17 +973,9 @@
 
 	IF_VERBOSE_ACTION
 	(
-	        boost::intrusive_ptr<as_object> obj=top_value.to_object();
-		if (obj == NULL) {
 			log_action(_("-- get var: %s=%s"),
 				var_string.c_str(),
 				top_value.to_debug_string().c_str());
-		} else {
-			log_action(_("-- get var: %s=%s at %p"),
-				var_string.c_str(),
-				top_value.to_string(&env).c_str(),
-				(void*)obj.get());
-		}
 	);
 #ifdef USE_DEBUGGER
 	debugger.matchWatchPoint(var_string, Debugger::READS);



From MAILER-DAEMON Sun Aug 19 18:55:44 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMtgO-0000fO-Fz
	for mharc-gnash-commit@gnu.org; Sun, 19 Aug 2007 18:55:44 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMtgL-0000f4-NK
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 18:55:41 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMtgK-0000eo-2m
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 18:55:40 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMtgJ-0000eh-U2
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 18:55:39 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMtgI-0007Yg-FJ
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 18:55:38 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMtgH-0002m2-RI
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 22:55:37 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMtgH-0002lz-Mp
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 22:55:37 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMtgH-0002lz-Mp@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sun, 19 Aug 2007 22:55:37 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/vm/ASHandlers.cpp
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Aug 2007 22:55:42 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/19 22:55:37

Modified files:
	.              : ChangeLog 
	server/vm      : ASHandlers.cpp 

Log message:
	        * server/vm/ASHandlers.cpp (ActionGetVariables): simplify debugging
	          output.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.42&r2=1.3971.2.43
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.118.2.2&r2=1.118.2.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.42
retrieving revision 1.3971.2.43
diff -u -b -r1.3971.2.42 -r1.3971.2.43
--- ChangeLog	19 Aug 2007 20:32:27 -0000	1.3971.2.42
+++ ChangeLog	19 Aug 2007 22:55:36 -0000	1.3971.2.43
@@ -1,5 +1,10 @@
 2007-08-19 Sandro Santilli <strk@keybit.net>
 
+	* server/vm/ASHandlers.cpp (ActionGetVariables): simplify debugging
+	  output.
+
+2007-08-19 Sandro Santilli <strk@keybit.net>
+
 	* server/vm/ASHandlers.cpp (CommonGetUrl): backport a copy from
 	  head.
 

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.118.2.2
retrieving revision 1.118.2.3
diff -u -b -r1.118.2.2 -r1.118.2.3
--- server/vm/ASHandlers.cpp	19 Aug 2007 20:32:27 -0000	1.118.2.2
+++ server/vm/ASHandlers.cpp	19 Aug 2007 22:55:37 -0000	1.118.2.3
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ASHandlers.cpp,v 1.118.2.2 2007/08/19 20:32:27 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.118.2.3 2007/08/19 22:55:37 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -973,17 +973,9 @@
 
 	IF_VERBOSE_ACTION
 	(
-	        boost::intrusive_ptr<as_object> obj=top_value.to_object();
-		if (obj == NULL) {
 			log_action(_("-- get var: %s=%s"),
 				var_string.c_str(),
 				top_value.to_debug_string().c_str());
-		} else {
-			log_action(_("-- get var: %s=%s at %p"),
-				var_string.c_str(),
-				top_value.to_string(&env).c_str(),
-				(void*)obj.get());
-		}
 	);
 #ifdef USE_DEBUGGER
 	debugger.matchWatchPoint(var_string, Debugger::READS);



From MAILER-DAEMON Sun Aug 19 19:35:03 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMuIQ-0003Xu-Qe
	for mharc-gnash-commit@gnu.org; Sun, 19 Aug 2007 19:35:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMuIO-0003Xc-Bh
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 19:35:00 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMuIM-0003XQ-IP
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 19:35:00 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMuIM-0003XN-Ek
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 19:34:58 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IMuIK-0004rK-MS
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 19:34:56 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IMuIJ-0004qp-Mt
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 23:34:55 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IMuIJ-0004qm-Fa
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 23:34:55 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMuIJ-0004qm-Fa@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sun, 19 Aug 2007 23:34:55 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/ops.as
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Aug 2007 23:35:01 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/19 23:34:55

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: ops.as 

Log message:
	        * testsuite/actionscript.all/ops.as: test that NaN and undefined are
	          not less one other.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4041&r2=1.4042
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/ops.as?cvsroot=gnash&r1=1.16&r2=1.17

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4041
retrieving revision 1.4042
diff -u -b -r1.4041 -r1.4042
--- ChangeLog	19 Aug 2007 22:50:15 -0000	1.4041
+++ ChangeLog	19 Aug 2007 23:34:54 -0000	1.4042
@@ -1,5 +1,7 @@
 2007-08-19 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/actionscript.all/ops.as: test that NaN and undefined are
+	  not less one other.
 	* server/vm/ASHandlers.cpp (ActionGetVariables): simplify debugging
 	  output.
 

Index: testsuite/actionscript.all/ops.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/ops.as,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- testsuite/actionscript.all/ops.as	13 Aug 2007 08:00:44 -0000	1.16
+++ testsuite/actionscript.all/ops.as	19 Aug 2007 23:34:55 -0000	1.17
@@ -20,7 +20,7 @@
  *  Test binary predicates (equal, less_then, greater_then, logical and bitwise ops)
  */
 
-rcsid="$Id: ops.as,v 1.16 2007/08/13 08:00:44 zoulunkai Exp $";
+rcsid="$Id: ops.as,v 1.17 2007/08/19 23:34:55 strk Exp $";
 
 #include "check.as"
 
@@ -120,6 +120,12 @@
 y=1.0;
 xcheck(x<y);
 
+check(! (NaN < NaN) );
+check(! (undefined < undefined) );
+
+check(! (NaN < undefined) );
+check(! (undefined < NaN) );
+
 //------------------------------------------------
 // Logical AND operator (ACTION_LOGICALAND : 0x10)
 //------------------------------------------------



From MAILER-DAEMON Sun Aug 19 23:25:16 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IMxtE-0004AE-83
	for mharc-gnash-commit@gnu.org; Sun, 19 Aug 2007 23:25:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IMxtB-0004A6-L3
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 23:25:13 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IMxtA-00049e-6j
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 23:25:12 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IMxtA-00049b-3k
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 23:25:12 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <chadmusick@msbx.net>) id 1IMxt9-0005H9-P3
	for gnash-commit@gnu.org; Sun, 19 Aug 2007 23:25:11 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <chadmusick@msbx.net>) id 1IMxt8-0003PA-Cp
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 03:25:10 +0000
Received: from cmusick by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <cmusick@savannah.gnu.org>) id 1IMxt8-0003P7-4n
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 03:25:10 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IMxt8-0003P7-4n@cvs.savannah.gnu.org>
From: Chad Musick <chadmusick@msbx.net>
Date: Mon, 20 Aug 2007 03:25:10 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/server/vm ASHandlers.cpp ASHandlers.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Aug 2007 03:25:14 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Chad Musick <cmusick>	07/08/20 03:25:10

Modified files:
	server/vm      : ASHandlers.cpp ASHandlers.h 

Log message:
	Adding the multibyte string operators.  This behavior currently has
	no testcases. There may be a more efficient way to know rather than
	discover encoding, but I have not found it. These operators are
	deprected since SWF 5.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.122&r2=1.123
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.h?cvsroot=gnash&r1=1.8&r2=1.9

Patches:
Index: ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -b -r1.122 -r1.123
--- ASHandlers.cpp	19 Aug 2007 22:50:16 -0000	1.122
+++ ASHandlers.cpp	20 Aug 2007 03:25:09 -0000	1.123
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ASHandlers.cpp,v 1.122 2007/08/19 22:50:16 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.123 2007/08/20 03:25:09 cmusick Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -55,6 +55,7 @@
 #include <set>
 #include <vector>
 #include <utility> // for std::pair
+#include <locale.h>
 
 using namespace std;
 
@@ -1376,12 +1377,115 @@
 	env.top(0).set_int(tu_random::next_random() % max);
 }
 
+as_encoding_guess_t
+SWFHandlers::GuessEncoding(std::string &str, int &length, int *offsets)
+{
+    const char *cstr = str.c_str();
+    const char *i = cstr;
+    int width = 0; // The remaining width, not the total.
+    bool is_sought = true;
+    int j;
+    int index = 0;
+
+    length = 0;
+    // First, assume it's UTF8 and try to be wrong.
+    for (index = 0; is_sought && *i != '\0'; ++i, ++index)
+    {
+        j = static_cast<int> (*i);
+
+        if (width)
+        {
+            --width;
+            if ((j & 0xB0) != 0x80)
+                is_sought = false;
+            continue;
+        }
+        ++length;
+        *(offsets + length - 1) = index;
+
+        if ((j & 0xC0) == 0x80)
+            continue; // A 1 byte character.
+        else if ((j & 0xE0) == 0xC0)
+            width = 1;
+        else if ((j & 0xF0) == 0xE0)
+            width = 2;
+        else if ((j & 0xF8) == 0xF0)
+            width = 3;
+        else if (j & 0x80)
+            is_sought = false;
+    }
+    *(offsets + length - 1) = index;
+    if (!width && is_sought) // No width left, so it's almost certainly UTF8.
+        return ENCGUESS_UNICODE;
+
+    is_sought = true;
+    width = 0;
+    length = 0;
+    bool was_odd = true;
+    bool was_even = true;
+    // Now, assume it's SHIFT_JIS and try to be wrong.
+    for (index = 0, i = cstr; is_sought && (*i != '\0'); ++i, ++index)
+    {
+        j = static_cast<int> (*i);
+
+        if (width)
+        {
+            --width;
+            if ((j < 0x40) || ((j < 0x9F) && was_even) ||
+                ((j > 0x9E) && was_odd) || (j == 0x7F))
+            {
+                is_sought = false;
+            }
+            continue;
+        }
+
+        ++length;
+        *(offsets + length - 1) = index;
+
+        if ((j == 0x80) || (j == 0xA0) || (j >= 0xF0))
+        {
+            is_sought = false;
+            break;
+        }
+
+        if (((j >= 0x81) && (j <= 0x9F)) || ((j >= 0xE0) && (j <= 0xEF)))
+        {
+            width = 1;
+            was_odd = j & 0x01;
+            was_even = !was_odd;
+        }
+        
+    }
+    *(offsets + length - 1) = index;
+    if (!width && is_sought) // No width left, so it's probably SHIFT_JIS.
+        return ENCGUESS_JIS;
+
+    // It's something else.
+    length = mbstowcs(NULL, cstr, 0);
+    if (length == -1)
+        length = strlen(cstr);
+    return ENCGUESS_OTHER;
+}
+
 void
-SWFHandlers::ActionMbLength(ActionExec& /*thread*/)
+SWFHandlers::ActionMbLength(ActionExec& thread)
 {
 //    GNASH_REPORT_FUNCTION;
-//    as_environment& env = thread.env;
-    log_unimpl (__PRETTY_FUNCTION__);
+    as_environment& env = thread.env;
+
+    thread.ensureStack(1);
+    string str = env.top(0).to_string(&env);
+
+    if (str.empty())
+    {
+        env.top(0).set_int(0);
+    }
+    else
+    {
+        int length;
+        (void) GuessEncoding(str, length, NULL);
+        env.top(0).set_int(length);
+    }
 }
 
 void
@@ -1423,11 +1527,76 @@
 }
 
 void
-SWFHandlers::ActionMbSubString(ActionExec& /*thread*/)
+SWFHandlers::ActionMbSubString(ActionExec& thread)
 {
 //    GNASH_REPORT_FUNCTION;
-//    as_environment& env = thread.env;
-    log_unimpl (__PRETTY_FUNCTION__);
+    as_environment& env = thread.env;
+
+    thread.ensureStack(3);
+
+    int size = env.top(0).to_int(env);
+    int start = env.top(1).to_int(env);
+    as_value& string_val = env.top(2);
+
+    env.drop(2);
+
+    if (string_val.is_undefined() || string_val.is_null())
+    {
+        log_error(_("Undefined or null string passed to ActionMBSubString, "
+            "returning undefined"));
+        env.top(0).set_undefined();
+        return;
+    }
+
+    if (size < 1)
+    {
+        if (size < 0)
+        {
+            IF_VERBOSE_ASCODING_ERRORS(
+            log_aserror(_("Length is less than 1 in ActionMbSubString, "
+                "returning empty string."));
+            );
+        }
+        env.top(0).set_string("");
+        return;
+    }
+
+    string str = string_val.to_string(&env);
+    int length = 0;
+    int offsets[str.length() + 1];
+
+    as_encoding_guess_t encoding = GuessEncoding(str, length, offsets);
+
+    if (start < 1)
+    {
+	IF_VERBOSE_ASCODING_ERRORS(
+    	log_aserror(_("Base is less then 1 in ActionMbSubString, "
+		"setting to 1."));
+	);
+        start = 1;
+    }
+
+    // Adjust the start for our own use.
+    --start;
+
+    if (size + start - 1 > length)
+    {
+        IF_VERBOSE_ASCODING_ERRORS(
+        log_aserror(_("base+size goes beyond input string in ActionMbSubString, "
+            "adjusting size"));
+        );
+        size = length - start;
+    }
+
+    if (encoding == ENCGUESS_OTHER)
+    {
+        env.top(0).set_string(str.substr(start, size));
+    }
+    else
+    {
+        env.top(0).set_string(str.substr(offsets[start], offsets[size] - offsets[start] + 1));
+    }
+    return;
 }
 
 void
@@ -1439,11 +1608,26 @@
 }
 
 void
-SWFHandlers::ActionMbChr(ActionExec& /*thread*/)
+SWFHandlers::ActionMbChr(ActionExec& thread)
 {
 //    GNASH_REPORT_FUNCTION;
-//    as_environment& env = thread.env;
-    log_unimpl (__PRETTY_FUNCTION__);
+//    The correctness of this depends on the locale being correct,
+//    which it should be far more often than not, by choosing UTF8.
+    as_environment& env = thread.env;
+
+    thread.ensureStack(1);
+
+    wchar_t i = static_cast<wchar_t> (env.top(0).to_int(env));
+    char str[MB_CUR_MAX + 1];
+    memset(str, '\0', MB_CUR_MAX + 1);
+    if (wctomb(str, i) == -1)
+    {
+        env.top(0).set_undefined();
+    }
+    else
+    {
+        env.top(0).set_string(str);
+    }
 }
 
 // also known as WaitForFrame2

Index: ASHandlers.h
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- ASHandlers.h	1 Jul 2007 10:54:36 -0000	1.8
+++ ASHandlers.h	20 Aug 2007 03:25:09 -0000	1.9
@@ -49,6 +49,12 @@
     ARG_FUNCTION2
 } as_arg_t;
 
+typedef enum {
+    ENCGUESS_UNICODE = 0,
+    ENCGUESS_JIS = 1,
+    ENCGUESS_OTHER = 2
+} as_encoding_guess_t;
+
 // @@strk@@ should we move this to .cpp file ? it's only
 // use is within SWFHandlers, anyway...
 typedef void (*action_callback_t)(ActionExec& thread);
@@ -154,6 +160,13 @@
 	static void CommonSetTarget(as_environment& env, 
 			const std::string& target_name);
 
+        /// Common code for guessing at the encoding of random text, between
+        // Shift-Jis, UTF8, and other. Puts the character count in length,
+        // and the offsets to the characters in offsets, if offsets is not NULL.
+        // If not NULL, offsets should be at least s.length().
+        // offsets are not accurate if the return value is GUESSENC_OTHER
+        static as_encoding_guess_t GuessEncoding(std::string& s, int& length, int *offsets);
+
 	static void ActionEnd(ActionExec& thread);
 	static void ActionNextFrame(ActionExec& thread);
 	static void ActionPrevFrame(ActionExec& thread);



From MAILER-DAEMON Mon Aug 20 02:38:10 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IN0tu-000161-8s
	for mharc-gnash-commit@gnu.org; Mon, 20 Aug 2007 02:38:10 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IN0ts-00015v-G3
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 02:38:08 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IN0tq-00015g-B9
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 02:38:07 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IN0tq-00015d-5Z
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 02:38:06 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <chadmusick@msbx.net>) id 1IN0to-0005o1-Vo
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 02:38:05 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <chadmusick@msbx.net>) id 1IN0tn-0005y8-Ki
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 06:38:03 +0000
Received: from cmusick by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <cmusick@savannah.gnu.org>) id 1IN0tn-0005y5-Aw
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 06:38:03 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IN0tn-0005y5-Aw@cvs.savannah.gnu.org>
From: Chad Musick <chadmusick@msbx.net>
Date: Mon, 20 Aug 2007 06:38:03 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/server swf.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Aug 2007 06:38:08 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Chad Musick <cmusick>	07/08/20 06:38:03

Modified files:
	server         : swf.h 

Log message:
	Added MING-compatible enum for all new actionscript 3 (abc) opcodes,
	with information about their functions.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf.h?cvsroot=gnash&r1=1.35&r2=1.36

Patches:
Index: swf.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- swf.h	9 Jul 2007 14:32:23 -0000	1.35
+++ swf.h	20 Aug 2007 06:38:02 -0000	1.36
@@ -483,8 +483,1180 @@
     ACTION_DEFINEFUNCTION          = 0x9B,
 
     ACTION_SETREGISTER             = 0x87
+
 } action_type;
 
+typedef enum
+{
+    /// AS3 Actions go below here.
+
+    /// Do: Enter the debugger if one has been invoked.
+    ABC_ACTION_BKPT                = 0x01,
+
+    /// Do: Nothing.
+    ABC_ACTION_NOP                 = 0x02,
+
+    /// Stack In:
+    ///  obj -- an object
+    /// Stack Out:
+    ///  .
+    /// Do: Throw obj as an exception
+    ABC_ACTION_THROW               = 0X03,
+
+    /// Stream:
+    ///  name_id -- V32 index to multiname 'name'
+    /// Stack In:
+    ///  obj -- an object
+    ///  [ns [n]] -- Namespace stuff.
+    /// Stack Out:
+    ///  super -- if obj.name is a method, the super of that method.
+    ///        -- if obj.name is write-only data, throw ReferenceError.
+    ///        -- if obj.name is readable, the return of the getter of super.
+    ABC_ACTION_GETSUPER            = 0X04,
+
+    /// Stream: UV32 index to multiname 'name'
+    /// Stack In:
+    ///  obj -- an object
+    ///  val -- an object
+    ///  [ns [n]] -- Namespace stuff.
+    /// Stack Out:
+    ///  .
+    /// Do: Make val the super of obj.name ; throw ReferenceError if obj.name is
+    ///  not writable.
+    ABC_ACTION_SETSUPER            = 0X05,
+
+    /// Dynamically eXtend Name Space?
+    /// Stream: UV32 index to string pool 'nsname'
+    /// Do: Create a new public namespace with name nsname, enter the namespace.
+    ABC_ACTION_DXNS                = 0X06,
+
+    /// Stack In:
+    ///  nsname -- a string object
+    /// Stack Out:
+    ///  .
+    /// Do: Create a new public namespace with name nsname, but don't enter it.
+    ABC_ACTION_DXNSLATE            = 0X07,
+
+    /// Stream: UV32 frame pointer offset 'offset'
+    /// Frame: 
+    ///  Kill at offset
+    ABC_ACTION_KILL                = 0X08,
+
+    /// Do: Unknown purpose, Tamarin does nothing.
+    ABC_ACTION_LABEL               = 0X09,
+
+    ABC_ACTION_0x0A                = 0X0A,
+    ABC_ACTION_0X0B                = 0X0B,
+
+    /// Stream: S24 jump offset 'jump'
+    /// Stack In:
+    ///  a -- an object
+    ///  b -- an object
+    /// Stack Out:
+    ///  .
+    /// Do: If !(a < b) move by jump in stream, as ABC_ACTION_JUMP does.
+    ABC_ACTION_IFNLT               = 0X0C,
+
+    /// Stream: S24 jump offset 'jump'
+    /// Stack In:
+    ///  a -- an object
+    ///  b -- an object
+    /// Stack Out:
+    ///  .
+    /// Do: If !(a <= b) move by jump in stream, as ABC_ACTION_JUMP does.
+    ABC_ACTION_IFNLE               = 0X0D,
+
+    /// Stream: S24 jump offset 'jump'
+    /// Stack In:
+    ///  a -- an object
+    ///  b -- an object
+    /// Stack Out:
+    ///  .
+    /// Do: If !(a > b) move by jump in stream, as ABC_ACTION_JUMP does.
+    ABC_ACTION_IFNGT               = 0X0E,
+
+    /// Stream: S24 jump offset 'jump'
+    /// Stack In:
+    ///  a -- an object
+    ///  b -- an object
+    /// Stack Out:
+    ///  .
+    /// Do: If !(a >= b) move by jump in stream, as ABC_ACTION_JUMP does.
+    ABC_ACTION_IFNGE               = 0X0F,
+
+    /// Stream: S24 jump offset 'jump'
+    /// Do: If jump is negative, check for interrupts. Move by jump in stream.
+    ABC_ACTION_JUMP                = 0X10,
+
+    /// Stream: S24 jump offset 'jump'
+    /// Stack In:
+    ///  a -- an object
+    /// Stack Out:
+    ///  .
+    /// Do: If a is 'true', move by jump in stream, as ABC_ACTION_JUMP does.
+    ABC_ACTION_IFTRUE              = 0X11,
+
+    /// Stream: S24 jump offset 'jump'
+    /// Stack In:
+    ///  a -- an object
+    /// Stack Out:
+    ///  .
+    /// Do: If a is 'false', move by jump in stream, as ABC_ACTION_JUMP does.
+    ABC_ACTION_IFFALSE             = 0X12,
+
+    /// Stream: S24 jump offset 'jump'
+    /// Stack In:
+    ///  a -- an object
+    ///  b -- an object
+    /// Stack Out:
+    ///  .
+    /// Do: If a == b (weakly), move by jump in stream, as ABC_ACTION_JUMP does.
+    ABC_ACTION_IFEQ                = 0x13,
+
+    /// Stream: S24 jump offset 'jump'
+    /// Stack In:
+    ///  a -- an object
+    ///  b -- an object
+    /// Stack Out:
+    ///  .
+    /// Do: If a != b (weakly), move by jump in stream, as ABC_ACTION_JUMP does.
+    ABC_ACTION_IFNE                = 0X14,
+
+    /// Stream: S24 jump offset 'jump'
+    /// Stack In:
+    ///  a -- an object
+    ///  b -- an object
+    /// Stack Out:
+    ///  .
+    /// Do: If a < b move by jump in stream, as ABC_ACTION_JUMP does.
+    ABC_ACTION_IFLT                = 0X15,
+    
+    /// Stream: S24 jump offset 'jump'
+    /// Stack In:
+    ///  a -- an object
+    ///  b -- an object
+    /// Stack Out:
+    ///  .
+    /// Do: If a <= b move by jump in stream, as ABC_ACTION_JUMP does.
+    ABC_ACTION_IFLE                 = 0x16,
+
+    /// Stream: S24 jump offset 'jump'
+    /// Stack In:
+    ///  a -- an object
+    ///  b -- an object
+    /// Stack Out:
+    ///  .
+    /// Do: If a > b move by jump in stream, as ABC_ACTION_JUMP does.
+    ABC_ACTION_IFGT                 = 0x17,
+
+    /// Stream: S24 jump offset 'jump'
+    /// Stack In:
+    ///  a -- an object
+    ///  b -- an object
+    /// Stack Out:
+    ///  .
+    /// Do: If a >= b move by jump in stream, as ABC_ACTION_JUMP does.
+    ABC_ACTION_IFGE                 = 0x18,
+
+    /// Stream: S24 jump offset 'jump'
+    /// Stack In:
+    ///  a -- an object
+    ///  b -- an object
+    /// Stack Out:
+    ///  .
+    /// Do: If a == b (strictly), move by jump in stream, as ABC_ACTION_JUMP
+    ABC_ACTION_IFSTRICTEQ           = 0x19,
+
+    /// Stream: S24 jump offset 'jump'
+    /// Stack In:
+    ///  a -- an object
+    ///  b -- an object
+    /// Stack Out:
+    ///  .
+    /// Do: If a != b (strongly), move by jump in stream, as ABC_ACTION_JUMP
+    ABC_ACTION_IFSTRICTNE           = 0x1A,
+
+    /// Stream: 3 bytes | V32 count as 'case_count - 1' | case_count of S24
+    ///  as 'cases'
+    /// Stack In:
+    ///  index -- an integer object
+    /// Stack Out:
+    ///  .
+    /// Do: If index >= case_count, reset stream to position on op entry.
+    ///  Otherwise, move by cases[index] - 1 from stream position on op entry.
+    ABC_ACTION_LOOKUPSWITCH         = 0x1B,
+
+    /// Stack In:
+    ///  scope -- a scope
+    /// Stack Out:
+    ///  .
+    /// Do: Enter scope with previous scope as its base, unless it already had
+    ///  a base, in which case leave that alone.
+    ABC_ACTION_PUSHWITH             = 0x1C,
+
+    /// Do: exit current scope. Clear the base if the depth is now 
+    ///  shallower than the base's depth.
+    ABC_ACTION_POPSCOPE             = 0x1D,
+
+    /// Stack In:
+    ///  obj -- an object
+    ///  index -- an integer object
+    /// Stack Out:
+    ///  name -- the key name at index in obj (not next after index).
+    /// Do: If obj is a namespace index 1 is the uri of the namespace, 
+    ///  index 2 is the prefix of the namespace, and any other value is a
+    ///  null string object. If obj is an immutable object, like a number,
+    ///  operate on its prototype instead. If there is no such index,
+    ///  name is null.
+    ABC_ACTION_NEXTNAME             = 0x1E,
+
+    /// Stack In:
+    ///  obj -- an object
+    ///  index -- an integer object
+    /// Stack Out:
+    ///  next_index -- next index after index in obj, or 0 if none.
+    /// Do: If there is a key/val pair after index, make next_index as it.
+    ///  Otherwise, make next_index 0.
+    ABC_ACTION_HASNEXT              = 0x1F,
+
+    /// Stack Out:
+    ///  n -- a Null object.
+    ABC_ACTION_PUSHNULL             = 0x20,
+
+    ///  n -- an Undefined object.
+    ABC_ACTION_PUSHUNDEFINED        = 0x21,
+
+    ABC_ACTION_0x22                 = 0x22,
+
+    /// Stack In:
+    ///  obj -- an object (namespaces okay)
+    ///  index -- an integer object
+    /// Stack Out:
+    ///  value -- the value of the key value pair in obj at index.
+    ABC_ACTION_NEXTVALUE            = 0x23,
+
+    /// Stream: S8 as 'byte'
+    /// Stack Out:
+    ///  byte -- as a raw byte
+    ABC_ACTION_PUSHBYTE             = 0x24,
+
+    /// Stream: V32 as 'value'
+    /// Stack Out:
+    ///  value -- as a raw integer
+    ABC_ACTION_PUSHSHORT            = 0x25,
+
+    /// Stack Out:
+    ///  true -- the True object
+    ABC_ACTION_PUSHTRUE             = 0x26,
+
+    /// Stack Out:
+    ///  false -- the False object
+    ABC_ACTION_PUSHFALSE            = 0x27,
+
+    /// Stack Out:
+    ///  NaN -- the NaN object
+    ABC_ACTION_PUSHNAN              = 0x28,
+
+    /// Stack In:
+    ///  a -- anything
+    /// Stack Out:
+    ///  .
+    ABC_ACTION_POP                  = 0x29,
+
+    /// Stack In:
+    ///  a -- anything
+    /// Stack Out:
+    ///  a
+    ///  a
+    ABC_ACTION_DUP                  = 0x2A,
+
+    /// Stack In:
+    ///  a -- anything
+    ///  b -- anything
+    /// Stack Out:
+    ///  b
+    ///  a
+    ABC_ACTION_SWAP                 = 0x2B,
+
+    /// Stream: V32 string pool index 'index'
+    /// Stack Out:
+    ///  value -- String object from string_pool[index]
+    ABC_ACTION_PUSHSTRING           = 0x2C,
+
+    /// Stream: V32 int pool index 'index'
+    /// Stack Out:
+    ///  value -- Integer object from integer_pool[index]
+    ABC_ACTION_PUSHINT              = 0x2D,
+
+    /// Stream: V32 uint pool index 'index'
+    /// Stack Out:
+    ///  value -- Unsigned Integer object from unsigned_integer_pool[index]
+    ABC_ACTION_PUSHUINT             = 0x2E,
+
+    /// Stream: V32 double pool index 'index'
+    /// Stack Out:
+    ///  value -- Double object from double_pool[index]
+    ABC_ACTION_PUSHDOUBLE           = 0x2F,
+
+    /// Stack In:
+    ///  scope -- a scope
+    /// Stack Out:
+    ///  .
+    /// Do: Enter scope without altering base.
+    ABC_ACTION_PUSHSCOPE            = 0x30,
+
+    /// Stream: V32 namespace pool index 'index'
+    /// Stack Out:
+    ///  ns -- Namespace object from namespace_pool[index]
+    ABC_ACTION_PUSHNAMESPACE        = 0x31,
+
+    /// Stream: V32 frame location 'objloc' | V32 frame location 'indexloc'
+    /// Stack Out:
+    ///  truth -- True if frame[objloc] has key/val pair after frame[indexloc],
+    ///   following delagates (__proto__) objects if needed. False, otherwise.
+    /// Frame:
+    ///  Change at objloc to object which possessed next value.
+    ///  Change at indexloc to index (as object) of the next value.
+    ABC_ACTION_HASNEXT2             = 0x32,
+
+    ABC_ACTION_0x33                 = 0x33,
+    ABC_ACTION_0x34                 = 0x34,
+    ABC_ACTION_0x35                 = 0x35,
+    ABC_ACTION_0x36                 = 0x36,
+    ABC_ACTION_0x37                 = 0x37,
+    ABC_ACTION_0x38                 = 0x38,
+    ABC_ACTION_0x39                 = 0x39,
+    ABC_ACTION_0x3A                 = 0x3A,
+    ABC_ACTION_0x3B                 = 0x3B,
+    ABC_ACTION_0x3C                 = 0x3C,
+    ABC_ACTION_0x3D                 = 0x3D,
+    ABC_ACTION_0x3E                 = 0x3E,
+    ABC_ACTION_0x3F                 = 0x3F,
+
+    /// Stream: V32 'index'
+    /// Stack Out:
+    ///  func -- the function object
+    /// Do: Information about function is in the pool at index. Construct the
+    ///  function from this information, current scope, and base of the scope.
+    ABC_ACTION_NEWFUNCTION          = 0x40,
+
+    /// Stream: V32 'arg_count'
+    /// Stack In:
+    ///  func -- the function to be called
+    ///  obj -- the object to which the function belongs
+    ///  arg1 ... argN -- the arg_count arguments to pass
+    /// Stack Out:
+    ///  value -- the value returned by obj->func(arg1, ...., argN)
+    ABC_ACTION_CALL                = 0x41,
+
+    /// Stream: V32 'arg_count'
+    /// Stack In:
+    ///  obj -- the object to be constructed
+    ///  arg1 ... argN -- the arg_count arguments to pass
+    /// Stack Out:
+    ///  value -- obj after it has been constructed as obj(arg1, ..., argN)
+    ABC_ACTION_CONSTRUCT           = 0x42,
+
+    /// Stream: V32 'method_id + 1' | V32 'arg_count'
+    /// Stack In:
+    ///  obj -- the object to be called
+    ///  arg1 ... argN -- the arg_count arguments to pass
+    /// Stack Out:
+    ///  value -- the value returned by obj::'method_id'(arg1, ..., argN)
+    ABC_ACTION_CALLMETHOD          = 0x43,
+
+    /// Stream: V32 'method_id' | V32 'arg_count'
+    /// Stack In:
+    ///  obj -- the object to act as a receiver for the static call
+    ///  arg1 ... argN -- the arg_count arguments to pass
+    /// Stack Out:
+    ///  value -- the value returned by obj->ABC::'method_id'(arg1, ..., argN)
+    ABC_ACTION_CALLSTATIC          = 0x44,
+
+    /// Stream: V32 'name_offset' | V32 'arg_count'
+    /// Stack In:
+    ///  obj -- the object whose super is to be called
+    ///  [ns [n]] -- Namespace stuff
+    ///  arg1 ... argN -- the arg_count arguments to pass
+    /// Stack Out:
+    ///  value -- the value returned by obj::(resolve)'name_offset'::super(arg1,
+    ///   ..., argN)
+    ABC_ACTION_CALLSUPER           = 0x45,
+
+    /// Stream: V32 'name_offset' | V32 'arg_count'
+    /// Stack In:
+    ///  obj -- The object whose property is to be accessed.
+    ///  [ns [n]] -- Namespace stuff
+    ///  arg1 ... argN -- the arg_count arguments to pass
+    /// Stack Out:
+    ///  value -- the value from obj::(resolve)'name_offset'(arg1, ..., argN)
+    /// NB: Calls getter/setter if they exist.
+    ABC_ACTION_CALLPROPERTY        = 0x46,
+
+    /// Do: Return an Undefined object up the callstack.
+    ABC_ACTION_RETURNVOID           = 0x47,
+
+    /// Stack In:
+    ///  value -- value to be returned
+    /// Stack Out:
+    ///  .
+    /// Do: Return value up the callstack.
+    ABC_ACTION_RETURNVALUE          = 0x48,
+
+    /// Stream: V32 'arg_count'
+    /// Stack In:
+    ///  obj -- the object whose super's constructor should be invoked
+    ///  arg1 ... argN -- the arg_count arguments
+    /// Stack Out:
+    ///  value -- obj after obj::super(arg1, ..., argN) has been invoked
+    ABC_ACTION_CONSTRUCTSUPER      = 0x49,
+
+    /// Stream: V32 'name_offset' | V32 'arg_count'
+    /// Stack In:
+    ///  obj -- the object whose property should be constructed
+    ///  [ns [n]] -- Namespace stuff
+    ///  arg1 ... argN -- the arg_count arguments to pass
+    /// Stack Out:
+    ///  value -- the newly constructed prop from obj::(resolve)
+    ///   'name_offset'(arg1, ..., argN)
+    ABC_ACTION_CONSTRUCTPROP       = 0x4A,
+
+    /// Do: Nothing, this is an intermediate code op, should not appear in ABC.
+    ABC_ACTION_CALLSUPERID          = 0x4B,
+
+    /// Stream: V32 'name_offset' | V32 'arg_count'
+    /// Stack In:
+    ///  obj -- The object whose property is to be accessed.
+    ///  [ns [n]] -- Namespace stuff
+    ///  arg1 ... argN -- the arg_count arguments to pass
+    /// Stack Out:
+    ///  value -- the value from by obj::(resolve)'name_offset'(arg1, ..., argN)
+    /// NB: It seems like this does _not_ call getter/setter if they exist,
+    ///  but is otherwise identical to ABC_ACTION_CALLPROPERTY
+    ABC_ACTION_CALLPROPLEX         = 0x4C,
+
+    /// Do: Nothing, this is an intermediate code op, should not appear in ABC.
+    ABC_ACTION_CALLINTERFACE        = 0x4D,
+
+    /// See: 0x45 (ABC_ACTION_CALLSUPER), but
+    /// Stack Out:
+    ///  .
+    ABC_ACTION_CALLSUPERVOID       = 0x4E,
+
+    /// See: 0x46 (ABC_ACTION_CALLPROPERTY), but
+    /// Stack Out:
+    ///  .
+    ABC_ACTION_CALLPROPVOID        = 0x4F,
+
+    ABC_ACTION_0x50                 = 0x50,
+    ABC_ACTION_0x51                 = 0x51,
+    ABC_ACTION_0x52                 = 0x52,
+    ABC_ACTION_0x53                 = 0x53,
+    ABC_ACTION_0x54                 = 0x54,
+
+    /// Stream: V32 'arg_count'
+    /// Stack In:
+    ///  prop_name_1 -- a string
+    ///  prop_value_1 -- a value object
+    ///  .
+    ///  . (arg_count name/value pairs in all)
+    ///  .
+    ///  prop_name_n -- a string
+    ///  prop_value_n -- a value object
+    /// Stack Out:
+    ///  obj -- A new object which contains all of the given properties.
+    /// NB: This builds an object from its properties, it's not a constructor.
+    ABC_ACTION_NEWOBJECT            = 0x55,
+
+    /// Stream: V32 'array_size'
+    /// Stack In:
+    ///  value_1 -- a value
+    ///  .
+    ///  . (array_size of these)
+    ///  .
+    ///  value_n -- a value
+    /// Stack Out:
+    ///  array -- an array { value_1, value_2, ..., value_n }
+    ABC_ACTION_NEWARRAY             = 0x56,
+
+    /// Stack Out:
+    ///  vtable -- A new virtual table, which has the previous one as a parent.
+    ABC_ACTION_NEWACTIVATION        = 0x57,
+
+    /// Stream: V32 'class_id'
+    /// Stack In:
+    ///  obj -- An object to be turned into a class
+    /// Stack Out:
+    ///  class -- The newly made class, made from obj and the information at
+    ///   cinits_pool[class_id]
+    /// NB: This depends on scope and scope base (to determine base class)
+    ABC_ACTION_NEWCLASS             = 0x58,
+
+    /// Stream: V32 'name_id'
+    /// Stack In:
+    ///  value -- Whose descendants to get
+    ///  [ns [n]] -- Namespace stuff
+    /// Stack Out:
+    ///  ?
+    /// NB: This op seems to always throw a TypeError in Tamarin, though I
+    /// assume that it ought to do something to yield a list of
+    /// descendants of a class.
+    ABC_ACTION_GETDESCENDANTS       = 0x59,
+
+    /// Stream: V32 'catch_id'
+    /// Stack Out:
+    ///  vtable -- vtable suitable to catch an exception of type in catch_id.
+    /// NB: Need more information on how exceptions are set up.
+    ABC_ACTION_NEWCATCH             = 0x5A,
+
+    ABC_ACTION_0x5B                 = 0x5B,
+    ABC_ACTION_0x5C                 = 0x5C,
+
+    /// Stream: V32 'name_id'
+    /// Stack In:
+    ///  [ns [n]] -- Namespace stuff
+    /// Stack Out:
+    ///  owner -- object which owns property given by looking up the name_id,
+    ///   or throw a ReferenceError if none exists.
+    ABC_ACTION_FINDPROPSTRICT       = 0x5D,
+
+    /// Stream: V32 'name_id'
+    /// Stack In:
+    ///  [ns [n]] -- Namespace stuff
+    /// Stack Out:
+    ///  owner -- object which owns property given by looking up the name_id,
+    ///   or an Undefined object if none exists.
+    ABC_ACTION_FINDPROPERTY         = 0x5E,
+
+    /// Stream: V32 'name_id' (no ns expansion)
+    /// Stack Out:
+    ///  def -- The definition of the name at name_id.
+    ABC_ACTION_FINDDEF              = 0x5F,
+
+    /// Stream: V32 'name_id' (no ns expansion)
+    /// Stack Out:
+    ///  property -- The result of 0x5D (ABC_ACTION_FINDPROPSTRICT)
+    ///   + 0x66 (ABC_ACTION_GETPROPERTY)
+    ABC_ACTION_GETLEX               = 0x60,
+
+    /// Stream: V32 'name_id'
+    /// Stack In:
+    ///  obj -- The object whose property is to be set
+    ///  [ns [n]] -- Namespace stuff
+    ///  [key] -- Key name for property. Will not have both Namespace and key.
+    ///  value -- The value to be used
+    /// Stack Out:
+    ///  .
+    /// Do: Set obj::(resolve)'name_id' to value, or set obj::key to value.
+    /// NB: I'm not yet clear which should be used when. (Chad)
+    ABC_ACTION_SETPROPERTY          = 0x61,
+
+    /// Stream: V32 'frame_index'
+    /// Frame: value at frame_index is needed
+    /// Stack Out:
+    ///  value
+    ABC_ACTION_GETLOCAL             = 0x62,
+
+    /// Stream: V32 'frame_index'
+    /// Frame: obj at frame_index is set to value
+    /// Stack In:
+    ///  value
+    /// Stack Out:
+    ///  .
+    ABC_ACTION_SETLOCAL             = 0x63,
+
+    /// Stack Out:
+    ///  global -- The global scope object
+    ABC_ACTION_GETGLOBALSCOPE       = 0x64,
+
+    /// Stream: S8 'depth'
+    /// Stack Out:
+    ///  scope -- The scope object at depth
+    ABC_ACTION_GETSCOPEOBJECT       = 0x65,
+
+    /// Stream: V32 'name_id'
+    /// Stack In:
+    ///  obj -- The object whose property is to be retrieved
+    ///  [ns [n]] -- Namespace stuff
+    ///  [key] -- Key name for property. Will not have both Namespace and key.
+    /// Stack Out:
+    ///  prop -- The requested property.
+    /// NB: As with 0x61 (ABC_ACTION_SETPROPERTY) it's unclear to me when
+    /// key gets used and when the namespace (or nothing) is used.
+    ABC_ACTION_GETPROPERTY          = 0x66,
+
+    ABC_ACTION_0x67                 = 0x67,
+
+    /// Stream V32 'name_id'
+    /// Stack In:
+    ///  obj -- The object whose property is to be initialized
+    ///  [ns [n]] -- Namespace stuff
+    ///  value -- The value to be put into the property.
+    /// Stack Out:
+    ///  .
+    /// Do:
+    ///  Set obj::(resolve)'name_id' to value, set bindings from the context.
+    ABC_ACTION_INITPROPERTY         = 0x68,
+
+    ABC_ACTION_0x69                 = 0x69,
+
+    /// Stream: V32 'name_id'
+    /// Stack In:
+    ///  obj -- The object whose property should be deleted.
+    ///  [ns [n]] -- Namespace stuff
+    /// Stack Out:
+    ///  truth -- True if property was deleted or did not exist, else False.
+    ABC_ACTION_DELETEPROPERTY       = 0x6A,
+
+    ABC_ACTION_0x6B                = 0x6B,
+
+    /// Stream: V32 'slot_index + 1'
+    /// Stack In:
+    ///  obj -- The object which owns the desired slot.
+    /// Stack Out:
+    ///  slot -- obj.slots[slot_index]
+    ABC_ACTION_GETSLOT              = 0x6C,
+
+    /// Stream: V32 'slot_index + 1'
+    /// Stack In:
+    ///  obj -- The object whose slot should be set.
+    ///  value -- The value intended for the slot.
+    /// Stack Out:
+    ///  .
+    /// Do: obj.slots[slot_index] = value
+    ABC_ACTION_SETSLOT              = 0x6D,
+
+    /// Stream: V32 'slot_index + 1'
+    /// Stack In:
+    ///  .
+    /// Stack Out:
+    ///  slot -- globals.slots[slot_index]
+    /// NB: Deprecated
+    ABC_ACTION_GETGLOBALSLOT        = 0x6E,
+
+    /// Stream: V32 'slot_index + 1'
+    /// Stack In:
+    ///  value -- The value to be placed into the slot.
+    /// Stack Out:
+    ///  .
+    /// Do: globals[slot_index] = value
+    /// NB: Deprecated
+    ABC_ACTION_SETGLOBALSLOT        = 0x6F,
+
+    /// Stack In:
+    ///  value -- An object
+    /// Stack Out:
+    ///  str_value -- value as a string
+    ABC_ACTION_CONVERT_S           = 0x70,
+
+    /// Stack In:
+    ///  value -- An object to be escaped
+    /// Stack Out:
+    ///  str_value -- value as a string, escaped suitably for an XML element.
+    ABC_ACTION_ESC_XELEM           = 0x71,
+
+    /// Stack In:
+    ///  value -- An object to be escaped
+    /// Stack Out:
+    ///  str_value -- value as a string, escaped suitably for an XML attribute.
+    ABC_ACTION_ESC_XATTR           = 0x72,
+
+    /// Stack In:
+    ///  value -- An object to be converted to Integer
+    /// Stack Out:
+    ///  int_value -- value as an integer object
+    ABC_ACTION_CONVERT_I           = 0x73,
+
+    /// Stack In:
+    ///  value -- An object to be converted to unsigned integer
+    /// Stack Out:
+    ///  int_value -- value as an unsigned integer object
+    ABC_ACTION_CONVERT_U           = 0X74,
+
+    /// Stack In:
+    ///  value -- An object to be converted to a double
+    /// Stack Out:
+    ///  double_value -- value as a double object
+    ABC_ACTION_CONVERT_D           = 0X75,
+
+    /// Stack In:
+    ///  value -- An object to be converted to a boolean
+    /// Stack Out:
+    ///  bool_value -- value as a boolean object
+    ABC_ACTION_CONVERT_B           = 0X76,
+
+    /// Stack In:
+    ///  obj -- An object
+    /// Stack Out:
+    ///  obj -- An object
+    /// Do: If obj is Undefined or Null, throw TypeError
+    ABC_ACTION_CONVERT_O           = 0X77,
+
+    /// Stack In:
+    ///  obj -- An object
+    /// Stack Out:
+    ///  obj -- An object
+    /// Do: If obj is not XML based, throw TypeError
+    ABC_ACTION_CHECKFILTER         = 0x78,
+
+    ABC_ACTION_0x79                = 0x79,
+    ABC_ACTION_0x7A                 = 0x7A,
+    ABC_ACTION_0x7B                 = 0x7B,
+    ABC_ACTION_0x7C                 = 0x7C,
+    ABC_ACTION_0x7D                 = 0x7D,
+    ABC_ACTION_0x7E                 = 0x7E,
+    ABC_ACTION_0x7F                 = 0x7F,
+
+    /// Stream: V32 'name_index'
+    /// Stack In:
+    ///  obj -- An object to be converted
+    /// Stack Out:
+    ///  coerced_obj -- The object as the desired (resolve)'name_index' type.
+    ABC_ACTION_COERCE              = 0x80,
+
+    /// See: 0x76 (ABC_ACTION_CONVERT_B)
+    /// NB: Deprecated
+    ABC_ACTION_COERCE_B             = 0x81,
+
+    /// Stack In:
+    ///  obj -- An object to be converted
+    /// Stack Out:
+    ///  obj
+    /// Do: Nothing. (The 'a' is for atom, and this already is.)
+    ABC_ACTION_COERCE_A            = 0x82,
+
+    /// See: 0x73 ABC_ACTION_CONVERT_I
+    /// NB: Deprecated
+    /// NOMING 20 Aug 2007
+    ABC_ACTION_COERCE_I            = 0x83,
+
+    /// See: 0x75 ABC_ACTION_CONVERT_D
+    /// NB: Deprecated
+    /// NOMING 20 Aug 2007
+    ABC_ACTION_COERCE_D            = 0x84,
+
+    /// Stack In:
+    ///  obj -- An object to be converted
+    /// Stack Out:
+    ///  str_obj -- obj as string. nullString object if obj is Null or Undefined
+    ABC_ACTION_COERCE_S            = 0x85,
+
+    /// Stream: V32 'name_index' (no namespace)
+    /// Stack In:
+    ///  obj -- An object to be checked
+    /// Stack Out:
+    ///  cobj -- obj if obj is of type (resolve)'name_index', otherwise Null
+    ABC_ACTION_ASTYPE              = 0x86,
+
+    /// Stack In:
+    ///  obj -- An object to be checked
+    ///  valid -- The object whose type is to be matched
+    /// Stack Out:
+    ///  cobj -- obj if type of obj is type of valid, otherwise Null
+    ABC_ACTION_ASTYPELATE          = 0x87,
+
+    /// See: 0x74 (ABC_ACTION_CONVERT_U)
+    /// NB: Deprecated
+    ABC_ACTION_COERCE_U             = 0x88,
+
+    /// Stack In:
+    ///  obj -- An object
+    /// Stack Out:
+    ///  cobj -- obj if obj is not Undefined, otherwise Null
+    ABC_ACTION_COERCE_O             = 0x89,
+
+    ABC_ACTION_0x8A                 = 0x8A,
+    ABC_ACTION_0x8B                 = 0x8B,
+    ABC_ACTION_0x8C                 = 0x8C,
+    ABC_ACTION_0x8D                 = 0x8D,
+    ABC_ACTION_0x8E                 = 0x8E,
+    ABC_ACTION_0x8F                 = 0x8F,
+
+    /// Stack In:
+    ///  obj -- An object
+    /// Stack Out:
+    ///  negdouble -- -1.0 * (double) obj
+    ABC_ACTION_NEGATE               = 0x90,
+
+    /// Stack In:
+    ///  num -- A number, integer or double
+    /// Stack Out:
+    ///  num2 -- The same value, but new object.
+    /// Do:
+    ///  num = num + 1 (post-increment)
+    ABC_ACTION_INCREMENT            = 0x91,
+
+    /// Stream: V32 'frame_addr'
+    /// Frame: Load i from frame_addr. Store clone(i) at frame_addr. i = i + 1
+    ///  (post-increment in frame)
+    ABC_ACTION_INCLOCAL             = 0x92,
+
+    /// Stack In:
+    ///  num -- A number, integer or double
+    /// Stack Out:
+    ///  num2 -- The same value, but new object.
+    /// Do:
+    ///  num = num - 1 (post-decrement)
+    ABC_ACTION_DECREMENT            = 0x93,
+
+    /// Stream: V32 'frame_addr'
+    /// Frame: Load i from frame_addr. Store clone(i) at frame_addr. i = i - 1
+    ///  (post-decrement in frame)
+    ABC_ACTION_DECLOCAL             = 0x94,
+
+    /// Stack In:
+    ///  obj -- An object
+    /// Stack Out:
+    ///  type -- typeof(obj)
+    ABC_ACTION_ABC_TYPEOF               = 0x95,
+
+    /// Stack In:
+    ///  obj -- An object
+    /// Stack Out:
+    ///  nobj -- A truth object with value !((Boolean) obj)
+    ABC_ACTION_NOT                  = 0x96,
+
+    /// Stack In:
+    ///  obj -- An object
+    /// Stack Out:
+    ///  nint -- ~((Int) obj)
+    ABC_ACTION_BITNOT              = 0x97,
+
+    ABC_ACTION_0x98                 = 0x98,
+    ABC_ACTION_0x99                 = 0x99,
+
+    /// NB: It is an error for this to appear.
+    ABC_ACTION_CONCAT               = 0x9A,
+
+    /// NB: It is an error for this to appear.
+    ABC_ACTION_ADD_D                = 0x9B,
+
+    ABC_ACTION_0x9C                 = 0x9C,
+    ABC_ACTION_0x9D                 = 0x9D,
+    ABC_ACTION_0x9E                 = 0x9E,
+    ABC_ACTION_0x9F                 = 0x9F,
+
+    /// Stack In:
+    /// a
+    /// b
+    /// Stack Out:
+    /// a + b (double if numeric)
+    ABC_ACTION_ADD		   = 0xA0,
+
+    /// Stack In:    /// Stack In:
+    ///  a
+    ///  b
+    /// Stack Out:
+    ///  a - b (double)
+    ABC_ACTION_SUBTRACT             = 0xA1,
+
+    /// Stack In:
+    ///  a
+    ///  b
+    /// Stack Out:
+    ///  a * b (double)
+    ABC_ACTION_MULTIPLY             = 0xA2,
+
+    /// Stack In:
+    ///  a
+    ///  b
+    /// Stack Out:
+    ///  a / b (double)
+    ABC_ACTION_DIVIDE               = 0xA3,
+
+    /// Stack In:
+    ///  a
+    ///  b
+    /// Stack Out:
+    ///  a % b
+    ABC_ACTION_MODULO               = 0xA4,
+
+    /// Stack In:
+    ///  a
+    ///  b
+    /// Stack Out:
+    ///  a << b
+    ABC_ACTION_LSHIFT               = 0xA5,
+
+    /// Stack In:
+    ///  a
+    ///  b
+    /// Stack Out:
+    ///  a >> b
+    ABC_ACTION_RSHIFT               = 0xA6,
+
+    /// Stack In:
+    ///  a
+    ///  b
+    /// Stack Out:
+    ///  ((unsigned) a) >> b
+    ABC_ACTION_URSHIFT              = 0xA7,
+
+    ///  a
+    ///  b
+    /// Stack Out:
+    ///  a & b
+    ABC_ACTION_BITAND              = 0xA8,
+
+    /// Stack In:
+    ///  a
+    ///  b
+    /// Stack Out:
+    ///  a | b
+    ABC_ACTION_BITOR               = 0xA9,
+
+    /// Stack In:
+    ///  a
+    ///  b
+    /// Stack Out:
+    ///  a ^ b
+    ABC_ACTION_BITXOR              = 0xAA,
+
+    /// Stack In:
+    ///  a
+    ///  b
+    /// Stack Out:
+    ///  truth -- Truth of (a == b) (weakly)
+    ABC_ACTION_EQUALS               = 0xAB,
+
+    /// Stack In:
+    ///  a
+    ///  b
+    /// Stack Out:
+    ///  truth -- Truth of (a == b) (strongly, as in 
+    ///   0x19 (ABC_ACTION_IFSTRICTEQ))
+    ABC_ACTION_STRICTEQUALS         = 0xAC,
+
+    /// Stack In:
+    ///  a
+    ///  b
+    /// Stack Out:
+    ///  truth -- Truth of (a < b)
+    ABC_ACTION_LESSTHAN             = 0xAD,
+
+    /// Stack In:
+    ///  a
+    ///  b
+    /// Stack Out:
+    ///  truth -- Truth of (a <= b)
+    ABC_ACTION_LESSEQUALS           = 0xAE,
+
+    /// Stack In:
+    ///  a
+    ///  b
+    /// Stack Out:
+    ///  truth -- Truth of (a > b)
+    ABC_ACTION_GREATERTHAN          = 0xAF,
+
+    /// Stack In:
+    ///  a
+    ///  b
+    /// Stack Out:
+    ///  truth -- Truth of (a >= b)
+    ABC_ACTION_GREATEREQUALS        = 0xB0,
+
+    /// Stack In:
+    ///  val -- An object
+    ///  super -- An object
+    /// Stack Out:
+    ///  truth -- Truth of "val is an instance of super"
+    ABC_ACTION_INSTANCEOF           = 0xB1,
+
+    /// Stream: V32 'name_id'
+    /// Stack In:
+    ///  obj -- An object
+    /// Stack Out:
+    ///  truth -- Truth of "obj is of the type given in (resolve)'name_id'"
+    ABC_ACTION_ISTYPE               = 0xB2,
+
+    /// Stack In:
+    ///  obj -- An object
+    ///  type -- A type to match
+    /// Stack Out:
+    ///  truth -- Truth of "obj is of type"
+    ABC_ACTION_ISTYPELATE           = 0xB3,
+
+    /// Stack In:
+    ///  name -- The name to find
+    ///  obj -- The object to search for it
+    /// Stack Out:
+    ///  truth -- True if name is in current namespace or anywhere in object.
+    ///   Don't look in the namespace if obj is a dictionary.
+    ABC_ACTION_IN                   = 0xB4,
+
+    ABC_ACTION_0xB5                 = 0xB5,
+    ABC_ACTION_0xB6                 = 0xB6,
+    ABC_ACTION_0xB7                 = 0xB7,
+    ABC_ACTION_0xB8                 = 0xB8,
+    ABC_ACTION_0xB9                 = 0xB9,
+    ABC_ACTION_0xBA                 = 0xBA,
+    ABC_ACTION_0xBB                 = 0xBB,
+    ABC_ACTION_0xBC                 = 0xBC,
+    ABC_ACTION_0xBD                 = 0xBD,
+    ABC_ACTION_0xBE                 = 0xBE,
+    ABC_ACTION_0xBF                 = 0xBF,
+
+    /// See: 0x91 (ABC_ACTION_INCREMENT), but forces types to int, not double
+    ABC_ACTION_INCREMENT_I          = 0xC0,
+
+    /// See: 0x93 (ABC_ACTION_DECREMENT), but forces types to int, not double
+    ABC_ACTION_DECREMENT_I          = 0xC1,
+
+    /// See: 0x92 (ABC_ACTION_INCLOCAL), but forces types to int, not double
+    ABC_ACTION_INCLOCAL_I           = 0xC2,
+
+    /// See: 0x94 (ABC_ACTION_DECLOCAL), but forces types to int, not double
+    ABC_ACTION_DECLOCAL_I           = 0xC3,
+
+    /// See: 0x90 (ABC_ACTION_NEGATE), but forces type to int, not double
+    ABC_ACTION_NEGATE_I             = 0xC4,
+
+    /// See: 0xA0 (ABC_ACTION_ADD), but forces type to int
+    ABC_ACTION_ADD_I                = 0xC5,
+
+    /// See: 0xA1 (ABC_ACTION_SUBTRACT), but forces type to int
+    ABC_ACTION_SUBTRACT_I           = 0xC6,
+
+    /// See: 0xA2 (ABC_ACTION_MULTIPLY), but forces type to int
+    ABC_ACTION_MULTIPLY_I           = 0xC7,
+
+    ABC_ACTION_0xC8                 = 0xC8,
+    ABC_ACTION_0xC9                 = 0xC9,
+    ABC_ACTION_0xCA                 = 0xCA,
+    ABC_ACTION_0xCB                 = 0xCB,
+    ABC_ACTION_0xCC                 = 0xCC,
+    ABC_ACTION_0xCD                 = 0xCD,
+    ABC_ACTION_0xCE                 = 0xCE,
+    ABC_ACTION_0xCF                 = 0xCF,
+
+    /// Frame: Load frame[0] as val
+    /// Stack Out:
+    ///  val
+    ABC_ACTION_GETLOCAL0            = 0xD0,
+
+    /// Frame: Load frame[1] as val
+    /// Stack Out:
+    ///  val
+    ABC_ACTION_GETLOCAL1            = 0xD1,
+
+    /// Frame: Load frame[2] as val
+    /// Stack Out:
+    ///  val
+    ABC_ACTION_GETLOCAL2            = 0xD2,
+
+    /// Frame: Load frame[3] as val
+    /// Stack Out:
+    ///  val
+    ABC_ACTION_GETLOCAL3            = 0xD3,
+
+    /// Frame: Store val as frame[0]
+    /// Stack In:
+    ///  val
+    /// Stack Out:
+    ///  .
+    ABC_ACTION_SETLOCAL0            = 0xD4,
+
+    /// Frame: Store val as frame[1]
+    /// Stack In:
+    ///  val
+    /// Stack Out:
+    ///  .
+    ABC_ACTION_SETLOCAL1            = 0xD5,
+
+    /// Frame: Store val as frame[2]
+    /// Stack In:
+    ///  val
+    /// Stack Out:
+    ///  .
+    ABC_ACTION_SETLOCAL2            = 0xD6,
+
+    /// Frame: Store val as frame[3]
+    /// Stack In:
+    ///  val
+    /// Stack Out:
+    ///  .
+    ABC_ACTION_SETLOCAL3            = 0xD7,
+
+    ABC_ACTION_0xD8                 = 0xD8,
+    ABC_ACTION_0xD9                 = 0xD9,
+    ABC_ACTION_0xDA                 = 0xDA,
+    ABC_ACTION_0xDB                 = 0xDB,
+    ABC_ACTION_0xDC                 = 0xDC,
+    ABC_ACTION_0xDD                 = 0xDD,
+    ABC_ACTION_0xDE                 = 0xDE,
+    ABC_ACTION_0xDF                 = 0xDF,
+    ABC_ACTION_0xE0                 = 0xE0,
+    ABC_ACTION_0xE1                 = 0xE1,
+    ABC_ACTION_0xE2                 = 0xE2,
+    ABC_ACTION_0xE3                 = 0xE3,
+    ABC_ACTION_0xE4                 = 0xE4,
+    ABC_ACTION_0xE5                 = 0xE5,
+    ABC_ACTION_0xE6                 = 0xE6,
+    ABC_ACTION_0xE7                 = 0xE7,
+    ABC_ACTION_0xE8                 = 0xE8,
+    ABC_ACTION_0xE9                 = 0xE9,
+    ABC_ACTION_0xEA                 = 0xEA,
+    ABC_ACTION_0xEB                 = 0xEB,
+    ABC_ACTION_0xEC                 = 0xEC,
+    ABC_ACTION_0xED                 = 0xED,
+
+    /// NB: It is an error for this to appear.
+    ABC_ACTION_ABS_JUMP             = 0xEE,
+
+    /// Stream: 7 bytes of unknown stuff to be skipped
+    /// Do: skip ahead 7 bytes in stream
+    ABC_ACTION_DEBUG                = 0xEF,
+
+    /// Stream: V32 'line_number'
+    /// Do: Nothing, but line_number is for the debugger if wanted.
+    ABC_ACTION_DEBUGLINE            = 0xF0,
+
+    /// Stream: V32 'name_offset'
+    /// Do: Nothing. 'name_offset' into string pool is the file name if wanted.
+    ABC_ACTION_DEBUGFILE            = 0xF1,
+
+    /// Stream: V32 'line_number'
+    /// Do: Enter debugger if present, line_number is the line number in source.
+    ABC_ACTION_BKPTLINE             = 0xF2,
+
+    /// Do: Nothing.
+    ABC_ACTION_TIMESTAMP            = 0xF3,
+
+    ABC_ACTION_0xF4                 = 0xF4,
+
+    /// NB: It seems an error for this to appear.
+    ABC_ACTION_VERIFYPASS           = 0xF5,
+
+    /// NB: Error to appear in ABC
+    ABC_ACTION_ALLOC                = 0xF6,
+
+    /// NB: Error to appear in ABC
+    ABC_ACTION_MARK                 = 0xF7,
+
+    /// NB: Error to appear in ABC
+    ABC_ACTION_WB                   = 0xF8,
+
+    /// NB: Error to appear in ABC
+    ABC_ACTION_PROLOGUE             = 0xF9,
+
+    /// NB: Error to appear in ABC
+    ABC_ACTION_SENDENTER            = 0xFA,
+
+    /// NB: Error to appear in ABC
+    ABC_ACTION_DOUBLETOATOM         = 0xFB,
+
+    /// NB: Error to appear in ABC
+    ABC_ACTION_SWEEP                = 0xFC,
+
+    /// NB: Error to appear in ABC
+    ABC_ACTION_CODEGENOP            = 0xFD,
+
+    /// NB: Error to appear in ABC
+    ABC_ACTION_VERIFYOP             = 0xFE
+
+} abc_action_type;
+
+
 /// SWF fill style types. Symbolic names copied from Ming.
 //
 /// For more info see:



From MAILER-DAEMON Mon Aug 20 03:28:10 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IN1gI-0000sr-5A
	for mharc-gnash-commit@gnu.org; Mon, 20 Aug 2007 03:28:10 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IN1gG-0000sl-Hd
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 03:28:08 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IN1gE-0000sV-St
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 03:28:08 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IN1gE-0000sS-9C
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 03:28:06 -0400
Received: from mx20.gnu.org ([199.232.41.8])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IN1gC-0006qK-P2
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 03:28:05 -0400
Received: from wa-out-1112.google.com ([209.85.146.179])
	by mx20.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1IN1gB-0003bz-8c
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 03:28:03 -0400
Received: by wa-out-1112.google.com with SMTP id j4so680233wah
	for <gnash-commit@gnu.org>; Mon, 20 Aug 2007 00:28:00 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=cOEgi7dM4EY7DIgY91GgShjx88/2GQbBXgiGwWnY/fN+f+DQ4xj7Gvi84vRQAX1RVxn4dfUAyw9C7ejReoWTTFkjjLSctLgD4zBi7wPTnuPY9Nwv8GXo2vQd4dSpTro3WjmwyuF3vIAjCc3pdtiYPl8iiAVoU43Q8n3m6T4nxSw=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=i0ZTdAvO2ULQLwlUJUH8XZVXBxtvVCXtuViV2xmNyUbqV4v27gvlwdSNjWZRO/KzYE8c0EnuxH8H6psgX0Ku1fjUr4Cw5xjqsTW2JLUfJzgQExVu846sDFbabY3yeybabb0xN/yOWkl4ogal3GeFK8c0CKs4wCpnCf0m2tYBVlc=
Received: by 10.114.174.2 with SMTP id w2mr592829wae.1187594880593;
	Mon, 20 Aug 2007 00:28:00 -0700 (PDT)
Received: by 10.114.110.5 with HTTP; Mon, 20 Aug 2007 00:28:00 -0700 (PDT)
Message-ID: <ca4b43ff0708200028q25209bb4v41cc67dc0a7fe938@mail.gmail.com>
Date: Mon, 20 Aug 2007 15:28:00 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "Chad Musick" <chadmusick@msbx.net>
Subject: Re: [Gnash-commit] gnash/server/vm ASHandlers.cpp ASHandlers.h
In-Reply-To: <E1IMxt8-0003P7-4n@cvs.savannah.gnu.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1IMxt8-0003P7-4n@cvs.savannah.gnu.org>
X-detected-kernel: Linux 2.6 (newer, 2)
X-Detected-Kernel: Linux 2.6, seldom 2.4 (older, 4)
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Aug 2007 07:28:08 -0000

>         Adding the multibyte string operators.  This behavior currently has
>         no testcases.

Any free compiler support these operators?


On 8/20/07, Chad Musick <chadmusick@msbx.net> wrote:
> CVSROOT:        /sources/gnash
> Module name:    gnash
> Changes by:     Chad Musick <cmusick>   07/08/20 03:25:10
>
> Modified files:
>         server/vm      : ASHandlers.cpp ASHandlers.h
>
> Log message:
>         Adding the multibyte string operators.  This behavior currently has
>         no testcases. There may be a more efficient way to know rather than
>         discover encoding, but I have not found it. These operators are
>         deprected since SWF 5.
>
> CVSWeb URLs:
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.122&r2=1.123
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.h?cvsroot=gnash&r1=1.8&r2=1.9
>
> Patches:
> Index: ASHandlers.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
> retrieving revision 1.122
> retrieving revision 1.123
> diff -u -b -r1.122 -r1.123
> --- ASHandlers.cpp      19 Aug 2007 22:50:16 -0000      1.122
> +++ ASHandlers.cpp      20 Aug 2007 03:25:09 -0000      1.123
> @@ -17,7 +17,7 @@
>  // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  //
>
> -/* $Id: ASHandlers.cpp,v 1.122 2007/08/19 22:50:16 strk Exp $ */
> +/* $Id: ASHandlers.cpp,v 1.123 2007/08/20 03:25:09 cmusick Exp $ */
>
>  #ifdef HAVE_CONFIG_H
>  #include "config.h"
> @@ -55,6 +55,7 @@
>  #include <set>
>  #include <vector>
>  #include <utility> // for std::pair
> +#include <locale.h>
>
>  using namespace std;
>
> @@ -1376,12 +1377,115 @@
>         env.top(0).set_int(tu_random::next_random() % max);
>  }
>
> +as_encoding_guess_t
> +SWFHandlers::GuessEncoding(std::string &str, int &length, int *offsets)
> +{
> +    const char *cstr = str.c_str();
> +    const char *i = cstr;
> +    int width = 0; // The remaining width, not the total.
> +    bool is_sought = true;
> +    int j;
> +    int index = 0;
> +
> +    length = 0;
> +    // First, assume it's UTF8 and try to be wrong.
> +    for (index = 0; is_sought && *i != '\0'; ++i, ++index)
> +    {
> +        j = static_cast<int> (*i);
> +
> +        if (width)
> +        {
> +            --width;
> +            if ((j & 0xB0) != 0x80)
> +                is_sought = false;
> +            continue;
> +        }
> +        ++length;
> +        *(offsets + length - 1) = index;
> +
> +        if ((j & 0xC0) == 0x80)
> +            continue; // A 1 byte character.
> +        else if ((j & 0xE0) == 0xC0)
> +            width = 1;
> +        else if ((j & 0xF0) == 0xE0)
> +            width = 2;
> +        else if ((j & 0xF8) == 0xF0)
> +            width = 3;
> +        else if (j & 0x80)
> +            is_sought = false;
> +    }
> +    *(offsets + length - 1) = index;
> +    if (!width && is_sought) // No width left, so it's almost certainly UTF8.
> +        return ENCGUESS_UNICODE;
> +
> +    is_sought = true;
> +    width = 0;
> +    length = 0;
> +    bool was_odd = true;
> +    bool was_even = true;
> +    // Now, assume it's SHIFT_JIS and try to be wrong.
> +    for (index = 0, i = cstr; is_sought && (*i != '\0'); ++i, ++index)
> +    {
> +        j = static_cast<int> (*i);
> +
> +        if (width)
> +        {
> +            --width;
> +            if ((j < 0x40) || ((j < 0x9F) && was_even) ||
> +                ((j > 0x9E) && was_odd) || (j == 0x7F))
> +            {
> +                is_sought = false;
> +            }
> +            continue;
> +        }
> +
> +        ++length;
> +        *(offsets + length - 1) = index;
> +
> +        if ((j == 0x80) || (j == 0xA0) || (j >= 0xF0))
> +        {
> +            is_sought = false;
> +            break;
> +        }
> +
> +        if (((j >= 0x81) && (j <= 0x9F)) || ((j >= 0xE0) && (j <= 0xEF)))
> +        {
> +            width = 1;
> +            was_odd = j & 0x01;
> +            was_even = !was_odd;
> +        }
> +
> +    }
> +    *(offsets + length - 1) = index;
> +    if (!width && is_sought) // No width left, so it's probably SHIFT_JIS.
> +        return ENCGUESS_JIS;
> +
> +    // It's something else.
> +    length = mbstowcs(NULL, cstr, 0);
> +    if (length == -1)
> +        length = strlen(cstr);
> +    return ENCGUESS_OTHER;
> +}
> +
>  void
> -SWFHandlers::ActionMbLength(ActionExec& /*thread*/)
> +SWFHandlers::ActionMbLength(ActionExec& thread)
>  {
>  //    GNASH_REPORT_FUNCTION;
> -//    as_environment& env = thread.env;
> -    log_unimpl (__PRETTY_FUNCTION__);
> +    as_environment& env = thread.env;
> +
> +    thread.ensureStack(1);
> +    string str = env.top(0).to_string(&env);
> +
> +    if (str.empty())
> +    {
> +        env.top(0).set_int(0);
> +    }
> +    else
> +    {
> +        int length;
> +        (void) GuessEncoding(str, length, NULL);
> +        env.top(0).set_int(length);
> +    }
>  }
>
>  void
> @@ -1423,11 +1527,76 @@
>  }
>
>  void
> -SWFHandlers::ActionMbSubString(ActionExec& /*thread*/)
> +SWFHandlers::ActionMbSubString(ActionExec& thread)
>  {
>  //    GNASH_REPORT_FUNCTION;
> -//    as_environment& env = thread.env;
> -    log_unimpl (__PRETTY_FUNCTION__);
> +    as_environment& env = thread.env;
> +
> +    thread.ensureStack(3);
> +
> +    int size = env.top(0).to_int(env);
> +    int start = env.top(1).to_int(env);
> +    as_value& string_val = env.top(2);
> +
> +    env.drop(2);
> +
> +    if (string_val.is_undefined() || string_val.is_null())
> +    {
> +        log_error(_("Undefined or null string passed to ActionMBSubString, "
> +            "returning undefined"));
> +        env.top(0).set_undefined();
> +        return;
> +    }
> +
> +    if (size < 1)
> +    {
> +        if (size < 0)
> +        {
> +            IF_VERBOSE_ASCODING_ERRORS(
> +            log_aserror(_("Length is less than 1 in ActionMbSubString, "
> +                "returning empty string."));
> +            );
> +        }
> +        env.top(0).set_string("");
> +        return;
> +    }
> +
> +    string str = string_val.to_string(&env);
> +    int length = 0;
> +    int offsets[str.length() + 1];
> +
> +    as_encoding_guess_t encoding = GuessEncoding(str, length, offsets);
> +
> +    if (start < 1)
> +    {
> +       IF_VERBOSE_ASCODING_ERRORS(
> +       log_aserror(_("Base is less then 1 in ActionMbSubString, "
> +               "setting to 1."));
> +       );
> +        start = 1;
> +    }
> +
> +    // Adjust the start for our own use.
> +    --start;
> +
> +    if (size + start - 1 > length)
> +    {
> +        IF_VERBOSE_ASCODING_ERRORS(
> +        log_aserror(_("base+size goes beyond input string in ActionMbSubString, "
> +            "adjusting size"));
> +        );
> +        size = length - start;
> +    }
> +
> +    if (encoding == ENCGUESS_OTHER)
> +    {
> +        env.top(0).set_string(str.substr(start, size));
> +    }
> +    else
> +    {
> +        env.top(0).set_string(str.substr(offsets[start], offsets[size] - offsets[start] + 1));
> +    }
> +    return;
>  }
>
>  void
> @@ -1439,11 +1608,26 @@
>  }
>
>  void
> -SWFHandlers::ActionMbChr(ActionExec& /*thread*/)
> +SWFHandlers::ActionMbChr(ActionExec& thread)
>  {
>  //    GNASH_REPORT_FUNCTION;
> -//    as_environment& env = thread.env;
> -    log_unimpl (__PRETTY_FUNCTION__);
> +//    The correctness of this depends on the locale being correct,
> +//    which it should be far more often than not, by choosing UTF8.
> +    as_environment& env = thread.env;
> +
> +    thread.ensureStack(1);
> +
> +    wchar_t i = static_cast<wchar_t> (env.top(0).to_int(env));
> +    char str[MB_CUR_MAX + 1];
> +    memset(str, '\0', MB_CUR_MAX + 1);
> +    if (wctomb(str, i) == -1)
> +    {
> +        env.top(0).set_undefined();
> +    }
> +    else
> +    {
> +        env.top(0).set_string(str);
> +    }
>  }
>
>  // also known as WaitForFrame2
>
> Index: ASHandlers.h
> ===================================================================
> RCS file: /sources/gnash/gnash/server/vm/ASHandlers.h,v
> retrieving revision 1.8
> retrieving revision 1.9
> diff -u -b -r1.8 -r1.9
> --- ASHandlers.h        1 Jul 2007 10:54:36 -0000       1.8
> +++ ASHandlers.h        20 Aug 2007 03:25:09 -0000      1.9
> @@ -49,6 +49,12 @@
>      ARG_FUNCTION2
>  } as_arg_t;
>
> +typedef enum {
> +    ENCGUESS_UNICODE = 0,
> +    ENCGUESS_JIS = 1,
> +    ENCGUESS_OTHER = 2
> +} as_encoding_guess_t;
> +
>  // @@strk@@ should we move this to .cpp file ? it's only
>  // use is within SWFHandlers, anyway...
>  typedef void (*action_callback_t)(ActionExec& thread);
> @@ -154,6 +160,13 @@
>         static void CommonSetTarget(as_environment& env,
>                         const std::string& target_name);
>
> +        /// Common code for guessing at the encoding of random text, between
> +        // Shift-Jis, UTF8, and other. Puts the character count in length,
> +        // and the offsets to the characters in offsets, if offsets is not NULL.
> +        // If not NULL, offsets should be at least s.length().
> +        // offsets are not accurate if the return value is GUESSENC_OTHER
> +        static as_encoding_guess_t GuessEncoding(std::string& s, int& length, int *offsets);
> +
>         static void ActionEnd(ActionExec& thread);
>         static void ActionNextFrame(ActionExec& thread);
>         static void ActionPrevFrame(ActionExec& thread);
>
>
> _______________________________________________
> Gnash-commit mailing list
> Gnash-commit@gnu.org
> http://lists.gnu.org/mailman/listinfo/gnash-commit
>



From MAILER-DAEMON Mon Aug 20 03:41:04 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IN1sm-0004Ad-0b
	for mharc-gnash-commit@gnu.org; Mon, 20 Aug 2007 03:41:04 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IN1sk-0004AU-TS
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 03:41:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IN1si-00049k-PJ
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 03:41:02 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IN1si-00049W-MA
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 03:41:00 -0400
Received: from g78.mailsnare.net ([209.236.228.78] helo=mail.mailsnare.net)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <chadmusick@msbx.net>) id 1IN1sh-0000TA-Bk
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 03:40:59 -0400
X-Virus-Scanned: by ClamAV at mailsnare.net
X-Message-ID: 00ff702db0dc1113dba21d7ff9204a39d6a357911d59be81
Received: from [192.168.1.100] (unknown [222.229.211.188])
	by mail.mailsnare.net (Postfix) with ESMTP id 521C07AA14;
	Mon, 20 Aug 2007 07:40:53 +0000 (UTC)
Subject: Re: [Gnash-commit] gnash/server/vm ASHandlers.cpp ASHandlers.h
From: Chad Musick <chadmusick@msbx.net>
To: zou lunkai <zoulunkai@gmail.com>
In-Reply-To: <ca4b43ff0708200028q25209bb4v41cc67dc0a7fe938@mail.gmail.com>
References: <E1IMxt8-0003P7-4n@cvs.savannah.gnu.org>
	<ca4b43ff0708200028q25209bb4v41cc67dc0a7fe938@mail.gmail.com>
Content-Type: text/plain
Date: Mon, 20 Aug 2007 16:41:02 +0900
Message-Id: <1187595662.6191.87.camel@ubuntu.sys76.lan>
Mime-Version: 1.0
X-Mailer: Evolution 2.10.1 
Content-Transfer-Encoding: 7bit
X-Detected-Kernel: Linux 2.6 (newer, 3)
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Aug 2007 07:41:03 -0000

On Mon, 2007-08-20 at 15:28 +0800, zou lunkai wrote:
> 
> Any free compiler support these operators? 

Not that I have found.

Chad





From MAILER-DAEMON Mon Aug 20 04:45:23 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IN2t0-0004qA-SN
	for mharc-gnash-commit@gnu.org; Mon, 20 Aug 2007 04:45:22 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IN2sz-0004q5-4X
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 04:45:21 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IN2sy-0004pQ-8Y
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 04:45:20 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IN2sy-0004p8-1z
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 04:45:20 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1IN2sw-0003er-8P
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 04:45:18 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l7K8j5x80863;
	Mon, 20 Aug 2007 10:45:05 +0200 (CEST)
	(envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Mon, 20 Aug 2007 10:45:05 +0200
To: Chad Musick <chadmusick@msbx.net>
Subject: Re: [Gnash-commit] gnash/server/vm ASHandlers.cpp ASHandlers.h
Message-ID: <20070820084505.GB70316@keybit.net>
Mail-Followup-To: Chad Musick <chadmusick@msbx.net>, gnash-commit@gnu.org
References: <E1IMxt8-0003P7-4n@cvs.savannah.gnu.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1IMxt8-0003P7-4n@cvs.savannah.gnu.org>
X-Detected-Kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Aug 2007 08:45:21 -0000

On Mon, Aug 20, 2007 at 03:25:10AM +0000, Chad Musick wrote:
> CVSROOT:	/sources/gnash
> Module name:	gnash
> Changes by:	Chad Musick <cmusick>	07/08/20 03:25:10
> 
> Modified files:
> 	server/vm      : ASHandlers.cpp ASHandlers.h 

Chad, please update the ChangeLog with any commit. We're doing that manually.

--strk;




From MAILER-DAEMON Mon Aug 20 06:39:31 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IN4fT-0001Ot-Dg
	for mharc-gnash-commit@gnu.org; Mon, 20 Aug 2007 06:39:31 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IN4fR-0001N2-0g
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 06:39:29 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IN4fP-0001Lz-IK
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 06:39:28 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IN4fP-0001Ln-6N
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 06:39:27 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IN4fN-0006IN-0a
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 06:39:25 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IN4fM-0005pT-5K
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 10:39:24 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IN4fL-0005pQ-WC
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 10:39:24 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IN4fL-0005pQ-WC@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 20 Aug 2007 10:39:24 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog libbase/log.cpp testsuite/libba...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Aug 2007 10:39:29 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/20 10:39:23

Modified files:
	.              : ChangeLog 
	libbase        : log.cpp 
	testsuite/libbase: TCXXRc.cpp gnashrc.in 

Log message:
	        * testsuite/libbase/: TCXXRc.cpp, gnashrc.in:
	          Test 'set debuglog' directive.
	
	Patch #6158 (reviewed) by Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>:
	
	        * libbase/log.cpp: fix 'set debuglog' directive.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4042&r2=1.4043
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.cpp?cvsroot=gnash&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libbase/TCXXRc.cpp?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libbase/gnashrc.in?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4042
retrieving revision 1.4043
diff -u -b -r1.4042 -r1.4043
--- ChangeLog	19 Aug 2007 23:34:54 -0000	1.4042
+++ ChangeLog	20 Aug 2007 10:39:23 -0000	1.4043
@@ -1,5 +1,14 @@
 2007-08-19 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/libbase/: TCXXRc.cpp, gnashrc.in:
+	  Test 'set debuglog' directive.
+
+2007-08-19 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
+
+	* libbase/log.cpp: fix 'set debuglog' directive.
+
+2007-08-19 Sandro Santilli <strk@keybit.net>
+
 	* testsuite/actionscript.all/ops.as: test that NaN and undefined are
 	  not less one other.
 	* server/vm/ASHandlers.cpp (ActionGetVariables): simplify debugging

Index: libbase/log.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- libbase/log.cpp	18 Aug 2007 13:45:20 -0000	1.55
+++ libbase/log.cpp	20 Aug 2007 10:39:23 -0000	1.56
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: log.cpp,v 1.55 2007/08/18 13:45:20 strk Exp $ */
+/* $Id: log.cpp,v 1.56 2007/08/20 10:39:23 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -364,10 +364,16 @@
     loadfile = "/tmp/";
     loadfile += DEFAULT_LOGFILE;
 # else
-    loadfile = DEFAULT_LOGFILE;
+
+    RcInitFile& rcfile = RcInitFile::getDefaultInstance();
+    loadfile = rcfile.getDebugLog();
+    if ( loadfile.empty() ) loadfile = DEFAULT_LOGFILE;
+
 # endif
 #endif
 
+    // TODO: expand ~ to getenv("HOME") !!
+
     _outstream.open (loadfile.c_str(), ios::out);
     _filespec = loadfile;
     _state = OPEN;

Index: testsuite/libbase/TCXXRc.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libbase/TCXXRc.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- testsuite/libbase/TCXXRc.cpp	19 Aug 2007 20:01:13 -0000	1.15
+++ testsuite/libbase/TCXXRc.cpp	20 Aug 2007 10:39:23 -0000	1.16
@@ -164,6 +164,12 @@
         runtest.fail ("getFlashVersionString");
     }
 
+    if (rc.getDebugLog() == "/tmp/gnash-dbg.log") {
+        runtest.pass ("getDebugLog");
+    } else {
+        runtest.fail ("getDebugLog");
+    }
+
     if (rc.startStopped() == 1) {
         runtest.pass ("startStopped");
     } else {

Index: testsuite/libbase/gnashrc.in
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libbase/gnashrc.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- testsuite/libbase/gnashrc.in	19 Aug 2007 20:01:13 -0000	1.6
+++ testsuite/libbase/gnashrc.in	20 Aug 2007 10:39:23 -0000	1.7
@@ -26,7 +26,7 @@
 set parserDump off
 
 # The full path to the debug log
-set debuglog ~/gnash-dbg.log
+set debuglog /tmp/gnash-dbg.log
 
 # Version string to pass to ActionScript
 set flashVersionString GSH 9,0,99,0



From MAILER-DAEMON Mon Aug 20 06:48:33 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IN4oD-0005rs-Oz
	for mharc-gnash-commit@gnu.org; Mon, 20 Aug 2007 06:48:33 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IN4oB-0005pT-UR
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 06:48:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IN4oB-0005o5-1i
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 06:48:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IN4oA-0005nn-SG
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 06:48:30 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IN4o8-0007ma-KK
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 06:48:28 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IN4o8-0007Bx-7H
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 10:48:28 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IN4o8-0007Bu-2W
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 10:48:28 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IN4o8-0007Bu-2W@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 20 Aug 2007 10:48:28 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog libbase/log.cpp testsuite/libba...
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Aug 2007 10:48:32 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/20 10:48:27

Modified files:
	.              : ChangeLog 
	libbase        : log.cpp 
	testsuite/libbase: TCXXRc.cpp gnashrc.in 

Log message:
		* testsuite/libbase/: TCXXRc.cpp, gnashrc.in:
		  Test 'set debuglog' directive.
	
	Patch #6158 (reviewed) by Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>:
	
		* libbase/log.cpp: fix 'set debuglog' directive.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.43&r2=1.3971.2.44
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.54&r2=1.54.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libbase/TCXXRc.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.14.2.1&r2=1.14.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libbase/gnashrc.in?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.5.6.1&r2=1.5.6.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.43
retrieving revision 1.3971.2.44
diff -u -b -r1.3971.2.43 -r1.3971.2.44
--- ChangeLog	19 Aug 2007 22:55:36 -0000	1.3971.2.43
+++ ChangeLog	20 Aug 2007 10:48:26 -0000	1.3971.2.44
@@ -1,5 +1,14 @@
 2007-08-19 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/libbase/: TCXXRc.cpp, gnashrc.in:
+	  Test 'set debuglog' directive.
+
+2007-08-19 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
+
+	* libbase/log.cpp: fix 'set debuglog' directive.
+
+2007-08-19 Sandro Santilli <strk@keybit.net>
+
 	* server/vm/ASHandlers.cpp (ActionGetVariables): simplify debugging
 	  output.
 

Index: libbase/log.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.cpp,v
retrieving revision 1.54
retrieving revision 1.54.2.1
diff -u -b -r1.54 -r1.54.2.1
--- libbase/log.cpp	1 Jul 2007 10:54:09 -0000	1.54
+++ libbase/log.cpp	20 Aug 2007 10:48:27 -0000	1.54.2.1
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: log.cpp,v 1.54 2007/07/01 10:54:09 bjacques Exp $ */
+/* $Id: log.cpp,v 1.54.2.1 2007/08/20 10:48:27 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -364,10 +364,16 @@
     loadfile = "/tmp/";
     loadfile += DEFAULT_LOGFILE;
 # else
-    loadfile = DEFAULT_LOGFILE;
+
+    RcInitFile& rcfile = RcInitFile::getDefaultInstance();
+    loadfile = rcfile.getDebugLog();
+    if ( loadfile.empty() ) loadfile = DEFAULT_LOGFILE;
+
 # endif
 #endif
 
+    // TODO: expand ~ to getenv("HOME") !!
+
     _outstream.open (loadfile.c_str(), ios::out);
     _filespec = loadfile;
     _state = OPEN;

Index: testsuite/libbase/TCXXRc.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libbase/TCXXRc.cpp,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -u -b -r1.14.2.1 -r1.14.2.2
--- testsuite/libbase/TCXXRc.cpp	19 Aug 2007 20:22:04 -0000	1.14.2.1
+++ testsuite/libbase/TCXXRc.cpp	20 Aug 2007 10:48:27 -0000	1.14.2.2
@@ -164,6 +164,12 @@
         runtest.fail ("getFlashVersionString");
     }
 
+    if (rc.getDebugLog() == "/tmp/gnash-dbg.log") {
+        runtest.pass ("getDebugLog");
+    } else {
+        runtest.fail ("getDebugLog");
+    }
+
     if (rc.startStopped() == 1) {
         runtest.pass ("startStopped");
     } else {

Index: testsuite/libbase/gnashrc.in
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libbase/gnashrc.in,v
retrieving revision 1.5.6.1
retrieving revision 1.5.6.2
diff -u -b -r1.5.6.1 -r1.5.6.2
--- testsuite/libbase/gnashrc.in	19 Aug 2007 20:22:04 -0000	1.5.6.1
+++ testsuite/libbase/gnashrc.in	20 Aug 2007 10:48:27 -0000	1.5.6.2
@@ -26,7 +26,7 @@
 set parserDump off
 
 # The full path to the debug log
-set debuglog ~/gnash-dbg.log
+set debuglog /tmp/gnash-dbg.log
 
 # Version string to pass to ActionScript
 set flashVersionString GSH 9,0,99,0



From MAILER-DAEMON Mon Aug 20 07:13:20 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IN5CC-0007qa-0j
	for mharc-gnash-commit@gnu.org; Mon, 20 Aug 2007 07:13:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IN5C6-0007dx-Vd
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 07:13:15 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IN5C4-0007Ye-1R
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 07:13:12 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IN5C3-0007Xx-GJ
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 07:13:11 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IN5C1-0003If-1c
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 07:13:09 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IN5C0-0008OS-05
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 11:13:08 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IN5Bz-0008OL-Rt
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 11:13:07 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IN5Bz-0008OL-Rt@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 20 Aug 2007 11:13:07 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-mtasc.all/Makefi...
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Aug 2007 11:13:17 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/20 11:13:07

Modified files:
	.              : ChangeLog 
	testsuite/misc-mtasc.all: Makefile.am 

Log message:
	Patch by Asger Ottar Alstrup <asger@area9.dk>:
	
	 * testsuite/misc-mtasc.all/: Makefile.am, exception.as:
	   Test for try/catch (gnash fails).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.44&r2=1.3971.2.45
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-mtasc.all/Makefile.am?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.13&r2=1.13.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.44
retrieving revision 1.3971.2.45
diff -u -b -r1.3971.2.44 -r1.3971.2.45
--- ChangeLog	20 Aug 2007 10:48:26 -0000	1.3971.2.44
+++ ChangeLog	20 Aug 2007 11:13:06 -0000	1.3971.2.45
@@ -1,9 +1,14 @@
-2007-08-19 Sandro Santilli <strk@keybit.net>
+2007-08-20 Asger Ottar Alstrup <asger@area9.dk>
+
+	* testsuite/misc-mtasc.all/: Makefile.am, exception.as:
+	  Test for try/catch (gnash fails).
+
+2007-08-20 Sandro Santilli <strk@keybit.net>
 
 	* testsuite/libbase/: TCXXRc.cpp, gnashrc.in:
 	  Test 'set debuglog' directive.
 
-2007-08-19 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
+2007-08-20 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
 
 	* libbase/log.cpp: fix 'set debuglog' directive.
 

Index: testsuite/misc-mtasc.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-mtasc.all/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -b -r1.13 -r1.13.2.1
--- testsuite/misc-mtasc.all/Makefile.am	28 Jul 2007 12:58:09 -0000	1.13
+++ testsuite/misc-mtasc.all/Makefile.am	20 Aug 2007 11:13:07 -0000	1.13.2.1
@@ -24,6 +24,7 @@
 	inheritance.as \
 	function.as \
 	enum.as \
+	exception.as \
 	levels.as \
 	$(NULL)
 



From MAILER-DAEMON Mon Aug 20 07:13:24 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IN5CG-0007yn-63
	for mharc-gnash-commit@gnu.org; Mon, 20 Aug 2007 07:13:24 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IN5CE-0007v0-0D
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 07:13:22 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IN5CD-0007tC-0M
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 07:13:21 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IN5CC-0007sU-TW
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 07:13:20 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IN5CA-0003Kf-Dv
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 07:13:18 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IN5CA-0008Rw-0Q
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 11:13:18 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IN5C9-0008Rq-SN
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 11:13:17 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IN5C9-0008Rq-SN@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 20 Aug 2007 11:13:17 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-mtasc.all/Makefi...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Aug 2007 11:13:22 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/20 11:13:17

Modified files:
	.              : ChangeLog 
	testsuite/misc-mtasc.all: Makefile.am 
Added files:
	testsuite/misc-mtasc.all: exception.as 

Log message:
	Patch by Asger Ottar Alstrup <asger@area9.dk>:
	
	 * testsuite/misc-mtasc.all/: Makefile.am, exception.as:
	   Test for try/catch (gnash fails).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4043&r2=1.4044
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-mtasc.all/Makefile.am?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-mtasc.all/exception.as?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4043
retrieving revision 1.4044
diff -u -b -r1.4043 -r1.4044
--- ChangeLog	20 Aug 2007 10:39:23 -0000	1.4043
+++ ChangeLog	20 Aug 2007 11:13:17 -0000	1.4044
@@ -1,9 +1,14 @@
-2007-08-19 Sandro Santilli <strk@keybit.net>
+2007-08-20 Asger Ottar Alstrup <asger@area9.dk>
+
+	* testsuite/misc-mtasc.all/: Makefile.am, exception.as:
+	  Test for try/catch (gnash fails).
+
+2007-08-20 Sandro Santilli <strk@keybit.net>
 
 	* testsuite/libbase/: TCXXRc.cpp, gnashrc.in:
 	  Test 'set debuglog' directive.
 
-2007-08-19 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
+2007-08-20 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
 
 	* libbase/log.cpp: fix 'set debuglog' directive.
 

Index: testsuite/misc-mtasc.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-mtasc.all/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- testsuite/misc-mtasc.all/Makefile.am	28 Jul 2007 12:58:09 -0000	1.13
+++ testsuite/misc-mtasc.all/Makefile.am	20 Aug 2007 11:13:17 -0000	1.14
@@ -24,6 +24,7 @@
 	inheritance.as \
 	function.as \
 	enum.as \
+	exception.as \
 	levels.as \
 	$(NULL)
 

Index: testsuite/misc-mtasc.all/exception.as
===================================================================
RCS file: testsuite/misc-mtasc.all/exception.as
diff -N testsuite/misc-mtasc.all/exception.as
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-mtasc.all/exception.as	20 Aug 2007 11:13:17 -0000	1.1
@@ -0,0 +1,57 @@
+// exception.as - MTASC testcase for try/catch 
+//
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
+//
+// Original author: Asger Ottar Alstrup <asger@area9.dk>
+//
+
+#include "check.as"
+
+// This movie tests exceptions
+
+class Test 
+{
+
+	// constructor
+	function Test()
+	{
+		note("Test constructor called");
+	}
+
+	function test_all()
+	{
+		var res;
+		try {
+			throw(1);
+			res = 0;
+		} catch (e) {
+			res = e;
+		}
+
+		xcheck_equals(res, 1);
+	}
+
+	static function main(mc)
+	{
+		var myTest = new Test;
+		myTest.test_all();
+
+                Dejagnu.done();
+	}
+
+}



From MAILER-DAEMON Mon Aug 20 07:13:46 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IN5Cc-0000MK-Be
	for mharc-gnash-commit@gnu.org; Mon, 20 Aug 2007 07:13:46 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IN5Cb-0000Jt-G2
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 07:13:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IN5Ca-0000Ia-RK
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 07:13:45 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IN5Ca-0000IF-O8
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 07:13:44 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IN5CY-0003PW-GO
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 07:13:42 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IN5CY-00006w-3O
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 11:13:42 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IN5CX-00006p-Uc
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 11:13:42 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IN5CX-00006p-Uc@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 20 Aug 2007 11:13:41 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/testsuite/misc-mtasc.all exception.as
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Aug 2007 11:13:45 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/20 11:13:41

Added files:
	testsuite/misc-mtasc.all: exception.as 

Log message:
	Ops, forgot to add this

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-mtasc.all/exception.as?cvsroot=gnash&only_with_tag=release_0_8_1&rev=1.1.2.2

Patches:
Index: exception.as
===================================================================
RCS file: exception.as
diff -N exception.as
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ exception.as	20 Aug 2007 11:13:41 -0000	1.1.2.2
@@ -0,0 +1,57 @@
+// exception.as - MTASC testcase for try/catch 
+//
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
+//
+// Original author: Asger Ottar Alstrup <asger@area9.dk>
+//
+
+#include "check.as"
+
+// This movie tests exceptions
+
+class Test 
+{
+
+	// constructor
+	function Test()
+	{
+		note("Test constructor called");
+	}
+
+	function test_all()
+	{
+		var res;
+		try {
+			throw(1);
+			res = 0;
+		} catch (e) {
+			res = e;
+		}
+
+		xcheck_equals(res, 1);
+	}
+
+	static function main(mc)
+	{
+		var myTest = new Test;
+		myTest.test_all();
+
+                Dejagnu.done();
+	}
+
+}



From MAILER-DAEMON Mon Aug 20 11:15:37 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IN8yf-00056W-He
	for mharc-gnash-commit@gnu.org; Mon, 20 Aug 2007 11:15:37 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IN8yd-00053B-Tv
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 11:15:35 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IN8yb-00051N-QU
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 11:15:34 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IN8yb-000511-KF
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 11:15:33 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IN8ya-00005t-Ih
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 11:15:32 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IN8yY-0001YV-P4
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 15:15:30 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IN8yY-0001YL-5p
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 15:15:30 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IN8yY-0001YL-5p@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 20 Aug 2007 15:15:30 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/vm/ExecutableCode.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Aug 2007 15:15:36 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/20 15:15:29

Modified files:
	.              : ChangeLog 
	server/vm      : ExecutableCode.h 

Log message:
	        * server/vm/ExecutableCode.h (FunctionCode::markReachableResources):
	          Don't mark the function twice, and most importantly don't forget
	          to mark the target character !!

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4044&r2=1.4045
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ExecutableCode.h?cvsroot=gnash&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4044
retrieving revision 1.4045
diff -u -b -r1.4044 -r1.4045
--- ChangeLog	20 Aug 2007 11:13:17 -0000	1.4044
+++ ChangeLog	20 Aug 2007 15:15:28 -0000	1.4045
@@ -1,3 +1,9 @@
+2007-08-20 Sandro Santilli <strk@keybit.net>
+
+	* server/vm/ExecutableCode.h (FunctionCode::markReachableResources):
+	  Don't mark the function twice, and most importantly don't forget
+	  to mark the target character !!
+
 2007-08-20 Asger Ottar Alstrup <asger@area9.dk>
 
 	* testsuite/misc-mtasc.all/: Makefile.am, exception.as:

Index: server/vm/ExecutableCode.h
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ExecutableCode.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/vm/ExecutableCode.h	1 Jul 2007 10:54:36 -0000	1.7
+++ server/vm/ExecutableCode.h	20 Aug 2007 15:15:29 -0000	1.8
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: ExecutableCode.h,v 1.7 2007/07/01 10:54:36 bjacques Exp $ */
+/* $Id: ExecutableCode.h,v 1.8 2007/08/20 15:15:29 strk Exp $ */
 
 #ifndef GNASH_EXECUTABLECODE_H
 #define GNASH_EXECUTABLECODE_H
@@ -205,7 +205,7 @@
 	virtual void markReachableResources() const
 	{
 		if ( func ) func->setReachable();
-		if ( func ) func->setReachable();
+		if ( target ) target->setReachable();
 	}
 #endif // GNASU_USE_GC
 



From MAILER-DAEMON Mon Aug 20 11:28:30 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IN9B8-0007ML-UJ
	for mharc-gnash-commit@gnu.org; Mon, 20 Aug 2007 11:28:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IN9B7-0007Lq-Ni
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 11:28:29 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IN9B7-0007LR-4e
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 11:28:29 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IN9B7-0007LO-1o
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 11:28:29 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IN9B6-0003yK-5h
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 11:28:28 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IN9B4-00021t-Mm
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 15:28:26 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IN9B4-00021q-Aw
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 15:28:26 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IN9B4-00021q-Aw@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 20 Aug 2007 15:28:26 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/vm/ExecutableCode.h
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Aug 2007 15:28:29 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/20 15:28:26

Modified files:
	.              : ChangeLog 
	server/vm      : ExecutableCode.h 

Log message:
	        * server/vm/ExecutableCode.h (FunctionCode::markReachableResources):
	          Don't mark the function twice, and most importantly don't forget
	          to mark the target character !!

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.45&r2=1.3971.2.46
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ExecutableCode.h?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.7&r2=1.7.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.45
retrieving revision 1.3971.2.46
diff -u -b -r1.3971.2.45 -r1.3971.2.46
--- ChangeLog	20 Aug 2007 11:13:06 -0000	1.3971.2.45
+++ ChangeLog	20 Aug 2007 15:28:25 -0000	1.3971.2.46
@@ -1,3 +1,9 @@
+2007-08-20 Sandro Santilli <strk@keybit.net>
+
+	* server/vm/ExecutableCode.h (FunctionCode::markReachableResources):
+	  Don't mark the function twice, and most importantly don't forget
+	  to mark the target character !!
+
 2007-08-20 Asger Ottar Alstrup <asger@area9.dk>
 
 	* testsuite/misc-mtasc.all/: Makefile.am, exception.as:

Index: server/vm/ExecutableCode.h
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ExecutableCode.h,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -b -r1.7 -r1.7.2.1
--- server/vm/ExecutableCode.h	1 Jul 2007 10:54:36 -0000	1.7
+++ server/vm/ExecutableCode.h	20 Aug 2007 15:28:26 -0000	1.7.2.1
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: ExecutableCode.h,v 1.7 2007/07/01 10:54:36 bjacques Exp $ */
+/* $Id: ExecutableCode.h,v 1.7.2.1 2007/08/20 15:28:26 strk Exp $ */
 
 #ifndef GNASH_EXECUTABLECODE_H
 #define GNASH_EXECUTABLECODE_H
@@ -205,7 +205,7 @@
 	virtual void markReachableResources() const
 	{
 		if ( func ) func->setReachable();
-		if ( func ) func->setReachable();
+		if ( target ) target->setReachable();
 	}
 #endif // GNASU_USE_GC
 



From MAILER-DAEMON Mon Aug 20 12:21:09 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INA05-0002J5-DY
	for mharc-gnash-commit@gnu.org; Mon, 20 Aug 2007 12:21:09 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INA04-0002IH-OV
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 12:21:08 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INA02-0002He-VS
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 12:21:07 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INA02-0002Ha-MV
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 12:21:06 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1INA02-0005pD-Fg
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 12:21:06 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1INA00-0005q1-WA
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 16:21:05 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1INA00-0005py-Ro
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 16:21:04 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INA00-0005py-Ro@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 20 Aug 2007 16:21:04 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog libbase/log.cpp libbase/log.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Aug 2007 16:21:08 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/20 16:21:04

Modified files:
	.              : ChangeLog 
	libbase        : log.cpp log.h 

Log message:
	        * libbase/log.{cpp,h}: print an error on stderr of the debug log file
	          can not be opened for writing. Minor cleanups (including dox).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4045&r2=1.4046
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.cpp?cvsroot=gnash&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.h?cvsroot=gnash&r1=1.59&r2=1.60

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4045
retrieving revision 1.4046
diff -u -b -r1.4045 -r1.4046
--- ChangeLog	20 Aug 2007 15:15:28 -0000	1.4045
+++ ChangeLog	20 Aug 2007 16:21:03 -0000	1.4046
@@ -1,5 +1,10 @@
 2007-08-20 Sandro Santilli <strk@keybit.net>
 
+	* libbase/log.{cpp,h}: print an error on stderr of the debug log file
+	  can not be opened for writing. Minor cleanups (including dox).
+
+2007-08-20 Sandro Santilli <strk@keybit.net>
+
 	* server/vm/ExecutableCode.h (FunctionCode::markReachableResources):
 	  Don't mark the function twice, and most importantly don't forget
 	  to mark the target character !!

Index: libbase/log.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- libbase/log.cpp	20 Aug 2007 10:39:23 -0000	1.56
+++ libbase/log.cpp	20 Aug 2007 16:21:04 -0000	1.57
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: log.cpp,v 1.56 2007/08/20 10:39:23 strk Exp $ */
+/* $Id: log.cpp,v 1.57 2007/08/20 16:21:04 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -340,7 +340,9 @@
 }
 
 // Default constructor
-LogFile::LogFile (void): _state(OPEN),
+LogFile::LogFile (void)
+	:
+	_state(CLOSED),
 			 _stamp(true),
 			 _write(true),
 			 _trace(false)
@@ -374,31 +376,35 @@
 
     // TODO: expand ~ to getenv("HOME") !!
 
-    _outstream.open (loadfile.c_str(), ios::out);
-    _filespec = loadfile;
-    _state = OPEN;
+    openLog(loadfile);
 }
 
-LogFile::LogFile (const char *filespec): _stamp(true), _write(true)
+LogFile::LogFile (const char *filespec)
+	:
+	_state(CLOSED),
+	_stamp(true),
+	_write(true)
 {
-    if (_state == OPEN) {
-	_outstream.close ();
-    }
-
-    _filespec = filespec;
-    _outstream.open (filespec, ios::out);
-    _state = OPEN;
+    openLog(filespec);
 }
 
-/// \brief open the log file
 bool
 LogFile::openLog (const char *filespec)
 {
+    boost::mutex::scoped_lock lock(_ioMutex);
     if (_state == OPEN) {
 	_outstream.close ();
+	_state = CLOSED;
     }
 
     _outstream.open (filespec, ios::out);
+    if( ! _outstream ) {
+	// Can't use log_error here...
+        std::cerr << "ERROR: can't open debug log file " << filespec << " for writing." << std::endl;
+        return false;
+    }       
+
+    _filespec = filespec;
     _state = OPEN;
 
   // LogFile::outstream << "Opened " << filespec << endl;
@@ -406,7 +412,6 @@
   return true;
 }
 
-/// \brief close the log file
 bool
 LogFile::closeLog (void)
 {
@@ -420,7 +425,6 @@
     return true;
 }
 
-/// \brief remove the log file
 bool
 LogFile::removeLog (void)
 {

Index: libbase/log.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.h,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- libbase/log.h	1 Jul 2007 10:54:09 -0000	1.59
+++ libbase/log.h	20 Aug 2007 16:21:04 -0000	1.60
@@ -99,10 +99,30 @@
 
     const char *getEntry(void);
     
+    /// Open the specified file to write logs on disk
+    //
+    /// Locks _ioMutex to prevent race conditions accessing _outstream
+    ///
+    /// @return true on success, false on failure
+    ///
+    bool openLog(const std::string& filespec)
+    {
+        return openLog(filespec.c_str());
+    }
+
+    /// See openLog(const std::string&) 
     bool openLog(const char *filespec);
+
+    /// Remove the log file
+    //
+    /// Does NOT lock _ioMutex (should it?)
+    ///
     bool removeLog(void);
 
-    // locks _ioMutex to prevent race conditions accessing _outstream
+    /// Close the log file
+    //
+    /// Locks _ioMutex to prevent race conditions accessing _outstream
+    ///
     bool closeLog(void);
 
     // accessors for the verbose level



From MAILER-DAEMON Mon Aug 20 12:39:38 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INAHy-00049w-G1
	for mharc-gnash-commit@gnu.org; Mon, 20 Aug 2007 12:39:38 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INAHw-00049L-WD
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 12:39:37 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INAHv-00048m-PV
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 12:39:36 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INAHv-00048g-LH
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 12:39:35 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1INAHv-0000HX-HL
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 12:39:35 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1INAHu-0006EH-Fk
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 16:39:34 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1INAHu-0006EE-AV
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 16:39:34 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INAHu-0006EE-AV@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 20 Aug 2007 16:39:34 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog libbase/log.cpp libbase/log.h
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Aug 2007 16:39:37 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/20 16:39:34

Modified files:
	.              : ChangeLog 
	libbase        : log.cpp log.h 

Log message:
	        * libbase/log.{cpp,h}: print an error on stderr of the debug log file
	          can not be opened for writing. Minor cleanups (including dox).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.46&r2=1.3971.2.47
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.54.2.1&r2=1.54.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.h?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.59&r2=1.59.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.46
retrieving revision 1.3971.2.47
diff -u -b -r1.3971.2.46 -r1.3971.2.47
--- ChangeLog	20 Aug 2007 15:28:25 -0000	1.3971.2.46
+++ ChangeLog	20 Aug 2007 16:39:33 -0000	1.3971.2.47
@@ -1,5 +1,10 @@
 2007-08-20 Sandro Santilli <strk@keybit.net>
 
+	* libbase/log.{cpp,h}: print an error on stderr of the debug log file
+	  can not be opened for writing. Minor cleanups (including dox).
+
+2007-08-20 Sandro Santilli <strk@keybit.net>
+
 	* server/vm/ExecutableCode.h (FunctionCode::markReachableResources):
 	  Don't mark the function twice, and most importantly don't forget
 	  to mark the target character !!

Index: libbase/log.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.cpp,v
retrieving revision 1.54.2.1
retrieving revision 1.54.2.2
diff -u -b -r1.54.2.1 -r1.54.2.2
--- libbase/log.cpp	20 Aug 2007 10:48:27 -0000	1.54.2.1
+++ libbase/log.cpp	20 Aug 2007 16:39:33 -0000	1.54.2.2
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: log.cpp,v 1.54.2.1 2007/08/20 10:48:27 strk Exp $ */
+/* $Id: log.cpp,v 1.54.2.2 2007/08/20 16:39:33 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -340,7 +340,9 @@
 }
 
 // Default constructor
-LogFile::LogFile (void): _state(OPEN),
+LogFile::LogFile (void)
+	:
+	_state(CLOSED),
 			 _stamp(true),
 			 _write(true),
 			 _trace(false)
@@ -374,31 +376,35 @@
 
     // TODO: expand ~ to getenv("HOME") !!
 
-    _outstream.open (loadfile.c_str(), ios::out);
-    _filespec = loadfile;
-    _state = OPEN;
+    openLog(loadfile);
 }
 
-LogFile::LogFile (const char *filespec): _stamp(true), _write(true)
+LogFile::LogFile (const char *filespec)
+	:
+	_state(CLOSED),
+	_stamp(true),
+	_write(true)
 {
-    if (_state == OPEN) {
-	_outstream.close ();
-    }
-
-    _filespec = filespec;
-    _outstream.open (filespec, ios::out);
-    _state = OPEN;
+    openLog(filespec);
 }
 
-/// \brief open the log file
 bool
 LogFile::openLog (const char *filespec)
 {
+    boost::mutex::scoped_lock lock(_ioMutex);
     if (_state == OPEN) {
 	_outstream.close ();
+	_state = CLOSED;
     }
 
     _outstream.open (filespec, ios::out);
+    if( ! _outstream ) {
+	// Can't use log_error here...
+        std::cerr << "ERROR: can't open debug log file " << filespec << " for writing." << std::endl;
+        return false;
+    }       
+
+    _filespec = filespec;
     _state = OPEN;
 
   // LogFile::outstream << "Opened " << filespec << endl;
@@ -406,7 +412,6 @@
   return true;
 }
 
-/// \brief close the log file
 bool
 LogFile::closeLog (void)
 {
@@ -420,7 +425,6 @@
     return true;
 }
 
-/// \brief remove the log file
 bool
 LogFile::removeLog (void)
 {

Index: libbase/log.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.h,v
retrieving revision 1.59
retrieving revision 1.59.2.1
diff -u -b -r1.59 -r1.59.2.1
--- libbase/log.h	1 Jul 2007 10:54:09 -0000	1.59
+++ libbase/log.h	20 Aug 2007 16:39:34 -0000	1.59.2.1
@@ -99,10 +99,30 @@
 
     const char *getEntry(void);
     
+    /// Open the specified file to write logs on disk
+    //
+    /// Locks _ioMutex to prevent race conditions accessing _outstream
+    ///
+    /// @return true on success, false on failure
+    ///
+    bool openLog(const std::string& filespec)
+    {
+        return openLog(filespec.c_str());
+    }
+
+    /// See openLog(const std::string&) 
     bool openLog(const char *filespec);
+
+    /// Remove the log file
+    //
+    /// Does NOT lock _ioMutex (should it?)
+    ///
     bool removeLog(void);
 
-    // locks _ioMutex to prevent race conditions accessing _outstream
+    /// Close the log file
+    //
+    /// Locks _ioMutex to prevent race conditions accessing _outstream
+    ///
     bool closeLog(void);
 
     // accessors for the verbose level



From MAILER-DAEMON Mon Aug 20 13:48:14 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INBMM-0002Sp-KR
	for mharc-gnash-commit@gnu.org; Mon, 20 Aug 2007 13:48:14 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INBML-0002Sh-7e
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 13:48:13 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INBMJ-0002SN-Lv
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 13:48:12 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INBMJ-0002SK-GN
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 13:48:11 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1INBMJ-00050f-Lf
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 13:48:11 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1INBMI-0003C1-7E
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 17:48:10 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1INBMI-0003By-27
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 17:48:10 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INBMI-0003By-27@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 20 Aug 2007 17:48:10 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog configure.ac doc/C/usermanual/u...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Aug 2007 17:48:13 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/20 17:48:09

Modified files:
	.              : ChangeLog configure.ac 
	doc/C/usermanual/usage: gnashrc.xml 
	libbase        : rc.cpp rc.h 

Log message:
	Tilde expansion (patch #6158) by Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>:
	
	 * configure.ac: look for the pwd.h header
	 * doc/C/usermanual/usage/gnashrc.xml: add info about tilde expansion.
	 * libbase/rc.{cpp,h}: add support for tilde expansion in debugLog
	   value.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4046&r2=1.4047
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.401&r2=1.402
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/usage/gnashrc.xml?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.cpp?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.h?cvsroot=gnash&r1=1.22&r2=1.23

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4046
retrieving revision 1.4047
diff -u -b -r1.4046 -r1.4047
--- ChangeLog	20 Aug 2007 16:21:03 -0000	1.4046
+++ ChangeLog	20 Aug 2007 17:48:09 -0000	1.4047
@@ -1,3 +1,10 @@
+2007-08-20 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
+
+	* configure.ac: look for the pwd.h header
+	* doc/C/usermanual/usage/gnashrc.xml: add info about tilde expansion.
+	* libbase/rc.{cpp,h}: add support for tilde expansion in debugLog
+	  value.
+
 2007-08-20 Sandro Santilli <strk@keybit.net>
 
 	* libbase/log.{cpp,h}: print an error on stderr of the debug log file

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -b -r1.401 -r1.402
--- configure.ac	18 Aug 2007 12:24:40 -0000	1.401
+++ configure.ac	20 Aug 2007 17:48:09 -0000	1.402
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.401 2007/08/18 12:24:40 strk Exp $
+dnl $Id: configure.ac,v 1.402 2007/08/20 17:48:09 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -773,6 +773,7 @@
 AC_CHECK_HEADERS(malloc.h)
 AC_CHECK_HEADERS(getopt.h)
 AC_CHECK_HEADERS(libgen.h)
+AC_CHECK_HEADERS(pwd.h)
 AC_CHECK_LIB(m, sqrt)
 
 dnl don't look for X11 when using a raw framebuffer for the GUI

Index: doc/C/usermanual/usage/gnashrc.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/usermanual/usage/gnashrc.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- doc/C/usermanual/usage/gnashrc.xml	19 Aug 2007 20:01:12 -0000	1.7
+++ doc/C/usermanual/usage/gnashrc.xml	20 Aug 2007 17:48:09 -0000	1.8
@@ -97,7 +97,9 @@
 <entry>debuglog</entry>
 <entry>Absolute path</entry>
 <entry>This is the full path and name of debug logfile as
-	    produced by &app;.</entry>
+	produced by &app;. On systems with a UNIX-type shell,
+        a tilde prefix (~) will be expanded as by Posix shell requirements
+        (see http://www.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html#tag_02_06_01).</entry>
 </row>
 <row>
 <entry>writelog</entry>

Index: libbase/rc.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- libbase/rc.cpp	19 Aug 2007 20:01:13 -0000	1.28
+++ libbase/rc.cpp	20 Aug 2007 17:48:09 -0000	1.29
@@ -22,6 +22,10 @@
 # include "config.h"
 #endif
 
+#ifdef HAVE_PWD_H
+# include <pwd.h>
+#endif
+
 #include <sys/types.h>
 #include <sys/stat.h>
 
@@ -144,6 +148,65 @@
     return *num;
 }
 
+string
+RcInitFile::expandTilde (std::string& unixpath)
+
+{
+string _expanded;
+
+              //Only if path starts with "~"
+             if (unixpath.substr(0,1) == "~") {
+             const char *home = getenv("HOME");
+                     if (unixpath.substr(1,2) == "/") {
+                          // Initial "~" followed by "/"
+                          if (home) {
+                               // if HOME set in env, replace ~ with HOME
+                               _expanded = unixpath.replace(0,1,home);
+                          }
+                          //HOME not set in env: try using pwd
+                          else { 
+                               struct passwd *password = getpwuid(getuid());
+                               const char *pwdhome = password->pw_dir;
+                               if (home) { _expanded = unixpath.replace(0,1,pwdhome); }
+                               //If all that fails, leave path alone
+                               else _expanded = unixpath;
+                          }
+                     }
+
+                     //Initial "~" is not followed by "/"
+                     else {
+                          const char *userhome = NULL;
+                          string::size_type first_slash = unixpath.find_first_of("/");
+                          string user;
+                          if (first_slash != string::npos) {
+                              // everything between initial ~ and / 
+                              user = unixpath.substr(1, first_slash - 1 );
+                          }
+
+                          //find user using pwd    
+                          struct passwd *password = getpwnam(user.c_str());
+                          if (password) {
+                              //User found
+                              userhome = password->pw_dir;
+                          }
+                          if (userhome) {
+                               string foundhome(userhome);
+                               _expanded = unixpath.replace(0,first_slash,foundhome);
+                          }
+                          else {
+                               //User not found and/or pwd doesn't return homedir:
+                               //Leave path alone.
+                               _expanded = unixpath;
+                          }
+                      }
+                 }
+                 //Path doesn't start with ~, leave it alone.
+                 else {
+                      _expanded = unixpath;
+                 }
+     return _expanded;
+}
+
 // Parse the config file and set the variables.
 bool
 RcInitFile::parseFile(const std::string& filespec)
@@ -211,7 +274,14 @@
                 }
 
                 if (variable == "debuglog") {
+
+#ifdef HAVE_PWD_H
+	             _log = expandTilde (value);
+#else
+//For non-UNIX systems
                     _log = value;
+#endif
+
                 }
 
                 if (variable == "documentroot") {

Index: libbase/rc.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- libbase/rc.h	19 Aug 2007 20:01:13 -0000	1.22
+++ libbase/rc.h	20 Aug 2007 17:48:09 -0000	1.23
@@ -102,6 +102,8 @@
     static int extractNumber(int *num, const char *pattern, std::string &variable,
                         std::string &value);
 
+    static std::string expandTilde(std::string& unixpath);
+
     const std::vector<std::string>& getWhiteList() const { return _whitelist; }
     const std::vector<std::string>& getBlackList() const { return _blacklist; }
 



From MAILER-DAEMON Mon Aug 20 14:09:38 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INBh4-0005Xn-7g
	for mharc-gnash-commit@gnu.org; Mon, 20 Aug 2007 14:09:38 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INBh1-0005XG-Sm
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 14:09:35 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INBgz-0005Wv-8e
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 14:09:35 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INBgz-0005Ws-3T
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 14:09:33 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1INBgz-0000yl-5i
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 14:09:33 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1INBgv-0004KO-HB
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 18:09:29 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1INBgv-0004KL-C8
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 18:09:29 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INBgv-0004KL-C8@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 20 Aug 2007 18:09:29 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog configure.ac doc/C/usermanual/u...
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Aug 2007 18:09:36 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/20 18:09:29

Modified files:
	.              : ChangeLog configure.ac 
	doc/C/usermanual/usage: gnashrc.xml 
	libbase        : rc.cpp rc.h 

Log message:
	Tilde expansion (patch #6158) by Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>:
	
	 * configure.ac: look for the pwd.h header
	 * doc/C/usermanual/usage/gnashrc.xml: add info about tilde expansion.
	 * libbase/rc.{cpp,h}: add support for tilde expansion in debugLog
	   value.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.47&r2=1.3971.2.48
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.396.2.5&r2=1.396.2.6
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/usage/gnashrc.xml?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.5.2.1&r2=1.5.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.27.2.1&r2=1.27.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.h?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.21.2.1&r2=1.21.2.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.47
retrieving revision 1.3971.2.48
diff -u -b -r1.3971.2.47 -r1.3971.2.48
--- ChangeLog	20 Aug 2007 16:39:33 -0000	1.3971.2.47
+++ ChangeLog	20 Aug 2007 18:09:27 -0000	1.3971.2.48
@@ -1,3 +1,10 @@
+2007-08-20 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
+
+	* configure.ac: look for the pwd.h header
+	* doc/C/usermanual/usage/gnashrc.xml: add info about tilde expansion.
+	* libbase/rc.{cpp,h}: add support for tilde expansion in debugLog
+	  value.
+
 2007-08-20 Sandro Santilli <strk@keybit.net>
 
 	* libbase/log.{cpp,h}: print an error on stderr of the debug log file

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.396.2.5
retrieving revision 1.396.2.6
diff -u -b -r1.396.2.5 -r1.396.2.6
--- configure.ac	18 Aug 2007 12:37:18 -0000	1.396.2.5
+++ configure.ac	20 Aug 2007 18:09:28 -0000	1.396.2.6
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.396.2.5 2007/08/18 12:37:18 strk Exp $
+dnl $Id: configure.ac,v 1.396.2.6 2007/08/20 18:09:28 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, 0.8.1)
@@ -773,6 +773,7 @@
 AC_CHECK_HEADERS(malloc.h)
 AC_CHECK_HEADERS(getopt.h)
 AC_CHECK_HEADERS(libgen.h)
+AC_CHECK_HEADERS(pwd.h)
 AC_CHECK_LIB(m, sqrt)
 
 dnl don't look for X11 when using a raw framebuffer for the GUI

Index: doc/C/usermanual/usage/gnashrc.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/usermanual/usage/gnashrc.xml,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -b -r1.5.2.1 -r1.5.2.2
--- doc/C/usermanual/usage/gnashrc.xml	19 Aug 2007 20:22:03 -0000	1.5.2.1
+++ doc/C/usermanual/usage/gnashrc.xml	20 Aug 2007 18:09:28 -0000	1.5.2.2
@@ -117,7 +117,9 @@
 	<listitem>
 	  <para>
 	    This is the full path and name of debug logfile as
-	    produced by Gnash.
+        produced by &app;. On systems with a UNIX-type shell,
+        a tilde prefix (~) will be expanded as by Posix shell requirements
+        (see http://www.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html#tag_02_06_01).
 	  </para>
 	</listitem>
       </varlistentry>

Index: libbase/rc.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.cpp,v
retrieving revision 1.27.2.1
retrieving revision 1.27.2.2
diff -u -b -r1.27.2.1 -r1.27.2.2
--- libbase/rc.cpp	19 Aug 2007 20:22:03 -0000	1.27.2.1
+++ libbase/rc.cpp	20 Aug 2007 18:09:28 -0000	1.27.2.2
@@ -22,6 +22,10 @@
 # include "config.h"
 #endif
 
+#ifdef HAVE_PWD_H
+# include <pwd.h>
+#endif
+
 #include <sys/types.h>
 #include <sys/stat.h>
 
@@ -144,6 +148,65 @@
     return *num;
 }
 
+string
+RcInitFile::expandTilde (std::string& unixpath)
+
+{
+string _expanded;
+
+              //Only if path starts with "~"
+             if (unixpath.substr(0,1) == "~") {
+             const char *home = getenv("HOME");
+                     if (unixpath.substr(1,2) == "/") {
+                          // Initial "~" followed by "/"
+                          if (home) {
+                               // if HOME set in env, replace ~ with HOME
+                               _expanded = unixpath.replace(0,1,home);
+                          }
+                          //HOME not set in env: try using pwd
+                          else { 
+                               struct passwd *password = getpwuid(getuid());
+                               const char *pwdhome = password->pw_dir;
+                               if (home) { _expanded = unixpath.replace(0,1,pwdhome); }
+                               //If all that fails, leave path alone
+                               else _expanded = unixpath;
+                          }
+                     }
+
+                     //Initial "~" is not followed by "/"
+                     else {
+                          const char *userhome = NULL;
+                          string::size_type first_slash = unixpath.find_first_of("/");
+                          string user;
+                          if (first_slash != string::npos) {
+                              // everything between initial ~ and / 
+                              user = unixpath.substr(1, first_slash - 1 );
+                          }
+
+                          //find user using pwd    
+                          struct passwd *password = getpwnam(user.c_str());
+                          if (password) {
+                              //User found
+                              userhome = password->pw_dir;
+                          }
+                          if (userhome) {
+                               string foundhome(userhome);
+                               _expanded = unixpath.replace(0,first_slash,foundhome);
+                          }
+                          else {
+                               //User not found and/or pwd doesn't return homedir:
+                               //Leave path alone.
+                               _expanded = unixpath;
+                          }
+                      }
+                 }
+                 //Path doesn't start with ~, leave it alone.
+                 else {
+                      _expanded = unixpath;
+                 }
+     return _expanded;
+}
+
 // Parse the config file and set the variables.
 bool
 RcInitFile::parseFile(const std::string& filespec)
@@ -211,7 +274,14 @@
                 }
 
                 if (variable == "debuglog") {
+
+#ifdef HAVE_PWD_H
+	             _log = expandTilde (value);
+#else
+//For non-UNIX systems
                     _log = value;
+#endif
+
                 }
 
                 if (variable == "documentroot") {

Index: libbase/rc.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.h,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -u -b -r1.21.2.1 -r1.21.2.2
--- libbase/rc.h	19 Aug 2007 20:22:03 -0000	1.21.2.1
+++ libbase/rc.h	20 Aug 2007 18:09:29 -0000	1.21.2.2
@@ -102,6 +102,8 @@
     static int extractNumber(int *num, const char *pattern, std::string &variable,
                         std::string &value);
 
+    static std::string expandTilde(std::string& unixpath);
+
     const std::vector<std::string>& getWhiteList() const { return _whitelist; }
     const std::vector<std::string>& getBlackList() const { return _blacklist; }
 



From MAILER-DAEMON Mon Aug 20 18:59:33 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INGDd-0004RA-Ah
	for mharc-gnash-commit@gnu.org; Mon, 20 Aug 2007 18:59:33 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INGDb-0004MH-5q
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 18:59:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INGDa-0004JI-1F
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 18:59:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INGDZ-0004Io-Nd
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 18:59:29 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1INGDX-0004Ua-Qu
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 18:59:27 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1INGDW-0007lZ-Fg
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 22:59:26 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1INGDW-0007lW-AE
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 22:59:26 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INGDW-0007lW-AE@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 20 Aug 2007 22:59:26 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog libbase/rc.cpp libbase/rc.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Aug 2007 22:59:31 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/20 22:59:26

Modified files:
	.              : ChangeLog 
	libbase        : rc.cpp rc.h 

Log message:
	Patch by Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>:
	
	        * libbase/rc.{cpp,h}: Fixes a typo, matches the whole username if
	          there's no slash (following POSIX) and makes expandPath
	          (not expandTilde) private.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4047&r2=1.4048
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.cpp?cvsroot=gnash&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.h?cvsroot=gnash&r1=1.23&r2=1.24

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4047
retrieving revision 1.4048
diff -u -b -r1.4047 -r1.4048
--- ChangeLog	20 Aug 2007 17:48:09 -0000	1.4047
+++ ChangeLog	20 Aug 2007 22:59:25 -0000	1.4048
@@ -1,3 +1,9 @@
+2007-08-21 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
+
+	* libbase/rc.{cpp,h}: Fixes a typo, matches the whole username if
+	  there's no slash (following POSIX) and makes expandPath
+	  (not expandTilde) private.
+
 2007-08-20 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
 
 	* configure.ac: look for the pwd.h header

Index: libbase/rc.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- libbase/rc.cpp	20 Aug 2007 17:48:09 -0000	1.29
+++ libbase/rc.cpp	20 Aug 2007 22:59:26 -0000	1.30
@@ -149,7 +149,7 @@
 }
 
 string
-RcInitFile::expandTilde (std::string& unixpath)
+RcInitFile::expandPath (std::string& unixpath)
 
 {
 string _expanded;
@@ -157,7 +157,7 @@
               //Only if path starts with "~"
              if (unixpath.substr(0,1) == "~") {
              const char *home = getenv("HOME");
-                     if (unixpath.substr(1,2) == "/") {
+                     if (unixpath.substr(1,1) == "/") {
                           // Initial "~" followed by "/"
                           if (home) {
                                // if HOME set in env, replace ~ with HOME
@@ -181,7 +181,7 @@
                           if (first_slash != string::npos) {
                               // everything between initial ~ and / 
                               user = unixpath.substr(1, first_slash - 1 );
-                          }
+                          } else user = unixpath.substr(1);
 
                           //find user using pwd    
                           struct passwd *password = getpwnam(user.c_str());
@@ -276,7 +276,7 @@
                 if (variable == "debuglog") {
 
 #ifdef HAVE_PWD_H
-	             _log = expandTilde (value);
+	             _log = expandPath (value);
 #else
 //For non-UNIX systems
                      _log = value;

Index: libbase/rc.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- libbase/rc.h	20 Aug 2007 17:48:09 -0000	1.23
+++ libbase/rc.h	20 Aug 2007 22:59:26 -0000	1.24
@@ -102,8 +102,6 @@
     static int extractNumber(int *num, const char *pattern, std::string &variable,
                         std::string &value);
 
-    static std::string expandTilde(std::string& unixpath);
-
     const std::vector<std::string>& getWhiteList() const { return _whitelist; }
     const std::vector<std::string>& getBlackList() const { return _blacklist; }
 
@@ -156,6 +154,9 @@
     bool _extensionsEnabled;	// wheter to scan plugin path for extensions
 
     bool _startStopped;		// whether to start the gui in "stop" mode
+
+    static std::string expandPath(std::string& unixpath);
+
 };
 
 //extern DSOEXPORT RcInitFile rcfile;



From MAILER-DAEMON Mon Aug 20 19:19:54 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INGXK-0007VH-5Q
	for mharc-gnash-commit@gnu.org; Mon, 20 Aug 2007 19:19:54 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INGXI-0007VC-HG
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 19:19:52 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INGXG-0007V0-8H
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 19:19:51 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INGXG-0007Ux-2k
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 19:19:50 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1INGXE-0007US-5C
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 19:19:48 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1INGXB-00017B-4h
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 23:19:45 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1INGXA-000177-UR
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 23:19:45 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INGXA-000177-UR@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 20 Aug 2007 23:19:44 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/libbase rc.cpp rc.h [release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Aug 2007 23:19:52 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/20 23:19:44

Modified files:
	libbase        : rc.cpp rc.h 

Log message:
	Patch by Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>:
	
	        * libbase/rc.{cpp,h}: Fixes a typo, matches the whole username if
	          there's no slash (following POSIX) and makes expandPath
	          (not expandTilde) private.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.27.2.2&r2=1.27.2.3
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.h?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.21.2.2&r2=1.21.2.3

Patches:
Index: rc.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.cpp,v
retrieving revision 1.27.2.2
retrieving revision 1.27.2.3
diff -u -b -r1.27.2.2 -r1.27.2.3
--- rc.cpp	20 Aug 2007 18:09:28 -0000	1.27.2.2
+++ rc.cpp	20 Aug 2007 23:19:44 -0000	1.27.2.3
@@ -149,7 +149,7 @@
 }
 
 string
-RcInitFile::expandTilde (std::string& unixpath)
+RcInitFile::expandPath (std::string& unixpath)
 
 {
 string _expanded;
@@ -157,7 +157,7 @@
               //Only if path starts with "~"
              if (unixpath.substr(0,1) == "~") {
              const char *home = getenv("HOME");
-                     if (unixpath.substr(1,2) == "/") {
+                     if (unixpath.substr(1,1) == "/") {
                           // Initial "~" followed by "/"
                           if (home) {
                                // if HOME set in env, replace ~ with HOME
@@ -181,7 +181,7 @@
                           if (first_slash != string::npos) {
                               // everything between initial ~ and / 
                               user = unixpath.substr(1, first_slash - 1 );
-                          }
+                          } else user = unixpath.substr(1);
 
                           //find user using pwd    
                           struct passwd *password = getpwnam(user.c_str());
@@ -276,7 +276,7 @@
                 if (variable == "debuglog") {
 
 #ifdef HAVE_PWD_H
-	             _log = expandTilde (value);
+	             _log = expandPath (value);
 #else
 //For non-UNIX systems
                      _log = value;

Index: rc.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.h,v
retrieving revision 1.21.2.2
retrieving revision 1.21.2.3
diff -u -b -r1.21.2.2 -r1.21.2.3
--- rc.h	20 Aug 2007 18:09:29 -0000	1.21.2.2
+++ rc.h	20 Aug 2007 23:19:44 -0000	1.21.2.3
@@ -102,8 +102,6 @@
     static int extractNumber(int *num, const char *pattern, std::string &variable,
                         std::string &value);
 
-    static std::string expandTilde(std::string& unixpath);
-
     const std::vector<std::string>& getWhiteList() const { return _whitelist; }
     const std::vector<std::string>& getBlackList() const { return _blacklist; }
 
@@ -156,6 +154,9 @@
     bool _extensionsEnabled;	// wheter to scan plugin path for extensions
 
     bool _startStopped;		// whether to start the gui in "stop" mode
+
+    static std::string expandPath(std::string& unixpath);
+
 };
 
 //extern DSOEXPORT RcInitFile rcfile;



From MAILER-DAEMON Mon Aug 20 19:36:22 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INGnG-0003Yc-ND
	for mharc-gnash-commit@gnu.org; Mon, 20 Aug 2007 19:36:22 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INGnE-0003Xm-Gi
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 19:36:20 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INGnD-0003XH-J4
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 19:36:19 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INGnD-0003XD-GF
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 19:36:19 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1INGnB-0001ca-FZ
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 19:36:17 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1INGnA-0001PX-Fw
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 23:36:16 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1INGnA-0001PU-C2
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 23:36:16 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INGnA-0001PU-C2@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 20 Aug 2007 23:36:16 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-swfc.all/Makefil...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Aug 2007 23:36:20 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/20 23:36:16

Modified files:
	.              : ChangeLog 
	testsuite/misc-swfc.all: Makefile.am 

Log message:
	        * testsuite/misc-swfc.all/Makefile.am: use an absolute
	          path for MEDIADIR to make swfc happy; don't do anything
	          on make check if SWFC is not enabled.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4048&r2=1.4049
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/Makefile.am?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4048
retrieving revision 1.4049
diff -u -b -r1.4048 -r1.4049
--- ChangeLog	20 Aug 2007 22:59:25 -0000	1.4048
+++ ChangeLog	20 Aug 2007 23:36:15 -0000	1.4049
@@ -1,3 +1,9 @@
+2007-08-21 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/misc-swfc.all/Makefile.am: use an absolute
+	  path for MEDIADIR to make swfc happy; don't do anything
+	  on make check if SWFC is not enabled.
+
 2007-08-21 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
 
 	* libbase/rc.{cpp,h}: Fixes a typo, matches the whole username if

Index: testsuite/misc-swfc.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- testsuite/misc-swfc.all/Makefile.am	10 Aug 2007 18:59:34 -0000	1.3
+++ testsuite/misc-swfc.all/Makefile.am	20 Aug 2007 23:36:16 -0000	1.4
@@ -32,11 +32,13 @@
 
 EXTRA_DIST = $(SCTESTS) $(AUXMOVIES) check.sc Dejagnu.sc
 
-#if ENABLE_SWFC
+if ENABLE_SWFC
+
+abs_mediadir = $(shell cd $(srcdir)/../media; pwd)
 
 #SWFC = swfc # this is set by ./configure
 SWFC_FLAGS = 
-SWFC_CPP = cpp -P -I$(srcdir) -DMEDIADIR='$(srcdir)/../media'
+SWFC_CPP = cpp -P -I$(srcdir) -DMEDIADIR='$(abs_mediadir)'
 
 SCTESTS_OUT = $(SCTESTS:.sc=.swf)
 
@@ -83,4 +85,4 @@
 	@echo "# This is a list of the pre-compiled testcases" >> site.exp
 	@echo "set testcases \"$(TEST_CASES)\"" >> site.exp
 
-#endif
+endif # ENABLE_SWFC



From MAILER-DAEMON Mon Aug 20 19:38:07 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INGow-0004F4-Nc
	for mharc-gnash-commit@gnu.org; Mon, 20 Aug 2007 19:38:06 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INGov-0004Ee-E0
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 19:38:05 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INGou-0004EG-K3
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 19:38:05 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INGou-0004EB-Fc
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 19:38:04 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1INGos-0001yU-FL
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 19:38:02 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1INGor-0001R2-Uq
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 23:38:02 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1INGor-0001Qy-QB
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 23:38:01 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INGor-0001Qy-QB@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 20 Aug 2007 23:38:01 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/testsuite/misc-swfc.all .cvsignore
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Aug 2007 23:38:05 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/20 23:38:01

Added files:
	testsuite/misc-swfc.all: .cvsignore 

Log message:
	new ignores

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/.cvsignore?cvsroot=gnash&rev=1.1

Patches:
Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	20 Aug 2007 23:38:01 -0000	1.1
@@ -0,0 +1,8 @@
+Makefile
+Makefile.in
+alltests-runner
+*.swf
+*.sc
+site.exp
+testrun.log
+testrun.sum



From MAILER-DAEMON Mon Aug 20 20:07:29 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INHHM-00066o-Uw
	for mharc-gnash-commit@gnu.org; Mon, 20 Aug 2007 20:07:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INHHL-00066h-65
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 20:07:27 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INHHK-00066O-EQ
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 20:07:26 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INHHK-00066L-BM
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 20:07:26 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1INHHI-0006aV-4X
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 20:07:24 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1INHHH-0003QI-6Z
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 00:07:23 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1INHHH-0003QF-2U
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 00:07:23 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INHHH-0003QF-2U@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 21 Aug 2007 00:07:23 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/edit_text_character.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Aug 2007 00:07:27 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/21 00:07:23

Modified files:
	.              : ChangeLog 
	server         : edit_text_character.cpp 

Log message:
	        * server/edit_text_character.cpp (add_invalidated_bounds): use
	          instance bounds, not definition ones.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4049&r2=1.4050
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.100&r2=1.101

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4049
retrieving revision 1.4050
diff -u -b -r1.4049 -r1.4050
--- ChangeLog	20 Aug 2007 23:36:15 -0000	1.4049
+++ ChangeLog	21 Aug 2007 00:07:22 -0000	1.4050
@@ -1,5 +1,7 @@
 2007-08-21 Sandro Santilli <strk@keybit.net>
 
+	* server/edit_text_character.cpp (add_invalidated_bounds): use
+	  instance bounds, not definition ones.
 	* testsuite/misc-swfc.all/Makefile.am: use an absolute
 	  path for MEDIADIR to make swfc happy; don't do anything
 	  on make check if SWFC is not enabled.

Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- server/edit_text_character.cpp	18 Aug 2007 08:04:59 -0000	1.100
+++ server/edit_text_character.cpp	21 Aug 2007 00:07:22 -0000	1.101
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: edit_text_character.cpp,v 1.100 2007/08/18 08:04:59 strk Exp $ */
+/* $Id: edit_text_character.cpp,v 1.101 2007/08/21 00:07:22 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -526,12 +526,10 @@
     
 	ranges.add(m_old_invalidated_ranges);
 
-	rect bounds;	
+	geometry::Range2d<float> bounds = getBounds();
+	get_world_matrix().transform(bounds);
 
-	bounds.expand_to_transformed_rect(get_world_matrix(),
-    				       m_def->get_bound());
-
-	ranges.add(bounds.getRange());            
+	ranges.add(bounds);            
 }
 
 bool
@@ -953,7 +951,7 @@
 	if (extra_space <= 0.0f)
 	{
 		log_debug(_("TextField text doesn't fit in its boundaries: "
-			    "width %g, margin %d - nothing to align"),
+			    "width %g, margin %g - nothing to align"),
 			    width, right_margin);
 		return 0.0f;
 	}



From MAILER-DAEMON Mon Aug 20 20:33:20 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INHgO-0007o5-D6
	for mharc-gnash-commit@gnu.org; Mon, 20 Aug 2007 20:33:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INHgM-0007jj-DZ
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 20:33:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INHgL-0007hz-DF
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 20:33:17 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INHgL-0007hp-9j
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 20:33:17 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1INHgJ-0001ow-05
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 20:33:15 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1INHgI-0005BR-0w
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 00:33:14 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1INHgH-0005BO-Pu
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 00:33:13 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INHgH-0005BO-Pu@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 21 Aug 2007 00:33:13 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/edit_text_character.cpp ...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Aug 2007 00:33:19 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/21 00:33:13

Modified files:
	.              : ChangeLog 
	server         : edit_text_character.cpp edit_text_character.h 

Log message:
	reformat text when _width or _height changes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4050&r2=1.4051
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.101&r2=1.102
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.h?cvsroot=gnash&r1=1.45&r2=1.46

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4050
retrieving revision 1.4051
diff -u -b -r1.4050 -r1.4051
--- ChangeLog	21 Aug 2007 00:07:22 -0000	1.4050
+++ ChangeLog	21 Aug 2007 00:33:13 -0000	1.4051
@@ -1,7 +1,8 @@
 2007-08-21 Sandro Santilli <strk@keybit.net>
 
 	* server/edit_text_character.cpp (add_invalidated_bounds): use
-	  instance bounds, not definition ones.
+	  instance bounds, not definition ones; reformat text when _width
+	  or _height changes.
 	* testsuite/misc-swfc.all/Makefile.am: use an absolute
 	  path for MEDIADIR to make swfc happy; don't do anything
 	  on make check if SWFC is not enabled.

Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -b -r1.101 -r1.102
--- server/edit_text_character.cpp	21 Aug 2007 00:07:22 -0000	1.101
+++ server/edit_text_character.cpp	21 Aug 2007 00:33:13 -0000	1.102
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: edit_text_character.cpp,v 1.101 2007/08/21 00:07:22 strk Exp $ */
+/* $Id: edit_text_character.cpp,v 1.102 2007/08/21 00:33:13 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -526,9 +526,11 @@
     
 	ranges.add(m_old_invalidated_ranges);
 
-	geometry::Range2d<float> bounds = getBounds();
-	get_world_matrix().transform(bounds);
+	matrix wm = get_world_matrix();
 
+	geometry::Range2d<float> bounds = getBounds();
+	bounds.expandTo(m_text_bounding_box); // add text bounds
+	wm.transform(bounds);
 	ranges.add(bounds);            
 }
 
@@ -792,6 +794,11 @@
 		_bounds.setTo(xmin, ymin, xmin+nw, ymax);
 		assert(_bounds.width() == nw);
 
+		// previously truncated text might get visible now
+		// TODO: if nested masks were implemented we would 
+		// not need to reformat text here
+		format_text();
+
 		return;
 	}
 	case M_HEIGHT: // _height
@@ -827,6 +834,11 @@
 
 		assert(_bounds.height() == nh);
 
+		// previously truncated text might get visible now
+		// TODO: if nested masks were implemented we would 
+		// not need to reformat text here
+		format_text();
+
 		return;
 	}
 	case M_VISIBLE:
@@ -1068,7 +1080,7 @@
 
 		// Expand the bounding-box to the lower-right corner of each glyph as
 		// we generate it.
-		m_text_bounding_box.expand_to_point(x, y + _font->get_descent() * scale);
+		m_text_bounding_box.expandTo(x, y + _font->get_descent() * scale);
 
 		if (code == 13 || code == 10)
 		{

Index: server/edit_text_character.h
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- server/edit_text_character.h	16 Aug 2007 10:31:51 -0000	1.45
+++ server/edit_text_character.h	21 Aug 2007 00:33:13 -0000	1.46
@@ -225,12 +225,12 @@
 	boost::intrusive_ptr<edit_text_character_def>	m_def;
 
 	/// bounds of dynamic text, as laid out
-	rect	m_text_bounding_box;
+	geometry::Range2d<float> m_text_bounding_box;
 
 	/// Reset our text bounding box to the given point.
 	void	reset_bounding_box(float x, float y)
 	{
-		m_text_bounding_box.enclose_point(x,y);
+		m_text_bounding_box.setTo(x,y);
 	}
 
 	typedef std::vector<text_glyph_record> TextGlyphRecords;



From MAILER-DAEMON Mon Aug 20 22:12:45 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INJEa-0001fR-IQ
	for mharc-gnash-commit@gnu.org; Mon, 20 Aug 2007 22:12:44 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INJEY-0001eX-J5
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 22:12:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INJEY-0001eE-4i
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 22:12:42 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INJEX-0001eB-SO
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 22:12:41 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <chadmusick@msbx.net>) id 1INJEW-0001Zd-S4
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 22:12:41 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <chadmusick@msbx.net>) id 1INJEV-0003F9-BO
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 02:12:39 +0000
Received: from cmusick by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <cmusick@savannah.gnu.org>) id 1INJEV-0003Ex-4K
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 02:12:39 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INJEV-0003Ex-4K@cvs.savannah.gnu.org>
From: Chad Musick <chadmusick@msbx.net>
Date: Tue, 21 Aug 2007 02:12:39 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Aug 2007 02:12:42 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Chad Musick <cmusick>	07/08/21 02:12:39

Modified files:
	.              : ChangeLog 

Log message:
	Updating the ChangeLog to reflect changes in ASHandlers.h and ASHandlers.cpp

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4051&r2=1.4052

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4051
retrieving revision 1.4052
diff -u -b -r1.4051 -r1.4052
--- ChangeLog	21 Aug 2007 00:33:13 -0000	1.4051
+++ ChangeLog	21 Aug 2007 02:12:38 -0000	1.4052
@@ -13,6 +13,14 @@
 	  there's no slash (following POSIX) and makes expandPath
 	  (not expandTilde) private.
 
+2007-08-20 Chad Musick <chadmusick@msbx.net>
+
+	* server/vm/ASHandlers.h: Add helper function for multi-byte
+	  string handling
+	* server/vm/ASHandlers.cpp: Implement helper function for multi-
+	  byte strings and implement multi-byte versions of strlen,
+	  substr, and chr
+
 2007-08-20 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
 
 	* configure.ac: look for the pwd.h header



From MAILER-DAEMON Mon Aug 20 23:49:47 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INKkV-0007FW-0s
	for mharc-gnash-commit@gnu.org; Mon, 20 Aug 2007 23:49:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INKkT-0007FR-Nq
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 23:49:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INKkS-0007FF-9h
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 23:49:44 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INKkS-0007FC-4t
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 23:49:44 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <chadmusick@msbx.net>) id 1INKkR-0000RF-AE
	for gnash-commit@gnu.org; Mon, 20 Aug 2007 23:49:43 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <chadmusick@msbx.net>) id 1INKkQ-0001Mf-6H
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 03:49:42 +0000
Received: from cmusick by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <cmusick@savannah.gnu.org>) id 1INKkQ-0001Mc-16
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 03:49:42 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INKkQ-0001Mc-16@cvs.savannah.gnu.org>
From: Chad Musick <chadmusick@msbx.net>
Date: Tue, 21 Aug 2007 03:49:42 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/swf.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Aug 2007 03:49:46 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Chad Musick <cmusick>	07/08/21 03:49:41

Modified files:
	.              : ChangeLog 
	server         : swf.h 

Log message:
	Adding new tag values for SWF 9 opcodes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4052&r2=1.4053
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf.h?cvsroot=gnash&r1=1.36&r2=1.37

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4052
retrieving revision 1.4053
diff -u -b -r1.4052 -r1.4053
--- ChangeLog	21 Aug 2007 02:12:38 -0000	1.4052
+++ ChangeLog	21 Aug 2007 03:49:41 -0000	1.4053
@@ -1,3 +1,7 @@
+2007-08-22 Chad Musick <chadmusick@msbx.net>
+
+        * server/swf.h: Add new tag values for SWF 9 support.
+
 2007-08-21 Sandro Santilli <strk@keybit.net>
 
 	* server/edit_text_character.cpp (add_invalidated_bounds): use

Index: server/swf.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- server/swf.h	20 Aug 2007 06:38:02 -0000	1.36
+++ server/swf.h	21 Aug 2007 03:49:41 -0000	1.37
@@ -46,6 +46,7 @@
     DEFINEFONTINFO        = 13,
     DEFINESOUND           = 14,
     STARTSOUND            = 15,
+    STOPSOUND             = 16, // SWF 9
     DEFINEBUTTONSOUND     = 17,
     SOUNDSTREAMHEAD       = 18,
     SOUNDSTREAMBLOCK      = 19,
@@ -74,6 +75,7 @@
     SERIALNUMBER          = 41,
     DEFINETEXTFORMAT	  = 42,
     FRAMELABEL            = 43,
+    DEFINEBEHAVIOR        = 44, // SWF 9
     SOUNDSTREAMHEAD2      = 45,
     DEFINEMORPHSHAPE      = 46,
     FRAMETAG		  = 47,
@@ -82,6 +84,9 @@
     DEFINECOMMANDOBJ	  = 50,
     CHARACTERSET	  = 51,
     FONTREF		  = 52,
+    DEFINEFUNCTION        = 53, // SWF 9
+    PLACEFUNCTION         = 54, // SWF 9
+    GENTAGOBJECT          = 55, // SWF 9
     EXPORTASSETS          = 56,
     IMPORTASSETS          = 57,
 
@@ -97,6 +102,8 @@
     /// DefineFontInfo2 (swf6)
     DEFINEFONTINFO2       = 62,
 
+    DEBUGID               = 63, // SWF 9
+
     /// See http://flasm.sourceforge.net/#protect
     /// See http://sswf.sourceforge.net/SWFalexref.html#tag_protectdebug
     ENABLEDEBUGGER2	  = 64,
@@ -105,6 +112,10 @@
     /// See http://sswf.sourceforge.net/SWFalexref.html#tag_scriptlimits
     SCRIPTLIMITS          = 65, 
 
+    SETTABINDEX           = 66, // SWF 9
+    DEFINESHAPE4_         = 67, // SWF 9
+    DEFINEMORPHSHAPE2_    = 68, // SWF 9
+
     /// http://sswf.sourceforge.net/SWFalexref.html#tag_fileattributes
     FILEATTRIBUTES        = 69,
 
@@ -114,6 +125,8 @@
     /// http://sswf.sourceforge.net/SWFalexref.html#tag_import2
     IMPORTASSETS2         = 71,
 
+    DOABC                 = 72,
+
     /// http://sswf.sourceforge.net/SWFalexref.html#tag_definefontalignzones
     DEFINEALIGNZONES      = 73,
 



From MAILER-DAEMON Tue Aug 21 03:56:50 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INOba-0006pg-Km
	for mharc-gnash-commit@gnu.org; Tue, 21 Aug 2007 03:56:50 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INObY-0006pB-V3
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 03:56:49 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INObW-0006mI-Bp
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 03:56:48 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INObV-0006mC-TM
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 03:56:45 -0400
Received: from rv-out-0910.google.com ([209.85.198.186])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1INObV-00035h-7Z
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 03:56:45 -0400
Received: by rv-out-0910.google.com with SMTP id c27so1098220rvf
	for <gnash-commit@gnu.org>; Tue, 21 Aug 2007 00:56:43 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=Qrmslr2T+unKejqo7NZuCJJoNuSqi04IhD4kUxLjVhiWc3aA/jNeD6MwpQFbTSb1Q/QZwCIiolG3y9TcE0Ty+rhwi6wTIvqS/MBGQjJcG6Dx/4OIq7ZCfHPhIKm59wcRvKF3VrA+YiKF99Yl2EdUVj8cOa9dd2lVCjPhaydvgJk=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=py76ochi5aiPPvW8SqWr9QTK633IVnq6ipuoTozAIA16bwXgRIW2nd39shxYOTF77r3TsRPsJYmo/ATjaGc3b+cH1X1G13cl6BUmWImEDGv03lyWwkmPKLYzw8Kv392wlI53iZpFNpccgSYwye0FaYyJ+9sYSG4KqkOPTaceVZE=
Received: by 10.115.55.1 with SMTP id h1mr77139wak.1187683003369;
	Tue, 21 Aug 2007 00:56:43 -0700 (PDT)
Received: by 10.114.110.5 with HTTP; Tue, 21 Aug 2007 00:56:43 -0700 (PDT)
Message-ID: <ca4b43ff0708210056q753b7134vcec28193ff19231@mail.gmail.com>
Date: Tue, 21 Aug 2007 15:56:43 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "Sandro Santilli" <strk@keybit.net>
Subject: Re: [Gnash-commit] gnash ChangeLog configure.ac doc/C/usermanual/u...
In-Reply-To: <E1INBMI-0003By-27@cvs.savannah.gnu.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1INBMI-0003By-27@cvs.savannah.gnu.org>
X-Detected-Kernel: Linux 2.6 (newer, 2)
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Aug 2007 07:56:49 -0000

> +#ifdef HAVE_PWD_H
> +# include <pwd.h>
> +#endif

> + struct passwd *password = getpwuid(getuid());

What if there is no pwd.h?  Should we take care of this, to make the
code still compiles?


On 8/21/07, Sandro Santilli <strk@keybit.net> wrote:
> CVSROOT:        /sources/gnash
> Module name:    gnash
> Changes by:     Sandro Santilli <strk>  07/08/20 17:48:09
>
> Modified files:
>        .              : ChangeLog configure.ac
>        doc/C/usermanual/usage: gnashrc.xml
>        libbase        : rc.cpp rc.h
>
> Log message:
>        Tilde expansion (patch #6158) by Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>:
>
>         * configure.ac: look for the pwd.h header
>         * doc/C/usermanual/usage/gnashrc.xml: add info about tilde expansion.
>         * libbase/rc.{cpp,h}: add support for tilde expansion in debugLog
>           value.
>
> CVSWeb URLs:
> http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4046&r2=1.4047
> http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.401&r2=1.402
> http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/usage/gnashrc.xml?cvsroot=gnash&r1=1.7&r2=1.8
> http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.cpp?cvsroot=gnash&r1=1.28&r2=1.29
> http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.h?cvsroot=gnash&r1=1.22&r2=1.23
>
> Patches:
> Index: ChangeLog
> ===================================================================
> RCS file: /sources/gnash/gnash/ChangeLog,v
> retrieving revision 1.4046
> retrieving revision 1.4047
> diff -u -b -r1.4046 -r1.4047
> --- ChangeLog   20 Aug 2007 16:21:03 -0000      1.4046
> +++ ChangeLog   20 Aug 2007 17:48:09 -0000      1.4047
> @@ -1,3 +1,10 @@
> +2007-08-20 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
> +
> +       * configure.ac: look for the pwd.h header
> +       * doc/C/usermanual/usage/gnashrc.xml: add info about tilde expansion.
> +       * libbase/rc.{cpp,h}: add support for tilde expansion in debugLog
> +         value.
> +
>  2007-08-20 Sandro Santilli <strk@keybit.net>
>
>        * libbase/log.{cpp,h}: print an error on stderr of the debug log file
>
> Index: configure.ac
> ===================================================================
> RCS file: /sources/gnash/gnash/configure.ac,v
> retrieving revision 1.401
> retrieving revision 1.402
> diff -u -b -r1.401 -r1.402
> --- configure.ac        18 Aug 2007 12:24:40 -0000      1.401
> +++ configure.ac        20 Aug 2007 17:48:09 -0000      1.402
> @@ -15,7 +15,7 @@
>  dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  dnl
>
> -dnl $Id: configure.ac,v 1.401 2007/08/18 12:24:40 strk Exp $
> +dnl $Id: configure.ac,v 1.402 2007/08/20 17:48:09 strk Exp $
>
>  AC_PREREQ(2.50)
>  AC_INIT(gnash, cvs)
> @@ -773,6 +773,7 @@
>  AC_CHECK_HEADERS(malloc.h)
>  AC_CHECK_HEADERS(getopt.h)
>  AC_CHECK_HEADERS(libgen.h)
> +AC_CHECK_HEADERS(pwd.h)
>  AC_CHECK_LIB(m, sqrt)
>
>  dnl don't look for X11 when using a raw framebuffer for the GUI
>
> Index: doc/C/usermanual/usage/gnashrc.xml
> ===================================================================
> RCS file: /sources/gnash/gnash/doc/C/usermanual/usage/gnashrc.xml,v
> retrieving revision 1.7
> retrieving revision 1.8
> diff -u -b -r1.7 -r1.8
> --- doc/C/usermanual/usage/gnashrc.xml  19 Aug 2007 20:01:12 -0000      1.7
> +++ doc/C/usermanual/usage/gnashrc.xml  20 Aug 2007 17:48:09 -0000      1.8
> @@ -97,7 +97,9 @@
>  <entry>debuglog</entry>
>  <entry>Absolute path</entry>
>  <entry>This is the full path and name of debug logfile as
> -           produced by &app;.</entry>
> +       produced by &app;. On systems with a UNIX-type shell,
> +        a tilde prefix (~) will be expanded as by Posix shell requirements
> +        (see http://www.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html#tag_02_06_01).</entry>
>  </row>
>  <row>
>  <entry>writelog</entry>
>
> Index: libbase/rc.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/libbase/rc.cpp,v
> retrieving revision 1.28
> retrieving revision 1.29
> diff -u -b -r1.28 -r1.29
> --- libbase/rc.cpp      19 Aug 2007 20:01:13 -0000      1.28
> +++ libbase/rc.cpp      20 Aug 2007 17:48:09 -0000      1.29
> @@ -22,6 +22,10 @@
>  # include "config.h"
>  #endif
>
> +#ifdef HAVE_PWD_H
> +# include <pwd.h>
> +#endif
> +
>  #include <sys/types.h>
>  #include <sys/stat.h>
>
> @@ -144,6 +148,65 @@
>     return *num;
>  }
>
> +string
> +RcInitFile::expandTilde (std::string& unixpath)
> +
> +{
> +string _expanded;
> +
> +              //Only if path starts with "~"
> +             if (unixpath.substr(0,1) == "~") {
> +             const char *home = getenv("HOME");
> +                     if (unixpath.substr(1,2) == "/") {
> +                          // Initial "~" followed by "/"
> +                          if (home) {
> +                               // if HOME set in env, replace ~ with HOME
> +                               _expanded = unixpath.replace(0,1,home);
> +                          }
> +                          //HOME not set in env: try using pwd
> +                          else {
> +                               struct passwd *password = getpwuid(getuid());
> +                               const char *pwdhome = password->pw_dir;
> +                               if (home) { _expanded = unixpath.replace(0,1,pwdhome); }
> +                               //If all that fails, leave path alone
> +                               else _expanded = unixpath;
> +                          }
> +                     }
> +
> +                     //Initial "~" is not followed by "/"
> +                     else {
> +                          const char *userhome = NULL;
> +                          string::size_type first_slash = unixpath.find_first_of("/");
> +                          string user;
> +                          if (first_slash != string::npos) {
> +                              // everything between initial ~ and /
> +                              user = unixpath.substr(1, first_slash - 1 );
> +                          }
> +
> +                          //find user using pwd
> +                          struct passwd *password = getpwnam(user.c_str());
> +                          if (password) {
> +                              //User found
> +                              userhome = password->pw_dir;
> +                          }
> +                          if (userhome) {
> +                               string foundhome(userhome);
> +                               _expanded = unixpath.replace(0,first_slash,foundhome);
> +                          }
> +                          else {
> +                               //User not found and/or pwd doesn't return homedir:
> +                               //Leave path alone.
> +                               _expanded = unixpath;
> +                          }
> +                      }
> +                 }
> +                 //Path doesn't start with ~, leave it alone.
> +                 else {
> +                      _expanded = unixpath;
> +                 }
> +     return _expanded;
> +}
> +
>  // Parse the config file and set the variables.
>  bool
>  RcInitFile::parseFile(const std::string& filespec)
> @@ -211,7 +274,14 @@
>                 }
>
>                 if (variable == "debuglog") {
> +
> +#ifdef HAVE_PWD_H
> +                    _log = expandTilde (value);
> +#else
> +//For non-UNIX systems
>                     _log = value;
> +#endif
> +
>                 }
>
>                 if (variable == "documentroot") {
>
> Index: libbase/rc.h
> ===================================================================
> RCS file: /sources/gnash/gnash/libbase/rc.h,v
> retrieving revision 1.22
> retrieving revision 1.23
> diff -u -b -r1.22 -r1.23
> --- libbase/rc.h        19 Aug 2007 20:01:13 -0000      1.22
> +++ libbase/rc.h        20 Aug 2007 17:48:09 -0000      1.23
> @@ -102,6 +102,8 @@
>     static int extractNumber(int *num, const char *pattern, std::string &variable,
>                         std::string &value);
>
> +    static std::string expandTilde(std::string& unixpath);
> +
>     const std::vector<std::string>& getWhiteList() const { return _whitelist; }
>     const std::vector<std::string>& getBlackList() const { return _blacklist; }
>
>
>
> _______________________________________________
> Gnash-commit mailing list
> Gnash-commit@gnu.org
> http://lists.gnu.org/mailman/listinfo/gnash-commit
>



From MAILER-DAEMON Tue Aug 21 05:58:59 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INQVm-0006fD-Qy
	for mharc-gnash-commit@gnu.org; Tue, 21 Aug 2007 05:58:58 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INQVk-0006dX-32
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 05:58:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INQVh-0006cz-Gp
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 05:58:55 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INQVg-0006cn-IZ
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 05:58:52 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1INQVf-0006Dv-Qc
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 05:58:52 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l7L9wSt07283;
	Tue, 21 Aug 2007 11:58:28 +0200 (CEST)
	(envelope-from strk@keybit.net)
Date: Tue, 21 Aug 2007 11:58:28 +0200
From: Sandro Santilli <strk@keybit.net>
To: zou lunkai <zoulunkai@gmail.com>,
	Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
Subject: Re: [Gnash-commit] gnash ChangeLog configure.ac doc/C/usermanual/u...
Message-ID: <20070821095828.GA98862@keybit.net>
Mail-Followup-To: zou lunkai <zoulunkai@gmail.com>,
	Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>,
	gnash-commit@gnu.org
References: <E1INBMI-0003By-27@cvs.savannah.gnu.org>
	<ca4b43ff0708210056q753b7134vcec28193ff19231@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <ca4b43ff0708210056q753b7134vcec28193ff19231@mail.gmail.com>
X-Detected-Kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Aug 2007 09:58:56 -0000

On Tue, Aug 21, 2007 at 03:56:43PM +0800, zou lunkai wrote:
> > +#ifdef HAVE_PWD_H
> > +# include <pwd.h>
> > +#endif
> 
> > + struct passwd *password = getpwuid(getuid());
> 
> What if there is no pwd.h?  Should we take care of this, to make the
> code still compiles?

Yes, of course. Thanks for pointing out.
Ben ? A new patch  ?

--strk;



From MAILER-DAEMON Tue Aug 21 07:22:21 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INRoT-0007aC-Cj
	for mharc-gnash-commit@gnu.org; Tue, 21 Aug 2007 07:22:21 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INRoR-0007ZG-TI
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 07:22:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INRoR-0007Z3-7Z
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 07:22:19 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INRoR-0007Z0-1v
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 07:22:19 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1INRoQ-000314-VM
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 07:22:19 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1INRoQ-0000eM-2U
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 11:22:18 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1INRoP-0000eJ-Ri
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 11:22:17 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INRoP-0000eJ-Ri@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Tue, 21 Aug 2007 11:22:17 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/dlist.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Aug 2007 11:22:20 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/21 11:22:17

Modified files:
	.              : ChangeLog 
	server         : dlist.cpp 

Log message:
	* server/dlist.cpp: update display(), for masks. It should work better, at least for agg renderer.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4053&r2=1.4054
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.cpp?cvsroot=gnash&r1=1.75&r2=1.76

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4053
retrieving revision 1.4054
diff -u -b -r1.4053 -r1.4054
--- ChangeLog	21 Aug 2007 03:49:41 -0000	1.4053
+++ ChangeLog	21 Aug 2007 11:22:17 -0000	1.4054
@@ -2,6 +2,10 @@
 
         * server/swf.h: Add new tag values for SWF 9 support.
 
+2007-08-21 Zou Lunkai <zoulunkai@gmail.com>
+	
+	* server/dlist.cpp: update display(), for masks, please check.
+	
 2007-08-21 Sandro Santilli <strk@keybit.net>
 
 	* server/edit_text_character.cpp (add_invalidated_bounds): use

Index: server/dlist.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- server/dlist.cpp	9 Aug 2007 12:18:05 -0000	1.75
+++ server/dlist.cpp	21 Aug 2007 11:22:17 -0000	1.76
@@ -27,6 +27,7 @@
 #include <typeinfo>
 #include <iostream>
 #include <algorithm>
+#include <stack>
 
 namespace gnash {
 
@@ -762,71 +763,52 @@
 DisplayList::display()
 {
 	//GNASH_REPORT_FUNCTION;
+    std::stack<int> clipDepthStack;
 	
-//		printf(".");
-
-	bool masked = false;
-	int highest_masked_layer = 0;
-	
-	//log_msg(_("number of objects to be drawn %d"), m_display_object_array.size());
-	
-	for( iterator it = _characters.begin(),
-			endIt = _characters.end();
+    for( iterator it = _characters.begin(), endIt = _characters.end();
 		it != endIt; ++it)
 	{
-		DisplayItem& dobj = *it;
-
-		//character*	ch = dobj.m_character.get();
-		character*	ch = dobj.get();
-
+        character* ch = it->get();
 		assert(ch);
 
 		if (ch->get_visible() == false)
 		{
+            // avoid stale old_invalidated_rect
+            ch->clear_invalidated(); 
 			// Don't display.
-			ch->clear_invalidated(); // avoid stale old_invalidated_rect
+            // TODO: test invisible characters as masks
 			continue;
 		}
 
-		// check whether a previous mask should be disabled
-		if (masked)
-		{
-			if (ch->get_depth() > highest_masked_layer)
+        int depth = ch->get_depth();
+        // Discard useless masks
+        while(!clipDepthStack.empty() && (depth > clipDepthStack.top()))
 			{
-//					log_msg(_("disabled mask before drawing depth %d"), ch->get_depth());
-				masked = false;
-				// turn off mask
+            clipDepthStack.pop();
 				render::disable_mask();
 			}
-		}
 
-		// check whether this object should become mask
-		// (see bug #20527 for the "&& !masked" condition)
-		if (ch->isMask() && !masked)
+        int clipDepth = ch->get_clip_depth();
+        // Push a new mask to the masks stack
+        if(clipDepth != character::noClipDepthValue)
 		{
-			//log_msg(_("begin submit mask"));
+            clipDepthStack.push(clipDepth);
 			render::begin_submit_mask();
 		}
 		
 		ch->display();
 
-		// if this object should have become a mask,
-		// inform the renderer that it now has all
-		// information about it
-		if (ch->isMask() && !masked)
+        // Notify the renderer that mask drawing has finished.
+        if (ch->isMask())
 		{
-			//log_msg(_("end submit mask"));
 			render::end_submit_mask();
-			highest_masked_layer = ch->get_clip_depth();
-			masked = true;
-		}
 	}
+    } //end of for
 	
-	if (masked)
+    // Discard any remaining masks
+    while(!clipDepthStack.empty())
 	{
-		// If a mask masks the scene all the way up to the highest
-		// layer, it will not be disabled at the end of drawing
-		// the display list, so disable it manually.
+        clipDepthStack.pop();
 		render::disable_mask();
 	}
 }



From MAILER-DAEMON Tue Aug 21 09:21:30 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INTfm-0003bc-SM
	for mharc-gnash-commit@gnu.org; Tue, 21 Aug 2007 09:21:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INTfm-0003bW-BI
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 09:21:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INTfl-0003as-LN
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 09:21:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INTfl-0003ao-HU
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 09:21:29 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1INTfl-0004j8-N2
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 09:21:29 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <udo.gnu@nova-sys.net>) id 1INTfj-0000Vn-Qm
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 13:21:27 +0000
Received: from udog by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <udog@savannah.gnu.org>) id 1INTfj-0000Vk-Jw
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 13:21:27 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INTfj-0000Vk-Jw@cvs.savannah.gnu.org>
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
Date: Tue, 21 Aug 2007 13:21:27 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog backend/render_handler_tri.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Aug 2007 13:21:30 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Udo Giacomozzi <udog>	07/08/21 13:21:27

Modified files:
	.              : ChangeLog 
	backend        : render_handler_tri.cpp 

Log message:
	backend/render_handler_tri.cpp: fix world_to_pixel() so that OpenGL works again

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4054&r2=1.4055
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_tri.cpp?cvsroot=gnash&r1=1.18&r2=1.19

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.4054
retrieving revision 1.4055
diff -u -b -r1.4054 -r1.4055
--- ChangeLog	21 Aug 2007 11:22:17 -0000	1.4054
+++ ChangeLog	21 Aug 2007 13:21:26 -0000	1.4055
@@ -1,3 +1,8 @@
+2007-08-02 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* backend/render_handler_tri.cpp: fix world_to_pixel() so that OpenGL
+	  works again 	
+
 2007-08-22 Chad Musick <chadmusick@msbx.net>
 
 	* server/swf.h: Add new tag values for SWF 9 support.

Index: backend/render_handler_tri.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/backend/render_handler_tri.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- backend/render_handler_tri.cpp	30 Jul 2007 21:26:39 -0000	1.18
+++ backend/render_handler_tri.cpp	21 Aug 2007 13:21:27 -0000	1.19
@@ -18,7 +18,7 @@
 // 
 //
 
-/* $Id: render_handler_tri.cpp,v 1.18 2007/07/30 21:26:39 strk Exp $ */
+/* $Id: render_handler_tri.cpp,v 1.19 2007/08/21 13:21:27 udog Exp $ */
 
 #include "render_handler_tri.h"
 
@@ -347,7 +347,7 @@
 {
   // TODO: verify this is correct
   geometry::Range2d<int> ret(worldbounds.getRange());
-  ret.scale(20); // twips to pixels
+  ret.scale(1.0/20.0); // twips to pixels
   return ret;
 }
 



From MAILER-DAEMON Tue Aug 21 09:27:11 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INTlH-0004uV-7B
	for mharc-gnash-commit@gnu.org; Tue, 21 Aug 2007 09:27:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INTlG-0004uQ-2q
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 09:27:10 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INTlF-0004uE-D8
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 09:27:09 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INTlF-0004uB-9I
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 09:27:09 -0400
Received: from server2.indunet.it ([217.70.144.109])
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <udo.gnu@nova-sys.net>) id 1INTlF-0005qX-5v
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 09:27:09 -0400
Received: from UDO-LAPTOP (sadsl-246098.rol.raiffeisen.net [195.254.246.98])
	(authenticated bits=0)
	by server2.indunet.it (8.12.8/8.12.5) with ESMTP id l7LDR4U4005923;
	Tue, 21 Aug 2007 15:27:06 +0200
Date: Tue, 21 Aug 2007 15:27:03 +0200
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
X-Mailer: The Bat! (v3.99.3) Professional
Organization: NOVASYS
X-Priority: 3 (Normal)
Message-ID: <6710531201.20070821152703@nova-sys.net>
To: Udo Giacomozzi <udo.gnu@nova-sys.net>
Subject: Re: [Gnash-commit] gnash ChangeLog backend/render_handler_tri.cpp
In-Reply-To: <E1INTfj-0000Vk-Jw@cvs.savannah.gnu.org>
References: <E1INTfj-0000Vk-Jw@cvs.savannah.gnu.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
X-Detected-Kernel: Linux 2.4-2.6
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Udo Giacomozzi <udo.gnu@nova-sys.net>
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Aug 2007 13:27:10 -0000

Hello Udo,

Tuesday, August 21, 2007, 3:21:27 PM, you wrote:
UG>         backend/render_handler_tri.cpp: fix world_to_pixel() so
UG> that OpenGL works again 

Important note: All renderers except AGG currently use incomplete
conversion routines between screen coordinates and TWIPS. These
routines, found in render_handler_tri.cpp, assume that the stage is
not resized (1 pixel == 20 TWIPS) and will lead to all kinds of weird
results when this is not the case (using the -s switch, for example).

The goal is to have all renderers use a "stage matrix" like AGG does.
This is a global matrix that's concatenated to any other matrix and
allows free positioning and scaling of the whole movie. As a side
effect, it allows also skewing and rotating of the movie, but we don't
need that.

Udo




From MAILER-DAEMON Tue Aug 21 09:29:08 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INTnA-0005HU-HK
	for mharc-gnash-commit@gnu.org; Tue, 21 Aug 2007 09:29:08 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INTn9-0005H9-1h
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 09:29:07 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INTn7-0005Gx-M5
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 09:29:05 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INTn7-0005Gu-H7
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 09:29:05 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1INTn7-0006C4-Kg
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 09:29:05 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <udo.gnu@nova-sys.net>) id 1INTn6-0000gN-OC
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 13:29:04 +0000
Received: from udog by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <udog@savannah.gnu.org>) id 1INTn6-0000gK-JH
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 13:29:04 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INTn6-0000gK-JH@cvs.savannah.gnu.org>
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
Date: Tue, 21 Aug 2007 13:29:04 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog backend/render_handler_tri.cpp
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Aug 2007 13:29:07 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Udo Giacomozzi <udog>	07/08/21 13:29:04

Modified files:
	.              : ChangeLog 
	backend        : render_handler_tri.cpp 

Log message:
	backend/render_handler_tri.cpp: fix world_to_pixel() so that OpenGL works again

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.48&r2=1.3971.2.49
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_tri.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.18&r2=1.18.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.48
retrieving revision 1.3971.2.49
diff -u -b -r1.3971.2.48 -r1.3971.2.49
--- ChangeLog	20 Aug 2007 18:09:27 -0000	1.3971.2.48
+++ ChangeLog	21 Aug 2007 13:29:03 -0000	1.3971.2.49
@@ -1,3 +1,8 @@
+2007-08-21 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* backend/render_handler_tri.cpp: fix world_to_pixel() so that OpenGL
+	  works again 	
+
 2007-08-20 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
 
 	* configure.ac: look for the pwd.h header

Index: backend/render_handler_tri.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/backend/render_handler_tri.cpp,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -u -b -r1.18 -r1.18.2.1
--- backend/render_handler_tri.cpp	30 Jul 2007 21:26:39 -0000	1.18
+++ backend/render_handler_tri.cpp	21 Aug 2007 13:29:04 -0000	1.18.2.1
@@ -18,7 +18,7 @@
 // 
 //
 
-/* $Id: render_handler_tri.cpp,v 1.18 2007/07/30 21:26:39 strk Exp $ */
+/* $Id: render_handler_tri.cpp,v 1.18.2.1 2007/08/21 13:29:04 udog Exp $ */
 
 #include "render_handler_tri.h"
 
@@ -347,7 +347,7 @@
 {
   // TODO: verify this is correct
   geometry::Range2d<int> ret(worldbounds.getRange());
-  ret.scale(20); // twips to pixels
+  ret.scale(1.0/20.0); // twips to pixels
   return ret;
 }
 



From MAILER-DAEMON Tue Aug 21 09:30:44 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INToi-0005ZU-0i
	for mharc-gnash-commit@gnu.org; Tue, 21 Aug 2007 09:30:44 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INTog-0005Yo-9m
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 09:30:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INTof-0005YS-LR
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 09:30:41 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INTof-0005YI-DR
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 09:30:41 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1INTof-0006Uy-By
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 09:30:41 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <udo.gnu@nova-sys.net>) id 1INTod-0000iy-NJ
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 13:30:39 +0000
Received: from udog by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <udog@savannah.gnu.org>) id 1INTod-0000iv-Fh
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 13:30:39 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INTod-0000iv-Fh@cvs.savannah.gnu.org>
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
Date: Tue, 21 Aug 2007 13:30:39 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Aug 2007 13:30:42 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Udo Giacomozzi <udog>	07/08/21 13:30:39

Modified files:
	.              : ChangeLog 

Log message:
	correct date

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4055&r2=1.4056

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.4055
retrieving revision 1.4056
diff -u -b -r1.4055 -r1.4056
--- ChangeLog	21 Aug 2007 13:21:26 -0000	1.4055
+++ ChangeLog	21 Aug 2007 13:30:38 -0000	1.4056
@@ -1,4 +1,4 @@
-2007-08-02 Udo Giacomozzi <udo.gnu@nova-sys.net>
+2007-08-21 Udo Giacomozzi <udo.gnu@nova-sys.net>
 
 	* backend/render_handler_tri.cpp: fix world_to_pixel() so that OpenGL
 	  works again 	



From MAILER-DAEMON Tue Aug 21 10:14:45 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INUVJ-0005fZ-DO
	for mharc-gnash-commit@gnu.org; Tue, 21 Aug 2007 10:14:45 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INUVH-0005fO-QT
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 10:14:43 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INUVB-0005dq-Gs
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 10:14:42 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INUVB-0005dh-84
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 10:14:37 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <chadmusick@msbx.net>) id 1INUVB-0007JE-IA
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 10:14:37 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <chadmusick@msbx.net>) id 1INUVA-0004N2-Fa
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 14:14:36 +0000
Received: from cmusick by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <cmusick@savannah.gnu.org>) id 1INUVA-0004Ms-7b
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 14:14:36 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INUVA-0004Ms-7b@cvs.savannah.gnu.org>
From: Chad Musick <chadmusick@msbx.net>
Date: Tue, 21 Aug 2007 14:14:36 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash testsuite/misc-ming.all/DrawingApiTestRun...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Aug 2007 14:14:44 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Chad Musick <cmusick>	07/08/21 14:14:36

Modified files:
	testsuite/misc-ming.all: DrawingApiTestRunner.cpp 
	.              : ChangeLog 

Log message:
	Fix a problem with make check for gcc 4.1.2

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4056&r2=1.4057

Patches:

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4056
retrieving revision 1.4057
diff -u -b -r1.4056 -r1.4057
--- ChangeLog	21 Aug 2007 13:30:38 -0000	1.4056
+++ ChangeLog	21 Aug 2007 14:14:35 -0000	1.4057
@@ -1,9 +1,15 @@
+2007-08-21 Chad Musick <chadmusick@msbx.net>
+
+        * testsuite/misc-ming.all/DrawingApiTestRunner.cpp
+	  Add a . output to stderr to fix a problem with make check in some
+	  versions of gcc.
+
 2007-08-21 Udo Giacomozzi <udo.gnu@nova-sys.net>
 
 	* backend/render_handler_tri.cpp: fix world_to_pixel() so that OpenGL
 	  works again 	
 
-2007-08-22 Chad Musick <chadmusick@msbx.net>
+2007-08-21 Chad Musick <chadmusick@msbx.net>
 
 	* server/swf.h: Add new tag values for SWF 9 support.
 



From MAILER-DAEMON Tue Aug 21 10:41:03 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INUuk-00023f-Nw
	for mharc-gnash-commit@gnu.org; Tue, 21 Aug 2007 10:41:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INUuj-000235-BL
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 10:41:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INUui-00022i-0r
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 10:41:01 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INUuh-00022d-RL
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 10:40:59 -0400
Received: from server2.indunet.it ([217.70.144.109])
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <udo.gnu@nova-sys.net>) id 1INUuh-0004uE-T3
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 10:41:00 -0400
Received: from UDO-LAPTOP (sadsl-246098.rol.raiffeisen.net [195.254.246.98])
	(authenticated bits=0)
	by server2.indunet.it (8.12.8/8.12.5) with ESMTP id l7LEetU4020518;
	Tue, 21 Aug 2007 16:40:57 +0200
Date: Tue, 21 Aug 2007 16:40:52 +0200
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
X-Mailer: The Bat! (v3.99.3) Professional
Organization: NOVASYS
X-Priority: 3 (Normal)
Message-ID: <145600547.20070821164052@nova-sys.net>
To: Tomas Groth <tomasgroth@yahoo.dk>
Subject: Re: [Gnash-commit] gnash ChangeLog backend/sound_handler_sdl.cpp
In-Reply-To: <E1IKsi8-0000LP-CL@cvs.savannah.gnu.org>
References: <E1IKsi8-0000LP-CL@cvs.savannah.gnu.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
X-Detected-Kernel: Linux 2.4-2.6
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Udo Giacomozzi <udo.gnu@nova-sys.net>
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Aug 2007 14:41:01 -0000

Hello Tomas,

Tuesday, August 14, 2007, 11:29:12 AM, you wrote:
TG>                 * backend/sound_handler_sdl.cpp: Also count sounds who stops
TG>                   because the reached the end. Fixes random eventSoundTest1
TG>                   failures.

I think I get the same failures for GST:

FAILED: tester.soundsStopped() == '11' (expected: 12) [eventSoundTest1-Runner.cpp:92]

So far they don't seem random, I get them with each "make check" run
or when running eventSoundTest1-Runner manually.

I'm not familiar with the sound code, could you fix GST please?

Udo




From MAILER-DAEMON Tue Aug 21 10:42:19 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INUvz-0002d6-0t
	for mharc-gnash-commit@gnu.org; Tue, 21 Aug 2007 10:42:19 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INUvw-0002bl-HX
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 10:42:16 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INUvv-0002bM-HP
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 10:42:16 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INUvv-0002bG-Cw
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 10:42:15 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1INUvv-0005KI-HF
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 10:42:15 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1INUvt-0005gq-0R
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 14:42:13 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1INUvs-0005gk-Re
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 14:42:12 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INUvs-0005gk-Re@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 21 Aug 2007 14:42:12 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/edit_text_character.cpp ...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Aug 2007 14:42:16 -0000

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

Modified files:
	.              : ChangeLog 
	server         : edit_text_character.cpp edit_text_character.h 
	                 text.h 
	server/parser  : edit_text_character_def.h 
	testsuite/actionscript.all: TextField.as 

Log message:
	        * server/text.h: documentation bits for text_glyph_record
	        * server/edit_text_character.{cpp,h}: Add support for dynamic
	          wordWrap setting and initial autoSize handling.
	        * server/parser/edit_text_character_def.h: style & cleanups.
	        * testsuite/actionscript.all/TextField.as: more successes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4057&r2=1.4058
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.102&r2=1.103
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.h?cvsroot=gnash&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/gnash/server/text.h?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/edit_text_character_def.h?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/TextField.as?cvsroot=gnash&r1=1.17&r2=1.18

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4057
retrieving revision 1.4058
diff -u -b -r1.4057 -r1.4058
--- ChangeLog	21 Aug 2007 14:14:35 -0000	1.4057
+++ ChangeLog	21 Aug 2007 14:42:11 -0000	1.4058
@@ -1,3 +1,11 @@
+2007-08-21 Sandro Santilli <strk@keybit.net>
+
+	* server/text.h: documentation bits for text_glyph_record
+	* server/edit_text_character.{cpp,h}: Add support for dynamic 
+	  wordWrap setting and initial autoSize handling.
+	* server/parser/edit_text_character_def.h: style & cleanups.
+	* testsuite/actionscript.all/TextField.as: more successes.
+
 2007-08-21 Chad Musick <chadmusick@msbx.net>
 
         * testsuite/misc-ming.all/DrawingApiTestRunner.cpp

Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- server/edit_text_character.cpp	21 Aug 2007 00:33:13 -0000	1.102
+++ server/edit_text_character.cpp	21 Aug 2007 14:42:12 -0000	1.103
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: edit_text_character.cpp,v 1.102 2007/08/21 00:33:13 strk Exp $ */
+/* $Id: edit_text_character.cpp,v 1.103 2007/08/21 14:42:12 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -82,6 +82,7 @@
 static as_value textfield_textColor_getset(const fn_call& fn);
 static as_value textfield_embedFonts_getset(const fn_call& fn);
 static as_value textfield_autoSize_getset(const fn_call& fn);
+static as_value textfield_wordWrap_getset(const fn_call& fn);
 
 
 //
@@ -329,6 +330,8 @@
 	o.init_property("embedFonts", *getset, *getset);
 	getset = new builtin_function(textfield_autoSize_getset);
 	o.init_property("autoSize", *getset, *getset);
+	getset = new builtin_function(textfield_wordWrap_getset);
+	o.init_property("wordWrap", *getset, *getset);
 
 
 	if ( target_version  < 7 ) return;
@@ -393,6 +396,7 @@
 	_borderColor(0,0,0,255),
 	_textColor(m_def->get_text_color()),
 	_embedFonts(m_def->getUseEmbeddedGlyphs()),
+	_wordWrap(m_def->do_word_wrap()),
 	_autoSize(autoSizeNone),
 	_bounds(m_def->get_bounds().getRange())
 {
@@ -962,9 +966,11 @@
 	//assert(extra_space >= 0.0f);
 	if (extra_space <= 0.0f)
 	{
+#ifdef GNASH_DEBUG_TEXTFIELDS
 		log_debug(_("TextField text doesn't fit in its boundaries: "
 			    "width %g, margin %g - nothing to align"),
 			    width, right_margin);
+#endif
 		return 0.0f;
 	}
 
@@ -1027,14 +1033,20 @@
 	}
 
 	float	scale = m_def->get_font_height() / 1024.0f;	// the EM square is 1024 x 1024
+	float fontDescent = _font->get_descent() * scale;
+	float fontLeading = _font->get_leading() * scale;
+	uint16_t fontHeight = m_def->get_font_height();
+	uint16_t leftMargin = m_def->get_left_margin();
+	uint16_t rightMargin = m_def->get_right_margin();
+	uint16_t indent = m_def->get_indent();
 
 	text_glyph_record	rec;	// one to work on
 	rec.m_style.setFont(_font);
 	rec.m_style.m_color = getTextColor(); 
-	rec.m_style.m_x_offset = PADDING_TWIPS + std::max(0, m_def->get_left_margin() + m_def->get_indent());
-	rec.m_style.m_y_offset = PADDING_TWIPS + m_def->get_font_height()
-		+ (_font->get_leading() - _font->get_descent()) * scale;
-	rec.m_style.m_text_height = m_def->get_font_height();
+	rec.m_style.m_x_offset = PADDING_TWIPS + std::max(0, leftMargin + indent); 
+	rec.m_style.m_y_offset = PADDING_TWIPS + fontHeight
+		+ (fontLeading - fontDescent);
+	rec.m_style.m_text_height = fontHeight;
 	rec.m_style.m_has_x_offset = true;
 	rec.m_style.m_has_y_offset = true;
 
@@ -1043,10 +1055,10 @@
 	
 
 	// Start the bbox at the upper-left corner of the first glyph.
-	reset_bounding_box(x, y - _font->get_descent() * scale + m_def->get_font_height());
+	reset_bounding_box(x, y - fontDescent + fontHeight); 
 
 	float	leading = m_def->get_leading();
-	leading += _font->get_leading() * scale;
+	leading += fontLeading * scale;
 
 	int	last_code = -1; // only used if _embedFonts
 	int	last_space_glyph = -1;
@@ -1060,18 +1072,6 @@
 	const char*	text = &_text[0]; 
 	while (uint32_t code = utf8::decode_next_unicode_character(&text))
 	{
-// @@ try to truncate overflow text??
-#if 0
-		if (y + _font->get_descent() * scale > m_def->height())
-		{
-			// Text goes below the bottom of our bounding box.
-			rec.m_glyphs.resize(0);
-			break;
-		}
-#endif // 0
-
-		//uint16_t	code = m_text[j];
-
 		if ( _embedFonts )
 		{
 			x += _font->get_kerning_adjustment(last_code, (int) code) * scale;
@@ -1080,7 +1080,7 @@
 
 		// Expand the bounding-box to the lower-right corner of each glyph as
 		// we generate it.
-		m_text_bounding_box.expandTo(x, y + _font->get_descent() * scale);
+		m_text_bounding_box.expandTo(x, y + fontDescent);
 
 		if (code == 13 || code == 10)
 		{
@@ -1096,9 +1096,8 @@
 			align_line(m_def->get_alignment(), last_line_start_record, x);
 
 			// new paragraphs get the indent.
-			x = std::max(0, m_def->get_left_margin() + m_def->get_indent()) + 
-			  PADDING_TWIPS;
-			y += m_def->get_font_height() + leading;
+			x = std::max(0, leftMargin + indent) + PADDING_TWIPS;
+			y += fontHeight + leading;
 
 			// Start a new record on the next line.
 			rec.m_glyphs.resize(0);
@@ -1106,7 +1105,7 @@
 			rec.m_style.m_color = getTextColor();
 			rec.m_style.m_x_offset = x;
 			rec.m_style.m_y_offset = y;
-			rec.m_style.m_text_height = m_def->get_font_height();
+			rec.m_style.m_text_height = fontHeight; 
 			rec.m_style.m_has_x_offset = true;
 			rec.m_style.m_has_y_offset = true;
 
@@ -1248,31 +1247,62 @@
 after_x_advance:
 
 		float width = _bounds.width(); // m_def->width()
-		float right_margin = m_def->get_right_margin();
+		//float right_margin = m_def->get_right_margin();
 
-		if (x >= width - right_margin - PADDING_TWIPS)
+		if (x >= width - rightMargin - PADDING_TWIPS)
 		{
+			//log_debug("Text in character %s exceeds margins", getTarget().c_str());
 			// Whoops, we just exceeded the box width. 
 			// Do word-wrap if requested to do so.
 
-			// TODO: don't query the definition about wordWrap,
-			//       we should have a wordWrap getter/setter instead !
-			//       Also, we should check autoSize (getAutoSize) and
-			//       behave accordingly
-			//
-			if ( ! m_def->do_word_wrap() )
+			if ( ! doWordWrap() )
+			{
+				//log_debug(" No word wrapping");
+				AutoSizeValue autoSize = getAutoSize();
+				if ( autoSize != autoSizeNone )
 			{
+					static bool warned = false;
+					if ( ! warned ) {
+						log_debug(_("TextField.autoSize != 'none' TESTING"));
+						warned = true;
+					}
+				}
+				else
+				{
+					//log_debug(" autoSize=NONE!");
+					// truncate long line, but keep expanding text box
 				bool newlinefound = false;
 				while ( (code = utf8::decode_next_unicode_character(&text)) )
 				{
+						if ( _embedFonts )
+						{
+							x += _font->get_kerning_adjustment(last_code, (int) code) * scale;
+							last_code = static_cast<int>(code);
+						}
+						// Expand the bounding-box to the lower-right corner of each glyph,
+						// even if we don't display it 
+						m_text_bounding_box.expandTo(x, y + fontDescent);
+#ifdef GNASH_DEBUG_TEXTFIELDS
+						std::stringstream ss;
+						ss << "Text bbox expanded to " << m_text_bounding_box << "(width: " << m_text_bounding_box.width() << ")";
+						log_debug("%s", ss.str().c_str());
+#endif
+
 					if (code == 13 || code == 10)
 					{
 						newlinefound = true;
 						break;
 					}
+
+						int index = _font->get_glyph_index((uint16_t) code, _embedFonts);
+						x += scale * _font->get_advance(index, _embedFonts);
+
 				}
 				if ( ! newlinefound ) break;
 			}
+			}
+			else // do word wrap
+			{
 
 			// Insert newline.
 
@@ -1282,6 +1312,7 @@
 			x = m_def->get_left_margin() + PADDING_TWIPS;
 			y += m_def->get_font_height() + leading;
 
+
 			// Start a new record on the next line.
 			rec.m_glyphs.resize(0);
 			rec.m_style.setFont(_font);
@@ -1292,6 +1323,8 @@
 			rec.m_style.m_has_x_offset = true;
 			rec.m_style.m_has_y_offset = true;
 			
+				// TODO : what if m_text_glyph_records is empty ? Is it possible ?
+				assert(!m_text_glyph_records.empty());
 			text_glyph_record&	last_line = m_text_glyph_records.back();
 			if (last_space_glyph == -1)
 			{
@@ -1325,6 +1358,7 @@
 			last_space_glyph = -1;
 			last_line_start_record = m_text_glyph_records.size();
 		}
+		}
 
 		if (m_cursor > character_idx)
 		{
@@ -1336,13 +1370,23 @@
 		// TODO: HTML markup
 	}
 
+	// Expand bounding box to include the whole text (if autoSize)
+	if ( _autoSize != autoSizeNone )
+	{
+		_bounds.expandTo(x+PADDING_TWIPS, y);
+	}
+	else
+	{
+		_bounds.expandTo(_bounds.getMaxX(), y);
+	}
+
 	// Add this line to our output.
 	m_text_glyph_records.push_back(rec);
 
 	float extra_space = align_line(m_def->get_alignment(), last_line_start_record, x);
 
 	m_xcursor += static_cast<int>(extra_space);
-	m_ycursor -= m_def->get_font_height() + (_font->get_leading() - _font->get_descent()) * scale;
+	m_ycursor -= fontHeight + (fontLeading - fontDescent);
 }
 
 void
@@ -1574,6 +1618,17 @@
 	}
 }
 
+void
+edit_text_character::setWordWrap(bool on)
+{
+	if ( _wordWrap != on )
+	{
+		set_invalidated();
+		_wordWrap=on;
+		format_text();
+	}
+}
+
 cxform	
 edit_text_character::get_world_cxform() const
 {
@@ -1704,6 +1759,23 @@
 }
 
 static as_value
+textfield_wordWrap_getset(const fn_call& fn)
+{
+	boost::intrusive_ptr<edit_text_character> ptr = ensureType<edit_text_character>(fn.this_ptr);
+
+	if ( fn.nargs == 0 ) // getter
+	{
+		return as_value(ptr->doWordWrap());
+	}
+	else // setter
+	{
+		ptr->setWordWrap( fn.arg(0).to_bool() );
+	}
+
+	return as_value();
+}
+
+static as_value
 textfield_autoSize_getset(const fn_call& fn)
 {
 	boost::intrusive_ptr<edit_text_character> ptr = ensureType<edit_text_character>(fn.this_ptr);
@@ -1782,13 +1854,6 @@
 {
 	if ( val == _autoSize ) return;
 
-	static bool warned = false;
-	if ( ! warned ) {
-		log_unimpl(_("TextField.autoSize unused"));
-		warned = true;
-	}
-
-	
 	set_invalidated();
 
 	_autoSize = val; 

Index: server/edit_text_character.h
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- server/edit_text_character.h	21 Aug 2007 00:33:13 -0000	1.46
+++ server/edit_text_character.h	21 Aug 2007 14:42:12 -0000	1.47
@@ -206,6 +206,24 @@
 	///
 	static const char* autoSizeValueName(AutoSizeValue val);
 
+	/// \brief
+	/// Return true if text should continue to next available line
+	/// when hitting end of bounding box.
+	///
+	bool doWordWrap() const {
+		return _wordWrap;
+	}
+
+	/// Set wordWrap parameter 
+	//
+	/// @param on
+	///	If true text hitting bounding box limits will continue
+	///	to next line.
+	///	If false, either text will be truncated or bounding box
+	///	expanded, depending on autoSize (see getAutoSize)
+	///
+	void setWordWrap(bool on);
+
 private:
 
 	/// Return true if HTML text is allowed 
@@ -313,6 +331,8 @@
 
 	bool _embedFonts;
 
+	bool _wordWrap;
+
 	AutoSizeValue _autoSize;
 
 	/// Area in which the text is drawn. 

Index: server/text.h
===================================================================
RCS file: /sources/gnash/gnash/server/text.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/text.h	18 Aug 2007 08:05:00 -0000	1.19
+++ server/text.h	21 Aug 2007 14:42:12 -0000	1.20
@@ -113,8 +113,10 @@
 	};
 
 
-	// Helper class.
-	// @@ text_character_def friend ?
+	/// A vector of glyphs sharing the same text_style
+	//
+	/// For each glyph, this class stores index and advance values
+	///
 	class text_glyph_record
 	{
 	public:

Index: server/parser/edit_text_character_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/edit_text_character_def.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/parser/edit_text_character_def.h	30 Jul 2007 18:38:15 -0000	1.19
+++ server/parser/edit_text_character_def.h	21 Aug 2007 14:42:12 -0000	1.20
@@ -231,7 +231,8 @@
 	  return m_no_select;
   }
 	
-	const rect&	get_bound() const {
+	const rect&	get_bound() const
+	{
 	  // I know it's stupid to have an alias that's nearly the same name but
     // get_bound() is required by the base class and get_bounds() was already
     // there. Should be fixed (remove get_bounds). 
@@ -338,15 +339,12 @@
 	
 	/// extra space between box's left border and text (in twips)
 	uint16_t m_left_margin;
-	//float	m_left_margin;
 
 	/// extra space between box's right border and text (in twips)
 	uint16_t m_right_margin;
-	//float	m_right_margin;
 
 	/// how much to indent the first line of multiline text (in twips)
 	uint16_t	m_indent;
-	//float	m_indent;
 
 	/// \brief
 	/// Extra space between lines

Index: testsuite/actionscript.all/TextField.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/TextField.as,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- testsuite/actionscript.all/TextField.as	16 Aug 2007 10:31:51 -0000	1.17
+++ testsuite/actionscript.all/TextField.as	21 Aug 2007 14:42:12 -0000	1.18
@@ -19,7 +19,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: TextField.as,v 1.17 2007/08/16 10:31:51 strk Exp $";
+rcsid="$Id: TextField.as,v 1.18 2007/08/21 14:42:12 strk Exp $";
 
 #include "check.as"
 
@@ -63,7 +63,7 @@
 check( !TextField.prototype.hasOwnProperty('textWidth') );
 check( !TextField.prototype.hasOwnProperty('type') );
 xcheck( !TextField.prototype.hasOwnProperty('variable') );
-check( !TextField.prototype.hasOwnProperty('wordWrap') );
+xcheck( !TextField.prototype.hasOwnProperty('wordWrap') );
 
 // this is a static method
 check_equals(typeof(TextField.getFontList), 'function');
@@ -132,7 +132,7 @@
 xcheck( TextField.prototype.hasOwnProperty('textWidth') );
 xcheck( TextField.prototype.hasOwnProperty('type') );
 check( TextField.prototype.hasOwnProperty('variable') );
-xcheck( TextField.prototype.hasOwnProperty('wordWrap') );
+check( TextField.prototype.hasOwnProperty('wordWrap') );
 
 // Check TextField._alpha
 
@@ -543,9 +543,10 @@
 
 // Check TextField.wordWrap (should text wrap when bbox limit is hit?)
 
-xcheck_equals(typeof(tf.wordWrap), 'boolean');
+check_equals(typeof(tf.wordWrap), 'boolean');
 check( ! tf.hasOwnProperty('wordWrap') ); 
-xcheck_equals(tf.wordWrap, false);
+check_equals(tf.wordWrap, false);
+// TODO: check what can be assigned to wordWrap and what not...
 
 // Check TextField._x 
 
@@ -623,13 +624,13 @@
 check_equals(tf._width, 10);
 origTextWidth = tf.textWidth;
 tf.autoSize = 'center';
-xcheck(tf._width > 10);
+check(tf._width > 10);
 check_equals(origTextWidth, tf.textWidth); // textWidth isn't influenced by autoSize 
 tf.autoSize = 'none';
 tf.wordWrap = true;
+check_equals(origTextWidth, tf.textWidth); 
 tf._width = 10;
-// Gnash ignores assigments to _width (should change TextField rendering area bounds instead)
 check_equals(tf._width, 10);
-check_equals(origTextWidth, tf.textWidth); // textWidth isn't influenced by wordWrap
+xcheck_equals(origTextWidth, tf.textWidth); // textWidth isn't influenced by wordWrap
 
 #endif // OUTPUT_VERSION > 5



From MAILER-DAEMON Tue Aug 21 11:03:13 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INVGD-0001MT-2Z
	for mharc-gnash-commit@gnu.org; Tue, 21 Aug 2007 11:03:13 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INVGB-0001L9-DT
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 11:03:11 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INVG9-0001Iv-Uf
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 11:03:10 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INVG9-0001IY-Iq
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 11:03:09 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1INVG9-0002c5-O8
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 11:03:09 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <udo.gnu@nova-sys.net>) id 1INVG8-0007V7-DD
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 15:03:08 +0000
Received: from udog by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <udog@savannah.gnu.org>) id 1INVG8-0007V4-9G
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 15:03:08 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INVG8-0007V4-9G@cvs.savannah.gnu.org>
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
Date: Tue, 21 Aug 2007 15:03:08 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog gui/gui.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Aug 2007 15:03:11 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Udo Giacomozzi <udog>	07/08/21 15:03:08

Modified files:
	.              : ChangeLog 
	gui            : gui.cpp 

Log message:
	gui/gui.cpp: Introduce FORCE_REDRAW macro

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4058&r2=1.4059
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.cpp?cvsroot=gnash&r1=1.91&r2=1.92

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.4058
retrieving revision 1.4059
diff -u -b -r1.4058 -r1.4059
--- ChangeLog	21 Aug 2007 14:42:11 -0000	1.4058
+++ ChangeLog	21 Aug 2007 15:03:07 -0000	1.4059
@@ -1,3 +1,7 @@
+2007-08-21 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* gui/gui.cpp: Introduce FORCE_REDRAW macro
+
 2007-08-21 Sandro Santilli <strk@keybit.net>
 
 	* server/text.h: documentation bits for text_glyph_record

Index: gui/gui.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/gui/gui.cpp,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- gui/gui.cpp	18 Aug 2007 13:08:15 -0000	1.91
+++ gui/gui.cpp	21 Aug 2007 15:03:08 -0000	1.92
@@ -37,9 +37,16 @@
 #include <cstdio>
 #include <cstring>
 
-/// Define this to have updated regions enclosed in a red rectangle
+/// Define this to make sure each frame is fully rendered from ground up
+/// even if no motion has been detected in the movie.
+//#define FORCE_REDRAW
+
+/// Define this to have updated regions enclosed in a red rectangle.
 /// In the future, enabling this might actually use a runtime flag
 /// as an additional conditional.
+/// This has the side effect that all frames will be re-rendered completely
+/// but in contrast to FORCE_REDRAW it won't re-render when no motion
+/// has been detected in the movie (for example when the movie is stopped).
 ///
 //#define ENABLE_REGION_UPDATES_DEBUGGING 1
 
@@ -355,7 +362,11 @@
 	bool redraw_flag;
 
 	// Should the frame be rendered completely, even if it did not change?
+#ifdef FORCE_REDRAW
+  redraw_flag = true;
+#else	
 	redraw_flag = _redraw_flag || want_redraw();
+#endif	
 	
 	// reset class member if we do a redraw now
 	if (redraw_flag) _redraw_flag=false;



From MAILER-DAEMON Tue Aug 21 11:05:07 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INVI3-0004Aq-0s
	for mharc-gnash-commit@gnu.org; Tue, 21 Aug 2007 11:05:07 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INVI0-00047j-N3
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 11:05:04 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INVHz-00045f-NC
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 11:05:03 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INVHz-00045I-Ap
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 11:05:03 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1INVHz-00039C-FD
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 11:05:03 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <udo.gnu@nova-sys.net>) id 1INVHy-0007ab-De
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 15:05:02 +0000
Received: from udog by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <udog@savannah.gnu.org>) id 1INVHy-0007aY-8e
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 15:05:02 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INVHy-0007aY-8e@cvs.savannah.gnu.org>
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
Date: Tue, 21 Aug 2007 15:05:02 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/gui gui.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Aug 2007 15:05:05 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Udo Giacomozzi <udog>	07/08/21 15:05:02

Modified files:
	gui            : gui.cpp 

Log message:
	minor change

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.cpp?cvsroot=gnash&r1=1.92&r2=1.93

Patches:
Index: gui.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/gui/gui.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- gui.cpp	21 Aug 2007 15:03:08 -0000	1.92
+++ gui.cpp	21 Aug 2007 15:05:02 -0000	1.93
@@ -39,7 +39,7 @@
 
 /// Define this to make sure each frame is fully rendered from ground up
 /// even if no motion has been detected in the movie.
-//#define FORCE_REDRAW
+//#define FORCE_REDRAW 1
 
 /// Define this to have updated regions enclosed in a red rectangle.
 /// In the future, enabling this might actually use a runtime flag



From MAILER-DAEMON Tue Aug 21 11:10:08 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INVMu-0001ij-2k
	for mharc-gnash-commit@gnu.org; Tue, 21 Aug 2007 11:10:08 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INVMs-0001iV-M7
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 11:10:06 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INVMr-0001iJ-Os
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 11:10:05 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INVMr-0001iG-J1
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 11:10:05 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <chadmusick@msbx.net>) id 1INVMr-0004bn-KW
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 11:10:05 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <chadmusick@msbx.net>) id 1INVMq-0007rq-J8
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 15:10:04 +0000
Received: from cmusick by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <cmusick@savannah.gnu.org>) id 1INVMq-0007rc-AM
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 15:10:04 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INVMq-0007rc-AM@cvs.savannah.gnu.org>
From: Chad Musick <chadmusick@msbx.net>
Date: Tue, 21 Aug 2007 15:10:04 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/testsuite/misc-ming.all DrawingApiTestRun...
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Aug 2007 15:10:06 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Chad Musick <cmusick>	07/08/21 15:10:03

Modified files:
	testsuite/misc-ming.all: DrawingApiTestRunner.cpp 

Log message:
	Hack to take care of make check failure in 4.1.2

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.20&r2=1.20.2.1

Patches:
Index: DrawingApiTestRunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -u -b -r1.20 -r1.20.2.1
--- DrawingApiTestRunner.cpp	1 Jul 2007 10:54:46 -0000	1.20
+++ DrawingApiTestRunner.cpp	21 Aug 2007 15:10:03 -0000	1.20.2.1
@@ -47,6 +47,7 @@
 	float halfside = ((float)radius * sqrt(2.0f))/2.0f;
 	ret.expandTo(int(round(x-halfside)), int(round(y-halfside)));
 	ret.expandTo(int(round(x+halfside)), int(round(y+halfside)));
+        fprintf(stderr, ".");
 	return ret;
 }
 



From MAILER-DAEMON Tue Aug 21 11:18:41 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INVVB-0006Iz-Jm
	for mharc-gnash-commit@gnu.org; Tue, 21 Aug 2007 11:18:41 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INVVA-0006Ij-0b
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 11:18:40 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INVV8-0006IX-AJ
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 11:18:38 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INVV8-0006IU-4T
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 11:18:38 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1INVV8-0006dn-H7
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 11:18:38 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1INVV6-0001El-Ss
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 15:18:37 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1INVV6-0001Eh-OI
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 15:18:36 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INVV6-0001Eh-OI@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 21 Aug 2007 15:18:36 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog configure.ac libbase/rc.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Aug 2007 15:18:40 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/21 15:18:36

Modified files:
	.              : ChangeLog configure.ac 
	libbase        : rc.cpp 

Log message:
	Patch by Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>:
	
	        * configure.ac: look for getpwnam
	        * libbase/rc.cpp (expandPath): don't try to use getpwnam
	          if not provided by OS.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4059&r2=1.4060
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.402&r2=1.403
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.cpp?cvsroot=gnash&r1=1.30&r2=1.31

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4059
retrieving revision 1.4060
diff -u -b -r1.4059 -r1.4060
--- ChangeLog	21 Aug 2007 15:03:07 -0000	1.4059
+++ ChangeLog	21 Aug 2007 15:18:35 -0000	1.4060
@@ -1,3 +1,9 @@
+2007-08-21 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
+
+	* configure.ac: look for getpwnam
+	* libbase/rc.cpp (expandPath): don't try to use getpwnam
+	  if not provided by OS.
+
 2007-08-21 Udo Giacomozzi <udo.gnu@nova-sys.net>
 
 	* gui/gui.cpp: Introduce FORCE_REDRAW macro

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -b -r1.402 -r1.403
--- configure.ac	20 Aug 2007 17:48:09 -0000	1.402
+++ configure.ac	21 Aug 2007 15:18:36 -0000	1.403
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.402 2007/08/20 17:48:09 strk Exp $
+dnl $Id: configure.ac,v 1.403 2007/08/21 15:18:36 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -775,6 +775,7 @@
 AC_CHECK_HEADERS(libgen.h)
 AC_CHECK_HEADERS(pwd.h)
 AC_CHECK_LIB(m, sqrt)
+AC_CHECK_LIB(c, getpwnam,AC_DEFINE(HAVE_GETPWNAM, 1, [Has getpwnam] ))
 
 dnl don't look for X11 when using a raw framebuffer for the GUI
 if test x$build_gtk = xyes -o x$build_kde = xyes -o x$build_fltk = xyes -o x$build_sdl = xyes; then

Index: libbase/rc.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- libbase/rc.cpp	20 Aug 2007 22:59:26 -0000	1.30
+++ libbase/rc.cpp	21 Aug 2007 15:18:36 -0000	1.31
@@ -152,6 +152,8 @@
 RcInitFile::expandPath (std::string& unixpath)
 
 {
+
+//Don't break build on systems without passwd / getpwnam
 string _expanded;
 
               //Only if path starts with "~"
@@ -163,7 +165,10 @@
                                // if HOME set in env, replace ~ with HOME
                                _expanded = unixpath.replace(0,1,home);
                           }
+
+#ifdef HAVE_GETPWNAM
                           //HOME not set in env: try using pwd
+
                           else { 
                                struct passwd *password = getpwuid(getuid());
                                const char *pwdhome = password->pw_dir;
@@ -171,6 +176,7 @@
                                //If all that fails, leave path alone
                                else _expanded = unixpath;
                           }
+
                      }
 
                      //Initial "~" is not followed by "/"
@@ -201,9 +207,22 @@
                       }
                  }
                  //Path doesn't start with ~, leave it alone.
+
+#else
+//For systems with pwd.h but not getpwnam, nothing to do if HOME not set.
+                          else _expanded = unixpath;
+                      }
+                      else _expanded = unixpath;
+                 }
+#endif
+
+
                  else {
                       _expanded = unixpath;
                  }
+
+
+
      return _expanded;
 }
 



From MAILER-DAEMON Tue Aug 21 11:26:24 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INVce-0007di-RZ
	for mharc-gnash-commit@gnu.org; Tue, 21 Aug 2007 11:26:24 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INVcd-0007cj-Fl
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 11:26:23 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INVcd-0007cQ-1Z
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 11:26:23 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INVcc-0007cE-Kk
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 11:26:22 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1INVcd-0008Ob-0G
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 11:26:23 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1INVcc-0001be-0v
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 15:26:22 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1INVcb-0001bZ-TH
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 15:26:21 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INVcb-0001bZ-TH@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 21 Aug 2007 15:26:21 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog configure.ac libbase/rc.cpp
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Aug 2007 15:26:23 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/21 15:26:21

Modified files:
	.              : ChangeLog configure.ac 
	libbase        : rc.cpp 

Log message:
	Patch by Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>:
	
	        * configure.ac: look for getpwnam
	        * libbase/rc.cpp (expandPath): don't try to use getpwnam
	          if not provided by OS.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.49&r2=1.3971.2.50
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.396.2.6&r2=1.396.2.7
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.27.2.3&r2=1.27.2.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.49
retrieving revision 1.3971.2.50
diff -u -b -r1.3971.2.49 -r1.3971.2.50
--- ChangeLog	21 Aug 2007 13:29:03 -0000	1.3971.2.49
+++ ChangeLog	21 Aug 2007 15:26:20 -0000	1.3971.2.50
@@ -1,3 +1,9 @@
+2007-08-21 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
+
+	* configure.ac: look for getpwnam
+	* libbase/rc.cpp (expandPath): don't try to use getpwnam
+	  if not provided by OS.
+
 2007-08-21 Udo Giacomozzi <udo.gnu@nova-sys.net>
 
 	* backend/render_handler_tri.cpp: fix world_to_pixel() so that OpenGL

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.396.2.6
retrieving revision 1.396.2.7
diff -u -b -r1.396.2.6 -r1.396.2.7
--- configure.ac	20 Aug 2007 18:09:28 -0000	1.396.2.6
+++ configure.ac	21 Aug 2007 15:26:21 -0000	1.396.2.7
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.396.2.6 2007/08/20 18:09:28 strk Exp $
+dnl $Id: configure.ac,v 1.396.2.7 2007/08/21 15:26:21 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, 0.8.1)
@@ -775,6 +775,7 @@
 AC_CHECK_HEADERS(libgen.h)
 AC_CHECK_HEADERS(pwd.h)
 AC_CHECK_LIB(m, sqrt)
+AC_CHECK_LIB(c, getpwnam,AC_DEFINE(HAVE_GETPWNAM, 1, [Has getpwnam] ))
 
 dnl don't look for X11 when using a raw framebuffer for the GUI
 if test x$build_gtk = xyes -o x$build_kde = xyes -o x$build_fltk = xyes -o x$build_sdl = xyes; then

Index: libbase/rc.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.cpp,v
retrieving revision 1.27.2.3
retrieving revision 1.27.2.4
diff -u -b -r1.27.2.3 -r1.27.2.4
--- libbase/rc.cpp	20 Aug 2007 23:19:44 -0000	1.27.2.3
+++ libbase/rc.cpp	21 Aug 2007 15:26:21 -0000	1.27.2.4
@@ -152,6 +152,8 @@
 RcInitFile::expandPath (std::string& unixpath)
 
 {
+
+//Don't break build on systems without passwd / getpwnam
 string _expanded;
 
               //Only if path starts with "~"
@@ -163,7 +165,10 @@
                                // if HOME set in env, replace ~ with HOME
                                _expanded = unixpath.replace(0,1,home);
                           }
+
+#ifdef HAVE_GETPWNAM
                           //HOME not set in env: try using pwd
+
                           else { 
                                struct passwd *password = getpwuid(getuid());
                                const char *pwdhome = password->pw_dir;
@@ -171,6 +176,7 @@
                                //If all that fails, leave path alone
                                else _expanded = unixpath;
                           }
+
                      }
 
                      //Initial "~" is not followed by "/"
@@ -201,9 +207,22 @@
                       }
                  }
                  //Path doesn't start with ~, leave it alone.
+
+#else
+//For systems with pwd.h but not getpwnam, nothing to do if HOME not set.
+                          else _expanded = unixpath;
+                      }
+                      else _expanded = unixpath;
+                 }
+#endif
+
+
                  else {
                       _expanded = unixpath;
                  }
+
+
+
      return _expanded;
 }
 



From MAILER-DAEMON Tue Aug 21 13:12:46 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INXHa-0000iy-N8
	for mharc-gnash-commit@gnu.org; Tue, 21 Aug 2007 13:12:46 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INXHZ-0000hU-4A
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 13:12:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INXHY-0000hB-Jd
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 13:12:44 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INXHY-0000h1-8P
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 13:12:44 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1INXHY-00071R-Qc
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 13:12:44 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1INXHW-0001Ns-Ma
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 17:12:42 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1INXHW-0001Nm-Gz
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 17:12:42 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INXHW-0001Nm-Gz@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 21 Aug 2007 17:12:42 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog libbase/embedVideoDecoderGst.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Aug 2007 17:12:45 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/21 17:12:42

Modified files:
	.              : ChangeLog 
	libbase        : embedVideoDecoderGst.cpp 

Log message:
	        * libbase/embedVideoDecoderGst.cpp (createDecoder): don't
	          abort if outputFormat is NONE (renderer missing).
	          Fixes bug bug #20852.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4060&r2=1.4061
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/embedVideoDecoderGst.cpp?cvsroot=gnash&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4060
retrieving revision 1.4061
diff -u -b -r1.4060 -r1.4061
--- ChangeLog	21 Aug 2007 15:18:35 -0000	1.4060
+++ ChangeLog	21 Aug 2007 17:12:41 -0000	1.4061
@@ -1,3 +1,9 @@
+2007-08-21 Sandro Santilli <strk@keybit.net>
+
+	* libbase/embedVideoDecoderGst.cpp (createDecoder): don't
+	  abort if outputFormat is NONE (renderer missing).
+	  Fixes bug bug #20852.
+
 2007-08-21 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
 
 	* configure.ac: look for getpwnam

Index: libbase/embedVideoDecoderGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/embedVideoDecoderGst.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- libbase/embedVideoDecoderGst.cpp	23 Jul 2007 22:09:49 -0000	1.9
+++ libbase/embedVideoDecoderGst.cpp	21 Aug 2007 17:12:42 -0000	1.10
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-// $Id: embedVideoDecoderGst.cpp,v 1.9 2007/07/23 22:09:49 strk Exp $
+// $Id: embedVideoDecoderGst.cpp,v 1.10 2007/08/21 17:12:42 strk Exp $
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -121,10 +121,14 @@
 	videocaps = gst_element_factory_make ("capsfilter", NULL);
 	if (outputFormat == YUV) {
 		caps = gst_caps_new_simple ("video/x-raw-yuv", NULL);
-	} else {
-		assert(outputFormat == RGB);
+	} else if ( outputFormat == RGB ) {
 		caps = gst_caps_new_simple ("video/x-raw-rgb", NULL);
 	}
+	else
+	{
+		assert(outputFormat == NONE);
+		return; // nothing to do, right ? TODO: some cleanup ?
+	}
 
 	assert(caps); // ok, this is a silly assertion *now*, but as long as 
 	              // the code is implemented with such long function bodies



From MAILER-DAEMON Tue Aug 21 13:14:32 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INXJI-0002L5-1H
	for mharc-gnash-commit@gnu.org; Tue, 21 Aug 2007 13:14:32 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INXJF-0002GW-Hz
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 13:14:29 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INXJE-0002EJ-Hl
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 13:14:28 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INXJE-0002E2-CB
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 13:14:28 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1INXJE-0007QA-Kt
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 13:14:28 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1INXJC-0001s4-VK
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 17:14:27 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1INXJC-0001ry-PE
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 17:14:26 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INXJC-0001ry-PE@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 21 Aug 2007 17:14:26 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog libbase/embedVideoDecoderGst.cpp
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Aug 2007 17:14:30 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/21 17:14:26

Modified files:
	.              : ChangeLog 
	libbase        : embedVideoDecoderGst.cpp 

Log message:
	        * libbase/embedVideoDecoderGst.cpp (createDecoder): don't
	          abort if outputFormat is NONE (renderer missing).
	          Fixes bug bug #20852.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.50&r2=1.3971.2.51
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/embedVideoDecoderGst.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.9&r2=1.9.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.50
retrieving revision 1.3971.2.51
diff -u -b -r1.3971.2.50 -r1.3971.2.51
--- ChangeLog	21 Aug 2007 15:26:20 -0000	1.3971.2.50
+++ ChangeLog	21 Aug 2007 17:14:25 -0000	1.3971.2.51
@@ -1,3 +1,9 @@
+2007-08-21 Sandro Santilli <strk@keybit.net>
+
+	* libbase/embedVideoDecoderGst.cpp (createDecoder): don't
+	  abort if outputFormat is NONE (renderer missing).
+	  Fixes bug bug #20852.
+
 2007-08-21 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
 
 	* configure.ac: look for getpwnam

Index: libbase/embedVideoDecoderGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/embedVideoDecoderGst.cpp,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -b -r1.9 -r1.9.2.1
--- libbase/embedVideoDecoderGst.cpp	23 Jul 2007 22:09:49 -0000	1.9
+++ libbase/embedVideoDecoderGst.cpp	21 Aug 2007 17:14:26 -0000	1.9.2.1
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-// $Id: embedVideoDecoderGst.cpp,v 1.9 2007/07/23 22:09:49 strk Exp $
+// $Id: embedVideoDecoderGst.cpp,v 1.9.2.1 2007/08/21 17:14:26 strk Exp $
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -121,10 +121,14 @@
 	videocaps = gst_element_factory_make ("capsfilter", NULL);
 	if (outputFormat == YUV) {
 		caps = gst_caps_new_simple ("video/x-raw-yuv", NULL);
-	} else {
-		assert(outputFormat == RGB);
+	} else if ( outputFormat == RGB ) {
 		caps = gst_caps_new_simple ("video/x-raw-rgb", NULL);
 	}
+	else
+	{
+		assert(outputFormat == NONE);
+		return; // nothing to do, right ? TODO: some cleanup ?
+	}
 
 	assert(caps); // ok, this is a silly assertion *now*, but as long as 
 	              // the code is implemented with such long function bodies



From MAILER-DAEMON Tue Aug 21 19:38:41 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INdJ3-0001r2-CH
	for mharc-gnash-commit@gnu.org; Tue, 21 Aug 2007 19:38:41 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INdJ1-0001nS-Ho
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 19:38:39 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INdJ0-0001kR-6s
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 19:38:39 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INdJ0-0001k1-0v
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 19:38:38 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1INdJ0-00042n-2G
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 19:38:38 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1INdIy-0003WR-8W
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 23:38:36 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1INdIy-0003WO-3j
	for gnash-commit@gnu.org; Tue, 21 Aug 2007 23:38:36 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INdIy-0003WO-3j@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 21 Aug 2007 23:38:36 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog gui/gtk.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Aug 2007 23:38:39 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/21 23:38:36

Modified files:
	.              : ChangeLog 
	gui            : gtk.cpp 

Log message:
	Patch by Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>:
	
	        * gui/gtk.cpp: rename View->MovieInfo to View->Properties,
	          make layout nicer and labels selectable.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4061&r2=1.4062
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.103&r2=1.104

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4061
retrieving revision 1.4062
diff -u -b -r1.4061 -r1.4062
--- ChangeLog	21 Aug 2007 17:12:41 -0000	1.4061
+++ ChangeLog	21 Aug 2007 23:38:35 -0000	1.4062
@@ -1,3 +1,8 @@
+2007-08-21 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
+
+	* gui/gtk.cpp: rename View->MovieInfo to View->Properties,
+	  make layout nicer and labels selectable.
+
 2007-08-21 Sandro Santilli <strk@keybit.net>
 
 	* libbase/embedVideoDecoderGst.cpp (createDecoder): don't

Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -b -r1.103 -r1.104
--- gui/gtk.cpp	18 Aug 2007 13:08:15 -0000	1.103
+++ gui/gtk.cpp	21 Aug 2007 23:38:35 -0000	1.104
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: gtk.cpp,v 1.103 2007/08/18 13:08:15 strk Exp $ */
+/* $Id: gtk.cpp,v 1.104 2007/08/21 23:38:35 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -942,6 +942,12 @@
                    NULL);
 }
 
+
+//Movie information / properties dialogue
+//
+//
+//
+
 void
 GtkGui::menuitem_movieinfo_callback(GtkMenuItem* /*menuitem*/, gpointer data)
 {
@@ -952,16 +958,33 @@
 
     GtkWidget* label;
 
-    GtkWidget* window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-    gtk_window_set_title (GTK_WINDOW (window), _("Movie info"));
-    gtk_widget_show (window);
+    GtkWidget* window1 = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+    gtk_window_set_title (GTK_WINDOW (window1), _("Movie Properties"));
+
+    GtkWidget *main_vbox = gtk_vbox_new(FALSE, 2);
+    gtk_container_add (GTK_CONTAINER (window1), main_vbox);
+
+    GtkWidget *frame1 = gtk_frame_new("Movie Properties");
+    gtk_box_pack_start (GTK_BOX (main_vbox), frame1, FALSE, FALSE, 0);
+
+    GtkWidget *vbox1 = gtk_vbox_new (FALSE, 3);
+    gtk_container_add (GTK_CONTAINER (frame1), vbox1);
+
+    GtkWidget *vbox2 = gtk_vbox_new (FALSE, 2);
+    gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
+
+    GtkWidget *label_vbox2 = gtk_label_new("VM Properties");
+    gtk_box_pack_start (GTK_BOX (vbox2), label_vbox2, FALSE, FALSE, 0);
+
+    GtkWidget *table1 = gtk_table_new(4, 2, FALSE);
+    gtk_box_pack_start (GTK_BOX (vbox2), table1, FALSE, FALSE, 0);
 
     std::auto_ptr<InfoTable> infoptr = gui->getMovieInfo();
     if ( ! infoptr.get() )
     {
             label = gtk_label_new (_("VM not initialized yet"));
             gtk_widget_show (label);
-            gtk_table_attach_defaults (GTK_TABLE (window), label, 0, 1, 0, 1);
+            gtk_table_attach_defaults (GTK_TABLE (table1), label, 0, 1, 0, 1);
             return;
     }
 
@@ -969,9 +992,6 @@
     
 #if 1
     size_t size = info.size();
-    GtkWidget* table1 = gtk_table_new (size, 2, TRUE);
-    gtk_widget_show (table1);
-    gtk_container_add (GTK_CONTAINER (window), table1);
 
     for (InfoTable::reverse_iterator i=info.rbegin(), e=info.rend(); i!=e; ++i)
     {
@@ -979,20 +999,46 @@
         guint up = size;
         guint bot = size-1;
 
-        label = gtk_label_new (p.first.c_str());
-        gtk_widget_show (label);
-        gtk_table_attach_defaults (GTK_TABLE (table1), label, 0, 1, bot, up);
+        GtkWidget *label_table11 = gtk_label_new(p.first.c_str());
+        gtk_table_attach (GTK_TABLE (table1), label_table11, 0, 1, bot, up,
+                      (GtkAttachOptions) (GTK_FILL),
+                      (GtkAttachOptions) (0), 0, 0);
+        gtk_misc_set_alignment (GTK_MISC (label_table11), 0.0, 1.0);
+        gtk_widget_show (label_table11);
 
-        label = gtk_label_new (p.second.c_str());
-        gtk_widget_show (label);
-        gtk_table_attach_defaults (GTK_TABLE (table1), label, 1, 2, bot, up);
+        GtkWidget *label_table12 = gtk_label_new(p.second.c_str());
+        gtk_table_attach (GTK_TABLE (table1), label_table12, 1, 2, bot, up,
+                      (GtkAttachOptions) (GTK_FILL),
+                      (GtkAttachOptions) (0), 0, 0);
+        gtk_label_set_selectable (GTK_LABEL (label_table12), TRUE);
+        gtk_widget_show (label_table12);
 
         --size;
     }
+
+     GtkWidget *bbox1 = gtk_hbutton_box_new ();
+     gtk_box_pack_start (
+	GTK_BOX (main_vbox), bbox1, FALSE, FALSE, 0);
+
+     gtk_box_pack_start (
+	GTK_BOX (vbox1), gtk_hseparator_new (), FALSE, FALSE, 0);
+
+     GtkWidget *vbox3 = gtk_vbox_new (FALSE, 3);
+     gtk_box_pack_start (
+	GTK_BOX (vbox1), vbox3, FALSE, FALSE, 0);
+
+
+     GtkWidget *button_ok = gtk_button_new_from_stock (GTK_STOCK_OK);
+     gtk_box_pack_end (GTK_BOX (bbox1), button_ok, FALSE, FALSE, 0);
+     g_signal_connect_swapped (button_ok, "clicked",
+             G_CALLBACK(gtk_widget_destroy), window1);
+
+     gtk_widget_show_all (window1);
+
 #else
     GtkWidget* box = gtk_vbox_new (FALSE, 2);
     gtk_widget_show (box);
-    gtk_container_add (GTK_CONTAINER (window), box);
+    gtk_container_add (GTK_CONTAINER (window1), box);
 
     for (InfoTable::reverse_iterator i=info.rbegin(), e=info.rend(); i!=e; ++i)
     {
@@ -1405,18 +1451,6 @@
     gtk_container_add (GTK_CONTAINER (menu), separatormenuitem1);
     gtk_widget_set_sensitive (separatormenuitem1, FALSE);
 
-    GtkWidget *properties1 =
- 	gtk_image_menu_item_new_from_stock ("gtk-properties", NULL);
-    gtk_widget_show (properties1);
-    gtk_container_add (GTK_CONTAINER (menu), properties1);
-    // Disabled until properties functionality is implemented:
-    gtk_widget_set_sensitive(properties1,FALSE);
- 
-    GtkWidget *separatormenuitem2 = gtk_separator_menu_item_new ();
-    gtk_widget_show (separatormenuitem2);
-    gtk_container_add (GTK_CONTAINER (menu), separatormenuitem2);
-    gtk_widget_set_sensitive (separatormenuitem2, FALSE);
-
     GtkWidget *surt1 = gtk_image_menu_item_new_from_stock ("gtk-quit", NULL);
     gtk_widget_show (surt1);
     gtk_container_add (GTK_CONTAINER (menu), surt1);
@@ -1485,13 +1519,15 @@
     GtkWidget *menu = gtk_menu_new ();
     gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menu);
 
-    GtkMenuItem *menuitem_movieinfo = 
- 	GTK_MENU_ITEM(gtk_menu_item_new_with_label(_("Movie info")));
-    gtk_menu_append(menu, GTK_WIDGET(menuitem_movieinfo));
-    gtk_widget_show(GTK_WIDGET(menuitem_movieinfo));
-    g_signal_connect ((gpointer) menuitem_movieinfo, "activate",
+    GtkWidget *properties1 =
+ 	gtk_image_menu_item_new_from_stock ("gtk-properties", NULL);
+    gtk_widget_show (properties1);
+    gtk_container_add (GTK_CONTAINER (menu), properties1);
+    // Disabled until properties functionality is implemented:
+    g_signal_connect ((gpointer) properties1, "activate",
                       G_CALLBACK (&menuitem_movieinfo_callback),
                       this);
+
 }
 
 // Create a Help menu that can be used from the menu bar or the popup.



From MAILER-DAEMON Wed Aug 22 00:27:07 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INhoB-0003mx-SN
	for mharc-gnash-commit@gnu.org; Wed, 22 Aug 2007 00:27:07 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INhoA-0003ms-Cj
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 00:27:06 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INho8-0003mg-Qa
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 00:27:05 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INho8-0003md-LB
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 00:27:04 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <chadmusick@msbx.net>) id 1INho8-0006Jp-Ab
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 00:27:04 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <chadmusick@msbx.net>) id 1INho7-0007nF-CW
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 04:27:03 +0000
Received: from cmusick by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <cmusick@savannah.gnu.org>) id 1INho7-0007nC-6e
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 04:27:03 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INho7-0007nC-6e@cvs.savannah.gnu.org>
From: Chad Musick <chadmusick@msbx.net>
Date: Wed, 22 Aug 2007 04:27:03 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/impl.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Aug 2007 04:27:07 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Chad Musick <cmusick>	07/08/22 04:27:03

Modified files:
	.              : ChangeLog 
	server         : impl.cpp 

Log message:
	Adding tag loaders for new SWF9 tags, plus some older tags which weren't
	present.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4062&r2=1.4063
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.cpp?cvsroot=gnash&r1=1.114&r2=1.115

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4062
retrieving revision 1.4063
diff -u -b -r1.4062 -r1.4063
--- ChangeLog	21 Aug 2007 23:38:35 -0000	1.4062
+++ ChangeLog	22 Aug 2007 04:27:02 -0000	1.4063
@@ -1,3 +1,9 @@
+2007-08-22 Chad Musick <chadmusick@msbx.net>
+
+	* server/impl.cpp: Add tag loaders (default loaders)
+	  for SWF9 opcodes, plus some older opcodes which were
+	  not present.
+
 2007-08-21 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
 
 	* gui/gtk.cpp: rename View->MovieInfo to View->Properties,

Index: server/impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/impl.cpp,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -b -r1.114 -r1.115
--- server/impl.cpp	8 Aug 2007 18:26:38 -0000	1.114
+++ server/impl.cpp	22 Aug 2007 04:27:02 -0000	1.115
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: impl.cpp,v 1.114 2007/08/08 18:26:38 strk Exp $ */
+/* $Id: impl.cpp,v 1.115 2007/08/22 04:27:02 cmusick Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -163,10 +163,12 @@
 	register_tag_loader(SWF::DEFINETEXT,	define_text_loader);
 	register_tag_loader(SWF::DOACTION,	DoActionTag::doActionLoader);
 	register_tag_loader(SWF::DEFINEFONTINFO, define_font_info_loader);
-	register_tag_loader(SWF::DEFINEFONTINFO2, define_font_info_loader);
+	register_tag_loader(SWF::DEFINEFONTINFO2, define_font_info_loader); // 62
 	register_tag_loader(SWF::DEFINESOUND,	define_sound_loader);
 	register_tag_loader(SWF::STARTSOUND,	start_sound_loader);
-	// 16 _UNKNOWN_ unimplemented
+
+        register_tag_loader(SWF::STOPSOUND,     fixme_loader); // 16
+	
 	register_tag_loader(SWF::DEFINEBUTTONSOUND, button_sound_loader);
 	register_tag_loader(SWF::SOUNDSTREAMHEAD, sound_stream_head_loader); // 18
 	register_tag_loader(SWF::SOUNDSTREAMBLOCK, sound_stream_block_loader); // 19
@@ -196,7 +198,10 @@
 	register_tag_loader(SWF::SERIALNUMBER,  serialnumber_loader); // 41
 	register_tag_loader(SWF::DEFINETEXTFORMAT, fixme_loader); // 42
 	register_tag_loader(SWF::FRAMELABEL,	frame_label_loader); // 43
-	// 44 - _UNKNOWN_ unimplemented
+
+        // TODO: Implement, but fixme_loader breaks tests.
+        register_tag_loader(SWF::DEFINEBEHAVIOR, fixme_loader); // 44
+
 	register_tag_loader(SWF::SOUNDSTREAMHEAD2, sound_stream_head_loader); // 45
 	register_tag_loader(SWF::DEFINEMORPHSHAPE, define_shape_morph_loader);
 	register_tag_loader(SWF::FRAMETAG,	fixme_loader); // 47
@@ -205,9 +210,12 @@
 	register_tag_loader(SWF::DEFINECOMMANDOBJ, fixme_loader); // 50
 	register_tag_loader(SWF::CHARACTERSET,  fixme_loader); // 51
 	register_tag_loader(SWF::FONTREF,	fixme_loader); // 52
-	// 53 - _UNKNOWN_ unimplemented
-	// 54 - _UNKNOWN_ unimplemented
-	// 55 - _UNKNOWN_ unimplemented
+
+        // TODO: Implement, but fixme_loader breaks tests.
+        register_tag_loader(SWF::DEFINEFUNCTION, fixme_loader); // 53 
+        register_tag_loader(SWF::PLACEFUNCTION, fixme_loader); // 54 
+        register_tag_loader(SWF::GENTAGOBJECT, fixme_loader); // 55 
+
 	register_tag_loader(SWF::EXPORTASSETS,	export_loader); // 56
 	register_tag_loader(SWF::IMPORTASSETS,  import_loader); // 57
 
@@ -219,22 +227,39 @@
 
 	register_tag_loader(SWF::DEFINEVIDEOSTREAM, define_video_loader); // 60
 	register_tag_loader(SWF::VIDEOFRAME, video_loader); // 61
-	// 62 - _UNKNOWN_ unimplemented
-	// 63 - _UNKNOWN_ unimplemented
+
+        // 62, DEFINEFONTINFO2 is done above.
+        // We're not an authoring tool.
+        register_tag_loader(SWF::DEBUGID, null_loader); // 63
+
 	//  We're not an authoring tool so we don't care.
 	// (might be nice to dump the password instead..)
 	register_tag_loader(SWF::ENABLEDEBUGGER2, null_loader);    // 64
 	
+        // TODO: Fix this to load the limits, or decide we will ignore them.	
+        register_tag_loader(SWF::SCRIPTLIMITS, fixme_loader); //65
+
+        // TODO: Fix this, but probably not critical.
+        register_tag_loader(SWF::SETTABINDEX, fixme_loader); //66 
+
+        // TODO: Alexis reference says these are 83, 84. The 67,68 comes from Tamarin.
+        // Figure out which one is correct (possibly both are).
+        register_tag_loader(SWF::DEFINESHAPE4_, fixme_loader); // 67
+        register_tag_loader(SWF::DEFINEMORPHSHAPE2_, fixme_loader); // 68
+
 	register_tag_loader(SWF::FILEATTRIBUTES, file_attributes_loader); // 69
 	register_tag_loader(SWF::PLACEOBJECT3, fixme_loader); // 70
 	register_tag_loader(SWF::IMPORTASSETS2, import_loader); // 71
 
+        register_tag_loader(SWF::DOABC, fixme_loader); // 72 -- AS3 codeblock.
 	register_tag_loader(SWF::DEFINEALIGNZONES, DefineFontAlignZonesTag::loader); // 73
 
 	register_tag_loader(SWF::CSMTEXTSETTINGS, fixme_loader); // 74
 	register_tag_loader(SWF::DEFINEFONT3, define_font_loader); // 75
+        register_tag_loader(SWF::SYMBOLCLASS, fixme_loader); // 76 Chad
 	register_tag_loader(SWF::METADATA, metadata_loader); // 77
 	register_tag_loader(SWF::DEFINESCALINGGRID, fixme_loader); // 78
+        register_tag_loader(SWF::DOABCDEFINE, fixme_loader); // 79 -- AS3 codeblock.
 	register_tag_loader(SWF::DEFINESHAPE4, fixme_loader); // 83
 	register_tag_loader(SWF::DEFINEMORPHSHAPE2, fixme_loader); // 84
 
@@ -242,7 +267,6 @@
 }
 
 
-
 #if 0 // deprecated
 void	get_movie_info(
     const URL& url,



From MAILER-DAEMON Wed Aug 22 00:55:01 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INiFB-0001fz-1g
	for mharc-gnash-commit@gnu.org; Wed, 22 Aug 2007 00:55:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INiF9-0001fb-Eg
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 00:54:59 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INiF8-0001fH-KH
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 00:54:58 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INiF8-0001fC-F3
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 00:54:58 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1INiF8-0001QX-3H
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 00:54:58 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1INiF7-0001XE-CG
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 04:54:57 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1INiF7-0001XB-8c
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 04:54:57 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INiF7-0001XB-8c@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Wed, 22 Aug 2007 04:54:57 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/server dlist.cpp sprite_instance.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Aug 2007 04:54:59 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/22 04:54:57

Modified files:
	server         : dlist.cpp sprite_instance.cpp 

Log message:
	* server/dlist.cpp, server/sprite_instance.cpp: handle hiden characters as masks, passed UdoG's test files.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.cpp?cvsroot=gnash&r1=1.76&r2=1.77
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.309&r2=1.310

Patches:
Index: dlist.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- dlist.cpp	21 Aug 2007 11:22:17 -0000	1.76
+++ dlist.cpp	22 Aug 2007 04:54:56 -0000	1.77
@@ -771,12 +771,23 @@
         character* ch = it->get();
         assert(ch);
 
-        if (ch->get_visible() == false)
+        // Check if this charater or any of its parents is a mask.
+        // Characters act as masks should always be rendered to the
+        // mask buffer despite their visibility.
+        character * parent = ch->get_parent();
+        bool renderAsMask = ch->isMask();
+        while(!renderAsMask && parent)
         {
-            // avoid stale old_invalidated_rect
+            renderAsMask = parent->isMask();
+            parent = parent->get_parent();
+        }
+        
+        // check for non-mask hiden characters
+        if( !renderAsMask && (ch->get_visible() == false))
+        {
+            // Avoid stale old_invalidated_rect
             ch->clear_invalidated(); 
-            // Don't display.
-            // TODO: test invisible characters as masks
+            // Don't display non-mask hiden characters
             continue;
         }
     

Index: sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -b -r1.309 -r1.310
--- sprite_instance.cpp	17 Aug 2007 18:02:35 -0000	1.309
+++ sprite_instance.cpp	22 Aug 2007 04:54:56 -0000	1.310
@@ -2723,14 +2723,13 @@
 {
 	//GNASH_REPORT_FUNCTION;
 
-	if (get_visible() == false)
-	{
-		// We're invisible, so don't display!
-		
-		// Note: dlist.cpp will avoid to even call display() so this will probably
-		// never happen.
-		return;
-	}
+	// Note: 
+	// DisplayList::Display() will take care of the visibility checking.
+	//
+	// Whether a character should be rendered or not is dependent on its paraent.
+	// i.e. if its parent is a mask, this character should be rendered to the mask
+	// buffer even it is invisible.
+	//
 	
 	// check if the sprite (and it's childs) needs to be drawn
 	InvalidatedRanges ranges;



From MAILER-DAEMON Wed Aug 22 01:55:13 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INjBR-0005Mz-BX
	for mharc-gnash-commit@gnu.org; Wed, 22 Aug 2007 01:55:13 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INjBP-0005Mi-QP
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 01:55:11 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INjBP-0005MJ-5O
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 01:55:11 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INjBO-0005MG-VJ
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 01:55:11 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1INjBO-00087F-Jq
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 01:55:10 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1INjBO-0002VR-1S
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 05:55:10 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1INjBN-0002VO-UQ
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 05:55:09 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INjBN-0002VO-UQ@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Wed, 22 Aug 2007 05:55:09 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/Makefil...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Aug 2007 05:55:12 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/22 05:55:09

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: Makefile.am 
Added files:
	testsuite/misc-ming.all: masks_test2.c masks_test2runner.cpp 

Log message:
	new testcase for nested masks.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4063&r2=1.4064
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.147&r2=1.148
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/masks_test2.c?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/masks_test2runner.cpp?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4063
retrieving revision 1.4064
diff -u -b -r1.4063 -r1.4064
--- ChangeLog	22 Aug 2007 04:27:02 -0000	1.4063
+++ ChangeLog	22 Aug 2007 05:55:09 -0000	1.4064
@@ -1,3 +1,14 @@
+2007-08-22 Zou Lunkai <zoulunkai@gmail.com>
+	
+	* testsuite/misc-ming.all/masks_test2.c, 
+	  testsuite/misc-ming.all/masks_test2runner.cpp, 
+	  testsuite/misc-ming.all/Makefile.am: new testcase for nested masks.
+	  
+2007-08-22 Zou Lunkai <zoulunkai@gmail.com>
+	
+	* server/dlist.cpp, server/sprite_instance.cpp: handle hiden characters
+	  as masks, passed UdoG's test files.
+	
 2007-08-22 Chad Musick <chadmusick@msbx.net>
 
 	* server/impl.cpp: Add tag loaders (default loaders)

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -b -r1.147 -r1.148
--- testsuite/misc-ming.all/Makefile.am	17 Aug 2007 18:02:36 -0000	1.147
+++ testsuite/misc-ming.all/Makefile.am	22 Aug 2007 05:55:09 -0000	1.148
@@ -101,6 +101,8 @@
 	displaylist_depths_test10 \
 	displaylist_depths_test11 \
 	masks_test \
+	masks_test2 \
+	masks_test2runner \
 	attachMovieTest \
 	attachMovieTestRunner \
 	attachMovieLoopingTest \
@@ -908,6 +910,29 @@
 	masks_test.swf      \
 	$(NULL)
 
+
+masks_test2_SOURCES =	\
+	masks_test2.c	\
+	$(NULL)
+masks_test2_LDADD = libgnashmingutils.la
+
+masks_test2.swf: masks_test2
+	./masks_test2 $(top_srcdir)/testsuite/media
+
+masks_test2runner_SOURCES = \
+	masks_test2runner.cpp \
+	$(NULL)
+masks_test2runner_CXXFLAGS = \
+	-DTGTDIR='"$(abs_builddir)"' \
+	$(NULL)
+masks_test2runner_LDADD = \
+	$(top_builddir)/testsuite/libtestsuite.la \
+	$(NULL)
+masks_test2runner_DEPENDENCIES = \
+	$(top_builddir)/testsuite/libtestsuite.la \
+	masks_test2.swf      \
+	$(NULL)
+
 matrix_test_SOURCES =	\
 	matrix_test.c	\
 	$(NULL)
@@ -1647,6 +1672,7 @@
 	duplicate_movie_clip_test2runner \
 	event_handler_scope_testrunner \
 	masks_testrunner \
+	masks_test2runner \
 	key_event_testrunner \
 	key_event_test2runner \
 	key_event_test3runner \

Index: testsuite/misc-ming.all/masks_test2.c
===================================================================
RCS file: testsuite/misc-ming.all/masks_test2.c
diff -N testsuite/misc-ming.all/masks_test2.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-ming.all/masks_test2.c	22 Aug 2007 05:55:09 -0000	1.1
@@ -0,0 +1,107 @@
+/*
+ *   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */ 
+
+/*
+ * Zou Lunkai, zoulunkai@gmail.com
+ *
+ *  Test for nested masks
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <ming.h>
+
+#include "ming_utils.h"
+
+#define OUTPUT_VERSION 6
+#define OUTPUT_FILENAME "masks_test2.swf"
+
+SWFMovieClip defineMovieclip(int x, int y, int w, int h);
+
+SWFMovieClip defineMovieclip(int x, int y, int w, int h)
+{
+		SWFMovieClip mc;
+		SWFShape  sh;
+	  mc = newSWFMovieClip();
+  	sh = make_fill_square (x, y, w, h, 255, 0, 0, 255, 0, 0);
+ 	 	SWFMovieClip_add(mc, (SWFBlock)sh);  
+  	SWFMovieClip_nextFrame(mc);
+  	return mc;
+}
+
+int
+main(int argc, char** argv)
+{
+  SWFMovie mo;
+  SWFMovieClip  mc1, mc2, mc3, mc4, mc5, mc6, mc7, dejagnuclip;
+  SWFDisplayItem it;
+	
+  Ming_init();
+  mo = newSWFMovieWithVersion(OUTPUT_VERSION);
+  SWFMovie_setDimension(mo, 800, 600);
+  SWFMovie_setRate (mo, 1.0);
+  /*
+   *  Don't add dejagnu clip to this file.
+   *  Or place it in a safe depth.
+   */
+  
+  mc1 = defineMovieclip(0, 0, 30, 30);
+  mc2 = defineMovieclip(0, 0, 60, 60);
+  mc3 = defineMovieclip(0, 0, 90, 90);
+  mc4 = defineMovieclip(0, 0, 120, 120);
+  mc5 = defineMovieclip(0, 0, 150, 150);
+  mc6 = defineMovieclip(0, 0, 180, 180);
+  mc7 = defineMovieclip(0, 0, 210, 210);
+  
+  it = SWFMovie_add(mo, (SWFBlock)mc1);  
+  SWFDisplayItem_setDepth(it, 1); 
+  SWFDisplayItem_setMaskLevel(it, 4);
+
+  it = SWFMovie_add(mo, (SWFBlock)mc2);  
+  SWFDisplayItem_setDepth(it, 2); 
+  SWFDisplayItem_setMaskLevel(it, 5);
+  
+  it = SWFMovie_add(mo, (SWFBlock)mc3);  
+  SWFDisplayItem_setDepth(it, 3); 
+  SWFDisplayItem_setMaskLevel(it, 6);
+  
+  it = SWFMovie_add(mo, (SWFBlock)mc4);  
+  SWFDisplayItem_setDepth(it, 4); 
+
+  it = SWFMovie_add(mo, (SWFBlock)mc5);  
+  SWFDisplayItem_setDepth(it, 5); 
+  
+  it = SWFMovie_add(mo, (SWFBlock)mc6);  
+  SWFDisplayItem_setDepth(it, 6); 
+
+	SWFMovie_nextFrame(mo); 
+
+	it = SWFMovie_add(mo, (SWFBlock)mc7);  
+  SWFDisplayItem_setDepth(it, 7); 
+                    
+  SWFMovie_nextFrame(mo); 
+
+  //Output movie
+  puts("Saving " OUTPUT_FILENAME );
+  SWFMovie_save(mo, OUTPUT_FILENAME);
+
+  return 0;
+}
+
+
+

Index: testsuite/misc-ming.all/masks_test2runner.cpp
===================================================================
RCS file: testsuite/misc-ming.all/masks_test2runner.cpp
diff -N testsuite/misc-ming.all/masks_test2runner.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-ming.all/masks_test2runner.cpp	22 Aug 2007 05:55:09 -0000	1.1
@@ -0,0 +1,64 @@
+/* 
+ *   Copyright (C) 2007 Free Software Foundation, Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+* 
+* You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *
+ */ 
+
+#define INPUT_FILENAME "masks_test2.swf"
+
+#include "MovieTester.h"
+#include "sprite_instance.h"
+#include "character.h"
+#include "dlist.h"
+#include "container.h"
+#include "log.h"
+
+#include "check.h"
+#include <string>
+#include <cassert>
+
+using namespace gnash;
+using namespace std;
+
+int
+main(int /*argc*/, char** /*argv*/)
+{
+  //string filename = string(TGTDIR) + string("/") + string(INPUT_FILENAME);
+  string filename = string(INPUT_FILENAME);
+  MovieTester tester(filename);
+
+  gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
+  dbglogfile.setVerbosity(1);
+
+  
+  rgba red(255,0,0,255);  
+  rgba white(255, 255, 255, 255);
+
+  sprite_instance* root = tester.getRootMovie();
+  assert(root);
+  check_equals(root->get_frame_count(), 2);
+  // FRAME 1
+  check_pixel(15, 15, 30, red, 2); 
+  // visual checks succeed with AGG pixel format RGB24
+  // don't know why this check fails with AGG and pixel foramt AGG_RGB555
+  xcheck_pixel(40, 40, 10, white, 3); 
+  
+  // FRAME 2 
+  tester.advance(); 
+  check_pixel(105, 105, 210, red, 2); 
+  check_pixel(220, 220, 10, white, 2); 
+}



From MAILER-DAEMON Wed Aug 22 02:01:13 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INjHE-000313-Qa
	for mharc-gnash-commit@gnu.org; Wed, 22 Aug 2007 02:01:12 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INjHD-0002zg-EC
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 02:01:11 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INjHC-0002ym-JL
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 02:01:10 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INjHB-0002yP-Vs
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 02:01:10 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1INjHB-0000Y1-Hd
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 02:01:09 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1INjHB-0002wf-1w
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 06:01:09 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1INjHA-0002wc-TQ
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 06:01:08 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INjHA-0002wc-TQ@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Wed, 22 Aug 2007 06:01:08 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/testsuite/misc-ming.all masks_test2.c mas...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Aug 2007 06:01:11 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/22 06:01:08

Modified files:
	testsuite/misc-ming.all: masks_test2.c masks_test2runner.cpp 

Log message:
	indent, minor cleanups.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/masks_test2.c?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/masks_test2runner.cpp?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: masks_test2.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/masks_test2.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- masks_test2.c	22 Aug 2007 05:55:09 -0000	1.1
+++ masks_test2.c	22 Aug 2007 06:01:08 -0000	1.2
@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+ *   Copyright (C) 2007 Free Software Foundation, Inc.
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

Index: masks_test2runner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/masks_test2runner.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- masks_test2runner.cpp	22 Aug 2007 05:55:09 -0000	1.1
+++ masks_test2runner.cpp	22 Aug 2007 06:01:08 -0000	1.2
@@ -10,8 +10,8 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
+ * 
+ * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
@@ -53,8 +53,8 @@
   check_equals(root->get_frame_count(), 2);
   // FRAME 1
   check_pixel(15, 15, 30, red, 2); 
-  // visual checks succeed with AGG pixel format RGB24
-  // don't know why this check fails with AGG and pixel foramt AGG_RGB555
+  // visual check succeeds with AGG pixel format RGB24
+  // don't know why this check fails with AGG pixel format AGG_RGB555
   xcheck_pixel(40, 40, 10, white, 3); 
   
   // FRAME 2 



From MAILER-DAEMON Wed Aug 22 05:39:24 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INmgN-0006Fp-Q0
	for mharc-gnash-commit@gnu.org; Wed, 22 Aug 2007 05:39:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INmgK-0006Cw-Rb
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 05:39:20 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INmgH-00067U-Mt
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 05:39:20 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INmgG-00067C-28
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 05:39:16 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1INmgF-0004jc-8e
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 05:39:15 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l7M9d9b33087;
	Wed, 22 Aug 2007 11:39:09 +0200 (CEST)
	(envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Wed, 22 Aug 2007 11:39:09 +0200
To: Zou Lunkai <zoulunkai@gmail.com>
Subject: Re: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/Makefil...
Message-ID: <20070822093909.GE14688@keybit.net>
Mail-Followup-To: Zou Lunkai <zoulunkai@gmail.com>, gnash-commit@gnu.org
References: <E1INjBN-0002VO-UQ@cvs.savannah.gnu.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1INjBN-0002VO-UQ@cvs.savannah.gnu.org>
X-Detected-Kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Aug 2007 09:39:21 -0000

On Wed, Aug 22, 2007 at 05:55:09AM +0000, Zou Lunkai wrote:

> Index: testsuite/misc-ming.all/masks_test2.c
> ===================================================================
> RCS file: testsuite/misc-ming.all/masks_test2.c
> diff -N testsuite/misc-ming.all/masks_test2.c
> --- /dev/null	1 Jan 1970 00:00:00 -0000
> +++ testsuite/misc-ming.all/masks_test2.c	22 Aug 2007 05:55:09 -0000	1.1
> @@ -0,0 +1,107 @@
> +/*
> + *   Copyright (C) 2005, 2006 Free Software Foundation, Inc.

... 2007 ...

--strk;



From MAILER-DAEMON Wed Aug 22 06:53:05 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INnph-0000xb-Ab
	for mharc-gnash-commit@gnu.org; Wed, 22 Aug 2007 06:53:05 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INnpf-0000tl-BY
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 06:53:03 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INnpd-0000pv-Me
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 06:53:02 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INnpd-0000pV-Hx
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 06:53:01 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1INnpd-0002L2-4F
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 06:53:01 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1INnpU-0007S7-JU
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 10:52:52 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1INnpU-0007S4-Am
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 10:52:52 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INnpU-0007S4-Am@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 22 Aug 2007 10:52:52 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog configure.ac macros/boost.m4
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Aug 2007 10:53:03 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/22 10:52:52

Modified files:
	.              : ChangeLog configure.ac 
	macros         : boost.m4 

Log message:
	        * configure.ac: bail out if boost_thread is not set to yes.
	        * macros/boost.m4: check for boost/thread.hpp. Should fix
	          bug #20847.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4064&r2=1.4065
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.403&r2=1.404
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/boost.m4?cvsroot=gnash&r1=1.47&r2=1.48

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4064
retrieving revision 1.4065
diff -u -b -r1.4064 -r1.4065
--- ChangeLog	22 Aug 2007 05:55:09 -0000	1.4064
+++ ChangeLog	22 Aug 2007 10:52:51 -0000	1.4065
@@ -1,3 +1,9 @@
+2007-08-22 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac: bail out if boost_thread is not set to yes.
+	* macros/boost.m4: check for boost/thread.hpp. Should fix
+	  bug #20847.
+
 2007-08-22 Zou Lunkai <zoulunkai@gmail.com>
 	
 	* testsuite/misc-ming.all/masks_test2.c, 

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.403
retrieving revision 1.404
diff -u -b -r1.403 -r1.404
--- configure.ac	21 Aug 2007 15:18:36 -0000	1.403
+++ configure.ac	22 Aug 2007 10:52:51 -0000	1.404
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.403 2007/08/21 15:18:36 strk Exp $
+dnl $Id: configure.ac,v 1.404 2007/08/22 10:52:51 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -1958,6 +1958,14 @@
 fi # }
 
 if test x"$BOOST_LIBS" != x; then
+
+    if test x"$boost_thread" != xyes; then
+	echo "        ERROR: The BOOST thread package is needed to compile cygnal!"
+	echo "               Install it from http://boost.org"
+	echo "               or .deb users: apt-get install libboost-thread-dev"
+	nogo=true
+    fi
+
     # Only cygnal requires date_time at present, so it's OK if either
     # you don't want cygnal or do have date_time installed.
     if test x"$cygnal" = xno -o x"$boost_date_time" = xyes; then
@@ -1974,9 +1982,9 @@
 else
     echo "        ERROR: No BOOST development package installed!"
     echo "               Install it from http://www.boost.org"
-    echo "               or .deb users: apt-get install libboost-thread-dev"
+    echo "               or .deb users: apt-get install libboost-dev libboost-thread-dev"
     if test x"$cygnal" = xyes; then
-    echo "                              and libboost-date-time-dev"
+    echo "                              and libboost-date-time-dev (for cygnal)"
     fi
     echo "               or .rpm users: yum install boost-devel"
  nogo=true

Index: macros/boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- macros/boost.m4	1 Jul 2007 10:54:11 -0000	1.47
+++ macros/boost.m4	22 Aug 2007 10:52:52 -0000	1.48
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: boost.m4,v 1.47 2007/07/01 10:54:11 bjacques Exp $
+dnl $Id: boost.m4,v 1.48 2007/08/22 10:52:52 strk Exp $
 
 dnl Boost modules are:
 dnl date-time, filesystem. graph. iostreams, program options, python,
@@ -26,10 +26,10 @@
   AC_ARG_WITH(boost_incl, AC_HELP_STRING([--with-boost-incl], [directory where boost headers are]), with_boost_incl=${withval})
   AC_CACHE_VAL(ac_cv_path_boost_incl, [
     if test x"${with_boost_incl}" != x ; then
-      if test -f ${with_boost_incl}/boost/detail/lightweight_mutex.hpp ; then
+      if test -f ${with_boost_incl}/boost/thread.hpp ; then
         ac_cv_path_boost_incl=-I`(cd ${with_boost_incl}; pwd)`
       else
-        AC_MSG_ERROR([${with_boost_incl} directory doesn't contain any headers])
+        AC_MSG_ERROR([${with_boost_incl} directory doesn't contain boost/thread.hpp])
       fi
     fi
   ])
@@ -49,16 +49,11 @@
     gnash_boost_version=""
     for i in $incllist; do
       for j in `ls -dr $i/boost* 2>/dev/null`; do
-        if test -f ${j}/boost/detail/lightweight_mutex.hpp; then
+        if test -f ${j}/boost/detail/lightweight_mutex.hpp -a -f ${j}/boost/thread.hpp; then
           gnash_boost_topdir=`basename $j`
           ac_cv_path_boost_incl="-I${j}"
           break
         fi
-        if test -f ${j}/detail/lightweight_mutex.hpp; then
-          gnash_boost_topdir=`basename $j`
-          ac_cv_path_boost_incl="-I${i}"
-          break
-        fi
       done
       if test x$gnash_boost_topdir != x; then
         gnash_boost_version=`echo ${gnash_boost_topdir} | sed -e 's:boost-::'`
@@ -68,17 +63,13 @@
   fi
 
   if test x"${gnash_boost_version}" = x; then
-    AC_MSG_RESULT([no version needed])
+    AC_MSG_RESULT([no version found/needed])
   else
    AC_MSG_RESULT(${gnash_boost_version})
   fi
 
-  if test x"${ac_cv_path_boost_incl}" = x ; then
-    AC_CHECK_HEADERS(boost/detail/lightweight_mutex.hpp, [ac_cv_path_boost_incl="-I/usr/include"])
-  fi
-
-  AC_MSG_CHECKING([for boost header])
-  AC_MSG_RESULT(${ac_cv_path_boost_incl})
+  dnl AC_MSG_CHECKING([for boost header])
+  dnl AC_MSG_RESULT(${ac_cv_path_boost_incl})
 
   dnl Look for the library
   AC_ARG_WITH(boost_lib, AC_HELP_STRING([--with-boost-lib], [directory where boost libraries are]), with_boost_lib=${withval})
@@ -88,9 +79,6 @@
     fi
   ])
 
-  AC_LANG_PUSH(C++)
-  save_LIBS="$LIBS"
-
   dnl Specify the list of probable names. Boost creates 8 identical
   dnl libraries with different names. The prefered order is to always
   dnl use the one with -mt on it, because it's the thread safe
@@ -144,18 +132,47 @@
   done
   AC_MSG_RESULT(${ac_cv_path_boost_lib})
 
-  dnl we don't want any boost libraries in LIBS, we prefer to keep it seperate.
+  BOOST_CFLAGS="$ac_cv_path_boost_incl"
+  BOOST_LIBS="$ac_cv_path_boost_lib" 
+
+  dnl ---------------------------------------
+  dnl Check actual usability of headers
+  dnl (if not cross-compiling)
+  dnl ---------------------------------------
+
+  if test x${cross_compiling} = xno; then
+    AC_LANG_PUSH(C++)  
+    save_CFLAGS="$CFLAGS"
+    CFLAGS="$CFLAGS $BOOST_CFLAGS"
+    AC_CHECK_HEADERS([boost/thread.hpp], [], [boost_thread=no]) 
+    CFLAGS="$save_CFLAGS"
   AC_LANG_POP(C++)  
-  LIBS="$save_LIBS"
+  fi # if not cross-compiling
 
-  BOOST_CFLAGS="$ac_cv_path_boost_incl"
-  AC_SUBST(BOOST_CFLAGS)
+  dnl ---------------------------------------
+  dnl TODO: Check actual usability of libs
+  dnl ---------------------------------------
+
+  if test x${cross_compiling} = xno; then
+    dnl Two problems:
+    dnl   1) knowing the name of the required libs
+    dnl      (needs storing the name when finding it
+    dnl      at the beginning of this macro)
+    dnl   2) check how to use AC_CHECK_LIB for C++ libs
+    :
+  fi # if not cross-compiling
+
+
+  dnl ------------------------------------------------------------------
+  dnl Set HAVE_BOOST conditional, BOOST_CFLAGS and BOOST_LIBS variables
+  dnl ------------------------------------------------------------------
 
-  BOOST_LIBS="$ac_cv_path_boost_lib" 
+  AC_SUBST(BOOST_CFLAGS)
   AC_SUBST(BOOST_LIBS)
 
   # This isn't right: you don't need boot date-time installed unless u build
   # cygnal, and it is sometimes a separate package from Boost core and thread.
+  # TODO: why is this needed, lack of boost being a fatal error?
   AM_CONDITIONAL(HAVE_BOOST, [test x${boost_date_time} = xyes && test x${boost_thread} = xyes])
 ])
 



From MAILER-DAEMON Wed Aug 22 07:20:35 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INoGJ-0004oI-F4
	for mharc-gnash-commit@gnu.org; Wed, 22 Aug 2007 07:20:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INoGG-0004nl-Pt
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 07:20:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INoGF-0004nY-8L
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 07:20:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INoGF-0004nV-2k
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 07:20:31 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1INoGE-00088X-PB
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 07:20:30 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1INoGD-0001CT-O0
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 11:20:29 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1INoGD-0001CP-HK
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 11:20:29 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INoGD-0001CP-HK@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 22 Aug 2007 11:20:29 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog configure.ac
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Aug 2007 11:20:33 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/22 11:20:29

Modified files:
	.              : ChangeLog configure.ac 

Log message:
	        * configure.ac: bail out if kde gui or kparts plugin are
	          requested but kde/qt deps are not met. Should fix bug
	          #20848.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4065&r2=1.4066
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.404&r2=1.405

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4065
retrieving revision 1.4066
diff -u -b -r1.4065 -r1.4066
--- ChangeLog	22 Aug 2007 10:52:51 -0000	1.4065
+++ ChangeLog	22 Aug 2007 11:20:28 -0000	1.4066
@@ -1,5 +1,11 @@
 2007-08-22 Sandro Santilli <strk@keybit.net>
 
+	* configure.ac: bail out if kde gui or kparts plugin are
+	  requested but kde/qt deps are not met. Should fix bug
+	  #20848.
+
+2007-08-22 Sandro Santilli <strk@keybit.net>
+
 	* configure.ac: bail out if boost_thread is not set to yes.
 	* macros/boost.m4: check for boost/thread.hpp. Should fix
 	  bug #20847.

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -b -r1.404 -r1.405
--- configure.ac	22 Aug 2007 10:52:51 -0000	1.404
+++ configure.ac	22 Aug 2007 11:20:29 -0000	1.405
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.404 2007/08/22 10:52:51 strk Exp $
+dnl $Id: configure.ac,v 1.405 2007/08/22 11:20:29 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -1539,21 +1539,19 @@
   fi
 fi
 
-if test x$kde = xyes -o x$kparts = xyes; then
+if test x$build_kde = xyes -o x$kparts = xyes; then
   if test x"$has_kde" = xyes; then
     echo "        KDE flags are: $KDE_CFLAGS"
     echo "        KDE libs are: $KDE_LIBS"
   else
-    if test x$build_kde = xyes -o x$parts = xyes ; then
       echo "        ERROR: No KDE development package installed!"
       echo "               Reconfigure with --disable-kparts and/or"
-      echo "               change to a different gui with --enable-gui=..."
+      echo "               omit 'kde' from the guis listed with --enable-gui=..."
       echo "               or install the KDE development environment from http://kde.org"
       echo "               or .deb users: apt-get install kdelibs-dev"
       echo "               or .rpm users: yum install <something-else>."
       nogo=true
     fi
-  fi
   if test x"$has_qt" = xyes; then
     echo "        QT flags are: $QT_CFLAGS"
     echo "        QT libs are: $QT_LIBS"



From MAILER-DAEMON Wed Aug 22 08:15:36 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INp7Y-0007Rg-Qn
	for mharc-gnash-commit@gnu.org; Wed, 22 Aug 2007 08:15:36 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INp7X-0007RP-TB
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 08:15:35 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INp7W-0007R0-R0
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 08:15:35 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INp7W-0007Qx-NB
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 08:15:34 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1INp7W-0001wN-3x
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 08:15:34 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1INp7U-0005LW-9j
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 12:15:32 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1INp7T-0005LO-Pr
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 12:15:31 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INp7T-0005LO-Pr@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 22 Aug 2007 12:15:31 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog configure.ac macros/boost.m4
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Aug 2007 12:15:36 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/22 12:15:31

Modified files:
	.              : ChangeLog configure.ac 
	macros         : boost.m4 

Log message:
	Backported:
	
	        * configure.ac: bail out if kde gui or kparts plugin are
	          requested but kde/qt deps are not met. Should fix bug
	          #20848; bail out if boost_thread is not set to yes.
	        * macros/boost.m4: check for boost/thread.hpp. Should fix
	          bug #20847.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.51&r2=1.3971.2.52
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.396.2.7&r2=1.396.2.8
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/boost.m4?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.47&r2=1.47.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.51
retrieving revision 1.3971.2.52
diff -u -b -r1.3971.2.51 -r1.3971.2.52
--- ChangeLog	21 Aug 2007 17:14:25 -0000	1.3971.2.51
+++ ChangeLog	22 Aug 2007 12:15:29 -0000	1.3971.2.52
@@ -1,3 +1,11 @@
+2007-08-22 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac: bail out if kde gui or kparts plugin are
+	  requested but kde/qt deps are not met. Should fix bug
+	  #20848; bail out if boost_thread is not set to yes.
+	* macros/boost.m4: check for boost/thread.hpp. Should fix
+	  bug #20847.
+
 2007-08-21 Sandro Santilli <strk@keybit.net>
 
 	* libbase/embedVideoDecoderGst.cpp (createDecoder): don't

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.396.2.7
retrieving revision 1.396.2.8
diff -u -b -r1.396.2.7 -r1.396.2.8
--- configure.ac	21 Aug 2007 15:26:21 -0000	1.396.2.7
+++ configure.ac	22 Aug 2007 12:15:30 -0000	1.396.2.8
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.396.2.7 2007/08/21 15:26:21 strk Exp $
+dnl $Id: configure.ac,v 1.396.2.8 2007/08/22 12:15:30 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, 0.8.1)
@@ -1536,21 +1536,19 @@
   fi
 fi
 
-if test x$kde = xyes -o x$kparts = xyes; then
+if test x$build_kde = xyes -o x$kparts = xyes; then
   if test x"$has_kde" = xyes; then
     echo "        KDE flags are: $KDE_CFLAGS"
     echo "        KDE libs are: $KDE_LIBS"
   else
-    if test x$build_kde = xyes -o x$parts = xyes ; then
       echo "        ERROR: No KDE development package installed!"
       echo "               Reconfigure with --disable-kparts and/or"
-      echo "               change to a different gui with --enable-gui=..."
+      echo "               omit 'kde' from the guis listed with --enable-gui=..."
       echo "               or install the KDE development environment from http://kde.org"
       echo "               or .deb users: apt-get install kdelibs-dev"
       echo "               or .rpm users: yum install <something-else>."
       nogo=true
     fi
-  fi
   if test x"$has_qt" = xyes; then
     echo "        QT flags are: $QT_CFLAGS"
     echo "        QT libs are: $QT_LIBS"
@@ -1955,6 +1953,14 @@
 fi # }
 
 if test x"$BOOST_LIBS" != x; then
+
+    if test x"$boost_thread" != xyes; then
+	echo "        ERROR: The BOOST thread package is needed to compile cygnal!"
+	echo "               Install it from http://boost.org"
+	echo "               or .deb users: apt-get install libboost-thread-dev"
+	nogo=true
+    fi
+
     # Only cygnal requires date_time at present, so it's OK if either
     # you don't want cygnal or do have date_time installed.
     if test x"$cygnal" = xno -o x"$boost_date_time" = xyes; then
@@ -1971,9 +1977,9 @@
 else
     echo "        ERROR: No BOOST development package installed!"
     echo "               Install it from http://www.boost.org"
-    echo "               or .deb users: apt-get install libboost-thread-dev"
+    echo "               or .deb users: apt-get install libboost-dev libboost-thread-dev"
     if test x"$cygnal" = xyes; then
-    echo "                              and libboost-date-time-dev"
+    echo "                              and libboost-date-time-dev (for cygnal)"
     fi
     echo "               or .rpm users: yum install boost-devel"
  nogo=true

Index: macros/boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.47
retrieving revision 1.47.2.1
diff -u -b -r1.47 -r1.47.2.1
--- macros/boost.m4	1 Jul 2007 10:54:11 -0000	1.47
+++ macros/boost.m4	22 Aug 2007 12:15:31 -0000	1.47.2.1
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: boost.m4,v 1.47 2007/07/01 10:54:11 bjacques Exp $
+dnl $Id: boost.m4,v 1.47.2.1 2007/08/22 12:15:31 strk Exp $
 
 dnl Boost modules are:
 dnl date-time, filesystem. graph. iostreams, program options, python,
@@ -26,10 +26,10 @@
   AC_ARG_WITH(boost_incl, AC_HELP_STRING([--with-boost-incl], [directory where boost headers are]), with_boost_incl=${withval})
   AC_CACHE_VAL(ac_cv_path_boost_incl, [
     if test x"${with_boost_incl}" != x ; then
-      if test -f ${with_boost_incl}/boost/detail/lightweight_mutex.hpp ; then
+      if test -f ${with_boost_incl}/boost/thread.hpp ; then
         ac_cv_path_boost_incl=-I`(cd ${with_boost_incl}; pwd)`
       else
-        AC_MSG_ERROR([${with_boost_incl} directory doesn't contain any headers])
+        AC_MSG_ERROR([${with_boost_incl} directory doesn't contain boost/thread.hpp])
       fi
     fi
   ])
@@ -49,16 +49,11 @@
     gnash_boost_version=""
     for i in $incllist; do
       for j in `ls -dr $i/boost* 2>/dev/null`; do
-        if test -f ${j}/boost/detail/lightweight_mutex.hpp; then
+        if test -f ${j}/boost/detail/lightweight_mutex.hpp -a -f ${j}/boost/thread.hpp; then
           gnash_boost_topdir=`basename $j`
           ac_cv_path_boost_incl="-I${j}"
           break
         fi
-        if test -f ${j}/detail/lightweight_mutex.hpp; then
-          gnash_boost_topdir=`basename $j`
-          ac_cv_path_boost_incl="-I${i}"
-          break
-        fi
       done
       if test x$gnash_boost_topdir != x; then
         gnash_boost_version=`echo ${gnash_boost_topdir} | sed -e 's:boost-::'`
@@ -68,17 +63,13 @@
   fi
 
   if test x"${gnash_boost_version}" = x; then
-    AC_MSG_RESULT([no version needed])
+    AC_MSG_RESULT([no version found/needed])
   else
    AC_MSG_RESULT(${gnash_boost_version})
   fi
 
-  if test x"${ac_cv_path_boost_incl}" = x ; then
-    AC_CHECK_HEADERS(boost/detail/lightweight_mutex.hpp, [ac_cv_path_boost_incl="-I/usr/include"])
-  fi
-
-  AC_MSG_CHECKING([for boost header])
-  AC_MSG_RESULT(${ac_cv_path_boost_incl})
+  dnl AC_MSG_CHECKING([for boost header])
+  dnl AC_MSG_RESULT(${ac_cv_path_boost_incl})
 
   dnl Look for the library
   AC_ARG_WITH(boost_lib, AC_HELP_STRING([--with-boost-lib], [directory where boost libraries are]), with_boost_lib=${withval})
@@ -88,9 +79,6 @@
     fi
   ])
 
-  AC_LANG_PUSH(C++)
-  save_LIBS="$LIBS"
-
   dnl Specify the list of probable names. Boost creates 8 identical
   dnl libraries with different names. The prefered order is to always
   dnl use the one with -mt on it, because it's the thread safe
@@ -144,18 +132,47 @@
   done
   AC_MSG_RESULT(${ac_cv_path_boost_lib})
 
-  dnl we don't want any boost libraries in LIBS, we prefer to keep it seperate.
+  BOOST_CFLAGS="$ac_cv_path_boost_incl"
+  BOOST_LIBS="$ac_cv_path_boost_lib" 
+
+  dnl ---------------------------------------
+  dnl Check actual usability of headers
+  dnl (if not cross-compiling)
+  dnl ---------------------------------------
+
+  if test x${cross_compiling} = xno; then
+    AC_LANG_PUSH(C++)  
+    save_CFLAGS="$CFLAGS"
+    CFLAGS="$CFLAGS $BOOST_CFLAGS"
+    AC_CHECK_HEADERS([boost/thread.hpp], [], [boost_thread=no]) 
+    CFLAGS="$save_CFLAGS"
   AC_LANG_POP(C++)  
-  LIBS="$save_LIBS"
+  fi # if not cross-compiling
 
-  BOOST_CFLAGS="$ac_cv_path_boost_incl"
-  AC_SUBST(BOOST_CFLAGS)
+  dnl ---------------------------------------
+  dnl TODO: Check actual usability of libs
+  dnl ---------------------------------------
+
+  if test x${cross_compiling} = xno; then
+    dnl Two problems:
+    dnl   1) knowing the name of the required libs
+    dnl      (needs storing the name when finding it
+    dnl      at the beginning of this macro)
+    dnl   2) check how to use AC_CHECK_LIB for C++ libs
+    :
+  fi # if not cross-compiling
+
+
+  dnl ------------------------------------------------------------------
+  dnl Set HAVE_BOOST conditional, BOOST_CFLAGS and BOOST_LIBS variables
+  dnl ------------------------------------------------------------------
 
-  BOOST_LIBS="$ac_cv_path_boost_lib" 
+  AC_SUBST(BOOST_CFLAGS)
   AC_SUBST(BOOST_LIBS)
 
   # This isn't right: you don't need boot date-time installed unless u build
   # cygnal, and it is sometimes a separate package from Boost core and thread.
+  # TODO: why is this needed, lack of boost being a fatal error?
   AM_CONDITIONAL(HAVE_BOOST, [test x${boost_date_time} = xyes && test x${boost_thread} = xyes])
 ])
 



From MAILER-DAEMON Wed Aug 22 09:09:15 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INpxT-0007FJ-L6
	for mharc-gnash-commit@gnu.org; Wed, 22 Aug 2007 09:09:15 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INpxR-0007F8-5j
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 09:09:13 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INpxQ-0007Ew-Kd
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 09:09:12 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INpxQ-0007Et-FI
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 09:09:12 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <chadmusick@msbx.net>) id 1INpxP-0002vu-S7
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 09:09:12 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <chadmusick@msbx.net>) id 1INpxP-00086d-7V
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 13:09:11 +0000
Received: from cmusick by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <cmusick@savannah.gnu.org>) id 1INpxP-00086a-0n
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 13:09:11 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INpxP-00086a-0n@cvs.savannah.gnu.org>
From: Chad Musick <chadmusick@msbx.net>
Date: Wed, 22 Aug 2007 13:09:11 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/font.cpp server/font.h s...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Aug 2007 13:09:13 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Chad Musick <cmusick>	07/08/22 13:09:10

Modified files:
	.              : ChangeLog 
	server         : font.cpp font.h impl.cpp swf.h 
	server/swf     : tag_loaders.cpp tag_loaders.h 

Log message:
	Changes necessary to implement SWF9 tag 88 -- DefineFontName
	font.h,font.cpp: Add new fields and read function.
	impl.cpp: Set loader for tag
	swf.h: Add tag
	tag_loaders.h,tag_loaders.cpp: Define and implement loader.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4066&r2=1.4067
http://cvs.savannah.gnu.org/viewcvs/gnash/server/font.cpp?cvsroot=gnash&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/gnash/server/font.h?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.cpp?cvsroot=gnash&r1=1.115&r2=1.116
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf.h?cvsroot=gnash&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.130&r2=1.131
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.h?cvsroot=gnash&r1=1.20&r2=1.21

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4066
retrieving revision 1.4067
diff -u -b -r1.4066 -r1.4067
--- ChangeLog	22 Aug 2007 11:20:28 -0000	1.4066
+++ ChangeLog	22 Aug 2007 13:09:09 -0000	1.4067
@@ -1,3 +1,14 @@
+2007-08-22 Chad Musick <chadmusick@msbx.net>
+
+	* server/font.h, server/font.cpp: Define
+	  m_display_name and m_copyright_name for the
+	  DefineFontName tag (88) of SWF 9, reader
+	  for the tag.
+	* server/swf.h Add DEFINEFONTNAME tag to list.
+	* server/impl.cpp Set loader for DefineFontName
+	* server/swf/tag_loaders.h,.cpp Add loader for
+	  DefineFontName tag.
+
 2007-08-22 Sandro Santilli <strk@keybit.net>
 
 	* configure.ac: bail out if kde gui or kparts plugin are

Index: server/font.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/font.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- server/font.cpp	24 Jul 2007 19:43:30 -0000	1.45
+++ server/font.cpp	22 Aug 2007 13:09:10 -0000	1.46
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: font.cpp,v 1.45 2007/07/24 19:43:30 strk Exp $ */
+/* $Id: font.cpp,v 1.46 2007/08/22 13:09:10 cmusick Exp $ */
 
 // Based on the public domain work of Thatcher Ulrich <tu@tulrich.com> 2003
 
@@ -68,6 +68,8 @@
 		:
 		m_texture_glyph_nominal_size(96),	// Default is not important; gets overridden during glyph generation
 		m_name(),
+                m_display_name(),
+                m_copyright_name(),
 		m_owning_movie(NULL),
 		m_unicode_chars(false),
 		m_shift_jis_chars(false),
@@ -85,6 +87,8 @@
 		:
 		m_texture_glyph_nominal_size(96),	// Default is not important; gets overridden during glyph generation
 		m_name(name),
+                m_display_name(),
+                m_copyright_name(),
 		m_owning_movie(NULL),
 		m_unicode_chars(false),
 		m_shift_jis_chars(false),
@@ -429,6 +433,18 @@
 		}
 	}
 
+        // Read the font name, display and legal, from a DefineFontName tag.
+        void font::read_font_name(stream* in, SWF::tag_type tag,
+            movie_definition* /*m*/) 
+        {
+            assert(tag == SWF::DEFINEFONTNAME);
+            char* disp_name = in->read_string();
+            char* copy_name = in->read_string();
+            m_display_name = disp_name;
+            delete [] disp_name;
+            m_copyright_name = copy_name;
+            delete [] copy_name;
+        }
 
 	// Read additional information about this font, from a
 	// DefineFontInfo tag.  The caller has already read the tag

Index: server/font.h
===================================================================
RCS file: /sources/gnash/gnash/server/font.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- server/font.h	24 Jul 2007 19:43:30 -0000	1.28
+++ server/font.h	22 Aug 2007 13:09:10 -0000	1.29
@@ -233,6 +233,15 @@
 	///
 	void	read_font_info(stream* in, SWF::tag_type tag, movie_definition* m);
 
+        /// \brief
+        /// Read the name of this font, from a DEFINEFONTNAME tag.
+        //
+        /// The caller has already read the tag type and font id.
+        //
+        /// @see SWF::define_font_name_loader
+        ///
+        void read_font_name(stream* in, SWF::tag_type tag, movie_definition* m);
+
 	/// Dump our cached data into the given stream.
 	void	output_cached_data(tu_file* out, const cache_options& options);
 
@@ -369,6 +378,9 @@
 	int	m_texture_glyph_nominal_size;
 
 	std::string	m_name;
+        std::string     m_display_name;
+        std::string     m_copyright_name;
+
 	movie_definition*	m_owning_movie;
 
 	bool	m_has_layout;

Index: server/impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/impl.cpp,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -b -r1.115 -r1.116
--- server/impl.cpp	22 Aug 2007 04:27:02 -0000	1.115
+++ server/impl.cpp	22 Aug 2007 13:09:10 -0000	1.116
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: impl.cpp,v 1.115 2007/08/22 04:27:02 cmusick Exp $ */
+/* $Id: impl.cpp,v 1.116 2007/08/22 13:09:10 cmusick Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -256,13 +256,15 @@
 
 	register_tag_loader(SWF::CSMTEXTSETTINGS, fixme_loader); // 74
 	register_tag_loader(SWF::DEFINEFONT3, define_font_loader); // 75
-        register_tag_loader(SWF::SYMBOLCLASS, fixme_loader); // 76 Chad
+        register_tag_loader(SWF::SYMBOLCLASS, fixme_loader); // 76 
 	register_tag_loader(SWF::METADATA, metadata_loader); // 77
 	register_tag_loader(SWF::DEFINESCALINGGRID, fixme_loader); // 78
         register_tag_loader(SWF::DOABCDEFINE, fixme_loader); // 79 -- AS3 codeblock.
 	register_tag_loader(SWF::DEFINESHAPE4, fixme_loader); // 83
 	register_tag_loader(SWF::DEFINEMORPHSHAPE2, fixme_loader); // 84
 
+        register_tag_loader(SWF::DEFINEFONTNAME, define_font_name_loader); // 88
+
 	register_tag_loader(SWF::REFLEX, reflex_loader); // 777
 }
 

Index: server/swf.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- server/swf.h	21 Aug 2007 03:49:41 -0000	1.37
+++ server/swf.h	22 Aug 2007 13:09:10 -0000	1.38
@@ -156,6 +156,8 @@
     /// http://sswf.sourceforge.net/SWFalexref.html#tag_definemorphshape2
     DEFINEMORPHSHAPE2     = 84,
 
+    DEFINEFONTNAME        = 88,
+
     REFLEX                = 777,
 
     DEFINEBITSPTR         = 1023

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -b -r1.130 -r1.131
--- server/swf/tag_loaders.cpp	18 Aug 2007 22:07:17 -0000	1.130
+++ server/swf/tag_loaders.cpp	22 Aug 2007 13:09:10 -0000	1.131
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: tag_loaders.cpp,v 1.130 2007/08/18 22:07:17 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.131 2007/08/22 13:09:10 cmusick Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1063,6 +1063,27 @@
     }
 }
 
+// Set font name for a font.
+void define_font_name_loader(stream* in, tag_type tag, movie_definition* m)
+{
+    assert(tag == SWF::DEFINEFONTNAME);
+
+    uint16_t font_id = in->read_u16();
+
+    font* f = m->get_font(font_id);
+    if (f)
+    {
+        f->read_font_name(in, tag, m);
+    }
+    else
+    {
+        IF_VERBOSE_MALFORMED_SWF(
+            log_swferror(_("define_font_name_loader: "
+                           "can't find font w/ id %d"), font_id);
+        );
+    }
+}
+
 // Create and initialize a sprite, and add it to the movie.
 void
 sprite_loader(stream* in, tag_type tag, movie_definition* m)

Index: server/swf/tag_loaders.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/swf/tag_loaders.h	8 Aug 2007 18:26:38 -0000	1.20
+++ server/swf/tag_loaders.h	22 Aug 2007 13:09:10 -0000	1.21
@@ -19,7 +19,7 @@
 //
 //
 
-/* $Id: tag_loaders.h,v 1.20 2007/08/08 18:26:38 strk Exp $ */
+/* $Id: tag_loaders.h,v 1.21 2007/08/22 13:09:10 cmusick Exp $ */
 
 #ifndef GNASH_SWF_TAG_LOADERS_H
 #define GNASH_SWF_TAG_LOADERS_H
@@ -89,6 +89,11 @@
 ///
 void	define_font_info_loader(stream*, tag_type, movie_definition*);
 
+/// SWF Tag DefineFontName (88)
+//  Load the display name and copyright string of a font.
+//  This adds to an existing font.
+void define_font_name_loader(stream*, tag_type, movie_definition*);
+
 /// Read SWF::DEFINETEXT and SWF::DEFINETEXT2 tags.
 void	define_text_loader(stream*, tag_type, movie_definition*);
 



From MAILER-DAEMON Wed Aug 22 10:29:36 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INrDE-0003t6-Gq
	for mharc-gnash-commit@gnu.org; Wed, 22 Aug 2007 10:29:36 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INrDC-0003oZ-H7
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 10:29:34 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INrDB-0003mB-IZ
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 10:29:33 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INrDA-0003ks-Vw
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 10:29:33 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1INrD9-0003YV-Tc
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 10:29:32 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1INrD8-0005uY-23
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 14:29:30 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1INrD7-0005uV-VJ
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 14:29:30 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INrD7-0005uV-VJ@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 22 Aug 2007 14:29:29 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/Movi...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Aug 2007 14:29:35 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/22 14:29:29

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: MovieClip.as 

Log message:
	        * testsuite/actionscript.all/MovieClip.as:
	          Modify syntax used to test for functions availability
	          to cope with a bug in Ming < 00040005.
	          Should fix bug #20867.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4067&r2=1.4068
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.79&r2=1.80

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4067
retrieving revision 1.4068
diff -u -b -r1.4067 -r1.4068
--- ChangeLog	22 Aug 2007 13:09:09 -0000	1.4067
+++ ChangeLog	22 Aug 2007 14:29:29 -0000	1.4068
@@ -1,3 +1,10 @@
+2007-08-22 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/actionscript.all/MovieClip.as:
+	  Modify syntax used to test for functions availability
+	  to cope with a bug in Ming < 00040005.
+	  Should fix bug #20867.
+
 2007-08-22 Chad Musick <chadmusick@msbx.net>
 
 	* server/font.h, server/font.cpp: Define

Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- testsuite/actionscript.all/MovieClip.as	2 Aug 2007 18:57:00 -0000	1.79
+++ testsuite/actionscript.all/MovieClip.as	22 Aug 2007 14:29:29 -0000	1.80
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.79 2007/08/02 18:57:00 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.80 2007/08/22 14:29:29 strk Exp $";
 
 #include "check.as"
 
@@ -98,13 +98,9 @@
 check_equals(mc.enabled, 'a string'); // yes, we can set to arbitrary values
 mc.__proto__.enabled = true; // better keep as it was initially, who knows what it would do...
 
-// This seems unavailable
-// when targetting SWF > 6
-#if OUTPUT_VERSION > 6
-check_equals(mc.duplicateMovieClip, undefined);
-#else
-check(mc.duplicateMovieClip);
-#endif
+// NOTE: due to a bug in Ming < 00040005, mc.loadMovie would
+//       be converted to lowercase, so we use the [] hack
+check_equals(typeof(mc['duplicateMovieClip']), 'function');
 
 #if OUTPUT_VERSION >= 6
     check_equals(typeof(mc.setMask), 'function');
@@ -133,15 +129,10 @@
     check_equals(typeof(mc.stopDrag), 'function');
     check_equals(typeof(mc.getTextSnapshot), 'function');
 
-    // These two seem unavailable
-    // when targetting SWF > 6
-#if OUTPUT_VERSION > 6
-    check_equals(typeof(mc.loadMovie), 'undefined');
-    check_equals(typeof(mc.removeMovieClip), 'undefined');
-#else
-    check_equals(typeof(mc.loadMovie), 'function');
-    check_equals(typeof(mc.removeMovieClip), 'function');
-#endif
+    // NOTE: due to a bug in Ming < 00040005, mc.loadMovie would
+    //       be converted to lowercase, so we use the [] hack
+    check_equals(typeof(mc['loadMovie']), 'function');
+    check_equals(typeof(mc['removeMovieClip']), 'function');
 
 #endif // OUTPUT_VERSION >= 6
 



From MAILER-DAEMON Wed Aug 22 10:29:39 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INrDG-0003xN-Qm
	for mharc-gnash-commit@gnu.org; Wed, 22 Aug 2007 10:29:38 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INrDE-0003tl-Sz
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 10:29:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INrDE-0003sW-6H
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 10:29:36 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INrDE-0003sJ-2w
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 10:29:36 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1INrDD-0003aA-E9
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 10:29:35 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1INrDC-0005up-Uc
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 14:29:35 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1INrDC-0005um-OL
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 14:29:34 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INrDC-0005um-OL@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 22 Aug 2007 14:29:34 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/Movi...
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Aug 2007 14:29:37 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/22 14:29:34

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: MovieClip.as 

Log message:
	        * testsuite/actionscript.all/MovieClip.as:
	          Modify syntax used to test for functions availability
	          to cope with a bug in Ming < 00040005.
	          Should fix bug #20867.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.52&r2=1.3971.2.53
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.79&r2=1.79.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.52
retrieving revision 1.3971.2.53
diff -u -b -r1.3971.2.52 -r1.3971.2.53
--- ChangeLog	22 Aug 2007 12:15:29 -0000	1.3971.2.52
+++ ChangeLog	22 Aug 2007 14:29:33 -0000	1.3971.2.53
@@ -1,5 +1,12 @@
 2007-08-22 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/actionscript.all/MovieClip.as:
+	  Modify syntax used to test for functions availability
+	  to cope with a bug in Ming < 00040005.
+	  Should fix bug #20867.
+
+2007-08-22 Sandro Santilli <strk@keybit.net>
+
 	* configure.ac: bail out if kde gui or kparts plugin are
 	  requested but kde/qt deps are not met. Should fix bug
 	  #20848; bail out if boost_thread is not set to yes.

Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.79
retrieving revision 1.79.2.1
diff -u -b -r1.79 -r1.79.2.1
--- testsuite/actionscript.all/MovieClip.as	2 Aug 2007 18:57:00 -0000	1.79
+++ testsuite/actionscript.all/MovieClip.as	22 Aug 2007 14:29:34 -0000	1.79.2.1
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.79 2007/08/02 18:57:00 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.79.2.1 2007/08/22 14:29:34 strk Exp $";
 
 #include "check.as"
 
@@ -98,13 +98,9 @@
 check_equals(mc.enabled, 'a string'); // yes, we can set to arbitrary values
 mc.__proto__.enabled = true; // better keep as it was initially, who knows what it would do...
 
-// This seems unavailable
-// when targetting SWF > 6
-#if OUTPUT_VERSION > 6
-check_equals(mc.duplicateMovieClip, undefined);
-#else
-check(mc.duplicateMovieClip);
-#endif
+// NOTE: due to a bug in Ming < 00040005, mc.loadMovie would
+//       be converted to lowercase, so we use the [] hack
+check_equals(typeof(mc['duplicateMovieClip']), 'function');
 
 #if OUTPUT_VERSION >= 6
     check_equals(typeof(mc.setMask), 'function');
@@ -133,15 +129,10 @@
     check_equals(typeof(mc.stopDrag), 'function');
     check_equals(typeof(mc.getTextSnapshot), 'function');
 
-    // These two seem unavailable
-    // when targetting SWF > 6
-#if OUTPUT_VERSION > 6
-    check_equals(typeof(mc.loadMovie), 'undefined');
-    check_equals(typeof(mc.removeMovieClip), 'undefined');
-#else
-    check_equals(typeof(mc.loadMovie), 'function');
-    check_equals(typeof(mc.removeMovieClip), 'function');
-#endif
+    // NOTE: due to a bug in Ming < 00040005, mc.loadMovie would
+    //       be converted to lowercase, so we use the [] hack
+    check_equals(typeof(mc['loadMovie']), 'function');
+    check_equals(typeof(mc['removeMovieClip']), 'function');
 
 #endif // OUTPUT_VERSION >= 6
 



From MAILER-DAEMON Wed Aug 22 11:44:57 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INsO9-00029M-GR
	for mharc-gnash-commit@gnu.org; Wed, 22 Aug 2007 11:44:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INsO8-00029G-VR
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 11:44:57 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INsO7-00028w-If
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 11:44:56 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INsO7-00028t-D7
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 11:44:55 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1INsO6-0003kL-Im
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 11:44:54 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1INsO5-0002Z0-8E
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 15:44:53 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1INsO5-0002Yu-38
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 15:44:53 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INsO5-0002Yu-38@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 22 Aug 2007 15:44:53 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/Drawing...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Aug 2007 15:44:57 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/22 15:44:53

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: DrawingApiTestRunner.cpp 

Log message:
	        * testsuite/misc-ming.all/DrawingApiTestRunner.cpp:
	          Try another work-around to gcc-4.1.2 bug, commented
	          this time.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4068&r2=1.4069
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp?cvsroot=gnash&r1=1.21&r2=1.22

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4068
retrieving revision 1.4069
diff -u -b -r1.4068 -r1.4069
--- ChangeLog	22 Aug 2007 14:29:29 -0000	1.4068
+++ ChangeLog	22 Aug 2007 15:44:52 -0000	1.4069
@@ -1,5 +1,8 @@
 2007-08-22 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/misc-ming.all/DrawingApiTestRunner.cpp:
+	  Try another work-around to gcc-4.1.2 bug, commented
+	  this time.
 	* testsuite/actionscript.all/MovieClip.as:
 	  Modify syntax used to test for functions availability
 	  to cope with a bug in Ming < 00040005.

Index: testsuite/misc-ming.all/DrawingApiTestRunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- testsuite/misc-ming.all/DrawingApiTestRunner.cpp	21 Aug 2007 14:14:35 -0000	1.21
+++ testsuite/misc-ming.all/DrawingApiTestRunner.cpp	22 Aug 2007 15:44:52 -0000	1.22
@@ -44,10 +44,26 @@
 inscribedRect(int x, int y, int radius)
 {
 	Range2d<int> ret;
-	float halfside = ((float)radius * sqrt(2.0f))/2.0f;
-	ret.expandTo(int(round(x-halfside)), int(round(y-halfside)));
-	ret.expandTo(int(round(x+halfside)), int(round(y+halfside)));
-        fprintf(stderr, ".");
+
+	int side = int(round((float)radius * sqrt(2.0f))); 
+	int halfside = int(side/2.0); // round toward zero
+
+	// Simply constructing a stringstream fixes an optimization
+	// bug with GCC-4.1.2 resulting in absurd values !
+	// See https://savannah.gnu.org/bugs/?20853
+	std::stringstream work_around_GCC_412_bug;
+
+	// upper-left corner
+	int ULx = x-halfside;
+	int ULy = y-halfside;
+
+	// lower-right corner
+	int LRx = x+halfside;
+	int LRy = y+halfside;
+
+	ret.expandTo(ULx, ULy);
+	ret.expandTo(LRx, LRy);
+
 	return ret;
 }
 



From MAILER-DAEMON Wed Aug 22 11:45:07 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INsOJ-0002Dh-90
	for mharc-gnash-commit@gnu.org; Wed, 22 Aug 2007 11:45:07 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INsOF-0002C7-Pi
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 11:45:03 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INsOF-0002Bf-4n
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 11:45:03 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INsOF-0002Bb-0Y
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 11:45:03 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1INsOE-0003nw-7r
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 11:45:02 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1INsOD-0002ax-Dj
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 15:45:01 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1INsOD-0002au-6x
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 15:45:01 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INsOD-0002au-6x@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 22 Aug 2007 15:45:01 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/Drawing...
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Aug 2007 15:45:04 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/22 15:45:01

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: DrawingApiTestRunner.cpp 

Log message:
	        * testsuite/misc-ming.all/DrawingApiTestRunner.cpp:
	          Try another work-around to gcc-4.1.2 bug, commented
	          this time.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.53&r2=1.3971.2.54
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.20.2.1&r2=1.20.2.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.53
retrieving revision 1.3971.2.54
diff -u -b -r1.3971.2.53 -r1.3971.2.54
--- ChangeLog	22 Aug 2007 14:29:33 -0000	1.3971.2.53
+++ ChangeLog	22 Aug 2007 15:45:00 -0000	1.3971.2.54
@@ -1,5 +1,8 @@
 2007-08-22 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/misc-ming.all/DrawingApiTestRunner.cpp:
+	  Try another work-around to gcc-4.1.2 bug, commented
+	  this time.
 	* testsuite/actionscript.all/MovieClip.as:
 	  Modify syntax used to test for functions availability
 	  to cope with a bug in Ming < 00040005.

Index: testsuite/misc-ming.all/DrawingApiTestRunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -u -b -r1.20.2.1 -r1.20.2.2
--- testsuite/misc-ming.all/DrawingApiTestRunner.cpp	21 Aug 2007 15:10:03 -0000	1.20.2.1
+++ testsuite/misc-ming.all/DrawingApiTestRunner.cpp	22 Aug 2007 15:45:00 -0000	1.20.2.2
@@ -44,10 +44,26 @@
 inscribedRect(int x, int y, int radius)
 {
 	Range2d<int> ret;
-	float halfside = ((float)radius * sqrt(2.0f))/2.0f;
-	ret.expandTo(int(round(x-halfside)), int(round(y-halfside)));
-	ret.expandTo(int(round(x+halfside)), int(round(y+halfside)));
-        fprintf(stderr, ".");
+
+	int side = int(round((float)radius * sqrt(2.0f))); 
+	int halfside = int(side/2.0); // round toward zero
+
+	// Simply constructing a stringstream fixes an optimization
+	// bug with GCC-4.1.2 resulting in absurd values !
+	// See https://savannah.gnu.org/bugs/?20853
+	std::stringstream work_around_GCC_412_bug;
+
+	// upper-left corner
+	int ULx = x-halfside;
+	int ULy = y-halfside;
+
+	// lower-right corner
+	int LRx = x+halfside;
+	int LRy = y+halfside;
+
+	ret.expandTo(ULx, ULy);
+	ret.expandTo(LRx, LRy);
+
 	return ret;
 }
 



From MAILER-DAEMON Wed Aug 22 11:47:32 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INsQe-0003Yd-4y
	for mharc-gnash-commit@gnu.org; Wed, 22 Aug 2007 11:47:32 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INsQc-0003XJ-Ow
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 11:47:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INsQc-0003X2-11
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 11:47:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INsQb-0003Wz-RS
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 11:47:29 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1INsQb-0004bb-Ea
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 11:47:29 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1INsQb-00039P-14
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 15:47:29 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1INsQa-00039J-Tv
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 15:47:28 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INsQa-00039J-Tv@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 22 Aug 2007 15:47:28 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/testsuite/misc-ming.all DrawingApiTestRun...
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Aug 2007 15:47:30 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/22 15:47:28

Modified files:
	testsuite/misc-ming.all: DrawingApiTestRunner.cpp 

Log message:
	don't forget to include <sstream>

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.20.2.2&r2=1.20.2.3

Patches:
Index: DrawingApiTestRunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp,v
retrieving revision 1.20.2.2
retrieving revision 1.20.2.3
diff -u -b -r1.20.2.2 -r1.20.2.3
--- DrawingApiTestRunner.cpp	22 Aug 2007 15:45:00 -0000	1.20.2.2
+++ DrawingApiTestRunner.cpp	22 Aug 2007 15:47:28 -0000	1.20.2.3
@@ -30,6 +30,7 @@
 #include "check.h"
 #include <string>
 #include <cassert>
+#include <sstream>
 
 using namespace gnash;
 using namespace gnash::geometry;



From MAILER-DAEMON Wed Aug 22 11:47:53 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INsQz-0003hI-7t
	for mharc-gnash-commit@gnu.org; Wed, 22 Aug 2007 11:47:53 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INsQx-0003gD-Gw
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 11:47:51 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INsQv-0003g1-SU
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 11:47:50 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INsQv-0003fy-O1
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 11:47:49 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1INsQv-0004g6-BC
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 11:47:49 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1INsQu-0003GW-Tz
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 15:47:48 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1INsQu-0003GR-QO
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 15:47:48 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INsQu-0003GR-QO@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 22 Aug 2007 15:47:48 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/testsuite/misc-ming.all DrawingApiTestRun...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Aug 2007 15:47:51 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/22 15:47:48

Modified files:
	testsuite/misc-ming.all: DrawingApiTestRunner.cpp 

Log message:
	don't forget to include <sstream>

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp?cvsroot=gnash&r1=1.22&r2=1.23

Patches:
Index: DrawingApiTestRunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- DrawingApiTestRunner.cpp	22 Aug 2007 15:44:52 -0000	1.22
+++ DrawingApiTestRunner.cpp	22 Aug 2007 15:47:48 -0000	1.23
@@ -30,6 +30,7 @@
 #include "check.h"
 #include <string>
 #include <cassert>
+#include <sstream>
 
 using namespace gnash;
 using namespace gnash::geometry;



From MAILER-DAEMON Wed Aug 22 12:03:32 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INsg8-0007Yl-Bt
	for mharc-gnash-commit@gnu.org; Wed, 22 Aug 2007 12:03:32 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INsg6-0007XD-VG
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 12:03:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INsg6-0007WA-9N
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 12:03:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INsg6-0007W1-0b
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 12:03:30 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1INsg5-0000Mw-GT
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 12:03:29 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1INsg4-0003iP-Q1
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 16:03:28 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1INsg4-0003iM-Ka
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 16:03:28 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INsg4-0003iM-Ka@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 22 Aug 2007 16:03:28 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog Makefile.am [release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Aug 2007 16:03:31 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/22 16:03:28

Modified files:
	.              : ChangeLog Makefile.am 

Log message:
	        * Makefile.am: distribute autogen.sh.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.54&r2=1.3971.2.55
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.87&r2=1.87.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.54
retrieving revision 1.3971.2.55
diff -u -b -r1.3971.2.54 -r1.3971.2.55
--- ChangeLog	22 Aug 2007 15:45:00 -0000	1.3971.2.54
+++ ChangeLog	22 Aug 2007 16:03:27 -0000	1.3971.2.55
@@ -1,5 +1,9 @@
 2007-08-22 Sandro Santilli <strk@keybit.net>
 
+	* Makefile.am: distribute autogen.sh.
+
+2007-08-22 Sandro Santilli <strk@keybit.net>
+
 	* testsuite/misc-ming.all/DrawingApiTestRunner.cpp:
 	  Try another work-around to gcc-4.1.2 bug, commented
 	  this time.

Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.87
retrieving revision 1.87.2.1
diff -u -b -r1.87 -r1.87.2.1
--- Makefile.am	7 Aug 2007 20:53:09 -0000	1.87
+++ Makefile.am	22 Aug 2007 16:03:28 -0000	1.87.2.1
@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # 
 
-# $Id: Makefile.am,v 1.87 2007/08/07 20:53:09 strk Exp $
+# $Id: Makefile.am,v 1.87.2.1 2007/08/22 16:03:28 strk Exp $
 
 ## Process this file with automake to produce Makefile.in
 AUTOMAKE_OPTIONS = 1.6.0
@@ -50,7 +50,7 @@
 
 DIST_SUBDIRS = $(STD_DIRS) cygnal doc
 
-EXTRA_DIST = config.rpath $(man_MANS) macros/incllist macros/libslist 
+EXTRA_DIST = config.rpath $(man_MANS) macros/incllist macros/libslist autogen.sh
 
 noinst_HEADERS = compatibility_include.h
 



From MAILER-DAEMON Wed Aug 22 12:11:48 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INso8-0002fg-Lb
	for mharc-gnash-commit@gnu.org; Wed, 22 Aug 2007 12:11:48 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INso6-0002es-Tq
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 12:11:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INso5-0002eH-Sb
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 12:11:46 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INso5-0002e3-It
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 12:11:45 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1INso5-0002Bk-97
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 12:11:45 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1INso4-00045k-1z
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 16:11:44 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1INso3-00045b-Cr
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 16:11:43 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INso3-00045b-Cr@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 22 Aug 2007 16:11:43 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog NEWS [release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Aug 2007 16:11:47 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/22 16:11:43

Modified files:
	.              : ChangeLog NEWS 

Log message:
	        * NEWS: add note about the 'debugLog' gnashrc fix and set
	          release date to Aug 23 (tomorrow).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.55&r2=1.3971.2.56
http://cvs.savannah.gnu.org/viewcvs/gnash/NEWS?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.4.6.2&r2=1.4.6.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.55
retrieving revision 1.3971.2.56
diff -u -b -r1.3971.2.55 -r1.3971.2.56
--- ChangeLog	22 Aug 2007 16:03:27 -0000	1.3971.2.55
+++ ChangeLog	22 Aug 2007 16:11:42 -0000	1.3971.2.56
@@ -1,5 +1,7 @@
 2007-08-22 Sandro Santilli <strk@keybit.net>
 
+	* NEWS: add note about the 'debugLog' gnashrc fix and set
+	  release date to Aug 23 (tomorrow).
 	* Makefile.am: distribute autogen.sh.
 
 2007-08-22 Sandro Santilli <strk@keybit.net>

Index: NEWS
===================================================================
RCS file: /sources/gnash/gnash/NEWS,v
retrieving revision 1.4.6.2
retrieving revision 1.4.6.3
diff -u -b -r1.4.6.2 -r1.4.6.3
--- NEWS	17 Aug 2007 14:08:40 -0000	1.4.6.2
+++ NEWS	22 Aug 2007 16:11:43 -0000	1.4.6.3
@@ -1,4 +1,4 @@
-2007-08-XX  Sandro Santilli <strk@keybit.net
+2007-08-23  Sandro Santilli <strk@keybit.net>
 
 Fourth alpha release of Gnash (0.8.1).
 Improvements since 0.8.0 release are:
@@ -16,6 +16,7 @@
 	  script with gui selection capabilities (-G)
 	- More robust parser 
 	- Better support for flash player detection
+	- Fix for 'debugLog' directive in gnashrc
 
 07-06-XX  Rob Savoye  <rob@darkstar.welcomehome.org>
 



From MAILER-DAEMON Wed Aug 22 13:32:51 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INu4Z-0002Wz-FP
	for mharc-gnash-commit@gnu.org; Wed, 22 Aug 2007 13:32:51 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INu4W-0002W7-Px
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 13:32:48 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INu4V-0002Uu-Kd
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 13:32:48 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INu4V-0002Uj-Ew
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 13:32:47 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1INu4V-0000np-3D
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 13:32:47 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1INu4U-0001Ub-1L
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 17:32:46 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1INu4T-0001UY-Tm
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 17:32:45 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INu4T-0001UY-Tm@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 22 Aug 2007 17:32:45 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/swf.h server/parser/acti...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Aug 2007 17:32:49 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/22 17:32:45

Modified files:
	.              : ChangeLog 
	server         : swf.h 
	server/parser  : action_buffer.h 
	server/vm      : ASHandlers.cpp 
	testsuite/misc-mtasc.all: exception.as 

Log message:
	        * server/swf.h: add version and reference url to
	          ACTION_TRY and ACTION_THROW
	        * server/parser/action_buffer.h: add read_uint8() method.
	        * server/vm/ASHandlers.cpp: stub ACTION_TRY handler
	          (parsed the tag, doesn't do anything with the info yet).
	        * testsuite/misc-mtasc.all/exception.as: more tests for
	          try/catch/finally.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4069&r2=1.4070
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf.h?cvsroot=gnash&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/action_buffer.h?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.123&r2=1.124
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-mtasc.all/exception.as?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4069
retrieving revision 1.4070
diff -u -b -r1.4069 -r1.4070
--- ChangeLog	22 Aug 2007 15:44:52 -0000	1.4069
+++ ChangeLog	22 Aug 2007 17:32:44 -0000	1.4070
@@ -1,5 +1,15 @@
 2007-08-22 Sandro Santilli <strk@keybit.net>
 
+	* server/swf.h: add version and reference url to
+	  ACTION_TRY and ACTION_THROW
+	* server/parser/action_buffer.h: add read_uint8() method.
+	* server/vm/ASHandlers.cpp: stub ACTION_TRY handler
+	  (parsed the tag, doesn't do anything with the info yet).
+	* testsuite/misc-mtasc.all/exception.as: more tests for
+	  try/catch/finally.
+
+2007-08-22 Sandro Santilli <strk@keybit.net>
+
 	* testsuite/misc-ming.all/DrawingApiTestRunner.cpp:
 	  Try another work-around to gcc-4.1.2 bug, commented
 	  this time.

Index: server/swf.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- server/swf.h	22 Aug 2007 13:09:10 -0000	1.38
+++ server/swf.h	22 Aug 2007 17:32:45 -0000	1.39
@@ -211,6 +211,11 @@
     ACTION_STARTDRAGMOVIE          = 0x27,
     ACTION_STOPDRAGMOVIE           = 0x28,
     ACTION_STRINGCOMPARE           = 0x29,
+
+    /// SWF7
+    ///
+    /// http://sswf.sourceforge.net/SWFalexref.html#action_throw
+    ///
     ACTION_THROW                   = 0x2A,
 
     /// SWF7
@@ -493,7 +498,12 @@
     ///
     ACTION_DEFINEFUNCTION2         = 0x8E,
 
+    /// SWF7
+    ///
+    /// http://sswf.sourceforge.net/SWFalexref.html#action_try
+    ///
     ACTION_TRY                     = 0x8F,
+
     ACTION_WITH                    = 0x94,
     ACTION_DEFINEFUNCTION          = 0x9B,
 

Index: server/parser/action_buffer.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/action_buffer.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- server/parser/action_buffer.h	1 Jul 2007 10:54:33 -0000	1.15
+++ server/parser/action_buffer.h	22 Aug 2007 17:32:45 -0000	1.16
@@ -139,7 +139,7 @@
 		return (const unsigned char*)(&m_buffer[pc]);
 	}
 
-	/// Get an integer value from given offset
+	/// Get a signed integer value from given offset
 	//
 	/// Useful to hide complexity of underlying buffer access.
 	///
@@ -149,6 +149,15 @@
 		return ret;
 	}
 
+	/// Get an unsigned short integer value from given offset
+	//
+	/// Useful to hide complexity of underlying buffer access.
+	///
+	uint16_t read_uint16(size_t pc) const
+	{
+		return static_cast<uint16_t>(read_int16(pc));
+	}
+
 	/// Read a 32-bit integer starting at given offset.
 	//
 	/// Useful to hide complexity of underlying buffer access.

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -b -r1.123 -r1.124
--- server/vm/ASHandlers.cpp	20 Aug 2007 03:25:09 -0000	1.123
+++ server/vm/ASHandlers.cpp	22 Aug 2007 17:32:45 -0000	1.124
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ASHandlers.cpp,v 1.123 2007/08/20 03:25:09 cmusick Exp $ */
+/* $Id: ASHandlers.cpp,v 1.124 2007/08/22 17:32:45 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -3581,9 +3581,47 @@
 }
 
 void
-SWFHandlers::ActionTry(ActionExec& /*thread*/)
+SWFHandlers::ActionTry(ActionExec& thread)
 {
 //    GNASH_REPORT_FUNCTION;
+
+	as_environment& env = thread.env;
+	const action_buffer& code = thread.code;
+	size_t pc = thread.pc;
+
+	assert( code[pc] == SWF::ACTION_TRY );
+
+        size_t i = thread.pc + 3; // skip tag id and length
+
+	uint8_t flags = code[i];
+	++i;
+
+	bool doCatch = flags & 1;
+	bool doFinally = flags & (1<<1);
+	bool catchInRegister = flags&(1<<2);
+	uint8_t reserved = flags&0xE0;
+
+	uint16_t trySize = code.read_uint16(i); i += 2;
+	uint16_t catchSize = code.read_uint16(i); i += 2;
+	uint16_t finallySize = code.read_uint16(i); i += 2;
+
+	const char* catchName = NULL;
+	uint8_t catchRegister = 0;
+
+	if ( catchInRegister )
+	{
+		catchName = code.read_string(i);
+	}
+	else
+	{
+		catchRegister = code[i];
+	}
+
+	IF_VERBOSE_ACTION(
+	log_action(_("ActionTry: reserved:%x doFinally:%d doCatch:%d trySize:%u catchSize:%u finallySize:%u catchName:%s catchRegister:%u"),
+		reserved, doFinally, doCatch, trySize, catchSize, finallySize, catchName ? catchName : "(null)", catchRegister);
+	);
+
     log_unimpl (__PRETTY_FUNCTION__);
 }
 

Index: testsuite/misc-mtasc.all/exception.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-mtasc.all/exception.as,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/misc-mtasc.all/exception.as	20 Aug 2007 11:13:17 -0000	1.1
+++ testsuite/misc-mtasc.all/exception.as	22 Aug 2007 17:32:45 -0000	1.2
@@ -33,17 +33,59 @@
 		note("Test constructor called");
 	}
 
+	function addOneOnFinal(o)
+	{
+		try {
+			return 'try';
+		}
+		finally {
+			o.num += 1;
+			return 'finally';
+		}
+	}
+
 	function test_all()
 	{
-		var res;
+		var res = 'string';
 		try {
 			throw(1);
 			res = 0;
 		} catch (e) {
 			res = e;
 		}
-
+		check_equals(typeof(res), 'number');
 		xcheck_equals(res, 1);
+
+		res = 'string';
+		try {
+			throw('thrown');
+			res = 0;
+		} catch(e) {
+			res = e;
+		}
+		finally {
+			res += '_finally';
+		}
+		check_equals(typeof(res), 'string');
+		xcheck_equals(res, 'thrown_finally');
+
+		res = 'string';
+		try {
+			res = 0;
+		} catch(e) {
+			res = e;
+		}
+		finally {
+			res = 3;
+		}
+		check_equals(typeof(res), 'number');
+		check_equals(res, 3);
+
+		var o = new Object();
+		o.num = 1;
+		var ret = addOneOnFinal(o);
+		xcheck_equals(ret, 'finally');
+		xcheck_equals(o.num, 2);
 	}
 
 	static function main(mc)



From MAILER-DAEMON Wed Aug 22 13:50:30 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INuLe-00019K-Gm
	for mharc-gnash-commit@gnu.org; Wed, 22 Aug 2007 13:50:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INuLc-00018l-Si
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 13:50:28 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INuLb-000176-Ny
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 13:50:28 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INuLb-000173-Ja
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 13:50:27 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1INuLb-0004H3-4v
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 13:50:27 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1INuLZ-0003NG-Vr
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 17:50:26 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1INuLZ-0003ND-Ri
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 17:50:25 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INuLZ-0003ND-Ri@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 22 Aug 2007 17:50:25 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-mtasc.all/except...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Aug 2007 17:50:29 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/22 17:50:25

Modified files:
	.              : ChangeLog 
	testsuite/misc-mtasc.all: exception.as 

Log message:
	        * testsuite/misc-mtasc.all/exception.as: more tests for
	          try/catch/finally.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4070&r2=1.4071
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-mtasc.all/exception.as?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4070
retrieving revision 1.4071
diff -u -b -r1.4070 -r1.4071
--- ChangeLog	22 Aug 2007 17:32:44 -0000	1.4070
+++ ChangeLog	22 Aug 2007 17:50:25 -0000	1.4071
@@ -1,3 +1,8 @@
+2007-08-23 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/misc-mtasc.all/exception.as: more tests for
+	  try/catch/finally.
+
 2007-08-22 Sandro Santilli <strk@keybit.net>
 
 	* server/swf.h: add version and reference url to

Index: testsuite/misc-mtasc.all/exception.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-mtasc.all/exception.as,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/misc-mtasc.all/exception.as	22 Aug 2007 17:32:45 -0000	1.2
+++ testsuite/misc-mtasc.all/exception.as	22 Aug 2007 17:50:25 -0000	1.3
@@ -44,6 +44,47 @@
 		}
 	}
 
+	function throwAndCatchAddingOne(o)
+	{
+		try {
+			throw 'catch';
+			return 'try';
+		}
+		catch (e) {
+			return e;
+		}
+		finally {
+			o.num += 1;
+		}
+	}
+
+	function throwFromCatchAddingOne(o)
+	{
+		try {
+			throw 'catch';
+			return 'try';
+		}
+		catch (e) {
+			o.num += 1;
+			note("Catch inside, throwing again (not expected to survive after finally)!");
+			throw e; // double throw not supported ?
+			return 'catch';
+		}
+		finally {
+			return 'finally';
+		}
+	}
+
+	function throwNested(o)
+	{
+		try {
+			throw 'throw';
+		} catch (e) {
+			note("Catch inside, throwing again!");
+			throw e;
+		}
+	}
+
 	function test_all()
 	{
 		var res = 'string';
@@ -86,6 +127,36 @@
 		var ret = addOneOnFinal(o);
 		xcheck_equals(ret, 'finally');
 		xcheck_equals(o.num, 2);
+
+		ret = throwAndCatchAddingOne(o);
+		xcheck_equals(ret, 'catch');
+		xcheck_equals(o.num, 3);
+
+		try {
+			ret = throwAndCatchAddingOne(o);
+		} catch (e) {
+			ret = 'catch_outside';
+		}
+		xcheck_equals(ret, 'catch');
+		xcheck_equals(o.num, 4);
+
+		try {
+			ret = throwFromCatchAddingOne(o);
+		} catch (e) {
+			note("Catch outside");
+			o.num += 1;
+			ret += e+'_outside';
+		}
+		xcheck_equals(ret, 'finally');
+		xcheck_equals(o.num, 5);
+
+		try {
+			throwNested();
+		} catch (e) {
+			note("Catch outside");
+			o.num = e;
+		}
+		xcheck_equals(o.num, 'throw');
 	}
 
 	static function main(mc)



From MAILER-DAEMON Wed Aug 22 17:05:00 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INxNs-0005Sr-J2
	for mharc-gnash-commit@gnu.org; Wed, 22 Aug 2007 17:05:00 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INxNq-0005Q9-CO
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 17:04:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INxNn-0005Lg-Ek
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 17:04:58 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INxNn-0005LQ-98
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 17:04:55 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1INxNm-0003og-5u
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 17:04:55 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1INxNk-00012r-CO
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 21:04:52 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1INxNk-00012n-5t
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 21:04:52 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INxNk-00012n-5t@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 22 Aug 2007 21:04:52 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog libbase/tree.hh
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Aug 2007 21:04:58 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/22 21:04:52

Modified files:
	.              : ChangeLog 
Added files:
	libbase        : tree.hh 

Log message:
	        * libbase/tree.hh: include generic tree class by
	          Kasper Peeters <kasper.peeters@aei.mpg.de>

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4071&r2=1.4072
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tree.hh?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4071
retrieving revision 1.4072
diff -u -b -r1.4071 -r1.4072
--- ChangeLog	22 Aug 2007 17:50:25 -0000	1.4071
+++ ChangeLog	22 Aug 2007 21:04:51 -0000	1.4072
@@ -1,5 +1,10 @@
 2007-08-23 Sandro Santilli <strk@keybit.net>
 
+	* libbase/tree.hh: include generic tree class by
+	  Kasper Peeters <kasper.peeters@aei.mpg.de>
+
+2007-08-23 Sandro Santilli <strk@keybit.net>
+
 	* testsuite/misc-mtasc.all/exception.as: more tests for
 	  try/catch/finally.
 

Index: libbase/tree.hh
===================================================================
RCS file: libbase/tree.hh
diff -N libbase/tree.hh
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ libbase/tree.hh	22 Aug 2007 21:04:51 -0000	1.1
@@ -0,0 +1,2620 @@
+/* 
+
+   $Id: tree.hh,v 1.1 2007/08/22 21:04:51 strk Exp $
+
+   STL-like templated tree class.
+   Copyright (C) 2001-2006  Kasper Peeters <kasper.peeters@aei.mpg.de>.
+
+*/
+
+/** \mainpage tree.hh
+    \author   Kasper Peeters
+    \version  2.31
+    \date     21-Aug-2007
+    \see      http://www.aei.mpg.de/~peekas/tree/
+    \see      http://www.aei.mpg.de/~peekas/tree/ChangeLog
+
+   The tree.hh library for C++ provides an STL-like container class
+   for n-ary trees, templated over the data stored at the
+   nodes. Various types of iterators are provided (post-order,
+   pre-order, and others). Where possible the access methods are
+   compatible with the STL or alternative algorithms are
+   available. 
+*/
+
+
+/*
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 or 3.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+/** \todo 
+   - New-style move members are not completely finished yet.
+   - It would be good to have an iterator which can iterate over all
+     nodes below a given node.
+   - Fixed depth iterators do not iterate over the entire range if there
+     are 'holes' in the tree.
+   - If a range uses const iter_base& as end iterator, things will
+     inevitably go wrong, because upcast from iter_base to a non-sibling_iter
+     is incorrect. This upcast should be removed (and then all illegal uses
+     as previously in 'equal' will be flagged by the compiler). This requires
+     new copy constructors though.
+   - There's a bug in replace(sibling_iterator, ...) when the ranges
+     sit next to each other. Turned up in append_child(iter,iter)
+     but has been avoided now.
+   - "std::operator<" does not work correctly on our iterators, and for some
+     reason a globally defined template operator< did not get picked up. 
+     Using a comparison class now, but this should be investigated.
+*/
+
+#ifndef tree_hh_
+#define tree_hh_
+
+#include <cassert>
+#include <memory>
+#include <stdexcept>
+#include <iterator>
+#include <set>
+#include <queue>
+#include <iostream>
+
+// HP-style construct/destroy have gone from the standard,
+// so here is a copy.
+
+namespace kp {
+
+template <class T1, class T2>
+void constructor(T1* p, T2& val) 
+   {
+   new ((void *) p) T1(val);
+   }
+
+template <class T1>
+void constructor(T1* p) 
+   {
+   new ((void *) p) T1;
+   }
+
+template <class T1>
+void destructor(T1* p)
+   {
+   p->~T1();
+   }
+
+};
+
+/// A node in the tree, combining links to other nodes as well as the actual data.
+template<class T>
+class tree_node_ { // size: 5*4=20 bytes (on 32 bit arch), can be reduced by 8.
+   public:
+      tree_node_<T> *parent;
+      tree_node_<T> *first_child, *last_child;
+      tree_node_<T> *prev_sibling, *next_sibling;
+      T data;
+}; // __attribute__((packed));
+
+template <class T, class tree_node_allocator = std::allocator<tree_node_<T> > >
+class tree {
+   protected:
+      typedef tree_node_<T> tree_node;
+   public:
+      /// Value of the data stored at a node.
+      typedef T value_type;
+
+      class iterator_base;
+      class pre_order_iterator;
+      class post_order_iterator;
+      class sibling_iterator;
+      class leaf_iterator;
+
+      tree();
+      tree(const T&);
+      tree(const iterator_base&);
+      tree(const tree<T, tree_node_allocator>&);
+      ~tree();
+      void operator=(const tree<T, tree_node_allocator>&);
+
+      /// Base class for iterators, only pointers stored, no traversal logic.
+#ifdef __SGI_STL_PORT
+      class iterator_base : public stlport::bidirectional_iterator<T, ptrdiff_t> {
+#else
+      class iterator_base {
+#endif
+         public:
+            typedef T                               value_type;
+            typedef T*                              pointer;
+            typedef T&                              reference;
+            typedef size_t                          size_type;
+            typedef ptrdiff_t                       difference_type;
+            typedef std::bidirectional_iterator_tag iterator_category;
+
+            iterator_base();
+            iterator_base(tree_node *);
+
+            T&             operator*() const;
+            T*             operator->() const;
+
+            /// When called, the next increment/decrement skips children of this node.
+            void         skip_children();
+            /// Number of children of the node pointed to by the iterator.
+            unsigned int number_of_children() const;
+
+            sibling_iterator begin() const;
+            sibling_iterator end() const;
+
+            tree_node *node;
+         protected:
+            bool skip_current_children_;
+      };
+
+      /// Depth-first iterator, first accessing the node, then its children.
+      class pre_order_iterator : public iterator_base { 
+         public:
+            pre_order_iterator();
+            pre_order_iterator(tree_node *);
+            pre_order_iterator(const iterator_base&);
+            pre_order_iterator(const sibling_iterator&);
+
+            bool    operator==(const pre_order_iterator&) const;
+            bool    operator!=(const pre_order_iterator&) const;
+            pre_order_iterator&  operator++();
+            pre_order_iterator&  operator--();
+            pre_order_iterator   operator++(int);
+            pre_order_iterator   operator--(int);
+            pre_order_iterator&  operator+=(unsigned int);
+            pre_order_iterator&  operator-=(unsigned int);
+      };
+
+      /// Depth-first iterator, first accessing the children, then the node itself.
+      class post_order_iterator : public iterator_base {
+         public:
+            post_order_iterator();
+            post_order_iterator(tree_node *);
+            post_order_iterator(const iterator_base&);
+            post_order_iterator(const sibling_iterator&);
+
+            bool    operator==(const post_order_iterator&) const;
+            bool    operator!=(const post_order_iterator&) const;
+            post_order_iterator&  operator++();
+            post_order_iterator&  operator--();
+            post_order_iterator   operator++(int);
+            post_order_iterator   operator--(int);
+            post_order_iterator&  operator+=(unsigned int);
+            post_order_iterator&  operator-=(unsigned int);
+
+            /// Set iterator to the first child as deep as possible down the tree.
+            void descend_all();
+      };
+
+      /// Breadth-first iterator, using a queue
+      class breadth_first_queued_iterator : public iterator_base {
+         public:
+            breadth_first_queued_iterator();
+            breadth_first_queued_iterator(tree_node *);
+            breadth_first_queued_iterator(const iterator_base&);
+
+            bool    operator==(const breadth_first_queued_iterator&) const;
+            bool    operator!=(const breadth_first_queued_iterator&) const;
+            breadth_first_queued_iterator&  operator++();
+            breadth_first_queued_iterator   operator++(int);
+            breadth_first_queued_iterator&  operator+=(unsigned int);
+
+         private:
+            std::queue<tree_node *> traversal_queue;
+      };
+
+      /// The default iterator types throughout the tree class.
+      typedef pre_order_iterator            iterator;
+      typedef breadth_first_queued_iterator breadth_first_iterator;
+
+      /// Iterator which traverses only the nodes at a given depth from the root.
+      class fixed_depth_iterator : public iterator_base {
+         public:
+            fixed_depth_iterator();
+            fixed_depth_iterator(tree_node *);
+            fixed_depth_iterator(const iterator_base&);
+            fixed_depth_iterator(const sibling_iterator&);
+            fixed_depth_iterator(const fixed_depth_iterator&);
+
+            bool    operator==(const fixed_depth_iterator&) const;
+            bool    operator!=(const fixed_depth_iterator&) const;
+            fixed_depth_iterator&  operator++();
+            fixed_depth_iterator&  operator--();
+            fixed_depth_iterator   operator++(int);
+            fixed_depth_iterator   operator--(int);
+            fixed_depth_iterator&  operator+=(unsigned int);
+            fixed_depth_iterator&  operator-=(unsigned int);
+
+            tree_node *first_parent_;
+         private:
+            void set_first_parent_();
+            void find_leftmost_parent_();
+      };
+
+      /// Iterator which traverses only the nodes which are siblings of each other.
+      class sibling_iterator : public iterator_base {
+         public:
+            sibling_iterator();
+            sibling_iterator(tree_node *);
+            sibling_iterator(const sibling_iterator&);
+            sibling_iterator(const iterator_base&);
+
+            bool    operator==(const sibling_iterator&) const;
+            bool    operator!=(const sibling_iterator&) const;
+            sibling_iterator&  operator++();
+            sibling_iterator&  operator--();
+            sibling_iterator   operator++(int);
+            sibling_iterator   operator--(int);
+            sibling_iterator&  operator+=(unsigned int);
+            sibling_iterator&  operator-=(unsigned int);
+
+            tree_node *range_first() const;
+            tree_node *range_last() const;
+            tree_node *parent_;
+         private:
+            void set_parent_();
+      };
+
+      /// Iterator which traverses only the leaves.
+      class leaf_iterator : public iterator_base {
+         public:
+            leaf_iterator();
+            leaf_iterator(tree_node *);
+            leaf_iterator(const sibling_iterator&);
+            leaf_iterator(const iterator_base&);
+
+            bool    operator==(const leaf_iterator&) const;
+            bool    operator!=(const leaf_iterator&) const;
+            leaf_iterator&  operator++();
+            leaf_iterator&  operator--();
+            leaf_iterator   operator++(int);
+            leaf_iterator   operator--(int);
+            leaf_iterator&  operator+=(unsigned int);
+            leaf_iterator&  operator-=(unsigned int);
+      };
+
+      /// Return iterator to the beginning of the tree.
+      inline pre_order_iterator   begin() const;
+      /// Return iterator to the end of the tree.
+      inline pre_order_iterator   end() const;
+      /// Return post-order iterator to the beginning of the tree.
+      post_order_iterator  begin_post() const;
+      /// Return post-order iterator to the end of the tree.
+      post_order_iterator  end_post() const;
+      /// Return fixed-depth iterator to the first node at a given depth.
+      fixed_depth_iterator begin_fixed(const iterator_base&, unsigned int) const;
+      /// Return fixed-depth iterator to end of the nodes at given depth.
+      fixed_depth_iterator end_fixed(const iterator_base&, unsigned int) const;
+      /// Return breadth-first iterator to the first node at a given depth.
+      breadth_first_queued_iterator begin_breadth_first() const;
+      /// Return breadth-first iterator to end of the nodes at given depth.
+      breadth_first_queued_iterator end_breadth_first() const;
+      /// Return sibling iterator to the first child of given node.
+      sibling_iterator     begin(const iterator_base&) const;
+      /// Return sibling iterator to the end of the children of a given node.
+      sibling_iterator     end(const iterator_base&) const;
+      /// Return leaf iterator to the first leaf of the tree.
+      leaf_iterator   begin_leaf() const;
+      /// Return leaf iterator to the last leaf of the tree.
+      leaf_iterator   end_leaf() const;
+
+      /// Return iterator to the parent of a node.
+      template<typename iter> static iter parent(iter);
+      /// Return iterator to the previous sibling of a node.
+      template<typename iter> iter previous_sibling(iter) const;
+      /// Return iterator to the next sibling of a node.
+      template<typename iter> iter next_sibling(iter) const;
+      /// Return iterator to the next node at a given depth.
+      template<typename iter> iter next_at_same_depth(iter) const;
+
+      /// Erase all nodes of the tree.
+      void     clear();
+      /// Erase element at position pointed to by iterator, return incremented iterator.
+      template<typename iter> iter erase(iter);
+      /// Erase all children of the node pointed to by iterator.
+      void     erase_children(const iterator_base&);
+
+      /// Insert empty node as last/first child of node pointed to by position.
+      template<typename iter> iter append_child(iter position); 
+      template<typename iter> iter prepend_child(iter position); 
+      /// Insert node as last/first child of node pointed to by position.
+      template<typename iter> iter append_child(iter position, const T& x);
+      template<typename iter> iter prepend_child(iter position, const T& x);
+      /// Append the node (plus its children) at other_position as last/first child of position.
+      template<typename iter> iter append_child(iter position, iter other_position);
+      template<typename iter> iter prepend_child(iter position, iter other_position);
+      /// Append the nodes in the from-to range (plus their children) as last/first children of position.
+      template<typename iter> iter append_children(iter position, sibling_iterator from, sibling_iterator to);
+      template<typename iter> iter prepend_children(iter position, sibling_iterator from, sibling_iterator to);
+
+      /// Short-hand to insert topmost node in otherwise empty tree.
+      pre_order_iterator set_head(const T& x);
+      /// Insert node as previous sibling of node pointed to by position.
+      template<typename iter> iter insert(iter position, const T& x);
+      /// Specialisation of previous member.
+      sibling_iterator insert(sibling_iterator position, const T& x);
+      /// Insert node (with children) pointed to by subtree as previous sibling of node pointed to by position.
+      template<typename iter> iter insert_subtree(iter position, const iterator_base& subtree);
+      /// Insert node as next sibling of node pointed to by position.
+      template<typename iter> iter insert_after(iter position, const T& x);
+      /// Insert node (with children) pointed to by subtree as next sibling of node pointed to by position.
+      template<typename iter> iter insert_subtree_after(iter position, const iterator_base& subtree);
+
+      /// Replace node at 'position' with other node (keeping same children); 'position' becomes invalid.
+      template<typename iter> iter replace(iter position, const T& x);
+      /// Replace node at 'position' with subtree starting at 'from' (do not erase subtree at 'from'); see above.
+      template<typename iter> iter replace(iter position, const iterator_base& from);
+      /// Replace string of siblings (plus their children) with copy of a new string (with children); see above
+      sibling_iterator replace(sibling_iterator orig_begin, sibling_iterator orig_end, 
+                               sibling_iterator new_begin,  sibling_iterator new_end); 
+
+      /// Move all children of node at 'position' to be siblings, returns position.
+      template<typename iter> iter flatten(iter position);
+      /// Move nodes in range to be children of 'position'.
+      template<typename iter> iter reparent(iter position, sibling_iterator begin, sibling_iterator end);
+      /// Move all child nodes of 'from' to be children of 'position'.
+      template<typename iter> iter reparent(iter position, iter from);
+
+      /// Replace node with a new node, making the old node a child of the new node.
+      template<typename iter> iter wrap(iter position, const T& x);
+
+      /// Move 'source' node (plus its children) to become the next sibling of 'target'.
+      template<typename iter> iter move_after(iter target, iter source);
+      /// Move 'source' node (plus its children) to become the previous sibling of 'target'.
+      template<typename iter> iter move_before(iter target, iter source);
+      sibling_iterator move_before(sibling_iterator target, sibling_iterator source);
+      /// Move 'source' node (plus its children) to become the node at 'target' (erasing the node at 'target').
+      template<typename iter> iter move_ontop(iter target, iter source);
+
+      /// Merge with other tree, creating new branches and leaves only if they are not already present.
+      void     merge(sibling_iterator, sibling_iterator, sibling_iterator, sibling_iterator, 
+                     bool duplicate_leaves=false);
+      /// Sort (std::sort only moves values of nodes, this one moves children as well).
+      void     sort(sibling_iterator from, sibling_iterator to, bool deep=false);
+      template<class StrictWeakOrdering>
+      void     sort(sibling_iterator from, sibling_iterator to, StrictWeakOrdering comp, bool deep=false);
+      /// Compare two ranges of nodes (compares nodes as well as tree structure).
+      template<typename iter>
+      bool     equal(const iter& one, const iter& two, const iter& three) const;
+      template<typename iter, class BinaryPredicate>
+      bool     equal(const iter& one, const iter& two, const iter& three, BinaryPredicate) const;
+      template<typename iter>
+      bool     equal_subtree(const iter& one, const iter& two) const;
+      template<typename iter, class BinaryPredicate>
+      bool     equal_subtree(const iter& one, const iter& two, BinaryPredicate) const;
+      /// Extract a new tree formed by the range of siblings plus all their children.
+      tree     subtree(sibling_iterator from, sibling_iterator to) const;
+      void     subtree(tree&, sibling_iterator from, sibling_iterator to) const;
+      /// Exchange the node (plus subtree) with its sibling node (do nothing if no sibling present).
+      void     swap(sibling_iterator it);
+      /// Exchange two nodes (plus subtrees)
+      void     swap(iterator, iterator);
+      
+      /// Count the total number of nodes.
+      int      size() const;
+      /// Count the total number of nodes below the indicated node (plus one).
+      int      size(const iterator_base&) const;
+      /// Check if tree is empty.
+      bool     empty() const;
+      /// Compute the depth to the root.
+      int      depth(const iterator_base&) const;
+      /// Count the number of children of node at position.
+      static unsigned int number_of_children(const iterator_base&);
+      /// Count the number of 'next' siblings of node at iterator.
+      unsigned int number_of_siblings(const iterator_base&) const;
+      /// Determine whether node at position is in the subtrees with root in the range.
+      bool     is_in_subtree(const iterator_base& position, const iterator_base& begin, 
+                             const iterator_base& end) const;
+      /// Determine whether the iterator is an 'end' iterator and thus not actually pointing to a node.
+      bool     is_valid(const iterator_base&) const;
+
+      /// Determine the index of a node in the range of siblings to which it belongs.
+      unsigned int index(sibling_iterator it) const;
+      /// Inverse of 'index': return the n-th child of the node at position.
+      sibling_iterator  child(const iterator_base& position, unsigned int) const;
+      
+      /// Comparator class for iterators (compares pointer values; why doesn't this work automatically?)
+      class iterator_base_less {
+         public:
+            bool operator()(const typename tree<T, tree_node_allocator>::iterator_base& one,
+                            const typename tree<T, tree_node_allocator>::iterator_base& two) const
+               {
+               return one.node < two.node;
+               }
+      };
+      tree_node *head, *feet;    // head/feet are always dummy; if an iterator points to them it is invalid
+   private:
+      tree_node_allocator alloc_;
+      void head_initialise_();
+      void copy_(const tree<T, tree_node_allocator>& other);
+
+      /// Comparator class for two nodes of a tree (used for sorting and searching).
+      template<class StrictWeakOrdering>
+      class compare_nodes {
+         public:
+            compare_nodes(StrictWeakOrdering comp) : comp_(comp) {};
+            
+            bool operator()(const tree_node *a, const tree_node *b) 
+               {
+               static StrictWeakOrdering comp;
+               return comp(a->data, b->data);
+               }
+         private:
+            StrictWeakOrdering comp_;
+      };
+};
+
+//template <class T, class tree_node_allocator>
+//class iterator_base_less {
+// public:
+//    bool operator()(const typename tree<T, tree_node_allocator>::iterator_base& one,
+//                  const typename tree<T, tree_node_allocator>::iterator_base& two) const
+//       {
+//       txtout << "operatorclass<" << one.node < two.node << std::endl;
+//       return one.node < two.node;
+//       }
+//};
+
+// template <class T, class tree_node_allocator>
+// bool operator<(const typename tree<T, tree_node_allocator>::iterator& one,
+//                const typename tree<T, tree_node_allocator>::iterator& two)
+//    {
+//    txtout << "operator< " << one.node < two.node << std::endl;
+//    if(one.node < two.node) return true;
+//    return false;
+//    }
+// 
+// template <class T, class tree_node_allocator>
+// bool operator==(const typename tree<T, tree_node_allocator>::iterator& one,
+//                const typename tree<T, tree_node_allocator>::iterator& two)
+//    {
+//    txtout << "operator== " << one.node == two.node << std::endl;
+//    if(one.node == two.node) return true;
+//    return false;
+//    }
+// 
+// template <class T, class tree_node_allocator>
+// bool operator>(const typename tree<T, tree_node_allocator>::iterator_base& one,
+//                const typename tree<T, tree_node_allocator>::iterator_base& two)
+//    {
+//    txtout << "operator> " << one.node < two.node << std::endl;
+//    if(one.node > two.node) return true;
+//    return false;
+//    }
+
+
+
+// Tree
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::tree() 
+   {
+   head_initialise_();
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::tree(const T& x) 
+   {
+   head_initialise_();
+   set_head(x);
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::tree(const iterator_base& other)
+   {
+   head_initialise_();
+   set_head((*other));
+   replace(begin(), other);
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::~tree()
+   {
+   clear();
+   alloc_.deallocate(head,1);
+   alloc_.deallocate(feet,1);
+   }
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::head_initialise_() 
+   { 
+   head = alloc_.allocate(1,0); // MSVC does not have default second argument 
+   feet = alloc_.allocate(1,0);
+
+   head->parent=0;
+   head->first_child=0;
+   head->last_child=0;
+   head->prev_sibling=0; //head;
+   head->next_sibling=feet; //head;
+
+   feet->parent=0;
+   feet->first_child=0;
+   feet->last_child=0;
+   feet->prev_sibling=head;
+   feet->next_sibling=0;
+   }
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::operator=(const tree<T, tree_node_allocator>& other)
+   {
+   copy_(other);
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::tree(const tree<T, tree_node_allocator>& other)
+   {
+   head_initialise_();
+   copy_(other);
+   }
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::copy_(const tree<T, tree_node_allocator>& other) 
+   {
+   clear();
+   pre_order_iterator it=other.begin(), to=begin();
+   while(it!=other.end()) {
+      to=insert(to, (*it));
+      it.skip_children();
+      ++it;
+      }
+   to=begin();
+   it=other.begin();
+   while(it!=other.end()) {
+      to=replace(to, it);
+      to.skip_children();
+      it.skip_children();
+      ++to;
+      ++it;
+      }
+   }
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::clear()
+   {
+   if(head)
+      while(head->next_sibling!=feet)
+         erase(pre_order_iterator(head->next_sibling));
+   }
+
+template<class T, class tree_node_allocator> 
+void tree<T, tree_node_allocator>::erase_children(const iterator_base& it)
+   {
+// std::cout << "erase_children " << it.node << std::endl;
+   if(it.node==0) return;
+
+   tree_node *cur=it.node->first_child;
+   tree_node *prev=0;
+
+   while(cur!=0) {
+      prev=cur;
+      cur=cur->next_sibling;
+      erase_children(pre_order_iterator(prev));
+      kp::destructor(&prev->data);
+      alloc_.deallocate(prev,1);
+      }
+   it.node->first_child=0;
+   it.node->last_child=0;
+// std::cout << "exit" << std::endl;
+   }
+
+template<class T, class tree_node_allocator> 
+template<class iter>
+iter tree<T, tree_node_allocator>::erase(iter it)
+   {
+   tree_node *cur=it.node;
+   assert(cur!=head);
+   iter ret=it;
+   ret.skip_children();
+   ++ret;
+   erase_children(it);
+   if(cur->prev_sibling==0) {
+      cur->parent->first_child=cur->next_sibling;
+      }
+   else {
+      cur->prev_sibling->next_sibling=cur->next_sibling;
+      }
+   if(cur->next_sibling==0) {
+      cur->parent->last_child=cur->prev_sibling;
+      }
+   else {
+      cur->next_sibling->prev_sibling=cur->prev_sibling;
+      }
+
+   kp::destructor(&cur->data);
+   alloc_.deallocate(cur,1);
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::pre_order_iterator tree<T, tree_node_allocator>::begin() const
+   {
+   return pre_order_iterator(head->next_sibling);
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::pre_order_iterator tree<T, tree_node_allocator>::end() const
+   {
+   return pre_order_iterator(feet);
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::breadth_first_queued_iterator tree<T, tree_node_allocator>::begin_breadth_first() const
+   {
+   return breadth_first_queued_iterator(head->next_sibling);
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::breadth_first_queued_iterator tree<T, tree_node_allocator>::end_breadth_first() const
+   {
+   return breadth_first_queued_iterator();
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::post_order_iterator tree<T, tree_node_allocator>::begin_post() const
+   {
+   tree_node *tmp=head->next_sibling;
+   if(tmp!=feet) {
+      while(tmp->first_child)
+         tmp=tmp->first_child;
+      }
+   return post_order_iterator(tmp);
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::post_order_iterator tree<T, tree_node_allocator>::end_post() const
+   {
+   return post_order_iterator(feet);
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::fixed_depth_iterator tree<T, tree_node_allocator>::begin_fixed(const iterator_base& pos, unsigned int dp) const
+   {
+   tree_node *tmp=pos.node;
+   unsigned int curdepth=0;
+   while(curdepth<dp) { // go down one level
+      while(tmp->first_child==0) {
+         tmp=tmp->next_sibling;
+         if(tmp==0)
+            throw std::range_error("tree: begin_fixed out of range");
+         }
+      tmp=tmp->first_child;
+      ++curdepth;
+      }
+   return tmp;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::fixed_depth_iterator tree<T, tree_node_allocator>::end_fixed(const iterator_base& pos, unsigned int dp) const
+   {
+   assert(1==0); // FIXME: not correct yet
+   tree_node *tmp=pos.node;
+   unsigned int curdepth=1;
+   while(curdepth<dp) { // go down one level
+      while(tmp->first_child==0) {
+         tmp=tmp->next_sibling;
+         if(tmp==0)
+            throw std::range_error("tree: end_fixed out of range");
+         }
+      tmp=tmp->first_child;
+      ++curdepth;
+      }
+   return tmp;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::begin(const iterator_base& pos) const
+   {
+   assert(pos.node!=0);
+   if(pos.node->first_child==0) {
+      return end(pos);
+      }
+   return pos.node->first_child;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::end(const iterator_base& pos) const
+   {
+   sibling_iterator ret(0);
+   ret.parent_=pos.node;
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::leaf_iterator tree<T, tree_node_allocator>::begin_leaf() const
+   {
+   tree_node *tmp=head->next_sibling;
+   if(tmp!=feet) {
+      while(tmp->first_child)
+         tmp=tmp->first_child;
+      }
+   return leaf_iterator(tmp);
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::leaf_iterator tree<T, tree_node_allocator>::end_leaf() const
+   {
+   return leaf_iterator(feet);
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter>
+iter tree<T, tree_node_allocator>::parent(iter position) 
+   {
+   assert(position.node!=0);
+   return iter(position.node->parent);
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter>
+iter tree<T, tree_node_allocator>::previous_sibling(iter position) const
+   {
+   assert(position.node!=0);
+   iter ret(position);
+   ret.node=position.node->prev_sibling;
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter>
+iter tree<T, tree_node_allocator>::next_sibling(iter position) const
+   {
+   assert(position.node!=0);
+   iter ret(position);
+   ret.node=position.node->next_sibling;
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter>
+iter tree<T, tree_node_allocator>::next_at_same_depth(iter position) const
+   {
+   assert(position.node!=0);
+   iter ret(position);
+
+   if(position.node->next_sibling) {
+      ret.node=position.node->next_sibling;
+      }
+   else { 
+      int relative_depth=0;
+      upper:
+      do {
+         ret.node=ret.node->parent;
+         if(ret.node==0) return ret;
+         --relative_depth;
+         } while(ret.node->next_sibling==0);
+      lower:
+      ret.node=ret.node->next_sibling;
+      while(ret.node->first_child==0) {
+         if(ret.node->next_sibling==0)
+            goto upper;
+         ret.node=ret.node->next_sibling;
+         if(ret.node==0) return ret;
+         }
+      while(relative_depth<0 && ret.node->first_child!=0) {
+         ret.node=ret.node->first_child;
+         ++relative_depth;
+         }
+      if(relative_depth<0) {
+         if(ret.node->next_sibling==0) goto upper;
+         else                          goto lower;
+         }
+      }
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter>
+iter tree<T, tree_node_allocator>::append_child(iter position)
+   {
+   assert(position.node!=head);
+   assert(position.node);
+
+   tree_node *tmp=alloc_.allocate(1,0);
+   kp::constructor(&tmp->data);
+   tmp->first_child=0;
+   tmp->last_child=0;
+
+   tmp->parent=position.node;
+   if(position.node->last_child!=0) {
+      position.node->last_child->next_sibling=tmp;
+      }
+   else {
+      position.node->first_child=tmp;
+      }
+   tmp->prev_sibling=position.node->last_child;
+   position.node->last_child=tmp;
+   tmp->next_sibling=0;
+   return tmp;
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter>
+iter tree<T, tree_node_allocator>::prepend_child(iter position)
+   {
+   assert(position.node!=head);
+   assert(position.node);
+
+   tree_node *tmp=alloc_.allocate(1,0);
+   kp::constructor(&tmp->data);
+   tmp->first_child=0;
+   tmp->last_child=0;
+
+   tmp->parent=position.node;
+   if(position.node->first_child!=0) {
+      position.node->first_child->prev_sibling=tmp;
+      }
+   else {
+      position.node->last_child=tmp;
+      }
+   tmp->next_sibling=position.node->first_child;
+   position.node->prev_child=tmp;
+   tmp->prev_sibling=0;
+   return tmp;
+   }
+
+template <class T, class tree_node_allocator>
+template <class iter>
+iter tree<T, tree_node_allocator>::append_child(iter position, const T& x)
+   {
+   // If your program fails here you probably used 'append_child' to add the top
+   // node to an empty tree. From version 1.45 the top element should be added
+   // using 'insert'. See the documentation for further information, and sorry about
+   // the API change.
+   assert(position.node!=head);
+   assert(position.node);
+
+   tree_node* tmp = alloc_.allocate(1,0);
+   kp::constructor(&tmp->data, x);
+   tmp->first_child=0;
+   tmp->last_child=0;
+
+   tmp->parent=position.node;
+   if(position.node->last_child!=0) {
+      position.node->last_child->next_sibling=tmp;
+      }
+   else {
+      position.node->first_child=tmp;
+      }
+   tmp->prev_sibling=position.node->last_child;
+   position.node->last_child=tmp;
+   tmp->next_sibling=0;
+   return tmp;
+   }
+
+template <class T, class tree_node_allocator>
+template <class iter>
+iter tree<T, tree_node_allocator>::prepend_child(iter position, const T& x)
+   {
+   assert(position.node!=head);
+   assert(position.node);
+
+   tree_node* tmp = alloc_.allocate(1,0);
+   kp::constructor(&tmp->data, x);
+   tmp->first_child=0;
+   tmp->last_child=0;
+
+   tmp->parent=position.node;
+   if(position.node->first_child!=0) {
+      position.node->first_child->prev_sibling=tmp;
+      }
+   else {
+      position.node->last_child=tmp;
+      }
+   tmp->next_sibling=position.node->first_child;
+   position.node->first_child=tmp;
+   tmp->prev_sibling=0;
+   return tmp;
+   }
+
+template <class T, class tree_node_allocator>
+template <class iter>
+iter tree<T, tree_node_allocator>::append_child(iter position, iter other)
+   {
+   assert(position.node!=head);
+   assert(position.node);
+
+   sibling_iterator aargh=append_child(position, value_type());
+   return replace(aargh, other);
+   }
+
+template <class T, class tree_node_allocator>
+template <class iter>
+iter tree<T, tree_node_allocator>::prepend_child(iter position, iter other)
+   {
+   assert(position.node!=head);
+   assert(position.node);
+
+   sibling_iterator aargh=prepend_child(position, value_type());
+   return replace(aargh, other);
+   }
+
+template <class T, class tree_node_allocator>
+template <class iter>
+iter tree<T, tree_node_allocator>::append_children(iter position, sibling_iterator from, sibling_iterator to)
+   {
+   assert(position.node!=head);
+   assert(position.node);
+
+   iter ret=from;
+
+   while(from!=to) {
+      insert_subtree(position.end(), from);
+      ++from;
+      }
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+template <class iter>
+iter tree<T, tree_node_allocator>::prepend_children(iter position, sibling_iterator from, sibling_iterator to)
+   {
+   assert(position.node!=head);
+   assert(position.node);
+
+   iter ret=from;
+
+   while(from!=to) {
+      insert_subtree(position.begin(), from);
+      ++from;
+      }
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::pre_order_iterator tree<T, tree_node_allocator>::set_head(const T& x)
+   {
+   assert(head->next_sibling==feet);
+   return insert(iterator(feet), x);
+   }
+
+template <class T, class tree_node_allocator>
+template <class iter>
+iter tree<T, tree_node_allocator>::insert(iter position, const T& x)
+   {
+   if(position.node==0) {
+      position.node=feet; // Backward compatibility: when calling insert on a null node,
+                          // insert before the feet.
+      }
+   tree_node* tmp = alloc_.allocate(1,0);
+   kp::constructor(&tmp->data, x);
+   tmp->first_child=0;
+   tmp->last_child=0;
+
+   tmp->parent=position.node->parent;
+   tmp->next_sibling=position.node;
+   tmp->prev_sibling=position.node->prev_sibling;
+   position.node->prev_sibling=tmp;
+
+   if(tmp->prev_sibling==0) {
+      if(tmp->parent) // when inserting nodes at the head, there is no parent
+         tmp->parent->first_child=tmp;
+      }
+   else
+      tmp->prev_sibling->next_sibling=tmp;
+   return tmp;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::insert(sibling_iterator position, const T& x)
+   {
+   tree_node* tmp = alloc_.allocate(1,0);
+   kp::constructor(&tmp->data, x);
+   tmp->first_child=0;
+   tmp->last_child=0;
+
+   tmp->next_sibling=position.node;
+   if(position.node==0) { // iterator points to end of a subtree
+      tmp->parent=position.parent_;
+      tmp->prev_sibling=position.range_last();
+      tmp->parent->last_child=tmp;
+      }
+   else {
+      tmp->parent=position.node->parent;
+      tmp->prev_sibling=position.node->prev_sibling;
+      position.node->prev_sibling=tmp;
+      }
+
+   if(tmp->prev_sibling==0) {
+      if(tmp->parent) // when inserting nodes at the head, there is no parent
+         tmp->parent->first_child=tmp;
+      }
+   else
+      tmp->prev_sibling->next_sibling=tmp;
+   return tmp;
+   }
+
+template <class T, class tree_node_allocator>
+template <class iter>
+iter tree<T, tree_node_allocator>::insert_after(iter position, const T& x)
+   {
+   tree_node* tmp = alloc_.allocate(1,0);
+   kp::constructor(&tmp->data, x);
+   tmp->first_child=0;
+   tmp->last_child=0;
+
+   tmp->parent=position.node->parent;
+   tmp->prev_sibling=position.node;
+   tmp->next_sibling=position.node->next_sibling;
+   position.node->next_sibling=tmp;
+
+   if(tmp->next_sibling==0) {
+      if(tmp->parent) // when inserting nodes at the head, there is no parent
+         tmp->parent->last_child=tmp;
+      }
+   else {
+      tmp->next_sibling->prev_sibling=tmp;
+      }
+   return tmp;
+   }
+
+template <class T, class tree_node_allocator>
+template <class iter>
+iter tree<T, tree_node_allocator>::insert_subtree(iter position, const iterator_base& subtree)
+   {
+   // insert dummy
+   iter it=insert(position, value_type());
+   // replace dummy with subtree
+   return replace(it, subtree);
+   }
+
+template <class T, class tree_node_allocator>
+template <class iter>
+iter tree<T, tree_node_allocator>::insert_subtree_after(iter position, const iterator_base& subtree)
+   {
+   // insert dummy
+   iter it=insert_after(position, value_type());
+   // replace dummy with subtree
+   return replace(it, subtree);
+   }
+
+// template <class T, class tree_node_allocator>
+// template <class iter>
+// iter tree<T, tree_node_allocator>::insert_subtree(sibling_iterator position, iter subtree)
+//    {
+//    // insert dummy
+//    iter it(insert(position, value_type()));
+//    // replace dummy with subtree
+//    return replace(it, subtree);
+//    }
+
+template <class T, class tree_node_allocator>
+template <class iter>
+iter tree<T, tree_node_allocator>::replace(iter position, const T& x)
+   {
+   kp::destructor(&position.node->data);
+   kp::constructor(&position.node->data, x);
+   return position;
+   }
+
+template <class T, class tree_node_allocator>
+template <class iter>
+iter tree<T, tree_node_allocator>::replace(iter position, const iterator_base& from)
+   {
+   assert(position.node!=head);
+   tree_node *current_from=from.node;
+   tree_node *start_from=from.node;
+   tree_node *current_to  =position.node;
+
+   // replace the node at position with head of the replacement tree at from
+// std::cout << "warning!" << position.node << std::endl;
+   erase_children(position);  
+// std::cout << "no warning!" << std::endl;
+   tree_node* tmp = alloc_.allocate(1,0);
+   kp::constructor(&tmp->data, (*from));
+   tmp->first_child=0;
+   tmp->last_child=0;
+   if(current_to->prev_sibling==0) {
+      if(current_to->parent!=0)
+         current_to->parent->first_child=tmp;
+      }
+   else {
+      current_to->prev_sibling->next_sibling=tmp;
+      }
+   tmp->prev_sibling=current_to->prev_sibling;
+   if(current_to->next_sibling==0) {
+      if(current_to->parent!=0)
+         current_to->parent->last_child=tmp;
+      }
+   else {
+      current_to->next_sibling->prev_sibling=tmp;
+      }
+   tmp->next_sibling=current_to->next_sibling;
+   tmp->parent=current_to->parent;
+   kp::destructor(&current_to->data);
+   alloc_.deallocate(current_to,1);
+   current_to=tmp;
+   
+   // only at this stage can we fix 'last'
+   tree_node *last=from.node->next_sibling;
+
+   pre_order_iterator toit=tmp;
+   // copy all children
+   do {
+      assert(current_from!=0);
+      if(current_from->first_child != 0) {
+         current_from=current_from->first_child;
+         toit=append_child(toit, current_from->data);
+         }
+      else {
+         while(current_from->next_sibling==0 && current_from!=start_from) {
+            current_from=current_from->parent;
+            toit=parent(toit);
+            assert(current_from!=0);
+            }
+         current_from=current_from->next_sibling;
+         if(current_from!=last) {
+            toit=append_child(parent(toit), current_from->data);
+            }
+         }
+      } while(current_from!=last);
+
+   return current_to;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::replace(
+   sibling_iterator orig_begin, 
+   sibling_iterator orig_end, 
+   sibling_iterator new_begin, 
+   sibling_iterator new_end)
+   {
+   tree_node *orig_first=orig_begin.node;
+   tree_node *new_first=new_begin.node;
+   tree_node *orig_last=orig_first;
+   while((++orig_begin)!=orig_end)
+      orig_last=orig_last->next_sibling;
+   tree_node *new_last=new_first;
+   while((++new_begin)!=new_end)
+      new_last=new_last->next_sibling;
+
+   // insert all siblings in new_first..new_last before orig_first
+   bool first=true;
+   pre_order_iterator ret;
+   while(1==1) {
+      pre_order_iterator tt=insert_subtree(pre_order_iterator(orig_first), pre_order_iterator(new_first));
+      if(first) {
+         ret=tt;
+         first=false;
+         }
+      if(new_first==new_last)
+         break;
+      new_first=new_first->next_sibling;
+      }
+
+   // erase old range of siblings
+   bool last=false;
+   tree_node *next=orig_first;
+   while(1==1) {
+      if(next==orig_last) 
+         last=true;
+      next=next->next_sibling;
+      erase((pre_order_iterator)orig_first);
+      if(last) 
+         break;
+      orig_first=next;
+      }
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter>
+iter tree<T, tree_node_allocator>::flatten(iter position)
+   {
+   if(position.node->first_child==0)
+      return position;
+
+   tree_node *tmp=position.node->first_child;
+   while(tmp) {
+      tmp->parent=position.node->parent;
+      tmp=tmp->next_sibling;
+      } 
+   if(position.node->next_sibling) {
+      position.node->last_child->next_sibling=position.node->next_sibling;
+      position.node->next_sibling->prev_sibling=position.node->last_child;
+      }
+   else {
+      position.node->parent->last_child=position.node->last_child;
+      }
+   position.node->next_sibling=position.node->first_child;
+   position.node->next_sibling->prev_sibling=position.node;
+   position.node->first_child=0;
+   position.node->last_child=0;
+
+   return position;
+   }
+
+
+template <class T, class tree_node_allocator>
+template <typename iter>
+iter tree<T, tree_node_allocator>::reparent(iter position, sibling_iterator begin, sibling_iterator end)
+   {
+   tree_node *first=begin.node;
+   tree_node *last=first;
+
+   assert(first!=position.node);
+   
+   if(begin==end) return begin;
+   // determine last node
+   while((++begin)!=end) {
+      last=last->next_sibling;
+      }
+   // move subtree
+   if(first->prev_sibling==0) {
+      first->parent->first_child=last->next_sibling;
+      }
+   else {
+      first->prev_sibling->next_sibling=last->next_sibling;
+      }
+   if(last->next_sibling==0) {
+      last->parent->last_child=first->prev_sibling;
+      }
+   else {
+      last->next_sibling->prev_sibling=first->prev_sibling;
+      }
+   if(position.node->first_child==0) {
+      position.node->first_child=first;
+      position.node->last_child=last;
+      first->prev_sibling=0;
+      }
+   else {
+      position.node->last_child->next_sibling=first;
+      first->prev_sibling=position.node->last_child;
+      position.node->last_child=last;
+      }
+   last->next_sibling=0;
+
+   tree_node *pos=first;
+   while(1==1) {
+      pos->parent=position.node;
+      if(pos==last) break;
+      pos=pos->next_sibling;
+      }
+
+   return first;
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter> iter tree<T, tree_node_allocator>::reparent(iter position, iter from)
+   {
+   if(from.node->first_child==0) return position;
+   return reparent(position, from.node->first_child, end(from));
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter> iter tree<T, tree_node_allocator>::wrap(iter position, const T& x)
+   {
+   assert(position.node!=0);
+   sibling_iterator fr=position, to=position;
+   ++to;
+   iter ret = insert(position, x);
+   reparent(ret, fr, to);
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter> iter tree<T, tree_node_allocator>::move_after(iter target, iter source)
+   {
+   tree_node *dst=target.node;
+   tree_node *src=source.node;
+   assert(dst);
+   assert(src);
+
+   if(dst==src) return source;
+   if(dst->next_sibling)
+      if(dst->next_sibling==src) // already in the right spot
+         return source;
+
+   // take src out of the tree
+   if(src->prev_sibling!=0) src->prev_sibling->next_sibling=src->next_sibling;
+   else                     src->parent->first_child=src->next_sibling;
+   if(src->next_sibling!=0) src->next_sibling->prev_sibling=src->prev_sibling;
+   else                     src->parent->last_child=src->prev_sibling;
+
+   // connect it to the new point
+   if(dst->next_sibling!=0) dst->next_sibling->prev_sibling=src;
+   else                     dst->parent->last_child=src;
+   src->next_sibling=dst->next_sibling;
+   dst->next_sibling=src;
+   src->prev_sibling=dst;
+   src->parent=dst->parent;
+   return src;
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter> iter tree<T, tree_node_allocator>::move_before(iter target, iter source)
+   {
+   tree_node *dst=target.node;
+   tree_node *src=source.node;
+   assert(dst);
+   assert(src);
+
+   if(dst==src) return source;
+   if(dst->prev_sibling)
+      if(dst->prev_sibling==src) // already in the right spot
+         return source;
+
+   // take src out of the tree
+   if(src->prev_sibling!=0) src->prev_sibling->next_sibling=src->next_sibling;
+   else                     src->parent->first_child=src->next_sibling;
+   if(src->next_sibling!=0) src->next_sibling->prev_sibling=src->prev_sibling;
+   else                     src->parent->last_child=src->prev_sibling;
+
+   // connect it to the new point
+   if(dst->prev_sibling!=0) dst->prev_sibling->next_sibling=src;
+   else                     dst->parent->first_child=src;
+   src->prev_sibling=dst->prev_sibling;
+   dst->prev_sibling=src;
+   src->next_sibling=dst;
+   src->parent=dst->parent;
+   return src;
+   }
+
+// specialisation for sibling_iterators
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::move_before(sibling_iterator target, 
+                                                                                         sibling_iterator source)
+   {
+   tree_node *dst=target.node;
+   tree_node *src=source.node;
+   tree_node *dst_prev_sibling;
+   if(dst==0) { // must then be an end iterator
+      dst_prev_sibling=target.parent_->last_child;
+      assert(dst_prev_sibling);
+      }
+   else dst_prev_sibling=dst->prev_sibling;
+   assert(src);
+
+   if(dst==src) return source;
+   if(dst_prev_sibling)
+      if(dst_prev_sibling==src) // already in the right spot
+         return source;
+
+   // take src out of the tree
+   if(src->prev_sibling!=0) src->prev_sibling->next_sibling=src->next_sibling;
+   else                     src->parent->first_child=src->next_sibling;
+   if(src->next_sibling!=0) src->next_sibling->prev_sibling=src->prev_sibling;
+   else                     src->parent->last_child=src->prev_sibling;
+
+   // connect it to the new point
+   if(dst_prev_sibling!=0) dst_prev_sibling->next_sibling=src;
+   else                    target.parent_->first_child=src;
+   src->prev_sibling=dst_prev_sibling;
+   if(dst) {
+      dst->prev_sibling=src;
+      src->parent=dst->parent;
+      }
+   src->next_sibling=dst;
+   return src;
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter> iter tree<T, tree_node_allocator>::move_ontop(iter target, iter source)
+   {
+   tree_node *dst=target.node;
+   tree_node *src=source.node;
+   assert(dst);
+   assert(src);
+
+   if(dst==src) return source;
+
+   // remember connection points
+   tree_node *b_prev_sibling=dst->prev_sibling;
+   tree_node *b_next_sibling=dst->next_sibling;
+   tree_node *b_parent=dst->parent;
+
+   // remove target
+   erase(target);
+
+   // take src out of the tree
+   if(src->prev_sibling!=0) src->prev_sibling->next_sibling=src->next_sibling;
+   else                     src->parent->first_child=src->next_sibling;
+   if(src->next_sibling!=0) src->next_sibling->prev_sibling=src->prev_sibling;
+   else                     src->parent->last_child=src->prev_sibling;
+
+   // connect it to the new point
+   if(b_prev_sibling!=0) b_prev_sibling->next_sibling=src;
+   else                  b_parent->first_child=src;
+   if(b_next_sibling!=0) b_next_sibling->prev_sibling=src;
+   else                  b_parent->last_child=src;
+   src->prev_sibling=b_prev_sibling;
+   src->next_sibling=b_next_sibling;
+   src->parent=b_parent;
+   return src;
+   }
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::merge(sibling_iterator to1,   sibling_iterator to2,
+                                          sibling_iterator from1, sibling_iterator from2,
+                                          bool duplicate_leaves)
+   {
+   sibling_iterator fnd;
+   while(from1!=from2) {
+      if((fnd=std::find(to1, to2, (*from1))) != to2) { // element found
+         if(from1.begin()==from1.end()) { // full depth reached
+            if(duplicate_leaves)
+               append_child(parent(to1), (*from1));
+            }
+         else { // descend further
+            merge(fnd.begin(), fnd.end(), from1.begin(), from1.end(), duplicate_leaves);
+            }
+         }
+      else { // element missing
+         insert_subtree(to2, from1);
+         }
+      ++from1;
+      }
+   }
+
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::sort(sibling_iterator from, sibling_iterator to, bool deep)
+   {
+   std::less<T> comp;
+   sort(from, to, comp, deep);
+   }
+
+template <class T, class tree_node_allocator>
+template <class StrictWeakOrdering>
+void tree<T, tree_node_allocator>::sort(sibling_iterator from, sibling_iterator to, 
+                                        StrictWeakOrdering comp, bool deep)
+   {
+   if(from==to) return;
+   // make list of sorted nodes
+   // CHECK: if multiset stores equivalent nodes in the order in which they
+   // are inserted, then this routine should be called 'stable_sort'.
+   std::multiset<tree_node *, compare_nodes<StrictWeakOrdering> > nodes(comp);
+   sibling_iterator it=from, it2=to;
+   while(it != to) {
+      nodes.insert(it.node);
+      ++it;
+      }
+   // reassemble
+   --it2;
+
+   // prev and next are the nodes before and after the sorted range
+   tree_node *prev=from.node->prev_sibling;
+   tree_node *next=it2.node->next_sibling;
+   typename std::multiset<tree_node *, compare_nodes<StrictWeakOrdering> >::iterator nit=nodes.begin(), eit=nodes.end();
+   if(prev==0) {
+      if((*nit)->parent!=0) // to catch "sorting the head" situations, when there is no parent
+         (*nit)->parent->first_child=(*nit);
+      }
+   else prev->next_sibling=(*nit);
+
+   --eit;
+   while(nit!=eit) {
+      (*nit)->prev_sibling=prev;
+      if(prev)
+         prev->next_sibling=(*nit);
+      prev=(*nit);
+      ++nit;
+      }
+   // prev now points to the last-but-one node in the sorted range
+   if(prev)
+      prev->next_sibling=(*eit);
+
+   // eit points to the last node in the sorted range.
+   (*eit)->next_sibling=next;
+   (*eit)->prev_sibling=prev; // missed in the loop above
+   if(next==0) {
+      if((*eit)->parent!=0) // to catch "sorting the head" situations, when there is no parent
+         (*eit)->parent->last_child=(*eit);
+      }
+   else next->prev_sibling=(*eit);
+
+   if(deep) {  // sort the children of each node too
+      sibling_iterator bcs(*nodes.begin());
+      sibling_iterator ecs(*eit);
+      ++ecs;
+      while(bcs!=ecs) {
+         sort(begin(bcs), end(bcs), comp, deep);
+         ++bcs;
+         }
+      }
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter>
+bool tree<T, tree_node_allocator>::equal(const iter& one_, const iter& two, const iter& three_) const
+   {
+   std::equal_to<T> comp;
+   return equal(one_, two, three_, comp);
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter>
+bool tree<T, tree_node_allocator>::equal_subtree(const iter& one_, const iter& two_) const
+   {
+   std::equal_to<T> comp;
+   return equal_subtree(one_, two_, comp);
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter, class BinaryPredicate>
+bool tree<T, tree_node_allocator>::equal(const iter& one_, const iter& two, const iter& three_, BinaryPredicate fun) const
+   {
+   pre_order_iterator one(one_), three(three_);
+
+// if(one==two && is_valid(three) && three.number_of_children()!=0)
+//    return false;
+   while(one!=two && is_valid(three)) {
+      if(!fun(*one,*three))
+         return false;
+      if(one.number_of_children()!=three.number_of_children()) 
+         return false;
+      ++one;
+      ++three;
+      }
+   return true;
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter, class BinaryPredicate>
+bool tree<T, tree_node_allocator>::equal_subtree(const iter& one_, const iter& two_, BinaryPredicate fun) const
+   {
+   pre_order_iterator one(one_), two(two_);
+
+   if(!fun(*one,*two)) return false;
+   if(number_of_children(one)!=number_of_children(two)) return false;
+   return equal(begin(one),end(one),begin(two),fun);
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator> tree<T, tree_node_allocator>::subtree(sibling_iterator from, sibling_iterator to) const
+   {
+   tree tmp;
+   tmp.set_head(value_type());
+   tmp.replace(tmp.begin(), tmp.end(), from, to);
+   return tmp;
+   }
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::subtree(tree& tmp, sibling_iterator from, sibling_iterator to) const
+   {
+   tmp.set_head(value_type());
+   tmp.replace(tmp.begin(), tmp.end(), from, to);
+   }
+
+template <class T, class tree_node_allocator>
+int tree<T, tree_node_allocator>::size() const
+   {
+   int i=0;
+   pre_order_iterator it=begin(), eit=end();
+   while(it!=eit) {
+      ++i;
+      ++it;
+      }
+   return i;
+   }
+
+template <class T, class tree_node_allocator>
+int tree<T, tree_node_allocator>::size(const iterator_base& top) const
+   {
+   int i=0;
+   pre_order_iterator it=top, eit=top;
+   eit.skip_children();
+   ++eit;
+   while(it!=eit) {
+      ++i;
+      ++it;
+      }
+   return i;
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::empty() const
+   {
+   pre_order_iterator it=begin(), eit=end();
+   return (it==eit);
+   }
+
+template <class T, class tree_node_allocator>
+int tree<T, tree_node_allocator>::depth(const iterator_base& it) const
+   {
+   tree_node* pos=it.node;
+   assert(pos!=0);
+   int ret=0;
+   while(pos->parent!=0) {
+      pos=pos->parent;
+      ++ret;
+      }
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+unsigned int tree<T, tree_node_allocator>::number_of_children(const iterator_base& it) 
+   {
+   tree_node *pos=it.node->first_child;
+   if(pos==0) return 0;
+   
+   unsigned int ret=1;
+//   while(pos!=it.node->last_child) {
+//      ++ret;
+//      pos=pos->next_sibling;
+//      }
+   while((pos=pos->next_sibling))
+      ++ret;
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+unsigned int tree<T, tree_node_allocator>::number_of_siblings(const iterator_base& it) const
+   {
+   tree_node *pos=it.node;
+   unsigned int ret=0;
+   // count forward
+   while(pos->next_sibling && 
+         pos->next_sibling!=head &&
+         pos->next_sibling!=feet) {
+      ++ret;
+      pos=pos->next_sibling;
+      }
+   // count backward
+   pos=it.node;
+   while(pos->prev_sibling && 
+         pos->prev_sibling!=head &&
+         pos->prev_sibling!=feet) {
+      ++ret;
+      pos=pos->prev_sibling;
+      }
+   
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::swap(sibling_iterator it)
+   {
+   tree_node *nxt=it.node->next_sibling;
+   if(nxt) {
+      if(it.node->prev_sibling)
+         it.node->prev_sibling->next_sibling=nxt;
+      else
+         it.node->parent->first_child=nxt;
+      nxt->prev_sibling=it.node->prev_sibling;
+      tree_node *nxtnxt=nxt->next_sibling;
+      if(nxtnxt)
+         nxtnxt->prev_sibling=it.node;
+      else
+         it.node->parent->last_child=it.node;
+      nxt->next_sibling=it.node;
+      it.node->prev_sibling=nxt;
+      it.node->next_sibling=nxtnxt;
+      }
+   }
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::swap(iterator one, iterator two)
+   {
+   // if one and two are adjacent siblings, use the sibling swap
+   if(one.node->next_sibling==two.node) swap(one);
+   else if(two.node->next_sibling==one.node) swap(two);
+   else {
+      tree_node *nxt1=one.node->next_sibling;
+      tree_node *nxt2=two.node->next_sibling;
+      tree_node *pre1=one.node->prev_sibling;
+      tree_node *pre2=two.node->prev_sibling;
+      tree_node *par1=one.node->parent;
+      tree_node *par2=two.node->parent;
+
+      // reconnect
+      one.node->parent=par2;
+      one.node->next_sibling=nxt2;
+      if(nxt2) nxt2->prev_sibling=one.node;
+      else     par2->last_child=one.node;
+      one.node->prev_sibling=pre2;
+      if(pre2) pre2->next_sibling=one.node;
+      else     par2->first_child=one.node;    
+
+      two.node->parent=par1;
+      two.node->next_sibling=nxt1;
+      if(nxt1) nxt1->prev_sibling=two.node;
+      else     par1->last_child=two.node;
+      two.node->prev_sibling=pre1;
+      if(pre1) pre1->next_sibling=two.node;
+      else     par1->first_child=two.node;
+      }
+   }
+
+// template <class BinaryPredicate>
+// tree<T, tree_node_allocator>::iterator tree<T, tree_node_allocator>::find_subtree(
+//    sibling_iterator subfrom, sibling_iterator subto, iterator from, iterator to, 
+//    BinaryPredicate fun) const
+//    {
+//    assert(1==0); // this routine is not finished yet.
+//    while(from!=to) {
+//       if(fun(*subfrom, *from)) {
+//          
+//          }
+//       }
+//    return to;
+//    }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::is_in_subtree(const iterator_base& it, const iterator_base& begin, 
+                                                 const iterator_base& end) const
+   {
+   // FIXME: this should be optimised.
+   pre_order_iterator tmp=begin;
+   while(tmp!=end) {
+      if(tmp==it) return true;
+      ++tmp;
+      }
+   return false;
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::is_valid(const iterator_base& it) const
+   {
+   if(it.node==0 || it.node==feet || it.node==head) return false;
+   else return true;
+   }
+
+template <class T, class tree_node_allocator>
+unsigned int tree<T, tree_node_allocator>::index(sibling_iterator it) const
+   {
+   unsigned int ind=0;
+   if(it.node->parent==0) {
+      while(it.node->prev_sibling!=head) {
+         it.node=it.node->prev_sibling;
+         ++ind;
+         }
+      }
+   else {
+      while(it.node->prev_sibling!=0) {
+         it.node=it.node->prev_sibling;
+         ++ind;
+         }
+      }
+   return ind;
+   }
+
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::child(const iterator_base& it, unsigned int num) const
+   {
+   tree_node *tmp=it.node->first_child;
+   while(num--) {
+      assert(tmp!=0);
+      tmp=tmp->next_sibling;
+      }
+   return tmp;
+   }
+
+
+
+
+// Iterator base
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::iterator_base::iterator_base()
+   : node(0), skip_current_children_(false)
+   {
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::iterator_base::iterator_base(tree_node *tn)
+   : node(tn), skip_current_children_(false)
+   {
+   }
+
+template <class T, class tree_node_allocator>
+T& tree<T, tree_node_allocator>::iterator_base::operator*() const
+   {
+   return node->data;
+   }
+
+template <class T, class tree_node_allocator>
+T* tree<T, tree_node_allocator>::iterator_base::operator->() const
+   {
+   return &(node->data);
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::post_order_iterator::operator!=(const post_order_iterator& other) const
+   {
+   if(other.node!=this->node) return true;
+   else return false;
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::post_order_iterator::operator==(const post_order_iterator& other) const
+   {
+   if(other.node==this->node) return true;
+   else return false;
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::pre_order_iterator::operator!=(const pre_order_iterator& other) const
+   {
+   if(other.node!=this->node) return true;
+   else return false;
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::pre_order_iterator::operator==(const pre_order_iterator& other) const
+   {
+   if(other.node==this->node) return true;
+   else return false;
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::sibling_iterator::operator!=(const sibling_iterator& other) const
+   {
+   if(other.node!=this->node) return true;
+   else return false;
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::sibling_iterator::operator==(const sibling_iterator& other) const
+   {
+   if(other.node==this->node) return true;
+   else return false;
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::leaf_iterator::operator!=(const leaf_iterator& other) const
+   {
+   if(other.node!=this->node) return true;
+   else return false;
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::leaf_iterator::operator==(const leaf_iterator& other) const
+   {
+   if(other.node==this->node) return true;
+   else return false;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::iterator_base::begin() const
+   {
+   if(node->first_child==0) 
+      return end();
+
+   sibling_iterator ret(node->first_child);
+   ret.parent_=this->node;
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::iterator_base::end() const
+   {
+   sibling_iterator ret(0);
+   ret.parent_=node;
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::iterator_base::skip_children()
+   {
+   skip_current_children_=true;
+   }
+
+template <class T, class tree_node_allocator>
+unsigned int tree<T, tree_node_allocator>::iterator_base::number_of_children() const
+   {
+   tree_node *pos=node->first_child;
+   if(pos==0) return 0;
+   
+   unsigned int ret=1;
+   while(pos!=node->last_child) {
+      ++ret;
+      pos=pos->next_sibling;
+      }
+   return ret;
+   }
+
+
+
+// Pre-order iterator
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::pre_order_iterator::pre_order_iterator() 
+   : iterator_base(0)
+   {
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::pre_order_iterator::pre_order_iterator(tree_node *tn)
+   : iterator_base(tn)
+   {
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::pre_order_iterator::pre_order_iterator(const iterator_base &other)
+   : iterator_base(other.node)
+   {
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::pre_order_iterator::pre_order_iterator(const sibling_iterator& other)
+   : iterator_base(other.node)
+   {
+   if(this->node==0) {
+      if(other.range_last()!=0)
+         this->node=other.range_last();
+      else 
+         this->node=other.parent_;
+      this->skip_children();
+      ++(*this);
+      }
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::pre_order_iterator& tree<T, tree_node_allocator>::pre_order_iterator::operator++()
+   {
+   assert(this->node!=0);
+   if(!this->skip_current_children_ && this->node->first_child != 0) {
+      this->node=this->node->first_child;
+      }
+   else {
+      this->skip_current_children_=false;
+      while(this->node->next_sibling==0) {
+         this->node=this->node->parent;
+         if(this->node==0)
+            return *this;
+         }
+      this->node=this->node->next_sibling;
+      }
+   return *this;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::pre_order_iterator& tree<T, tree_node_allocator>::pre_order_iterator::operator--()
+   {
+   assert(this->node!=0);
+   if(this->node->prev_sibling) {
+      this->node=this->node->prev_sibling;
+      while(this->node->last_child)
+         this->node=this->node->last_child;
+      }
+   else {
+      this->node=this->node->parent;
+      if(this->node==0)
+         return *this;
+      }
+   return *this;
+}
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::pre_order_iterator tree<T, tree_node_allocator>::pre_order_iterator::operator++(int n)
+   {
+   pre_order_iterator copy = *this;
+   ++(*this);
+   return copy;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::pre_order_iterator tree<T, tree_node_allocator>::pre_order_iterator::operator--(int n)
+{
+  pre_order_iterator copy = *this;
+  --(*this);
+  return copy;
+}
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::pre_order_iterator& tree<T, tree_node_allocator>::pre_order_iterator::operator+=(unsigned int num)
+   {
+   while(num>0) {
+      ++(*this);
+      --num;
+      }
+   return (*this);
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::pre_order_iterator& tree<T, tree_node_allocator>::pre_order_iterator::operator-=(unsigned int num)
+   {
+   while(num>0) {
+      --(*this);
+      --num;
+      }
+   return (*this);
+   }
+
+
+
+// Post-order iterator
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::post_order_iterator::post_order_iterator() 
+   : iterator_base(0)
+   {
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::post_order_iterator::post_order_iterator(tree_node *tn)
+   : iterator_base(tn)
+   {
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::post_order_iterator::post_order_iterator(const iterator_base &other)
+   : iterator_base(other.node)
+   {
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::post_order_iterator::post_order_iterator(const sibling_iterator& other)
+   : iterator_base(other.node)
+   {
+   if(this->node==0) {
+      if(other.range_last()!=0)
+         this->node=other.range_last();
+      else 
+         this->node=other.parent_;
+      this->skip_children();
+      ++(*this);
+      }
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::post_order_iterator& tree<T, tree_node_allocator>::post_order_iterator::operator++()
+   {
+   assert(this->node!=0);
+   if(this->node->next_sibling==0) {
+      this->node=this->node->parent;
+      this->skip_current_children_=false;
+      }
+   else {
+      this->node=this->node->next_sibling;
+      if(this->skip_current_children_) {
+         this->skip_current_children_=false;
+         }
+      else {
+         while(this->node->first_child)
+            this->node=this->node->first_child;
+         }
+      }
+   return *this;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::post_order_iterator& tree<T, tree_node_allocator>::post_order_iterator::operator--()
+   {
+   assert(this->node!=0);
+   if(this->skip_current_children_ || this->node->last_child==0) {
+      this->skip_current_children_=false;
+      while(this->node->prev_sibling==0)
+         this->node=this->node->parent;
+      this->node=this->node->prev_sibling;
+      }
+   else {
+      this->node=this->node->last_child;
+      }
+   return *this;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::post_order_iterator tree<T, tree_node_allocator>::post_order_iterator::operator++(int)
+   {
+   post_order_iterator copy = *this;
+   ++(*this);
+   return copy;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::post_order_iterator tree<T, tree_node_allocator>::post_order_iterator::operator--(int)
+   {
+   post_order_iterator copy = *this;
+   --(*this);
+   return copy;
+   }
+
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::post_order_iterator& tree<T, tree_node_allocator>::post_order_iterator::operator+=(unsigned int num)
+   {
+   while(num>0) {
+      ++(*this);
+      --num;
+      }
+   return (*this);
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::post_order_iterator& tree<T, tree_node_allocator>::post_order_iterator::operator-=(unsigned int num)
+   {
+   while(num>0) {
+      --(*this);
+      --num;
+      }
+   return (*this);
+   }
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::post_order_iterator::descend_all()
+   {
+   assert(this->node!=0);
+   while(this->node->first_child)
+      this->node=this->node->first_child;
+   }
+
+
+// Breadth-first iterator
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::breadth_first_queued_iterator::breadth_first_queued_iterator()
+   : iterator_base()
+   {
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::breadth_first_queued_iterator::breadth_first_queued_iterator(tree_node *tn)
+   : iterator_base(tn)
+   {
+   traversal_queue.push(tn);
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::breadth_first_queued_iterator::breadth_first_queued_iterator(const iterator_base& other)
+   : iterator_base(other.node)
+   {
+   traversal_queue.push(other.node);
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::breadth_first_queued_iterator::operator!=(const breadth_first_queued_iterator& other) const
+   {
+   if(other.node!=this->node) return true;
+   else return false;
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::breadth_first_queued_iterator::operator==(const breadth_first_queued_iterator& other) const
+   {
+   if(other.node==this->node) return true;
+   else return false;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::breadth_first_queued_iterator& tree<T, tree_node_allocator>::breadth_first_queued_iterator::operator++()
+   {
+   assert(this->node!=0);
+
+   // Add child nodes and pop current node
+   sibling_iterator sib=this->begin();
+   while(sib!=this->end()) {
+      traversal_queue.push(sib.node);
+      ++sib;
+      }
+   traversal_queue.pop();
+   if(traversal_queue.size()>0)
+      this->node=traversal_queue.front();
+   else 
+      this->node=0;
+   return (*this);
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::breadth_first_queued_iterator tree<T, tree_node_allocator>::breadth_first_queued_iterator::operator++(int n)
+   {
+   breadth_first_queued_iterator copy = *this;
+   ++(*this);
+   return copy;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::breadth_first_queued_iterator& tree<T, tree_node_allocator>::breadth_first_queued_iterator::operator+=(unsigned int num)
+   {
+   while(num>0) {
+      ++(*this);
+      --num;
+      }
+   return (*this);
+   }
+
+
+
+// Fixed depth iterator
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::fixed_depth_iterator::fixed_depth_iterator()
+   : iterator_base()
+   {
+   set_first_parent_();
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::fixed_depth_iterator::fixed_depth_iterator(tree_node *tn)
+   : iterator_base(tn)
+   {
+   set_first_parent_();
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::fixed_depth_iterator::fixed_depth_iterator(const iterator_base& other)
+   : iterator_base(other.node)
+   {
+   set_first_parent_();
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::fixed_depth_iterator::fixed_depth_iterator(const sibling_iterator& other)
+   : iterator_base(other.node), first_parent_(other.parent_)
+   {
+   find_leftmost_parent_();
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::fixed_depth_iterator::fixed_depth_iterator(const fixed_depth_iterator& other)
+   : iterator_base(other.node), first_parent_(other.first_parent_)
+   {
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::fixed_depth_iterator::operator==(const fixed_depth_iterator& other) const
+   {
+   if(other.node==this->node && other.first_parent_==first_parent_) return true;
+   else return false;
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::fixed_depth_iterator::operator!=(const fixed_depth_iterator& other) const
+   {
+   if(other.node!=this->node || other.first_parent_!=first_parent_) return true;
+   else return false;
+   }
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::fixed_depth_iterator::set_first_parent_()
+   {
+   return; // FIXME: we do not use first_parent_ yet, and it actually needs some serious reworking if
+           // it is ever to work at the 'head' level.
+   first_parent_=0;
+   if(this->node==0) return;
+   if(this->node->parent!=0)
+      first_parent_=this->node->parent;
+   if(first_parent_)
+      find_leftmost_parent_();
+   }
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::fixed_depth_iterator::find_leftmost_parent_()
+   {
+   return; // FIXME: see 'set_first_parent()'
+   tree_node *tmppar=first_parent_;
+   while(tmppar->prev_sibling) {
+      tmppar=tmppar->prev_sibling;
+      if(tmppar->first_child)
+         first_parent_=tmppar;
+      }
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::fixed_depth_iterator& tree<T, tree_node_allocator>::fixed_depth_iterator::operator++()
+   {
+   assert(this->node!=0);
+
+   if(this->node->next_sibling) {
+      this->node=this->node->next_sibling;
+      }
+   else { 
+      int relative_depth=0;
+      upper:
+      do {
+         this->node=this->node->parent;
+         if(this->node==0) return *this;
+         --relative_depth;
+         } while(this->node->next_sibling==0);
+      lower:
+      this->node=this->node->next_sibling;
+      while(this->node->first_child==0) {
+         if(this->node->next_sibling==0)
+            goto upper;
+         this->node=this->node->next_sibling;
+         if(this->node==0) return *this;
+         }
+      while(relative_depth<0 && this->node->first_child!=0) {
+         this->node=this->node->first_child;
+         ++relative_depth;
+         }
+      if(relative_depth<0) {
+         if(this->node->next_sibling==0) goto upper;
+         else                          goto lower;
+         }
+      }
+   return *this;
+
+// if(this->node->next_sibling!=0) {
+//    this->node=this->node->next_sibling;
+//    assert(this->node!=0);
+//    if(this->node->parent==0 && this->node->next_sibling==0) // feet element
+//       this->node=0;
+//    }
+// else {
+//    tree_node *par=this->node->parent;
+//    do {
+//       par=par->next_sibling;
+//       if(par==0) { // FIXME: need to keep track of this!
+//          this->node=0;
+//          return *this;
+//          }
+//       } while(par->first_child==0);
+//    this->node=par->first_child;
+//    }
+   return *this;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::fixed_depth_iterator& tree<T, tree_node_allocator>::fixed_depth_iterator::operator--()
+   {
+   assert(this->node!=0);
+   if(this->node->prev_sibling!=0) {
+      this->node=this->node->prev_sibling;
+      assert(this->node!=0);
+      if(this->node->parent==0 && this->node->prev_sibling==0) // head element
+         this->node=0;
+      }
+   else {
+      tree_node *par=this->node->parent;
+      do {
+         par=par->prev_sibling;
+         if(par==0) { // FIXME: need to keep track of this!
+            this->node=0;
+            return *this;
+            }
+         } while(par->last_child==0);
+      this->node=par->last_child;
+      }
+   return *this;
+}
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::fixed_depth_iterator tree<T, tree_node_allocator>::fixed_depth_iterator::operator++(int)
+   {
+   fixed_depth_iterator copy = *this;
+   ++(*this);
+   return copy;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::fixed_depth_iterator tree<T, tree_node_allocator>::fixed_depth_iterator::operator--(int)
+{
+  fixed_depth_iterator copy = *this;
+  --(*this);
+  return copy;
+}
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::fixed_depth_iterator& tree<T, tree_node_allocator>::fixed_depth_iterator::operator-=(unsigned int num)
+   {
+   while(num>0) {
+      --(*this);
+      --(num);
+      }
+   return (*this);
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::fixed_depth_iterator& tree<T, tree_node_allocator>::fixed_depth_iterator::operator+=(unsigned int num)
+   {
+   while(num>0) {
+      ++(*this);
+      --(num);
+      }
+   return *this;
+   }
+
+// FIXME: add the other members of fixed_depth_iterator.
+
+
+// Sibling iterator
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::sibling_iterator::sibling_iterator() 
+   : iterator_base()
+   {
+   set_parent_();
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::sibling_iterator::sibling_iterator(tree_node *tn)
+   : iterator_base(tn)
+   {
+   set_parent_();
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::sibling_iterator::sibling_iterator(const iterator_base& other)
+   : iterator_base(other.node)
+   {
+   set_parent_();
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::sibling_iterator::sibling_iterator(const sibling_iterator& other)
+   : iterator_base(other), parent_(other.parent_)
+   {
+   }
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::sibling_iterator::set_parent_()
+   {
+   parent_=0;
+   if(this->node==0) return;
+   if(this->node->parent!=0)
+      parent_=this->node->parent;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator& tree<T, tree_node_allocator>::sibling_iterator::operator++()
+   {
+   if(this->node)
+      this->node=this->node->next_sibling;
+   return *this;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator& tree<T, tree_node_allocator>::sibling_iterator::operator--()
+   {
+   if(this->node) this->node=this->node->prev_sibling;
+   else {
+      assert(parent_);
+      this->node=parent_->last_child;
+      }
+   return *this;
+}
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::sibling_iterator::operator++(int)
+   {
+   sibling_iterator copy = *this;
+   ++(*this);
+   return copy;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::sibling_iterator::operator--(int)
+   {
+   sibling_iterator copy = *this;
+   --(*this);
+   return copy;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator& tree<T, tree_node_allocator>::sibling_iterator::operator+=(unsigned int num)
+   {
+   while(num>0) {
+      ++(*this);
+      --num;
+      }
+   return (*this);
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator& tree<T, tree_node_allocator>::sibling_iterator::operator-=(unsigned int num)
+   {
+   while(num>0) {
+      --(*this);
+      --num;
+      }
+   return (*this);
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::tree_node *tree<T, tree_node_allocator>::sibling_iterator::range_first() const
+   {
+   tree_node *tmp=parent_->first_child;
+   return tmp;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::tree_node *tree<T, tree_node_allocator>::sibling_iterator::range_last() const
+   {
+   return parent_->last_child;
+   }
+
+// Leaf iterator
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::leaf_iterator::leaf_iterator() 
+   : iterator_base(0)
+   {
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::leaf_iterator::leaf_iterator(tree_node *tn)
+   : iterator_base(tn)
+   {
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::leaf_iterator::leaf_iterator(const iterator_base &other)
+   : iterator_base(other.node)
+   {
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::leaf_iterator::leaf_iterator(const sibling_iterator& other)
+   : iterator_base(other.node)
+   {
+   if(this->node==0) {
+      if(other.range_last()!=0)
+         this->node=other.range_last();
+      else 
+         this->node=other.parent_;
+      ++(*this);
+      }
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::leaf_iterator& tree<T, tree_node_allocator>::leaf_iterator::operator++()
+   {
+   assert(this->node!=0);
+   while(this->node->next_sibling==0) {
+      if (this->node->parent==0) return *this;
+      this->node=this->node->parent;
+      }
+   this->node=this->node->next_sibling;
+   while(this->node->first_child)
+      this->node=this->node->first_child;
+   return *this;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::leaf_iterator& tree<T, tree_node_allocator>::leaf_iterator::operator--()
+   {
+   assert(this->node!=0);
+   while (this->node->prev_sibling==0) {
+      if (this->node->parent==0) return *this;
+      this->node=this->node->parent;
+      }
+   this->node=this->node->prev_sibling;
+   while(this->node->last_child)
+      this->node=this->node->last_child;
+   return *this;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::leaf_iterator tree<T, tree_node_allocator>::leaf_iterator::operator++(int)
+   {
+   leaf_iterator copy = *this;
+   ++(*this);
+   return copy;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::leaf_iterator tree<T, tree_node_allocator>::leaf_iterator::operator--(int)
+   {
+   leaf_iterator copy = *this;
+   --(*this);
+   return copy;
+   }
+
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::leaf_iterator& tree<T, tree_node_allocator>::leaf_iterator::operator+=(unsigned int num)
+   {
+   while(num>0) {
+      ++(*this);
+      --num;
+      }
+   return (*this);
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::leaf_iterator& tree<T, tree_node_allocator>::leaf_iterator::operator-=(unsigned int num)
+   {
+   while(num>0) {
+      --(*this);
+      --num;
+      }
+   return (*this);
+   }
+
+#endif
+
+// Local variables:
+// default-tab-width: 3
+// End:



From MAILER-DAEMON Wed Aug 22 17:38:28 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INxuG-00058X-9f
	for mharc-gnash-commit@gnu.org; Wed, 22 Aug 2007 17:38:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INxuD-00058B-Vy
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 17:38:26 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INxuC-00057g-Bf
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 17:38:24 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INxuC-00057c-4b
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 17:38:24 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1INxuB-0000cH-Ny
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 17:38:23 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1INxuA-0003DG-Ma
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 21:38:22 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1INxuA-0003DD-Fu
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 21:38:22 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INxuA-0003DD-Fu@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 22 Aug 2007 21:38:22 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog gui/gtk.cpp gui/gui.cpp gui/gui.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Aug 2007 21:38:26 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/22 21:38:22

Modified files:
	.              : ChangeLog 
	gui            : gtk.cpp gui.cpp gui.h 

Log message:
	        * gui/gui.{cpp,h}: Use kasper's tree class for getMovieInfo
	          (InfoTable is now an InfoTree)
	        * gui/gtk.cpp (menuitem_movieinfo_callback): fix to use
	          an InfoTree - just a leaf-iteration.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4072&r2=1.4073
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.104&r2=1.105
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.cpp?cvsroot=gnash&r1=1.93&r2=1.94
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.h?cvsroot=gnash&r1=1.59&r2=1.60

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4072
retrieving revision 1.4073
diff -u -b -r1.4072 -r1.4073
--- ChangeLog	22 Aug 2007 21:04:51 -0000	1.4072
+++ ChangeLog	22 Aug 2007 21:38:21 -0000	1.4073
@@ -1,5 +1,12 @@
 2007-08-23 Sandro Santilli <strk@keybit.net>
 
+	* gui/gui.{cpp,h}: Use kasper's tree class for getMovieInfo
+	  (InfoTable is now an InfoTree)
+	* gui/gtk.cpp (menuitem_movieinfo_callback): fix to use
+	  an InfoTree - just a leaf-iteration.
+
+2007-08-23 Sandro Santilli <strk@keybit.net>
+
 	* libbase/tree.hh: include generic tree class by
 	  Kasper Peeters <kasper.peeters@aei.mpg.de>
 

Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -b -r1.104 -r1.105
--- gui/gtk.cpp	21 Aug 2007 23:38:35 -0000	1.104
+++ gui/gtk.cpp	22 Aug 2007 21:38:22 -0000	1.105
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: gtk.cpp,v 1.104 2007/08/21 23:38:35 strk Exp $ */
+/* $Id: gtk.cpp,v 1.105 2007/08/22 21:38:22 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -979,7 +979,7 @@
     GtkWidget *table1 = gtk_table_new(4, 2, FALSE);
     gtk_box_pack_start (GTK_BOX (vbox2), table1, FALSE, FALSE, 0);
 
-    std::auto_ptr<InfoTable> infoptr = gui->getMovieInfo();
+    std::auto_ptr<InfoTree> infoptr = gui->getMovieInfo();
     if ( ! infoptr.get() )
     {
             label = gtk_label_new (_("VM not initialized yet"));
@@ -988,12 +988,11 @@
             return;
     }
 
-    InfoTable& info = *infoptr;
+    InfoTree& info = *infoptr;
     
-#if 1
     size_t size = info.size();
 
-    for (InfoTable::reverse_iterator i=info.rbegin(), e=info.rend(); i!=e; ++i)
+    for (InfoTree::leaf_iterator i=info.begin_leaf(), e=info.end_leaf(); i!=e; ++i)
     {
         StringPair& p = *i;
         guint up = size;
@@ -1035,22 +1034,6 @@
 
      gtk_widget_show_all (window1);
 
-#else
-    GtkWidget* box = gtk_vbox_new (FALSE, 2);
-    gtk_widget_show (box);
-    gtk_container_add (GTK_CONTAINER (window1), box);
-
-    for (InfoTable::reverse_iterator i=info.rbegin(), e=info.rend(); i!=e; ++i)
-    {
-        StringPair& p = *i;
-
-        string text = p.first + string(" = ") + p.second;
-        label = gtk_label_new (text.c_str());
-        gtk_widget_show (label);
-        gtk_box_pack_start (GTK_BOX (box), label, TRUE, FALSE, 3);
-    }
-#endif
-    
 }
 
 

Index: gui/gui.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- gui/gui.cpp	21 Aug 2007 15:05:02 -0000	1.93
+++ gui/gui.cpp	22 Aug 2007 21:38:22 -0000	1.94
@@ -582,17 +582,17 @@
 	setInvalidatedRegion(bounds);
 }
 
-std::auto_ptr<Gui::InfoTable>
+std::auto_ptr<Gui::InfoTree>
 Gui::getMovieInfo() const
 {
-    std::auto_ptr<InfoTable> ret;
+    std::auto_ptr<InfoTree> ret;
 
     if ( ! VM::isInitialized() )
     {
         return ret;
     }
 
-    ret.reset(new InfoTable());
+    ret.reset(new InfoTree());
 
     VM& vm = VM::get();
 
@@ -600,7 +600,7 @@
     int vmSWFVersion = vm.getSWFVersion();
     char buf[16];
     snprintf(buf, 16, "SWF%d", vmSWFVersion); buf[15] = '\0';
-    ret->push_back(StringPair("VM", buf));
+    ret->insert(ret->begin(), StringPair("VM", buf));
 
     // Print info about levels (only level0 for now, then will be extended)
     movie_root& stage = vm.getRoot();
@@ -608,8 +608,8 @@
     movie_definition* def0 = level0->get_movie_definition();
     assert(def0);
     snprintf(buf, 16, "SWF%d", def0->get_version()); buf[15] = '\0';
-    ret->push_back(StringPair("_level0 SWFVersion", string(buf)));
-    ret->push_back(StringPair("_level0 URL", def0->get_url()));
+    ret->insert(ret->begin(), StringPair("_level0 SWFVersion", string(buf)));
+    ret->insert(ret->begin(), StringPair("_level0 URL", def0->get_url()));
 
     return ret;
 }

Index: gui/gui.h
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.h,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- gui/gui.h	18 Aug 2007 13:08:15 -0000	1.59
+++ gui/gui.h	22 Aug 2007 21:38:22 -0000	1.60
@@ -29,6 +29,7 @@
 #include "rect.h"  // for composition
 #include "snappingrange.h"  // for InvalidatedRanges
 #include "gnash.h" // for gnash::key::code type
+#include "tree.hh" // for tree
 
 #include <string>
 
@@ -247,13 +248,13 @@
 
     // TODO: use a tree-like structure (tree.hh?)
     typedef std::pair<std::string,std::string> StringPair;
-    typedef std::vector<StringPair> InfoTable;
+    typedef tree<StringPair> InfoTree;
 
     /// \brief
-    /// Return a table containing informations about the movie
+    /// Return a tree containing informations about the movie
     /// currently being played (or NULL, if the VM isn't initialized yet)
     ///
-    std::auto_ptr<InfoTable> getMovieInfo() const;
+    std::auto_ptr<InfoTree> getMovieInfo() const;
 
 protected:
 



From MAILER-DAEMON Wed Aug 22 18:53:15 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1INz4d-0008FM-A8
	for mharc-gnash-commit@gnu.org; Wed, 22 Aug 2007 18:53:15 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1INz4c-0008F9-5w
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 18:53:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1INz4b-0008Ex-CV
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 18:53:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1INz4b-0008Eu-7A
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 18:53:13 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1INz4a-0003gC-U4
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 18:53:13 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1INz4Z-0001VV-Js
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 22:53:11 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1INz4Z-0001VR-F8
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 22:53:11 +0000
To: gnash-commit@gnu.org
Message-Id: <E1INz4Z-0001VR-F8@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 22 Aug 2007 22:53:11 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-mtasc.all/Makefi...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Aug 2007 22:53:14 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/22 22:53:11

Modified files:
	.              : ChangeLog 
	testsuite/misc-mtasc.all: Makefile.am 

Log message:
	        * testsuite/misc-mtasc.all/Makefile.am: specify input language
	          in MTASC_CPP, so we can use a filename again (rather then
	          get meaningless <stdin> printed for __FILE__).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4073&r2=1.4074
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-mtasc.all/Makefile.am?cvsroot=gnash&r1=1.14&r2=1.15

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4073
retrieving revision 1.4074
diff -u -b -r1.4073 -r1.4074
--- ChangeLog	22 Aug 2007 21:38:21 -0000	1.4073
+++ ChangeLog	22 Aug 2007 22:53:10 -0000	1.4074
@@ -1,5 +1,8 @@
 2007-08-23 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/misc-mtasc.all/Makefile.am: specify input language 
+	  in MTASC_CPP, so we can use a filename again (rather then
+	  get meaningless <stdin> printed for __FILE__).
 	* gui/gui.{cpp,h}: Use kasper's tree class for getMovieInfo
 	  (InfoTable is now an InfoTree)
 	* gui/gtk.cpp (menuitem_movieinfo_callback): fix to use

Index: testsuite/misc-mtasc.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-mtasc.all/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- testsuite/misc-mtasc.all/Makefile.am	20 Aug 2007 11:13:17 -0000	1.14
+++ testsuite/misc-mtasc.all/Makefile.am	22 Aug 2007 22:53:11 -0000	1.15
@@ -41,7 +41,7 @@
 if ENABLE_MTASC
 
 MTASC_FLAGS = -version 6 -cp $(MTASC_CLASSPATH) -cp $(srcdir) -v -header 800:600:20
-MTASC_CPP = $(CPP) -P -I$(srcdir)
+MTASC_CPP = $(CPP) -x c -P -I$(srcdir)
 
 ASTESTS_OUT = $(ASTESTS:.as=.swf)
 
@@ -56,7 +56,7 @@
 	chmod 755 $@
 
 .as.swf:
-	cat $< | $(MTASC_CPP) - > $(@:%.swf=pp_%.as) 
+	$(MTASC_CPP) $< > $(@:%.swf=pp_%.as) 
 	$(MTASC) $(MTASC_FLAGS) -swf $@ -main $(@:%.swf=pp_%.as)
 
 CLEANFILES =  \



From MAILER-DAEMON Wed Aug 22 21:57:08 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IO1wa-0000On-G0
	for mharc-gnash-commit@gnu.org; Wed, 22 Aug 2007 21:57:08 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IO1wY-0000N7-Md
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 21:57:06 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IO1wX-0000MF-QT
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 21:57:06 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IO1wX-0000M6-NL
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 21:57:05 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1IO1wX-0002kM-BK
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 21:57:05 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <markus@unixrus.se>) id 1IO1wV-0000xS-0u
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 01:57:03 +0000
Received: from nihilus by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <nihilus@savannah.gnu.org>) id 1IO1wU-0000xP-SB
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 01:57:02 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IO1wU-0000xP-SB@cvs.savannah.gnu.org>
From: Markus Gothe <markus@unixrus.se>
Date: Thu, 23 Aug 2007 01:57:02 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog libamf/amf.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Aug 2007 01:57:06 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Markus Gothe <nihilus>	07/08/23 01:57:02

Modified files:
	.              : ChangeLog 
	libamf         : amf.cpp 

Log message:
	memcpy -> strncpy, since it does a memory access violation on Darwin 
	(and porbably other OSes).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4074&r2=1.4075
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/amf.cpp?cvsroot=gnash&r1=1.39&r2=1.40

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4074
retrieving revision 1.4075
diff -u -b -r1.4074 -r1.4075
--- ChangeLog	22 Aug 2007 22:53:10 -0000	1.4074
+++ ChangeLog	23 Aug 2007 01:57:02 -0000	1.4075
@@ -1,3 +1,8 @@
+2007-08-19 Markus Gothe <nietzsche@lysator.liu.se>
+
+	* libamf/amf.cpp: memcpy -> strncpy, since it does a memory 
+	access violation on Darwin (and porbably other OSes).
+
 2007-08-23 Sandro Santilli <strk@keybit.net>
 
 	* testsuite/misc-mtasc.all/Makefile.am: specify input language 

Index: libamf/amf.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/amf.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- libamf/amf.cpp	1 Jul 2007 10:54:05 -0000	1.39
+++ libamf/amf.cpp	23 Aug 2007 01:57:02 -0000	1.40
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: amf.cpp,v 1.39 2007/07/01 10:54:05 bjacques Exp $ */
+/* $Id: amf.cpp,v 1.40 2007/08/23 01:57:02 nihilus Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -725,7 +725,7 @@
         x += sizeof(short);
         buf = new char[length+1];
         memset(buf, 0, length+1);
-        memcpy(buf, x, length);
+        strncpy(buf, x, length); /* memcpy() does memory access violation on Darwin! */
     } else {
         log_error("Tried to extract AMF string from non String object!");
     }



From MAILER-DAEMON Wed Aug 22 22:00:18 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IO1ze-0001xE-3F
	for mharc-gnash-commit@gnu.org; Wed, 22 Aug 2007 22:00:18 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IO1zb-0001w7-MQ
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 22:00:15 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IO1zb-0001vZ-96
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 22:00:15 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IO1zb-0001vA-1n
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 22:00:15 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1IO1za-0003A7-MS
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 22:00:14 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <markus@unixrus.se>) id 1IO1za-00015z-6J
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 02:00:14 +0000
Received: from nihilus by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <nihilus@savannah.gnu.org>) id 1IO1za-00015v-2N
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 02:00:14 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IO1za-00015v-2N@cvs.savannah.gnu.org>
From: Markus Gothe <markus@unixrus.se>
Date: Thu, 23 Aug 2007 02:00:14 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog libamf/amf.cpp [release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Aug 2007 02:00:16 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Markus Gothe <nihilus>	07/08/23 02:00:13

Modified files:
	.              : ChangeLog 
	libamf         : amf.cpp 

Log message:
	memcpy -> strncpy, since it does a memory access violation on Darwin 
	(and porbably other OSes).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.56&r2=1.3971.2.57
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/amf.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.39&r2=1.39.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.56
retrieving revision 1.3971.2.57
diff -u -b -r1.3971.2.56 -r1.3971.2.57
--- ChangeLog	22 Aug 2007 16:11:42 -0000	1.3971.2.56
+++ ChangeLog	23 Aug 2007 02:00:12 -0000	1.3971.2.57
@@ -1,3 +1,8 @@
+2007-08-23 Markus Gothe <nietzsche@lysator.liu.se>
+
+	* libamf/amf.cpp: memcpy -> strncpy, since it does a memory 
+	access violation on Darwin (and porbably other OSes).
+	
 2007-08-22 Sandro Santilli <strk@keybit.net>
 
 	* NEWS: add note about the 'debugLog' gnashrc fix and set

Index: libamf/amf.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/amf.cpp,v
retrieving revision 1.39
retrieving revision 1.39.2.1
diff -u -b -r1.39 -r1.39.2.1
--- libamf/amf.cpp	1 Jul 2007 10:54:05 -0000	1.39
+++ libamf/amf.cpp	23 Aug 2007 02:00:13 -0000	1.39.2.1
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: amf.cpp,v 1.39 2007/07/01 10:54:05 bjacques Exp $ */
+/* $Id: amf.cpp,v 1.39.2.1 2007/08/23 02:00:13 nihilus Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -725,7 +725,7 @@
         x += sizeof(short);
         buf = new char[length+1];
         memset(buf, 0, length+1);
-        memcpy(buf, x, length);
+		strncpy(buf, x, length); /* memcpy() does memory access violation on Darwin! */
     } else {
         log_error("Tried to extract AMF string from non String object!");
     }



From MAILER-DAEMON Wed Aug 22 22:01:09 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IO20T-0002j8-CR
	for mharc-gnash-commit@gnu.org; Wed, 22 Aug 2007 22:01:09 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IO20R-0002iW-F7
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 22:01:07 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IO20Q-0002gF-CQ
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 22:01:06 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IO20Q-0002fx-8Q
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 22:01:06 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1IO20P-0003Fa-Sh
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 22:01:05 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <markus@unixrus.se>) id 1IO20P-000184-D1
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 02:01:05 +0000
Received: from nihilus by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <nihilus@savannah.gnu.org>) id 1IO20P-000181-4C
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 02:01:05 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IO20P-000181-4C@cvs.savannah.gnu.org>
From: Markus Gothe <markus@unixrus.se>
Date: Thu, 23 Aug 2007 02:01:05 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Aug 2007 02:01:07 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Markus Gothe <nihilus>	07/08/23 02:01:05

Modified files:
	.              : ChangeLog 

Log message:
	Forgot to set current date...

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4075&r2=1.4076

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4075
retrieving revision 1.4076
diff -u -b -r1.4075 -r1.4076
--- ChangeLog	23 Aug 2007 01:57:02 -0000	1.4075
+++ ChangeLog	23 Aug 2007 02:01:04 -0000	1.4076
@@ -1,4 +1,4 @@
-2007-08-19 Markus Gothe <nietzsche@lysator.liu.se>
+2007-08-23 Markus Gothe <nietzsche@lysator.liu.se>
 
 	* libamf/amf.cpp: memcpy -> strncpy, since it does a memory 
 	access violation on Darwin (and porbably other OSes).



From MAILER-DAEMON Wed Aug 22 22:59:18 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IO2uk-0003MG-3j
	for mharc-gnash-commit@gnu.org; Wed, 22 Aug 2007 22:59:18 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IO2uh-0003Kq-VG
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 22:59:16 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IO2uh-0003Js-DC
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 22:59:15 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IO2uh-0003JV-4Y
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 22:59:15 -0400
Received: from rv-out-0910.google.com ([209.85.198.185])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1IO2ug-0002cl-E1
	for gnash-commit@gnu.org; Wed, 22 Aug 2007 22:59:14 -0400
Received: by rv-out-0910.google.com with SMTP id c27so283817rvf
	for <gnash-commit@gnu.org>; Wed, 22 Aug 2007 19:59:09 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:mime-version:content-type:content-transfer-encoding:content-disposition;
	b=i+RPAFlZMxisFsvFUUiMXX4caiGagfjU153LxYvHTU7iqs4UknFRoJomXwfme2Q0WeGm4tquxkuhZpAfz85Z4xIwuLu56eGAwsE1qfFVDYjkuoQnRcUDvhG3hDPxSwJOwzf05RcJs0J/23FouxyW96cag5b+dRFmSF4xuQBVLts=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:mime-version:content-type:content-transfer-encoding:content-disposition;
	b=Xo4IzJbBAF8217vYgWwmYaY0jr8ibcmD8rfUuy9E/N+5ZHdF4++//t3gcVEHaVqOlwCr75Hl4ONd143cFUVIkGuFRc9tQ9jlnSAObMye5Jhj4ln/cJmP+cnSiCb/kzYlGotKfTnT2OdtWHFgFutDyMXXN8k3sPxbT/i9azQzGEU=
Received: by 10.114.132.5 with SMTP id f5mr1535073wad.1187837949635;
	Wed, 22 Aug 2007 19:59:09 -0700 (PDT)
Received: by 10.114.12.7 with HTTP; Wed, 22 Aug 2007 19:59:09 -0700 (PDT)
Message-ID: <ca4b43ff0708221959t6b920263s3fcfaa35f81736e7@mail.gmail.com>
Date: Thu, 23 Aug 2007 10:59:09 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: gnash-commit@gnu.org
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
X-Detected-Kernel: Linux 2.6 (newer, 2)
Subject: [Gnash-commit] known triggered bugs in our testsuite
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Aug 2007 02:59:16 -0000

FYI,

see http://www.gnashdev.org/wiki/index.php/Testcases#Triggered_bugs_in_cvs_head

the following are known triggered bugs in our testsuite:

==Action execution order==
related testcases: testsuite/misc-ming.all/action_execution_order_test*.c

==Case sensitiveness==
related testcases: testsuite/actionscript.all/case.as

==Fundamental operators==
related testcases: testsuite/actionscript.all/ops.as

==Soft reference==
related testcases:
testsuite/actionscript.all/MovieClip.as;
testsuite/misc-ming.all/displaylist_depths_test{2,3,4,5}.c

==Others==
There are still some other minor bugs exist in our testcases, the
above are just what I think critical.


=[[Untested topics]]=

==Key handling==
No failing tests in our testsuite. Ming support of 'onKeypress' event
is bogus, so just no proper
testcases, Key handling still need to be improved.

==Mouse handling==
No failing tests, due to lack of testcases.

zou



From MAILER-DAEMON Thu Aug 23 05:26:34 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IO8xU-0001An-SC
	for mharc-gnash-commit@gnu.org; Thu, 23 Aug 2007 05:26:33 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IO8xR-00019k-An
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 05:26:29 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IO8xP-000195-B2
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 05:26:28 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IO8xN-00018o-P1
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 05:26:26 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IO8xM-0003MY-Mf
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 05:26:24 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IO8xL-0003My-Cm
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 09:26:23 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IO8xL-0003Mu-7x
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 09:26:23 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IO8xL-0003Mu-7x@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 23 Aug 2007 09:26:23 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog configure.ac libbase/rc.cpp mac...
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Aug 2007 09:26:30 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/23 09:26:23

Modified files:
	.              : ChangeLog configure.ac 
	libbase        : rc.cpp 
	macros         : pthreads.m4 

Log message:
	        * configure.ac: move BOOST macro detector invocation after
	          PTHREAD one, as the former requires the latter.
	
	Patches by Deanna Phillips <deanna>:
	
	        * macros/pthreads.m4: set pthread flags to -pthread for openbsd.
	        * libbase/rc.cpp: include unistd.h for getuid()

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.57&r2=1.3971.2.58
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.396.2.8&r2=1.396.2.9
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.27.2.4&r2=1.27.2.5
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/pthreads.m4?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.30&r2=1.30.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.57
retrieving revision 1.3971.2.58
diff -u -b -r1.3971.2.57 -r1.3971.2.58
--- ChangeLog	23 Aug 2007 02:00:12 -0000	1.3971.2.57
+++ ChangeLog	23 Aug 2007 09:26:21 -0000	1.3971.2.58
@@ -1,9 +1,20 @@
+2007-08-23 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac: move BOOST macro detector invocation after
+	  PTHREAD one, as the former requires the latter.
+
+2007-08-23 Deanna Phillips <deanna>
+
+	* macros/pthreads.m4: set pthread flags to -pthread for openbsd.
+	* libbase/rc.cpp: include unistd.h for getuid()
+
 2007-08-23 Markus Gothe <nietzsche@lysator.liu.se>
 
 	* libamf/amf.cpp: memcpy -> strncpy, since it does a memory 
 	access violation on Darwin (and porbably other OSes).
 	
-2007-08-22 Sandro Santilli <strk@keybit.net>
+
+2007-08-23 Sandro Santilli <strk@keybit.net>
 
 	* NEWS: add note about the 'debugLog' gnashrc fix and set
 	  release date to Aug 23 (tomorrow).

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.396.2.8
retrieving revision 1.396.2.9
diff -u -b -r1.396.2.8 -r1.396.2.9
--- configure.ac	22 Aug 2007 12:15:30 -0000	1.396.2.8
+++ configure.ac	23 Aug 2007 09:26:22 -0000	1.396.2.9
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.396.2.8 2007/08/22 12:15:30 strk Exp $
+dnl $Id: configure.ac,v 1.396.2.9 2007/08/23 09:26:22 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, 0.8.1)
@@ -984,7 +984,6 @@
 
 AM_CONDITIONAL(HAVE_SDL, [ test x$has_SDL = xyes ])
 
-GNASH_PATH_BOOST
 GNASH_PATH_LIBXML
 
 dnl
@@ -1263,6 +1262,8 @@
   fi
 fi
 
+GNASH_PATH_BOOST
+
 AX_GCC_ARCHFLAG(no)
 
 AC_ARG_ENABLE([strict],

Index: libbase/rc.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.cpp,v
retrieving revision 1.27.2.4
retrieving revision 1.27.2.5
diff -u -b -r1.27.2.4 -r1.27.2.5
--- libbase/rc.cpp	21 Aug 2007 15:26:21 -0000	1.27.2.4
+++ libbase/rc.cpp	23 Aug 2007 09:26:22 -0000	1.27.2.5
@@ -27,6 +27,7 @@
 #endif
 
 #include <sys/types.h>
+#include <unistd.h> // for getuid()
 #include <sys/stat.h>
 
 #include <cctype>  // for toupper

Index: macros/pthreads.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/pthreads.m4,v
retrieving revision 1.30
retrieving revision 1.30.2.1
diff -u -b -r1.30 -r1.30.2.1
--- macros/pthreads.m4	1 Jul 2007 10:54:13 -0000	1.30
+++ macros/pthreads.m4	23 Aug 2007 09:26:22 -0000	1.30.2.1
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 dnl Copyright (C) 2006 Steven G. Johnson <stevenj@alum.mit.edu>.
-dnl $Id: pthreads.m4,v 1.30 2007/07/01 10:54:13 bjacques Exp $
+dnl $Id: pthreads.m4,v 1.30.2.1 2007/08/23 09:26:22 strk Exp $
 
 AC_DEFUN([GNASH_PATH_PTHREADS],
 [
@@ -82,7 +82,7 @@
 dnl pth(read)-config: use pthread-config program (for GNU Pth library)
 
 case "${host_cpu}-${host_os}" in
-  *linux*)
+  *linux* | *openbsd*)
     pthread_flags="-pthread"
     ;;
   *darwin*)



From MAILER-DAEMON Thu Aug 23 05:26:57 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IO8xt-0001SJ-2t
	for mharc-gnash-commit@gnu.org; Thu, 23 Aug 2007 05:26:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IO8xp-0001Pc-Nj
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 05:26:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IO8xo-0001Nc-BH
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 05:26:52 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IO8xo-0001NL-3g
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 05:26:52 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IO8xn-0003Tl-Pt
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 05:26:51 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IO8xn-0003Nc-Bm
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 09:26:51 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IO8xn-0003NZ-7G
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 09:26:51 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IO8xn-0003NZ-7G@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 23 Aug 2007 09:26:51 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog configure.ac libbase/rc.cpp mac...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Aug 2007 09:26:55 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/23 09:26:51

Modified files:
	.              : ChangeLog configure.ac 
	libbase        : rc.cpp 
	macros         : pthreads.m4 

Log message:
	        * configure.ac: move BOOST macro detector invocation after
	          PTHREAD one, as the former requires the latter.
	
	Patches by Deanna Phillips <deanna>:
	
	        * macros/pthreads.m4: set pthread flags to -pthread for openbsd.
	        * libbase/rc.cpp: include unistd.h for getuid()

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4076&r2=1.4077
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.405&r2=1.406
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.cpp?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/pthreads.m4?cvsroot=gnash&r1=1.30&r2=1.31

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4076
retrieving revision 1.4077
diff -u -b -r1.4076 -r1.4077
--- ChangeLog	23 Aug 2007 02:01:04 -0000	1.4076
+++ ChangeLog	23 Aug 2007 09:26:50 -0000	1.4077
@@ -1,3 +1,13 @@
+2007-08-23 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac: move BOOST macro detector invocation after
+	  PTHREAD one, as the former requires the latter.
+
+2007-08-23 Deanna Phillips <deanna>
+
+	* macros/pthreads.m4: set pthread flags to -pthread for openbsd.
+	* libbase/rc.cpp: include unistd.h for getuid()
+
 2007-08-23 Markus Gothe <nietzsche@lysator.liu.se>
 
 	* libamf/amf.cpp: memcpy -> strncpy, since it does a memory 

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.405
retrieving revision 1.406
diff -u -b -r1.405 -r1.406
--- configure.ac	22 Aug 2007 11:20:29 -0000	1.405
+++ configure.ac	23 Aug 2007 09:26:50 -0000	1.406
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.405 2007/08/22 11:20:29 strk Exp $
+dnl $Id: configure.ac,v 1.406 2007/08/23 09:26:50 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -986,7 +986,6 @@
 
 AM_CONDITIONAL(HAVE_SDL, [ test x$has_SDL = xyes ])
 
-GNASH_PATH_BOOST
 GNASH_PATH_LIBXML
 
 dnl
@@ -1265,6 +1264,8 @@
   fi
 fi
 
+GNASH_PATH_BOOST
+
 AX_GCC_ARCHFLAG(no)
 
 AC_ARG_ENABLE([strict],

Index: libbase/rc.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- libbase/rc.cpp	21 Aug 2007 15:18:36 -0000	1.31
+++ libbase/rc.cpp	23 Aug 2007 09:26:50 -0000	1.32
@@ -27,6 +27,7 @@
 #endif
 
 #include <sys/types.h>
+#include <unistd.h> // for getuid()
 #include <sys/stat.h>
 
 #include <cctype>  // for toupper

Index: macros/pthreads.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/pthreads.m4,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- macros/pthreads.m4	1 Jul 2007 10:54:13 -0000	1.30
+++ macros/pthreads.m4	23 Aug 2007 09:26:50 -0000	1.31
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 dnl Copyright (C) 2006 Steven G. Johnson <stevenj@alum.mit.edu>.
-dnl $Id: pthreads.m4,v 1.30 2007/07/01 10:54:13 bjacques Exp $
+dnl $Id: pthreads.m4,v 1.31 2007/08/23 09:26:50 strk Exp $
 
 AC_DEFUN([GNASH_PATH_PTHREADS],
 [
@@ -82,7 +82,7 @@
 dnl pth(read)-config: use pthread-config program (for GNU Pth library)
 
 case "${host_cpu}-${host_os}" in
-  *linux*)
+  *linux* | *openbsd*)
     pthread_flags="-pthread"
     ;;
   *darwin*)



From MAILER-DAEMON Thu Aug 23 05:29:29 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IO90L-0002Hy-GL
	for mharc-gnash-commit@gnu.org; Thu, 23 Aug 2007 05:29:29 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IO90J-0002Hg-Iw
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 05:29:27 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IO90I-0002HJ-Uz
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 05:29:27 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IO90I-0002HG-Ml
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 05:29:26 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IO90I-000407-DO
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 05:29:26 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IO90I-0003QV-1N
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 09:29:26 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IO90H-0003QS-Sk
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 09:29:25 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IO90H-0003QS-Sk@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 23 Aug 2007 09:29:25 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog [release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Aug 2007 09:29:27 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/23 09:29:25

Modified files:
	.              : ChangeLog 

Log message:
	minor merge problem (timewarp)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.58&r2=1.3971.2.59

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.58
retrieving revision 1.3971.2.59
diff -u -b -r1.3971.2.58 -r1.3971.2.59
--- ChangeLog	23 Aug 2007 09:26:21 -0000	1.3971.2.58
+++ ChangeLog	23 Aug 2007 09:29:25 -0000	1.3971.2.59
@@ -14,7 +14,7 @@
 	access violation on Darwin (and porbably other OSes).
 	
 
-2007-08-23 Sandro Santilli <strk@keybit.net>
+2007-08-22 Sandro Santilli <strk@keybit.net>
 
 	* NEWS: add note about the 'debugLog' gnashrc fix and set
 	  release date to Aug 23 (tomorrow).



From MAILER-DAEMON Thu Aug 23 05:37:36 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IO989-0006Od-TX
	for mharc-gnash-commit@gnu.org; Thu, 23 Aug 2007 05:37:34 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IO985-0006MH-Cx
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 05:37:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IO982-0006L0-UV
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 05:37:27 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IO980-0006Kf-VN
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 05:37:26 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <benjamin_pelican@yahoo.co.uk>)
	id 1IO980-0005cB-G0
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 05:37:24 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <benjamin_pelican@yahoo.co.uk>) id 1IO97z-0003Z7-9x
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 09:37:23 +0000
Received: from bwy by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <bwy@savannah.gnu.org>) id 1IO97z-0003Z4-4g
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 09:37:23 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IO97z-0003Z4-4g@cvs.savannah.gnu.org>
From: Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
Date: Thu, 23 Aug 2007 09:37:23 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash doc/C/usermanual/usage/gnashrc.xml libbas...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Aug 2007 09:37:30 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Benjamin Wolsey <bwy>	07/08/23 09:37:23

Modified files:
	doc/C/usermanual/usage: gnashrc.xml 
	libbase        : rc.cpp rc.h 

Log message:
	* libbase/rc.{cpp,h}: expandPath called on non-POSIX systems for other path
	operations. Whitelist and blacklist now space not colon separated. NOTE:
	Old lists still work, but that behaviour must be deprecated before protocols
	can be used in lists. Made private: extractSetting, extractNumber.
	Minor code cleanups.
	* docs/C/usermanual/usage/gnashrc.xml: add info about black- and whitelists.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/usage/gnashrc.xml?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.cpp?cvsroot=gnash&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.h?cvsroot=gnash&r1=1.24&r2=1.25

Patches:
Index: doc/C/usermanual/usage/gnashrc.xml
===================================================================
RCS file: /cvsroot/gnash/gnash/doc/C/usermanual/usage/gnashrc.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- doc/C/usermanual/usage/gnashrc.xml	20 Aug 2007 17:48:09 -0000	1.8
+++ doc/C/usermanual/usage/gnashrc.xml	23 Aug 2007 09:37:22 -0000	1.9
@@ -54,13 +54,13 @@
 <row>
 <entry>whitelist</entry>
 <entry>hostnames</entry>
-<entry>This is a list of hostnames, separated by a colon (:). If this list is populated, &app; will only load external Flash movies from the specified hosts.  The whitelist takes precedence over the blacklist.</entry>
+<entry>This is a list of hostnames, separated by spaces. If this list is populated, &app; will only load external Flash movies from the specified hosts.  The whitelist takes precedence over the blacklist.</entry>
 </row>
 <row>
 <entry>blacklist</entry>
 <entry>hostnames</entry>
-<entry>This is a list of hostnames, separated by a colon
-	    <emphasis>:</emphasis>.  External flash movies from these
+<entry>This is a list of hostnames, separated by spaces.
+	    External flash movies from these
             domains are never allowed to load. If whitelist is present
 	    and not empty, blacklist is not used.</entry>
 </row>
@@ -176,10 +176,10 @@
     # These sites are OK
     # uncommenting the following line will allow load of external
     # movies *only* from the specified hosts.
-    #set whitelist www.doonesbury.com:www.cnn.com:www.9news.com
+    #set whitelist www.doonesbury.com www.cnn.com www.9news.com
 
     # Don't access content from these sites
-    set blacklist www.doubleclick.com:mochibot.com
+    set blacklist www.doubleclick.com mochibot.com
 
     # The delay between timer interrupts
     set delay 50

Index: libbase/rc.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/libbase/rc.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- libbase/rc.cpp	23 Aug 2007 09:26:50 -0000	1.32
+++ libbase/rc.cpp	23 Aug 2007 09:37:22 -0000	1.33
@@ -117,19 +117,21 @@
 }
 
 bool
-RcInitFile::extractSetting(bool *var, const char *pattern, std::string &variable,
-                           std::string &value)
+RcInitFile::extractSetting(bool *var, const char *pattern,
+                           std::string &variable, std::string &value)
 {
 //    GNASH_REPORT_FUNCTION;
     //log_msg ("%s: %s", variable, value);
     
 	StringNoCaseEqual noCaseCompare;
     if ( noCaseCompare(variable, pattern) ) {
-        if ( noCaseCompare(value, "on") || noCaseCompare(value, "yes") || noCaseCompare(value, "true")) {
+        if ( noCaseCompare(value, "on") || noCaseCompare(value, "yes") ||
+             noCaseCompare(value, "true")) {
             //log_msg ("%s: Enabled", variable);
             *var = true;
         }
-        if (noCaseCompare(value, "off") || noCaseCompare(value, "no") || noCaseCompare(value, "false")) {
+        if (noCaseCompare(value, "off") || noCaseCompare(value, "no") ||
+            noCaseCompare(value, "false")) {
             //log_msg ("%s: Disabled", variable);
             *var = false;
         }
@@ -150,45 +152,52 @@
 }
 
 string
-RcInitFile::expandPath (std::string& unixpath)
+RcInitFile::expandPath (std::string _path)
 
 {
 
-//Don't break build on systems without passwd / getpwnam
-string _expanded;
+//Returns what's passed to it on systems without
+//POSIX tilde expansion, but is still called to prepare
+//for other operations on the path string
+
+#ifdef HAVE_PWD_H
+//Don't build tilde expansion on systems without pwd.h
 
               //Only if path starts with "~"
-             if (unixpath.substr(0,1) == "~") {
+             if (_path.substr(0,1) == "~") {
              const char *home = getenv("HOME");
-                     if (unixpath.substr(1,1) == "/") {
+                     if (_path.substr(1,1) == "/") {
                           // Initial "~" followed by "/"
                           if (home) {
                                // if HOME set in env, replace ~ with HOME
-                               _expanded = unixpath.replace(0,1,home);
+                               _path = _path.replace(0,1,home);
                           }
 
-#ifdef HAVE_GETPWNAM
+# ifdef HAVE_GETPWNAM
+//Don't try this on systems without getpwnam
+
                           //HOME not set in env: try using pwd
 
                           else { 
                                struct passwd *password = getpwuid(getuid());
                                const char *pwdhome = password->pw_dir;
-                               if (home) { _expanded = unixpath.replace(0,1,pwdhome); }
+                               if (home) {
+                                   _path = _path.replace(0,1,pwdhome);
+                               }
                                //If all that fails, leave path alone
-                               else _expanded = unixpath;
                           }
-
                      }
 
                      //Initial "~" is not followed by "/"
                      else {
                           const char *userhome = NULL;
-                          string::size_type first_slash = unixpath.find_first_of("/");
+                          string::size_type first_slash =
+                              _path.find_first_of("/");
                           string user;
                           if (first_slash != string::npos) {
                               // everything between initial ~ and / 
-                              user = unixpath.substr(1, first_slash - 1 );
-                          } else user = unixpath.substr(1);
+                              user = _path.substr(1, first_slash - 1 );
+                          } else user = _path.substr(1);
 
                           //find user using pwd    
                           struct passwd *password = getpwnam(user.c_str());
@@ -198,33 +207,14 @@
                           }
                           if (userhome) {
                                string foundhome(userhome);
-                               _expanded = unixpath.replace(0,first_slash,foundhome);
+                               _path = _path.replace(0,first_slash,foundhome);
                           }
-                          else {
-                               //User not found and/or pwd doesn't return homedir:
-                               //Leave path alone.
-                               _expanded = unixpath;
+# endif
                           }
                       }
-                 }
-                 //Path doesn't start with ~, leave it alone.
-
-#else
-//For systems with pwd.h but not getpwnam, nothing to do if HOME not set.
-                          else _expanded = unixpath;
-                      }
-                      else _expanded = unixpath;
-                 }
 #endif
 
-
-                 else {
-                      _expanded = unixpath;
-                 }
-
-
-
-     return _expanded;
+     return _path;
 }
 
 // Parse the config file and set the variables.
@@ -272,18 +262,24 @@
             //      log_msg ("%s %s %s", action, variable, value);
             
             if (action == "set") {
-                extractSetting(&_splash_screen, "splash_screen", variable, value);
-                extractSetting(&_localhost_only, "localhost", variable, value);
-                extractSetting(&_localdomain_only, "localdomain", variable, value);
+                extractSetting(&_splash_screen, "splash_screen", variable,
+                               value);
+                extractSetting(&_localhost_only, "localhost", variable,
+                               value);
+                extractSetting(&_localdomain_only, "localdomain", variable,
+                               value);
                 extractSetting(&_debugger, "debugger", variable, value);
                 extractSetting(&_actiondump, "actionDump", variable, value);
                 extractSetting(&_parserdump, "parserDump", variable, value);
                 extractSetting(&_writelog, "writelog", variable, value);
                 extractSetting(&_sound, "sound", variable, value);
                 extractSetting(&_plugin_sound, "pluginsound", variable, value);
-                extractSetting(&_verboseASCodingErrors, "ASCodingErrorsVerbosity", variable, value);
-                extractSetting(&_verboseMalformedSWF, "MalformedSWFVerbosity", variable, value);
-                extractSetting(&_extensionsEnabled, "EnableExtensions", variable, value);
+                extractSetting(&_verboseASCodingErrors,
+                               "ASCodingErrorsVerbosity", variable, value);
+                extractSetting(&_verboseMalformedSWF, "MalformedSWFVerbosity",
+                               variable, value);
+                extractSetting(&_extensionsEnabled, "EnableExtensions",
+                               variable, value);
                 extractSetting(&_startStopped, "StartStopped", variable, value);
                 
                 extractNumber(&_delay, "delay", variable, value);
@@ -291,39 +287,54 @@
 
                 if (variable == "flashVersionString") {
                     _flashVersionString = value;
+                    continue;
                 }
 
                 if (variable == "debuglog") {
-
-#ifdef HAVE_PWD_H
 	             _log = expandPath (value);
-#else
-//For non-UNIX systems
-                     _log = value;
-#endif
-
+                    continue;
                 }
 
                 if (variable == "documentroot") {
                     _wwwroot = value;
+                    continue;
                 }
                 
                 if (variable == "blacklist") {
                     string::size_type pos;
-                    while ((pos = value.find(':', 0)) != string::npos) {
+                    //This is an ugly way to avoid breaking lists
+                    //Lists will work if they worked before, but
+                    //combining the two separators will not.
+                    //The colon way must be removed before protocols
+                    //(http://, https:// can be included in lists).
+                    char separator;
+                    if (value.find(':') != string::npos) separator = ':';
+                    else separator = ' ';
+                    while (value.size()) {
+                        pos = value.find(separator, 0);
                         _blacklist.push_back(value.substr(0, pos));
-                        value.erase(0, pos+1);
+                        value.erase(0, pos);
+                        if (value.size()) value.erase(0, value.find_first_not_of(separator)); 
                     }
-                    _blacklist.push_back(value);
                     continue;
                 }
+
                 if (variable == "whitelist") {
                     string::size_type pos;
-                    while ((pos = value.find(':', 0)) != string::npos) {
+                    //This is an ugly way to avoid breaking lists
+                    //Lists will work if they worked before, but
+                    //combining the two separators will not.
+                    //The colon way must be removed before protocols
+                    //(http://, https:// can be included in lists).
+                    char separator;
+                    if (value.find(':') != string::npos) separator = ':';
+                    else separator = ' ';
+                    while (value.size()) {
+                        pos = value.find(separator, 0);
                         _whitelist.push_back(value.substr(0, pos));
-                        value.erase(0, pos+1);
+                        value.erase(0, pos);
+                        if (value.size()) value.erase(0, value.find_first_not_of(separator)); 
                     }
-                    _whitelist.push_back(value);
                     continue;
                 }
             }

Index: libbase/rc.h
===================================================================
RCS file: /cvsroot/gnash/gnash/libbase/rc.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- libbase/rc.h	20 Aug 2007 22:59:26 -0000	1.24
+++ libbase/rc.h	23 Aug 2007 09:37:22 -0000	1.25
@@ -96,12 +96,6 @@
     bool useLocalHost() const { return _localhost_only; }
     void useLocalHost(bool value);
 
-    static bool extractSetting(bool *var, const char *pattern, std::string &variable,
-                        std::string &value);
-    
-    static int extractNumber(int *num, const char *pattern, std::string &variable,
-                        std::string &value);
-
     const std::vector<std::string>& getWhiteList() const { return _whitelist; }
     const std::vector<std::string>& getBlackList() const { return _blacklist; }
 
@@ -117,7 +111,7 @@
     /// Construct only by getDefaultInstance()
     RcInitFile();
 
-    /// Never destry (TODO: add a destroyDefaultInstance)
+    /// Never destroy (TODO: add a destroyDefaultInstance)
     ~RcInitFile();
 
     int  _delay;                // the timer delay
@@ -151,11 +145,17 @@
     bool _sound;		// whether sound is enable or not
     bool _plugin_sound;		// whether sound is desired for the plugin
 
-    bool _extensionsEnabled;	// wheter to scan plugin path for extensions
+    bool _extensionsEnabled;	// whether to scan plugin path for extensions
 
     bool _startStopped;		// whether to start the gui in "stop" mode
 
-    static std::string expandPath(std::string& unixpath);
+    static std::string expandPath(std::string _path); //path string operations
+
+    static bool extractSetting(bool *var, const char *pattern,
+                        std::string &variable, std::string &value);
+    
+    static int extractNumber(int *num, const char *pattern,
+                        std::string &variable, std::string &value);
 
 };
 



From MAILER-DAEMON Thu Aug 23 05:40:29 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IO9Ax-0007Dr-Rr
	for mharc-gnash-commit@gnu.org; Thu, 23 Aug 2007 05:40:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IO9As-0007DL-E6
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 05:40:23 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IO9Ap-0007Ca-Tk
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 05:40:20 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IO9Ao-0007CP-Bd
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 05:40:18 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <benjamin_pelican@yahoo.co.uk>)
	id 1IO9Ao-0006A0-1C
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 05:40:18 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <benjamin_pelican@yahoo.co.uk>) id 1IO9An-0003dn-J1
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 09:40:17 +0000
Received: from bwy by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <bwy@savannah.gnu.org>) id 1IO9An-0003dk-Bb
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 09:40:17 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IO9An-0003dk-Bb@cvs.savannah.gnu.org>
From: Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
Date: Thu, 23 Aug 2007 09:40:17 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Aug 2007 09:40:23 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Benjamin Wolsey <bwy>	07/08/23 09:40:17

Modified files:
	.              : ChangeLog 

Log message:
	

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4077&r2=1.4078

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.4077
retrieving revision 1.4078
diff -u -b -r1.4077 -r1.4078
--- ChangeLog	23 Aug 2007 09:26:50 -0000	1.4077
+++ ChangeLog	23 Aug 2007 09:40:16 -0000	1.4078
@@ -1,3 +1,13 @@
+2007-08-23 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
+
+	* libbase/rc.{cpp,h}: expandPath called on non-POSIX systems
+	  for other path operations. Whitelist and blacklist now space
+          not colon separated. NOTE: old lists still work, but should
+          be deprecated. Made private: extractSetting, extractNumber.
+          Minor code cleanups.
+	* docs/C/usermanual/usage/gnashrc.xml: add info about black-
+          and whitelists.
+
 2007-08-23 Sandro Santilli <strk@keybit.net>
 
 	* configure.ac: move BOOST macro detector invocation after



From MAILER-DAEMON Thu Aug 23 05:53:20 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IO9NP-00026h-De
	for mharc-gnash-commit@gnu.org; Thu, 23 Aug 2007 05:53:19 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IO9NH-00024E-RP
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 05:53:12 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IO9NF-00023L-BS
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 05:53:10 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IO9NC-00023A-DT
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 05:53:07 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1IO9NB-0000Gb-TN
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 05:53:06 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <udo.gnu@nova-sys.net>) id 1IO9NA-0005Gs-FD
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 09:53:04 +0000
Received: from udog by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <udog@savannah.gnu.org>) id 1IO9NA-0005Gp-9W
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 09:53:04 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IO9NA-0005Gp-9W@cvs.savannah.gnu.org>
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
Date: Thu, 23 Aug 2007 09:53:04 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash backend/render_handler.h backend/render_h...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Aug 2007 09:53:13 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Udo Giacomozzi <udog>	07/08/23 09:53:04

Modified files:
	backend        : render_handler.h render_handler_agg.cpp 
	                 render_handler_tri.cpp render_handler_tri.h 
	server         : edit_text_character.cpp render.cpp render.h 
	.              : ChangeLog 

Log message:
	add parameter "masked" to draw_poly(), adjust calls to this function and implement (un)masked polygons in AGG renderer (see bug #20655)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler.h?cvsroot=gnash&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.cpp?cvsroot=gnash&r1=1.95&r2=1.96
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_tri.cpp?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_tri.h?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.103&r2=1.104
http://cvs.savannah.gnu.org/viewcvs/gnash/server/render.cpp?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/server/render.h?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4078&r2=1.4079

Patches:
Index: backend/render_handler.h
===================================================================
RCS file: /cvsroot/gnash/gnash/backend/render_handler.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- backend/render_handler.h	18 Jul 2007 10:06:13 -0000	1.45
+++ backend/render_handler.h	23 Aug 2007 09:53:02 -0000	1.46
@@ -18,7 +18,7 @@
 // 
 //
 
-/* $Id: render_handler.h,v 1.45 2007/07/18 10:06:13 udog Exp $ */
+/* $Id: render_handler.h,v 1.46 2007/08/23 09:53:02 udog Exp $ */
 
 #ifndef RENDER_HANDLER_H
 #define RENDER_HANDLER_H
@@ -376,8 +376,11 @@
   /// The polygon need NOT be closed (ie: this function will automatically
   /// add an additional vertex to close it.
   ///
+  /// When masked==false, then any potential mask currently active will be
+  /// ignored, otherwise it is respected.
+  ///
   virtual void  draw_poly(const point* corners, size_t corner_count, 
-    const rgba& fill, const rgba& outline) = 0;
+    const rgba& fill, const rgba& outline, bool masked) = 0;
     
     
   /// Set line and fill styles for mesh & line_strip rendering.

Index: backend/render_handler_agg.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/backend/render_handler_agg.cpp,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- backend/render_handler_agg.cpp	18 Jul 2007 23:17:54 -0000	1.95
+++ backend/render_handler_agg.cpp	23 Aug 2007 09:53:03 -0000	1.96
@@ -17,7 +17,7 @@
 
  
 
-/* $Id: render_handler_agg.cpp,v 1.95 2007/07/18 23:17:54 strk Exp $ */
+/* $Id: render_handler_agg.cpp,v 1.96 2007/08/23 09:53:03 udog Exp $ */
 
 // Original version by Udo Giacomozzi and Hannes Mayr, 
 // INDUNET GmbH (www.indunet.it)
@@ -1830,8 +1830,9 @@
 
   
   /// Draws the given polygon.
-  void  draw_poly(const point* corners, size_t corner_count, const rgba& fill, 
-    const rgba& outline) {
+  template <class scanline_type>
+  void draw_poly_impl(const point* corners, size_t corner_count, const rgba& fill, 
+    const rgba& outline, scanline_type& sl) {
     
     assert(m_pixf != NULL);
 
@@ -1842,28 +1843,17 @@
     matrix mat = stage_matrix;
     mat.concatenate(m_current_matrix);
     
-    // TODO: Use aliased scanline renderer instead of anti-aliased one since
-    // it is undesired anyway.
     typedef agg::rasterizer_scanline_aa<> ras_type;
     renderer_base rbase(*m_pixf);
-    agg::scanline_p8 sl;
     ras_type ras;
     agg::renderer_scanline_aa_solid<
       agg::renderer_base<PixelFormat> > ren_sl(rbase);
 
-    for (unsigned int cno=0; cno<_clipbounds.size(); cno++) {
-    
-      const geometry::Range2d<int>& bounds = _clipbounds[cno];
-         
-      apply_clip_box<ras_type> (ras, bounds); 
-
-          // TODO: what do do if _clipbox.isNull() or _clipbox.isWorld() ?
-    //       currently an assertion will fail when get{Min,Max}{X,Y}
-    //       are called below
-  
+    // -- create path --
       agg::path_storage path;
       point pnt, origin;
       
+    
       // Note: The coordinates are rounded and 0.5 is added to snap them to the 
       // center of the pixel. This avoids blurring caused by anti-aliasing.
       
@@ -1881,6 +1871,17 @@
       // close polygon
       path.line_to(trunc(origin.m_x)+0.5, trunc(origin.m_y)+0.5);
       
+    
+    
+    // -- render --
+      
+    // iterate through clipping bounds
+    for (unsigned int cno=0; cno<_clipbounds.size(); cno++) {
+    
+      const geometry::Range2d<int>& bounds = _clipbounds[cno];         
+      apply_clip_box<ras_type> (ras, bounds);     
+            
+      
       // fill polygon
       if (fill.m_a>0) {
         ras.add_path(path);
@@ -1903,6 +1904,34 @@
       }
     }
     
+  } //draw_poly_impl
+  
+  
+  void draw_poly(const point* corners, size_t corner_count, const rgba& fill, 
+    const rgba& outline, bool masked) {
+    
+    if (masked && !m_alpha_mask.empty()) {
+    
+      // apply mask
+      
+      typedef agg::scanline_u8_am<agg::alpha_mask_gray8> sl_type; 
+      
+      sl_type sl(m_alpha_mask.back()->get_amask());
+         
+      draw_poly_impl<sl_type> (corners, corner_count, fill, outline, sl);       
+    
+    } else {
+    
+      // no mask
+      
+      typedef agg::scanline_p8 sl_type; // packed scanline (faster for solid fills)
+      
+      sl_type sl;
+         
+      draw_poly_impl<sl_type> (corners, corner_count, fill, outline, sl);
+    
+    }
+    
   }
 
 

Index: backend/render_handler_tri.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/backend/render_handler_tri.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- backend/render_handler_tri.cpp	21 Aug 2007 13:21:27 -0000	1.19
+++ backend/render_handler_tri.cpp	23 Aug 2007 09:53:03 -0000	1.20
@@ -18,7 +18,7 @@
 // 
 //
 
-/* $Id: render_handler_tri.cpp,v 1.19 2007/08/21 13:21:27 udog Exp $ */
+/* $Id: render_handler_tri.cpp,v 1.20 2007/08/23 09:53:03 udog Exp $ */
 
 #include "render_handler_tri.h"
 
@@ -297,7 +297,10 @@
 }
 
 void  triangulating_render_handler::draw_poly(const point* corners, 
-  size_t corner_count, const rgba& fill, const rgba& outline) {
+  size_t corner_count, const rgba& fill, const rgba& outline, bool /*masked*/) {
+  
+  // TODO: The current implementation is only correct when masked==true,
+  // ie. it will always be masked.
   
   unsigned int vno=0;
   // Create points array to vertex array 

Index: backend/render_handler_tri.h
===================================================================
RCS file: /cvsroot/gnash/gnash/backend/render_handler_tri.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- backend/render_handler_tri.h	18 Jul 2007 10:03:04 -0000	1.14
+++ backend/render_handler_tri.h	23 Aug 2007 09:53:03 -0000	1.15
@@ -18,7 +18,7 @@
 // 
 //
 
-/* $Id: render_handler_tri.h,v 1.14 2007/07/18 10:03:04 udog Exp $ */
+/* $Id: render_handler_tri.h,v 1.15 2007/08/23 09:53:03 udog Exp $ */
 
 #ifndef GNASH_RENDER_HANDLER_TRI_H
 #define GNASH_RENDER_HANDLER_TRI_H
@@ -127,7 +127,7 @@
   
   /// The given polygon is translated to a mesh strip by this class.
   void  draw_poly(const point* corners, size_t corner_count, const rgba& fill, 
-    const rgba& outline);
+    const rgba& outline, bool masked);
     
   /// The glyph is drawn just like a normal shape character.
   virtual void draw_glyph(shape_character_def *def,

Index: server/edit_text_character.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -b -r1.103 -r1.104
--- server/edit_text_character.cpp	21 Aug 2007 14:42:12 -0000	1.103
+++ server/edit_text_character.cpp	23 Aug 2007 09:53:03 -0000	1.104
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: edit_text_character.cpp,v 1.103 2007/08/21 14:42:12 strk Exp $ */
+/* $Id: edit_text_character.cpp,v 1.104 2007/08/23 09:53:03 udog Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -492,7 +492,7 @@
 	log_debug("rendering a Pol composed by corners %s", ss.str().c_str());
 #endif
 
-		render::draw_poly( &coords[0], 4, backgroundColor, borderColor );
+		render::draw_poly( &coords[0], 4, backgroundColor, borderColor, true);
 		
 	}
 

Index: server/render.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/server/render.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/render.cpp	13 Jul 2007 16:05:09 -0000	1.16
+++ server/render.cpp	23 Aug 2007 09:53:03 -0000	1.17
@@ -169,13 +169,13 @@
 
 
     void  draw_poly(const point* corners, int corner_count, const rgba& fill, 
-      const rgba& outline) 
+      const rgba& outline, bool masked) 
 		{
 #ifdef DEBUG_RENDER_CALLS
 			GNASH_REPORT_FUNCTION;
 #endif
 			if (s_render_handler) s_render_handler->draw_poly(corners, corner_count,
-        fill, outline);
+        fill, outline, masked);
     }
     
     

Index: server/render.h
===================================================================
RCS file: /cvsroot/gnash/gnash/server/render.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/render.h	13 Jul 2007 16:05:09 -0000	1.16
+++ server/render.h	23 Aug 2007 09:53:03 -0000	1.17
@@ -104,7 +104,7 @@
 
 		/// See render_handler::draw_poly (in backend/render_handler.h)
 		void  draw_poly(const point* corners, int corner_count,
-				const rgba& fill, const rgba& outline);
+				const rgba& fill, const rgba& outline, bool masked);
       
 		/// See render_handler::draw_shape_character (in backend/render_handler.h)
 		void draw_shape_character(shape_character_def *def,

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.4078
retrieving revision 1.4079
diff -u -b -r1.4078 -r1.4079
--- ChangeLog	23 Aug 2007 09:40:16 -0000	1.4078
+++ ChangeLog	23 Aug 2007 09:53:03 -0000	1.4079
@@ -1,3 +1,11 @@
+2007-08-23 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* backend/render_handler.h, backend/render_handler_agg.cpp, 
+	  backend/render_handler_tri.{cpp,h}, server/edit_text_character.cpp,
+	  server/render.cpp, server/render.h: add parameter "masked" to 
+    draw_poly(), adjust calls to this function and implement (un)masked
+    polygons in AGG renderer (see bug #20655).
+
 2007-08-23 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
 
 	* libbase/rc.{cpp,h}: expandPath called on non-POSIX systems



From MAILER-DAEMON Thu Aug 23 05:56:03 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IO9Q2-00030G-Ak
	for mharc-gnash-commit@gnu.org; Thu, 23 Aug 2007 05:56:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IO9Q0-0002z1-9s
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 05:56:00 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IO9Py-0002xt-1G
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 05:55:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IO9Px-0002xn-HG
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 05:55:57 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IO9Px-0000mE-4t
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 05:55:57 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IO9Pw-0005KH-6S
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 09:55:56 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IO9Pv-0005KD-SG
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 09:55:55 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IO9Pv-0005KD-SG@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 23 Aug 2007 09:55:55 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/case.as
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Aug 2007 09:56:01 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/23 09:55:55

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: case.as 

Log message:
	        * testsuite/actionscript.all/case.as: reduce alpha of clips used
	          for visual checking, to avoid hiding the visual traces; don't
	          print totals twice.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4079&r2=1.4080
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/case.as?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4079
retrieving revision 1.4080
diff -u -b -r1.4079 -r1.4080
--- ChangeLog	23 Aug 2007 09:53:03 -0000	1.4079
+++ ChangeLog	23 Aug 2007 09:55:55 -0000	1.4080
@@ -1,3 +1,9 @@
+2007-08-23 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/actionscript.all/case.as: reduce alpha of clips used
+	  for visual checking, to avoid hiding the visual traces; don't
+	  print totals twice.
+
 2007-08-23 Udo Giacomozzi <udo.gnu@nova-sys.net>
 
 	* backend/render_handler.h, backend/render_handler_agg.cpp, 

Index: testsuite/actionscript.all/case.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/case.as,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- testsuite/actionscript.all/case.as	10 Aug 2007 08:34:32 -0000	1.6
+++ testsuite/actionscript.all/case.as	23 Aug 2007 09:55:55 -0000	1.7
@@ -22,7 +22,7 @@
  *  Test case sensitivity 
  */
 
-rcsid="$Id: case.as,v 1.6 2007/08/10 08:34:32 zoulunkai Exp $";
+rcsid="$Id: case.as,v 1.7 2007/08/23 09:55:55 strk Exp $";
 
 #include "check.as"
 
@@ -94,6 +94,7 @@
 	lineTo(100,200);
 	lineTo(100,100);
 	endFill();
+	_alpha = 20;
 }
 
 // support visual checks
@@ -106,6 +107,7 @@
 	lineTo(100,200);
 	lineTo(100,100);
 	endFill();
+	_alpha = 20;
 }
 mcRef[1]._x += 100;
 
@@ -129,4 +131,4 @@
 xcheck_equals(CLIP.getDepth(), 7);
 #endif 
 
-_root.totals();
+//_root.totals(); // this is done by dejagnu_so_fini.as



From MAILER-DAEMON Thu Aug 23 06:11:53 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IO9fM-0005Zj-SU
	for mharc-gnash-commit@gnu.org; Thu, 23 Aug 2007 06:11:52 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IO9fK-0005ZR-L3
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 06:11:50 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IO9fJ-0005ZE-UB
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 06:11:50 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IO9fJ-0005ZB-RU
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 06:11:49 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1IO9fJ-00042I-Gq
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 06:11:49 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <udo.gnu@nova-sys.net>) id 1IO9fI-00061q-Oz
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 10:11:48 +0000
Received: from udog by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <udog@savannah.gnu.org>) id 1IO9fI-00061f-GI
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 10:11:48 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IO9fI-00061f-GI@cvs.savannah.gnu.org>
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
Date: Thu, 23 Aug 2007 10:11:48 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash backend/render_handler_agg.cpp ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Aug 2007 10:11:50 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Udo Giacomozzi <udog>	07/08/23 10:11:48

Modified files:
	backend        : render_handler_agg.cpp 
	.              : ChangeLog 

Log message:
	draw_line_strip() now applies masks

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.cpp?cvsroot=gnash&r1=1.96&r2=1.97
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4080&r2=1.4081

Patches:
Index: backend/render_handler_agg.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/backend/render_handler_agg.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -b -r1.96 -r1.97
--- backend/render_handler_agg.cpp	23 Aug 2007 09:53:03 -0000	1.96
+++ backend/render_handler_agg.cpp	23 Aug 2007 10:11:47 -0000	1.97
@@ -17,7 +17,7 @@
 
  
 
-/* $Id: render_handler_agg.cpp,v 1.96 2007/08/23 09:53:03 udog Exp $ */
+/* $Id: render_handler_agg.cpp,v 1.97 2007/08/23 10:11:47 udog Exp $ */
 
 // Original version by Udo Giacomozzi and Hannes Mayr, 
 // INDUNET GmbH (www.indunet.it)
@@ -767,6 +767,7 @@
   }
 
 
+  
   void  draw_line_strip(const void* coords, int vertex_count, const rgba& color)
   // Draw the line strip formed by the sequence of points.
   {
@@ -785,16 +786,10 @@
     typedef agg::rasterizer_scanline_aa<> ras_type;
 
     ras_type ras;
-    agg::scanline_p8 sl;
     agg::renderer_scanline_aa_solid<
       agg::renderer_base<PixelFormat> > ren_sl(rbase);
       
-    for (unsigned int cno=0; cno<_clipbounds.size(); cno++) {
-    
-      const geometry::Range2d<int>& bounds = _clipbounds[cno];
-            
-      apply_clip_box<ras_type> (ras, bounds);
-          
+    // -- create path --
       agg::path_storage path;
       agg::conv_stroke<agg::path_storage> stroke(path);
       stroke.width(1);
@@ -811,14 +806,55 @@
         mat.transform(&pnt, point(vertex[0], vertex[1]));
         path.line_to(pnt.m_x, pnt.m_y);
       }
+    
+    // -- render --
+    
+    if (m_alpha_mask.empty()) {
+    
+      // No mask active
+      
+      agg::scanline_p8 sl;      
+      
+      for (unsigned int cno=0; cno<_clipbounds.size(); cno++) {
+      
+        const geometry::Range2d<int>& bounds = _clipbounds[cno];
+              
+        apply_clip_box<ras_type> (ras, bounds);
+        
       // The vectorial pipeline
       ras.add_path(stroke);
   
       // Set the color and render the scanlines
       ren_sl.color(agg::rgba8_pre(color.m_r, color.m_g, color.m_b, color.m_a));
   
+        agg::render_scanlines(ras, sl, ren_sl);     
+        
+      }
+      
+    } else {
+    
+      // Mask is active!
+
+      typedef agg::scanline_u8_am<agg::alpha_mask_gray8> sl_type;
+      
+      sl_type sl(m_alpha_mask.back()->get_amask());      
+      
+      for (unsigned int cno=0; cno<_clipbounds.size(); cno++) {
+      
+        const geometry::Range2d<int>& bounds = _clipbounds[cno];
+              
+        apply_clip_box<ras_type> (ras, bounds);
+        
+        // The vectorial pipeline
+        ras.add_path(stroke);
+    
+        // Set the color and render the scanlines
+        ren_sl.color(agg::rgba8_pre(color.m_r, color.m_g, color.m_b, color.m_a));
     
       agg::render_scanlines(ras, sl, ren_sl);
+        
+      }
+    
     }
 
   } // draw_line_strip

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.4080
retrieving revision 1.4081
diff -u -b -r1.4080 -r1.4081
--- ChangeLog	23 Aug 2007 09:55:55 -0000	1.4080
+++ ChangeLog	23 Aug 2007 10:11:48 -0000	1.4081
@@ -11,6 +11,7 @@
 	  server/render.cpp, server/render.h: add parameter "masked" to 
 	  draw_poly(), adjust calls to this function and implement (un)masked
 	  polygons in AGG renderer (see bug #20655).
+	* backend/render_handler_agg.cpp: draw_line_strip() now applies masks 
 
 2007-08-23 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
 



From MAILER-DAEMON Thu Aug 23 09:04:14 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IOCMA-0002mC-H1
	for mharc-gnash-commit@gnu.org; Thu, 23 Aug 2007 09:04:14 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IOCM7-0002kb-U0
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 09:04:11 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IOCM6-0002jv-VF
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 09:04:11 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IOCM6-0002jh-Ql
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 09:04:10 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1IOCM6-0000mj-BZ
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 09:04:10 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <udo.gnu@nova-sys.net>) id 1IOCM5-0001Al-N6
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 13:04:09 +0000
Received: from udog by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <udog@savannah.gnu.org>) id 1IOCM5-0001Ai-Hs
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 13:04:09 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IOCM5-0001Ai-Hs@cvs.savannah.gnu.org>
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
Date: Thu, 23 Aug 2007 13:04:09 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/backend render_handler_agg.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Aug 2007 13:04:12 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Udo Giacomozzi <udog>	07/08/23 13:04:09

Modified files:
	backend        : render_handler_agg.cpp 

Log message:
	just updated comments

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.cpp?cvsroot=gnash&r1=1.97&r2=1.98

Patches:
Index: render_handler_agg.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/backend/render_handler_agg.cpp,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -b -r1.97 -r1.98
--- render_handler_agg.cpp	23 Aug 2007 10:11:47 -0000	1.97
+++ render_handler_agg.cpp	23 Aug 2007 13:04:09 -0000	1.98
@@ -17,7 +17,7 @@
 
  
 
-/* $Id: render_handler_agg.cpp,v 1.97 2007/08/23 10:11:47 udog Exp $ */
+/* $Id: render_handler_agg.cpp,v 1.98 2007/08/23 13:04:09 udog Exp $ */
 
 // Original version by Udo Giacomozzi and Hannes Mayr, 
 // INDUNET GmbH (www.indunet.it)
@@ -49,15 +49,17 @@
     linear gradients  COMPLETE
     radial gradients  COMPLETE
     focal gradients   NOT IMPLEMENTED *
+    ext. spread modes NOT IMPLEMENTED *
+    linear RGB mode   NOT IMPLEMENTED *
     bitmaps, tiled    COMPLETE
     bitmaps, clipped  COMPLETE
     bitmaps, smooth   COMPLETE
     bitmaps, hard     COMPLETE    
     color xform       COMPLETE
     
-    * focal gradients (introduced in Flash 7, I think) are not yet supported 
-    by Gnash itself AFAIK, but AGG supports them and it should be easy to add 
-    them.    
+    * focal gradients (introduced in Flash 8) and similar special fill styles
+    are not yet supported by Gnash itself AFAIK, but AGG supports them and it 
+    should be easy to add them.    
     
   fonts               COMPLETE
     



From MAILER-DAEMON Thu Aug 23 10:06:59 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IODKt-0008Rf-4w
	for mharc-gnash-commit@gnu.org; Thu, 23 Aug 2007 10:06:59 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IODKr-0008OS-Sb
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 10:06:57 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IODKq-0008Md-UO
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 10:06:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IODKq-0008MS-GG
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 10:06:56 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1IODKq-00069n-2o
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 10:06:56 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <udo.gnu@nova-sys.net>) id 1IODKp-0005KM-FU
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 14:06:55 +0000
Received: from udog by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <udog@savannah.gnu.org>) id 1IODKp-0005KJ-A5
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 14:06:55 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IODKp-0005KJ-A5@cvs.savannah.gnu.org>
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
Date: Thu, 23 Aug 2007 14:06:55 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash backend/render_handler_agg.cpp ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Aug 2007 14:06:58 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Udo Giacomozzi <udog>	07/08/23 14:06:55

Modified files:
	backend        : render_handler_agg.cpp 
	.              : ChangeLog 

Log message:
	Initial support for glyphs with known bounds

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.cpp?cvsroot=gnash&r1=1.98&r2=1.99
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4081&r2=1.4082

Patches:
Index: backend/render_handler_agg.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/backend/render_handler_agg.cpp,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- backend/render_handler_agg.cpp	23 Aug 2007 13:04:09 -0000	1.98
+++ backend/render_handler_agg.cpp	23 Aug 2007 14:06:54 -0000	1.99
@@ -17,7 +17,7 @@
 
  
 
-/* $Id: render_handler_agg.cpp,v 1.98 2007/08/23 13:04:09 udog Exp $ */
+/* $Id: render_handler_agg.cpp,v 1.99 2007/08/23 14:06:54 udog Exp $ */
 
 // Original version by Udo Giacomozzi and Hannes Mayr, 
 // INDUNET GmbH (www.indunet.it)
@@ -908,13 +908,25 @@
 
 
 
+  // ensures that the bounds of the character definiton are known
+  inline void need_shape_bounds(shape_character_def *def) {
+  
+    // TO BE REMOVED - does not work
+  
+    if (def->get_bound().is_null()) {
+      printf("Calculating bounds for %p\n", def);
+      rect temp;
+      def->compute_bound(&temp);
+      def->set_bound(temp);
+    }
+  
+  }
 
   void draw_glyph(shape_character_def *def,
       const matrix& mat, const rgba& color, float /*pixel_scale*/) {
       
-    // NOTE: def->get_bound() is NULL for glyphs so we can't check the 
-    // clipping area (bounds_in_clipping_area):
-    // create a new path with the matrix applied   
+    //need_shape_bounds(def);    
+      
     std::vector<path> paths;    
     apply_matrix_to_path(def->get_paths(), paths, mat);
     
@@ -929,13 +941,14 @@
     agg_style_handler sh;
     build_agg_styles(sh, m_single_fill_styles, mat, m_neutral_cxform);
     
-    // select all clipping ranges. 
-    // NOTE: Glyphs are loaded like normal shape definitons, but w/o style
-    // definitons, which unfortunately include shape bounds. So "def" has
-    // no bounds (isNull) and thus select_clipbounds() won't work.
-    // TODO: Find a different solution since it's suboptimal to render in
-    // all clipping bounds.
+    // select relevant clipping bounds
+    if (def->get_bound().is_null())   // currently true for all glyphs
     select_all_clipbounds();
+    else
+      select_clipbounds(def, mat);
+    
+    
+    if (_clipbounds_selected.empty()) return; // nothing to draw
       
     // draw the shape
     if (m_drawing_mask)

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.4081
retrieving revision 1.4082
diff -u -b -r1.4081 -r1.4082
--- ChangeLog	23 Aug 2007 10:11:48 -0000	1.4081
+++ ChangeLog	23 Aug 2007 14:06:54 -0000	1.4082
@@ -1,3 +1,8 @@
+2007-08-23 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* backend/render_handler_agg.cpp: Initial support for glyphs
+	  with known bounds
+
 2007-08-23 Sandro Santilli <strk@keybit.net>
 
 	* testsuite/actionscript.all/case.as: reduce alpha of clips used



From MAILER-DAEMON Thu Aug 23 10:10:59 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IODOl-000487-Nz
	for mharc-gnash-commit@gnu.org; Thu, 23 Aug 2007 10:10:59 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IODOk-00047z-Qr
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 10:10:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IODOj-00047b-Ca
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 10:10:58 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IODOj-00047Y-9t
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 10:10:57 -0400
Received: from server2.indunet.it ([217.70.144.109])
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <udo.gnu@nova-sys.net>) id 1IODOi-0006p1-Q3
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 10:10:57 -0400
Received: from UDO-LAPTOP (sadsl-246098.rol.raiffeisen.net [195.254.246.98])
	(authenticated bits=0)
	by server2.indunet.it (8.12.8/8.12.5) with ESMTP id l7NEAoU4021285;
	Thu, 23 Aug 2007 16:10:55 +0200
Date: Thu, 23 Aug 2007 16:10:50 +0200
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
X-Mailer: The Bat! (v3.99.3) Professional
Organization: NOVASYS
X-Priority: 3 (Normal)
Message-ID: <172343978.20070823161050@nova-sys.net>
To: Udo Giacomozzi <udo.gnu@nova-sys.net>
Subject: Re: [Gnash-commit] gnash backend/render_handler_agg.cpp ChangeLog
In-Reply-To: <E1IODKp-0005KJ-A5@cvs.savannah.gnu.org>
References: <E1IODKp-0005KJ-A5@cvs.savannah.gnu.org>
MIME-Version: 1.0
Content-Type: multipart/mixed;
 boundary="----------FC12B11B288D978E"
X-Detected-Kernel: Linux 2.4-2.6
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Udo Giacomozzi <udo.gnu@nova-sys.net>
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Aug 2007 14:10:59 -0000

------------FC12B11B288D978E
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

UG> +  // ensures that the bounds of the character definiton are known
UG> +  inline void need_shape_bounds(shape_character_def *def) {
UG> +  
UG> +    // TO BE REMOVED - does not work
UG> +
UG> +    if (def->>get_bound().is_null()) {
UG> +      printf("Calculating bounds for %p\n", def);
UG> +      rect temp;
UG> +      def->>compute_bound(&temp);
UG> +      def->>set_bound(temp);
UG> +    }
UG> +  
UG> +  }


Sandro, can you commit a patch that calculates the bounds of all
glyphs at parse time? I tried with the function above but with the
attached testcase it keeps on calulating the bounds of one certain
glyph forever. Also, it's not the best way to calculate the bounds in
the renderer.

To test, uncomment the line in render_handler_agg.cpp:928:

need_shape_bounds(def);

The goal is to avoid handling of glyphs that are not visible anyway
(like it's done for other shapes).

Udo
------------FC12B11B288D978E
Content-Type: application/x-shockwave-flash; name="text-performance-test.swf"
Content-transfer-encoding: base64
Content-Disposition: attachment;
 filename="text-performance-test.swf"

Q1dTBmkNAAB4nKtgYI1nYOBfwMBQwcjgzPT//3975mAGBoYOVQYWhpKMzGKG/DzXvJLUIrei
xNxUhuTMouScVIb4ovySxJLM/DyGaUwMHAwyIJJxNitQH4MYWIhJZhoLAwcziAbymP0C/P0Z
7HlagfKMDCyMHGGpRSmJeYlAK7gYeBh0GVwZ8hgEGAR4M20YKhTjogwPfH2zpsBfes05NuXU
5KaKh64WEr1TG0AK7u2o0M8LVdxofTrGQj93Vp/L+00bgOJZRT0V91+3i7BW3Oh9POvmnWKW
00nBXZxuhQdWnG3XU/OKPXJ2yzZpBgWgTSEMEQz/me5yMzAwMVTwtqo38PMHNTAwcfYzgpx/
BwwDJnLpe59omK0kEjd9IqOZi8ZefSWmnI7AqjgXlpsCi77s6eDcpOj6slJAOMWp+9InBbUT
reJLnzj4kqmt+Q4wxOhvpwcz/e0sYaG/nQtY6W/nGTb628nDQX87LTjpb2cKF/3tnMBNfzsv
8NDfzj+89LdTg5/+doYI0N/OKYL0t/OAEP3tfCNMfzslROlvZ4QY/e1sEae/nRsk6G/nHUn6
2ykjPQBtMJkBaIPJDkAbTM6frnYydLKxMQJb+EILRBj2M7gBW/bMDPkLnb7bZecBuyD/0xgY
RRj+MzAImi5k3WxuF3A9neF82v+nRZufGjVw2zzgNtysbbleYxaD30wGad7Js84miFz5/+Vc
yA2G/5wCQLNYgGa0gSxgZmBwAPL3swkCSTUmoITMqoM/F0C7SSApAHVXIvs=
------------FC12B11B288D978E--




From MAILER-DAEMON Thu Aug 23 10:11:07 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IODOs-0004D3-SS
	for mharc-gnash-commit@gnu.org; Thu, 23 Aug 2007 10:11:06 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IODOq-0004AX-LJ
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 10:11:04 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IODOp-00049i-JI
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 10:11:04 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IODOp-00049e-Cj
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 10:11:03 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IODOo-0006ou-RX
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 10:11:03 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IODOh-0005Sm-3o
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 14:10:55 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IODOg-0005Sj-Tx
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 14:10:55 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IODOg-0005Sj-Tx@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 23 Aug 2007 14:10:54 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog libamf/amf.cpp libamf/amf.h tes...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Aug 2007 14:11:04 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/23 14:10:54

Modified files:
	.              : ChangeLog 
	libamf         : amf.cpp amf.h 
	testsuite/libamf.all: Makefile.am test_object.cpp 
	                      test_string.cpp test_variable.cpp 

Log message:
	        * libamf/amf.{cpp,h}: fixed a bunch of memory errors, added
	          some dox, first pass to interface clean ups.
	        * testsuite/libamf.all/Makefile.am: add testsuite/ to the
	          include dir, to allow for using our check_equals functions.
	        * testsuite/libamf.all/: test_object.cpp, test_string.cpp,
	          test_variable.cpp: fixed new[]/delete mismatches.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4082&r2=1.4083
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/amf.cpp?cvsroot=gnash&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/amf.h?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libamf.all/Makefile.am?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libamf.all/test_object.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libamf.all/test_string.cpp?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libamf.all/test_variable.cpp?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4082
retrieving revision 1.4083
diff -u -b -r1.4082 -r1.4083
--- ChangeLog	23 Aug 2007 14:06:54 -0000	1.4082
+++ ChangeLog	23 Aug 2007 14:10:53 -0000	1.4083
@@ -1,3 +1,12 @@
+2007-08-23 Sandro Santilli <strk@keybit.net>
+
+	* libamf/amf.{cpp,h}: fixed a bunch of memory errors, added
+	  some dox, first pass to interface clean ups.
+	* testsuite/libamf.all/Makefile.am: add testsuite/ to the 
+	  include dir, to allow for using our check_equals functions.
+	* testsuite/libamf.all/: test_object.cpp, test_string.cpp,
+	  test_variable.cpp: fixed new[]/delete mismatches.
+
 2007-08-23 Udo Giacomozzi <udo.gnu@nova-sys.net>
 
 	* backend/render_handler_agg.cpp: Initial support for glyphs

Index: libamf/amf.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/amf.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- libamf/amf.cpp	23 Aug 2007 01:57:02 -0000	1.40
+++ libamf/amf.cpp	23 Aug 2007 14:10:54 -0000	1.41
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: amf.cpp,v 1.40 2007/08/23 01:57:02 nihilus Exp $ */
+/* $Id: amf.cpp,v 1.41 2007/08/23 14:10:54 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -293,14 +293,15 @@
 /// normal ASCII. It may be that these need to be converted to wide
 /// characters, but for now we just leave them as standard multibyte
 /// characters.
-void *
+byte*
 AMF::encodeElement(astype_e type, const void *in, int nbytes)
 {
     GNASH_REPORT_FUNCTION;
 
-    char *out = NULL, *x;
     amfnum_t num;
-    int pktsize = -1;
+    int pktsize = 0;
+    byte* out = NULL;
+    byte* x = NULL;
 
     // Packets are of varying length. A few pass in a byte count, but
     // most packets have a hardcoded size.
@@ -360,12 +361,17 @@
           pktsize = 0;          // look for the terminator
           break;
 // FIXME, shouldn't there be a default case here?
+      default:
+          log_error("Unknown AMF packet type %d", type);
+          return 0;
     };
     
+    log_debug("pktsize:%d, nbytes:%d", pktsize, nbytes);
+    
     switch (type) {
-        // Encode the data as a 64 bit, big-endian, numeric value
       case NUMBER:
-          x = out = new char[pktsize];
+          // Encode the data as a 64 bit, big-endian, numeric value
+          x = out = new byte[pktsize];
           memset(x, 0, pktsize);
           *x++ = (char)AMF::NUMBER;
           memcpy(&num, in, AMF_NUMBER_SIZE);
@@ -374,7 +380,7 @@
           break;
       case BOOLEAN:
           // Encode a boolean value. 0 for false, 1 for true
-          out = new char[pktsize];
+          out = new byte[pktsize];
           x = out;    
           *x++ = (char)AMF::BOOLEAN;
           *x = *static_cast<const char *>(in);
@@ -382,11 +388,13 @@
       case STRING:
           // Encode a string value. The data follows a 2 byte length
           // field. (which must be big-endian)
-          x = out = new char[pktsize];
+          x = out = new byte[pktsize];
           memset(x, 0, pktsize);
           *x++ = AMF::STRING;
           num = nbytes;
+          log_debug("Encoded data size is going to be " AMFNUM_F, num);
           swapBytes(&num, 2);
+          log_debug("After swapping, it's " AMFNUM_F, num);
           memcpy(x, &num, 2);
           x+=2;
           memcpy(x, in, nbytes);
@@ -401,7 +409,7 @@
           log_unimpl("Null AMF encoder");
           break;
       case UNDEFINED:
-          x = out = new char[pktsize];
+          x = out = new byte[pktsize];
           memset(x, 0, pktsize);
           *x++ = AMF::UNDEFINED;
           num = nbytes;
@@ -424,7 +432,7 @@
           break;
           // Encode the date as a 64 bit, big-endian, numeric value
       case DATE:
-          x = out = new char[pktsize];
+          x = out = new byte[pktsize];
           memset(x, 0, pktsize);
           *x++ = AMF::DATE;
           num = *static_cast<const amfnum_t*>(in);
@@ -443,7 +451,7 @@
       case XML_OBJECT:
           // Encode an XML object. The data follows a 4 byte length
           // field. (which must be big-endian)
-          x = out = new char[pktsize];
+          x = out = new byte[pktsize];
           memset(x, 0, pktsize);
           *x++ = AMF::STRING;
           num = nbytes;
@@ -712,20 +720,21 @@
 }
 
 char *
-AMF::extractString(const char *in)
+AMF::extractString(const byte *in)
 {
     GNASH_REPORT_FUNCTION;
     char *buf = NULL;
-    char *x = const_cast<char*>(in);
-    short length;
+    const byte *x = in;
     
     if (*x == AMF::STRING) {
         x++;
-        length = *(reinterpret_cast<short *>(x));
+        short length = *(reinterpret_cast<const short *>(x));
+        swapBytes(&length, 2);
+	log_debug("Encoded length of string: %hd", length);
         x += sizeof(short);
         buf = new char[length+1];
         memset(buf, 0, length+1);
-        strncpy(buf, x, length); /* memcpy() does memory access violation on Darwin! */
+        memcpy(buf, x, length); /* x is not long enough */
     } else {
         log_error("Tried to extract AMF string from non String object!");
     }
@@ -739,7 +748,7 @@
     GNASH_REPORT_FUNCTION;    
     char *x = const_cast<char *>(in);
     amfnum_t *num = new amfnum_t;
-    memset(num, 0, AMF_NUMBER_SIZE+1);
+    memset(num, 0, AMF_NUMBER_SIZE);
     
     if (*x == AMF::NUMBER) {
         x++;
@@ -752,29 +761,29 @@
     return num;
 }
 
-void *
+byte *
 AMF::encodeVariable(amf_element_t & /* el */)
 {
     GNASH_REPORT_FUNCTION;
     return NULL;
 }
 
-void *
+byte *
 AMF::encodeVariable(const char *name, bool flag)
 {
     GNASH_REPORT_FUNCTION;
     
     int outsize = strlen(name) + AMF_NUMBER_SIZE + 5;
-    char *out = new char[outsize];
-    char *tmpptr = out;
-    short length;
+    byte *out = new byte[outsize];
+    byte *tmpptr = out;
 
-    length = strlen(name);
-    swapBytes(&length, 2);
-    memcpy(tmpptr, &length, 2);
+    size_t length = strlen(name);
+    short enclength = length;
+    swapBytes(&enclength, 2);
+    memcpy(tmpptr, &enclength, 2);
     tmpptr += 2;
-    strcpy(tmpptr, name);
-    tmpptr += strlen(name);
+    memcpy(tmpptr, name, length);
+    tmpptr += length;
     *tmpptr = AMF::BOOLEAN;
     tmpptr++;
     *tmpptr = flag;
@@ -782,44 +791,44 @@
     return out;    
 }
 
-void *
+byte *
 AMF::encodeVariable(const char *name)
 {
     GNASH_REPORT_FUNCTION;
-    int outsize = strlen(name) + AMF_NUMBER_SIZE + 5;
-    char *out = new char[outsize];
-    char *tmpptr = out;
-    short length;
-
-    length = strlen(name);
-    swapBytes(&length, 2);
-    memcpy(tmpptr, &length, 2);
+    size_t outsize = strlen(name) + AMF_NUMBER_SIZE + 5;
+    byte *out = new byte[outsize];
+    byte *tmpptr = out;
+
+    size_t length = strlen(name);
+    short enclength = length;
+    swapBytes(&enclength, 2);
+    memcpy(tmpptr, &enclength, 2);
     tmpptr += 2;
-    strcpy(tmpptr, name);
-    tmpptr += strlen(name);
+    memcpy(tmpptr, name, length);
+    tmpptr += length;
     *tmpptr = AMF::UNDEFINED;
     tmpptr++;
 
     return out;    
 }
 
-void *
+byte *
 AMF::encodeVariable(const char *name, amfnum_t bignum)
 {
     GNASH_REPORT_FUNCTION;
     int outsize = strlen(name) + AMF_NUMBER_SIZE + 5;
-    char *out = new char[outsize];
-    char *tmpptr = out;
-    short length;
+    byte *out = new byte[outsize];
+    byte *tmpptr = out;
     amfnum_t newnum = bignum;
     char *numptr = (char *)&newnum;
 
-    length = strlen(name);
-    swapBytes(&length, 2);
-    memcpy(tmpptr, &length, 2);
+    size_t length = strlen(name);
+    short enclength = length;
+    swapBytes(&enclength, 2);
+    memcpy(tmpptr, &enclength, 2);
     tmpptr += 2;
-    strcpy(tmpptr, name);
-    tmpptr += strlen(name);
+    memcpy(tmpptr, name, length);
+    tmpptr += length;
     *tmpptr = AMF::NUMBER;
     tmpptr++;
 //    swapBytes(numptr, AMF_NUMBER_SIZE);
@@ -828,41 +837,42 @@
     return out;    
 }
 
-void *
+byte *
 AMF::encodeVariable(const char *name, const char *val)
 {
     GNASH_REPORT_FUNCTION;
 
     int outsize = strlen(name) + strlen(val) + 5;
-    char *out = new char[outsize];
-    char *tmpptr = out;
-    short length;
+    byte *out = new byte[outsize];
+    byte *tmpptr = out;
 
-    length = strlen(name);
-    swapBytes(&length, 2);
-    memcpy(tmpptr, &length, 2);
+    size_t length = strlen(name);
+    short enclength = length;
+    swapBytes(&enclength, 2);
+    memcpy(tmpptr, &enclength, 2);
     tmpptr += 2;
-    strcpy(tmpptr, name);
-    tmpptr += strlen(name);
+    memcpy(tmpptr, name, length);
+    tmpptr += length;
     *tmpptr = AMF::STRING;
     tmpptr++;
     length = strlen(val);
-    swapBytes(&length, 2);
-    memcpy(tmpptr, &length, 2);
+    enclength = length;
+    swapBytes(&enclength, 2);
+    memcpy(tmpptr, &enclength, 2);
     tmpptr += 2;
-    strcpy(tmpptr, val);
+    memcpy(tmpptr, val, length);
 
     return out;
 }
 
-void *
+byte *
 AMF::encodeVariable(std::string &name, std::string &val)
 {
     GNASH_REPORT_FUNCTION;
 
     int outsize = name.size() + val.size() + 5;
-    unsigned char *out = new unsigned char[outsize];
-    unsigned char *tmpptr = out;
+    byte *out = new unsigned char[outsize];
+    byte *tmpptr = out;
     short length;
 
     length = name.size() && 0xffff;
@@ -1188,27 +1198,30 @@
 	  break;
         }
       case STRING:
+      {
 	  length = ntohs((*(const short *)tmpptr) & 0xffff);
           tmpptr += sizeof(short);
           el->data = (const unsigned char*)tmpptr; 
-          log_msg(_("Variable \"%s\" is: %s"), el->name.c_str(), el->data);
+          std::string v((char*)el->data, length);
+          log_msg(_("Variable \"%s\" is: %s"), el->name.c_str(), v.c_str()); // el->data);
           tmpptr += length;
           el->length = length;
           break;
+      }
       case OBJECT:
       case MOVIECLIP:
       case NULL_VALUE:
 	  // Undefined types have a name, but no value
 		//FIXME this shouldn't fall through!
       case UNDEFINED:
+      {
           log_msg(_("Undefined type"));
-	  length = ntohs((*(const short *)tmpptr) & 0xffff);
-          el->data = (const unsigned char*)tmpptr; 
-          log_msg(_("Variable \"%s\" is: %s"), el->name.c_str(), el->data);
-//          tmpptr += length;
-          el->length = length;
+          el->data = 0; // (const unsigned char*)tmpptr; 
+          //log_msg(_("Variable \"%s\" is of undefined type"), el->name.c_str());
+          el->length = 0;
           el->type = AMF::UNDEFINED;
           break;
+      }
       case REFERENCE:
       case ECMA_ARRAY:
 			// FIXME this shouldn't fall thru

Index: libamf/amf.h
===================================================================
RCS file: /sources/gnash/gnash/libamf/amf.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- libamf/amf.h	1 Jul 2007 10:54:05 -0000	1.21
+++ libamf/amf.h	23 Aug 2007 14:10:54 -0000	1.22
@@ -39,6 +39,8 @@
 typedef long long amfnum_t;
 #define AMFNUM_F "%lld"
 #endif
+// TIDO FIXME: this will be longer then the actual amfnum_t 
+//             if __WORDSIZE != 64 !!
 const char AMF_NUMBER_SIZE = 0x08;
 
 // These are the data types defined by AMF
@@ -48,6 +50,8 @@
 typedef int AMF_Long_t;
 typedef double AMF_Double_t;
 
+typedef unsigned char byte;
+
 // FIXME: These are probably bogus, and need to be a UTF-8 type.
 typedef char *AMF_UTF8_t;
 typedef char *AMF_LongUTF8_t;
@@ -74,15 +78,15 @@
 //
 // The first byte of the AMF file/stream is believed to be a version
 // indicator. So far the only valid value for this field that has been
-// found is 0×00. If it is anything other than 0×00 (zero), your
+// found is 0x00. If it is anything other than 0x00 (zero), your
 // system should consider the AMF file/stream to be
 // 'cmalformed'd. This can happen in the IDE if AMF calls are put
 // on the stack but never executed and the user exits the movie from the
 // IDE; the two top bytes will be random and the number of headers will
 // be unreliable.
 
-// The second byte of the AMF file/stream is appears to be 0×00 if the
-// client is the Flash Player and 0×01 if the client is the FlashCom
+// The second byte of the AMF file/stream is appears to be 0x00 if the
+// client is the Flash Player and 0x01 if the client is the FlashCom
 // server. 
 
 // The third and fourth bytes form an integer value that specifies the
@@ -166,39 +170,100 @@
         DELETE_ATTRIBYTE = 0x0a,
         INITIAL_DATA = 0x0b
     } shared_obj_types_e;
-    typedef struct {
+
+    struct amf_element_t {
         astype_e       type;
         short          length;
         std::string     name;
         const unsigned char   *data;
-    } amf_element_t;
+
+        amf_element_t()
+                :
+                type(NUMBER),
+                length(0),
+                name(),
+                data(NULL)
+        {}
+
+    };
 
     AMF();
     AMF(int size);
     ~AMF();
     size_t size() { return _total_size; };
 
-    // encode an element
-    void *encodeElement(astype_e type, const void *in, int nbytes);
-    // encode a string
-    void *encodeString(char *str)  {
+    /// Encode an element
+    //
+    /// @param type
+    ///		Type of element
+    ///
+    /// @param in
+    ///		Input stream
+    ///
+    /// @param nbytes
+    ///		Lenght of data packet (not including header).
+    ///
+    /// @return an amf packet (header,data)
+    ///
+    byte* encodeElement(astype_e type, const void *in, int nbytes);
+
+    /// Encode a string
+    ///
+    /// @return an amf packet (header,data)
+    ///
+    byte* encodeString(const char *str)  {
         return encodeElement (STRING, str, strlen(str));
     };
-    void *encodeString(std::string &str) {
-        return encodeElement (STRING, static_cast<const void *>(str.c_str()), str.size());
-    };
-    // encode a 64 bit number
-    void *encodeNumber(amfnum_t num)  {
+
+    /// Encode a 64 bit number
+    ///
+    /// @return an amf packet (header,data)
+    ///
+    byte* encodeNumber(amfnum_t num)  {
         return encodeElement (NUMBER, &num, AMF_NUMBER_SIZE);
     };
 
-    // encode a variable. These are a name, followed by a string or number
-    void *encodeVariable(const char *name);
-    void *encodeVariable(amf_element_t &el);
-    void *encodeVariable(const char *name, bool flag);
-    void *encodeVariable(const char *name, amfnum_t num);
-    void *encodeVariable(std::string &name, std::string &val);
-    void *encodeVariable(const char *name, const char *val);
+    /// Encode a variable. These are a name, followed by a string or number
+    //
+    /// @return a newly allocated byte array,
+    /// to be deleted by caller using delete [] operator, or NULL
+    ///
+    byte* encodeVariable(const char *name);
+
+    /// Encode a variable. 
+    //
+    /// @return a newly allocated byte array,
+    /// to be deleted by caller using delete [] operator, or NULL
+    ///
+    byte* encodeVariable(amf_element_t &el);
+
+    /// Encode a boolean variable. This is a name followed by a boolean value.
+    //
+    /// @return a newly allocated byte array,
+    /// to be deleted by caller using delete [] operator, or NULL
+    ///
+    byte* encodeVariable(const char *name, bool flag);
+
+    /// Encode a variable. 
+    //
+    /// @return a newly allocated byte array,
+    /// to be deleted by caller using delete [] operator, or NULL
+    ///
+    byte* encodeVariable(const char *name, amfnum_t num);
+
+    /// Encode a variable. 
+    //
+    /// @return a newly allocated byte array,
+    /// to be deleted by caller using delete [] operator, or NULL
+    ///
+    byte* encodeVariable(std::string &name, std::string &val);
+
+    /// Encode a variable. 
+    //
+    /// @return a newly allocated byte array,
+    /// to be deleted by caller using delete [] operator, or NULL
+    ///
+    byte* encodeVariable(const char *name, const char *val);
 
     void *encodeRTMPHeader(int amf_index, amf_headersize_e head_size, int total_size,
                            content_types_e type, amfsource_e routing);
@@ -208,9 +273,15 @@
 
     char *readElement(void *in);
     
-    astype_e extractElementHeader(void *in);
-    int extractElementLength(void *in);
-    char *extractString(const char *in);
+    /// Extract the string from a string-type AMF packet
+    //
+    /// Return a newly allocated char[],
+    /// or NULL if the given AMF packet is not a string type
+    ///
+    /// Caller is responsible for deletion using delete [] operator.
+    ///
+    char *extractString(const byte* in);
+
     amfnum_t *extractNumber(const char *in);
     amf_element_t *extractObject(const char *in);
 
@@ -242,6 +313,11 @@
     }
         
  private:
+
+    astype_e extractElementHeader(void *in);
+
+    int extractElementLength(void *in);
+
     content_types_e     _type;
     std::map<std::string, amf_element_t *> _elements;
     int                 _amf_index;

Index: testsuite/libamf.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libamf.all/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- testsuite/libamf.all/Makefile.am	19 Aug 2007 20:07:42 -0000	1.5
+++ testsuite/libamf.all/Makefile.am	23 Aug 2007 14:10:54 -0000	1.6
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.5 2007/08/19 20:07:42 nihilus Exp $
+# $Id: Makefile.am,v 1.6 2007/08/23 14:10:54 strk Exp $
 
 AUTOMAKE_OPTIONS = dejagnu
 
@@ -37,6 +37,7 @@
         -I$(top_srcdir)/libamf \
         -I$(top_srcdir)/libbase \
         -I$(top_srcdir)/server \
+	-I$(top_srcdir)/testsuite \
         $(LIBXML_CFLAGS) \
 	$(DMALLOC_CFLAGS) \
 	$(CURL_CFLAGS) \

Index: testsuite/libamf.all/test_object.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libamf.all/test_object.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- testsuite/libamf.all/test_object.cpp	1 Jul 2007 10:54:44 -0000	1.7
+++ testsuite/libamf.all/test_object.cpp	23 Aug 2007 14:10:54 -0000	1.8
@@ -31,9 +31,10 @@
 #include <iostream>
 #include <string>
 
-#include "dejagnu.h"
+//#include "dejagnu.h"
 #include "rtmp.h"
 #include "amf.h"
+#include "check.h"
 
 using namespace amf;
 using namespace gnash;
@@ -72,6 +73,9 @@
     char buffer[300];
     int c;
 
+    //gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
+    //dbglogfile.setVerbosity(1);
+
     memset(buffer, 0, 300);
     
     while ((c = getopt (argc, argv, "hdvsm:")) != -1) {
@@ -142,7 +146,7 @@
     // This extracts a "connect" message from the RTMP data stream. We
     // look for everything ourselves to be the most accurate.
     tmpptr = buf  + amf_obj.getHeaderSize();
-    char *str = amf_obj.extractString((char *)tmpptr);
+    char *str = amf_obj.extractString(tmpptr);
     if (strcmp(str, "connect") == 0) {
         runtest.pass("Extracted \"connect\" string");
     } else {
@@ -278,10 +282,20 @@
         runtest.fail("New Message Routing");
     }
 
+    check_equals(rtmp.getHeaderSize(), 12);
+
     if (memcmp(out, buf, 12) == 0) {
         runtest.pass("RTMP Headers match");
     } else {
-        runtest.fail("RTMP Headers match");
+        size_t s = 12;
+        runtest.fail("RTMP Headers mismatch");
+        unsigned char hexint[(s*2)+1];
+        hexify((unsigned char *)hexint, (unsigned char *)buf, s, true);
+	hexint[s*2] = '\0';
+        cerr << "buf is: 0x" << hexint << endl;
+        hexify((unsigned char *)hexint, (unsigned char *)out, s, true);
+	hexint[s*2] = '\0';
+        cerr << "out is: 0x" << hexint << endl;
     }
 
     tmpptr += rtmp.getHeaderSize();
@@ -290,13 +304,25 @@
     unsigned char *var;
 
     var = (unsigned char *)rtmp.encodeString("connect");
-    if (strncmp(rtmp.extractString((char *)var), "connect", strlen("connect")) == 0) {
+    char* c_out = rtmp.extractString(var);
+    if ( ! c_out )
+    {
+        runtest.fail("Encoded \"connect\" string could not be extracted");
+    }
+    else
+    {
+        std::string s_in("connect");
+        std::string s_out(c_out);
+
+        if (s_in == s_out) {
         runtest.pass("Encoded \"connect\" string");
     } else {
         runtest.fail("Encoded \"connect\" string");
+            cerr << "Encoded 'connect' returned as as" << s_out << endl;
+        }
     }
     tmpptr = rtmp.appendPtr(tmpptr, var, strlen("connect") + 3);
-    delete var;
+    delete [] var;
 
     amfnum_t bignum = 0x3ff0000000000000LL;
     numptr = (char *)&bignum;
@@ -308,7 +334,7 @@
     }
 
     tmpptr = rtmp.appendPtr(tmpptr, var, AMF_NUMBER_SIZE + 1);
-    delete var;
+    delete [] var;
 
     // Start the object
     *tmpptr++ = AMF::OBJECT;
@@ -321,7 +347,7 @@
         runtest.fail("Encoded \"app\" variable");
     }
     tmpptr = rtmp.appendPtr(tmpptr, var, el.length + strlen("app") + 5);
-    delete var;
+    delete [] var;
     
     var = (unsigned char *)rtmp.encodeVariable("flashVer", "LNX 9,0,31,0");
     rtmp.extractVariable(&el, var);
@@ -331,7 +357,7 @@
         runtest.fail("Encoded \"flashVer\" variable");
     }
     tmpptr = rtmp.appendPtr(tmpptr, var, el.length + strlen("flashVer") + 5);
-    delete var;
+    delete [] var;
     
     var = (unsigned char *)rtmp.encodeVariable("swfUrl", "http://www.red5.nl/tools/publisher/publisher.swf");
     rtmp.extractVariable(&el, var);
@@ -341,7 +367,7 @@
         runtest.fail("Encoded \"swfUrl\" variable");
     }
     tmpptr = rtmp.appendPtr(tmpptr, var, el.length + strlen("swfUrl") + 5);
-    delete var;
+    delete [] var;
     
     var = (unsigned char *)rtmp.encodeVariable("tcUrl", "rtmp://localhost/oflaDemo");
     rtmp.extractVariable(&el, var);
@@ -351,7 +377,7 @@
         runtest.fail("Encoded \"tcUrl\" variable");
     }
     tmpptr = rtmp.appendPtr(tmpptr, var, el.length + strlen("tcUrl") + 5);
-    delete var;
+    delete [] var;
 
     var = (unsigned char *)rtmp.encodeVariable("fpad", false);
     rtmp.extractVariable(&el, var);
@@ -361,7 +387,7 @@
         runtest.fail("Encoded \"fpad\" Boolean variable");
     }
     tmpptr = rtmp.appendPtr(tmpptr, var, 1 + strlen("fpad") + 3);
-    delete var;
+    delete [] var;
     
     bignum = 0x388340LL;
     numptr = (char *)&bignum;
@@ -378,7 +404,7 @@
         runtest.fail("Encoded \"audioCodecs\" variable");
     }
     tmpptr = rtmp.appendPtr(tmpptr, var, el.name.size() + AMF_NUMBER_SIZE + 3);
-    delete var;
+    delete [] var;
     
     bignum = 0x5f40LL;
     numptr = (char *)&bignum;
@@ -394,7 +420,7 @@
         runtest.fail("Encoded \"videoCodecs\" variable");
     }
     tmpptr = rtmp.appendPtr(tmpptr, var, el.name.size() + AMF_NUMBER_SIZE + 3);
-    delete var;
+    delete [] var;
     
     bignum = 0xf03fLL;
     numptr = (char *)&bignum;
@@ -410,7 +436,7 @@
         runtest.fail("Encoded \"videoFunction\" variable");
     }
     tmpptr = rtmp.appendPtr(tmpptr, var, el.name.size() + AMF_NUMBER_SIZE + 3);
-    delete var;
+    delete [] var;
     
     var = (unsigned char *)rtmp.encodeVariable("pageUrl");
     rtmp.extractVariable(&el, var);
@@ -421,7 +447,7 @@
         runtest.fail("Encoded \"pageUrl\" undefined variable");
     }
     tmpptr = rtmp.appendPtr(tmpptr, var, el.name.size() + 3);
-    delete var;
+    delete [] var;
     
     bignum = 0x0;
     numptr = (char *)&bignum;
@@ -437,7 +463,7 @@
         runtest.fail("Encoded \"objectEncoding\" variable");
     }
     tmpptr = rtmp.appendPtr(tmpptr, var, el.name.size() + AMF_NUMBER_SIZE + 3);
-    delete var;
+    delete [] var;
 
     // Start the object
     *tmpptr++ = AMF::OBJECT_END;
@@ -445,13 +471,16 @@
     if (memcmp(buf, out, amf_obj.getTotalSize()) == 0) {
         runtest.pass("Object Packets match");
     } else {
-        runtest.fail("Object Packets match");
+        runtest.fail("Object Packets mismatch");
     }    
 
-    unsigned char hexint[AMF_PACKET_SIZE];
+    size_t hexsize = std::max(AMF_PACKET_SIZE, amf_obj.getTotalSize())*2;
+    unsigned char hexint[hexsize+1];
     hexify((unsigned char *)hexint, (unsigned char *)buf, amf_obj.getTotalSize() + 10, true);
+    hexint[hexsize] = '\0';
     cerr << "buf is: 0x" << hexint << ", size is: " << amf_obj.getTotalSize() << endl;
     hexify((unsigned char *)hexint, (unsigned char *)out, rtmp.getTotalSize() + 10, true);
+    hexint[hexsize] = '\0';
     cerr << "out is: 0x" << hexint << ", size is: " << rtmp.getTotalSize() << endl;
     
 //    delete out;

Index: testsuite/libamf.all/test_string.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libamf.all/test_string.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- testsuite/libamf.all/test_string.cpp	1 Jul 2007 10:54:44 -0000	1.8
+++ testsuite/libamf.all/test_string.cpp	23 Aug 2007 14:10:54 -0000	1.9
@@ -71,7 +71,7 @@
 
     AMF amf_obj;
     int fd, ret;
-    char buf[AMF_VIDEO_PACKET_SIZE+1];
+    byte buf[AMF_VIDEO_PACKET_SIZE+1];
 
     // First see if we can read strings. This file is produced by
     // using a network packet sniffer, and should be binary correct.
@@ -99,7 +99,7 @@
         runtest.fail("Encoded \"connect\" string");
     }
 
-    delete str;
+    delete [] str;
 }
 
 static void

Index: testsuite/libamf.all/test_variable.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libamf.all/test_variable.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- testsuite/libamf.all/test_variable.cpp	1 Jul 2007 10:54:44 -0000	1.6
+++ testsuite/libamf.all/test_variable.cpp	23 Aug 2007 14:10:54 -0000	1.7
@@ -127,7 +127,7 @@
         runtest.fail("Got String element data");
     }  
 
-    char *out = (char *)amf_obj.encodeVariable("tcUrl", "rtmp://localhost/oflaDemo");
+    char *out = (char*)amf_obj.encodeVariable("tcUrl", "rtmp://localhost/oflaDemo");
     if ((out[1] == 0x5)
         && (out[2] == 't')
         && (out[3] == 'c')
@@ -158,7 +158,7 @@
         runtest.fail("String Packets match");
     }
     
-    delete out;
+    delete [] out;
     
     // Test number fields
     memset(buf, 0, AMF_PACKET_SIZE+1);
@@ -185,7 +185,7 @@
     }
     
     amfnum_t bignum = 0x388340L;
-    out = (char *)amf_obj.encodeVariable("audioCodecs", bignum);
+    out = (char*)amf_obj.encodeVariable("audioCodecs", bignum);
     if ((out[1] == 11)
         && (out[2] == 'a')
         && (out[3] == 'u')
@@ -212,7 +212,7 @@
         runtest.fail("Number Packets match");
     }
 
-    delete out;
+    delete [] out;
 }
 
 static void



From MAILER-DAEMON Thu Aug 23 10:18:24 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IODVw-000612-H6
	for mharc-gnash-commit@gnu.org; Thu, 23 Aug 2007 10:18:24 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IODVu-0005zj-Ay
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 10:18:22 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IODVt-0005zD-2T
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 10:18:21 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IODVs-0005z4-S5
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 10:18:20 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IODVs-0008EU-DN
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 10:18:20 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IODVq-0006yz-U8
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 14:18:19 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IODVq-0006yt-Hm
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 14:18:18 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IODVq-0006yt-Hm@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 23 Aug 2007 14:18:18 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog libamf/amf.cpp libamf/amf.h tes...
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Aug 2007 14:18:23 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/23 14:18:18

Modified files:
	.              : ChangeLog 
	libamf         : amf.cpp amf.h 
	testsuite/libamf.all: Makefile.am test_object.cpp 
	                      test_string.cpp test_variable.cpp 

Log message:
	        * libamf/amf.{cpp,h}: fixed a bunch of memory errors, added
	          some dox, first pass to interface clean ups.
	        * testsuite/libamf.all/Makefile.am: add testsuite/ to the
	          include dir, to allow for using our check_equals functions.
	        * testsuite/libamf.all/: test_object.cpp, test_string.cpp,
	          test_variable.cpp: fixed new[]/delete mismatches.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.59&r2=1.3971.2.60
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/amf.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.39.2.1&r2=1.39.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/amf.h?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.21&r2=1.21.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libamf.all/Makefile.am?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.4.2.1&r2=1.4.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libamf.all/test_object.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.7&r2=1.7.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libamf.all/test_string.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.8&r2=1.8.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libamf.all/test_variable.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.6&r2=1.6.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.59
retrieving revision 1.3971.2.60
diff -u -b -r1.3971.2.59 -r1.3971.2.60
--- ChangeLog	23 Aug 2007 09:29:25 -0000	1.3971.2.59
+++ ChangeLog	23 Aug 2007 14:18:16 -0000	1.3971.2.60
@@ -1,5 +1,14 @@
 2007-08-23 Sandro Santilli <strk@keybit.net>
 
+	* libamf/amf.{cpp,h}: fixed a bunch of memory errors, added
+	  some dox, first pass to interface clean ups.
+	* testsuite/libamf.all/Makefile.am: add testsuite/ to the 
+	  include dir, to allow for using our check_equals functions.
+	* testsuite/libamf.all/: test_object.cpp, test_string.cpp,
+	  test_variable.cpp: fixed new[]/delete mismatches.
+
+2007-08-23 Sandro Santilli <strk@keybit.net>
+
 	* configure.ac: move BOOST macro detector invocation after
 	  PTHREAD one, as the former requires the latter.
 

Index: libamf/amf.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/amf.cpp,v
retrieving revision 1.39.2.1
retrieving revision 1.39.2.2
diff -u -b -r1.39.2.1 -r1.39.2.2
--- libamf/amf.cpp	23 Aug 2007 02:00:13 -0000	1.39.2.1
+++ libamf/amf.cpp	23 Aug 2007 14:18:17 -0000	1.39.2.2
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: amf.cpp,v 1.39.2.1 2007/08/23 02:00:13 nihilus Exp $ */
+/* $Id: amf.cpp,v 1.39.2.2 2007/08/23 14:18:17 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -293,14 +293,15 @@
 /// normal ASCII. It may be that these need to be converted to wide
 /// characters, but for now we just leave them as standard multibyte
 /// characters.
-void *
+byte*
 AMF::encodeElement(astype_e type, const void *in, int nbytes)
 {
     GNASH_REPORT_FUNCTION;
 
-    char *out = NULL, *x;
     amfnum_t num;
-    int pktsize = -1;
+    int pktsize = 0;
+    byte* out = NULL;
+    byte* x = NULL;
 
     // Packets are of varying length. A few pass in a byte count, but
     // most packets have a hardcoded size.
@@ -360,12 +361,17 @@
           pktsize = 0;          // look for the terminator
           break;
 // FIXME, shouldn't there be a default case here?
+      default:
+          log_error("Unknown AMF packet type %d", type);
+          return 0;
     };
     
+    log_debug("pktsize:%d, nbytes:%d", pktsize, nbytes);
+    
     switch (type) {
-        // Encode the data as a 64 bit, big-endian, numeric value
       case NUMBER:
-          x = out = new char[pktsize];
+          // Encode the data as a 64 bit, big-endian, numeric value
+          x = out = new byte[pktsize];
           memset(x, 0, pktsize);
           *x++ = (char)AMF::NUMBER;
           memcpy(&num, in, AMF_NUMBER_SIZE);
@@ -374,7 +380,7 @@
           break;
       case BOOLEAN:
           // Encode a boolean value. 0 for false, 1 for true
-          out = new char[pktsize];
+          out = new byte[pktsize];
           x = out;    
           *x++ = (char)AMF::BOOLEAN;
           *x = *static_cast<const char *>(in);
@@ -382,11 +388,13 @@
       case STRING:
           // Encode a string value. The data follows a 2 byte length
           // field. (which must be big-endian)
-          x = out = new char[pktsize];
+          x = out = new byte[pktsize];
           memset(x, 0, pktsize);
           *x++ = AMF::STRING;
           num = nbytes;
+          log_debug("Encoded data size is going to be " AMFNUM_F, num);
           swapBytes(&num, 2);
+          log_debug("After swapping, it's " AMFNUM_F, num);
           memcpy(x, &num, 2);
           x+=2;
           memcpy(x, in, nbytes);
@@ -401,7 +409,7 @@
           log_unimpl("Null AMF encoder");
           break;
       case UNDEFINED:
-          x = out = new char[pktsize];
+          x = out = new byte[pktsize];
           memset(x, 0, pktsize);
           *x++ = AMF::UNDEFINED;
           num = nbytes;
@@ -424,7 +432,7 @@
           break;
           // Encode the date as a 64 bit, big-endian, numeric value
       case DATE:
-          x = out = new char[pktsize];
+          x = out = new byte[pktsize];
           memset(x, 0, pktsize);
           *x++ = AMF::DATE;
           num = *static_cast<const amfnum_t*>(in);
@@ -443,7 +451,7 @@
       case XML_OBJECT:
           // Encode an XML object. The data follows a 4 byte length
           // field. (which must be big-endian)
-          x = out = new char[pktsize];
+          x = out = new byte[pktsize];
           memset(x, 0, pktsize);
           *x++ = AMF::STRING;
           num = nbytes;
@@ -712,20 +720,20 @@
 }
 
 char *
-AMF::extractString(const char *in)
+AMF::extractString(const byte *in)
 {
     GNASH_REPORT_FUNCTION;
     char *buf = NULL;
-    char *x = const_cast<char*>(in);
-    short length;
+    const byte *x = in;
     
     if (*x == AMF::STRING) {
         x++;
-        length = *(reinterpret_cast<short *>(x));
+        short length = *(reinterpret_cast<const short *>(x));
+        swapBytes(&length, 2);
         x += sizeof(short);
         buf = new char[length+1];
         memset(buf, 0, length+1);
-		strncpy(buf, x, length); /* memcpy() does memory access violation on Darwin! */
+        memcpy(buf, x, length); 
     } else {
         log_error("Tried to extract AMF string from non String object!");
     }
@@ -739,7 +747,7 @@
     GNASH_REPORT_FUNCTION;    
     char *x = const_cast<char *>(in);
     amfnum_t *num = new amfnum_t;
-    memset(num, 0, AMF_NUMBER_SIZE+1);
+    memset(num, 0, AMF_NUMBER_SIZE);
     
     if (*x == AMF::NUMBER) {
         x++;
@@ -752,29 +760,29 @@
     return num;
 }
 
-void *
+byte *
 AMF::encodeVariable(amf_element_t & /* el */)
 {
     GNASH_REPORT_FUNCTION;
     return NULL;
 }
 
-void *
+byte *
 AMF::encodeVariable(const char *name, bool flag)
 {
     GNASH_REPORT_FUNCTION;
     
     int outsize = strlen(name) + AMF_NUMBER_SIZE + 5;
-    char *out = new char[outsize];
-    char *tmpptr = out;
-    short length;
+    byte *out = new byte[outsize];
+    byte *tmpptr = out;
 
-    length = strlen(name);
-    swapBytes(&length, 2);
-    memcpy(tmpptr, &length, 2);
+    size_t length = strlen(name);
+    short enclength = length;
+    swapBytes(&enclength, 2);
+    memcpy(tmpptr, &enclength, 2);
     tmpptr += 2;
-    strcpy(tmpptr, name);
-    tmpptr += strlen(name);
+    memcpy(tmpptr, name, length);
+    tmpptr += length;
     *tmpptr = AMF::BOOLEAN;
     tmpptr++;
     *tmpptr = flag;
@@ -782,44 +790,44 @@
     return out;    
 }
 
-void *
+byte *
 AMF::encodeVariable(const char *name)
 {
     GNASH_REPORT_FUNCTION;
-    int outsize = strlen(name) + AMF_NUMBER_SIZE + 5;
-    char *out = new char[outsize];
-    char *tmpptr = out;
-    short length;
-
-    length = strlen(name);
-    swapBytes(&length, 2);
-    memcpy(tmpptr, &length, 2);
+    size_t outsize = strlen(name) + AMF_NUMBER_SIZE + 5;
+    byte *out = new byte[outsize];
+    byte *tmpptr = out;
+
+    size_t length = strlen(name);
+    short enclength = length;
+    swapBytes(&enclength, 2);
+    memcpy(tmpptr, &enclength, 2);
     tmpptr += 2;
-    strcpy(tmpptr, name);
-    tmpptr += strlen(name);
+    memcpy(tmpptr, name, length);
+    tmpptr += length;
     *tmpptr = AMF::UNDEFINED;
     tmpptr++;
 
     return out;    
 }
 
-void *
+byte *
 AMF::encodeVariable(const char *name, amfnum_t bignum)
 {
     GNASH_REPORT_FUNCTION;
     int outsize = strlen(name) + AMF_NUMBER_SIZE + 5;
-    char *out = new char[outsize];
-    char *tmpptr = out;
-    short length;
+    byte *out = new byte[outsize];
+    byte *tmpptr = out;
     amfnum_t newnum = bignum;
     char *numptr = (char *)&newnum;
 
-    length = strlen(name);
-    swapBytes(&length, 2);
-    memcpy(tmpptr, &length, 2);
+    size_t length = strlen(name);
+    short enclength = length;
+    swapBytes(&enclength, 2);
+    memcpy(tmpptr, &enclength, 2);
     tmpptr += 2;
-    strcpy(tmpptr, name);
-    tmpptr += strlen(name);
+    memcpy(tmpptr, name, length);
+    tmpptr += length;
     *tmpptr = AMF::NUMBER;
     tmpptr++;
 //    swapBytes(numptr, AMF_NUMBER_SIZE);
@@ -828,41 +836,42 @@
     return out;    
 }
 
-void *
+byte *
 AMF::encodeVariable(const char *name, const char *val)
 {
     GNASH_REPORT_FUNCTION;
 
     int outsize = strlen(name) + strlen(val) + 5;
-    char *out = new char[outsize];
-    char *tmpptr = out;
-    short length;
+    byte *out = new byte[outsize];
+    byte *tmpptr = out;
 
-    length = strlen(name);
-    swapBytes(&length, 2);
-    memcpy(tmpptr, &length, 2);
+    size_t length = strlen(name);
+    short enclength = length;
+    swapBytes(&enclength, 2);
+    memcpy(tmpptr, &enclength, 2);
     tmpptr += 2;
-    strcpy(tmpptr, name);
-    tmpptr += strlen(name);
+    memcpy(tmpptr, name, length);
+    tmpptr += length;
     *tmpptr = AMF::STRING;
     tmpptr++;
     length = strlen(val);
-    swapBytes(&length, 2);
-    memcpy(tmpptr, &length, 2);
+    enclength = length;
+    swapBytes(&enclength, 2);
+    memcpy(tmpptr, &enclength, 2);
     tmpptr += 2;
-    strcpy(tmpptr, val);
+    memcpy(tmpptr, val, length);
 
     return out;
 }
 
-void *
+byte *
 AMF::encodeVariable(std::string &name, std::string &val)
 {
     GNASH_REPORT_FUNCTION;
 
     int outsize = name.size() + val.size() + 5;
-    unsigned char *out = new unsigned char[outsize];
-    unsigned char *tmpptr = out;
+    byte *out = new unsigned char[outsize];
+    byte *tmpptr = out;
     short length;
 
     length = name.size() && 0xffff;
@@ -1188,27 +1197,30 @@
 	  break;
         }
       case STRING:
+      {
 	  length = ntohs((*(const short *)tmpptr) & 0xffff);
           tmpptr += sizeof(short);
           el->data = (const unsigned char*)tmpptr; 
-          log_msg(_("Variable \"%s\" is: %s"), el->name.c_str(), el->data);
+          std::string v((char*)el->data, length);
+          log_msg(_("Variable \"%s\" is: %s"), el->name.c_str(), v.c_str()); // el->data);
           tmpptr += length;
           el->length = length;
           break;
+      }
       case OBJECT:
       case MOVIECLIP:
       case NULL_VALUE:
 	  // Undefined types have a name, but no value
 		//FIXME this shouldn't fall through!
       case UNDEFINED:
+      {
           log_msg(_("Undefined type"));
-	  length = ntohs((*(const short *)tmpptr) & 0xffff);
-          el->data = (const unsigned char*)tmpptr; 
-          log_msg(_("Variable \"%s\" is: %s"), el->name.c_str(), el->data);
-//          tmpptr += length;
-          el->length = length;
+          el->data = 0; // (const unsigned char*)tmpptr; 
+          //log_msg(_("Variable \"%s\" is of undefined type"), el->name.c_str());
+          el->length = 0;
           el->type = AMF::UNDEFINED;
           break;
+      }
       case REFERENCE:
       case ECMA_ARRAY:
 			// FIXME this shouldn't fall thru

Index: libamf/amf.h
===================================================================
RCS file: /sources/gnash/gnash/libamf/amf.h,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -u -b -r1.21 -r1.21.2.1
--- libamf/amf.h	1 Jul 2007 10:54:05 -0000	1.21
+++ libamf/amf.h	23 Aug 2007 14:18:17 -0000	1.21.2.1
@@ -39,6 +39,8 @@
 typedef long long amfnum_t;
 #define AMFNUM_F "%lld"
 #endif
+// TIDO FIXME: this will be longer then the actual amfnum_t 
+//             if __WORDSIZE != 64 !!
 const char AMF_NUMBER_SIZE = 0x08;
 
 // These are the data types defined by AMF
@@ -48,6 +50,8 @@
 typedef int AMF_Long_t;
 typedef double AMF_Double_t;
 
+typedef unsigned char byte;
+
 // FIXME: These are probably bogus, and need to be a UTF-8 type.
 typedef char *AMF_UTF8_t;
 typedef char *AMF_LongUTF8_t;
@@ -74,15 +78,15 @@
 //
 // The first byte of the AMF file/stream is believed to be a version
 // indicator. So far the only valid value for this field that has been
-// found is 0×00. If it is anything other than 0×00 (zero), your
+// found is 0x00. If it is anything other than 0x00 (zero), your
 // system should consider the AMF file/stream to be
 // 'cmalformed'd. This can happen in the IDE if AMF calls are put
 // on the stack but never executed and the user exits the movie from the
 // IDE; the two top bytes will be random and the number of headers will
 // be unreliable.
 
-// The second byte of the AMF file/stream is appears to be 0×00 if the
-// client is the Flash Player and 0×01 if the client is the FlashCom
+// The second byte of the AMF file/stream is appears to be 0x00 if the
+// client is the Flash Player and 0x01 if the client is the FlashCom
 // server. 
 
 // The third and fourth bytes form an integer value that specifies the
@@ -166,39 +170,100 @@
         DELETE_ATTRIBYTE = 0x0a,
         INITIAL_DATA = 0x0b
     } shared_obj_types_e;
-    typedef struct {
+
+    struct amf_element_t {
         astype_e       type;
         short          length;
         std::string     name;
         const unsigned char   *data;
-    } amf_element_t;
+
+        amf_element_t()
+                :
+                type(NUMBER),
+                length(0),
+                name(),
+                data(NULL)
+        {}
+
+    };
 
     AMF();
     AMF(int size);
     ~AMF();
     size_t size() { return _total_size; };
 
-    // encode an element
-    void *encodeElement(astype_e type, const void *in, int nbytes);
-    // encode a string
-    void *encodeString(char *str)  {
+    /// Encode an element
+    //
+    /// @param type
+    ///		Type of element
+    ///
+    /// @param in
+    ///		Input stream
+    ///
+    /// @param nbytes
+    ///		Lenght of data packet (not including header).
+    ///
+    /// @return an amf packet (header,data)
+    ///
+    byte* encodeElement(astype_e type, const void *in, int nbytes);
+
+    /// Encode a string
+    ///
+    /// @return an amf packet (header,data)
+    ///
+    byte* encodeString(const char *str)  {
         return encodeElement (STRING, str, strlen(str));
     };
-    void *encodeString(std::string &str) {
-        return encodeElement (STRING, static_cast<const void *>(str.c_str()), str.size());
-    };
-    // encode a 64 bit number
-    void *encodeNumber(amfnum_t num)  {
+
+    /// Encode a 64 bit number
+    ///
+    /// @return an amf packet (header,data)
+    ///
+    byte* encodeNumber(amfnum_t num)  {
         return encodeElement (NUMBER, &num, AMF_NUMBER_SIZE);
     };
 
-    // encode a variable. These are a name, followed by a string or number
-    void *encodeVariable(const char *name);
-    void *encodeVariable(amf_element_t &el);
-    void *encodeVariable(const char *name, bool flag);
-    void *encodeVariable(const char *name, amfnum_t num);
-    void *encodeVariable(std::string &name, std::string &val);
-    void *encodeVariable(const char *name, const char *val);
+    /// Encode a variable. These are a name, followed by a string or number
+    //
+    /// @return a newly allocated byte array,
+    /// to be deleted by caller using delete [] operator, or NULL
+    ///
+    byte* encodeVariable(const char *name);
+
+    /// Encode a variable. 
+    //
+    /// @return a newly allocated byte array,
+    /// to be deleted by caller using delete [] operator, or NULL
+    ///
+    byte* encodeVariable(amf_element_t &el);
+
+    /// Encode a boolean variable. This is a name followed by a boolean value.
+    //
+    /// @return a newly allocated byte array,
+    /// to be deleted by caller using delete [] operator, or NULL
+    ///
+    byte* encodeVariable(const char *name, bool flag);
+
+    /// Encode a variable. 
+    //
+    /// @return a newly allocated byte array,
+    /// to be deleted by caller using delete [] operator, or NULL
+    ///
+    byte* encodeVariable(const char *name, amfnum_t num);
+
+    /// Encode a variable. 
+    //
+    /// @return a newly allocated byte array,
+    /// to be deleted by caller using delete [] operator, or NULL
+    ///
+    byte* encodeVariable(std::string &name, std::string &val);
+
+    /// Encode a variable. 
+    //
+    /// @return a newly allocated byte array,
+    /// to be deleted by caller using delete [] operator, or NULL
+    ///
+    byte* encodeVariable(const char *name, const char *val);
 
     void *encodeRTMPHeader(int amf_index, amf_headersize_e head_size, int total_size,
                            content_types_e type, amfsource_e routing);
@@ -208,9 +273,15 @@
 
     char *readElement(void *in);
     
-    astype_e extractElementHeader(void *in);
-    int extractElementLength(void *in);
-    char *extractString(const char *in);
+    /// Extract the string from a string-type AMF packet
+    //
+    /// Return a newly allocated char[],
+    /// or NULL if the given AMF packet is not a string type
+    ///
+    /// Caller is responsible for deletion using delete [] operator.
+    ///
+    char *extractString(const byte* in);
+
     amfnum_t *extractNumber(const char *in);
     amf_element_t *extractObject(const char *in);
 
@@ -242,6 +313,11 @@
     }
         
  private:
+
+    astype_e extractElementHeader(void *in);
+
+    int extractElementLength(void *in);
+
     content_types_e     _type;
     std::map<std::string, amf_element_t *> _elements;
     int                 _amf_index;

Index: testsuite/libamf.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libamf.all/Makefile.am,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -b -r1.4.2.1 -r1.4.2.2
--- testsuite/libamf.all/Makefile.am	19 Aug 2007 20:31:24 -0000	1.4.2.1
+++ testsuite/libamf.all/Makefile.am	23 Aug 2007 14:18:17 -0000	1.4.2.2
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.4.2.1 2007/08/19 20:31:24 nihilus Exp $
+# $Id: Makefile.am,v 1.4.2.2 2007/08/23 14:18:17 strk Exp $
 
 AUTOMAKE_OPTIONS = dejagnu
 
@@ -37,6 +37,7 @@
         -I$(top_srcdir)/libamf \
         -I$(top_srcdir)/libbase \
         -I$(top_srcdir)/server \
+	-I$(top_srcdir)/testsuite \
         $(LIBXML_CFLAGS) \
 	$(DMALLOC_CFLAGS) \
 	$(CURL_CFLAGS) \

Index: testsuite/libamf.all/test_object.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libamf.all/test_object.cpp,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -b -r1.7 -r1.7.2.1
--- testsuite/libamf.all/test_object.cpp	1 Jul 2007 10:54:44 -0000	1.7
+++ testsuite/libamf.all/test_object.cpp	23 Aug 2007 14:18:17 -0000	1.7.2.1
@@ -31,9 +31,10 @@
 #include <iostream>
 #include <string>
 
-#include "dejagnu.h"
+//#include "dejagnu.h"
 #include "rtmp.h"
 #include "amf.h"
+#include "check.h"
 
 using namespace amf;
 using namespace gnash;
@@ -72,6 +73,9 @@
     char buffer[300];
     int c;
 
+    //gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
+    //dbglogfile.setVerbosity(1);
+
     memset(buffer, 0, 300);
     
     while ((c = getopt (argc, argv, "hdvsm:")) != -1) {
@@ -142,7 +146,7 @@
     // This extracts a "connect" message from the RTMP data stream. We
     // look for everything ourselves to be the most accurate.
     tmpptr = buf  + amf_obj.getHeaderSize();
-    char *str = amf_obj.extractString((char *)tmpptr);
+    char *str = amf_obj.extractString(tmpptr);
     if (strcmp(str, "connect") == 0) {
         runtest.pass("Extracted \"connect\" string");
     } else {
@@ -278,10 +282,20 @@
         runtest.fail("New Message Routing");
     }
 
+    check_equals(rtmp.getHeaderSize(), 12);
+
     if (memcmp(out, buf, 12) == 0) {
         runtest.pass("RTMP Headers match");
     } else {
-        runtest.fail("RTMP Headers match");
+        size_t s = 12;
+        runtest.fail("RTMP Headers mismatch");
+        unsigned char hexint[(s*2)+1];
+        hexify((unsigned char *)hexint, (unsigned char *)buf, s, true);
+	hexint[s*2] = '\0';
+        cerr << "buf is: 0x" << hexint << endl;
+        hexify((unsigned char *)hexint, (unsigned char *)out, s, true);
+	hexint[s*2] = '\0';
+        cerr << "out is: 0x" << hexint << endl;
     }
 
     tmpptr += rtmp.getHeaderSize();
@@ -290,13 +304,25 @@
     unsigned char *var;
 
     var = (unsigned char *)rtmp.encodeString("connect");
-    if (strncmp(rtmp.extractString((char *)var), "connect", strlen("connect")) == 0) {
+    char* c_out = rtmp.extractString(var);
+    if ( ! c_out )
+    {
+        runtest.fail("Encoded \"connect\" string could not be extracted");
+    }
+    else
+    {
+        std::string s_in("connect");
+        std::string s_out(c_out);
+
+        if (s_in == s_out) {
         runtest.pass("Encoded \"connect\" string");
     } else {
         runtest.fail("Encoded \"connect\" string");
+            cerr << "Encoded 'connect' returned as as" << s_out << endl;
+        }
     }
     tmpptr = rtmp.appendPtr(tmpptr, var, strlen("connect") + 3);
-    delete var;
+    delete [] var;
 
     amfnum_t bignum = 0x3ff0000000000000LL;
     numptr = (char *)&bignum;
@@ -308,7 +334,7 @@
     }
 
     tmpptr = rtmp.appendPtr(tmpptr, var, AMF_NUMBER_SIZE + 1);
-    delete var;
+    delete [] var;
 
     // Start the object
     *tmpptr++ = AMF::OBJECT;
@@ -321,7 +347,7 @@
         runtest.fail("Encoded \"app\" variable");
     }
     tmpptr = rtmp.appendPtr(tmpptr, var, el.length + strlen("app") + 5);
-    delete var;
+    delete [] var;
     
     var = (unsigned char *)rtmp.encodeVariable("flashVer", "LNX 9,0,31,0");
     rtmp.extractVariable(&el, var);
@@ -331,7 +357,7 @@
         runtest.fail("Encoded \"flashVer\" variable");
     }
     tmpptr = rtmp.appendPtr(tmpptr, var, el.length + strlen("flashVer") + 5);
-    delete var;
+    delete [] var;
     
     var = (unsigned char *)rtmp.encodeVariable("swfUrl", "http://www.red5.nl/tools/publisher/publisher.swf");
     rtmp.extractVariable(&el, var);
@@ -341,7 +367,7 @@
         runtest.fail("Encoded \"swfUrl\" variable");
     }
     tmpptr = rtmp.appendPtr(tmpptr, var, el.length + strlen("swfUrl") + 5);
-    delete var;
+    delete [] var;
     
     var = (unsigned char *)rtmp.encodeVariable("tcUrl", "rtmp://localhost/oflaDemo");
     rtmp.extractVariable(&el, var);
@@ -351,7 +377,7 @@
         runtest.fail("Encoded \"tcUrl\" variable");
     }
     tmpptr = rtmp.appendPtr(tmpptr, var, el.length + strlen("tcUrl") + 5);
-    delete var;
+    delete [] var;
 
     var = (unsigned char *)rtmp.encodeVariable("fpad", false);
     rtmp.extractVariable(&el, var);
@@ -361,7 +387,7 @@
         runtest.fail("Encoded \"fpad\" Boolean variable");
     }
     tmpptr = rtmp.appendPtr(tmpptr, var, 1 + strlen("fpad") + 3);
-    delete var;
+    delete [] var;
     
     bignum = 0x388340LL;
     numptr = (char *)&bignum;
@@ -378,7 +404,7 @@
         runtest.fail("Encoded \"audioCodecs\" variable");
     }
     tmpptr = rtmp.appendPtr(tmpptr, var, el.name.size() + AMF_NUMBER_SIZE + 3);
-    delete var;
+    delete [] var;
     
     bignum = 0x5f40LL;
     numptr = (char *)&bignum;
@@ -394,7 +420,7 @@
         runtest.fail("Encoded \"videoCodecs\" variable");
     }
     tmpptr = rtmp.appendPtr(tmpptr, var, el.name.size() + AMF_NUMBER_SIZE + 3);
-    delete var;
+    delete [] var;
     
     bignum = 0xf03fLL;
     numptr = (char *)&bignum;
@@ -410,7 +436,7 @@
         runtest.fail("Encoded \"videoFunction\" variable");
     }
     tmpptr = rtmp.appendPtr(tmpptr, var, el.name.size() + AMF_NUMBER_SIZE + 3);
-    delete var;
+    delete [] var;
     
     var = (unsigned char *)rtmp.encodeVariable("pageUrl");
     rtmp.extractVariable(&el, var);
@@ -421,7 +447,7 @@
         runtest.fail("Encoded \"pageUrl\" undefined variable");
     }
     tmpptr = rtmp.appendPtr(tmpptr, var, el.name.size() + 3);
-    delete var;
+    delete [] var;
     
     bignum = 0x0;
     numptr = (char *)&bignum;
@@ -437,7 +463,7 @@
         runtest.fail("Encoded \"objectEncoding\" variable");
     }
     tmpptr = rtmp.appendPtr(tmpptr, var, el.name.size() + AMF_NUMBER_SIZE + 3);
-    delete var;
+    delete [] var;
 
     // Start the object
     *tmpptr++ = AMF::OBJECT_END;
@@ -445,13 +471,16 @@
     if (memcmp(buf, out, amf_obj.getTotalSize()) == 0) {
         runtest.pass("Object Packets match");
     } else {
-        runtest.fail("Object Packets match");
+        runtest.fail("Object Packets mismatch");
     }    
 
-    unsigned char hexint[AMF_PACKET_SIZE];
+    size_t hexsize = std::max(AMF_PACKET_SIZE, amf_obj.getTotalSize())*2;
+    unsigned char hexint[hexsize+1];
     hexify((unsigned char *)hexint, (unsigned char *)buf, amf_obj.getTotalSize() + 10, true);
+    hexint[hexsize] = '\0';
     cerr << "buf is: 0x" << hexint << ", size is: " << amf_obj.getTotalSize() << endl;
     hexify((unsigned char *)hexint, (unsigned char *)out, rtmp.getTotalSize() + 10, true);
+    hexint[hexsize] = '\0';
     cerr << "out is: 0x" << hexint << ", size is: " << rtmp.getTotalSize() << endl;
     
 //    delete out;

Index: testsuite/libamf.all/test_string.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libamf.all/test_string.cpp,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -b -r1.8 -r1.8.2.1
--- testsuite/libamf.all/test_string.cpp	1 Jul 2007 10:54:44 -0000	1.8
+++ testsuite/libamf.all/test_string.cpp	23 Aug 2007 14:18:17 -0000	1.8.2.1
@@ -71,7 +71,7 @@
 
     AMF amf_obj;
     int fd, ret;
-    char buf[AMF_VIDEO_PACKET_SIZE+1];
+    byte buf[AMF_VIDEO_PACKET_SIZE+1];
 
     // First see if we can read strings. This file is produced by
     // using a network packet sniffer, and should be binary correct.
@@ -99,7 +99,7 @@
         runtest.fail("Encoded \"connect\" string");
     }
 
-    delete str;
+    delete [] str;
 }
 
 static void

Index: testsuite/libamf.all/test_variable.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libamf.all/test_variable.cpp,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -b -r1.6 -r1.6.2.1
--- testsuite/libamf.all/test_variable.cpp	1 Jul 2007 10:54:44 -0000	1.6
+++ testsuite/libamf.all/test_variable.cpp	23 Aug 2007 14:18:18 -0000	1.6.2.1
@@ -127,7 +127,7 @@
         runtest.fail("Got String element data");
     }  
 
-    char *out = (char *)amf_obj.encodeVariable("tcUrl", "rtmp://localhost/oflaDemo");
+    char *out = (char*)amf_obj.encodeVariable("tcUrl", "rtmp://localhost/oflaDemo");
     if ((out[1] == 0x5)
         && (out[2] == 't')
         && (out[3] == 'c')
@@ -158,7 +158,7 @@
         runtest.fail("String Packets match");
     }
     
-    delete out;
+    delete [] out;
     
     // Test number fields
     memset(buf, 0, AMF_PACKET_SIZE+1);
@@ -185,7 +185,7 @@
     }
     
     amfnum_t bignum = 0x388340L;
-    out = (char *)amf_obj.encodeVariable("audioCodecs", bignum);
+    out = (char*)amf_obj.encodeVariable("audioCodecs", bignum);
     if ((out[1] == 11)
         && (out[2] == 'a')
         && (out[3] == 'u')
@@ -212,7 +212,7 @@
         runtest.fail("Number Packets match");
     }
 
-    delete out;
+    delete [] out;
 }
 
 static void



From MAILER-DAEMON Thu Aug 23 11:26:29 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IOEZp-00019l-Ta
	for mharc-gnash-commit@gnu.org; Thu, 23 Aug 2007 11:26:29 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IOEZo-00019S-MO
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 11:26:28 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IOEZo-00018e-0Z
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 11:26:28 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IOEZn-00018X-TC
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 11:26:27 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1IOEZn-0004Fw-Nj
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 11:26:27 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <udo.gnu@nova-sys.net>) id 1IOEZm-0002d7-Ov
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 15:26:26 +0000
Received: from udog by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <udog@savannah.gnu.org>) id 1IOEZm-0002d4-Iu
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 15:26:26 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IOEZm-0002d4-Iu@cvs.savannah.gnu.org>
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
Date: Thu, 23 Aug 2007 15:26:26 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/backend render_handler_agg.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Aug 2007 15:26:28 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Udo Giacomozzi <udog>	07/08/23 15:26:26

Modified files:
	backend        : render_handler_agg.cpp 

Log message:
	just updated comments

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.cpp?cvsroot=gnash&r1=1.99&r2=1.100

Patches:
Index: render_handler_agg.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/backend/render_handler_agg.cpp,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -b -r1.99 -r1.100
--- render_handler_agg.cpp	23 Aug 2007 14:06:54 -0000	1.99
+++ render_handler_agg.cpp	23 Aug 2007 15:26:26 -0000	1.100
@@ -17,7 +17,7 @@
 
  
 
-/* $Id: render_handler_agg.cpp,v 1.99 2007/08/23 14:06:54 udog Exp $ */
+/* $Id: render_handler_agg.cpp,v 1.100 2007/08/23 15:26:26 udog Exp $ */
 
 // Original version by Udo Giacomozzi and Hannes Mayr, 
 // INDUNET GmbH (www.indunet.it)
@@ -942,7 +942,7 @@
     build_agg_styles(sh, m_single_fill_styles, mat, m_neutral_cxform);
 
     // select relevant clipping bounds
-    if (def->get_bound().is_null())   // currently true for all glyphs
+    if (def->get_bound().is_null())   // can happen (spaces? to be investigated..)
       select_all_clipbounds();
     else
       select_clipbounds(def, mat);



From MAILER-DAEMON Thu Aug 23 11:28:03 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IOEbL-0003DH-Hg
	for mharc-gnash-commit@gnu.org; Thu, 23 Aug 2007 11:28:03 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IOEbK-0003Bt-9h
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 11:28:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IOEbJ-0003AO-7N
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 11:28:01 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IOEbI-0003AE-P6
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 11:28:00 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1IOEbI-0004is-Hi
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 11:28:00 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <udo.gnu@nova-sys.net>) id 1IOEbI-0002em-52
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 15:28:00 +0000
Received: from udog by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <udog@savannah.gnu.org>) id 1IOEbI-0002ej-0g
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 15:28:00 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IOEbI-0002ej-0g@cvs.savannah.gnu.org>
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
Date: Thu, 23 Aug 2007 15:28:00 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash backend/render_handler_agg.cpp ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Aug 2007 15:28:02 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Udo Giacomozzi <udog>	07/08/23 15:27:59

Modified files:
	backend        : render_handler_agg.cpp 
	.              : ChangeLog 

Log message:
	need_shape_bounds()

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.cpp?cvsroot=gnash&r1=1.100&r2=1.101
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4084&r2=1.4085

Patches:
Index: backend/render_handler_agg.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/backend/render_handler_agg.cpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- backend/render_handler_agg.cpp	23 Aug 2007 15:26:26 -0000	1.100
+++ backend/render_handler_agg.cpp	23 Aug 2007 15:27:59 -0000	1.101
@@ -17,7 +17,7 @@
 
  
 
-/* $Id: render_handler_agg.cpp,v 1.100 2007/08/23 15:26:26 udog Exp $ */
+/* $Id: render_handler_agg.cpp,v 1.101 2007/08/23 15:27:59 udog Exp $ */
 
 // Original version by Udo Giacomozzi and Hannes Mayr, 
 // INDUNET GmbH (www.indunet.it)
@@ -905,28 +905,9 @@
   }
   
 
-
-
-
-  // ensures that the bounds of the character definiton are known
-  inline void need_shape_bounds(shape_character_def *def) {
-  
-    // TO BE REMOVED - does not work
-  
-    if (def->get_bound().is_null()) {
-      printf("Calculating bounds for %p\n", def);
-      rect temp;
-      def->compute_bound(&temp);
-      def->set_bound(temp);
-    }
-  
-  }
-
   void draw_glyph(shape_character_def *def,
       const matrix& mat, const rgba& color, float /*pixel_scale*/) {
     
-    //need_shape_bounds(def);    
-      
     std::vector<path> paths;    
     apply_matrix_to_path(def->get_paths(), paths, mat);
     

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.4084
retrieving revision 1.4085
diff -u -b -r1.4084 -r1.4085
--- ChangeLog	23 Aug 2007 15:10:50 -0000	1.4084
+++ ChangeLog	23 Aug 2007 15:27:59 -0000	1.4085
@@ -1,3 +1,7 @@
+2007-08-23 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* backend/render_handler_agg.cpp: remove need_shape_bounds()
+	
 2007-08-23 Sandro Santilli <strk@keybit.net>
 
 	* server/parser/shape_character_def.{cpp,h}: document



From MAILER-DAEMON Thu Aug 23 11:29:30 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IOEcj-0004KH-TE
	for mharc-gnash-commit@gnu.org; Thu, 23 Aug 2007 11:29:29 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IOEch-0004IY-UT
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 11:29:27 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IOEcg-0004HM-By
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 11:29:27 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IOEcg-0004HD-1r
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 11:29:26 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1IOEcf-00050N-Cn
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 11:29:25 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l7NFTJ564791;
	Thu, 23 Aug 2007 17:29:19 +0200 (CEST)
	(envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Thu, 23 Aug 2007 17:29:19 +0200
To: Udo Giacomozzi <udo.gnu@nova-sys.net>
Subject: Re: [Gnash-commit] gnash/backend render_handler_agg.cpp
Message-ID: <20070823152919.GA64373@keybit.net>
Mail-Followup-To: Udo Giacomozzi <udo.gnu@nova-sys.net>, gnash-commit@gnu.org
References: <E1IOEZm-0002d4-Iu@cvs.savannah.gnu.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1IOEZm-0002d4-Iu@cvs.savannah.gnu.org>
X-Detected-Kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Aug 2007 15:29:28 -0000

On Thu, Aug 23, 2007 at 03:26:26PM +0000, Udo Giacomozzi wrote:

> +    if (def->get_bound().is_null())   // can happen (spaces? to be investigated..)

I *think* spaces are handled by the text formatter by simply using its advance
values.

--strk;



From MAILER-DAEMON Thu Aug 23 11:35:00 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IOEi3-0006lA-KZ
	for mharc-gnash-commit@gnu.org; Thu, 23 Aug 2007 11:34:59 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IOEi2-0006kU-Fi
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 11:34:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IOEi1-0006ja-Kj
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 11:34:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IOEi1-0006jM-Fq
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 11:34:57 -0400
Received: from mx20.gnu.org ([199.232.41.8])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IOEi1-0006NR-6J
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 11:34:57 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by mx20.gnu.org with esmtp (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1IOEKo-000534-WA
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 11:10:59 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IOEKh-0000z0-LO
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 15:10:51 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IOEKh-0000yx-Fj
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 15:10:51 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IOEKh-0000yx-Fj@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 23 Aug 2007 15:10:51 +0000
X-detected-kernel: Linux 2.6 (newer, 3)
X-Detected-Kernel: Linux 2.6, seldom 2.4 (older, 4)
Subject: [Gnash-commit] gnash ChangeLog server/parser/shape_character_d...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Aug 2007 15:34:58 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/23 15:10:51

Modified files:
	.              : ChangeLog 
	server/parser  : shape_character_def.cpp shape_character_def.h 

Log message:
	        * server/parser/shape_character_def.{cpp,h}: document
	          the read function; compute bound when not available
	          in the SWF (glyphs in DEFINEFONT*).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4083&r2=1.4084
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/shape_character_def.cpp?cvsroot=gnash&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/shape_character_def.h?cvsroot=gnash&r1=1.14&r2=1.15

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4083
retrieving revision 1.4084
diff -u -b -r1.4083 -r1.4084
--- ChangeLog	23 Aug 2007 14:10:53 -0000	1.4083
+++ ChangeLog	23 Aug 2007 15:10:50 -0000	1.4084
@@ -1,5 +1,11 @@
 2007-08-23 Sandro Santilli <strk@keybit.net>
 
+	* server/parser/shape_character_def.{cpp,h}: document
+	  the read function; compute bound when not available
+	  in the SWF (glyphs in DEFINEFONT*).
+
+2007-08-23 Sandro Santilli <strk@keybit.net>
+
 	* libamf/amf.{cpp,h}: fixed a bunch of memory errors, added
 	  some dox, first pass to interface clean ups.
 	* testsuite/libamf.all/Makefile.am: add testsuite/ to the 

Index: server/parser/shape_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/shape_character_def.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- server/parser/shape_character_def.cpp	7 Aug 2007 20:53:10 -0000	1.32
+++ server/parser/shape_character_def.cpp	23 Aug 2007 15:10:51 -0000	1.33
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: shape_character_def.cpp,v 1.32 2007/08/07 20:53:10 strk Exp $ */
+/* $Id: shape_character_def.cpp,v 1.33 2007/08/23 15:10:51 strk Exp $ */
 
 // Based on the public domain shape.cpp of Thatcher Ulrich <tu@tulrich.com> 2003
 
@@ -36,6 +36,9 @@
 #include <cfloat>
 #include <algorithm>
 
+// Define the macro below to always compute bounds for shape characters
+// and compare them with the bounds encoded in the SWF
+//#define GNASH_DEBUG_SHAPE_BOUNDS 1
 
 //#define DEBUG_DISPLAY_SHAPE_PATHS    // won't probably work anymore (Udo)
 #ifdef DEBUG_DISPLAY_SHAPE_PATHS
@@ -481,6 +484,25 @@
 	    }
 	}
     }
+
+    if ( ! with_style )
+    {
+        // TODO: performance would be improved by computing 
+        //       the bounds as edges are parsed.
+        compute_bound(&m_bound);
+    }
+#ifdef GNASH_DEBUG_SHAPE_BOUNDS
+    else
+    {
+        rect computedBounds;
+        compute_bound(&computedBounds);
+        if ( computedBounds != m_bounds )
+        {
+            log_debug("Shape character read for tag %d contained embedded bounds %s, while we computed bounds %s",
+                tag_type, m_bound.toString().c_str(), computedBounds.toString().c_str());
+        }
+    }
+#endif // GNASH_DEBUG_SHAPE_BOUNDS
 }
 
 

Index: server/parser/shape_character_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/shape_character_def.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- server/parser/shape_character_def.h	6 Aug 2007 03:30:19 -0000	1.14
+++ server/parser/shape_character_def.h	23 Aug 2007 15:10:51 -0000	1.15
@@ -5,7 +5,7 @@
 
 // Quadratic bezier outline shapes, the basis for most SWF rendering.
 
-/* $Id: shape_character_def.h,v 1.14 2007/08/06 03:30:19 strk Exp $ */
+/* $Id: shape_character_def.h,v 1.15 2007/08/23 15:10:51 strk Exp $ */
 
 #ifndef GNASH_SHAPE_CHARACTER_DEF_H
 #define GNASH_SHAPE_CHARACTER_DEF_H
@@ -48,7 +48,31 @@
 		float	get_height_local() const;
 		float	get_width_local() const;
 
+		/// \brief
+		/// Read a shape definition as included in DEFINEFONT*,
+		/// DEFINESHAPE* or DEFINEMORPH* tag
+		//
+		/// @param in
+		///	The stream to read the shape from
+		///
+		/// @param tag_type
+		///	The SWF::tag_type this shape definition is read for.
+		///	TODO: change to an actual SWF::tag_type type
+		///
+		/// @param with_style
+		///	If true, this definition includes bounds, fill styles and line styles.
+		///	Tipically, this is only false for DEFINEFONT* tags.
+		///	NOTE: if with_style is false, bounds of the shape will be computed
+		///	      rather then read.
+		///	TODO: drop this function, set based on tag_type ?
+		///
+		/// @param m
+		///	The movie definition corresponding to the SWF we/re parsing.
+		///	This is used to resolve bitmap characters for fill styles, never
+		///	used if with_style is false.
+		///
 		void	read(stream* in, int tag_type, bool with_style, movie_definition* m);
+
 		void	display(
 			const matrix& mat,
 			const cxform& cx,



From MAILER-DAEMON Thu Aug 23 12:51:02 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IOFte-0000B4-BL
	for mharc-gnash-commit@gnu.org; Thu, 23 Aug 2007 12:51:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IOFtd-0000AE-BP
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 12:51:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IOFta-00009e-QR
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 12:51:00 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IOFta-00009b-N4
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 12:50:58 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IOFta-0006KA-9y
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 12:50:58 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IOFtZ-0008TA-1h
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 16:50:57 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IOFtY-0008T7-TD
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 16:50:56 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IOFtY-0008T7-TD@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 23 Aug 2007 16:50:56 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/as_environment.h server/...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Aug 2007 16:51:01 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/23 16:50:56

Modified files:
	.              : ChangeLog 
	server         : as_environment.h character.cpp character.h 
	                 sprite_instance.cpp 
	server/vm      : ASHandlers.cpp 
	testsuite/actionscript.all: case.as 

Log message:
	        * server/as_environment.h: document case-sensitiveness of
	          find_target.
	        * server/character.{h,cpp} (get_relative_target_common):
	          document and fix case-sensitiveness.
	        * server/vm/ASHandlers.cpp (ActionSetProperty): log a actionscript
	          error if trying to set the property of an unknown target.
	        * server/sprite_instance.cpp (get_member, get_relative_target): be
	          case sensitive/insensitive based on SWF target version.
	        * testsuite/actionscript.all/case.as: more tests; some unexpected
	          successes, some unexpected failures.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4085&r2=1.4086
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.h?cvsroot=gnash&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.cpp?cvsroot=gnash&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.88&r2=1.89
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.310&r2=1.311
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.124&r2=1.125
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/case.as?cvsroot=gnash&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4085
retrieving revision 1.4086
diff -u -b -r1.4085 -r1.4086
--- ChangeLog	23 Aug 2007 15:27:59 -0000	1.4085
+++ ChangeLog	23 Aug 2007 16:50:55 -0000	1.4086
@@ -1,3 +1,16 @@
+2007-08-23 Sandro Santilli <strk@keybit.net>
+
+	* server/as_environment.h: document case-sensitiveness of
+	  find_target.
+	* server/character.{h,cpp} (get_relative_target_common):
+	  document and fix case-sensitiveness.
+	* server/vm/ASHandlers.cpp (ActionSetProperty): log a actionscript
+	  error if trying to set the property of an unknown target.
+	* server/sprite_instance.cpp (get_member, get_relative_target): be
+	  case sensitive/insensitive based on SWF target version.
+	* testsuite/actionscript.all/case.as: more tests; some unexpected
+	  successes, some unexpected failures.
+
 2007-08-23 Udo Giacomozzi <udo.gnu@nova-sys.net>
 
 	* backend/render_handler_agg.cpp: remove need_shape_bounds()

Index: server/as_environment.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- server/as_environment.h	25 Jul 2007 15:40:11 -0000	1.54
+++ server/as_environment.h	23 Aug 2007 16:50:56 -0000	1.55
@@ -342,6 +342,7 @@
 	/// Find the sprite/movie referenced by the given path.
 	//
 	/// Supports both /slash/syntax and dot.syntax
+	/// Case insensitive for SWF up to 6, sensitive from 7 up
 	///
 	character* find_target(const std::string& path) const;
 

Index: server/character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/character.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- server/character.cpp	11 Jul 2007 00:33:57 -0000	1.47
+++ server/character.cpp	23 Aug 2007 16:50:56 -0000	1.48
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 
-/* $Id: character.cpp,v 1.47 2007/07/11 00:33:57 strk Exp $ */
+/* $Id: character.cpp,v 1.48 2007/08/23 16:50:56 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -152,8 +152,9 @@
 }
 
 character*
-character::get_relative_target_common(const std::string& name)
+character::get_relative_target_common(const std::string& name_orig)
 {
+	string name = PROPNAME(name_orig); // convert name to lowercase in SWF<6
 	if (name == "." || name == "this")
 	{
 	    return this;

Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -b -r1.88 -r1.89
--- server/character.h	18 Aug 2007 16:12:38 -0000	1.88
+++ server/character.h	23 Aug 2007 16:50:56 -0000	1.89
@@ -19,7 +19,7 @@
 //
 //
 
-/* $Id: character.h,v 1.88 2007/08/18 16:12:38 strk Exp $ */
+/* $Id: character.h,v 1.89 2007/08/23 16:50:56 strk Exp $ */
 
 #ifndef GNASH_CHARACTER_H
 #define GNASH_CHARACTER_H
@@ -213,6 +213,9 @@
 	void do_mouse_drag();
 
 	/// look for '.', 'this',  '..', '_parent', '_level0' and '_root'
+	//
+	/// NOTE: case insensitive up to SWF6, sensitive from SWF7 up
+	///
 	character* get_relative_target_common(const std::string& name);
 
 	/// \brief
@@ -664,6 +667,7 @@
 	///
 	/// In ActionScript 1.0, everything seems to be CASE
 	/// INSENSITIVE.
+	///
 	virtual character* get_relative_target(const std::string& name)
 	{
 		return get_relative_target_common(name);

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -b -r1.310 -r1.311
--- server/sprite_instance.cpp	22 Aug 2007 04:54:56 -0000	1.310
+++ server/sprite_instance.cpp	23 Aug 2007 16:50:56 -0000	1.311
@@ -1841,7 +1841,10 @@
 
 
 	// Try items on our display list.
-	character* ch = m_display_list.get_character_by_name_i(name);
+	character* ch;
+	if ( _vm.getSWFVersion() >= 7 ) ch =  m_display_list.get_character_by_name(name);
+	else ch = m_display_list.get_character_by_name_i(name);
+
 	if (ch)
 	{
 	    // Found object.
@@ -2179,7 +2182,9 @@
 	if ( ch ) return ch;
 
 	// See if we have a match on the display list.
-	ch =  m_display_list.get_character_by_name(name);
+	if ( _vm.getSWFVersion() >= 7 ) ch =  m_display_list.get_character_by_name(name);
+	else ch = m_display_list.get_character_by_name_i(name);
+
     	// TODO: should we check for isActionScriptReferenceable here ?
 	if ( ch )
 	{

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -b -r1.124 -r1.125
--- server/vm/ASHandlers.cpp	22 Aug 2007 17:32:45 -0000	1.124
+++ server/vm/ASHandlers.cpp	23 Aug 2007 16:50:56 -0000	1.125
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ASHandlers.cpp,v 1.124 2007/08/22 17:32:45 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.125 2007/08/23 16:50:56 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1128,6 +1128,14 @@
 	}
 
     }
+    else
+    {
+	IF_VERBOSE_ASCODING_ERRORS (
+	log_aserror(_("ActionSetProperty: can't find target %s for setting property %s"),
+		env.top(2).to_debug_string().c_str(), get_property_names()[prop_number].c_str());
+	)
+
+    }
     env.drop(3);
 }
 
@@ -3585,7 +3593,7 @@
 {
 //    GNASH_REPORT_FUNCTION;
 
-	as_environment& env = thread.env;
+	//as_environment& env = thread.env;
 	const action_buffer& code = thread.code;
 	size_t pc = thread.pc;
 

Index: testsuite/actionscript.all/case.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/case.as,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- testsuite/actionscript.all/case.as	23 Aug 2007 09:55:55 -0000	1.7
+++ testsuite/actionscript.all/case.as	23 Aug 2007 16:50:56 -0000	1.8
@@ -22,11 +22,11 @@
  *  Test case sensitivity 
  */
 
-rcsid="$Id: case.as,v 1.7 2007/08/23 09:55:55 strk Exp $";
+rcsid="$Id: case.as,v 1.8 2007/08/23 16:50:56 strk Exp $";
 
 #include "check.as"
 
-#if OUTPUT_VERSION <= 6
+#if OUTPUT_VERSION <= 6 // {
 aBcD = 100;
 oBj = new Object();
 obj.xYZ = 100;
@@ -34,13 +34,23 @@
 check_equals(ABCD, 100);
 check_equals(typeof(OBJ), 'object');
 check_equals(OBJ.xyz, 100);
-#else
+#else // OUTPUT_VERSION > 6 }{
 //swf7 and above are case sensitive
 check_equals(ABCD, undefined);
 check_equals(OBJ, undefined);
-#endif 
+#endif  // OUTPUT_VERSION > 6 }
+
+#if OUTPUT_VERSION <= 6
+check_equals(_root, _ROOT);
+check_equals(_level0, _LEVEL0);
+#else // OUTPUT_VERSION >= 7
+check(_root != _ROOT);
+check(_level0 != _LEVEL0);
+#endif // OUTPUT_VERSION >= 7
+
+#if OUTPUT_VERSION == 6 // { 
+
 
-#if OUTPUT_VERSION == 6
 // 
 // create _root.mc0 and _root.mc0.mc1
 // 
@@ -49,7 +59,7 @@
 mC0.createEmptyMovieClip("mC1", 3);
 check_equals(typeof(mc0.mc1), 'movieclip');
 
-#ifdef MING_SUPPORTS_ASM
+#ifdef MING_SUPPORTS_ASM // {
 asm{
      push "/_ROOT/MC0/"
      push 0.0
@@ -57,8 +67,8 @@
      setproperty
 };
 // check setproperty
-xcheck_equals(mC0._X, 100);
-xcheck_equals(mC0._x, 100);
+check_equals(mC0._X, 100);
+check_equals(mC0._x, 100);
 
 //
 // check _name and _target, they still keep the case
@@ -67,18 +77,20 @@
 check_equals(mC0._target, "/mC0");
 check_equals(mC0.mC1._name, "mC1");
 check_equals(mC0.mC1._target, "/mC0/mC1");
-#endif  // MING_SUPPORTS_ASM
-#endif  // OUTPUT_VERSION == 6
+#endif  // MING_SUPPORTS_ASM }
+#endif  // OUTPUT_VERSION == 6  }
+
+#if OUTPUT_VERSION >= 6 // {
 
-#if OUTPUT_VERSION >= 6
 //
-// creat two movieclips named by same letters but different cases
+// create two movieclips named by same letters but different cases
 //
 mcRef = new Array(10);
 i = 0;
 MovieClip.prototype.onConstruct = function ()
 {
 	mcRef[i++] = this;
+	note("Constructed "+this+" in depth "+this.getDepth()+" and assigned to mcRef["+(i-1)+"]");
 };
 
 _root.createEmptyMovieClip("clip", 6); //this will invoke the onConstruct listener
@@ -113,22 +125,49 @@
 
 check(mcRef[0]!= mcRef[1]);
 check_equals(mcRef[0].getDepth(), 6);
-check_equals(mcRef[1].getDepth(), 7);
 check_equals(mcRef[0]._name, "clip");
-check_equals(mcRef[1]._name, "CLIP");
 check_equals(mcRef[0]._target, "/clip");
+
+#if OUTPUT_VERSION > 6
+check_equals(mcRef[1].getDepth(), 7); 
+check_equals(mcRef[1]._name, "CLIP"); 
 check_equals(mcRef[1]._target, "/CLIP");
-#endif
+#else // OUTPUT_VERSION <= 6
+// Gnash fails these due to "soft references"
+// Basically, a MOVIECLIP as_value stores the clip
+// target, but in SWF<7 the target is insensitive
+// so /clip and /CLIP both resolve to the *same*
+// character.
+//
+xcheck_equals(mcRef[1].getDepth(), 7);
+xcheck_equals(mcRef[1]._name, "CLIP"); 
+xcheck_equals(mcRef[1]._target, "/CLIP"); 
+#endif // OUTPUT_VERSION <= 6
+
 
 #if OUTPUT_VERSION <= 6
 //case insensitive, so they reference the same movieclip.
 //Or both are undefined with OUTPUT_VERSION <= 5
 check(clip == CLIP); 
-#else 
+#else // OUTPUT_VERSION >= 7
 //case sensitive, so they are different
-xcheck(clip != CLIP);
+check(clip != CLIP);
+check_equals(clip.getDepth(), 6);
+check_equals(CLIP.getDepth(), 7);
+#endif  // OUTPUT_VERSION >= 7
+
+_root.createEmptyMovieClip("CLIP2", 8); //this will invoke the onConstruct listener
+_root.createEmptyMovieClip("clip2", 9); //this will invoke the onConstruct listener
+
 check_equals(clip.getDepth(), 6);
-xcheck_equals(CLIP.getDepth(), 7);
+#if OUTPUT_VERSION < 7
+check_equals(CLIP.getDepth(), 6);
+check_equals(CLIP2.getDepth(), 8);
+check_equals(clip2.getDepth(), 8);
+#else // OUTPUT_VERSION >= 7
+check_equals(CLIP.getDepth(), 7);
+check_equals(clip2.getDepth(), 9);
+check_equals(CLIP2.getDepth(), 8);
 #endif 
 
-//_root.totals(); // this is done by dejagnu_so_fini.as
+#endif // OUTPUT_VERSION >= 6 }



From MAILER-DAEMON Thu Aug 23 23:11:07 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IOPZj-00024L-IT
	for mharc-gnash-commit@gnu.org; Thu, 23 Aug 2007 23:11:07 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IOPZh-00020K-2I
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 23:11:05 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IOPZc-0001vB-Vv
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 23:11:04 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IOPZc-0001uj-P6
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 23:11:00 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1IOPZb-00045v-0U
	for gnash-commit@gnu.org; Thu, 23 Aug 2007 23:11:00 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <markus@unixrus.se>) id 1IOPZZ-0002Ft-AK
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 03:10:57 +0000
Received: from nihilus by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <nihilus@savannah.gnu.org>) id 1IOPZZ-0002Fm-3K
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 03:10:57 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IOPZZ-0002Fm-3K@cvs.savannah.gnu.org>
From: Markus Gothe <markus@unixrus.se>
Date: Fri, 24 Aug 2007 03:10:57 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/libbase tree.hpp tree.hh
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2007 03:11:05 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Markus Gothe <nihilus>	07/08/24 03:10:57

Added files:
	libbase        : tree.hpp 
Removed files:
	libbase        : tree.hh 

Log message:
	Naming convetion, afaik C++ templates should be named .hpp (see boost).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tree.hpp?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tree.hh?cvsroot=gnash&r1=1.1&r2=0

Patches:
Index: tree.hpp
===================================================================
RCS file: tree.hpp
diff -N tree.hpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tree.hpp	24 Aug 2007 03:10:56 -0000	1.1
@@ -0,0 +1,2620 @@
+/* 
+
+   $Id: tree.hpp,v 1.1 2007/08/24 03:10:56 nihilus Exp $
+
+   STL-like templated tree class.
+   Copyright (C) 2001-2006  Kasper Peeters <kasper.peeters@aei.mpg.de>.
+
+*/
+
+/** \mainpage tree.hh
+    \author   Kasper Peeters
+    \version  2.31
+    \date     21-Aug-2007
+    \see      http://www.aei.mpg.de/~peekas/tree/
+    \see      http://www.aei.mpg.de/~peekas/tree/ChangeLog
+
+   The tree.hh library for C++ provides an STL-like container class
+   for n-ary trees, templated over the data stored at the
+   nodes. Various types of iterators are provided (post-order,
+   pre-order, and others). Where possible the access methods are
+   compatible with the STL or alternative algorithms are
+   available. 
+*/
+
+
+/*
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 or 3.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+/** \todo 
+   - New-style move members are not completely finished yet.
+   - It would be good to have an iterator which can iterate over all
+     nodes below a given node.
+   - Fixed depth iterators do not iterate over the entire range if there
+     are 'holes' in the tree.
+   - If a range uses const iter_base& as end iterator, things will
+     inevitably go wrong, because upcast from iter_base to a non-sibling_iter
+     is incorrect. This upcast should be removed (and then all illegal uses
+     as previously in 'equal' will be flagged by the compiler). This requires
+     new copy constructors though.
+   - There's a bug in replace(sibling_iterator, ...) when the ranges
+     sit next to each other. Turned up in append_child(iter,iter)
+     but has been avoided now.
+   - "std::operator<" does not work correctly on our iterators, and for some
+     reason a globally defined template operator< did not get picked up. 
+     Using a comparison class now, but this should be investigated.
+*/
+
+#ifndef tree_hh_
+#define tree_hh_
+
+#include <cassert>
+#include <memory>
+#include <stdexcept>
+#include <iterator>
+#include <set>
+#include <queue>
+#include <iostream>
+
+// HP-style construct/destroy have gone from the standard,
+// so here is a copy.
+
+namespace kp {
+
+template <class T1, class T2>
+void constructor(T1* p, T2& val) 
+   {
+   new ((void *) p) T1(val);
+   }
+
+template <class T1>
+void constructor(T1* p) 
+   {
+   new ((void *) p) T1;
+   }
+
+template <class T1>
+void destructor(T1* p)
+   {
+   p->~T1();
+   }
+
+};
+
+/// A node in the tree, combining links to other nodes as well as the actual data.
+template<class T>
+class tree_node_ { // size: 5*4=20 bytes (on 32 bit arch), can be reduced by 8.
+   public:
+      tree_node_<T> *parent;
+      tree_node_<T> *first_child, *last_child;
+      tree_node_<T> *prev_sibling, *next_sibling;
+      T data;
+}; // __attribute__((packed));
+
+template <class T, class tree_node_allocator = std::allocator<tree_node_<T> > >
+class tree {
+   protected:
+      typedef tree_node_<T> tree_node;
+   public:
+      /// Value of the data stored at a node.
+      typedef T value_type;
+
+      class iterator_base;
+      class pre_order_iterator;
+      class post_order_iterator;
+      class sibling_iterator;
+      class leaf_iterator;
+
+      tree();
+      tree(const T&);
+      tree(const iterator_base&);
+      tree(const tree<T, tree_node_allocator>&);
+      ~tree();
+      void operator=(const tree<T, tree_node_allocator>&);
+
+      /// Base class for iterators, only pointers stored, no traversal logic.
+#ifdef __SGI_STL_PORT
+      class iterator_base : public stlport::bidirectional_iterator<T, ptrdiff_t> {
+#else
+      class iterator_base {
+#endif
+         public:
+            typedef T                               value_type;
+            typedef T*                              pointer;
+            typedef T&                              reference;
+            typedef size_t                          size_type;
+            typedef ptrdiff_t                       difference_type;
+            typedef std::bidirectional_iterator_tag iterator_category;
+
+            iterator_base();
+            iterator_base(tree_node *);
+
+            T&             operator*() const;
+            T*             operator->() const;
+
+            /// When called, the next increment/decrement skips children of this node.
+            void         skip_children();
+            /// Number of children of the node pointed to by the iterator.
+            unsigned int number_of_children() const;
+
+            sibling_iterator begin() const;
+            sibling_iterator end() const;
+
+            tree_node *node;
+         protected:
+            bool skip_current_children_;
+      };
+
+      /// Depth-first iterator, first accessing the node, then its children.
+      class pre_order_iterator : public iterator_base { 
+         public:
+            pre_order_iterator();
+            pre_order_iterator(tree_node *);
+            pre_order_iterator(const iterator_base&);
+            pre_order_iterator(const sibling_iterator&);
+
+            bool    operator==(const pre_order_iterator&) const;
+            bool    operator!=(const pre_order_iterator&) const;
+            pre_order_iterator&  operator++();
+            pre_order_iterator&  operator--();
+            pre_order_iterator   operator++(int);
+            pre_order_iterator   operator--(int);
+            pre_order_iterator&  operator+=(unsigned int);
+            pre_order_iterator&  operator-=(unsigned int);
+      };
+
+      /// Depth-first iterator, first accessing the children, then the node itself.
+      class post_order_iterator : public iterator_base {
+         public:
+            post_order_iterator();
+            post_order_iterator(tree_node *);
+            post_order_iterator(const iterator_base&);
+            post_order_iterator(const sibling_iterator&);
+
+            bool    operator==(const post_order_iterator&) const;
+            bool    operator!=(const post_order_iterator&) const;
+            post_order_iterator&  operator++();
+            post_order_iterator&  operator--();
+            post_order_iterator   operator++(int);
+            post_order_iterator   operator--(int);
+            post_order_iterator&  operator+=(unsigned int);
+            post_order_iterator&  operator-=(unsigned int);
+
+            /// Set iterator to the first child as deep as possible down the tree.
+            void descend_all();
+      };
+
+      /// Breadth-first iterator, using a queue
+      class breadth_first_queued_iterator : public iterator_base {
+         public:
+            breadth_first_queued_iterator();
+            breadth_first_queued_iterator(tree_node *);
+            breadth_first_queued_iterator(const iterator_base&);
+
+            bool    operator==(const breadth_first_queued_iterator&) const;
+            bool    operator!=(const breadth_first_queued_iterator&) const;
+            breadth_first_queued_iterator&  operator++();
+            breadth_first_queued_iterator   operator++(int);
+            breadth_first_queued_iterator&  operator+=(unsigned int);
+
+         private:
+            std::queue<tree_node *> traversal_queue;
+      };
+
+      /// The default iterator types throughout the tree class.
+      typedef pre_order_iterator            iterator;
+      typedef breadth_first_queued_iterator breadth_first_iterator;
+
+      /// Iterator which traverses only the nodes at a given depth from the root.
+      class fixed_depth_iterator : public iterator_base {
+         public:
+            fixed_depth_iterator();
+            fixed_depth_iterator(tree_node *);
+            fixed_depth_iterator(const iterator_base&);
+            fixed_depth_iterator(const sibling_iterator&);
+            fixed_depth_iterator(const fixed_depth_iterator&);
+
+            bool    operator==(const fixed_depth_iterator&) const;
+            bool    operator!=(const fixed_depth_iterator&) const;
+            fixed_depth_iterator&  operator++();
+            fixed_depth_iterator&  operator--();
+            fixed_depth_iterator   operator++(int);
+            fixed_depth_iterator   operator--(int);
+            fixed_depth_iterator&  operator+=(unsigned int);
+            fixed_depth_iterator&  operator-=(unsigned int);
+
+            tree_node *first_parent_;
+         private:
+            void set_first_parent_();
+            void find_leftmost_parent_();
+      };
+
+      /// Iterator which traverses only the nodes which are siblings of each other.
+      class sibling_iterator : public iterator_base {
+         public:
+            sibling_iterator();
+            sibling_iterator(tree_node *);
+            sibling_iterator(const sibling_iterator&);
+            sibling_iterator(const iterator_base&);
+
+            bool    operator==(const sibling_iterator&) const;
+            bool    operator!=(const sibling_iterator&) const;
+            sibling_iterator&  operator++();
+            sibling_iterator&  operator--();
+            sibling_iterator   operator++(int);
+            sibling_iterator   operator--(int);
+            sibling_iterator&  operator+=(unsigned int);
+            sibling_iterator&  operator-=(unsigned int);
+
+            tree_node *range_first() const;
+            tree_node *range_last() const;
+            tree_node *parent_;
+         private:
+            void set_parent_();
+      };
+
+      /// Iterator which traverses only the leaves.
+      class leaf_iterator : public iterator_base {
+         public:
+            leaf_iterator();
+            leaf_iterator(tree_node *);
+            leaf_iterator(const sibling_iterator&);
+            leaf_iterator(const iterator_base&);
+
+            bool    operator==(const leaf_iterator&) const;
+            bool    operator!=(const leaf_iterator&) const;
+            leaf_iterator&  operator++();
+            leaf_iterator&  operator--();
+            leaf_iterator   operator++(int);
+            leaf_iterator   operator--(int);
+            leaf_iterator&  operator+=(unsigned int);
+            leaf_iterator&  operator-=(unsigned int);
+      };
+
+      /// Return iterator to the beginning of the tree.
+      inline pre_order_iterator   begin() const;
+      /// Return iterator to the end of the tree.
+      inline pre_order_iterator   end() const;
+      /// Return post-order iterator to the beginning of the tree.
+      post_order_iterator  begin_post() const;
+      /// Return post-order iterator to the end of the tree.
+      post_order_iterator  end_post() const;
+      /// Return fixed-depth iterator to the first node at a given depth.
+      fixed_depth_iterator begin_fixed(const iterator_base&, unsigned int) const;
+      /// Return fixed-depth iterator to end of the nodes at given depth.
+      fixed_depth_iterator end_fixed(const iterator_base&, unsigned int) const;
+      /// Return breadth-first iterator to the first node at a given depth.
+      breadth_first_queued_iterator begin_breadth_first() const;
+      /// Return breadth-first iterator to end of the nodes at given depth.
+      breadth_first_queued_iterator end_breadth_first() const;
+      /// Return sibling iterator to the first child of given node.
+      sibling_iterator     begin(const iterator_base&) const;
+      /// Return sibling iterator to the end of the children of a given node.
+      sibling_iterator     end(const iterator_base&) const;
+      /// Return leaf iterator to the first leaf of the tree.
+      leaf_iterator   begin_leaf() const;
+      /// Return leaf iterator to the last leaf of the tree.
+      leaf_iterator   end_leaf() const;
+
+      /// Return iterator to the parent of a node.
+      template<typename iter> static iter parent(iter);
+      /// Return iterator to the previous sibling of a node.
+      template<typename iter> iter previous_sibling(iter) const;
+      /// Return iterator to the next sibling of a node.
+      template<typename iter> iter next_sibling(iter) const;
+      /// Return iterator to the next node at a given depth.
+      template<typename iter> iter next_at_same_depth(iter) const;
+
+      /// Erase all nodes of the tree.
+      void     clear();
+      /// Erase element at position pointed to by iterator, return incremented iterator.
+      template<typename iter> iter erase(iter);
+      /// Erase all children of the node pointed to by iterator.
+      void     erase_children(const iterator_base&);
+
+      /// Insert empty node as last/first child of node pointed to by position.
+      template<typename iter> iter append_child(iter position); 
+      template<typename iter> iter prepend_child(iter position); 
+      /// Insert node as last/first child of node pointed to by position.
+      template<typename iter> iter append_child(iter position, const T& x);
+      template<typename iter> iter prepend_child(iter position, const T& x);
+      /// Append the node (plus its children) at other_position as last/first child of position.
+      template<typename iter> iter append_child(iter position, iter other_position);
+      template<typename iter> iter prepend_child(iter position, iter other_position);
+      /// Append the nodes in the from-to range (plus their children) as last/first children of position.
+      template<typename iter> iter append_children(iter position, sibling_iterator from, sibling_iterator to);
+      template<typename iter> iter prepend_children(iter position, sibling_iterator from, sibling_iterator to);
+
+      /// Short-hand to insert topmost node in otherwise empty tree.
+      pre_order_iterator set_head(const T& x);
+      /// Insert node as previous sibling of node pointed to by position.
+      template<typename iter> iter insert(iter position, const T& x);
+      /// Specialisation of previous member.
+      sibling_iterator insert(sibling_iterator position, const T& x);
+      /// Insert node (with children) pointed to by subtree as previous sibling of node pointed to by position.
+      template<typename iter> iter insert_subtree(iter position, const iterator_base& subtree);
+      /// Insert node as next sibling of node pointed to by position.
+      template<typename iter> iter insert_after(iter position, const T& x);
+      /// Insert node (with children) pointed to by subtree as next sibling of node pointed to by position.
+      template<typename iter> iter insert_subtree_after(iter position, const iterator_base& subtree);
+
+      /// Replace node at 'position' with other node (keeping same children); 'position' becomes invalid.
+      template<typename iter> iter replace(iter position, const T& x);
+      /// Replace node at 'position' with subtree starting at 'from' (do not erase subtree at 'from'); see above.
+      template<typename iter> iter replace(iter position, const iterator_base& from);
+      /// Replace string of siblings (plus their children) with copy of a new string (with children); see above
+      sibling_iterator replace(sibling_iterator orig_begin, sibling_iterator orig_end, 
+                               sibling_iterator new_begin,  sibling_iterator new_end); 
+
+      /// Move all children of node at 'position' to be siblings, returns position.
+      template<typename iter> iter flatten(iter position);
+      /// Move nodes in range to be children of 'position'.
+      template<typename iter> iter reparent(iter position, sibling_iterator begin, sibling_iterator end);
+      /// Move all child nodes of 'from' to be children of 'position'.
+      template<typename iter> iter reparent(iter position, iter from);
+
+      /// Replace node with a new node, making the old node a child of the new node.
+      template<typename iter> iter wrap(iter position, const T& x);
+
+      /// Move 'source' node (plus its children) to become the next sibling of 'target'.
+      template<typename iter> iter move_after(iter target, iter source);
+      /// Move 'source' node (plus its children) to become the previous sibling of 'target'.
+      template<typename iter> iter move_before(iter target, iter source);
+      sibling_iterator move_before(sibling_iterator target, sibling_iterator source);
+      /// Move 'source' node (plus its children) to become the node at 'target' (erasing the node at 'target').
+      template<typename iter> iter move_ontop(iter target, iter source);
+
+      /// Merge with other tree, creating new branches and leaves only if they are not already present.
+      void     merge(sibling_iterator, sibling_iterator, sibling_iterator, sibling_iterator, 
+                     bool duplicate_leaves=false);
+      /// Sort (std::sort only moves values of nodes, this one moves children as well).
+      void     sort(sibling_iterator from, sibling_iterator to, bool deep=false);
+      template<class StrictWeakOrdering>
+      void     sort(sibling_iterator from, sibling_iterator to, StrictWeakOrdering comp, bool deep=false);
+      /// Compare two ranges of nodes (compares nodes as well as tree structure).
+      template<typename iter>
+      bool     equal(const iter& one, const iter& two, const iter& three) const;
+      template<typename iter, class BinaryPredicate>
+      bool     equal(const iter& one, const iter& two, const iter& three, BinaryPredicate) const;
+      template<typename iter>
+      bool     equal_subtree(const iter& one, const iter& two) const;
+      template<typename iter, class BinaryPredicate>
+      bool     equal_subtree(const iter& one, const iter& two, BinaryPredicate) const;
+      /// Extract a new tree formed by the range of siblings plus all their children.
+      tree     subtree(sibling_iterator from, sibling_iterator to) const;
+      void     subtree(tree&, sibling_iterator from, sibling_iterator to) const;
+      /// Exchange the node (plus subtree) with its sibling node (do nothing if no sibling present).
+      void     swap(sibling_iterator it);
+      /// Exchange two nodes (plus subtrees)
+      void     swap(iterator, iterator);
+      
+      /// Count the total number of nodes.
+      int      size() const;
+      /// Count the total number of nodes below the indicated node (plus one).
+      int      size(const iterator_base&) const;
+      /// Check if tree is empty.
+      bool     empty() const;
+      /// Compute the depth to the root.
+      int      depth(const iterator_base&) const;
+      /// Count the number of children of node at position.
+      static unsigned int number_of_children(const iterator_base&);
+      /// Count the number of 'next' siblings of node at iterator.
+      unsigned int number_of_siblings(const iterator_base&) const;
+      /// Determine whether node at position is in the subtrees with root in the range.
+      bool     is_in_subtree(const iterator_base& position, const iterator_base& begin, 
+                             const iterator_base& end) const;
+      /// Determine whether the iterator is an 'end' iterator and thus not actually pointing to a node.
+      bool     is_valid(const iterator_base&) const;
+
+      /// Determine the index of a node in the range of siblings to which it belongs.
+      unsigned int index(sibling_iterator it) const;
+      /// Inverse of 'index': return the n-th child of the node at position.
+      sibling_iterator  child(const iterator_base& position, unsigned int) const;
+      
+      /// Comparator class for iterators (compares pointer values; why doesn't this work automatically?)
+      class iterator_base_less {
+         public:
+            bool operator()(const typename tree<T, tree_node_allocator>::iterator_base& one,
+                            const typename tree<T, tree_node_allocator>::iterator_base& two) const
+               {
+               return one.node < two.node;
+               }
+      };
+      tree_node *head, *feet;    // head/feet are always dummy; if an iterator points to them it is invalid
+   private:
+      tree_node_allocator alloc_;
+      void head_initialise_();
+      void copy_(const tree<T, tree_node_allocator>& other);
+
+      /// Comparator class for two nodes of a tree (used for sorting and searching).
+      template<class StrictWeakOrdering>
+      class compare_nodes {
+         public:
+            compare_nodes(StrictWeakOrdering comp) : comp_(comp) {};
+            
+            bool operator()(const tree_node *a, const tree_node *b) 
+               {
+               static StrictWeakOrdering comp;
+               return comp(a->data, b->data);
+               }
+         private:
+            StrictWeakOrdering comp_;
+      };
+};
+
+//template <class T, class tree_node_allocator>
+//class iterator_base_less {
+// public:
+//    bool operator()(const typename tree<T, tree_node_allocator>::iterator_base& one,
+//                  const typename tree<T, tree_node_allocator>::iterator_base& two) const
+//       {
+//       txtout << "operatorclass<" << one.node < two.node << std::endl;
+//       return one.node < two.node;
+//       }
+//};
+
+// template <class T, class tree_node_allocator>
+// bool operator<(const typename tree<T, tree_node_allocator>::iterator& one,
+//                const typename tree<T, tree_node_allocator>::iterator& two)
+//    {
+//    txtout << "operator< " << one.node < two.node << std::endl;
+//    if(one.node < two.node) return true;
+//    return false;
+//    }
+// 
+// template <class T, class tree_node_allocator>
+// bool operator==(const typename tree<T, tree_node_allocator>::iterator& one,
+//                const typename tree<T, tree_node_allocator>::iterator& two)
+//    {
+//    txtout << "operator== " << one.node == two.node << std::endl;
+//    if(one.node == two.node) return true;
+//    return false;
+//    }
+// 
+// template <class T, class tree_node_allocator>
+// bool operator>(const typename tree<T, tree_node_allocator>::iterator_base& one,
+//                const typename tree<T, tree_node_allocator>::iterator_base& two)
+//    {
+//    txtout << "operator> " << one.node < two.node << std::endl;
+//    if(one.node > two.node) return true;
+//    return false;
+//    }
+
+
+
+// Tree
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::tree() 
+   {
+   head_initialise_();
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::tree(const T& x) 
+   {
+   head_initialise_();
+   set_head(x);
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::tree(const iterator_base& other)
+   {
+   head_initialise_();
+   set_head((*other));
+   replace(begin(), other);
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::~tree()
+   {
+   clear();
+   alloc_.deallocate(head,1);
+   alloc_.deallocate(feet,1);
+   }
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::head_initialise_() 
+   { 
+   head = alloc_.allocate(1,0); // MSVC does not have default second argument 
+   feet = alloc_.allocate(1,0);
+
+   head->parent=0;
+   head->first_child=0;
+   head->last_child=0;
+   head->prev_sibling=0; //head;
+   head->next_sibling=feet; //head;
+
+   feet->parent=0;
+   feet->first_child=0;
+   feet->last_child=0;
+   feet->prev_sibling=head;
+   feet->next_sibling=0;
+   }
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::operator=(const tree<T, tree_node_allocator>& other)
+   {
+   copy_(other);
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::tree(const tree<T, tree_node_allocator>& other)
+   {
+   head_initialise_();
+   copy_(other);
+   }
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::copy_(const tree<T, tree_node_allocator>& other) 
+   {
+   clear();
+   pre_order_iterator it=other.begin(), to=begin();
+   while(it!=other.end()) {
+      to=insert(to, (*it));
+      it.skip_children();
+      ++it;
+      }
+   to=begin();
+   it=other.begin();
+   while(it!=other.end()) {
+      to=replace(to, it);
+      to.skip_children();
+      it.skip_children();
+      ++to;
+      ++it;
+      }
+   }
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::clear()
+   {
+   if(head)
+      while(head->next_sibling!=feet)
+         erase(pre_order_iterator(head->next_sibling));
+   }
+
+template<class T, class tree_node_allocator> 
+void tree<T, tree_node_allocator>::erase_children(const iterator_base& it)
+   {
+// std::cout << "erase_children " << it.node << std::endl;
+   if(it.node==0) return;
+
+   tree_node *cur=it.node->first_child;
+   tree_node *prev=0;
+
+   while(cur!=0) {
+      prev=cur;
+      cur=cur->next_sibling;
+      erase_children(pre_order_iterator(prev));
+      kp::destructor(&prev->data);
+      alloc_.deallocate(prev,1);
+      }
+   it.node->first_child=0;
+   it.node->last_child=0;
+// std::cout << "exit" << std::endl;
+   }
+
+template<class T, class tree_node_allocator> 
+template<class iter>
+iter tree<T, tree_node_allocator>::erase(iter it)
+   {
+   tree_node *cur=it.node;
+   assert(cur!=head);
+   iter ret=it;
+   ret.skip_children();
+   ++ret;
+   erase_children(it);
+   if(cur->prev_sibling==0) {
+      cur->parent->first_child=cur->next_sibling;
+      }
+   else {
+      cur->prev_sibling->next_sibling=cur->next_sibling;
+      }
+   if(cur->next_sibling==0) {
+      cur->parent->last_child=cur->prev_sibling;
+      }
+   else {
+      cur->next_sibling->prev_sibling=cur->prev_sibling;
+      }
+
+   kp::destructor(&cur->data);
+   alloc_.deallocate(cur,1);
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::pre_order_iterator tree<T, tree_node_allocator>::begin() const
+   {
+   return pre_order_iterator(head->next_sibling);
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::pre_order_iterator tree<T, tree_node_allocator>::end() const
+   {
+   return pre_order_iterator(feet);
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::breadth_first_queued_iterator tree<T, tree_node_allocator>::begin_breadth_first() const
+   {
+   return breadth_first_queued_iterator(head->next_sibling);
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::breadth_first_queued_iterator tree<T, tree_node_allocator>::end_breadth_first() const
+   {
+   return breadth_first_queued_iterator();
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::post_order_iterator tree<T, tree_node_allocator>::begin_post() const
+   {
+   tree_node *tmp=head->next_sibling;
+   if(tmp!=feet) {
+      while(tmp->first_child)
+         tmp=tmp->first_child;
+      }
+   return post_order_iterator(tmp);
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::post_order_iterator tree<T, tree_node_allocator>::end_post() const
+   {
+   return post_order_iterator(feet);
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::fixed_depth_iterator tree<T, tree_node_allocator>::begin_fixed(const iterator_base& pos, unsigned int dp) const
+   {
+   tree_node *tmp=pos.node;
+   unsigned int curdepth=0;
+   while(curdepth<dp) { // go down one level
+      while(tmp->first_child==0) {
+         tmp=tmp->next_sibling;
+         if(tmp==0)
+            throw std::range_error("tree: begin_fixed out of range");
+         }
+      tmp=tmp->first_child;
+      ++curdepth;
+      }
+   return tmp;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::fixed_depth_iterator tree<T, tree_node_allocator>::end_fixed(const iterator_base& pos, unsigned int dp) const
+   {
+   assert(1==0); // FIXME: not correct yet
+   tree_node *tmp=pos.node;
+   unsigned int curdepth=1;
+   while(curdepth<dp) { // go down one level
+      while(tmp->first_child==0) {
+         tmp=tmp->next_sibling;
+         if(tmp==0)
+            throw std::range_error("tree: end_fixed out of range");
+         }
+      tmp=tmp->first_child;
+      ++curdepth;
+      }
+   return tmp;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::begin(const iterator_base& pos) const
+   {
+   assert(pos.node!=0);
+   if(pos.node->first_child==0) {
+      return end(pos);
+      }
+   return pos.node->first_child;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::end(const iterator_base& pos) const
+   {
+   sibling_iterator ret(0);
+   ret.parent_=pos.node;
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::leaf_iterator tree<T, tree_node_allocator>::begin_leaf() const
+   {
+   tree_node *tmp=head->next_sibling;
+   if(tmp!=feet) {
+      while(tmp->first_child)
+         tmp=tmp->first_child;
+      }
+   return leaf_iterator(tmp);
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::leaf_iterator tree<T, tree_node_allocator>::end_leaf() const
+   {
+   return leaf_iterator(feet);
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter>
+iter tree<T, tree_node_allocator>::parent(iter position) 
+   {
+   assert(position.node!=0);
+   return iter(position.node->parent);
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter>
+iter tree<T, tree_node_allocator>::previous_sibling(iter position) const
+   {
+   assert(position.node!=0);
+   iter ret(position);
+   ret.node=position.node->prev_sibling;
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter>
+iter tree<T, tree_node_allocator>::next_sibling(iter position) const
+   {
+   assert(position.node!=0);
+   iter ret(position);
+   ret.node=position.node->next_sibling;
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter>
+iter tree<T, tree_node_allocator>::next_at_same_depth(iter position) const
+   {
+   assert(position.node!=0);
+   iter ret(position);
+
+   if(position.node->next_sibling) {
+      ret.node=position.node->next_sibling;
+      }
+   else { 
+      int relative_depth=0;
+      upper:
+      do {
+         ret.node=ret.node->parent;
+         if(ret.node==0) return ret;
+         --relative_depth;
+         } while(ret.node->next_sibling==0);
+      lower:
+      ret.node=ret.node->next_sibling;
+      while(ret.node->first_child==0) {
+         if(ret.node->next_sibling==0)
+            goto upper;
+         ret.node=ret.node->next_sibling;
+         if(ret.node==0) return ret;
+         }
+      while(relative_depth<0 && ret.node->first_child!=0) {
+         ret.node=ret.node->first_child;
+         ++relative_depth;
+         }
+      if(relative_depth<0) {
+         if(ret.node->next_sibling==0) goto upper;
+         else                          goto lower;
+         }
+      }
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter>
+iter tree<T, tree_node_allocator>::append_child(iter position)
+   {
+   assert(position.node!=head);
+   assert(position.node);
+
+   tree_node *tmp=alloc_.allocate(1,0);
+   kp::constructor(&tmp->data);
+   tmp->first_child=0;
+   tmp->last_child=0;
+
+   tmp->parent=position.node;
+   if(position.node->last_child!=0) {
+      position.node->last_child->next_sibling=tmp;
+      }
+   else {
+      position.node->first_child=tmp;
+      }
+   tmp->prev_sibling=position.node->last_child;
+   position.node->last_child=tmp;
+   tmp->next_sibling=0;
+   return tmp;
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter>
+iter tree<T, tree_node_allocator>::prepend_child(iter position)
+   {
+   assert(position.node!=head);
+   assert(position.node);
+
+   tree_node *tmp=alloc_.allocate(1,0);
+   kp::constructor(&tmp->data);
+   tmp->first_child=0;
+   tmp->last_child=0;
+
+   tmp->parent=position.node;
+   if(position.node->first_child!=0) {
+      position.node->first_child->prev_sibling=tmp;
+      }
+   else {
+      position.node->last_child=tmp;
+      }
+   tmp->next_sibling=position.node->first_child;
+   position.node->prev_child=tmp;
+   tmp->prev_sibling=0;
+   return tmp;
+   }
+
+template <class T, class tree_node_allocator>
+template <class iter>
+iter tree<T, tree_node_allocator>::append_child(iter position, const T& x)
+   {
+   // If your program fails here you probably used 'append_child' to add the top
+   // node to an empty tree. From version 1.45 the top element should be added
+   // using 'insert'. See the documentation for further information, and sorry about
+   // the API change.
+   assert(position.node!=head);
+   assert(position.node);
+
+   tree_node* tmp = alloc_.allocate(1,0);
+   kp::constructor(&tmp->data, x);
+   tmp->first_child=0;
+   tmp->last_child=0;
+
+   tmp->parent=position.node;
+   if(position.node->last_child!=0) {
+      position.node->last_child->next_sibling=tmp;
+      }
+   else {
+      position.node->first_child=tmp;
+      }
+   tmp->prev_sibling=position.node->last_child;
+   position.node->last_child=tmp;
+   tmp->next_sibling=0;
+   return tmp;
+   }
+
+template <class T, class tree_node_allocator>
+template <class iter>
+iter tree<T, tree_node_allocator>::prepend_child(iter position, const T& x)
+   {
+   assert(position.node!=head);
+   assert(position.node);
+
+   tree_node* tmp = alloc_.allocate(1,0);
+   kp::constructor(&tmp->data, x);
+   tmp->first_child=0;
+   tmp->last_child=0;
+
+   tmp->parent=position.node;
+   if(position.node->first_child!=0) {
+      position.node->first_child->prev_sibling=tmp;
+      }
+   else {
+      position.node->last_child=tmp;
+      }
+   tmp->next_sibling=position.node->first_child;
+   position.node->first_child=tmp;
+   tmp->prev_sibling=0;
+   return tmp;
+   }
+
+template <class T, class tree_node_allocator>
+template <class iter>
+iter tree<T, tree_node_allocator>::append_child(iter position, iter other)
+   {
+   assert(position.node!=head);
+   assert(position.node);
+
+   sibling_iterator aargh=append_child(position, value_type());
+   return replace(aargh, other);
+   }
+
+template <class T, class tree_node_allocator>
+template <class iter>
+iter tree<T, tree_node_allocator>::prepend_child(iter position, iter other)
+   {
+   assert(position.node!=head);
+   assert(position.node);
+
+   sibling_iterator aargh=prepend_child(position, value_type());
+   return replace(aargh, other);
+   }
+
+template <class T, class tree_node_allocator>
+template <class iter>
+iter tree<T, tree_node_allocator>::append_children(iter position, sibling_iterator from, sibling_iterator to)
+   {
+   assert(position.node!=head);
+   assert(position.node);
+
+   iter ret=from;
+
+   while(from!=to) {
+      insert_subtree(position.end(), from);
+      ++from;
+      }
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+template <class iter>
+iter tree<T, tree_node_allocator>::prepend_children(iter position, sibling_iterator from, sibling_iterator to)
+   {
+   assert(position.node!=head);
+   assert(position.node);
+
+   iter ret=from;
+
+   while(from!=to) {
+      insert_subtree(position.begin(), from);
+      ++from;
+      }
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::pre_order_iterator tree<T, tree_node_allocator>::set_head(const T& x)
+   {
+   assert(head->next_sibling==feet);
+   return insert(iterator(feet), x);
+   }
+
+template <class T, class tree_node_allocator>
+template <class iter>
+iter tree<T, tree_node_allocator>::insert(iter position, const T& x)
+   {
+   if(position.node==0) {
+      position.node=feet; // Backward compatibility: when calling insert on a null node,
+                          // insert before the feet.
+      }
+   tree_node* tmp = alloc_.allocate(1,0);
+   kp::constructor(&tmp->data, x);
+   tmp->first_child=0;
+   tmp->last_child=0;
+
+   tmp->parent=position.node->parent;
+   tmp->next_sibling=position.node;
+   tmp->prev_sibling=position.node->prev_sibling;
+   position.node->prev_sibling=tmp;
+
+   if(tmp->prev_sibling==0) {
+      if(tmp->parent) // when inserting nodes at the head, there is no parent
+         tmp->parent->first_child=tmp;
+      }
+   else
+      tmp->prev_sibling->next_sibling=tmp;
+   return tmp;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::insert(sibling_iterator position, const T& x)
+   {
+   tree_node* tmp = alloc_.allocate(1,0);
+   kp::constructor(&tmp->data, x);
+   tmp->first_child=0;
+   tmp->last_child=0;
+
+   tmp->next_sibling=position.node;
+   if(position.node==0) { // iterator points to end of a subtree
+      tmp->parent=position.parent_;
+      tmp->prev_sibling=position.range_last();
+      tmp->parent->last_child=tmp;
+      }
+   else {
+      tmp->parent=position.node->parent;
+      tmp->prev_sibling=position.node->prev_sibling;
+      position.node->prev_sibling=tmp;
+      }
+
+   if(tmp->prev_sibling==0) {
+      if(tmp->parent) // when inserting nodes at the head, there is no parent
+         tmp->parent->first_child=tmp;
+      }
+   else
+      tmp->prev_sibling->next_sibling=tmp;
+   return tmp;
+   }
+
+template <class T, class tree_node_allocator>
+template <class iter>
+iter tree<T, tree_node_allocator>::insert_after(iter position, const T& x)
+   {
+   tree_node* tmp = alloc_.allocate(1,0);
+   kp::constructor(&tmp->data, x);
+   tmp->first_child=0;
+   tmp->last_child=0;
+
+   tmp->parent=position.node->parent;
+   tmp->prev_sibling=position.node;
+   tmp->next_sibling=position.node->next_sibling;
+   position.node->next_sibling=tmp;
+
+   if(tmp->next_sibling==0) {
+      if(tmp->parent) // when inserting nodes at the head, there is no parent
+         tmp->parent->last_child=tmp;
+      }
+   else {
+      tmp->next_sibling->prev_sibling=tmp;
+      }
+   return tmp;
+   }
+
+template <class T, class tree_node_allocator>
+template <class iter>
+iter tree<T, tree_node_allocator>::insert_subtree(iter position, const iterator_base& subtree)
+   {
+   // insert dummy
+   iter it=insert(position, value_type());
+   // replace dummy with subtree
+   return replace(it, subtree);
+   }
+
+template <class T, class tree_node_allocator>
+template <class iter>
+iter tree<T, tree_node_allocator>::insert_subtree_after(iter position, const iterator_base& subtree)
+   {
+   // insert dummy
+   iter it=insert_after(position, value_type());
+   // replace dummy with subtree
+   return replace(it, subtree);
+   }
+
+// template <class T, class tree_node_allocator>
+// template <class iter>
+// iter tree<T, tree_node_allocator>::insert_subtree(sibling_iterator position, iter subtree)
+//    {
+//    // insert dummy
+//    iter it(insert(position, value_type()));
+//    // replace dummy with subtree
+//    return replace(it, subtree);
+//    }
+
+template <class T, class tree_node_allocator>
+template <class iter>
+iter tree<T, tree_node_allocator>::replace(iter position, const T& x)
+   {
+   kp::destructor(&position.node->data);
+   kp::constructor(&position.node->data, x);
+   return position;
+   }
+
+template <class T, class tree_node_allocator>
+template <class iter>
+iter tree<T, tree_node_allocator>::replace(iter position, const iterator_base& from)
+   {
+   assert(position.node!=head);
+   tree_node *current_from=from.node;
+   tree_node *start_from=from.node;
+   tree_node *current_to  =position.node;
+
+   // replace the node at position with head of the replacement tree at from
+// std::cout << "warning!" << position.node << std::endl;
+   erase_children(position);  
+// std::cout << "no warning!" << std::endl;
+   tree_node* tmp = alloc_.allocate(1,0);
+   kp::constructor(&tmp->data, (*from));
+   tmp->first_child=0;
+   tmp->last_child=0;
+   if(current_to->prev_sibling==0) {
+      if(current_to->parent!=0)
+         current_to->parent->first_child=tmp;
+      }
+   else {
+      current_to->prev_sibling->next_sibling=tmp;
+      }
+   tmp->prev_sibling=current_to->prev_sibling;
+   if(current_to->next_sibling==0) {
+      if(current_to->parent!=0)
+         current_to->parent->last_child=tmp;
+      }
+   else {
+      current_to->next_sibling->prev_sibling=tmp;
+      }
+   tmp->next_sibling=current_to->next_sibling;
+   tmp->parent=current_to->parent;
+   kp::destructor(&current_to->data);
+   alloc_.deallocate(current_to,1);
+   current_to=tmp;
+   
+   // only at this stage can we fix 'last'
+   tree_node *last=from.node->next_sibling;
+
+   pre_order_iterator toit=tmp;
+   // copy all children
+   do {
+      assert(current_from!=0);
+      if(current_from->first_child != 0) {
+         current_from=current_from->first_child;
+         toit=append_child(toit, current_from->data);
+         }
+      else {
+         while(current_from->next_sibling==0 && current_from!=start_from) {
+            current_from=current_from->parent;
+            toit=parent(toit);
+            assert(current_from!=0);
+            }
+         current_from=current_from->next_sibling;
+         if(current_from!=last) {
+            toit=append_child(parent(toit), current_from->data);
+            }
+         }
+      } while(current_from!=last);
+
+   return current_to;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::replace(
+   sibling_iterator orig_begin, 
+   sibling_iterator orig_end, 
+   sibling_iterator new_begin, 
+   sibling_iterator new_end)
+   {
+   tree_node *orig_first=orig_begin.node;
+   tree_node *new_first=new_begin.node;
+   tree_node *orig_last=orig_first;
+   while((++orig_begin)!=orig_end)
+      orig_last=orig_last->next_sibling;
+   tree_node *new_last=new_first;
+   while((++new_begin)!=new_end)
+      new_last=new_last->next_sibling;
+
+   // insert all siblings in new_first..new_last before orig_first
+   bool first=true;
+   pre_order_iterator ret;
+   while(1==1) {
+      pre_order_iterator tt=insert_subtree(pre_order_iterator(orig_first), pre_order_iterator(new_first));
+      if(first) {
+         ret=tt;
+         first=false;
+         }
+      if(new_first==new_last)
+         break;
+      new_first=new_first->next_sibling;
+      }
+
+   // erase old range of siblings
+   bool last=false;
+   tree_node *next=orig_first;
+   while(1==1) {
+      if(next==orig_last) 
+         last=true;
+      next=next->next_sibling;
+      erase((pre_order_iterator)orig_first);
+      if(last) 
+         break;
+      orig_first=next;
+      }
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter>
+iter tree<T, tree_node_allocator>::flatten(iter position)
+   {
+   if(position.node->first_child==0)
+      return position;
+
+   tree_node *tmp=position.node->first_child;
+   while(tmp) {
+      tmp->parent=position.node->parent;
+      tmp=tmp->next_sibling;
+      } 
+   if(position.node->next_sibling) {
+      position.node->last_child->next_sibling=position.node->next_sibling;
+      position.node->next_sibling->prev_sibling=position.node->last_child;
+      }
+   else {
+      position.node->parent->last_child=position.node->last_child;
+      }
+   position.node->next_sibling=position.node->first_child;
+   position.node->next_sibling->prev_sibling=position.node;
+   position.node->first_child=0;
+   position.node->last_child=0;
+
+   return position;
+   }
+
+
+template <class T, class tree_node_allocator>
+template <typename iter>
+iter tree<T, tree_node_allocator>::reparent(iter position, sibling_iterator begin, sibling_iterator end)
+   {
+   tree_node *first=begin.node;
+   tree_node *last=first;
+
+   assert(first!=position.node);
+   
+   if(begin==end) return begin;
+   // determine last node
+   while((++begin)!=end) {
+      last=last->next_sibling;
+      }
+   // move subtree
+   if(first->prev_sibling==0) {
+      first->parent->first_child=last->next_sibling;
+      }
+   else {
+      first->prev_sibling->next_sibling=last->next_sibling;
+      }
+   if(last->next_sibling==0) {
+      last->parent->last_child=first->prev_sibling;
+      }
+   else {
+      last->next_sibling->prev_sibling=first->prev_sibling;
+      }
+   if(position.node->first_child==0) {
+      position.node->first_child=first;
+      position.node->last_child=last;
+      first->prev_sibling=0;
+      }
+   else {
+      position.node->last_child->next_sibling=first;
+      first->prev_sibling=position.node->last_child;
+      position.node->last_child=last;
+      }
+   last->next_sibling=0;
+
+   tree_node *pos=first;
+   while(1==1) {
+      pos->parent=position.node;
+      if(pos==last) break;
+      pos=pos->next_sibling;
+      }
+
+   return first;
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter> iter tree<T, tree_node_allocator>::reparent(iter position, iter from)
+   {
+   if(from.node->first_child==0) return position;
+   return reparent(position, from.node->first_child, end(from));
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter> iter tree<T, tree_node_allocator>::wrap(iter position, const T& x)
+   {
+   assert(position.node!=0);
+   sibling_iterator fr=position, to=position;
+   ++to;
+   iter ret = insert(position, x);
+   reparent(ret, fr, to);
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter> iter tree<T, tree_node_allocator>::move_after(iter target, iter source)
+   {
+   tree_node *dst=target.node;
+   tree_node *src=source.node;
+   assert(dst);
+   assert(src);
+
+   if(dst==src) return source;
+   if(dst->next_sibling)
+      if(dst->next_sibling==src) // already in the right spot
+         return source;
+
+   // take src out of the tree
+   if(src->prev_sibling!=0) src->prev_sibling->next_sibling=src->next_sibling;
+   else                     src->parent->first_child=src->next_sibling;
+   if(src->next_sibling!=0) src->next_sibling->prev_sibling=src->prev_sibling;
+   else                     src->parent->last_child=src->prev_sibling;
+
+   // connect it to the new point
+   if(dst->next_sibling!=0) dst->next_sibling->prev_sibling=src;
+   else                     dst->parent->last_child=src;
+   src->next_sibling=dst->next_sibling;
+   dst->next_sibling=src;
+   src->prev_sibling=dst;
+   src->parent=dst->parent;
+   return src;
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter> iter tree<T, tree_node_allocator>::move_before(iter target, iter source)
+   {
+   tree_node *dst=target.node;
+   tree_node *src=source.node;
+   assert(dst);
+   assert(src);
+
+   if(dst==src) return source;
+   if(dst->prev_sibling)
+      if(dst->prev_sibling==src) // already in the right spot
+         return source;
+
+   // take src out of the tree
+   if(src->prev_sibling!=0) src->prev_sibling->next_sibling=src->next_sibling;
+   else                     src->parent->first_child=src->next_sibling;
+   if(src->next_sibling!=0) src->next_sibling->prev_sibling=src->prev_sibling;
+   else                     src->parent->last_child=src->prev_sibling;
+
+   // connect it to the new point
+   if(dst->prev_sibling!=0) dst->prev_sibling->next_sibling=src;
+   else                     dst->parent->first_child=src;
+   src->prev_sibling=dst->prev_sibling;
+   dst->prev_sibling=src;
+   src->next_sibling=dst;
+   src->parent=dst->parent;
+   return src;
+   }
+
+// specialisation for sibling_iterators
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::move_before(sibling_iterator target, 
+                                                                                         sibling_iterator source)
+   {
+   tree_node *dst=target.node;
+   tree_node *src=source.node;
+   tree_node *dst_prev_sibling;
+   if(dst==0) { // must then be an end iterator
+      dst_prev_sibling=target.parent_->last_child;
+      assert(dst_prev_sibling);
+      }
+   else dst_prev_sibling=dst->prev_sibling;
+   assert(src);
+
+   if(dst==src) return source;
+   if(dst_prev_sibling)
+      if(dst_prev_sibling==src) // already in the right spot
+         return source;
+
+   // take src out of the tree
+   if(src->prev_sibling!=0) src->prev_sibling->next_sibling=src->next_sibling;
+   else                     src->parent->first_child=src->next_sibling;
+   if(src->next_sibling!=0) src->next_sibling->prev_sibling=src->prev_sibling;
+   else                     src->parent->last_child=src->prev_sibling;
+
+   // connect it to the new point
+   if(dst_prev_sibling!=0) dst_prev_sibling->next_sibling=src;
+   else                    target.parent_->first_child=src;
+   src->prev_sibling=dst_prev_sibling;
+   if(dst) {
+      dst->prev_sibling=src;
+      src->parent=dst->parent;
+      }
+   src->next_sibling=dst;
+   return src;
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter> iter tree<T, tree_node_allocator>::move_ontop(iter target, iter source)
+   {
+   tree_node *dst=target.node;
+   tree_node *src=source.node;
+   assert(dst);
+   assert(src);
+
+   if(dst==src) return source;
+
+   // remember connection points
+   tree_node *b_prev_sibling=dst->prev_sibling;
+   tree_node *b_next_sibling=dst->next_sibling;
+   tree_node *b_parent=dst->parent;
+
+   // remove target
+   erase(target);
+
+   // take src out of the tree
+   if(src->prev_sibling!=0) src->prev_sibling->next_sibling=src->next_sibling;
+   else                     src->parent->first_child=src->next_sibling;
+   if(src->next_sibling!=0) src->next_sibling->prev_sibling=src->prev_sibling;
+   else                     src->parent->last_child=src->prev_sibling;
+
+   // connect it to the new point
+   if(b_prev_sibling!=0) b_prev_sibling->next_sibling=src;
+   else                  b_parent->first_child=src;
+   if(b_next_sibling!=0) b_next_sibling->prev_sibling=src;
+   else                  b_parent->last_child=src;
+   src->prev_sibling=b_prev_sibling;
+   src->next_sibling=b_next_sibling;
+   src->parent=b_parent;
+   return src;
+   }
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::merge(sibling_iterator to1,   sibling_iterator to2,
+                                          sibling_iterator from1, sibling_iterator from2,
+                                          bool duplicate_leaves)
+   {
+   sibling_iterator fnd;
+   while(from1!=from2) {
+      if((fnd=std::find(to1, to2, (*from1))) != to2) { // element found
+         if(from1.begin()==from1.end()) { // full depth reached
+            if(duplicate_leaves)
+               append_child(parent(to1), (*from1));
+            }
+         else { // descend further
+            merge(fnd.begin(), fnd.end(), from1.begin(), from1.end(), duplicate_leaves);
+            }
+         }
+      else { // element missing
+         insert_subtree(to2, from1);
+         }
+      ++from1;
+      }
+   }
+
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::sort(sibling_iterator from, sibling_iterator to, bool deep)
+   {
+   std::less<T> comp;
+   sort(from, to, comp, deep);
+   }
+
+template <class T, class tree_node_allocator>
+template <class StrictWeakOrdering>
+void tree<T, tree_node_allocator>::sort(sibling_iterator from, sibling_iterator to, 
+                                        StrictWeakOrdering comp, bool deep)
+   {
+   if(from==to) return;
+   // make list of sorted nodes
+   // CHECK: if multiset stores equivalent nodes in the order in which they
+   // are inserted, then this routine should be called 'stable_sort'.
+   std::multiset<tree_node *, compare_nodes<StrictWeakOrdering> > nodes(comp);
+   sibling_iterator it=from, it2=to;
+   while(it != to) {
+      nodes.insert(it.node);
+      ++it;
+      }
+   // reassemble
+   --it2;
+
+   // prev and next are the nodes before and after the sorted range
+   tree_node *prev=from.node->prev_sibling;
+   tree_node *next=it2.node->next_sibling;
+   typename std::multiset<tree_node *, compare_nodes<StrictWeakOrdering> >::iterator nit=nodes.begin(), eit=nodes.end();
+   if(prev==0) {
+      if((*nit)->parent!=0) // to catch "sorting the head" situations, when there is no parent
+         (*nit)->parent->first_child=(*nit);
+      }
+   else prev->next_sibling=(*nit);
+
+   --eit;
+   while(nit!=eit) {
+      (*nit)->prev_sibling=prev;
+      if(prev)
+         prev->next_sibling=(*nit);
+      prev=(*nit);
+      ++nit;
+      }
+   // prev now points to the last-but-one node in the sorted range
+   if(prev)
+      prev->next_sibling=(*eit);
+
+   // eit points to the last node in the sorted range.
+   (*eit)->next_sibling=next;
+   (*eit)->prev_sibling=prev; // missed in the loop above
+   if(next==0) {
+      if((*eit)->parent!=0) // to catch "sorting the head" situations, when there is no parent
+         (*eit)->parent->last_child=(*eit);
+      }
+   else next->prev_sibling=(*eit);
+
+   if(deep) {  // sort the children of each node too
+      sibling_iterator bcs(*nodes.begin());
+      sibling_iterator ecs(*eit);
+      ++ecs;
+      while(bcs!=ecs) {
+         sort(begin(bcs), end(bcs), comp, deep);
+         ++bcs;
+         }
+      }
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter>
+bool tree<T, tree_node_allocator>::equal(const iter& one_, const iter& two, const iter& three_) const
+   {
+   std::equal_to<T> comp;
+   return equal(one_, two, three_, comp);
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter>
+bool tree<T, tree_node_allocator>::equal_subtree(const iter& one_, const iter& two_) const
+   {
+   std::equal_to<T> comp;
+   return equal_subtree(one_, two_, comp);
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter, class BinaryPredicate>
+bool tree<T, tree_node_allocator>::equal(const iter& one_, const iter& two, const iter& three_, BinaryPredicate fun) const
+   {
+   pre_order_iterator one(one_), three(three_);
+
+// if(one==two && is_valid(three) && three.number_of_children()!=0)
+//    return false;
+   while(one!=two && is_valid(three)) {
+      if(!fun(*one,*three))
+         return false;
+      if(one.number_of_children()!=three.number_of_children()) 
+         return false;
+      ++one;
+      ++three;
+      }
+   return true;
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter, class BinaryPredicate>
+bool tree<T, tree_node_allocator>::equal_subtree(const iter& one_, const iter& two_, BinaryPredicate fun) const
+   {
+   pre_order_iterator one(one_), two(two_);
+
+   if(!fun(*one,*two)) return false;
+   if(number_of_children(one)!=number_of_children(two)) return false;
+   return equal(begin(one),end(one),begin(two),fun);
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator> tree<T, tree_node_allocator>::subtree(sibling_iterator from, sibling_iterator to) const
+   {
+   tree tmp;
+   tmp.set_head(value_type());
+   tmp.replace(tmp.begin(), tmp.end(), from, to);
+   return tmp;
+   }
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::subtree(tree& tmp, sibling_iterator from, sibling_iterator to) const
+   {
+   tmp.set_head(value_type());
+   tmp.replace(tmp.begin(), tmp.end(), from, to);
+   }
+
+template <class T, class tree_node_allocator>
+int tree<T, tree_node_allocator>::size() const
+   {
+   int i=0;
+   pre_order_iterator it=begin(), eit=end();
+   while(it!=eit) {
+      ++i;
+      ++it;
+      }
+   return i;
+   }
+
+template <class T, class tree_node_allocator>
+int tree<T, tree_node_allocator>::size(const iterator_base& top) const
+   {
+   int i=0;
+   pre_order_iterator it=top, eit=top;
+   eit.skip_children();
+   ++eit;
+   while(it!=eit) {
+      ++i;
+      ++it;
+      }
+   return i;
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::empty() const
+   {
+   pre_order_iterator it=begin(), eit=end();
+   return (it==eit);
+   }
+
+template <class T, class tree_node_allocator>
+int tree<T, tree_node_allocator>::depth(const iterator_base& it) const
+   {
+   tree_node* pos=it.node;
+   assert(pos!=0);
+   int ret=0;
+   while(pos->parent!=0) {
+      pos=pos->parent;
+      ++ret;
+      }
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+unsigned int tree<T, tree_node_allocator>::number_of_children(const iterator_base& it) 
+   {
+   tree_node *pos=it.node->first_child;
+   if(pos==0) return 0;
+   
+   unsigned int ret=1;
+//   while(pos!=it.node->last_child) {
+//      ++ret;
+//      pos=pos->next_sibling;
+//      }
+   while((pos=pos->next_sibling))
+      ++ret;
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+unsigned int tree<T, tree_node_allocator>::number_of_siblings(const iterator_base& it) const
+   {
+   tree_node *pos=it.node;
+   unsigned int ret=0;
+   // count forward
+   while(pos->next_sibling && 
+         pos->next_sibling!=head &&
+         pos->next_sibling!=feet) {
+      ++ret;
+      pos=pos->next_sibling;
+      }
+   // count backward
+   pos=it.node;
+   while(pos->prev_sibling && 
+         pos->prev_sibling!=head &&
+         pos->prev_sibling!=feet) {
+      ++ret;
+      pos=pos->prev_sibling;
+      }
+   
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::swap(sibling_iterator it)
+   {
+   tree_node *nxt=it.node->next_sibling;
+   if(nxt) {
+      if(it.node->prev_sibling)
+         it.node->prev_sibling->next_sibling=nxt;
+      else
+         it.node->parent->first_child=nxt;
+      nxt->prev_sibling=it.node->prev_sibling;
+      tree_node *nxtnxt=nxt->next_sibling;
+      if(nxtnxt)
+         nxtnxt->prev_sibling=it.node;
+      else
+         it.node->parent->last_child=it.node;
+      nxt->next_sibling=it.node;
+      it.node->prev_sibling=nxt;
+      it.node->next_sibling=nxtnxt;
+      }
+   }
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::swap(iterator one, iterator two)
+   {
+   // if one and two are adjacent siblings, use the sibling swap
+   if(one.node->next_sibling==two.node) swap(one);
+   else if(two.node->next_sibling==one.node) swap(two);
+   else {
+      tree_node *nxt1=one.node->next_sibling;
+      tree_node *nxt2=two.node->next_sibling;
+      tree_node *pre1=one.node->prev_sibling;
+      tree_node *pre2=two.node->prev_sibling;
+      tree_node *par1=one.node->parent;
+      tree_node *par2=two.node->parent;
+
+      // reconnect
+      one.node->parent=par2;
+      one.node->next_sibling=nxt2;
+      if(nxt2) nxt2->prev_sibling=one.node;
+      else     par2->last_child=one.node;
+      one.node->prev_sibling=pre2;
+      if(pre2) pre2->next_sibling=one.node;
+      else     par2->first_child=one.node;    
+
+      two.node->parent=par1;
+      two.node->next_sibling=nxt1;
+      if(nxt1) nxt1->prev_sibling=two.node;
+      else     par1->last_child=two.node;
+      two.node->prev_sibling=pre1;
+      if(pre1) pre1->next_sibling=two.node;
+      else     par1->first_child=two.node;
+      }
+   }
+
+// template <class BinaryPredicate>
+// tree<T, tree_node_allocator>::iterator tree<T, tree_node_allocator>::find_subtree(
+//    sibling_iterator subfrom, sibling_iterator subto, iterator from, iterator to, 
+//    BinaryPredicate fun) const
+//    {
+//    assert(1==0); // this routine is not finished yet.
+//    while(from!=to) {
+//       if(fun(*subfrom, *from)) {
+//          
+//          }
+//       }
+//    return to;
+//    }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::is_in_subtree(const iterator_base& it, const iterator_base& begin, 
+                                                 const iterator_base& end) const
+   {
+   // FIXME: this should be optimised.
+   pre_order_iterator tmp=begin;
+   while(tmp!=end) {
+      if(tmp==it) return true;
+      ++tmp;
+      }
+   return false;
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::is_valid(const iterator_base& it) const
+   {
+   if(it.node==0 || it.node==feet || it.node==head) return false;
+   else return true;
+   }
+
+template <class T, class tree_node_allocator>
+unsigned int tree<T, tree_node_allocator>::index(sibling_iterator it) const
+   {
+   unsigned int ind=0;
+   if(it.node->parent==0) {
+      while(it.node->prev_sibling!=head) {
+         it.node=it.node->prev_sibling;
+         ++ind;
+         }
+      }
+   else {
+      while(it.node->prev_sibling!=0) {
+         it.node=it.node->prev_sibling;
+         ++ind;
+         }
+      }
+   return ind;
+   }
+
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::child(const iterator_base& it, unsigned int num) const
+   {
+   tree_node *tmp=it.node->first_child;
+   while(num--) {
+      assert(tmp!=0);
+      tmp=tmp->next_sibling;
+      }
+   return tmp;
+   }
+
+
+
+
+// Iterator base
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::iterator_base::iterator_base()
+   : node(0), skip_current_children_(false)
+   {
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::iterator_base::iterator_base(tree_node *tn)
+   : node(tn), skip_current_children_(false)
+   {
+   }
+
+template <class T, class tree_node_allocator>
+T& tree<T, tree_node_allocator>::iterator_base::operator*() const
+   {
+   return node->data;
+   }
+
+template <class T, class tree_node_allocator>
+T* tree<T, tree_node_allocator>::iterator_base::operator->() const
+   {
+   return &(node->data);
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::post_order_iterator::operator!=(const post_order_iterator& other) const
+   {
+   if(other.node!=this->node) return true;
+   else return false;
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::post_order_iterator::operator==(const post_order_iterator& other) const
+   {
+   if(other.node==this->node) return true;
+   else return false;
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::pre_order_iterator::operator!=(const pre_order_iterator& other) const
+   {
+   if(other.node!=this->node) return true;
+   else return false;
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::pre_order_iterator::operator==(const pre_order_iterator& other) const
+   {
+   if(other.node==this->node) return true;
+   else return false;
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::sibling_iterator::operator!=(const sibling_iterator& other) const
+   {
+   if(other.node!=this->node) return true;
+   else return false;
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::sibling_iterator::operator==(const sibling_iterator& other) const
+   {
+   if(other.node==this->node) return true;
+   else return false;
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::leaf_iterator::operator!=(const leaf_iterator& other) const
+   {
+   if(other.node!=this->node) return true;
+   else return false;
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::leaf_iterator::operator==(const leaf_iterator& other) const
+   {
+   if(other.node==this->node) return true;
+   else return false;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::iterator_base::begin() const
+   {
+   if(node->first_child==0) 
+      return end();
+
+   sibling_iterator ret(node->first_child);
+   ret.parent_=this->node;
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::iterator_base::end() const
+   {
+   sibling_iterator ret(0);
+   ret.parent_=node;
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::iterator_base::skip_children()
+   {
+   skip_current_children_=true;
+   }
+
+template <class T, class tree_node_allocator>
+unsigned int tree<T, tree_node_allocator>::iterator_base::number_of_children() const
+   {
+   tree_node *pos=node->first_child;
+   if(pos==0) return 0;
+   
+   unsigned int ret=1;
+   while(pos!=node->last_child) {
+      ++ret;
+      pos=pos->next_sibling;
+      }
+   return ret;
+   }
+
+
+
+// Pre-order iterator
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::pre_order_iterator::pre_order_iterator() 
+   : iterator_base(0)
+   {
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::pre_order_iterator::pre_order_iterator(tree_node *tn)
+   : iterator_base(tn)
+   {
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::pre_order_iterator::pre_order_iterator(const iterator_base &other)
+   : iterator_base(other.node)
+   {
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::pre_order_iterator::pre_order_iterator(const sibling_iterator& other)
+   : iterator_base(other.node)
+   {
+   if(this->node==0) {
+      if(other.range_last()!=0)
+         this->node=other.range_last();
+      else 
+         this->node=other.parent_;
+      this->skip_children();
+      ++(*this);
+      }
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::pre_order_iterator& tree<T, tree_node_allocator>::pre_order_iterator::operator++()
+   {
+   assert(this->node!=0);
+   if(!this->skip_current_children_ && this->node->first_child != 0) {
+      this->node=this->node->first_child;
+      }
+   else {
+      this->skip_current_children_=false;
+      while(this->node->next_sibling==0) {
+         this->node=this->node->parent;
+         if(this->node==0)
+            return *this;
+         }
+      this->node=this->node->next_sibling;
+      }
+   return *this;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::pre_order_iterator& tree<T, tree_node_allocator>::pre_order_iterator::operator--()
+   {
+   assert(this->node!=0);
+   if(this->node->prev_sibling) {
+      this->node=this->node->prev_sibling;
+      while(this->node->last_child)
+         this->node=this->node->last_child;
+      }
+   else {
+      this->node=this->node->parent;
+      if(this->node==0)
+         return *this;
+      }
+   return *this;
+}
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::pre_order_iterator tree<T, tree_node_allocator>::pre_order_iterator::operator++(int n)
+   {
+   pre_order_iterator copy = *this;
+   ++(*this);
+   return copy;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::pre_order_iterator tree<T, tree_node_allocator>::pre_order_iterator::operator--(int n)
+{
+  pre_order_iterator copy = *this;
+  --(*this);
+  return copy;
+}
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::pre_order_iterator& tree<T, tree_node_allocator>::pre_order_iterator::operator+=(unsigned int num)
+   {
+   while(num>0) {
+      ++(*this);
+      --num;
+      }
+   return (*this);
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::pre_order_iterator& tree<T, tree_node_allocator>::pre_order_iterator::operator-=(unsigned int num)
+   {
+   while(num>0) {
+      --(*this);
+      --num;
+      }
+   return (*this);
+   }
+
+
+
+// Post-order iterator
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::post_order_iterator::post_order_iterator() 
+   : iterator_base(0)
+   {
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::post_order_iterator::post_order_iterator(tree_node *tn)
+   : iterator_base(tn)
+   {
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::post_order_iterator::post_order_iterator(const iterator_base &other)
+   : iterator_base(other.node)
+   {
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::post_order_iterator::post_order_iterator(const sibling_iterator& other)
+   : iterator_base(other.node)
+   {
+   if(this->node==0) {
+      if(other.range_last()!=0)
+         this->node=other.range_last();
+      else 
+         this->node=other.parent_;
+      this->skip_children();
+      ++(*this);
+      }
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::post_order_iterator& tree<T, tree_node_allocator>::post_order_iterator::operator++()
+   {
+   assert(this->node!=0);
+   if(this->node->next_sibling==0) {
+      this->node=this->node->parent;
+      this->skip_current_children_=false;
+      }
+   else {
+      this->node=this->node->next_sibling;
+      if(this->skip_current_children_) {
+         this->skip_current_children_=false;
+         }
+      else {
+         while(this->node->first_child)
+            this->node=this->node->first_child;
+         }
+      }
+   return *this;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::post_order_iterator& tree<T, tree_node_allocator>::post_order_iterator::operator--()
+   {
+   assert(this->node!=0);
+   if(this->skip_current_children_ || this->node->last_child==0) {
+      this->skip_current_children_=false;
+      while(this->node->prev_sibling==0)
+         this->node=this->node->parent;
+      this->node=this->node->prev_sibling;
+      }
+   else {
+      this->node=this->node->last_child;
+      }
+   return *this;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::post_order_iterator tree<T, tree_node_allocator>::post_order_iterator::operator++(int)
+   {
+   post_order_iterator copy = *this;
+   ++(*this);
+   return copy;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::post_order_iterator tree<T, tree_node_allocator>::post_order_iterator::operator--(int)
+   {
+   post_order_iterator copy = *this;
+   --(*this);
+   return copy;
+   }
+
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::post_order_iterator& tree<T, tree_node_allocator>::post_order_iterator::operator+=(unsigned int num)
+   {
+   while(num>0) {
+      ++(*this);
+      --num;
+      }
+   return (*this);
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::post_order_iterator& tree<T, tree_node_allocator>::post_order_iterator::operator-=(unsigned int num)
+   {
+   while(num>0) {
+      --(*this);
+      --num;
+      }
+   return (*this);
+   }
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::post_order_iterator::descend_all()
+   {
+   assert(this->node!=0);
+   while(this->node->first_child)
+      this->node=this->node->first_child;
+   }
+
+
+// Breadth-first iterator
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::breadth_first_queued_iterator::breadth_first_queued_iterator()
+   : iterator_base()
+   {
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::breadth_first_queued_iterator::breadth_first_queued_iterator(tree_node *tn)
+   : iterator_base(tn)
+   {
+   traversal_queue.push(tn);
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::breadth_first_queued_iterator::breadth_first_queued_iterator(const iterator_base& other)
+   : iterator_base(other.node)
+   {
+   traversal_queue.push(other.node);
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::breadth_first_queued_iterator::operator!=(const breadth_first_queued_iterator& other) const
+   {
+   if(other.node!=this->node) return true;
+   else return false;
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::breadth_first_queued_iterator::operator==(const breadth_first_queued_iterator& other) const
+   {
+   if(other.node==this->node) return true;
+   else return false;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::breadth_first_queued_iterator& tree<T, tree_node_allocator>::breadth_first_queued_iterator::operator++()
+   {
+   assert(this->node!=0);
+
+   // Add child nodes and pop current node
+   sibling_iterator sib=this->begin();
+   while(sib!=this->end()) {
+      traversal_queue.push(sib.node);
+      ++sib;
+      }
+   traversal_queue.pop();
+   if(traversal_queue.size()>0)
+      this->node=traversal_queue.front();
+   else 
+      this->node=0;
+   return (*this);
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::breadth_first_queued_iterator tree<T, tree_node_allocator>::breadth_first_queued_iterator::operator++(int n)
+   {
+   breadth_first_queued_iterator copy = *this;
+   ++(*this);
+   return copy;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::breadth_first_queued_iterator& tree<T, tree_node_allocator>::breadth_first_queued_iterator::operator+=(unsigned int num)
+   {
+   while(num>0) {
+      ++(*this);
+      --num;
+      }
+   return (*this);
+   }
+
+
+
+// Fixed depth iterator
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::fixed_depth_iterator::fixed_depth_iterator()
+   : iterator_base()
+   {
+   set_first_parent_();
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::fixed_depth_iterator::fixed_depth_iterator(tree_node *tn)
+   : iterator_base(tn)
+   {
+   set_first_parent_();
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::fixed_depth_iterator::fixed_depth_iterator(const iterator_base& other)
+   : iterator_base(other.node)
+   {
+   set_first_parent_();
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::fixed_depth_iterator::fixed_depth_iterator(const sibling_iterator& other)
+   : iterator_base(other.node), first_parent_(other.parent_)
+   {
+   find_leftmost_parent_();
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::fixed_depth_iterator::fixed_depth_iterator(const fixed_depth_iterator& other)
+   : iterator_base(other.node), first_parent_(other.first_parent_)
+   {
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::fixed_depth_iterator::operator==(const fixed_depth_iterator& other) const
+   {
+   if(other.node==this->node && other.first_parent_==first_parent_) return true;
+   else return false;
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::fixed_depth_iterator::operator!=(const fixed_depth_iterator& other) const
+   {
+   if(other.node!=this->node || other.first_parent_!=first_parent_) return true;
+   else return false;
+   }
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::fixed_depth_iterator::set_first_parent_()
+   {
+   return; // FIXME: we do not use first_parent_ yet, and it actually needs some serious reworking if
+           // it is ever to work at the 'head' level.
+   first_parent_=0;
+   if(this->node==0) return;
+   if(this->node->parent!=0)
+      first_parent_=this->node->parent;
+   if(first_parent_)
+      find_leftmost_parent_();
+   }
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::fixed_depth_iterator::find_leftmost_parent_()
+   {
+   return; // FIXME: see 'set_first_parent()'
+   tree_node *tmppar=first_parent_;
+   while(tmppar->prev_sibling) {
+      tmppar=tmppar->prev_sibling;
+      if(tmppar->first_child)
+         first_parent_=tmppar;
+      }
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::fixed_depth_iterator& tree<T, tree_node_allocator>::fixed_depth_iterator::operator++()
+   {
+   assert(this->node!=0);
+
+   if(this->node->next_sibling) {
+      this->node=this->node->next_sibling;
+      }
+   else { 
+      int relative_depth=0;
+      upper:
+      do {
+         this->node=this->node->parent;
+         if(this->node==0) return *this;
+         --relative_depth;
+         } while(this->node->next_sibling==0);
+      lower:
+      this->node=this->node->next_sibling;
+      while(this->node->first_child==0) {
+         if(this->node->next_sibling==0)
+            goto upper;
+         this->node=this->node->next_sibling;
+         if(this->node==0) return *this;
+         }
+      while(relative_depth<0 && this->node->first_child!=0) {
+         this->node=this->node->first_child;
+         ++relative_depth;
+         }
+      if(relative_depth<0) {
+         if(this->node->next_sibling==0) goto upper;
+         else                          goto lower;
+         }
+      }
+   return *this;
+
+// if(this->node->next_sibling!=0) {
+//    this->node=this->node->next_sibling;
+//    assert(this->node!=0);
+//    if(this->node->parent==0 && this->node->next_sibling==0) // feet element
+//       this->node=0;
+//    }
+// else {
+//    tree_node *par=this->node->parent;
+//    do {
+//       par=par->next_sibling;
+//       if(par==0) { // FIXME: need to keep track of this!
+//          this->node=0;
+//          return *this;
+//          }
+//       } while(par->first_child==0);
+//    this->node=par->first_child;
+//    }
+   return *this;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::fixed_depth_iterator& tree<T, tree_node_allocator>::fixed_depth_iterator::operator--()
+   {
+   assert(this->node!=0);
+   if(this->node->prev_sibling!=0) {
+      this->node=this->node->prev_sibling;
+      assert(this->node!=0);
+      if(this->node->parent==0 && this->node->prev_sibling==0) // head element
+         this->node=0;
+      }
+   else {
+      tree_node *par=this->node->parent;
+      do {
+         par=par->prev_sibling;
+         if(par==0) { // FIXME: need to keep track of this!
+            this->node=0;
+            return *this;
+            }
+         } while(par->last_child==0);
+      this->node=par->last_child;
+      }
+   return *this;
+}
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::fixed_depth_iterator tree<T, tree_node_allocator>::fixed_depth_iterator::operator++(int)
+   {
+   fixed_depth_iterator copy = *this;
+   ++(*this);
+   return copy;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::fixed_depth_iterator tree<T, tree_node_allocator>::fixed_depth_iterator::operator--(int)
+{
+  fixed_depth_iterator copy = *this;
+  --(*this);
+  return copy;
+}
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::fixed_depth_iterator& tree<T, tree_node_allocator>::fixed_depth_iterator::operator-=(unsigned int num)
+   {
+   while(num>0) {
+      --(*this);
+      --(num);
+      }
+   return (*this);
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::fixed_depth_iterator& tree<T, tree_node_allocator>::fixed_depth_iterator::operator+=(unsigned int num)
+   {
+   while(num>0) {
+      ++(*this);
+      --(num);
+      }
+   return *this;
+   }
+
+// FIXME: add the other members of fixed_depth_iterator.
+
+
+// Sibling iterator
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::sibling_iterator::sibling_iterator() 
+   : iterator_base()
+   {
+   set_parent_();
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::sibling_iterator::sibling_iterator(tree_node *tn)
+   : iterator_base(tn)
+   {
+   set_parent_();
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::sibling_iterator::sibling_iterator(const iterator_base& other)
+   : iterator_base(other.node)
+   {
+   set_parent_();
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::sibling_iterator::sibling_iterator(const sibling_iterator& other)
+   : iterator_base(other), parent_(other.parent_)
+   {
+   }
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::sibling_iterator::set_parent_()
+   {
+   parent_=0;
+   if(this->node==0) return;
+   if(this->node->parent!=0)
+      parent_=this->node->parent;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator& tree<T, tree_node_allocator>::sibling_iterator::operator++()
+   {
+   if(this->node)
+      this->node=this->node->next_sibling;
+   return *this;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator& tree<T, tree_node_allocator>::sibling_iterator::operator--()
+   {
+   if(this->node) this->node=this->node->prev_sibling;
+   else {
+      assert(parent_);
+      this->node=parent_->last_child;
+      }
+   return *this;
+}
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::sibling_iterator::operator++(int)
+   {
+   sibling_iterator copy = *this;
+   ++(*this);
+   return copy;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::sibling_iterator::operator--(int)
+   {
+   sibling_iterator copy = *this;
+   --(*this);
+   return copy;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator& tree<T, tree_node_allocator>::sibling_iterator::operator+=(unsigned int num)
+   {
+   while(num>0) {
+      ++(*this);
+      --num;
+      }
+   return (*this);
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator& tree<T, tree_node_allocator>::sibling_iterator::operator-=(unsigned int num)
+   {
+   while(num>0) {
+      --(*this);
+      --num;
+      }
+   return (*this);
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::tree_node *tree<T, tree_node_allocator>::sibling_iterator::range_first() const
+   {
+   tree_node *tmp=parent_->first_child;
+   return tmp;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::tree_node *tree<T, tree_node_allocator>::sibling_iterator::range_last() const
+   {
+   return parent_->last_child;
+   }
+
+// Leaf iterator
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::leaf_iterator::leaf_iterator() 
+   : iterator_base(0)
+   {
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::leaf_iterator::leaf_iterator(tree_node *tn)
+   : iterator_base(tn)
+   {
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::leaf_iterator::leaf_iterator(const iterator_base &other)
+   : iterator_base(other.node)
+   {
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::leaf_iterator::leaf_iterator(const sibling_iterator& other)
+   : iterator_base(other.node)
+   {
+   if(this->node==0) {
+      if(other.range_last()!=0)
+         this->node=other.range_last();
+      else 
+         this->node=other.parent_;
+      ++(*this);
+      }
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::leaf_iterator& tree<T, tree_node_allocator>::leaf_iterator::operator++()
+   {
+   assert(this->node!=0);
+   while(this->node->next_sibling==0) {
+      if (this->node->parent==0) return *this;
+      this->node=this->node->parent;
+      }
+   this->node=this->node->next_sibling;
+   while(this->node->first_child)
+      this->node=this->node->first_child;
+   return *this;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::leaf_iterator& tree<T, tree_node_allocator>::leaf_iterator::operator--()
+   {
+   assert(this->node!=0);
+   while (this->node->prev_sibling==0) {
+      if (this->node->parent==0) return *this;
+      this->node=this->node->parent;
+      }
+   this->node=this->node->prev_sibling;
+   while(this->node->last_child)
+      this->node=this->node->last_child;
+   return *this;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::leaf_iterator tree<T, tree_node_allocator>::leaf_iterator::operator++(int)
+   {
+   leaf_iterator copy = *this;
+   ++(*this);
+   return copy;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::leaf_iterator tree<T, tree_node_allocator>::leaf_iterator::operator--(int)
+   {
+   leaf_iterator copy = *this;
+   --(*this);
+   return copy;
+   }
+
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::leaf_iterator& tree<T, tree_node_allocator>::leaf_iterator::operator+=(unsigned int num)
+   {
+   while(num>0) {
+      ++(*this);
+      --num;
+      }
+   return (*this);
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::leaf_iterator& tree<T, tree_node_allocator>::leaf_iterator::operator-=(unsigned int num)
+   {
+   while(num>0) {
+      --(*this);
+      --num;
+      }
+   return (*this);
+   }
+
+#endif
+
+// Local variables:
+// default-tab-width: 3
+// End:

Index: tree.hh
===================================================================
RCS file: tree.hh
diff -N tree.hh
--- tree.hh	22 Aug 2007 21:04:51 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,2620 +0,0 @@
-/* 
-
-   $Id: tree.hh,v 1.1 2007/08/22 21:04:51 strk Exp $
-
-   STL-like templated tree class.
-   Copyright (C) 2001-2006  Kasper Peeters <kasper.peeters@aei.mpg.de>.
-
-*/
-
-/** \mainpage tree.hh
-    \author   Kasper Peeters
-    \version  2.31
-    \date     21-Aug-2007
-    \see      http://www.aei.mpg.de/~peekas/tree/
-    \see      http://www.aei.mpg.de/~peekas/tree/ChangeLog
-
-   The tree.hh library for C++ provides an STL-like container class
-   for n-ary trees, templated over the data stored at the
-   nodes. Various types of iterators are provided (post-order,
-   pre-order, and others). Where possible the access methods are
-   compatible with the STL or alternative algorithms are
-   available. 
-*/
-
-
-/*
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 or 3.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-/** \todo 
-   - New-style move members are not completely finished yet.
-   - It would be good to have an iterator which can iterate over all
-     nodes below a given node.
-   - Fixed depth iterators do not iterate over the entire range if there
-     are 'holes' in the tree.
-   - If a range uses const iter_base& as end iterator, things will
-     inevitably go wrong, because upcast from iter_base to a non-sibling_iter
-     is incorrect. This upcast should be removed (and then all illegal uses
-     as previously in 'equal' will be flagged by the compiler). This requires
-     new copy constructors though.
-   - There's a bug in replace(sibling_iterator, ...) when the ranges
-     sit next to each other. Turned up in append_child(iter,iter)
-     but has been avoided now.
-   - "std::operator<" does not work correctly on our iterators, and for some
-     reason a globally defined template operator< did not get picked up. 
-     Using a comparison class now, but this should be investigated.
-*/
-
-#ifndef tree_hh_
-#define tree_hh_
-
-#include <cassert>
-#include <memory>
-#include <stdexcept>
-#include <iterator>
-#include <set>
-#include <queue>
-#include <iostream>
-
-// HP-style construct/destroy have gone from the standard,
-// so here is a copy.
-
-namespace kp {
-
-template <class T1, class T2>
-void constructor(T1* p, T2& val) 
-   {
-   new ((void *) p) T1(val);
-   }
-
-template <class T1>
-void constructor(T1* p) 
-   {
-   new ((void *) p) T1;
-   }
-
-template <class T1>
-void destructor(T1* p)
-   {
-   p->~T1();
-   }
-
-};
-
-/// A node in the tree, combining links to other nodes as well as the actual data.
-template<class T>
-class tree_node_ { // size: 5*4=20 bytes (on 32 bit arch), can be reduced by 8.
-   public:
-      tree_node_<T> *parent;
-      tree_node_<T> *first_child, *last_child;
-      tree_node_<T> *prev_sibling, *next_sibling;
-      T data;
-}; // __attribute__((packed));
-
-template <class T, class tree_node_allocator = std::allocator<tree_node_<T> > >
-class tree {
-   protected:
-      typedef tree_node_<T> tree_node;
-   public:
-      /// Value of the data stored at a node.
-      typedef T value_type;
-
-      class iterator_base;
-      class pre_order_iterator;
-      class post_order_iterator;
-      class sibling_iterator;
-      class leaf_iterator;
-
-      tree();
-      tree(const T&);
-      tree(const iterator_base&);
-      tree(const tree<T, tree_node_allocator>&);
-      ~tree();
-      void operator=(const tree<T, tree_node_allocator>&);
-
-      /// Base class for iterators, only pointers stored, no traversal logic.
-#ifdef __SGI_STL_PORT
-      class iterator_base : public stlport::bidirectional_iterator<T, ptrdiff_t> {
-#else
-      class iterator_base {
-#endif
-         public:
-            typedef T                               value_type;
-            typedef T*                              pointer;
-            typedef T&                              reference;
-            typedef size_t                          size_type;
-            typedef ptrdiff_t                       difference_type;
-            typedef std::bidirectional_iterator_tag iterator_category;
-
-            iterator_base();
-            iterator_base(tree_node *);
-
-            T&             operator*() const;
-            T*             operator->() const;
-
-            /// When called, the next increment/decrement skips children of this node.
-            void         skip_children();
-            /// Number of children of the node pointed to by the iterator.
-            unsigned int number_of_children() const;
-
-            sibling_iterator begin() const;
-            sibling_iterator end() const;
-
-            tree_node *node;
-         protected:
-            bool skip_current_children_;
-      };
-
-      /// Depth-first iterator, first accessing the node, then its children.
-      class pre_order_iterator : public iterator_base { 
-         public:
-            pre_order_iterator();
-            pre_order_iterator(tree_node *);
-            pre_order_iterator(const iterator_base&);
-            pre_order_iterator(const sibling_iterator&);
-
-            bool    operator==(const pre_order_iterator&) const;
-            bool    operator!=(const pre_order_iterator&) const;
-            pre_order_iterator&  operator++();
-            pre_order_iterator&  operator--();
-            pre_order_iterator   operator++(int);
-            pre_order_iterator   operator--(int);
-            pre_order_iterator&  operator+=(unsigned int);
-            pre_order_iterator&  operator-=(unsigned int);
-      };
-
-      /// Depth-first iterator, first accessing the children, then the node itself.
-      class post_order_iterator : public iterator_base {
-         public:
-            post_order_iterator();
-            post_order_iterator(tree_node *);
-            post_order_iterator(const iterator_base&);
-            post_order_iterator(const sibling_iterator&);
-
-            bool    operator==(const post_order_iterator&) const;
-            bool    operator!=(const post_order_iterator&) const;
-            post_order_iterator&  operator++();
-            post_order_iterator&  operator--();
-            post_order_iterator   operator++(int);
-            post_order_iterator   operator--(int);
-            post_order_iterator&  operator+=(unsigned int);
-            post_order_iterator&  operator-=(unsigned int);
-
-            /// Set iterator to the first child as deep as possible down the tree.
-            void descend_all();
-      };
-
-      /// Breadth-first iterator, using a queue
-      class breadth_first_queued_iterator : public iterator_base {
-         public:
-            breadth_first_queued_iterator();
-            breadth_first_queued_iterator(tree_node *);
-            breadth_first_queued_iterator(const iterator_base&);
-
-            bool    operator==(const breadth_first_queued_iterator&) const;
-            bool    operator!=(const breadth_first_queued_iterator&) const;
-            breadth_first_queued_iterator&  operator++();
-            breadth_first_queued_iterator   operator++(int);
-            breadth_first_queued_iterator&  operator+=(unsigned int);
-
-         private:
-            std::queue<tree_node *> traversal_queue;
-      };
-
-      /// The default iterator types throughout the tree class.
-      typedef pre_order_iterator            iterator;
-      typedef breadth_first_queued_iterator breadth_first_iterator;
-
-      /// Iterator which traverses only the nodes at a given depth from the root.
-      class fixed_depth_iterator : public iterator_base {
-         public:
-            fixed_depth_iterator();
-            fixed_depth_iterator(tree_node *);
-            fixed_depth_iterator(const iterator_base&);
-            fixed_depth_iterator(const sibling_iterator&);
-            fixed_depth_iterator(const fixed_depth_iterator&);
-
-            bool    operator==(const fixed_depth_iterator&) const;
-            bool    operator!=(const fixed_depth_iterator&) const;
-            fixed_depth_iterator&  operator++();
-            fixed_depth_iterator&  operator--();
-            fixed_depth_iterator   operator++(int);
-            fixed_depth_iterator   operator--(int);
-            fixed_depth_iterator&  operator+=(unsigned int);
-            fixed_depth_iterator&  operator-=(unsigned int);
-
-            tree_node *first_parent_;
-         private:
-            void set_first_parent_();
-            void find_leftmost_parent_();
-      };
-
-      /// Iterator which traverses only the nodes which are siblings of each other.
-      class sibling_iterator : public iterator_base {
-         public:
-            sibling_iterator();
-            sibling_iterator(tree_node *);
-            sibling_iterator(const sibling_iterator&);
-            sibling_iterator(const iterator_base&);
-
-            bool    operator==(const sibling_iterator&) const;
-            bool    operator!=(const sibling_iterator&) const;
-            sibling_iterator&  operator++();
-            sibling_iterator&  operator--();
-            sibling_iterator   operator++(int);
-            sibling_iterator   operator--(int);
-            sibling_iterator&  operator+=(unsigned int);
-            sibling_iterator&  operator-=(unsigned int);
-
-            tree_node *range_first() const;
-            tree_node *range_last() const;
-            tree_node *parent_;
-         private:
-            void set_parent_();
-      };
-
-      /// Iterator which traverses only the leaves.
-      class leaf_iterator : public iterator_base {
-         public:
-            leaf_iterator();
-            leaf_iterator(tree_node *);
-            leaf_iterator(const sibling_iterator&);
-            leaf_iterator(const iterator_base&);
-
-            bool    operator==(const leaf_iterator&) const;
-            bool    operator!=(const leaf_iterator&) const;
-            leaf_iterator&  operator++();
-            leaf_iterator&  operator--();
-            leaf_iterator   operator++(int);
-            leaf_iterator   operator--(int);
-            leaf_iterator&  operator+=(unsigned int);
-            leaf_iterator&  operator-=(unsigned int);
-      };
-
-      /// Return iterator to the beginning of the tree.
-      inline pre_order_iterator   begin() const;
-      /// Return iterator to the end of the tree.
-      inline pre_order_iterator   end() const;
-      /// Return post-order iterator to the beginning of the tree.
-      post_order_iterator  begin_post() const;
-      /// Return post-order iterator to the end of the tree.
-      post_order_iterator  end_post() const;
-      /// Return fixed-depth iterator to the first node at a given depth.
-      fixed_depth_iterator begin_fixed(const iterator_base&, unsigned int) const;
-      /// Return fixed-depth iterator to end of the nodes at given depth.
-      fixed_depth_iterator end_fixed(const iterator_base&, unsigned int) const;
-      /// Return breadth-first iterator to the first node at a given depth.
-      breadth_first_queued_iterator begin_breadth_first() const;
-      /// Return breadth-first iterator to end of the nodes at given depth.
-      breadth_first_queued_iterator end_breadth_first() const;
-      /// Return sibling iterator to the first child of given node.
-      sibling_iterator     begin(const iterator_base&) const;
-      /// Return sibling iterator to the end of the children of a given node.
-      sibling_iterator     end(const iterator_base&) const;
-      /// Return leaf iterator to the first leaf of the tree.
-      leaf_iterator   begin_leaf() const;
-      /// Return leaf iterator to the last leaf of the tree.
-      leaf_iterator   end_leaf() const;
-
-      /// Return iterator to the parent of a node.
-      template<typename iter> static iter parent(iter);
-      /// Return iterator to the previous sibling of a node.
-      template<typename iter> iter previous_sibling(iter) const;
-      /// Return iterator to the next sibling of a node.
-      template<typename iter> iter next_sibling(iter) const;
-      /// Return iterator to the next node at a given depth.
-      template<typename iter> iter next_at_same_depth(iter) const;
-
-      /// Erase all nodes of the tree.
-      void     clear();
-      /// Erase element at position pointed to by iterator, return incremented iterator.
-      template<typename iter> iter erase(iter);
-      /// Erase all children of the node pointed to by iterator.
-      void     erase_children(const iterator_base&);
-
-      /// Insert empty node as last/first child of node pointed to by position.
-      template<typename iter> iter append_child(iter position); 
-      template<typename iter> iter prepend_child(iter position); 
-      /// Insert node as last/first child of node pointed to by position.
-      template<typename iter> iter append_child(iter position, const T& x);
-      template<typename iter> iter prepend_child(iter position, const T& x);
-      /// Append the node (plus its children) at other_position as last/first child of position.
-      template<typename iter> iter append_child(iter position, iter other_position);
-      template<typename iter> iter prepend_child(iter position, iter other_position);
-      /// Append the nodes in the from-to range (plus their children) as last/first children of position.
-      template<typename iter> iter append_children(iter position, sibling_iterator from, sibling_iterator to);
-      template<typename iter> iter prepend_children(iter position, sibling_iterator from, sibling_iterator to);
-
-      /// Short-hand to insert topmost node in otherwise empty tree.
-      pre_order_iterator set_head(const T& x);
-      /// Insert node as previous sibling of node pointed to by position.
-      template<typename iter> iter insert(iter position, const T& x);
-      /// Specialisation of previous member.
-      sibling_iterator insert(sibling_iterator position, const T& x);
-      /// Insert node (with children) pointed to by subtree as previous sibling of node pointed to by position.
-      template<typename iter> iter insert_subtree(iter position, const iterator_base& subtree);
-      /// Insert node as next sibling of node pointed to by position.
-      template<typename iter> iter insert_after(iter position, const T& x);
-      /// Insert node (with children) pointed to by subtree as next sibling of node pointed to by position.
-      template<typename iter> iter insert_subtree_after(iter position, const iterator_base& subtree);
-
-      /// Replace node at 'position' with other node (keeping same children); 'position' becomes invalid.
-      template<typename iter> iter replace(iter position, const T& x);
-      /// Replace node at 'position' with subtree starting at 'from' (do not erase subtree at 'from'); see above.
-      template<typename iter> iter replace(iter position, const iterator_base& from);
-      /// Replace string of siblings (plus their children) with copy of a new string (with children); see above
-      sibling_iterator replace(sibling_iterator orig_begin, sibling_iterator orig_end, 
-                               sibling_iterator new_begin,  sibling_iterator new_end); 
-
-      /// Move all children of node at 'position' to be siblings, returns position.
-      template<typename iter> iter flatten(iter position);
-      /// Move nodes in range to be children of 'position'.
-      template<typename iter> iter reparent(iter position, sibling_iterator begin, sibling_iterator end);
-      /// Move all child nodes of 'from' to be children of 'position'.
-      template<typename iter> iter reparent(iter position, iter from);
-
-      /// Replace node with a new node, making the old node a child of the new node.
-      template<typename iter> iter wrap(iter position, const T& x);
-
-      /// Move 'source' node (plus its children) to become the next sibling of 'target'.
-      template<typename iter> iter move_after(iter target, iter source);
-      /// Move 'source' node (plus its children) to become the previous sibling of 'target'.
-      template<typename iter> iter move_before(iter target, iter source);
-      sibling_iterator move_before(sibling_iterator target, sibling_iterator source);
-      /// Move 'source' node (plus its children) to become the node at 'target' (erasing the node at 'target').
-      template<typename iter> iter move_ontop(iter target, iter source);
-
-      /// Merge with other tree, creating new branches and leaves only if they are not already present.
-      void     merge(sibling_iterator, sibling_iterator, sibling_iterator, sibling_iterator, 
-                     bool duplicate_leaves=false);
-      /// Sort (std::sort only moves values of nodes, this one moves children as well).
-      void     sort(sibling_iterator from, sibling_iterator to, bool deep=false);
-      template<class StrictWeakOrdering>
-      void     sort(sibling_iterator from, sibling_iterator to, StrictWeakOrdering comp, bool deep=false);
-      /// Compare two ranges of nodes (compares nodes as well as tree structure).
-      template<typename iter>
-      bool     equal(const iter& one, const iter& two, const iter& three) const;
-      template<typename iter, class BinaryPredicate>
-      bool     equal(const iter& one, const iter& two, const iter& three, BinaryPredicate) const;
-      template<typename iter>
-      bool     equal_subtree(const iter& one, const iter& two) const;
-      template<typename iter, class BinaryPredicate>
-      bool     equal_subtree(const iter& one, const iter& two, BinaryPredicate) const;
-      /// Extract a new tree formed by the range of siblings plus all their children.
-      tree     subtree(sibling_iterator from, sibling_iterator to) const;
-      void     subtree(tree&, sibling_iterator from, sibling_iterator to) const;
-      /// Exchange the node (plus subtree) with its sibling node (do nothing if no sibling present).
-      void     swap(sibling_iterator it);
-      /// Exchange two nodes (plus subtrees)
-      void     swap(iterator, iterator);
-      
-      /// Count the total number of nodes.
-      int      size() const;
-      /// Count the total number of nodes below the indicated node (plus one).
-      int      size(const iterator_base&) const;
-      /// Check if tree is empty.
-      bool     empty() const;
-      /// Compute the depth to the root.
-      int      depth(const iterator_base&) const;
-      /// Count the number of children of node at position.
-      static unsigned int number_of_children(const iterator_base&);
-      /// Count the number of 'next' siblings of node at iterator.
-      unsigned int number_of_siblings(const iterator_base&) const;
-      /// Determine whether node at position is in the subtrees with root in the range.
-      bool     is_in_subtree(const iterator_base& position, const iterator_base& begin, 
-                             const iterator_base& end) const;
-      /// Determine whether the iterator is an 'end' iterator and thus not actually pointing to a node.
-      bool     is_valid(const iterator_base&) const;
-
-      /// Determine the index of a node in the range of siblings to which it belongs.
-      unsigned int index(sibling_iterator it) const;
-      /// Inverse of 'index': return the n-th child of the node at position.
-      sibling_iterator  child(const iterator_base& position, unsigned int) const;
-      
-      /// Comparator class for iterators (compares pointer values; why doesn't this work automatically?)
-      class iterator_base_less {
-         public:
-            bool operator()(const typename tree<T, tree_node_allocator>::iterator_base& one,
-                            const typename tree<T, tree_node_allocator>::iterator_base& two) const
-               {
-               return one.node < two.node;
-               }
-      };
-      tree_node *head, *feet;    // head/feet are always dummy; if an iterator points to them it is invalid
-   private:
-      tree_node_allocator alloc_;
-      void head_initialise_();
-      void copy_(const tree<T, tree_node_allocator>& other);
-
-      /// Comparator class for two nodes of a tree (used for sorting and searching).
-      template<class StrictWeakOrdering>
-      class compare_nodes {
-         public:
-            compare_nodes(StrictWeakOrdering comp) : comp_(comp) {};
-            
-            bool operator()(const tree_node *a, const tree_node *b) 
-               {
-               static StrictWeakOrdering comp;
-               return comp(a->data, b->data);
-               }
-         private:
-            StrictWeakOrdering comp_;
-      };
-};
-
-//template <class T, class tree_node_allocator>
-//class iterator_base_less {
-// public:
-//    bool operator()(const typename tree<T, tree_node_allocator>::iterator_base& one,
-//                  const typename tree<T, tree_node_allocator>::iterator_base& two) const
-//       {
-//       txtout << "operatorclass<" << one.node < two.node << std::endl;
-//       return one.node < two.node;
-//       }
-//};
-
-// template <class T, class tree_node_allocator>
-// bool operator<(const typename tree<T, tree_node_allocator>::iterator& one,
-//                const typename tree<T, tree_node_allocator>::iterator& two)
-//    {
-//    txtout << "operator< " << one.node < two.node << std::endl;
-//    if(one.node < two.node) return true;
-//    return false;
-//    }
-// 
-// template <class T, class tree_node_allocator>
-// bool operator==(const typename tree<T, tree_node_allocator>::iterator& one,
-//                const typename tree<T, tree_node_allocator>::iterator& two)
-//    {
-//    txtout << "operator== " << one.node == two.node << std::endl;
-//    if(one.node == two.node) return true;
-//    return false;
-//    }
-// 
-// template <class T, class tree_node_allocator>
-// bool operator>(const typename tree<T, tree_node_allocator>::iterator_base& one,
-//                const typename tree<T, tree_node_allocator>::iterator_base& two)
-//    {
-//    txtout << "operator> " << one.node < two.node << std::endl;
-//    if(one.node > two.node) return true;
-//    return false;
-//    }
-
-
-
-// Tree
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::tree() 
-   {
-   head_initialise_();
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::tree(const T& x) 
-   {
-   head_initialise_();
-   set_head(x);
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::tree(const iterator_base& other)
-   {
-   head_initialise_();
-   set_head((*other));
-   replace(begin(), other);
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::~tree()
-   {
-   clear();
-   alloc_.deallocate(head,1);
-   alloc_.deallocate(feet,1);
-   }
-
-template <class T, class tree_node_allocator>
-void tree<T, tree_node_allocator>::head_initialise_() 
-   { 
-   head = alloc_.allocate(1,0); // MSVC does not have default second argument 
-   feet = alloc_.allocate(1,0);
-
-   head->parent=0;
-   head->first_child=0;
-   head->last_child=0;
-   head->prev_sibling=0; //head;
-   head->next_sibling=feet; //head;
-
-   feet->parent=0;
-   feet->first_child=0;
-   feet->last_child=0;
-   feet->prev_sibling=head;
-   feet->next_sibling=0;
-   }
-
-template <class T, class tree_node_allocator>
-void tree<T, tree_node_allocator>::operator=(const tree<T, tree_node_allocator>& other)
-   {
-   copy_(other);
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::tree(const tree<T, tree_node_allocator>& other)
-   {
-   head_initialise_();
-   copy_(other);
-   }
-
-template <class T, class tree_node_allocator>
-void tree<T, tree_node_allocator>::copy_(const tree<T, tree_node_allocator>& other) 
-   {
-   clear();
-   pre_order_iterator it=other.begin(), to=begin();
-   while(it!=other.end()) {
-      to=insert(to, (*it));
-      it.skip_children();
-      ++it;
-      }
-   to=begin();
-   it=other.begin();
-   while(it!=other.end()) {
-      to=replace(to, it);
-      to.skip_children();
-      it.skip_children();
-      ++to;
-      ++it;
-      }
-   }
-
-template <class T, class tree_node_allocator>
-void tree<T, tree_node_allocator>::clear()
-   {
-   if(head)
-      while(head->next_sibling!=feet)
-         erase(pre_order_iterator(head->next_sibling));
-   }
-
-template<class T, class tree_node_allocator> 
-void tree<T, tree_node_allocator>::erase_children(const iterator_base& it)
-   {
-// std::cout << "erase_children " << it.node << std::endl;
-   if(it.node==0) return;
-
-   tree_node *cur=it.node->first_child;
-   tree_node *prev=0;
-
-   while(cur!=0) {
-      prev=cur;
-      cur=cur->next_sibling;
-      erase_children(pre_order_iterator(prev));
-      kp::destructor(&prev->data);
-      alloc_.deallocate(prev,1);
-      }
-   it.node->first_child=0;
-   it.node->last_child=0;
-// std::cout << "exit" << std::endl;
-   }
-
-template<class T, class tree_node_allocator> 
-template<class iter>
-iter tree<T, tree_node_allocator>::erase(iter it)
-   {
-   tree_node *cur=it.node;
-   assert(cur!=head);
-   iter ret=it;
-   ret.skip_children();
-   ++ret;
-   erase_children(it);
-   if(cur->prev_sibling==0) {
-      cur->parent->first_child=cur->next_sibling;
-      }
-   else {
-      cur->prev_sibling->next_sibling=cur->next_sibling;
-      }
-   if(cur->next_sibling==0) {
-      cur->parent->last_child=cur->prev_sibling;
-      }
-   else {
-      cur->next_sibling->prev_sibling=cur->prev_sibling;
-      }
-
-   kp::destructor(&cur->data);
-   alloc_.deallocate(cur,1);
-   return ret;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::pre_order_iterator tree<T, tree_node_allocator>::begin() const
-   {
-   return pre_order_iterator(head->next_sibling);
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::pre_order_iterator tree<T, tree_node_allocator>::end() const
-   {
-   return pre_order_iterator(feet);
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::breadth_first_queued_iterator tree<T, tree_node_allocator>::begin_breadth_first() const
-   {
-   return breadth_first_queued_iterator(head->next_sibling);
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::breadth_first_queued_iterator tree<T, tree_node_allocator>::end_breadth_first() const
-   {
-   return breadth_first_queued_iterator();
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::post_order_iterator tree<T, tree_node_allocator>::begin_post() const
-   {
-   tree_node *tmp=head->next_sibling;
-   if(tmp!=feet) {
-      while(tmp->first_child)
-         tmp=tmp->first_child;
-      }
-   return post_order_iterator(tmp);
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::post_order_iterator tree<T, tree_node_allocator>::end_post() const
-   {
-   return post_order_iterator(feet);
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::fixed_depth_iterator tree<T, tree_node_allocator>::begin_fixed(const iterator_base& pos, unsigned int dp) const
-   {
-   tree_node *tmp=pos.node;
-   unsigned int curdepth=0;
-   while(curdepth<dp) { // go down one level
-      while(tmp->first_child==0) {
-         tmp=tmp->next_sibling;
-         if(tmp==0)
-            throw std::range_error("tree: begin_fixed out of range");
-         }
-      tmp=tmp->first_child;
-      ++curdepth;
-      }
-   return tmp;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::fixed_depth_iterator tree<T, tree_node_allocator>::end_fixed(const iterator_base& pos, unsigned int dp) const
-   {
-   assert(1==0); // FIXME: not correct yet
-   tree_node *tmp=pos.node;
-   unsigned int curdepth=1;
-   while(curdepth<dp) { // go down one level
-      while(tmp->first_child==0) {
-         tmp=tmp->next_sibling;
-         if(tmp==0)
-            throw std::range_error("tree: end_fixed out of range");
-         }
-      tmp=tmp->first_child;
-      ++curdepth;
-      }
-   return tmp;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::begin(const iterator_base& pos) const
-   {
-   assert(pos.node!=0);
-   if(pos.node->first_child==0) {
-      return end(pos);
-      }
-   return pos.node->first_child;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::end(const iterator_base& pos) const
-   {
-   sibling_iterator ret(0);
-   ret.parent_=pos.node;
-   return ret;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::leaf_iterator tree<T, tree_node_allocator>::begin_leaf() const
-   {
-   tree_node *tmp=head->next_sibling;
-   if(tmp!=feet) {
-      while(tmp->first_child)
-         tmp=tmp->first_child;
-      }
-   return leaf_iterator(tmp);
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::leaf_iterator tree<T, tree_node_allocator>::end_leaf() const
-   {
-   return leaf_iterator(feet);
-   }
-
-template <class T, class tree_node_allocator>
-template <typename iter>
-iter tree<T, tree_node_allocator>::parent(iter position) 
-   {
-   assert(position.node!=0);
-   return iter(position.node->parent);
-   }
-
-template <class T, class tree_node_allocator>
-template <typename iter>
-iter tree<T, tree_node_allocator>::previous_sibling(iter position) const
-   {
-   assert(position.node!=0);
-   iter ret(position);
-   ret.node=position.node->prev_sibling;
-   return ret;
-   }
-
-template <class T, class tree_node_allocator>
-template <typename iter>
-iter tree<T, tree_node_allocator>::next_sibling(iter position) const
-   {
-   assert(position.node!=0);
-   iter ret(position);
-   ret.node=position.node->next_sibling;
-   return ret;
-   }
-
-template <class T, class tree_node_allocator>
-template <typename iter>
-iter tree<T, tree_node_allocator>::next_at_same_depth(iter position) const
-   {
-   assert(position.node!=0);
-   iter ret(position);
-
-   if(position.node->next_sibling) {
-      ret.node=position.node->next_sibling;
-      }
-   else { 
-      int relative_depth=0;
-      upper:
-      do {
-         ret.node=ret.node->parent;
-         if(ret.node==0) return ret;
-         --relative_depth;
-         } while(ret.node->next_sibling==0);
-      lower:
-      ret.node=ret.node->next_sibling;
-      while(ret.node->first_child==0) {
-         if(ret.node->next_sibling==0)
-            goto upper;
-         ret.node=ret.node->next_sibling;
-         if(ret.node==0) return ret;
-         }
-      while(relative_depth<0 && ret.node->first_child!=0) {
-         ret.node=ret.node->first_child;
-         ++relative_depth;
-         }
-      if(relative_depth<0) {
-         if(ret.node->next_sibling==0) goto upper;
-         else                          goto lower;
-         }
-      }
-   return ret;
-   }
-
-template <class T, class tree_node_allocator>
-template <typename iter>
-iter tree<T, tree_node_allocator>::append_child(iter position)
-   {
-   assert(position.node!=head);
-   assert(position.node);
-
-   tree_node *tmp=alloc_.allocate(1,0);
-   kp::constructor(&tmp->data);
-   tmp->first_child=0;
-   tmp->last_child=0;
-
-   tmp->parent=position.node;
-   if(position.node->last_child!=0) {
-      position.node->last_child->next_sibling=tmp;
-      }
-   else {
-      position.node->first_child=tmp;
-      }
-   tmp->prev_sibling=position.node->last_child;
-   position.node->last_child=tmp;
-   tmp->next_sibling=0;
-   return tmp;
-   }
-
-template <class T, class tree_node_allocator>
-template <typename iter>
-iter tree<T, tree_node_allocator>::prepend_child(iter position)
-   {
-   assert(position.node!=head);
-   assert(position.node);
-
-   tree_node *tmp=alloc_.allocate(1,0);
-   kp::constructor(&tmp->data);
-   tmp->first_child=0;
-   tmp->last_child=0;
-
-   tmp->parent=position.node;
-   if(position.node->first_child!=0) {
-      position.node->first_child->prev_sibling=tmp;
-      }
-   else {
-      position.node->last_child=tmp;
-      }
-   tmp->next_sibling=position.node->first_child;
-   position.node->prev_child=tmp;
-   tmp->prev_sibling=0;
-   return tmp;
-   }
-
-template <class T, class tree_node_allocator>
-template <class iter>
-iter tree<T, tree_node_allocator>::append_child(iter position, const T& x)
-   {
-   // If your program fails here you probably used 'append_child' to add the top
-   // node to an empty tree. From version 1.45 the top element should be added
-   // using 'insert'. See the documentation for further information, and sorry about
-   // the API change.
-   assert(position.node!=head);
-   assert(position.node);
-
-   tree_node* tmp = alloc_.allocate(1,0);
-   kp::constructor(&tmp->data, x);
-   tmp->first_child=0;
-   tmp->last_child=0;
-
-   tmp->parent=position.node;
-   if(position.node->last_child!=0) {
-      position.node->last_child->next_sibling=tmp;
-      }
-   else {
-      position.node->first_child=tmp;
-      }
-   tmp->prev_sibling=position.node->last_child;
-   position.node->last_child=tmp;
-   tmp->next_sibling=0;
-   return tmp;
-   }
-
-template <class T, class tree_node_allocator>
-template <class iter>
-iter tree<T, tree_node_allocator>::prepend_child(iter position, const T& x)
-   {
-   assert(position.node!=head);
-   assert(position.node);
-
-   tree_node* tmp = alloc_.allocate(1,0);
-   kp::constructor(&tmp->data, x);
-   tmp->first_child=0;
-   tmp->last_child=0;
-
-   tmp->parent=position.node;
-   if(position.node->first_child!=0) {
-      position.node->first_child->prev_sibling=tmp;
-      }
-   else {
-      position.node->last_child=tmp;
-      }
-   tmp->next_sibling=position.node->first_child;
-   position.node->first_child=tmp;
-   tmp->prev_sibling=0;
-   return tmp;
-   }
-
-template <class T, class tree_node_allocator>
-template <class iter>
-iter tree<T, tree_node_allocator>::append_child(iter position, iter other)
-   {
-   assert(position.node!=head);
-   assert(position.node);
-
-   sibling_iterator aargh=append_child(position, value_type());
-   return replace(aargh, other);
-   }
-
-template <class T, class tree_node_allocator>
-template <class iter>
-iter tree<T, tree_node_allocator>::prepend_child(iter position, iter other)
-   {
-   assert(position.node!=head);
-   assert(position.node);
-
-   sibling_iterator aargh=prepend_child(position, value_type());
-   return replace(aargh, other);
-   }
-
-template <class T, class tree_node_allocator>
-template <class iter>
-iter tree<T, tree_node_allocator>::append_children(iter position, sibling_iterator from, sibling_iterator to)
-   {
-   assert(position.node!=head);
-   assert(position.node);
-
-   iter ret=from;
-
-   while(from!=to) {
-      insert_subtree(position.end(), from);
-      ++from;
-      }
-   return ret;
-   }
-
-template <class T, class tree_node_allocator>
-template <class iter>
-iter tree<T, tree_node_allocator>::prepend_children(iter position, sibling_iterator from, sibling_iterator to)
-   {
-   assert(position.node!=head);
-   assert(position.node);
-
-   iter ret=from;
-
-   while(from!=to) {
-      insert_subtree(position.begin(), from);
-      ++from;
-      }
-   return ret;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::pre_order_iterator tree<T, tree_node_allocator>::set_head(const T& x)
-   {
-   assert(head->next_sibling==feet);
-   return insert(iterator(feet), x);
-   }
-
-template <class T, class tree_node_allocator>
-template <class iter>
-iter tree<T, tree_node_allocator>::insert(iter position, const T& x)
-   {
-   if(position.node==0) {
-      position.node=feet; // Backward compatibility: when calling insert on a null node,
-                          // insert before the feet.
-      }
-   tree_node* tmp = alloc_.allocate(1,0);
-   kp::constructor(&tmp->data, x);
-   tmp->first_child=0;
-   tmp->last_child=0;
-
-   tmp->parent=position.node->parent;
-   tmp->next_sibling=position.node;
-   tmp->prev_sibling=position.node->prev_sibling;
-   position.node->prev_sibling=tmp;
-
-   if(tmp->prev_sibling==0) {
-      if(tmp->parent) // when inserting nodes at the head, there is no parent
-         tmp->parent->first_child=tmp;
-      }
-   else
-      tmp->prev_sibling->next_sibling=tmp;
-   return tmp;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::insert(sibling_iterator position, const T& x)
-   {
-   tree_node* tmp = alloc_.allocate(1,0);
-   kp::constructor(&tmp->data, x);
-   tmp->first_child=0;
-   tmp->last_child=0;
-
-   tmp->next_sibling=position.node;
-   if(position.node==0) { // iterator points to end of a subtree
-      tmp->parent=position.parent_;
-      tmp->prev_sibling=position.range_last();
-      tmp->parent->last_child=tmp;
-      }
-   else {
-      tmp->parent=position.node->parent;
-      tmp->prev_sibling=position.node->prev_sibling;
-      position.node->prev_sibling=tmp;
-      }
-
-   if(tmp->prev_sibling==0) {
-      if(tmp->parent) // when inserting nodes at the head, there is no parent
-         tmp->parent->first_child=tmp;
-      }
-   else
-      tmp->prev_sibling->next_sibling=tmp;
-   return tmp;
-   }
-
-template <class T, class tree_node_allocator>
-template <class iter>
-iter tree<T, tree_node_allocator>::insert_after(iter position, const T& x)
-   {
-   tree_node* tmp = alloc_.allocate(1,0);
-   kp::constructor(&tmp->data, x);
-   tmp->first_child=0;
-   tmp->last_child=0;
-
-   tmp->parent=position.node->parent;
-   tmp->prev_sibling=position.node;
-   tmp->next_sibling=position.node->next_sibling;
-   position.node->next_sibling=tmp;
-
-   if(tmp->next_sibling==0) {
-      if(tmp->parent) // when inserting nodes at the head, there is no parent
-         tmp->parent->last_child=tmp;
-      }
-   else {
-      tmp->next_sibling->prev_sibling=tmp;
-      }
-   return tmp;
-   }
-
-template <class T, class tree_node_allocator>
-template <class iter>
-iter tree<T, tree_node_allocator>::insert_subtree(iter position, const iterator_base& subtree)
-   {
-   // insert dummy
-   iter it=insert(position, value_type());
-   // replace dummy with subtree
-   return replace(it, subtree);
-   }
-
-template <class T, class tree_node_allocator>
-template <class iter>
-iter tree<T, tree_node_allocator>::insert_subtree_after(iter position, const iterator_base& subtree)
-   {
-   // insert dummy
-   iter it=insert_after(position, value_type());
-   // replace dummy with subtree
-   return replace(it, subtree);
-   }
-
-// template <class T, class tree_node_allocator>
-// template <class iter>
-// iter tree<T, tree_node_allocator>::insert_subtree(sibling_iterator position, iter subtree)
-//    {
-//    // insert dummy
-//    iter it(insert(position, value_type()));
-//    // replace dummy with subtree
-//    return replace(it, subtree);
-//    }
-
-template <class T, class tree_node_allocator>
-template <class iter>
-iter tree<T, tree_node_allocator>::replace(iter position, const T& x)
-   {
-   kp::destructor(&position.node->data);
-   kp::constructor(&position.node->data, x);
-   return position;
-   }
-
-template <class T, class tree_node_allocator>
-template <class iter>
-iter tree<T, tree_node_allocator>::replace(iter position, const iterator_base& from)
-   {
-   assert(position.node!=head);
-   tree_node *current_from=from.node;
-   tree_node *start_from=from.node;
-   tree_node *current_to  =position.node;
-
-   // replace the node at position with head of the replacement tree at from
-// std::cout << "warning!" << position.node << std::endl;
-   erase_children(position);  
-// std::cout << "no warning!" << std::endl;
-   tree_node* tmp = alloc_.allocate(1,0);
-   kp::constructor(&tmp->data, (*from));
-   tmp->first_child=0;
-   tmp->last_child=0;
-   if(current_to->prev_sibling==0) {
-      if(current_to->parent!=0)
-         current_to->parent->first_child=tmp;
-      }
-   else {
-      current_to->prev_sibling->next_sibling=tmp;
-      }
-   tmp->prev_sibling=current_to->prev_sibling;
-   if(current_to->next_sibling==0) {
-      if(current_to->parent!=0)
-         current_to->parent->last_child=tmp;
-      }
-   else {
-      current_to->next_sibling->prev_sibling=tmp;
-      }
-   tmp->next_sibling=current_to->next_sibling;
-   tmp->parent=current_to->parent;
-   kp::destructor(&current_to->data);
-   alloc_.deallocate(current_to,1);
-   current_to=tmp;
-   
-   // only at this stage can we fix 'last'
-   tree_node *last=from.node->next_sibling;
-
-   pre_order_iterator toit=tmp;
-   // copy all children
-   do {
-      assert(current_from!=0);
-      if(current_from->first_child != 0) {
-         current_from=current_from->first_child;
-         toit=append_child(toit, current_from->data);
-         }
-      else {
-         while(current_from->next_sibling==0 && current_from!=start_from) {
-            current_from=current_from->parent;
-            toit=parent(toit);
-            assert(current_from!=0);
-            }
-         current_from=current_from->next_sibling;
-         if(current_from!=last) {
-            toit=append_child(parent(toit), current_from->data);
-            }
-         }
-      } while(current_from!=last);
-
-   return current_to;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::replace(
-   sibling_iterator orig_begin, 
-   sibling_iterator orig_end, 
-   sibling_iterator new_begin, 
-   sibling_iterator new_end)
-   {
-   tree_node *orig_first=orig_begin.node;
-   tree_node *new_first=new_begin.node;
-   tree_node *orig_last=orig_first;
-   while((++orig_begin)!=orig_end)
-      orig_last=orig_last->next_sibling;
-   tree_node *new_last=new_first;
-   while((++new_begin)!=new_end)
-      new_last=new_last->next_sibling;
-
-   // insert all siblings in new_first..new_last before orig_first
-   bool first=true;
-   pre_order_iterator ret;
-   while(1==1) {
-      pre_order_iterator tt=insert_subtree(pre_order_iterator(orig_first), pre_order_iterator(new_first));
-      if(first) {
-         ret=tt;
-         first=false;
-         }
-      if(new_first==new_last)
-         break;
-      new_first=new_first->next_sibling;
-      }
-
-   // erase old range of siblings
-   bool last=false;
-   tree_node *next=orig_first;
-   while(1==1) {
-      if(next==orig_last) 
-         last=true;
-      next=next->next_sibling;
-      erase((pre_order_iterator)orig_first);
-      if(last) 
-         break;
-      orig_first=next;
-      }
-   return ret;
-   }
-
-template <class T, class tree_node_allocator>
-template <typename iter>
-iter tree<T, tree_node_allocator>::flatten(iter position)
-   {
-   if(position.node->first_child==0)
-      return position;
-
-   tree_node *tmp=position.node->first_child;
-   while(tmp) {
-      tmp->parent=position.node->parent;
-      tmp=tmp->next_sibling;
-      } 
-   if(position.node->next_sibling) {
-      position.node->last_child->next_sibling=position.node->next_sibling;
-      position.node->next_sibling->prev_sibling=position.node->last_child;
-      }
-   else {
-      position.node->parent->last_child=position.node->last_child;
-      }
-   position.node->next_sibling=position.node->first_child;
-   position.node->next_sibling->prev_sibling=position.node;
-   position.node->first_child=0;
-   position.node->last_child=0;
-
-   return position;
-   }
-
-
-template <class T, class tree_node_allocator>
-template <typename iter>
-iter tree<T, tree_node_allocator>::reparent(iter position, sibling_iterator begin, sibling_iterator end)
-   {
-   tree_node *first=begin.node;
-   tree_node *last=first;
-
-   assert(first!=position.node);
-   
-   if(begin==end) return begin;
-   // determine last node
-   while((++begin)!=end) {
-      last=last->next_sibling;
-      }
-   // move subtree
-   if(first->prev_sibling==0) {
-      first->parent->first_child=last->next_sibling;
-      }
-   else {
-      first->prev_sibling->next_sibling=last->next_sibling;
-      }
-   if(last->next_sibling==0) {
-      last->parent->last_child=first->prev_sibling;
-      }
-   else {
-      last->next_sibling->prev_sibling=first->prev_sibling;
-      }
-   if(position.node->first_child==0) {
-      position.node->first_child=first;
-      position.node->last_child=last;
-      first->prev_sibling=0;
-      }
-   else {
-      position.node->last_child->next_sibling=first;
-      first->prev_sibling=position.node->last_child;
-      position.node->last_child=last;
-      }
-   last->next_sibling=0;
-
-   tree_node *pos=first;
-   while(1==1) {
-      pos->parent=position.node;
-      if(pos==last) break;
-      pos=pos->next_sibling;
-      }
-
-   return first;
-   }
-
-template <class T, class tree_node_allocator>
-template <typename iter> iter tree<T, tree_node_allocator>::reparent(iter position, iter from)
-   {
-   if(from.node->first_child==0) return position;
-   return reparent(position, from.node->first_child, end(from));
-   }
-
-template <class T, class tree_node_allocator>
-template <typename iter> iter tree<T, tree_node_allocator>::wrap(iter position, const T& x)
-   {
-   assert(position.node!=0);
-   sibling_iterator fr=position, to=position;
-   ++to;
-   iter ret = insert(position, x);
-   reparent(ret, fr, to);
-   return ret;
-   }
-
-template <class T, class tree_node_allocator>
-template <typename iter> iter tree<T, tree_node_allocator>::move_after(iter target, iter source)
-   {
-   tree_node *dst=target.node;
-   tree_node *src=source.node;
-   assert(dst);
-   assert(src);
-
-   if(dst==src) return source;
-   if(dst->next_sibling)
-      if(dst->next_sibling==src) // already in the right spot
-         return source;
-
-   // take src out of the tree
-   if(src->prev_sibling!=0) src->prev_sibling->next_sibling=src->next_sibling;
-   else                     src->parent->first_child=src->next_sibling;
-   if(src->next_sibling!=0) src->next_sibling->prev_sibling=src->prev_sibling;
-   else                     src->parent->last_child=src->prev_sibling;
-
-   // connect it to the new point
-   if(dst->next_sibling!=0) dst->next_sibling->prev_sibling=src;
-   else                     dst->parent->last_child=src;
-   src->next_sibling=dst->next_sibling;
-   dst->next_sibling=src;
-   src->prev_sibling=dst;
-   src->parent=dst->parent;
-   return src;
-   }
-
-template <class T, class tree_node_allocator>
-template <typename iter> iter tree<T, tree_node_allocator>::move_before(iter target, iter source)
-   {
-   tree_node *dst=target.node;
-   tree_node *src=source.node;
-   assert(dst);
-   assert(src);
-
-   if(dst==src) return source;
-   if(dst->prev_sibling)
-      if(dst->prev_sibling==src) // already in the right spot
-         return source;
-
-   // take src out of the tree
-   if(src->prev_sibling!=0) src->prev_sibling->next_sibling=src->next_sibling;
-   else                     src->parent->first_child=src->next_sibling;
-   if(src->next_sibling!=0) src->next_sibling->prev_sibling=src->prev_sibling;
-   else                     src->parent->last_child=src->prev_sibling;
-
-   // connect it to the new point
-   if(dst->prev_sibling!=0) dst->prev_sibling->next_sibling=src;
-   else                     dst->parent->first_child=src;
-   src->prev_sibling=dst->prev_sibling;
-   dst->prev_sibling=src;
-   src->next_sibling=dst;
-   src->parent=dst->parent;
-   return src;
-   }
-
-// specialisation for sibling_iterators
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::move_before(sibling_iterator target, 
-                                                                                         sibling_iterator source)
-   {
-   tree_node *dst=target.node;
-   tree_node *src=source.node;
-   tree_node *dst_prev_sibling;
-   if(dst==0) { // must then be an end iterator
-      dst_prev_sibling=target.parent_->last_child;
-      assert(dst_prev_sibling);
-      }
-   else dst_prev_sibling=dst->prev_sibling;
-   assert(src);
-
-   if(dst==src) return source;
-   if(dst_prev_sibling)
-      if(dst_prev_sibling==src) // already in the right spot
-         return source;
-
-   // take src out of the tree
-   if(src->prev_sibling!=0) src->prev_sibling->next_sibling=src->next_sibling;
-   else                     src->parent->first_child=src->next_sibling;
-   if(src->next_sibling!=0) src->next_sibling->prev_sibling=src->prev_sibling;
-   else                     src->parent->last_child=src->prev_sibling;
-
-   // connect it to the new point
-   if(dst_prev_sibling!=0) dst_prev_sibling->next_sibling=src;
-   else                    target.parent_->first_child=src;
-   src->prev_sibling=dst_prev_sibling;
-   if(dst) {
-      dst->prev_sibling=src;
-      src->parent=dst->parent;
-      }
-   src->next_sibling=dst;
-   return src;
-   }
-
-template <class T, class tree_node_allocator>
-template <typename iter> iter tree<T, tree_node_allocator>::move_ontop(iter target, iter source)
-   {
-   tree_node *dst=target.node;
-   tree_node *src=source.node;
-   assert(dst);
-   assert(src);
-
-   if(dst==src) return source;
-
-   // remember connection points
-   tree_node *b_prev_sibling=dst->prev_sibling;
-   tree_node *b_next_sibling=dst->next_sibling;
-   tree_node *b_parent=dst->parent;
-
-   // remove target
-   erase(target);
-
-   // take src out of the tree
-   if(src->prev_sibling!=0) src->prev_sibling->next_sibling=src->next_sibling;
-   else                     src->parent->first_child=src->next_sibling;
-   if(src->next_sibling!=0) src->next_sibling->prev_sibling=src->prev_sibling;
-   else                     src->parent->last_child=src->prev_sibling;
-
-   // connect it to the new point
-   if(b_prev_sibling!=0) b_prev_sibling->next_sibling=src;
-   else                  b_parent->first_child=src;
-   if(b_next_sibling!=0) b_next_sibling->prev_sibling=src;
-   else                  b_parent->last_child=src;
-   src->prev_sibling=b_prev_sibling;
-   src->next_sibling=b_next_sibling;
-   src->parent=b_parent;
-   return src;
-   }
-
-template <class T, class tree_node_allocator>
-void tree<T, tree_node_allocator>::merge(sibling_iterator to1,   sibling_iterator to2,
-                                          sibling_iterator from1, sibling_iterator from2,
-                                          bool duplicate_leaves)
-   {
-   sibling_iterator fnd;
-   while(from1!=from2) {
-      if((fnd=std::find(to1, to2, (*from1))) != to2) { // element found
-         if(from1.begin()==from1.end()) { // full depth reached
-            if(duplicate_leaves)
-               append_child(parent(to1), (*from1));
-            }
-         else { // descend further
-            merge(fnd.begin(), fnd.end(), from1.begin(), from1.end(), duplicate_leaves);
-            }
-         }
-      else { // element missing
-         insert_subtree(to2, from1);
-         }
-      ++from1;
-      }
-   }
-
-
-template <class T, class tree_node_allocator>
-void tree<T, tree_node_allocator>::sort(sibling_iterator from, sibling_iterator to, bool deep)
-   {
-   std::less<T> comp;
-   sort(from, to, comp, deep);
-   }
-
-template <class T, class tree_node_allocator>
-template <class StrictWeakOrdering>
-void tree<T, tree_node_allocator>::sort(sibling_iterator from, sibling_iterator to, 
-                                        StrictWeakOrdering comp, bool deep)
-   {
-   if(from==to) return;
-   // make list of sorted nodes
-   // CHECK: if multiset stores equivalent nodes in the order in which they
-   // are inserted, then this routine should be called 'stable_sort'.
-   std::multiset<tree_node *, compare_nodes<StrictWeakOrdering> > nodes(comp);
-   sibling_iterator it=from, it2=to;
-   while(it != to) {
-      nodes.insert(it.node);
-      ++it;
-      }
-   // reassemble
-   --it2;
-
-   // prev and next are the nodes before and after the sorted range
-   tree_node *prev=from.node->prev_sibling;
-   tree_node *next=it2.node->next_sibling;
-   typename std::multiset<tree_node *, compare_nodes<StrictWeakOrdering> >::iterator nit=nodes.begin(), eit=nodes.end();
-   if(prev==0) {
-      if((*nit)->parent!=0) // to catch "sorting the head" situations, when there is no parent
-         (*nit)->parent->first_child=(*nit);
-      }
-   else prev->next_sibling=(*nit);
-
-   --eit;
-   while(nit!=eit) {
-      (*nit)->prev_sibling=prev;
-      if(prev)
-         prev->next_sibling=(*nit);
-      prev=(*nit);
-      ++nit;
-      }
-   // prev now points to the last-but-one node in the sorted range
-   if(prev)
-      prev->next_sibling=(*eit);
-
-   // eit points to the last node in the sorted range.
-   (*eit)->next_sibling=next;
-   (*eit)->prev_sibling=prev; // missed in the loop above
-   if(next==0) {
-      if((*eit)->parent!=0) // to catch "sorting the head" situations, when there is no parent
-         (*eit)->parent->last_child=(*eit);
-      }
-   else next->prev_sibling=(*eit);
-
-   if(deep) {  // sort the children of each node too
-      sibling_iterator bcs(*nodes.begin());
-      sibling_iterator ecs(*eit);
-      ++ecs;
-      while(bcs!=ecs) {
-         sort(begin(bcs), end(bcs), comp, deep);
-         ++bcs;
-         }
-      }
-   }
-
-template <class T, class tree_node_allocator>
-template <typename iter>
-bool tree<T, tree_node_allocator>::equal(const iter& one_, const iter& two, const iter& three_) const
-   {
-   std::equal_to<T> comp;
-   return equal(one_, two, three_, comp);
-   }
-
-template <class T, class tree_node_allocator>
-template <typename iter>
-bool tree<T, tree_node_allocator>::equal_subtree(const iter& one_, const iter& two_) const
-   {
-   std::equal_to<T> comp;
-   return equal_subtree(one_, two_, comp);
-   }
-
-template <class T, class tree_node_allocator>
-template <typename iter, class BinaryPredicate>
-bool tree<T, tree_node_allocator>::equal(const iter& one_, const iter& two, const iter& three_, BinaryPredicate fun) const
-   {
-   pre_order_iterator one(one_), three(three_);
-
-// if(one==two && is_valid(three) && three.number_of_children()!=0)
-//    return false;
-   while(one!=two && is_valid(three)) {
-      if(!fun(*one,*three))
-         return false;
-      if(one.number_of_children()!=three.number_of_children()) 
-         return false;
-      ++one;
-      ++three;
-      }
-   return true;
-   }
-
-template <class T, class tree_node_allocator>
-template <typename iter, class BinaryPredicate>
-bool tree<T, tree_node_allocator>::equal_subtree(const iter& one_, const iter& two_, BinaryPredicate fun) const
-   {
-   pre_order_iterator one(one_), two(two_);
-
-   if(!fun(*one,*two)) return false;
-   if(number_of_children(one)!=number_of_children(two)) return false;
-   return equal(begin(one),end(one),begin(two),fun);
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator> tree<T, tree_node_allocator>::subtree(sibling_iterator from, sibling_iterator to) const
-   {
-   tree tmp;
-   tmp.set_head(value_type());
-   tmp.replace(tmp.begin(), tmp.end(), from, to);
-   return tmp;
-   }
-
-template <class T, class tree_node_allocator>
-void tree<T, tree_node_allocator>::subtree(tree& tmp, sibling_iterator from, sibling_iterator to) const
-   {
-   tmp.set_head(value_type());
-   tmp.replace(tmp.begin(), tmp.end(), from, to);
-   }
-
-template <class T, class tree_node_allocator>
-int tree<T, tree_node_allocator>::size() const
-   {
-   int i=0;
-   pre_order_iterator it=begin(), eit=end();
-   while(it!=eit) {
-      ++i;
-      ++it;
-      }
-   return i;
-   }
-
-template <class T, class tree_node_allocator>
-int tree<T, tree_node_allocator>::size(const iterator_base& top) const
-   {
-   int i=0;
-   pre_order_iterator it=top, eit=top;
-   eit.skip_children();
-   ++eit;
-   while(it!=eit) {
-      ++i;
-      ++it;
-      }
-   return i;
-   }
-
-template <class T, class tree_node_allocator>
-bool tree<T, tree_node_allocator>::empty() const
-   {
-   pre_order_iterator it=begin(), eit=end();
-   return (it==eit);
-   }
-
-template <class T, class tree_node_allocator>
-int tree<T, tree_node_allocator>::depth(const iterator_base& it) const
-   {
-   tree_node* pos=it.node;
-   assert(pos!=0);
-   int ret=0;
-   while(pos->parent!=0) {
-      pos=pos->parent;
-      ++ret;
-      }
-   return ret;
-   }
-
-template <class T, class tree_node_allocator>
-unsigned int tree<T, tree_node_allocator>::number_of_children(const iterator_base& it) 
-   {
-   tree_node *pos=it.node->first_child;
-   if(pos==0) return 0;
-   
-   unsigned int ret=1;
-//   while(pos!=it.node->last_child) {
-//      ++ret;
-//      pos=pos->next_sibling;
-//      }
-   while((pos=pos->next_sibling))
-      ++ret;
-   return ret;
-   }
-
-template <class T, class tree_node_allocator>
-unsigned int tree<T, tree_node_allocator>::number_of_siblings(const iterator_base& it) const
-   {
-   tree_node *pos=it.node;
-   unsigned int ret=0;
-   // count forward
-   while(pos->next_sibling && 
-         pos->next_sibling!=head &&
-         pos->next_sibling!=feet) {
-      ++ret;
-      pos=pos->next_sibling;
-      }
-   // count backward
-   pos=it.node;
-   while(pos->prev_sibling && 
-         pos->prev_sibling!=head &&
-         pos->prev_sibling!=feet) {
-      ++ret;
-      pos=pos->prev_sibling;
-      }
-   
-   return ret;
-   }
-
-template <class T, class tree_node_allocator>
-void tree<T, tree_node_allocator>::swap(sibling_iterator it)
-   {
-   tree_node *nxt=it.node->next_sibling;
-   if(nxt) {
-      if(it.node->prev_sibling)
-         it.node->prev_sibling->next_sibling=nxt;
-      else
-         it.node->parent->first_child=nxt;
-      nxt->prev_sibling=it.node->prev_sibling;
-      tree_node *nxtnxt=nxt->next_sibling;
-      if(nxtnxt)
-         nxtnxt->prev_sibling=it.node;
-      else
-         it.node->parent->last_child=it.node;
-      nxt->next_sibling=it.node;
-      it.node->prev_sibling=nxt;
-      it.node->next_sibling=nxtnxt;
-      }
-   }
-
-template <class T, class tree_node_allocator>
-void tree<T, tree_node_allocator>::swap(iterator one, iterator two)
-   {
-   // if one and two are adjacent siblings, use the sibling swap
-   if(one.node->next_sibling==two.node) swap(one);
-   else if(two.node->next_sibling==one.node) swap(two);
-   else {
-      tree_node *nxt1=one.node->next_sibling;
-      tree_node *nxt2=two.node->next_sibling;
-      tree_node *pre1=one.node->prev_sibling;
-      tree_node *pre2=two.node->prev_sibling;
-      tree_node *par1=one.node->parent;
-      tree_node *par2=two.node->parent;
-
-      // reconnect
-      one.node->parent=par2;
-      one.node->next_sibling=nxt2;
-      if(nxt2) nxt2->prev_sibling=one.node;
-      else     par2->last_child=one.node;
-      one.node->prev_sibling=pre2;
-      if(pre2) pre2->next_sibling=one.node;
-      else     par2->first_child=one.node;    
-
-      two.node->parent=par1;
-      two.node->next_sibling=nxt1;
-      if(nxt1) nxt1->prev_sibling=two.node;
-      else     par1->last_child=two.node;
-      two.node->prev_sibling=pre1;
-      if(pre1) pre1->next_sibling=two.node;
-      else     par1->first_child=two.node;
-      }
-   }
-
-// template <class BinaryPredicate>
-// tree<T, tree_node_allocator>::iterator tree<T, tree_node_allocator>::find_subtree(
-//    sibling_iterator subfrom, sibling_iterator subto, iterator from, iterator to, 
-//    BinaryPredicate fun) const
-//    {
-//    assert(1==0); // this routine is not finished yet.
-//    while(from!=to) {
-//       if(fun(*subfrom, *from)) {
-//          
-//          }
-//       }
-//    return to;
-//    }
-
-template <class T, class tree_node_allocator>
-bool tree<T, tree_node_allocator>::is_in_subtree(const iterator_base& it, const iterator_base& begin, 
-                                                 const iterator_base& end) const
-   {
-   // FIXME: this should be optimised.
-   pre_order_iterator tmp=begin;
-   while(tmp!=end) {
-      if(tmp==it) return true;
-      ++tmp;
-      }
-   return false;
-   }
-
-template <class T, class tree_node_allocator>
-bool tree<T, tree_node_allocator>::is_valid(const iterator_base& it) const
-   {
-   if(it.node==0 || it.node==feet || it.node==head) return false;
-   else return true;
-   }
-
-template <class T, class tree_node_allocator>
-unsigned int tree<T, tree_node_allocator>::index(sibling_iterator it) const
-   {
-   unsigned int ind=0;
-   if(it.node->parent==0) {
-      while(it.node->prev_sibling!=head) {
-         it.node=it.node->prev_sibling;
-         ++ind;
-         }
-      }
-   else {
-      while(it.node->prev_sibling!=0) {
-         it.node=it.node->prev_sibling;
-         ++ind;
-         }
-      }
-   return ind;
-   }
-
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::child(const iterator_base& it, unsigned int num) const
-   {
-   tree_node *tmp=it.node->first_child;
-   while(num--) {
-      assert(tmp!=0);
-      tmp=tmp->next_sibling;
-      }
-   return tmp;
-   }
-
-
-
-
-// Iterator base
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::iterator_base::iterator_base()
-   : node(0), skip_current_children_(false)
-   {
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::iterator_base::iterator_base(tree_node *tn)
-   : node(tn), skip_current_children_(false)
-   {
-   }
-
-template <class T, class tree_node_allocator>
-T& tree<T, tree_node_allocator>::iterator_base::operator*() const
-   {
-   return node->data;
-   }
-
-template <class T, class tree_node_allocator>
-T* tree<T, tree_node_allocator>::iterator_base::operator->() const
-   {
-   return &(node->data);
-   }
-
-template <class T, class tree_node_allocator>
-bool tree<T, tree_node_allocator>::post_order_iterator::operator!=(const post_order_iterator& other) const
-   {
-   if(other.node!=this->node) return true;
-   else return false;
-   }
-
-template <class T, class tree_node_allocator>
-bool tree<T, tree_node_allocator>::post_order_iterator::operator==(const post_order_iterator& other) const
-   {
-   if(other.node==this->node) return true;
-   else return false;
-   }
-
-template <class T, class tree_node_allocator>
-bool tree<T, tree_node_allocator>::pre_order_iterator::operator!=(const pre_order_iterator& other) const
-   {
-   if(other.node!=this->node) return true;
-   else return false;
-   }
-
-template <class T, class tree_node_allocator>
-bool tree<T, tree_node_allocator>::pre_order_iterator::operator==(const pre_order_iterator& other) const
-   {
-   if(other.node==this->node) return true;
-   else return false;
-   }
-
-template <class T, class tree_node_allocator>
-bool tree<T, tree_node_allocator>::sibling_iterator::operator!=(const sibling_iterator& other) const
-   {
-   if(other.node!=this->node) return true;
-   else return false;
-   }
-
-template <class T, class tree_node_allocator>
-bool tree<T, tree_node_allocator>::sibling_iterator::operator==(const sibling_iterator& other) const
-   {
-   if(other.node==this->node) return true;
-   else return false;
-   }
-
-template <class T, class tree_node_allocator>
-bool tree<T, tree_node_allocator>::leaf_iterator::operator!=(const leaf_iterator& other) const
-   {
-   if(other.node!=this->node) return true;
-   else return false;
-   }
-
-template <class T, class tree_node_allocator>
-bool tree<T, tree_node_allocator>::leaf_iterator::operator==(const leaf_iterator& other) const
-   {
-   if(other.node==this->node) return true;
-   else return false;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::iterator_base::begin() const
-   {
-   if(node->first_child==0) 
-      return end();
-
-   sibling_iterator ret(node->first_child);
-   ret.parent_=this->node;
-   return ret;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::iterator_base::end() const
-   {
-   sibling_iterator ret(0);
-   ret.parent_=node;
-   return ret;
-   }
-
-template <class T, class tree_node_allocator>
-void tree<T, tree_node_allocator>::iterator_base::skip_children()
-   {
-   skip_current_children_=true;
-   }
-
-template <class T, class tree_node_allocator>
-unsigned int tree<T, tree_node_allocator>::iterator_base::number_of_children() const
-   {
-   tree_node *pos=node->first_child;
-   if(pos==0) return 0;
-   
-   unsigned int ret=1;
-   while(pos!=node->last_child) {
-      ++ret;
-      pos=pos->next_sibling;
-      }
-   return ret;
-   }
-
-
-
-// Pre-order iterator
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::pre_order_iterator::pre_order_iterator() 
-   : iterator_base(0)
-   {
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::pre_order_iterator::pre_order_iterator(tree_node *tn)
-   : iterator_base(tn)
-   {
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::pre_order_iterator::pre_order_iterator(const iterator_base &other)
-   : iterator_base(other.node)
-   {
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::pre_order_iterator::pre_order_iterator(const sibling_iterator& other)
-   : iterator_base(other.node)
-   {
-   if(this->node==0) {
-      if(other.range_last()!=0)
-         this->node=other.range_last();
-      else 
-         this->node=other.parent_;
-      this->skip_children();
-      ++(*this);
-      }
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::pre_order_iterator& tree<T, tree_node_allocator>::pre_order_iterator::operator++()
-   {
-   assert(this->node!=0);
-   if(!this->skip_current_children_ && this->node->first_child != 0) {
-      this->node=this->node->first_child;
-      }
-   else {
-      this->skip_current_children_=false;
-      while(this->node->next_sibling==0) {
-         this->node=this->node->parent;
-         if(this->node==0)
-            return *this;
-         }
-      this->node=this->node->next_sibling;
-      }
-   return *this;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::pre_order_iterator& tree<T, tree_node_allocator>::pre_order_iterator::operator--()
-   {
-   assert(this->node!=0);
-   if(this->node->prev_sibling) {
-      this->node=this->node->prev_sibling;
-      while(this->node->last_child)
-         this->node=this->node->last_child;
-      }
-   else {
-      this->node=this->node->parent;
-      if(this->node==0)
-         return *this;
-      }
-   return *this;
-}
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::pre_order_iterator tree<T, tree_node_allocator>::pre_order_iterator::operator++(int n)
-   {
-   pre_order_iterator copy = *this;
-   ++(*this);
-   return copy;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::pre_order_iterator tree<T, tree_node_allocator>::pre_order_iterator::operator--(int n)
-{
-  pre_order_iterator copy = *this;
-  --(*this);
-  return copy;
-}
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::pre_order_iterator& tree<T, tree_node_allocator>::pre_order_iterator::operator+=(unsigned int num)
-   {
-   while(num>0) {
-      ++(*this);
-      --num;
-      }
-   return (*this);
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::pre_order_iterator& tree<T, tree_node_allocator>::pre_order_iterator::operator-=(unsigned int num)
-   {
-   while(num>0) {
-      --(*this);
-      --num;
-      }
-   return (*this);
-   }
-
-
-
-// Post-order iterator
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::post_order_iterator::post_order_iterator() 
-   : iterator_base(0)
-   {
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::post_order_iterator::post_order_iterator(tree_node *tn)
-   : iterator_base(tn)
-   {
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::post_order_iterator::post_order_iterator(const iterator_base &other)
-   : iterator_base(other.node)
-   {
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::post_order_iterator::post_order_iterator(const sibling_iterator& other)
-   : iterator_base(other.node)
-   {
-   if(this->node==0) {
-      if(other.range_last()!=0)
-         this->node=other.range_last();
-      else 
-         this->node=other.parent_;
-      this->skip_children();
-      ++(*this);
-      }
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::post_order_iterator& tree<T, tree_node_allocator>::post_order_iterator::operator++()
-   {
-   assert(this->node!=0);
-   if(this->node->next_sibling==0) {
-      this->node=this->node->parent;
-      this->skip_current_children_=false;
-      }
-   else {
-      this->node=this->node->next_sibling;
-      if(this->skip_current_children_) {
-         this->skip_current_children_=false;
-         }
-      else {
-         while(this->node->first_child)
-            this->node=this->node->first_child;
-         }
-      }
-   return *this;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::post_order_iterator& tree<T, tree_node_allocator>::post_order_iterator::operator--()
-   {
-   assert(this->node!=0);
-   if(this->skip_current_children_ || this->node->last_child==0) {
-      this->skip_current_children_=false;
-      while(this->node->prev_sibling==0)
-         this->node=this->node->parent;
-      this->node=this->node->prev_sibling;
-      }
-   else {
-      this->node=this->node->last_child;
-      }
-   return *this;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::post_order_iterator tree<T, tree_node_allocator>::post_order_iterator::operator++(int)
-   {
-   post_order_iterator copy = *this;
-   ++(*this);
-   return copy;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::post_order_iterator tree<T, tree_node_allocator>::post_order_iterator::operator--(int)
-   {
-   post_order_iterator copy = *this;
-   --(*this);
-   return copy;
-   }
-
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::post_order_iterator& tree<T, tree_node_allocator>::post_order_iterator::operator+=(unsigned int num)
-   {
-   while(num>0) {
-      ++(*this);
-      --num;
-      }
-   return (*this);
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::post_order_iterator& tree<T, tree_node_allocator>::post_order_iterator::operator-=(unsigned int num)
-   {
-   while(num>0) {
-      --(*this);
-      --num;
-      }
-   return (*this);
-   }
-
-template <class T, class tree_node_allocator>
-void tree<T, tree_node_allocator>::post_order_iterator::descend_all()
-   {
-   assert(this->node!=0);
-   while(this->node->first_child)
-      this->node=this->node->first_child;
-   }
-
-
-// Breadth-first iterator
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::breadth_first_queued_iterator::breadth_first_queued_iterator()
-   : iterator_base()
-   {
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::breadth_first_queued_iterator::breadth_first_queued_iterator(tree_node *tn)
-   : iterator_base(tn)
-   {
-   traversal_queue.push(tn);
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::breadth_first_queued_iterator::breadth_first_queued_iterator(const iterator_base& other)
-   : iterator_base(other.node)
-   {
-   traversal_queue.push(other.node);
-   }
-
-template <class T, class tree_node_allocator>
-bool tree<T, tree_node_allocator>::breadth_first_queued_iterator::operator!=(const breadth_first_queued_iterator& other) const
-   {
-   if(other.node!=this->node) return true;
-   else return false;
-   }
-
-template <class T, class tree_node_allocator>
-bool tree<T, tree_node_allocator>::breadth_first_queued_iterator::operator==(const breadth_first_queued_iterator& other) const
-   {
-   if(other.node==this->node) return true;
-   else return false;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::breadth_first_queued_iterator& tree<T, tree_node_allocator>::breadth_first_queued_iterator::operator++()
-   {
-   assert(this->node!=0);
-
-   // Add child nodes and pop current node
-   sibling_iterator sib=this->begin();
-   while(sib!=this->end()) {
-      traversal_queue.push(sib.node);
-      ++sib;
-      }
-   traversal_queue.pop();
-   if(traversal_queue.size()>0)
-      this->node=traversal_queue.front();
-   else 
-      this->node=0;
-   return (*this);
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::breadth_first_queued_iterator tree<T, tree_node_allocator>::breadth_first_queued_iterator::operator++(int n)
-   {
-   breadth_first_queued_iterator copy = *this;
-   ++(*this);
-   return copy;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::breadth_first_queued_iterator& tree<T, tree_node_allocator>::breadth_first_queued_iterator::operator+=(unsigned int num)
-   {
-   while(num>0) {
-      ++(*this);
-      --num;
-      }
-   return (*this);
-   }
-
-
-
-// Fixed depth iterator
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::fixed_depth_iterator::fixed_depth_iterator()
-   : iterator_base()
-   {
-   set_first_parent_();
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::fixed_depth_iterator::fixed_depth_iterator(tree_node *tn)
-   : iterator_base(tn)
-   {
-   set_first_parent_();
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::fixed_depth_iterator::fixed_depth_iterator(const iterator_base& other)
-   : iterator_base(other.node)
-   {
-   set_first_parent_();
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::fixed_depth_iterator::fixed_depth_iterator(const sibling_iterator& other)
-   : iterator_base(other.node), first_parent_(other.parent_)
-   {
-   find_leftmost_parent_();
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::fixed_depth_iterator::fixed_depth_iterator(const fixed_depth_iterator& other)
-   : iterator_base(other.node), first_parent_(other.first_parent_)
-   {
-   }
-
-template <class T, class tree_node_allocator>
-bool tree<T, tree_node_allocator>::fixed_depth_iterator::operator==(const fixed_depth_iterator& other) const
-   {
-   if(other.node==this->node && other.first_parent_==first_parent_) return true;
-   else return false;
-   }
-
-template <class T, class tree_node_allocator>
-bool tree<T, tree_node_allocator>::fixed_depth_iterator::operator!=(const fixed_depth_iterator& other) const
-   {
-   if(other.node!=this->node || other.first_parent_!=first_parent_) return true;
-   else return false;
-   }
-
-template <class T, class tree_node_allocator>
-void tree<T, tree_node_allocator>::fixed_depth_iterator::set_first_parent_()
-   {
-   return; // FIXME: we do not use first_parent_ yet, and it actually needs some serious reworking if
-           // it is ever to work at the 'head' level.
-   first_parent_=0;
-   if(this->node==0) return;
-   if(this->node->parent!=0)
-      first_parent_=this->node->parent;
-   if(first_parent_)
-      find_leftmost_parent_();
-   }
-
-template <class T, class tree_node_allocator>
-void tree<T, tree_node_allocator>::fixed_depth_iterator::find_leftmost_parent_()
-   {
-   return; // FIXME: see 'set_first_parent()'
-   tree_node *tmppar=first_parent_;
-   while(tmppar->prev_sibling) {
-      tmppar=tmppar->prev_sibling;
-      if(tmppar->first_child)
-         first_parent_=tmppar;
-      }
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::fixed_depth_iterator& tree<T, tree_node_allocator>::fixed_depth_iterator::operator++()
-   {
-   assert(this->node!=0);
-
-   if(this->node->next_sibling) {
-      this->node=this->node->next_sibling;
-      }
-   else { 
-      int relative_depth=0;
-      upper:
-      do {
-         this->node=this->node->parent;
-         if(this->node==0) return *this;
-         --relative_depth;
-         } while(this->node->next_sibling==0);
-      lower:
-      this->node=this->node->next_sibling;
-      while(this->node->first_child==0) {
-         if(this->node->next_sibling==0)
-            goto upper;
-         this->node=this->node->next_sibling;
-         if(this->node==0) return *this;
-         }
-      while(relative_depth<0 && this->node->first_child!=0) {
-         this->node=this->node->first_child;
-         ++relative_depth;
-         }
-      if(relative_depth<0) {
-         if(this->node->next_sibling==0) goto upper;
-         else                          goto lower;
-         }
-      }
-   return *this;
-
-// if(this->node->next_sibling!=0) {
-//    this->node=this->node->next_sibling;
-//    assert(this->node!=0);
-//    if(this->node->parent==0 && this->node->next_sibling==0) // feet element
-//       this->node=0;
-//    }
-// else {
-//    tree_node *par=this->node->parent;
-//    do {
-//       par=par->next_sibling;
-//       if(par==0) { // FIXME: need to keep track of this!
-//          this->node=0;
-//          return *this;
-//          }
-//       } while(par->first_child==0);
-//    this->node=par->first_child;
-//    }
-   return *this;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::fixed_depth_iterator& tree<T, tree_node_allocator>::fixed_depth_iterator::operator--()
-   {
-   assert(this->node!=0);
-   if(this->node->prev_sibling!=0) {
-      this->node=this->node->prev_sibling;
-      assert(this->node!=0);
-      if(this->node->parent==0 && this->node->prev_sibling==0) // head element
-         this->node=0;
-      }
-   else {
-      tree_node *par=this->node->parent;
-      do {
-         par=par->prev_sibling;
-         if(par==0) { // FIXME: need to keep track of this!
-            this->node=0;
-            return *this;
-            }
-         } while(par->last_child==0);
-      this->node=par->last_child;
-      }
-   return *this;
-}
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::fixed_depth_iterator tree<T, tree_node_allocator>::fixed_depth_iterator::operator++(int)
-   {
-   fixed_depth_iterator copy = *this;
-   ++(*this);
-   return copy;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::fixed_depth_iterator tree<T, tree_node_allocator>::fixed_depth_iterator::operator--(int)
-{
-  fixed_depth_iterator copy = *this;
-  --(*this);
-  return copy;
-}
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::fixed_depth_iterator& tree<T, tree_node_allocator>::fixed_depth_iterator::operator-=(unsigned int num)
-   {
-   while(num>0) {
-      --(*this);
-      --(num);
-      }
-   return (*this);
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::fixed_depth_iterator& tree<T, tree_node_allocator>::fixed_depth_iterator::operator+=(unsigned int num)
-   {
-   while(num>0) {
-      ++(*this);
-      --(num);
-      }
-   return *this;
-   }
-
-// FIXME: add the other members of fixed_depth_iterator.
-
-
-// Sibling iterator
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::sibling_iterator::sibling_iterator() 
-   : iterator_base()
-   {
-   set_parent_();
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::sibling_iterator::sibling_iterator(tree_node *tn)
-   : iterator_base(tn)
-   {
-   set_parent_();
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::sibling_iterator::sibling_iterator(const iterator_base& other)
-   : iterator_base(other.node)
-   {
-   set_parent_();
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::sibling_iterator::sibling_iterator(const sibling_iterator& other)
-   : iterator_base(other), parent_(other.parent_)
-   {
-   }
-
-template <class T, class tree_node_allocator>
-void tree<T, tree_node_allocator>::sibling_iterator::set_parent_()
-   {
-   parent_=0;
-   if(this->node==0) return;
-   if(this->node->parent!=0)
-      parent_=this->node->parent;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::sibling_iterator& tree<T, tree_node_allocator>::sibling_iterator::operator++()
-   {
-   if(this->node)
-      this->node=this->node->next_sibling;
-   return *this;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::sibling_iterator& tree<T, tree_node_allocator>::sibling_iterator::operator--()
-   {
-   if(this->node) this->node=this->node->prev_sibling;
-   else {
-      assert(parent_);
-      this->node=parent_->last_child;
-      }
-   return *this;
-}
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::sibling_iterator::operator++(int)
-   {
-   sibling_iterator copy = *this;
-   ++(*this);
-   return copy;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::sibling_iterator::operator--(int)
-   {
-   sibling_iterator copy = *this;
-   --(*this);
-   return copy;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::sibling_iterator& tree<T, tree_node_allocator>::sibling_iterator::operator+=(unsigned int num)
-   {
-   while(num>0) {
-      ++(*this);
-      --num;
-      }
-   return (*this);
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::sibling_iterator& tree<T, tree_node_allocator>::sibling_iterator::operator-=(unsigned int num)
-   {
-   while(num>0) {
-      --(*this);
-      --num;
-      }
-   return (*this);
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::tree_node *tree<T, tree_node_allocator>::sibling_iterator::range_first() const
-   {
-   tree_node *tmp=parent_->first_child;
-   return tmp;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::tree_node *tree<T, tree_node_allocator>::sibling_iterator::range_last() const
-   {
-   return parent_->last_child;
-   }
-
-// Leaf iterator
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::leaf_iterator::leaf_iterator() 
-   : iterator_base(0)
-   {
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::leaf_iterator::leaf_iterator(tree_node *tn)
-   : iterator_base(tn)
-   {
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::leaf_iterator::leaf_iterator(const iterator_base &other)
-   : iterator_base(other.node)
-   {
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::leaf_iterator::leaf_iterator(const sibling_iterator& other)
-   : iterator_base(other.node)
-   {
-   if(this->node==0) {
-      if(other.range_last()!=0)
-         this->node=other.range_last();
-      else 
-         this->node=other.parent_;
-      ++(*this);
-      }
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::leaf_iterator& tree<T, tree_node_allocator>::leaf_iterator::operator++()
-   {
-   assert(this->node!=0);
-   while(this->node->next_sibling==0) {
-      if (this->node->parent==0) return *this;
-      this->node=this->node->parent;
-      }
-   this->node=this->node->next_sibling;
-   while(this->node->first_child)
-      this->node=this->node->first_child;
-   return *this;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::leaf_iterator& tree<T, tree_node_allocator>::leaf_iterator::operator--()
-   {
-   assert(this->node!=0);
-   while (this->node->prev_sibling==0) {
-      if (this->node->parent==0) return *this;
-      this->node=this->node->parent;
-      }
-   this->node=this->node->prev_sibling;
-   while(this->node->last_child)
-      this->node=this->node->last_child;
-   return *this;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::leaf_iterator tree<T, tree_node_allocator>::leaf_iterator::operator++(int)
-   {
-   leaf_iterator copy = *this;
-   ++(*this);
-   return copy;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::leaf_iterator tree<T, tree_node_allocator>::leaf_iterator::operator--(int)
-   {
-   leaf_iterator copy = *this;
-   --(*this);
-   return copy;
-   }
-
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::leaf_iterator& tree<T, tree_node_allocator>::leaf_iterator::operator+=(unsigned int num)
-   {
-   while(num>0) {
-      ++(*this);
-      --num;
-      }
-   return (*this);
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::leaf_iterator& tree<T, tree_node_allocator>::leaf_iterator::operator-=(unsigned int num)
-   {
-   while(num>0) {
-      --(*this);
-      --num;
-      }
-   return (*this);
-   }
-
-#endif
-
-// Local variables:
-// default-tab-width: 3
-// End:



From MAILER-DAEMON Fri Aug 24 01:28:47 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IORix-000371-AQ
	for mharc-gnash-commit@gnu.org; Fri, 24 Aug 2007 01:28:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IORiu-00035a-Ev
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 01:28:44 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IORip-00032B-JY
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 01:28:43 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IORip-000321-Ej
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 01:28:39 -0400
Received: from g78.mailsnare.net ([209.236.228.78] helo=mail.mailsnare.net)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <chadmusick@msbx.net>) id 1IORip-00050v-38
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 01:28:39 -0400
X-Virus-Scanned: by ClamAV at mailsnare.net
X-Message-ID: 00ff702db0dc1113dba21d7ff9204a39d6a357911d59be81
Received: from [192.168.1.103] (unknown [222.229.211.188])
	by mail.mailsnare.net (Postfix) with ESMTP id E85F87ABD1;
	Fri, 24 Aug 2007 05:28:36 +0000 (UTC)
Subject: Re: [Gnash-commit] gnash/libbase tree.hpp tree.hh
From: Chad Musick <chadmusick@msbx.net>
To: Markus Gothe <markus@unixrus.se>
In-Reply-To: <E1IOPZZ-0002Fm-3K@cvs.savannah.gnu.org>
References: <E1IOPZZ-0002Fm-3K@cvs.savannah.gnu.org>
Content-Type: text/plain
Date: Fri, 24 Aug 2007 14:28:51 +0900
Message-Id: <1187933331.7055.5.camel@ubuntu.sys76.lan>
Mime-Version: 1.0
X-Mailer: Evolution 2.10.1 
Content-Transfer-Encoding: 7bit
X-Detected-Kernel: Linux 2.6 (newer, 3)
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2007 05:28:44 -0000

Could you commit gui.h as well? It breaks with an include error now.
Thanks,
Chad

On Fri, 2007-08-24 at 03:10 +0000, Markus Gothe wrote:
> CVSROOT:	/sources/gnash
> Module name:	gnash
> Changes by:	Markus Gothe <nihilus>	07/08/24 03:10:57
> 
> Added files:
> 	libbase        : tree.hpp 
> Removed files:
> 	libbase        : tree.hh 
> 
> Log message:
> 	Naming convetion, afaik C++ templates should be named .hpp (see boost).
> 
> CVSWeb URLs:
> http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tree.hpp?cvsroot=gnash&rev=1.1
> http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tree.hh?cvsroot=gnash&r1=1.1&r2=0





From MAILER-DAEMON Fri Aug 24 01:44:23 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IORy3-0008Jt-GS
	for mharc-gnash-commit@gnu.org; Fri, 24 Aug 2007 01:44:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IORy1-0008Jo-LQ
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 01:44:21 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IORxz-0008Jc-VK
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 01:44:20 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IORxz-0008JZ-Py
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 01:44:19 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <chadmusick@msbx.net>) id 1IORxz-0007ly-CF
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 01:44:19 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <chadmusick@msbx.net>) id 1IORxy-0002t9-Po
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 05:44:18 +0000
Received: from cmusick by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <cmusick@savannah.gnu.org>) id 1IORxy-0002t2-Ha
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 05:44:18 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IORxy-0002t2-Ha@cvs.savannah.gnu.org>
From: Chad Musick <chadmusick@msbx.net>
Date: Fri, 24 Aug 2007 05:44:18 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/filters.h server/filters...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2007 05:44:21 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Chad Musick <cmusick>	07/08/24 05:44:18

Modified files:
	.              : ChangeLog 
Added files:
	server         : filters.h filters.cpp 

Log message:
	New effect filters for use in PlaceObject3 and in new style buttons.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4086&r2=1.4087
http://cvs.savannah.gnu.org/viewcvs/gnash/server/filters.h?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/filters.cpp?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4086
retrieving revision 1.4087
diff -u -b -r1.4086 -r1.4087
--- ChangeLog	23 Aug 2007 16:50:55 -0000	1.4086
+++ ChangeLog	24 Aug 2007 05:44:17 -0000	1.4087
@@ -1,3 +1,9 @@
+2007-08-24 Chad Musick <chadmusick@msbx.net>
+
+	* server/filters.cpp,h: Effect filters for PlaceObject3 and
+	  for buttons. No current effect, but it parses correctly from SWF.
+	* Makefile.am: Add the filters files.
+
 2007-08-23 Sandro Santilli <strk@keybit.net>
 
 	* server/as_environment.h: document case-sensitiveness of

Index: server/filters.h
===================================================================
RCS file: server/filters.h
diff -N server/filters.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/filters.h	24 Aug 2007 05:44:18 -0000	1.1
@@ -0,0 +1,65 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+/* $Id: filters.h,v 1.1 2007/08/24 05:44:18 cmusick Exp $ */
+
+#ifndef GNASH_FILTERS
+#define GNASH_FILTERS
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <vector>
+#include <boost/shared_ptr.hpp>
+
+namespace gnash {
+
+class stream;
+
+namespace effect_filters {
+
+class effect_filter;
+
+typedef boost::shared_ptr<effect_filter> effect_filter_ptr;
+typedef std::vector<effect_filter_ptr> effect_filters_vec;
+
+class filter_factory
+{
+public:
+    /// \brief Read one, possibly multiple filters from the stream,
+    /// and push them into the vector store. Returns the number read.
+    /// If read_multiple is true, the first byte of the stream is
+    /// expected to contain the number of filters to be read.
+    static int const read(stream* in, int movie_version, bool read_multiple,
+        effect_filters_vec *store);
+};
+
+// Common base class for the filters.
+class effect_filter
+{
+public:
+    // Fill from a stream.
+    virtual bool read(stream* in) = 0;
+
+    virtual ~effect_filter() { return; }
+};
+
+} // Namespace effect_filters
+} // Namespace gnash
+
+#endif // GNASH_FILTERS

Index: server/filters.cpp
===================================================================
RCS file: server/filters.cpp
diff -N server/filters.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/filters.cpp	24 Aug 2007 05:44:18 -0000	1.1
@@ -0,0 +1,516 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+/* $Id: filters.cpp,v 1.1 2007/08/24 05:44:18 cmusick Exp $ */
+
+#include "filters.h"
+
+#include "cxform.h"
+#include "log.h"
+#include "stream.h"
+
+namespace gnash {
+namespace effect_filters {
+
+typedef enum
+{
+    DROP_SHADOW = 0,
+    BLUR = 1,
+    GLOW = 2,
+    BEVEL = 3,
+    GRADIENT_GLOW = 4,
+    CONVOLUTION = 5,
+    COLOR_MATRIX = 6,
+    GRADIENT_BEVEL = 7
+} filter_types;
+
+class drop_shadow_filter : public effect_filter
+{
+public:
+    friend class filter_factory;
+
+    bool read(stream* in);
+
+private:
+    drop_shadow_filter() : 
+        m_rgba(), m_blur_horizontal(), m_blur_vertical(),
+        m_radian_angle(), m_distance(), m_strength(),
+        m_inner_shadow(), m_knock_out(), m_composite_source()
+   { return; }
+
+    cxform m_rgba;
+
+    float m_blur_horizontal;
+    float m_blur_vertical;
+
+    float m_radian_angle;
+    float m_distance;
+
+    float m_strength;
+
+    bool m_inner_shadow;
+    bool m_knock_out;
+    bool m_composite_source;
+};
+
+class blur_filter : public effect_filter
+{
+public:
+    friend class filter_factory;
+
+    bool read(stream* in);
+
+private:
+    blur_filter() :
+        m_blur_horizontal(), m_blur_vertical(), m_passes()
+    { return; }
+
+    float m_blur_horizontal;
+    float m_blur_vertical;
+
+    uint8_t m_passes;
+};
+
+class glow_filter : public effect_filter
+{
+public:
+    friend class filter_factory;
+
+    bool read(stream* in);
+
+private:
+    glow_filter() :
+        m_rgba(), m_blur_horizontal(), m_blur_vertical(), m_strength(),
+        m_inner_shadow(), m_knock_out(), m_composite_source()
+    { return; }
+
+    cxform m_rgba;
+
+    float m_blur_horizontal;
+    float m_blur_vertical;
+
+    float m_strength;
+
+    bool m_inner_shadow;
+    bool m_knock_out;
+    bool m_composite_source;
+};
+
+class bevel_filter : public effect_filter
+{
+public:
+    friend class filter_factory;
+
+    bool read(stream* in);
+
+private:
+    bevel_filter() :
+        m_rgba(), m_highlight_rgba(), m_blur_horizontal(), m_blur_vertical(),
+        m_radian_angle(), m_distance(), m_strength(), m_inner_shadow(),
+        m_composite_source(), m_on_top()
+    { return; }
+
+    cxform m_rgba;
+    cxform m_highlight_rgba;
+
+    float m_blur_horizontal;
+    float m_blur_vertical;
+
+    float m_radian_angle;
+    float m_distance;
+
+    float m_strength;
+
+    bool m_inner_shadow;
+    bool m_knock_out;
+    bool m_composite_source;
+    bool m_on_top; // Overlay.
+};
+
+class gradient_glow_filter : public effect_filter
+{
+public:
+    friend class filter_factory;
+
+    bool read(stream* in);
+
+private:
+    gradient_glow_filter() :
+        m_count(), m_rgba_array(), m_positions(), m_blur_horizontal(),
+        m_blur_vertical(), m_radian_angle(), m_distance(), m_strength(),
+        m_inner_shadow(), m_knock_out(), m_composite_source(),
+        m_passes()
+    { return; }
+
+    uint8_t m_count;
+    std::vector<boost::shared_ptr<cxform> > m_rgba_array;
+    std::vector<uint8_t> m_positions;
+
+    float m_blur_horizontal;
+    float m_blur_vertical;
+
+    float m_radian_angle;
+    float m_distance;
+
+    float m_strength;
+
+    bool m_inner_shadow;
+    bool m_knock_out;
+    bool m_composite_source;
+
+    uint8_t m_passes;
+};
+
+class convolution_filter : public effect_filter
+{
+public:
+    friend class filter_factory;
+
+    bool read(stream* in);
+
+private:
+    convolution_filter() :
+         m_columns(), m_rows(), m_divisor(), m_bias(), m_weights(),
+         m_default_rgba(), m_clamp(), m_reserve_alpha()
+    { return; }
+
+    uint8_t m_columns;
+    uint8_t m_rows;
+
+    float m_divisor;
+    float m_bias;
+
+    std::vector<float> m_weights;
+
+    cxform m_default_rgba;
+
+    bool m_clamp;
+    bool m_reserve_alpha;
+};
+
+class color_matrix_filter : public effect_filter
+{
+public:
+    friend class filter_factory;
+
+    bool read(stream* in);
+
+private:
+    color_matrix_filter() :
+        m_matrix()
+    { return; }
+
+    float m_matrix[25]; // Fixed size for color_matrix filters.
+};
+
+class gradient_bevel_filter : public effect_filter
+{
+public:
+    friend class filter_factory;
+
+    bool read(stream* in);
+
+private:
+    gradient_bevel_filter() :
+        m_count(), m_rgba_array(), m_positions(), m_blur_horizontal(),
+        m_blur_vertical(), m_radian_angle(), m_distance(), m_strength(),
+        m_inner_shadow(), m_knock_out(), m_composite_source(),
+        m_passes()
+    { return; }
+
+    uint8_t m_count;
+    std::vector<boost::shared_ptr<cxform> > m_rgba_array;
+    std::vector<uint8_t> m_positions;
+
+    float m_blur_horizontal;
+    float m_blur_vertical;
+
+    float m_radian_angle;
+    float m_distance;
+
+    float m_strength;
+
+    bool m_inner_shadow;
+    bool m_knock_out;
+    bool m_composite_source;
+
+    uint8_t m_passes;
+};
+
+int const filter_factory::read(stream* in, int /* movie_version */,
+    bool read_multiple, effect_filters_vec *store)
+{
+    int count = 1;
+
+    if (read_multiple)
+    {
+        in->ensureBytes(1);
+        count = static_cast<int> (in->read_u8());
+    }
+
+    for (int i = 0; i < count; ++i)
+    {
+        effect_filter *the_filter = NULL;
+
+        uint8_t filter_type = in->read_u8();
+
+        switch (filter_type)
+        {
+            case DROP_SHADOW:
+                the_filter = new drop_shadow_filter;
+                break;
+            case BLUR:
+                the_filter = new blur_filter; 
+                break;
+            case GLOW:
+                the_filter = new glow_filter;
+                break;
+            case BEVEL:
+                the_filter = new bevel_filter;
+                break;
+            case GRADIENT_GLOW:
+                the_filter = new gradient_glow_filter;
+                break;
+            case CONVOLUTION:
+                the_filter = new convolution_filter;
+                break;
+            case COLOR_MATRIX:
+                the_filter = new color_matrix_filter;
+                break;
+            case GRADIENT_BEVEL:
+                the_filter = new gradient_bevel_filter;
+                break;
+            default:
+                IF_VERBOSE_MALFORMED_SWF(
+                log_swferror(_("Invalid filter type %d."), filter_type);
+                );
+                return i; // We're already broken, no need to cause more pain.
+        }
+
+        // Protect against exceptions and such by storing before we read.
+        effect_filter_ptr p(the_filter);
+        if (!p->read(in))
+        {
+            IF_VERBOSE_MALFORMED_SWF(
+            log_swferror(_("Filter %d could not read."), filter_type);
+            );
+            return i; // We're already broken.
+        }
+        store->push_back(p);
+    }
+
+    return count;
+}
+
+bool drop_shadow_filter::read(stream* in)
+{
+    m_rgba.read_rgba(in);
+
+    m_blur_horizontal = in->read_fixed();
+    m_blur_vertical = in->read_fixed();
+
+    m_radian_angle = in->read_fixed();
+    m_distance = in->read_fixed();
+
+    m_strength = in->read_short_fixed();
+
+    m_inner_shadow = in->read_uint(1) ? true : false;
+    m_knock_out = in->read_uint(1) ? true : false;
+    m_composite_source = in->read_uint(1) ? true : false;
+
+    static_cast<void> (in->read_uint(5)); // Throw these away on purpose.
+
+    return true;
+}
+
+bool blur_filter::read(stream* in)
+{
+    m_blur_horizontal = in->read_fixed();
+    m_blur_vertical = in->read_fixed();
+
+    m_passes = static_cast<uint8_t> (in->read_uint(5));
+
+    static_cast<void> (in->read_uint(3)); // Throw these away.
+
+    return true;
+}
+
+bool glow_filter::read(stream* in)
+{
+    m_rgba.read_rgba(in);
+
+    m_blur_horizontal = in->read_fixed();
+    m_blur_vertical = in->read_fixed();
+
+    m_strength = in->read_short_fixed();
+
+    m_inner_shadow = in->read_uint(1) ? true : false;
+    m_knock_out = in->read_uint(1) ? true : false;
+    m_composite_source = in->read_uint(1) ? true : false;
+
+    static_cast<void> (in->read_uint(5)); // Throw these away.
+
+    return true;
+}
+
+bool bevel_filter::read(stream* in)
+{
+    m_rgba.read_rgba(in);
+    m_highlight_rgba.read_rgba(in);
+
+    m_blur_horizontal = in->read_fixed();
+    m_blur_vertical = in->read_fixed();
+
+    m_radian_angle = in->read_fixed();
+    m_distance = in->read_fixed();
+    
+    m_strength = in->read_short_fixed();
+
+    m_inner_shadow = in->read_uint(1) ? true : false;
+    m_knock_out = in->read_uint(1) ? true : false;
+    m_composite_source = in->read_uint(1) ? true : false;
+    m_on_top = in->read_uint(1) ? true : false;
+
+    static_cast<void> (in->read_uint(4)); // Throw these away.
+
+    return true;
+}
+
+bool gradient_glow_filter::read(stream* in)
+{
+    m_count = in->read_u8();
+
+    m_rgba_array.reserve(m_count);
+    for (int i = 0; i < m_count; ++i)
+    {
+        boost::shared_ptr<cxform> rgba(new cxform);
+        rgba->read_rgba(in);
+        m_rgba_array.push_back(rgba);
+    }
+
+    m_positions.reserve(m_count);
+    for (int i = 0; i < m_count; ++i)
+    {
+        m_positions.push_back(in->read_u8());
+    }
+
+    m_blur_horizontal = in->read_fixed();
+    m_blur_vertical = in->read_fixed();
+
+    m_radian_angle = in->read_fixed();
+    m_distance = in->read_fixed();
+
+    m_strength = in->read_short_fixed();
+
+    m_inner_shadow = in->read_uint(1) ? true : false;
+    m_knock_out = in->read_uint(1) ? true : false;
+    m_composite_source = in->read_uint(1) ? true : false;
+
+    static_cast<void> (in->read_uint(1)); // Throw away.
+
+    m_passes = static_cast<uint8_t> (in->read_uint(4));
+
+    return true;
+}
+
+// TODO: Be sure that read_fixed is doing the right thing with
+// values that are stored as floats rather than as fixed point
+// values! If they are not, define such a function in the
+// stream and remove this #define.
+#define read_float read_fixed
+
+bool convolution_filter::read(stream* in)
+{
+    m_columns = in->read_u8();
+    m_rows = in->read_u8();
+
+    m_divisor = in->read_float();
+    m_bias = in->read_float();
+
+    m_weights.reserve(m_columns * m_rows);
+    for (int i = 0; i < m_columns * m_rows; ++i)
+    {
+        m_weights.push_back(in->read_float());
+    }
+
+    m_default_rgba.read_rgba(in);
+
+    static_cast<void> (in->read_uint(6)); // Throw away.
+
+    m_clamp = in->read_uint(1) ? true : false;
+    m_reserve_alpha = in->read_uint(1) ? true : false;
+
+    return true;
+}
+
+bool color_matrix_filter::read(stream* in)
+{
+    for (int i = 0; i < 20; ++i)
+    {
+        m_matrix[i] = in->read_float();
+    }
+
+    m_matrix[20] = m_matrix[21] = m_matrix[22] = m_matrix[23] = 0.0;
+    m_matrix[24] = 1.0;
+
+    return true;
+}
+
+#undef read_float
+
+// This is the same code as gradient_glow_filter,
+// however, there is no intrinsic reason this must be the case,
+// so these two functions are separated.
+bool gradient_bevel_filter::read(stream* in)
+{
+    m_count = in->read_u8();
+
+    m_rgba_array.reserve(m_count);
+    for (int i = 0; i < m_count; ++i)
+    {
+        boost::shared_ptr<cxform> rgba(new cxform);
+        rgba->read_rgba(in);
+        m_rgba_array.push_back(rgba);
+    }
+
+    m_positions.reserve(m_count);
+    for (int i = 0; i < m_count; ++i)
+    {
+        m_positions.push_back(in->read_u8());
+    }
+
+    m_blur_horizontal = in->read_fixed();
+    m_blur_vertical = in->read_fixed();
+
+    m_radian_angle = in->read_fixed();
+    m_distance = in->read_fixed();
+
+    m_strength = in->read_short_fixed();
+
+    m_inner_shadow = in->read_uint(1) ? true : false;
+    m_knock_out = in->read_uint(1) ? true : false;
+    m_composite_source = in->read_uint(1) ? true : false;
+
+    static_cast<void> (in->read_uint(1)); // Throw away.
+
+    m_passes = static_cast<uint8_t> (in->read_uint(4));
+
+    return true;
+}
+
+} // effect_filters namespace
+} // gnash namespace



From MAILER-DAEMON Fri Aug 24 01:45:56 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IORzY-0000j1-KV
	for mharc-gnash-commit@gnu.org; Fri, 24 Aug 2007 01:45:56 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IORzW-0000gU-MT
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 01:45:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IORzV-0000fX-AC
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 01:45:53 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IORzV-0000fU-3s
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 01:45:53 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <chadmusick@msbx.net>) id 1IORzU-00086B-Qm
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 01:45:52 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <chadmusick@msbx.net>) id 1IORzU-0003D5-AJ
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 05:45:52 +0000
Received: from cmusick by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <cmusick@savannah.gnu.org>) id 1IORzU-0003Cy-3K
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 05:45:52 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IORzU-0003Cy-3K@cvs.savannah.gnu.org>
From: Chad Musick <chadmusick@msbx.net>
Date: Fri, 24 Aug 2007 05:45:52 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/stream.h server/stream.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2007 05:45:54 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Chad Musick <cmusick>	07/08/24 05:45:52

Modified files:
	.              : ChangeLog 
	server         : stream.h stream.cpp 

Log message:
	Add read_short_fixed() function to the stream for 16 bit fixed reads.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4087&r2=1.4088
http://cvs.savannah.gnu.org/viewcvs/gnash/server/stream.h?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/server/stream.cpp?cvsroot=gnash&r1=1.23&r2=1.24

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4087
retrieving revision 1.4088
diff -u -b -r1.4087 -r1.4088
--- ChangeLog	24 Aug 2007 05:44:17 -0000	1.4087
+++ ChangeLog	24 Aug 2007 05:45:51 -0000	1.4088
@@ -1,5 +1,11 @@
 2007-08-24 Chad Musick <chadmusick@msbx.net>
 
+	* server/stream.cpp,h: Add read_short_fixed() function for
+	  what short fixed values (16 bits) are needed rather than
+	  long fixed values (32 bits) from the SWF stream.
+
+2007-08-24 Chad Musick <chadmusick@msbx.net>
+
 	* server/filters.cpp,h: Effect filters for PlaceObject3 and
 	  for buttons. No current effect, but it parses correctly from SWF.
 	* Makefile.am: Add the filters files.

Index: server/stream.h
===================================================================
RCS file: /sources/gnash/gnash/server/stream.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- server/stream.h	9 Aug 2007 04:18:37 -0000	1.23
+++ server/stream.h	24 Aug 2007 05:45:51 -0000	1.24
@@ -52,6 +52,7 @@
 		int	read_sint(unsigned short bitcount);
 
 		float	read_fixed();
+                float   read_short_fixed();
 		void	align();
 
 		unsigned read(char *buf, unsigned count);

Index: server/stream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/stream.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- server/stream.cpp	12 Jul 2007 14:28:01 -0000	1.23
+++ server/stream.cpp	24 Aug 2007 05:45:51 -0000	1.24
@@ -120,6 +120,11 @@
 		int32_t	val = m_input->read_le32();
 		return (float) val / 65536.0f;
 	}
+        float   stream::read_short_fixed()
+        {
+                m_unused_bits = 0;
+                return (float) m_input->read_le16();
+        }
 
 	void	stream::align() { m_unused_bits = 0; m_current_byte = 0; }
 



From MAILER-DAEMON Fri Aug 24 01:49:49 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IOS3J-0001iS-Lp
	for mharc-gnash-commit@gnu.org; Fri, 24 Aug 2007 01:49:49 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IOS3H-0001fo-A1
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 01:49:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IOS3G-0001fF-Qn
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 01:49:46 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IOS3G-0001f9-Fx
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 01:49:46 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <chadmusick@msbx.net>) id 1IOS3G-0000Ec-4U
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 01:49:46 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <chadmusick@msbx.net>) id 1IOS3F-0003kN-LO
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 05:49:45 +0000
Received: from cmusick by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <cmusick@savannah.gnu.org>) id 1IOS3F-0003kK-HT
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 05:49:45 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IOS3F-0003kK-HT@cvs.savannah.gnu.org>
From: Chad Musick <chadmusick@msbx.net>
Date: Fri, 24 Aug 2007 05:49:45 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/swf.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2007 05:49:47 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Chad Musick <cmusick>	07/08/24 05:49:45

Modified files:
	.              : ChangeLog 
	server         : swf.h 

Log message:
	Adding the FOCAL_GRADIENT fill style identifier.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4088&r2=1.4089
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf.h?cvsroot=gnash&r1=1.39&r2=1.40

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4088
retrieving revision 1.4089
diff -u -b -r1.4088 -r1.4089
--- ChangeLog	24 Aug 2007 05:45:51 -0000	1.4088
+++ ChangeLog	24 Aug 2007 05:49:45 -0000	1.4089
@@ -1,5 +1,9 @@
 2007-08-24 Chad Musick <chadmusick@msbx.net>
 
+	* server/swf.h: Add FOCAL_GRADIENT to fill styles.
+
+2007-08-24 Chad Musick <chadmusick@msbx.net>
+
 	* server/stream.cpp,h: Add read_short_fixed() function for
 	  what short fixed values (16 bits) are needed rather than
 	  long fixed values (32 bits) from the SWF stream.

Index: server/swf.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- server/swf.h	22 Aug 2007 17:32:45 -0000	1.39
+++ server/swf.h	24 Aug 2007 05:49:45 -0000	1.40
@@ -1691,6 +1691,7 @@
 	FILL_SOLID                   = 0x00,
 	FILL_LINEAR_GRADIENT         = 0x10,
 	FILL_RADIAL_GRADIENT         = 0x12,
+	FILL_FOCAL_GRADIENT	     = 0x13,
 	FILL_TILED_BITMAP            = 0x40,
 	FILL_CLIPPED_BITMAP          = 0x41,
 



From MAILER-DAEMON Fri Aug 24 01:55:58 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IOS9F-0007Gu-Sa
	for mharc-gnash-commit@gnu.org; Fri, 24 Aug 2007 01:55:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IOS9E-0007E8-8g
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 01:55:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IOS9D-0007Cr-7p
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 01:55:55 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IOS9D-0007CQ-0H
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 01:55:55 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <chadmusick@msbx.net>) id 1IOS9C-0001UK-AF
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 01:55:54 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <chadmusick@msbx.net>) id 1IOS9A-0003rO-GX
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 05:55:52 +0000
Received: from cmusick by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <cmusick@savannah.gnu.org>) id 1IOS9A-0003rL-Au
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 05:55:52 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IOS9A-0003rL-Au@cvs.savannah.gnu.org>
From: Chad Musick <chadmusick@msbx.net>
Date: Fri, 24 Aug 2007 05:55:52 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/impl.cpp server/swf/Plac...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2007 05:55:57 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Chad Musick <cmusick>	07/08/24 05:55:52

Modified files:
	.              : ChangeLog 
	server         : impl.cpp 
	server/swf     : PlaceObject2Tag.cpp PlaceObject2Tag.h 

Log message:
	Adding support for PlaceObject3 SWF8 tag.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4089&r2=1.4090
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.cpp?cvsroot=gnash&r1=1.116&r2=1.117
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/PlaceObject2Tag.cpp?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/PlaceObject2Tag.h?cvsroot=gnash&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4089
retrieving revision 1.4090
diff -u -b -r1.4089 -r1.4090
--- ChangeLog	24 Aug 2007 05:49:45 -0000	1.4089
+++ ChangeLog	24 Aug 2007 05:55:51 -0000	1.4090
@@ -1,5 +1,14 @@
 2007-08-24 Chad Musick <chadmusick@msbx.net>
 
+	* server/swf/PlaceObject2Tag.cpp,h: Add support for the
+	  PlaceObject3 tag.  This immediately improves some SWF 8
+	  support.  The tag still needs to do something with the
+	  filters which it loads.
+	* server/impl.cpp: Add a loader for PlaceObject3, remove
+	  loaders for DefineShape4, which isn't yet functional.
+
+2007-08-24 Chad Musick <chadmusick@msbx.net>
+
 	* server/swf.h: Add FOCAL_GRADIENT to fill styles.
 
 2007-08-24 Chad Musick <chadmusick@msbx.net>

Index: server/impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/impl.cpp,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -b -r1.116 -r1.117
--- server/impl.cpp	22 Aug 2007 13:09:10 -0000	1.116
+++ server/impl.cpp	24 Aug 2007 05:55:51 -0000	1.117
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: impl.cpp,v 1.116 2007/08/22 13:09:10 cmusick Exp $ */
+/* $Id: impl.cpp,v 1.117 2007/08/24 05:55:51 cmusick Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -244,11 +244,11 @@
 
         // TODO: Alexis reference says these are 83, 84. The 67,68 comes from Tamarin.
         // Figure out which one is correct (possibly both are).
-        register_tag_loader(SWF::DEFINESHAPE4_, fixme_loader); // 67
+        register_tag_loader(SWF::DEFINESHAPE4_, fixme_loader /*define_shape_loader*/); // 67
         register_tag_loader(SWF::DEFINEMORPHSHAPE2_, fixme_loader); // 68
 
 	register_tag_loader(SWF::FILEATTRIBUTES, file_attributes_loader); // 69
-	register_tag_loader(SWF::PLACEOBJECT3, fixme_loader); // 70
+	register_tag_loader(SWF::PLACEOBJECT3, PlaceObject2Tag::loader); // 70
 	register_tag_loader(SWF::IMPORTASSETS2, import_loader); // 71
 
         register_tag_loader(SWF::DOABC, fixme_loader); // 72 -- AS3 codeblock.
@@ -260,7 +260,7 @@
 	register_tag_loader(SWF::METADATA, metadata_loader); // 77
 	register_tag_loader(SWF::DEFINESCALINGGRID, fixme_loader); // 78
         register_tag_loader(SWF::DOABCDEFINE, fixme_loader); // 79 -- AS3 codeblock.
-	register_tag_loader(SWF::DEFINESHAPE4, fixme_loader); // 83
+	register_tag_loader(SWF::DEFINESHAPE4, fixme_loader /*define_shape_loader*/); // 83
 	register_tag_loader(SWF::DEFINEMORPHSHAPE2, fixme_loader); // 84
 
         register_tag_loader(SWF::DEFINEFONTNAME, define_font_name_loader); // 88

Index: server/swf/PlaceObject2Tag.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/PlaceObject2Tag.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- server/swf/PlaceObject2Tag.cpp	9 Aug 2007 12:18:07 -0000	1.17
+++ server/swf/PlaceObject2Tag.cpp	24 Aug 2007 05:55:52 -0000	1.18
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: PlaceObject2Tag.cpp,v 1.17 2007/08/09 12:18:07 zoulunkai Exp $ */
+/* $Id: PlaceObject2Tag.cpp,v 1.18 2007/08/24 05:55:52 cmusick Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -29,6 +29,7 @@
 #include "swf_event.h"
 #include "log.h"
 #include "stream.h"
+#include "filters.h"
 
 namespace gnash {
 namespace SWF {
@@ -210,10 +211,16 @@
 
 // read SWF::PLACEOBJECT2
 void
-PlaceObject2Tag::readPlaceObject2(stream* in, int movie_version)
+PlaceObject2Tag::readPlaceObject2(stream* in, int movie_version, bool place_2)
 {
 	in->align();
 
+        uint8_t blend_mode = 0;
+        uint8_t bitmask = 0;
+        bool has_bitmap_caching = false;
+        bool has_blend_mode = false;
+        bool has_filters = false;
+
 	bool	has_actions = in->read_uint(1) ? true : false;
 	bool	has_clip_bracket = in->read_uint(1) ? true : false;
 	bool	has_name = in->read_uint(1) ? true : false;
@@ -223,6 +230,14 @@
 	bool	has_char = in->read_uint(1) ? true : false;
 	bool	flag_move = in->read_uint(1) ? true : false;
 
+        if (!place_2 && movie_version >= 8)
+        {
+            static_cast<void> (in->read_uint(5)); // Ignore on purpose.
+            has_bitmap_caching = in->read_uint(1) ? true : false;
+            has_blend_mode = in->read_uint(1) ? true : false;
+            has_filters = in->read_uint(1) ? true : false;
+        }
+
 	m_depth = in->read_u16()+character::staticDepthOffset;
 
 	if (has_char) m_character_id = in->read_u16();
@@ -251,12 +266,29 @@
 	else
 		m_clip_depth = character::noClipDepthValue;
 
+        if (has_filters)
+        {
+            effect_filters::effect_filters_vec v; // TODO: Something should be done with the filters...
+            effect_filters::filter_factory::read(in, movie_version, true, &v);
+        }
+
+        if (has_blend_mode)
+        {
+            blend_mode = in->read_u8();
+        }
+
+        if (has_bitmap_caching)
+        {
+            // It is not certain that this actually exists, so if this reader
+            // is broken, it is probably here!
+            bitmask = in->read_u8();
+        }
+
 	if (has_actions)
 	{
 		readPlaceActions(in, movie_version);
 	}
 
-
 	if (has_char == true && flag_move == true)
 	{
 		// Remove whatever's at m_depth, and put m_character there.
@@ -272,6 +304,10 @@
 		// Put m_character at m_depth.
 		m_place_type = PLACE;
 	}
+        else if (has_char == false && flag_move == false)
+        {
+             m_place_type = REMOVE;
+        }
 
 	IF_VERBOSE_PARSE (
 		log_parse(_("  PLACEOBJECT2: depth = %d (%d)"), m_depth, m_depth-character::staticDepthOffset);
@@ -307,7 +343,7 @@
 	}
 	else
 	{
-		readPlaceObject2(in, movie_version);
+		readPlaceObject2(in, movie_version, tag == SWF::PLACEOBJECT3 ? false : true);
 	}
 }
 
@@ -349,6 +385,9 @@
 	      m_ratio,
 	      m_clip_depth);
 	  break;
+
+      case REMOVE:
+          m->remove_display_object(m_depth, 0); // 0 since it is unused.
     }
 }
 
@@ -366,7 +405,7 @@
 void
 PlaceObject2Tag::loader(stream* in, tag_type tag, movie_definition* m)
 {
-    assert(tag == SWF::PLACEOBJECT || tag == SWF::PLACEOBJECT2);
+    assert(tag == SWF::PLACEOBJECT || tag == SWF::PLACEOBJECT2 || tag == SWF::PLACEOBJECT3);
 
     IF_VERBOSE_PARSE
     (

Index: server/swf/PlaceObject2Tag.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf/PlaceObject2Tag.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/swf/PlaceObject2Tag.h	1 Jul 2007 10:54:35 -0000	1.12
+++ server/swf/PlaceObject2Tag.h	24 Aug 2007 05:55:52 -0000	1.13
@@ -19,7 +19,7 @@
 //
 //
 
-/* $Id: PlaceObject2Tag.h,v 1.12 2007/07/01 10:54:35 bjacques Exp $ */
+/* $Id: PlaceObject2Tag.h,v 1.13 2007/08/24 05:55:52 cmusick Exp $ */
 
 #ifndef GNASH_SWF_PLACEOBJECT2TAG_H
 #define GNASH_SWF_PLACEOBJECT2TAG_H
@@ -97,6 +97,10 @@
 	/// Return true if this tag transforms a character
 	bool isMove() const { return m_place_type == MOVE; }
 
+        /// Return true if this tag removes a character.
+        //  This is set by having no char and no place in the place tag.
+        bool isRemove() const { return m_place_type == REMOVE; }
+
 	static void loader(stream* in, tag_type tag, movie_definition* m);
 
     int getRatio() const { return m_ratio;}
@@ -118,7 +122,8 @@
 	{
 		PLACE,
 		MOVE,
-		REPLACE
+		REPLACE,
+                REMOVE
 	} m_place_type;
 
 	const movie_definition& _movie_def;
@@ -131,8 +136,8 @@
 	// read placeObject2 actions
 	void readPlaceActions(stream* in, int movie_version);
 
-	// read SWF::PLACEOBJECT2
-	void readPlaceObject2(stream* in, int movie_version);
+	// read SWF::PLACEOBJECT2 or SWF::PLACEOBJECT3
+	void readPlaceObject2(stream* in, int movie_version, bool place_2);
 
 };
 



From MAILER-DAEMON Fri Aug 24 01:57:13 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IOSAT-0001Zm-6S
	for mharc-gnash-commit@gnu.org; Fri, 24 Aug 2007 01:57:13 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IOSAR-0001To-1c
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 01:57:11 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IOSAQ-0001Re-FL
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 01:57:10 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IOSAQ-0001RC-4l
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 01:57:10 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <chadmusick@msbx.net>) id 1IOSAP-0001nt-RI
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 01:57:09 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <chadmusick@msbx.net>) id 1IOSAP-0003sn-Bv
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 05:57:09 +0000
Received: from cmusick by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <cmusick@savannah.gnu.org>) id 1IOSAP-0003sk-7i
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 05:57:09 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IOSAP-0003sk-7i@cvs.savannah.gnu.org>
From: Chad Musick <chadmusick@msbx.net>
Date: Fri, 24 Aug 2007 05:57:09 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/server Makefile.am
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2007 05:57:11 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Chad Musick <cmusick>	07/08/24 05:57:09

Modified files:
	server         : Makefile.am 

Log message:
	Makefile needed filters.cpp and filters.h added.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Makefile.am?cvsroot=gnash&r1=1.121&r2=1.122

Patches:
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/Makefile.am,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -b -r1.121 -r1.122
--- Makefile.am	10 Aug 2007 04:36:13 -0000	1.121
+++ Makefile.am	24 Aug 2007 05:57:09 -0000	1.122
@@ -18,7 +18,7 @@
 # 
 #
 
-# $Id: Makefile.am,v 1.121 2007/08/10 04:36:13 strk Exp $
+# $Id: Makefile.am,v 1.122 2007/08/24 05:57:09 cmusick Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -65,6 +65,7 @@
 	cxform.cpp \
 	DynamicShape.cpp	\
 	edit_text_character.cpp \
+        filters.cpp \
 	generic_character.cpp \
 	matrix.cpp \
 	movie_instance.cpp \
@@ -128,6 +129,7 @@
 	event_id.h \
 	execute_tag.h \
 	fill_style.h \
+        filters.h \
 	font.h \
 	fontlib.h \
 	generic_character.h \



From MAILER-DAEMON Fri Aug 24 02:01:58 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IOSF4-0007mY-Ln
	for mharc-gnash-commit@gnu.org; Fri, 24 Aug 2007 02:01:58 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IOSF1-0007i8-Q1
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 02:01:55 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IOSEx-0007bj-Ed
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 02:01:55 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IOSEx-0007bI-8q
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 02:01:51 -0400
Received: from rv-out-0910.google.com ([209.85.198.189])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1IOSEw-00031M-66
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 02:01:50 -0400
Received: by rv-out-0910.google.com with SMTP id c27so550942rvf
	for <gnash-commit@gnu.org>; Thu, 23 Aug 2007 23:01:42 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=VT6e55tyD8os9Ug5FhMuEslWxr7aTp1pXxndt9XpGYasuM2sRe1WrTx17nxe5uGQyyqqq3IFsxaXRUahHzSTE6AE2bTRDa3m+KdY3WXBsgcBMBpX2RYQIsgl3cw2c0wBXr47GZU85o3LnNVwzjUcAFaMdpxwFTEuq9JNYYnBU88=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=ZXLQQOZIjpK9mwEdDWcB5ms6taFpNFtvqONTdGu1aRZFoAEv5pYMrnEHPTW8UZ6yN/P+ZaG2B4qjea/KoBUlZ4Mym+CFc3PJQlqf0uxtgfQzp7wb+lo0cc6i9yav80sMasI3PJmLiUAWFb18p0G7wD4cJgcJsZCxHavFHLWA9mM=
Received: by 10.114.56.1 with SMTP id e1mr265989waa.1187935301948;
	Thu, 23 Aug 2007 23:01:41 -0700 (PDT)
Received: by 10.114.12.7 with HTTP; Thu, 23 Aug 2007 23:01:41 -0700 (PDT)
Message-ID: <ca4b43ff0708232301t52d3616dm94e7f3163937a74d@mail.gmail.com>
Date: Fri, 24 Aug 2007 14:01:41 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "Chad Musick" <chadmusick@msbx.net>
Subject: Re: [Gnash-commit] gnash ChangeLog server/impl.cpp server/swf/Plac...
In-Reply-To: <E1IOS9A-0003rL-Au@cvs.savannah.gnu.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1IOS9A-0003rL-Au@cvs.savannah.gnu.org>
X-Detected-Kernel: Linux 2.6 (newer, 2)
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2007 06:01:57 -0000

+        else if (has_char == false && flag_move == false)
+        {
+             m_place_type = REMOVE;
+        }

PlaceObject2/3 could act as a REMOVE tag?  Sounds interesting, never
met this situation before.  Any difference compared to RemoveObject
tag?

On 8/24/07, Chad Musick <chadmusick@msbx.net> wrote:
> CVSROOT:        /sources/gnash
> Module name:    gnash
> Changes by:     Chad Musick <cmusick>   07/08/24 05:55:52
>
> Modified files:
>        .              : ChangeLog
>        server         : impl.cpp
>        server/swf     : PlaceObject2Tag.cpp PlaceObject2Tag.h
>
> Log message:
>        Adding support for PlaceObject3 SWF8 tag.
>
> CVSWeb URLs:
> http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4089&r2=1.4090
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.cpp?cvsroot=gnash&r1=1.116&r2=1.117
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/PlaceObject2Tag.cpp?cvsroot=gnash&r1=1.17&r2=1.18
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/PlaceObject2Tag.h?cvsroot=gnash&r1=1.12&r2=1.13
>
> Patches:
> Index: ChangeLog
> ===================================================================
> RCS file: /sources/gnash/gnash/ChangeLog,v
> retrieving revision 1.4089
> retrieving revision 1.4090
> diff -u -b -r1.4089 -r1.4090
> --- ChangeLog   24 Aug 2007 05:49:45 -0000      1.4089
> +++ ChangeLog   24 Aug 2007 05:55:51 -0000      1.4090
> @@ -1,5 +1,14 @@
>  2007-08-24 Chad Musick <chadmusick@msbx.net>
>
> +       * server/swf/PlaceObject2Tag.cpp,h: Add support for the
> +         PlaceObject3 tag.  This immediately improves some SWF 8
> +         support.  The tag still needs to do something with the
> +         filters which it loads.
> +       * server/impl.cpp: Add a loader for PlaceObject3, remove
> +         loaders for DefineShape4, which isn't yet functional.
> +
> +2007-08-24 Chad Musick <chadmusick@msbx.net>
> +
>        * server/swf.h: Add FOCAL_GRADIENT to fill styles.
>
>  2007-08-24 Chad Musick <chadmusick@msbx.net>
>
> Index: server/impl.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/server/impl.cpp,v
> retrieving revision 1.116
> retrieving revision 1.117
> diff -u -b -r1.116 -r1.117
> --- server/impl.cpp     22 Aug 2007 13:09:10 -0000      1.116
> +++ server/impl.cpp     24 Aug 2007 05:55:51 -0000      1.117
> @@ -17,7 +17,7 @@
>  // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  //
>
> -/* $Id: impl.cpp,v 1.116 2007/08/22 13:09:10 cmusick Exp $ */
> +/* $Id: impl.cpp,v 1.117 2007/08/24 05:55:51 cmusick Exp $ */
>
>  #ifdef HAVE_CONFIG_H
>  #include "config.h"
> @@ -244,11 +244,11 @@
>
>         // TODO: Alexis reference says these are 83, 84. The 67,68 comes from Tamarin.
>         // Figure out which one is correct (possibly both are).
> -        register_tag_loader(SWF::DEFINESHAPE4_, fixme_loader); // 67
> +        register_tag_loader(SWF::DEFINESHAPE4_, fixme_loader /*define_shape_loader*/); // 67
>         register_tag_loader(SWF::DEFINEMORPHSHAPE2_, fixme_loader); // 68
>
>        register_tag_loader(SWF::FILEATTRIBUTES, file_attributes_loader); // 69
> -       register_tag_loader(SWF::PLACEOBJECT3, fixme_loader); // 70
> +       register_tag_loader(SWF::PLACEOBJECT3, PlaceObject2Tag::loader); // 70
>        register_tag_loader(SWF::IMPORTASSETS2, import_loader); // 71
>
>         register_tag_loader(SWF::DOABC, fixme_loader); // 72 -- AS3 codeblock.
> @@ -260,7 +260,7 @@
>        register_tag_loader(SWF::METADATA, metadata_loader); // 77
>        register_tag_loader(SWF::DEFINESCALINGGRID, fixme_loader); // 78
>         register_tag_loader(SWF::DOABCDEFINE, fixme_loader); // 79 -- AS3 codeblock.
> -       register_tag_loader(SWF::DEFINESHAPE4, fixme_loader); // 83
> +       register_tag_loader(SWF::DEFINESHAPE4, fixme_loader /*define_shape_loader*/); // 83
>        register_tag_loader(SWF::DEFINEMORPHSHAPE2, fixme_loader); // 84
>
>         register_tag_loader(SWF::DEFINEFONTNAME, define_font_name_loader); // 88
>
> Index: server/swf/PlaceObject2Tag.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/server/swf/PlaceObject2Tag.cpp,v
> retrieving revision 1.17
> retrieving revision 1.18
> diff -u -b -r1.17 -r1.18
> --- server/swf/PlaceObject2Tag.cpp      9 Aug 2007 12:18:07 -0000       1.17
> +++ server/swf/PlaceObject2Tag.cpp      24 Aug 2007 05:55:52 -0000      1.18
> @@ -17,7 +17,7 @@
>  // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  //
>
> -/* $Id: PlaceObject2Tag.cpp,v 1.17 2007/08/09 12:18:07 zoulunkai Exp $ */
> +/* $Id: PlaceObject2Tag.cpp,v 1.18 2007/08/24 05:55:52 cmusick Exp $ */
>
>  #ifdef HAVE_CONFIG_H
>  #include "config.h"
> @@ -29,6 +29,7 @@
>  #include "swf_event.h"
>  #include "log.h"
>  #include "stream.h"
> +#include "filters.h"
>
>  namespace gnash {
>  namespace SWF {
> @@ -210,10 +211,16 @@
>
>  // read SWF::PLACEOBJECT2
>  void
> -PlaceObject2Tag::readPlaceObject2(stream* in, int movie_version)
> +PlaceObject2Tag::readPlaceObject2(stream* in, int movie_version, bool place_2)
>  {
>        in->align();
>
> +        uint8_t blend_mode = 0;
> +        uint8_t bitmask = 0;
> +        bool has_bitmap_caching = false;
> +        bool has_blend_mode = false;
> +        bool has_filters = false;
> +
>        bool    has_actions = in->read_uint(1) ? true : false;
>        bool    has_clip_bracket = in->read_uint(1) ? true : false;
>        bool    has_name = in->read_uint(1) ? true : false;
> @@ -223,6 +230,14 @@
>        bool    has_char = in->read_uint(1) ? true : false;
>        bool    flag_move = in->read_uint(1) ? true : false;
>
> +        if (!place_2 && movie_version >= 8)
> +        {
> +            static_cast<void> (in->read_uint(5)); // Ignore on purpose.
> +            has_bitmap_caching = in->read_uint(1) ? true : false;
> +            has_blend_mode = in->read_uint(1) ? true : false;
> +            has_filters = in->read_uint(1) ? true : false;
> +        }
> +
>        m_depth = in->read_u16()+character::staticDepthOffset;
>
>        if (has_char) m_character_id = in->read_u16();
> @@ -251,12 +266,29 @@
>        else
>                m_clip_depth = character::noClipDepthValue;
>
> +        if (has_filters)
> +        {
> +            effect_filters::effect_filters_vec v; // TODO: Something should be done with the filters...
> +            effect_filters::filter_factory::read(in, movie_version, true, &v);
> +        }
> +
> +        if (has_blend_mode)
> +        {
> +            blend_mode = in->read_u8();
> +        }
> +
> +        if (has_bitmap_caching)
> +        {
> +            // It is not certain that this actually exists, so if this reader
> +            // is broken, it is probably here!
> +            bitmask = in->read_u8();
> +        }
> +
>        if (has_actions)
>        {
>                readPlaceActions(in, movie_version);
>        }
>
> -
>        if (has_char == true && flag_move == true)
>        {
>                // Remove whatever's at m_depth, and put m_character there.
> @@ -272,6 +304,10 @@
>                // Put m_character at m_depth.
>                m_place_type = PLACE;
>        }
> +        else if (has_char == false && flag_move == false)
> +        {
> +             m_place_type = REMOVE;
> +        }
>
>        IF_VERBOSE_PARSE (
>                log_parse(_("  PLACEOBJECT2: depth = %d (%d)"), m_depth, m_depth-character::staticDepthOffset);
> @@ -307,7 +343,7 @@
>        }
>        else
>        {
> -               readPlaceObject2(in, movie_version);
> +               readPlaceObject2(in, movie_version, tag == SWF::PLACEOBJECT3 ? false : true);
>        }
>  }
>
> @@ -349,6 +385,9 @@
>              m_ratio,
>              m_clip_depth);
>          break;
> +
> +      case REMOVE:
> +          m->remove_display_object(m_depth, 0); // 0 since it is unused.
>     }
>  }
>
> @@ -366,7 +405,7 @@
>  void
>  PlaceObject2Tag::loader(stream* in, tag_type tag, movie_definition* m)
>  {
> -    assert(tag == SWF::PLACEOBJECT || tag == SWF::PLACEOBJECT2);
> +    assert(tag == SWF::PLACEOBJECT || tag == SWF::PLACEOBJECT2 || tag == SWF::PLACEOBJECT3);
>
>     IF_VERBOSE_PARSE
>     (
>
> Index: server/swf/PlaceObject2Tag.h
> ===================================================================
> RCS file: /sources/gnash/gnash/server/swf/PlaceObject2Tag.h,v
> retrieving revision 1.12
> retrieving revision 1.13
> diff -u -b -r1.12 -r1.13
> --- server/swf/PlaceObject2Tag.h        1 Jul 2007 10:54:35 -0000       1.12
> +++ server/swf/PlaceObject2Tag.h        24 Aug 2007 05:55:52 -0000      1.13
> @@ -19,7 +19,7 @@
>  //
>  //
>
> -/* $Id: PlaceObject2Tag.h,v 1.12 2007/07/01 10:54:35 bjacques Exp $ */
> +/* $Id: PlaceObject2Tag.h,v 1.13 2007/08/24 05:55:52 cmusick Exp $ */
>
>  #ifndef GNASH_SWF_PLACEOBJECT2TAG_H
>  #define GNASH_SWF_PLACEOBJECT2TAG_H
> @@ -97,6 +97,10 @@
>        /// Return true if this tag transforms a character
>        bool isMove() const { return m_place_type == MOVE; }
>
> +        /// Return true if this tag removes a character.
> +        //  This is set by having no char and no place in the place tag.
> +        bool isRemove() const { return m_place_type == REMOVE; }
> +
>        static void loader(stream* in, tag_type tag, movie_definition* m);
>
>     int getRatio() const { return m_ratio;}
> @@ -118,7 +122,8 @@
>        {
>                PLACE,
>                MOVE,
> -               REPLACE
> +               REPLACE,
> +                REMOVE
>        } m_place_type;
>
>        const movie_definition& _movie_def;
> @@ -131,8 +136,8 @@
>        // read placeObject2 actions
>        void readPlaceActions(stream* in, int movie_version);
>
> -       // read SWF::PLACEOBJECT2
> -       void readPlaceObject2(stream* in, int movie_version);
> +       // read SWF::PLACEOBJECT2 or SWF::PLACEOBJECT3
> +       void readPlaceObject2(stream* in, int movie_version, bool place_2);
>
>  };
>
>
>
> _______________________________________________
> Gnash-commit mailing list
> Gnash-commit@gnu.org
> http://lists.gnu.org/mailman/listinfo/gnash-commit
>



From MAILER-DAEMON Fri Aug 24 02:05:49 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IOSIn-0001LJ-5T
	for mharc-gnash-commit@gnu.org; Fri, 24 Aug 2007 02:05:49 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IOSIm-0001L4-4d
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 02:05:48 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IOSIk-0001KK-6B
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 02:05:47 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IOSIk-0001KH-4i
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 02:05:46 -0400
Received: from g78.mailsnare.net ([209.236.228.78] helo=mail.mailsnare.net)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <chadmusick@msbx.net>) id 1IOSIj-0003v3-Of
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 02:05:45 -0400
X-Virus-Scanned: by ClamAV at mailsnare.net
X-Message-ID: 00ff702db0dc1113dba21d7ff9204a39d6a357911d59be81
Received: from [192.168.1.103] (unknown [222.229.211.188])
	by mail.mailsnare.net (Postfix) with ESMTP id 2CAF27AC9F;
	Fri, 24 Aug 2007 06:05:43 +0000 (UTC)
Subject: Re: [Gnash-commit] gnash ChangeLog server/impl.cpp server/swf/Plac...
From: Chad Musick <chadmusick@msbx.net>
To: zou lunkai <zoulunkai@gmail.com>
In-Reply-To: <ca4b43ff0708232301t52d3616dm94e7f3163937a74d@mail.gmail.com>
References: <E1IOS9A-0003rL-Au@cvs.savannah.gnu.org>
	<ca4b43ff0708232301t52d3616dm94e7f3163937a74d@mail.gmail.com>
Content-Type: text/plain
Date: Fri, 24 Aug 2007 15:05:56 +0900
Message-Id: <1187935556.7055.8.camel@ubuntu.sys76.lan>
Mime-Version: 1.0
X-Mailer: Evolution 2.10.1 
Content-Transfer-Encoding: 7bit
X-Detected-Kernel: Linux 2.6 (newer, 3)
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2007 06:05:48 -0000

Yes, in the situation listed PlaceObject2/3 acts as a RemoveObject2 tag.
There's no difference in functionality between the two.  I'm not quite
clear why someone would do it this way, though...

On Fri, 2007-08-24 at 14:01 +0800, zou lunkai wrote:
> +        else if (has_char == false && flag_move == false)
> +        {
> +             m_place_type = REMOVE;
> +        }
> 
> PlaceObject2/3 could act as a REMOVE tag?  Sounds interesting, never
> met this situation before.  Any difference compared to RemoveObject
> tag?





From MAILER-DAEMON Fri Aug 24 02:20:31 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IOSX1-00051u-QC
	for mharc-gnash-commit@gnu.org; Fri, 24 Aug 2007 02:20:31 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IOSX0-0004zJ-4F
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 02:20:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IOSWz-0004ya-M7
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 02:20:29 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IOSWz-0004yO-Bf
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 02:20:29 -0400
Received: from rv-out-0910.google.com ([209.85.198.186])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1IOSWz-0006KM-1b
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 02:20:29 -0400
Received: by rv-out-0910.google.com with SMTP id c27so553669rvf
	for <gnash-commit@gnu.org>; Thu, 23 Aug 2007 23:20:28 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=CvSglsFN+KoeL9wtcSZmBFv1fjk3XrnUf6fqxJTYuKAjnpWbk0e3AFcoxgi/286l6L3g8bdDjRL6ono+Ysap4422hlETOeGdVphDNTlJ1GMoLrjDo5ja5ctaTFw15XT8UFyrxWad4vLNywerJ437/2GAyY8sd9KxYj/Zr64tDW0=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=Ti9pTOE+/KI+p7T/6oS7RjZgXNMiffioqP8BVPZBcMC3Ckc8Fw6p6wOsZoQ1XvnPSHXS7ea5gJCaaCVdNyRCfV/W3ubr1M7MkEMeMTK4tFYH5ZannQIBAKRZTvgZY1ESxua+9PT2MMvGuyM+1YMao6wsC0IuReJcFr4VyPbsFwQ=
Received: by 10.115.77.1 with SMTP id e1mr929800wal.1187936427933;
	Thu, 23 Aug 2007 23:20:27 -0700 (PDT)
Received: by 10.114.12.7 with HTTP; Thu, 23 Aug 2007 23:20:27 -0700 (PDT)
Message-ID: <ca4b43ff0708232320uf9b1addp97a5a4d89d24d121@mail.gmail.com>
Date: Fri, 24 Aug 2007 14:20:27 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "Chad Musick" <chadmusick@msbx.net>
Subject: Re: [Gnash-commit] gnash ChangeLog server/impl.cpp server/swf/Plac...
In-Reply-To: <1187935556.7055.8.camel@ubuntu.sys76.lan>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1IOS9A-0003rL-Au@cvs.savannah.gnu.org>
	<ca4b43ff0708232301t52d3616dm94e7f3163937a74d@mail.gmail.com>
	<1187935556.7055.8.camel@ubuntu.sys76.lan>
X-Detected-Kernel: Linux 2.6 (newer, 2)
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2007 06:20:30 -0000

>I'm not quite clear why someone would do it this way, though...

At least Ming does not support setting both flags to false.

Em.., Current timeline control haven't considered this sitiuation, but
shouldn't be difficult to fix.  Good to know.

On 8/24/07, Chad Musick <chadmusick@msbx.net> wrote:
> Yes, in the situation listed PlaceObject2/3 acts as a RemoveObject2 tag.
> There's no difference in functionality between the two.  I'm not quite
> clear why someone would do it this way, though...
>
> On Fri, 2007-08-24 at 14:01 +0800, zou lunkai wrote:
> > +        else if (has_char == false && flag_move == false)
> > +        {
> > +             m_place_type = REMOVE;
> > +        }
> >
> > PlaceObject2/3 could act as a REMOVE tag?  Sounds interesting, never
> > met this situation before.  Any difference compared to RemoveObject
> > tag?
>
>
>



From MAILER-DAEMON Fri Aug 24 03:36:30 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IOTiY-0005nb-FA
	for mharc-gnash-commit@gnu.org; Fri, 24 Aug 2007 03:36:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IOTiX-0005nV-1k
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 03:36:29 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IOTiV-0005nI-Ue
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 03:36:28 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IOTiV-0005nF-M7
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 03:36:27 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IOTiU-00081g-PG
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 03:36:26 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IOTiU-0001tb-AL
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 07:36:26 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IOTiU-0001tY-3w
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 07:36:26 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IOTiU-0001tY-3w@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Fri, 24 Aug 2007 07:36:26 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/DefineE...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2007 07:36:29 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/24 07:36:26

Modified files:
	.              : ChangeLog 
Added files:
	testsuite/misc-ming.all: DefineEditTextVariableNameTest2.c 

Log message:
	* testsuite/misc-ming.all/DefineEditTextVariableNameTest2.c: add a new testcase for EditText variables, not enabled yet, need review.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4090&r2=1.4091
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DefineEditTextVariableNameTest2.c?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4090
retrieving revision 1.4091
diff -u -b -r1.4090 -r1.4091
--- ChangeLog	24 Aug 2007 05:55:51 -0000	1.4090
+++ ChangeLog	24 Aug 2007 07:36:25 -0000	1.4091
@@ -1,3 +1,8 @@
+2007-08-24 Zou Lunkai <zoulunkai@gmail.com>
+	
+	* testsuite/misc-ming.all/DefineEditTextVariableNameTest2.c: add a new 
+	  testcase for EditText variables, not enabled yet, need review.
+	  
 2007-08-24 Chad Musick <chadmusick@msbx.net>
 
 	* server/swf/PlaceObject2Tag.cpp,h: Add support for the

Index: testsuite/misc-ming.all/DefineEditTextVariableNameTest2.c
===================================================================
RCS file: testsuite/misc-ming.all/DefineEditTextVariableNameTest2.c
diff -N testsuite/misc-ming.all/DefineEditTextVariableNameTest2.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-ming.all/DefineEditTextVariableNameTest2.c	24 Aug 2007 07:36:25 -0000	1.1
@@ -0,0 +1,204 @@
+/* 
+ *   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *
+ */ 
+
+/*
+ * zou lunkai zoulunkai@gmail.com
+ *
+ * Test DefineEditText tag with VariableName
+ *
+ * TODO: review this testcase later.
+ *
+ * run as ./DefineEditTextVariableNameTest2
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <ming.h>
+
+#include "ming_utils.h"
+
+#define OUTPUT_VERSION 7
+#define OUTPUT_FILENAME "DefineEditTextVariableNameTest2.swf"
+
+SWFDisplayItem add_text_field(SWFMovie mo, SWFBlock font, const char* varname,  const char* text);
+
+SWFDisplayItem
+add_text_field(SWFMovie mo, SWFBlock font, const char* varname, const char* text)
+{
+  SWFTextField tf;
+  SWFDisplayItem it;
+
+  tf = newSWFTextField();
+
+  SWFTextField_setFlags(tf, SWFTEXTFIELD_DRAWBOX);
+
+  SWFTextField_setFont(tf, font);
+  SWFTextField_addChars(tf, text);
+  SWFTextField_addString(tf, text);
+
+  SWFTextField_setBounds(tf, 150, 30);
+  
+  /* Give the textField a variablename*/
+  SWFTextField_setVariableName(tf, varname);
+
+  return SWFMovie_add(mo, (SWFBlock)tf);
+}
+
+
+int
+main(int argc, char** argv)
+{
+  SWFMovie mo;
+  const char *srcdir=".";
+  char fdbfont[256];
+  SWFMovieClip  dejagnuclip;
+  SWFFont bfont;
+  SWFDisplayItem it1, it2, it3, it4;
+  
+
+  // Frame1: Initialization
+
+  if ( argc>1 ) srcdir=argv[1];
+  else
+  {
+    fprintf(stderr, "Usage: %s <mediadir>\n", argv[0]);
+    return 1;
+  }
+
+  sprintf(fdbfont, "%s/Bitstream Vera Sans.fdb", srcdir);
+
+  puts("Setting things up");
+
+  Ming_init();
+  Ming_useSWFVersion (OUTPUT_VERSION);
+ 
+  mo = newSWFMovie();
+  SWFMovie_setRate(mo, 1.0);
+  SWFMovie_setDimension(mo, 800, 600);
+  
+  dejagnuclip = get_dejagnu_clip((SWFBlock)get_default_font(srcdir), 10, 0, 0, 800, 600);
+  SWFMovie_add(mo, (SWFBlock)dejagnuclip);
+  SWFMovie_nextFrame(mo);  
+
+  // Frame2: add dtext1, associate it with a variable 'edit_text_var'
+  
+  bfont = get_default_font(srcdir);
+       
+  it1 = add_text_field(mo, (SWFBlock)bfont, "edit_text_var",  "Hello");
+  SWFDisplayItem_setName(it1, "dtext1");
+  SWFDisplayItem_moveTo(it1, 0, 100);
+  
+  check_equals(mo, "edit_text_var", "'Hello'");
+  check_equals(mo, "dtext1.text", "'Hello'");
+  SWFMovie_nextFrame(mo); 
+  
+  // Frame3: add dtext2, associate it with a variable 'edit_text_var' again
+  
+  it2 = add_text_field(mo, (SWFBlock)bfont, "edit_text_var",  "World");
+  SWFDisplayItem_setName(it2, "dtext2");
+  SWFDisplayItem_moveTo(it2, 0, 200);
+  
+  check_equals(mo, "edit_text_var", "'Hello'");
+  check_equals(mo, "dtext1.text", "'Hello'");
+  check_equals(mo, "dtext2.text", "'Hello'");
+  SWFMovie_nextFrame(mo); 
+  
+  // Frame4: add dtext3, associate it with a variable 'edit_text_var' again
+  
+  it3 = add_text_field(mo, (SWFBlock)bfont, "edit_text_var",  "Hello World");
+  SWFDisplayItem_setName(it3, "dtext3");
+  SWFDisplayItem_moveTo(it3, 0, 300);
+  
+  check_equals(mo, "edit_text_var", "'Hello'");
+  check_equals(mo, "dtext1.text", "'Hello'");
+  check_equals(mo, "dtext2.text", "'Hello'");
+  check_equals(mo, "dtext3.text", "'Hello'");
+  SWFMovie_nextFrame(mo); 
+  
+  // Frame5: set edit_text_var to 'Hahaha'
+  
+  add_actions(mo, "edit_text_var = 'Hahaha'; ");
+  check_equals(mo, "edit_text_var", "'Hahaha'");
+  check_equals(mo, "dtext1.text", "'Hahaha'");
+  xcheck_equals(mo, "dtext2.text", "'Hahaha'");
+  xcheck_equals(mo, "dtext3.text", "'Hahaha'");
+  SWFMovie_nextFrame(mo); 
+  
+  // Frame6: remove dtext1
+  SWFDisplayItem_remove(it1);
+  check_equals(mo, "typeof(edit_text_var)", "'string'" );
+  check_equals(mo, "edit_text_var", "'Hahaha'");
+  SWFMovie_nextFrame(mo); 
+  
+  // Frame7: remove dtext2
+  SWFDisplayItem_remove(it2);
+  check_equals(mo, "typeof(edit_text_var)", "'string'" );
+  check_equals(mo, "edit_text_var", "'Hahaha'");
+  SWFMovie_nextFrame(mo); 
+
+  // Frame8: remove dtext3
+  SWFDisplayItem_remove(it3);
+  check_equals(mo, "typeof(edit_text_var)", "'string'" );
+  check_equals(mo, "edit_text_var", "'Hahaha'");
+  SWFMovie_nextFrame(mo); 
+  
+  // Frame 9: add dtext4, associate it with a variable 'edit_text_var' again. 
+  it4 = add_text_field(mo, (SWFBlock)bfont, "edit_text_var",  "Hello");
+  SWFDisplayItem_setName(it4, "dtext4");
+  SWFDisplayItem_moveTo(it4, 0, 400);
+  check_equals(mo, "edit_text_var", "'Hahaha'");
+  check_equals(mo, "dtext4.text", "'Hahaha'");
+  SWFMovie_nextFrame(mo); 
+  
+  // Frame10: set edit_text_var to a new Object
+  add_actions(mo, "edit_text_var = new Object();");
+  check_equals(mo, "typeof(edit_text_var)", "'object'");
+  check_equals(mo, "typeof(dtext4.text)", "'string'");
+  // dtext4.text == Object.toString() 
+  xcheck_equals(mo, "dtext4.text", "'[object Object]'");
+  SWFMovie_nextFrame(mo);
+  
+  // Frame 11: provide a user defined toString for edit_text_var
+  //
+  add_actions(mo, "Object.prototype.toString = function() {return 'Hello world';}; ");
+  check_equals(mo, "typeof(dtext4.text)", "'string'");
+  // Object.prototype.toString not invoked here!
+  // Strange!!!
+  xcheck_equals(mo, "dtext4.text", "'[object Object]'");
+  check_equals(mo, "typeof(dtext4.text.toString)", "'function'");
+  xcheck_equals(mo, "dtext4.text.toString()", "'[object Object]'");
+  xcheck_equals(mo, "dtext4.text.valueOf()", "'[object Object]'");
+  SWFMovie_nextFrame(mo);
+  
+  // Frame 13: prints 'Hello world', but the text in dtext4 is '[object Object]'
+  // Strange!!!
+  add_actions(mo, "_root.note(edit_text_var);");
+  SWFMovie_nextFrame(mo);
+  
+  // Frame 14: end
+  add_actions(mo, "totals(); stop();");
+  SWFMovie_nextFrame(mo); 
+ 
+
+  // Output movie
+  puts("Saving " OUTPUT_FILENAME );
+  SWFMovie_save(mo, OUTPUT_FILENAME);
+
+  return 0;
+}



From MAILER-DAEMON Fri Aug 24 03:43:41 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IOTpV-0002EH-E6
	for mharc-gnash-commit@gnu.org; Fri, 24 Aug 2007 03:43:41 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IOTpT-0002Dt-PZ
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 03:43:39 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IOTpT-0002Dh-AV
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 03:43:39 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IOTpT-0002De-4K
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 03:43:39 -0400
Received: from mx20.gnu.org ([199.232.41.8])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IOTpS-0005Zz-GA
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 03:43:38 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by mx20.gnu.org with esmtp (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1IOTpR-0002XE-Aw
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 03:43:37 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l7O7hYO81547;
	Fri, 24 Aug 2007 09:43:34 +0200 (CEST)
	(envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Fri, 24 Aug 2007 09:43:34 +0200
To: Markus Gothe <markus@unixrus.se>
Subject: Re: [Gnash-commit] gnash/libbase tree.hpp tree.hh
Message-ID: <20070824074334.GB81385@keybit.net>
Mail-Followup-To: Markus Gothe <markus@unixrus.se>, gnash-commit@gnu.org
References: <E1IOPZZ-0002Fm-3K@cvs.savannah.gnu.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1IOPZZ-0002Fm-3K@cvs.savannah.gnu.org>
X-detected-kernel: FreeBSD 2.0-4.2
X-Detected-Kernel: Linux 2.6, seldom 2.4 (older, 4)
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2007 07:43:40 -0000

On Fri, Aug 24, 2007 at 03:10:57AM +0000, Markus Gothe wrote:
> CVSROOT:	/sources/gnash
> Module name:	gnash
> Changes by:	Markus Gothe <nihilus>	07/08/24 03:10:57
> 
> Added files:
> 	libbase        : tree.hpp 
> Removed files:
> 	libbase        : tree.hh 
> 
> Log message:
> 	Naming convetion, afaik C++ templates should be named .hpp (see boost).

Why don't you keep the original filename ? It's not gnash code, it's external one...
Boost has its own convention. Gnash also has templates (Range2d.h) but doesn't name 
them .hpp -- please keep the author name for that file.

--strk;



From MAILER-DAEMON Fri Aug 24 03:55:31 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IOU0x-0001ot-N0
	for mharc-gnash-commit@gnu.org; Fri, 24 Aug 2007 03:55:31 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IOU0w-0001oR-41
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 03:55:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IOU0v-0001oD-GI
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 03:55:29 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IOU0v-0001oA-BI
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 03:55:29 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1IOU0u-0000yh-EI
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 03:55:28 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l7O7tNv81699;
	Fri, 24 Aug 2007 09:55:23 +0200 (CEST)
	(envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Fri, 24 Aug 2007 09:55:23 +0200
To: Chad Musick <chadmusick@msbx.net>
Subject: Re: [Gnash-commit] gnash ChangeLog server/stream.h server/stream.cpp
Message-ID: <20070824075522.GC81385@keybit.net>
Mail-Followup-To: Chad Musick <chadmusick@msbx.net>, gnash-commit@gnu.org
References: <E1IORzU-0003Cy-3K@cvs.savannah.gnu.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1IORzU-0003Cy-3K@cvs.savannah.gnu.org>
X-Detected-Kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2007 07:55:30 -0000

On Fri, Aug 24, 2007 at 05:45:52AM +0000, Chad Musick wrote:

> +                float   read_short_fixed();

Please document the functions you add, a single line would do.

> +        float   stream::read_short_fixed()
> +        {
> +                m_unused_bits = 0;
> +                return (float) m_input->read_le16();
> +        }
>  
>  	void	stream::align() { m_unused_bits = 0; m_current_byte = 0; }

Should you call align() instead of just setting m_unused_bits to 0 ?

--strk;



From MAILER-DAEMON Fri Aug 24 06:06:09 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IOW3L-0002c7-S4
	for mharc-gnash-commit@gnu.org; Fri, 24 Aug 2007 06:06:08 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IOW3H-0002ZW-U5
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 06:06:04 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IOW3G-0002Xr-19
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 06:06:02 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IOW3E-0002Xf-Ek
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 06:06:01 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IOW3D-00035Q-VY
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 06:06:00 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IOW3C-0003sa-In
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 10:05:58 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IOW3C-0003sX-CZ
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 10:05:58 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IOW3C-0003sX-CZ@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 24 Aug 2007 10:05:58 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/as_environment.cpp serve...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2007 10:06:04 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/24 10:05:58

Modified files:
	.              : ChangeLog 
	server         : as_environment.cpp sprite_instance.cpp 
	testsuite/actionscript.all: MovieClip.as delete.as 
	                            getvariable.as 

Log message:
	        * testsuite/actionscript.all/MovieClip.as: test that '_root' and
	          '_level0' can be accessed as members of a movieclip, while 'this'
	          cannot.
	        * testsuite/actionscript.all/delete.as: add TODO request for testing
	          variable access by path
	        * testsuite/actionscript.all/getvariable.as: add test for accessing
	          slash-based paths starting with 'this'
	        * server/sprite_instance.cpp (get_member): don't consider 'this' as
	          a member.
	        * server/as_environment.cpp (find_object_{slash,dot}syntax): handle
	          paths starting with 'this'.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4091&r2=1.4092
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.82&r2=1.83
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.311&r2=1.312
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.80&r2=1.81
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/delete.as?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/getvariable.as?cvsroot=gnash&r1=1.13&r2=1.14

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4091
retrieving revision 1.4092
diff -u -b -r1.4091 -r1.4092
--- ChangeLog	24 Aug 2007 07:36:25 -0000	1.4091
+++ ChangeLog	24 Aug 2007 10:05:57 -0000	1.4092
@@ -1,3 +1,17 @@
+2007-08-24 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/actionscript.all/MovieClip.as: test that '_root' and
+	  '_level0' can be accessed as members of a movieclip, while 'this'
+	  cannot.
+	* testsuite/actionscript.all/delete.as: add TODO request for testing
+	  variable access by path
+	* testsuite/actionscript.all/getvariable.as: add test for accessing
+	  slash-based paths starting with 'this'
+	* server/sprite_instance.cpp (get_member): don't consider 'this' as
+	  a member.
+	* server/as_environment.cpp (find_object_{slash,dot}syntax): handle
+	  paths starting with 'this'.
+
 2007-08-24 Zou Lunkai <zoulunkai@gmail.com>
 	
 	* testsuite/misc-ming.all/DefineEditTextVariableNameTest2.c: add a new 

Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- server/as_environment.cpp	11 Jul 2007 00:16:38 -0000	1.82
+++ server/as_environment.cpp	24 Aug 2007 10:05:57 -0000	1.83
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: as_environment.cpp,v 1.82 2007/07/11 00:16:38 strk Exp $ */
+/* $Id: as_environment.cpp,v 1.83 2007/08/24 10:05:57 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -219,6 +219,7 @@
 		return ret.second;
 	}
 
+	// TODO: try 'this' ? Add a testcase for it !
 
 	// Try _global
 	return VM::get().getGlobal()->delProperty(varname).second;
@@ -664,7 +665,8 @@
 	// TODO: make sure sprite_instances know about ".."
 	if ( ! env->get_member(subpart.c_str(), &tmp) )
 	{
-		// Try _global, but only at first iteration...
+		// Try this and _global, but only at first iteration...
+
 		if ( depth > 0 ) 
 		{
 			IF_VERBOSE_ASCODING_ERRORS(
@@ -674,7 +676,11 @@
 			return NULL;
 		}
 
-		if ( ! VM::get().getGlobal()->get_member(subpart.c_str(), &tmp) )
+		if ( subpart == "this" )
+		{
+			tmp.set_as_object(m_target);
+		}
+		else if ( ! VM::get().getGlobal()->get_member(subpart.c_str(), &tmp) )
 		{
 			IF_VERBOSE_ASCODING_ERRORS(
 			log_aserror(_("Element '%s' of variable '%s' not found in object %p nor in _global (dotsyntax)"),
@@ -811,7 +817,8 @@
 		// TODO: make sure sprite_instances know about ".."
 		if ( ! env->get_member(subpart.c_str(), &tmp) )
 		{
-			// Try _global, but only at first iteration...
+			// Try this and _global, but only at first iteration...
+
 			if ( depth > 0 ) 
 			{
 				IF_VERBOSE_ASCODING_ERRORS(
@@ -821,7 +828,12 @@
 				return NULL;
 			}
 
-			if ( ! VM::get().getGlobal()->get_member(subpart.c_str(), &tmp) )
+			if ( subpart == "this" )
+			{
+				tmp.set_as_object(m_target);
+			}
+
+			else if ( ! VM::get().getGlobal()->get_member(subpart.c_str(), &tmp) )
 			{
 				IF_VERBOSE_ASCODING_ERRORS(
 				log_aserror(_("Element '%s' of variable '%s' not found in object %p nor in _global (slashsyntax)"),

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.311
retrieving revision 1.312
diff -u -b -r1.311 -r1.312
--- server/sprite_instance.cpp	23 Aug 2007 16:50:56 -0000	1.311
+++ server/sprite_instance.cpp	24 Aug 2007 10:05:57 -0000	1.312
@@ -1777,6 +1777,10 @@
 bool sprite_instance::get_member(const std::string& name, as_value* val)
 {
 	// FIXME: use addProperty interface for these !!
+	// TODO: or at least have a character:: protected method take
+	//       care of these ?
+	//       Duplicates code in character::get_relative_target_common too..
+	//
 	if ( name == "_root" )
 	{
 		// TODO: handle lockroot
@@ -1797,11 +1801,13 @@
 			return false;
 		}
 	}
+#if 0 // see MovieClip.as
 	if ( name == "this" )
 	{
 		val->set_as_object( this );
 		return true;
 	}
+#endif
 
 	// Try variables.
 	if ( m_as_environment.get_member(name, val) )

Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- testsuite/actionscript.all/MovieClip.as	22 Aug 2007 14:29:29 -0000	1.80
+++ testsuite/actionscript.all/MovieClip.as	24 Aug 2007 10:05:58 -0000	1.81
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.80 2007/08/22 14:29:29 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.81 2007/08/24 10:05:58 strk Exp $";
 
 #include "check.as"
 
@@ -40,6 +40,9 @@
 check_equals(typeof(this), 'movieclip');
 check_equals(typeof(_parent), 'undefined');
 check_equals(_root, this);
+check_equals(typeof(this['_root']), 'movieclip');
+check_equals(typeof(this['_level0']), 'movieclip');
+check_equals(typeof(this['this']), 'undefined');
 
 // Check inheritance
 check(MovieClip);

Index: testsuite/actionscript.all/delete.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/delete.as,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- testsuite/actionscript.all/delete.as	24 Apr 2007 20:38:26 -0000	1.10
+++ testsuite/actionscript.all/delete.as	24 Aug 2007 10:05:58 -0000	1.11
@@ -1,4 +1,4 @@
-rcsid="$Id: delete.as,v 1.10 2007/04/24 20:38:26 strk Exp $";
+rcsid="$Id: delete.as,v 1.11 2007/08/24 10:05:58 strk Exp $";
 
 #include "check.as"
 
@@ -71,3 +71,6 @@
 check(!delete unexistent.a);
 
 // TODO: try other malformed ActionDelete calls
+
+// TODO: test deletion of variables referenced by path (slash-based or dot-based)
+//       make sure to test use of 'this' here too !

Index: testsuite/actionscript.all/getvariable.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/getvariable.as,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- testsuite/actionscript.all/getvariable.as	1 Jul 2007 10:54:42 -0000	1.13
+++ testsuite/actionscript.all/getvariable.as	24 Aug 2007 10:05:58 -0000	1.14
@@ -19,7 +19,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: getvariable.as,v 1.13 2007/07/01 10:54:42 bjacques Exp $";
+rcsid="$Id: getvariable.as,v 1.14 2007/08/24 10:05:58 strk Exp $";
 
 #include "check.as"
 
@@ -281,6 +281,20 @@
 check_equals(objmemb, 3);
 
 //-----------------------------------------------------------------------
+// Check 'this/:member' access  (and deletion)
+//-----------------------------------------------------------------------
+
+var memb = 6;
+asm {
+        push 'thismemb'
+	push 'this/:memb'
+	getvariable
+        setvariable
+};
+check_equals(memb, 6);
+check_equals(thismemb, 6);
+
+//-----------------------------------------------------------------------
 // Check 'invalid/name' access
 // ('invalid/name' used as a variable name)
 //-----------------------------------------------------------------------



From MAILER-DAEMON Fri Aug 24 06:07:59 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IOW58-0003Jj-Fp
	for mharc-gnash-commit@gnu.org; Fri, 24 Aug 2007 06:07:58 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IOW51-0003GB-Kg
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 06:07:51 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IOW4v-0003DK-Qe
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 06:07:50 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IOW4u-0003Cl-Ly
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 06:07:45 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IOW4s-0003cs-LK
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 06:07:44 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IOW4s-0003uo-1X
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 10:07:42 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IOW4r-0003ul-Kj
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 10:07:41 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IOW4r-0003ul-Kj@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 24 Aug 2007 10:07:41 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog libbase/Makefile.am libbase/tre...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2007 10:07:52 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/24 10:07:41

Modified files:
	.              : ChangeLog 
	libbase        : Makefile.am 
Added files:
	libbase        : tree.hh 
Removed files:
	libbase        : tree.hpp 

Log message:
	        * libbase/: tree.hpp => tree.hh: don't change original name of
	          external source code.
	        * libbase/Makefile.am: distribute tree.hh

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4092&r2=1.4093
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/Makefile.am?cvsroot=gnash&r1=1.78&r2=1.79
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tree.hh?cvsroot=gnash&rev=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tree.hpp?cvsroot=gnash&r1=1.1&r2=0

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4092
retrieving revision 1.4093
diff -u -b -r1.4092 -r1.4093
--- ChangeLog	24 Aug 2007 10:05:57 -0000	1.4092
+++ ChangeLog	24 Aug 2007 10:07:40 -0000	1.4093
@@ -1,5 +1,11 @@
 2007-08-24 Sandro Santilli <strk@keybit.net>
 
+	* libbase/: tree.hpp => tree.hh: don't change original name of
+	  external source code.
+	* libbase/Makefile.am: distribute tree.hh
+
+2007-08-24 Sandro Santilli <strk@keybit.net>
+
 	* testsuite/actionscript.all/MovieClip.as: test that '_root' and
 	  '_level0' can be accessed as members of a movieclip, while 'this'
 	  cannot.

Index: libbase/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libbase/Makefile.am,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- libbase/Makefile.am	10 Aug 2007 04:36:13 -0000	1.78
+++ libbase/Makefile.am	24 Aug 2007 10:07:41 -0000	1.79
@@ -130,6 +130,7 @@
 	ref_counted.h \
 	smart_ptr.h \
 	sharedlib.h \
+	tree.hh \
 	triangulate.h \
 	triangulate_impl.h \
 	tu_config.h \

Index: libbase/tree.hh
===================================================================
RCS file: libbase/tree.hh
diff -N libbase/tree.hh
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ libbase/tree.hh	24 Aug 2007 10:07:41 -0000	1.3
@@ -0,0 +1,2620 @@
+/* 
+
+   $Id: tree.hh,v 1.3 2007/08/24 10:07:41 strk Exp $
+
+   STL-like templated tree class.
+   Copyright (C) 2001-2006  Kasper Peeters <kasper.peeters@aei.mpg.de>.
+
+*/
+
+/** \mainpage tree.hh
+    \author   Kasper Peeters
+    \version  2.31
+    \date     21-Aug-2007
+    \see      http://www.aei.mpg.de/~peekas/tree/
+    \see      http://www.aei.mpg.de/~peekas/tree/ChangeLog
+
+   The tree.hh library for C++ provides an STL-like container class
+   for n-ary trees, templated over the data stored at the
+   nodes. Various types of iterators are provided (post-order,
+   pre-order, and others). Where possible the access methods are
+   compatible with the STL or alternative algorithms are
+   available. 
+*/
+
+
+/*
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 or 3.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+/** \todo 
+   - New-style move members are not completely finished yet.
+   - It would be good to have an iterator which can iterate over all
+     nodes below a given node.
+   - Fixed depth iterators do not iterate over the entire range if there
+     are 'holes' in the tree.
+   - If a range uses const iter_base& as end iterator, things will
+     inevitably go wrong, because upcast from iter_base to a non-sibling_iter
+     is incorrect. This upcast should be removed (and then all illegal uses
+     as previously in 'equal' will be flagged by the compiler). This requires
+     new copy constructors though.
+   - There's a bug in replace(sibling_iterator, ...) when the ranges
+     sit next to each other. Turned up in append_child(iter,iter)
+     but has been avoided now.
+   - "std::operator<" does not work correctly on our iterators, and for some
+     reason a globally defined template operator< did not get picked up. 
+     Using a comparison class now, but this should be investigated.
+*/
+
+#ifndef tree_hh_
+#define tree_hh_
+
+#include <cassert>
+#include <memory>
+#include <stdexcept>
+#include <iterator>
+#include <set>
+#include <queue>
+#include <iostream>
+
+// HP-style construct/destroy have gone from the standard,
+// so here is a copy.
+
+namespace kp {
+
+template <class T1, class T2>
+void constructor(T1* p, T2& val) 
+   {
+   new ((void *) p) T1(val);
+   }
+
+template <class T1>
+void constructor(T1* p) 
+   {
+   new ((void *) p) T1;
+   }
+
+template <class T1>
+void destructor(T1* p)
+   {
+   p->~T1();
+   }
+
+};
+
+/// A node in the tree, combining links to other nodes as well as the actual data.
+template<class T>
+class tree_node_ { // size: 5*4=20 bytes (on 32 bit arch), can be reduced by 8.
+   public:
+      tree_node_<T> *parent;
+      tree_node_<T> *first_child, *last_child;
+      tree_node_<T> *prev_sibling, *next_sibling;
+      T data;
+}; // __attribute__((packed));
+
+template <class T, class tree_node_allocator = std::allocator<tree_node_<T> > >
+class tree {
+   protected:
+      typedef tree_node_<T> tree_node;
+   public:
+      /// Value of the data stored at a node.
+      typedef T value_type;
+
+      class iterator_base;
+      class pre_order_iterator;
+      class post_order_iterator;
+      class sibling_iterator;
+      class leaf_iterator;
+
+      tree();
+      tree(const T&);
+      tree(const iterator_base&);
+      tree(const tree<T, tree_node_allocator>&);
+      ~tree();
+      void operator=(const tree<T, tree_node_allocator>&);
+
+      /// Base class for iterators, only pointers stored, no traversal logic.
+#ifdef __SGI_STL_PORT
+      class iterator_base : public stlport::bidirectional_iterator<T, ptrdiff_t> {
+#else
+      class iterator_base {
+#endif
+         public:
+            typedef T                               value_type;
+            typedef T*                              pointer;
+            typedef T&                              reference;
+            typedef size_t                          size_type;
+            typedef ptrdiff_t                       difference_type;
+            typedef std::bidirectional_iterator_tag iterator_category;
+
+            iterator_base();
+            iterator_base(tree_node *);
+
+            T&             operator*() const;
+            T*             operator->() const;
+
+            /// When called, the next increment/decrement skips children of this node.
+            void         skip_children();
+            /// Number of children of the node pointed to by the iterator.
+            unsigned int number_of_children() const;
+
+            sibling_iterator begin() const;
+            sibling_iterator end() const;
+
+            tree_node *node;
+         protected:
+            bool skip_current_children_;
+      };
+
+      /// Depth-first iterator, first accessing the node, then its children.
+      class pre_order_iterator : public iterator_base { 
+         public:
+            pre_order_iterator();
+            pre_order_iterator(tree_node *);
+            pre_order_iterator(const iterator_base&);
+            pre_order_iterator(const sibling_iterator&);
+
+            bool    operator==(const pre_order_iterator&) const;
+            bool    operator!=(const pre_order_iterator&) const;
+            pre_order_iterator&  operator++();
+            pre_order_iterator&  operator--();
+            pre_order_iterator   operator++(int);
+            pre_order_iterator   operator--(int);
+            pre_order_iterator&  operator+=(unsigned int);
+            pre_order_iterator&  operator-=(unsigned int);
+      };
+
+      /// Depth-first iterator, first accessing the children, then the node itself.
+      class post_order_iterator : public iterator_base {
+         public:
+            post_order_iterator();
+            post_order_iterator(tree_node *);
+            post_order_iterator(const iterator_base&);
+            post_order_iterator(const sibling_iterator&);
+
+            bool    operator==(const post_order_iterator&) const;
+            bool    operator!=(const post_order_iterator&) const;
+            post_order_iterator&  operator++();
+            post_order_iterator&  operator--();
+            post_order_iterator   operator++(int);
+            post_order_iterator   operator--(int);
+            post_order_iterator&  operator+=(unsigned int);
+            post_order_iterator&  operator-=(unsigned int);
+
+            /// Set iterator to the first child as deep as possible down the tree.
+            void descend_all();
+      };
+
+      /// Breadth-first iterator, using a queue
+      class breadth_first_queued_iterator : public iterator_base {
+         public:
+            breadth_first_queued_iterator();
+            breadth_first_queued_iterator(tree_node *);
+            breadth_first_queued_iterator(const iterator_base&);
+
+            bool    operator==(const breadth_first_queued_iterator&) const;
+            bool    operator!=(const breadth_first_queued_iterator&) const;
+            breadth_first_queued_iterator&  operator++();
+            breadth_first_queued_iterator   operator++(int);
+            breadth_first_queued_iterator&  operator+=(unsigned int);
+
+         private:
+            std::queue<tree_node *> traversal_queue;
+      };
+
+      /// The default iterator types throughout the tree class.
+      typedef pre_order_iterator            iterator;
+      typedef breadth_first_queued_iterator breadth_first_iterator;
+
+      /// Iterator which traverses only the nodes at a given depth from the root.
+      class fixed_depth_iterator : public iterator_base {
+         public:
+            fixed_depth_iterator();
+            fixed_depth_iterator(tree_node *);
+            fixed_depth_iterator(const iterator_base&);
+            fixed_depth_iterator(const sibling_iterator&);
+            fixed_depth_iterator(const fixed_depth_iterator&);
+
+            bool    operator==(const fixed_depth_iterator&) const;
+            bool    operator!=(const fixed_depth_iterator&) const;
+            fixed_depth_iterator&  operator++();
+            fixed_depth_iterator&  operator--();
+            fixed_depth_iterator   operator++(int);
+            fixed_depth_iterator   operator--(int);
+            fixed_depth_iterator&  operator+=(unsigned int);
+            fixed_depth_iterator&  operator-=(unsigned int);
+
+            tree_node *first_parent_;
+         private:
+            void set_first_parent_();
+            void find_leftmost_parent_();
+      };
+
+      /// Iterator which traverses only the nodes which are siblings of each other.
+      class sibling_iterator : public iterator_base {
+         public:
+            sibling_iterator();
+            sibling_iterator(tree_node *);
+            sibling_iterator(const sibling_iterator&);
+            sibling_iterator(const iterator_base&);
+
+            bool    operator==(const sibling_iterator&) const;
+            bool    operator!=(const sibling_iterator&) const;
+            sibling_iterator&  operator++();
+            sibling_iterator&  operator--();
+            sibling_iterator   operator++(int);
+            sibling_iterator   operator--(int);
+            sibling_iterator&  operator+=(unsigned int);
+            sibling_iterator&  operator-=(unsigned int);
+
+            tree_node *range_first() const;
+            tree_node *range_last() const;
+            tree_node *parent_;
+         private:
+            void set_parent_();
+      };
+
+      /// Iterator which traverses only the leaves.
+      class leaf_iterator : public iterator_base {
+         public:
+            leaf_iterator();
+            leaf_iterator(tree_node *);
+            leaf_iterator(const sibling_iterator&);
+            leaf_iterator(const iterator_base&);
+
+            bool    operator==(const leaf_iterator&) const;
+            bool    operator!=(const leaf_iterator&) const;
+            leaf_iterator&  operator++();
+            leaf_iterator&  operator--();
+            leaf_iterator   operator++(int);
+            leaf_iterator   operator--(int);
+            leaf_iterator&  operator+=(unsigned int);
+            leaf_iterator&  operator-=(unsigned int);
+      };
+
+      /// Return iterator to the beginning of the tree.
+      inline pre_order_iterator   begin() const;
+      /// Return iterator to the end of the tree.
+      inline pre_order_iterator   end() const;
+      /// Return post-order iterator to the beginning of the tree.
+      post_order_iterator  begin_post() const;
+      /// Return post-order iterator to the end of the tree.
+      post_order_iterator  end_post() const;
+      /// Return fixed-depth iterator to the first node at a given depth.
+      fixed_depth_iterator begin_fixed(const iterator_base&, unsigned int) const;
+      /// Return fixed-depth iterator to end of the nodes at given depth.
+      fixed_depth_iterator end_fixed(const iterator_base&, unsigned int) const;
+      /// Return breadth-first iterator to the first node at a given depth.
+      breadth_first_queued_iterator begin_breadth_first() const;
+      /// Return breadth-first iterator to end of the nodes at given depth.
+      breadth_first_queued_iterator end_breadth_first() const;
+      /// Return sibling iterator to the first child of given node.
+      sibling_iterator     begin(const iterator_base&) const;
+      /// Return sibling iterator to the end of the children of a given node.
+      sibling_iterator     end(const iterator_base&) const;
+      /// Return leaf iterator to the first leaf of the tree.
+      leaf_iterator   begin_leaf() const;
+      /// Return leaf iterator to the last leaf of the tree.
+      leaf_iterator   end_leaf() const;
+
+      /// Return iterator to the parent of a node.
+      template<typename iter> static iter parent(iter);
+      /// Return iterator to the previous sibling of a node.
+      template<typename iter> iter previous_sibling(iter) const;
+      /// Return iterator to the next sibling of a node.
+      template<typename iter> iter next_sibling(iter) const;
+      /// Return iterator to the next node at a given depth.
+      template<typename iter> iter next_at_same_depth(iter) const;
+
+      /// Erase all nodes of the tree.
+      void     clear();
+      /// Erase element at position pointed to by iterator, return incremented iterator.
+      template<typename iter> iter erase(iter);
+      /// Erase all children of the node pointed to by iterator.
+      void     erase_children(const iterator_base&);
+
+      /// Insert empty node as last/first child of node pointed to by position.
+      template<typename iter> iter append_child(iter position); 
+      template<typename iter> iter prepend_child(iter position); 
+      /// Insert node as last/first child of node pointed to by position.
+      template<typename iter> iter append_child(iter position, const T& x);
+      template<typename iter> iter prepend_child(iter position, const T& x);
+      /// Append the node (plus its children) at other_position as last/first child of position.
+      template<typename iter> iter append_child(iter position, iter other_position);
+      template<typename iter> iter prepend_child(iter position, iter other_position);
+      /// Append the nodes in the from-to range (plus their children) as last/first children of position.
+      template<typename iter> iter append_children(iter position, sibling_iterator from, sibling_iterator to);
+      template<typename iter> iter prepend_children(iter position, sibling_iterator from, sibling_iterator to);
+
+      /// Short-hand to insert topmost node in otherwise empty tree.
+      pre_order_iterator set_head(const T& x);
+      /// Insert node as previous sibling of node pointed to by position.
+      template<typename iter> iter insert(iter position, const T& x);
+      /// Specialisation of previous member.
+      sibling_iterator insert(sibling_iterator position, const T& x);
+      /// Insert node (with children) pointed to by subtree as previous sibling of node pointed to by position.
+      template<typename iter> iter insert_subtree(iter position, const iterator_base& subtree);
+      /// Insert node as next sibling of node pointed to by position.
+      template<typename iter> iter insert_after(iter position, const T& x);
+      /// Insert node (with children) pointed to by subtree as next sibling of node pointed to by position.
+      template<typename iter> iter insert_subtree_after(iter position, const iterator_base& subtree);
+
+      /// Replace node at 'position' with other node (keeping same children); 'position' becomes invalid.
+      template<typename iter> iter replace(iter position, const T& x);
+      /// Replace node at 'position' with subtree starting at 'from' (do not erase subtree at 'from'); see above.
+      template<typename iter> iter replace(iter position, const iterator_base& from);
+      /// Replace string of siblings (plus their children) with copy of a new string (with children); see above
+      sibling_iterator replace(sibling_iterator orig_begin, sibling_iterator orig_end, 
+                               sibling_iterator new_begin,  sibling_iterator new_end); 
+
+      /// Move all children of node at 'position' to be siblings, returns position.
+      template<typename iter> iter flatten(iter position);
+      /// Move nodes in range to be children of 'position'.
+      template<typename iter> iter reparent(iter position, sibling_iterator begin, sibling_iterator end);
+      /// Move all child nodes of 'from' to be children of 'position'.
+      template<typename iter> iter reparent(iter position, iter from);
+
+      /// Replace node with a new node, making the old node a child of the new node.
+      template<typename iter> iter wrap(iter position, const T& x);
+
+      /// Move 'source' node (plus its children) to become the next sibling of 'target'.
+      template<typename iter> iter move_after(iter target, iter source);
+      /// Move 'source' node (plus its children) to become the previous sibling of 'target'.
+      template<typename iter> iter move_before(iter target, iter source);
+      sibling_iterator move_before(sibling_iterator target, sibling_iterator source);
+      /// Move 'source' node (plus its children) to become the node at 'target' (erasing the node at 'target').
+      template<typename iter> iter move_ontop(iter target, iter source);
+
+      /// Merge with other tree, creating new branches and leaves only if they are not already present.
+      void     merge(sibling_iterator, sibling_iterator, sibling_iterator, sibling_iterator, 
+                     bool duplicate_leaves=false);
+      /// Sort (std::sort only moves values of nodes, this one moves children as well).
+      void     sort(sibling_iterator from, sibling_iterator to, bool deep=false);
+      template<class StrictWeakOrdering>
+      void     sort(sibling_iterator from, sibling_iterator to, StrictWeakOrdering comp, bool deep=false);
+      /// Compare two ranges of nodes (compares nodes as well as tree structure).
+      template<typename iter>
+      bool     equal(const iter& one, const iter& two, const iter& three) const;
+      template<typename iter, class BinaryPredicate>
+      bool     equal(const iter& one, const iter& two, const iter& three, BinaryPredicate) const;
+      template<typename iter>
+      bool     equal_subtree(const iter& one, const iter& two) const;
+      template<typename iter, class BinaryPredicate>
+      bool     equal_subtree(const iter& one, const iter& two, BinaryPredicate) const;
+      /// Extract a new tree formed by the range of siblings plus all their children.
+      tree     subtree(sibling_iterator from, sibling_iterator to) const;
+      void     subtree(tree&, sibling_iterator from, sibling_iterator to) const;
+      /// Exchange the node (plus subtree) with its sibling node (do nothing if no sibling present).
+      void     swap(sibling_iterator it);
+      /// Exchange two nodes (plus subtrees)
+      void     swap(iterator, iterator);
+      
+      /// Count the total number of nodes.
+      int      size() const;
+      /// Count the total number of nodes below the indicated node (plus one).
+      int      size(const iterator_base&) const;
+      /// Check if tree is empty.
+      bool     empty() const;
+      /// Compute the depth to the root.
+      int      depth(const iterator_base&) const;
+      /// Count the number of children of node at position.
+      static unsigned int number_of_children(const iterator_base&);
+      /// Count the number of 'next' siblings of node at iterator.
+      unsigned int number_of_siblings(const iterator_base&) const;
+      /// Determine whether node at position is in the subtrees with root in the range.
+      bool     is_in_subtree(const iterator_base& position, const iterator_base& begin, 
+                             const iterator_base& end) const;
+      /// Determine whether the iterator is an 'end' iterator and thus not actually pointing to a node.
+      bool     is_valid(const iterator_base&) const;
+
+      /// Determine the index of a node in the range of siblings to which it belongs.
+      unsigned int index(sibling_iterator it) const;
+      /// Inverse of 'index': return the n-th child of the node at position.
+      sibling_iterator  child(const iterator_base& position, unsigned int) const;
+      
+      /// Comparator class for iterators (compares pointer values; why doesn't this work automatically?)
+      class iterator_base_less {
+         public:
+            bool operator()(const typename tree<T, tree_node_allocator>::iterator_base& one,
+                            const typename tree<T, tree_node_allocator>::iterator_base& two) const
+               {
+               return one.node < two.node;
+               }
+      };
+      tree_node *head, *feet;    // head/feet are always dummy; if an iterator points to them it is invalid
+   private:
+      tree_node_allocator alloc_;
+      void head_initialise_();
+      void copy_(const tree<T, tree_node_allocator>& other);
+
+      /// Comparator class for two nodes of a tree (used for sorting and searching).
+      template<class StrictWeakOrdering>
+      class compare_nodes {
+         public:
+            compare_nodes(StrictWeakOrdering comp) : comp_(comp) {};
+            
+            bool operator()(const tree_node *a, const tree_node *b) 
+               {
+               static StrictWeakOrdering comp;
+               return comp(a->data, b->data);
+               }
+         private:
+            StrictWeakOrdering comp_;
+      };
+};
+
+//template <class T, class tree_node_allocator>
+//class iterator_base_less {
+// public:
+//    bool operator()(const typename tree<T, tree_node_allocator>::iterator_base& one,
+//                  const typename tree<T, tree_node_allocator>::iterator_base& two) const
+//       {
+//       txtout << "operatorclass<" << one.node < two.node << std::endl;
+//       return one.node < two.node;
+//       }
+//};
+
+// template <class T, class tree_node_allocator>
+// bool operator<(const typename tree<T, tree_node_allocator>::iterator& one,
+//                const typename tree<T, tree_node_allocator>::iterator& two)
+//    {
+//    txtout << "operator< " << one.node < two.node << std::endl;
+//    if(one.node < two.node) return true;
+//    return false;
+//    }
+// 
+// template <class T, class tree_node_allocator>
+// bool operator==(const typename tree<T, tree_node_allocator>::iterator& one,
+//                const typename tree<T, tree_node_allocator>::iterator& two)
+//    {
+//    txtout << "operator== " << one.node == two.node << std::endl;
+//    if(one.node == two.node) return true;
+//    return false;
+//    }
+// 
+// template <class T, class tree_node_allocator>
+// bool operator>(const typename tree<T, tree_node_allocator>::iterator_base& one,
+//                const typename tree<T, tree_node_allocator>::iterator_base& two)
+//    {
+//    txtout << "operator> " << one.node < two.node << std::endl;
+//    if(one.node > two.node) return true;
+//    return false;
+//    }
+
+
+
+// Tree
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::tree() 
+   {
+   head_initialise_();
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::tree(const T& x) 
+   {
+   head_initialise_();
+   set_head(x);
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::tree(const iterator_base& other)
+   {
+   head_initialise_();
+   set_head((*other));
+   replace(begin(), other);
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::~tree()
+   {
+   clear();
+   alloc_.deallocate(head,1);
+   alloc_.deallocate(feet,1);
+   }
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::head_initialise_() 
+   { 
+   head = alloc_.allocate(1,0); // MSVC does not have default second argument 
+   feet = alloc_.allocate(1,0);
+
+   head->parent=0;
+   head->first_child=0;
+   head->last_child=0;
+   head->prev_sibling=0; //head;
+   head->next_sibling=feet; //head;
+
+   feet->parent=0;
+   feet->first_child=0;
+   feet->last_child=0;
+   feet->prev_sibling=head;
+   feet->next_sibling=0;
+   }
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::operator=(const tree<T, tree_node_allocator>& other)
+   {
+   copy_(other);
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::tree(const tree<T, tree_node_allocator>& other)
+   {
+   head_initialise_();
+   copy_(other);
+   }
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::copy_(const tree<T, tree_node_allocator>& other) 
+   {
+   clear();
+   pre_order_iterator it=other.begin(), to=begin();
+   while(it!=other.end()) {
+      to=insert(to, (*it));
+      it.skip_children();
+      ++it;
+      }
+   to=begin();
+   it=other.begin();
+   while(it!=other.end()) {
+      to=replace(to, it);
+      to.skip_children();
+      it.skip_children();
+      ++to;
+      ++it;
+      }
+   }
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::clear()
+   {
+   if(head)
+      while(head->next_sibling!=feet)
+         erase(pre_order_iterator(head->next_sibling));
+   }
+
+template<class T, class tree_node_allocator> 
+void tree<T, tree_node_allocator>::erase_children(const iterator_base& it)
+   {
+// std::cout << "erase_children " << it.node << std::endl;
+   if(it.node==0) return;
+
+   tree_node *cur=it.node->first_child;
+   tree_node *prev=0;
+
+   while(cur!=0) {
+      prev=cur;
+      cur=cur->next_sibling;
+      erase_children(pre_order_iterator(prev));
+      kp::destructor(&prev->data);
+      alloc_.deallocate(prev,1);
+      }
+   it.node->first_child=0;
+   it.node->last_child=0;
+// std::cout << "exit" << std::endl;
+   }
+
+template<class T, class tree_node_allocator> 
+template<class iter>
+iter tree<T, tree_node_allocator>::erase(iter it)
+   {
+   tree_node *cur=it.node;
+   assert(cur!=head);
+   iter ret=it;
+   ret.skip_children();
+   ++ret;
+   erase_children(it);
+   if(cur->prev_sibling==0) {
+      cur->parent->first_child=cur->next_sibling;
+      }
+   else {
+      cur->prev_sibling->next_sibling=cur->next_sibling;
+      }
+   if(cur->next_sibling==0) {
+      cur->parent->last_child=cur->prev_sibling;
+      }
+   else {
+      cur->next_sibling->prev_sibling=cur->prev_sibling;
+      }
+
+   kp::destructor(&cur->data);
+   alloc_.deallocate(cur,1);
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::pre_order_iterator tree<T, tree_node_allocator>::begin() const
+   {
+   return pre_order_iterator(head->next_sibling);
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::pre_order_iterator tree<T, tree_node_allocator>::end() const
+   {
+   return pre_order_iterator(feet);
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::breadth_first_queued_iterator tree<T, tree_node_allocator>::begin_breadth_first() const
+   {
+   return breadth_first_queued_iterator(head->next_sibling);
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::breadth_first_queued_iterator tree<T, tree_node_allocator>::end_breadth_first() const
+   {
+   return breadth_first_queued_iterator();
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::post_order_iterator tree<T, tree_node_allocator>::begin_post() const
+   {
+   tree_node *tmp=head->next_sibling;
+   if(tmp!=feet) {
+      while(tmp->first_child)
+         tmp=tmp->first_child;
+      }
+   return post_order_iterator(tmp);
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::post_order_iterator tree<T, tree_node_allocator>::end_post() const
+   {
+   return post_order_iterator(feet);
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::fixed_depth_iterator tree<T, tree_node_allocator>::begin_fixed(const iterator_base& pos, unsigned int dp) const
+   {
+   tree_node *tmp=pos.node;
+   unsigned int curdepth=0;
+   while(curdepth<dp) { // go down one level
+      while(tmp->first_child==0) {
+         tmp=tmp->next_sibling;
+         if(tmp==0)
+            throw std::range_error("tree: begin_fixed out of range");
+         }
+      tmp=tmp->first_child;
+      ++curdepth;
+      }
+   return tmp;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::fixed_depth_iterator tree<T, tree_node_allocator>::end_fixed(const iterator_base& pos, unsigned int dp) const
+   {
+   assert(1==0); // FIXME: not correct yet
+   tree_node *tmp=pos.node;
+   unsigned int curdepth=1;
+   while(curdepth<dp) { // go down one level
+      while(tmp->first_child==0) {
+         tmp=tmp->next_sibling;
+         if(tmp==0)
+            throw std::range_error("tree: end_fixed out of range");
+         }
+      tmp=tmp->first_child;
+      ++curdepth;
+      }
+   return tmp;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::begin(const iterator_base& pos) const
+   {
+   assert(pos.node!=0);
+   if(pos.node->first_child==0) {
+      return end(pos);
+      }
+   return pos.node->first_child;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::end(const iterator_base& pos) const
+   {
+   sibling_iterator ret(0);
+   ret.parent_=pos.node;
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::leaf_iterator tree<T, tree_node_allocator>::begin_leaf() const
+   {
+   tree_node *tmp=head->next_sibling;
+   if(tmp!=feet) {
+      while(tmp->first_child)
+         tmp=tmp->first_child;
+      }
+   return leaf_iterator(tmp);
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::leaf_iterator tree<T, tree_node_allocator>::end_leaf() const
+   {
+   return leaf_iterator(feet);
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter>
+iter tree<T, tree_node_allocator>::parent(iter position) 
+   {
+   assert(position.node!=0);
+   return iter(position.node->parent);
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter>
+iter tree<T, tree_node_allocator>::previous_sibling(iter position) const
+   {
+   assert(position.node!=0);
+   iter ret(position);
+   ret.node=position.node->prev_sibling;
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter>
+iter tree<T, tree_node_allocator>::next_sibling(iter position) const
+   {
+   assert(position.node!=0);
+   iter ret(position);
+   ret.node=position.node->next_sibling;
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter>
+iter tree<T, tree_node_allocator>::next_at_same_depth(iter position) const
+   {
+   assert(position.node!=0);
+   iter ret(position);
+
+   if(position.node->next_sibling) {
+      ret.node=position.node->next_sibling;
+      }
+   else { 
+      int relative_depth=0;
+      upper:
+      do {
+         ret.node=ret.node->parent;
+         if(ret.node==0) return ret;
+         --relative_depth;
+         } while(ret.node->next_sibling==0);
+      lower:
+      ret.node=ret.node->next_sibling;
+      while(ret.node->first_child==0) {
+         if(ret.node->next_sibling==0)
+            goto upper;
+         ret.node=ret.node->next_sibling;
+         if(ret.node==0) return ret;
+         }
+      while(relative_depth<0 && ret.node->first_child!=0) {
+         ret.node=ret.node->first_child;
+         ++relative_depth;
+         }
+      if(relative_depth<0) {
+         if(ret.node->next_sibling==0) goto upper;
+         else                          goto lower;
+         }
+      }
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter>
+iter tree<T, tree_node_allocator>::append_child(iter position)
+   {
+   assert(position.node!=head);
+   assert(position.node);
+
+   tree_node *tmp=alloc_.allocate(1,0);
+   kp::constructor(&tmp->data);
+   tmp->first_child=0;
+   tmp->last_child=0;
+
+   tmp->parent=position.node;
+   if(position.node->last_child!=0) {
+      position.node->last_child->next_sibling=tmp;
+      }
+   else {
+      position.node->first_child=tmp;
+      }
+   tmp->prev_sibling=position.node->last_child;
+   position.node->last_child=tmp;
+   tmp->next_sibling=0;
+   return tmp;
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter>
+iter tree<T, tree_node_allocator>::prepend_child(iter position)
+   {
+   assert(position.node!=head);
+   assert(position.node);
+
+   tree_node *tmp=alloc_.allocate(1,0);
+   kp::constructor(&tmp->data);
+   tmp->first_child=0;
+   tmp->last_child=0;
+
+   tmp->parent=position.node;
+   if(position.node->first_child!=0) {
+      position.node->first_child->prev_sibling=tmp;
+      }
+   else {
+      position.node->last_child=tmp;
+      }
+   tmp->next_sibling=position.node->first_child;
+   position.node->prev_child=tmp;
+   tmp->prev_sibling=0;
+   return tmp;
+   }
+
+template <class T, class tree_node_allocator>
+template <class iter>
+iter tree<T, tree_node_allocator>::append_child(iter position, const T& x)
+   {
+   // If your program fails here you probably used 'append_child' to add the top
+   // node to an empty tree. From version 1.45 the top element should be added
+   // using 'insert'. See the documentation for further information, and sorry about
+   // the API change.
+   assert(position.node!=head);
+   assert(position.node);
+
+   tree_node* tmp = alloc_.allocate(1,0);
+   kp::constructor(&tmp->data, x);
+   tmp->first_child=0;
+   tmp->last_child=0;
+
+   tmp->parent=position.node;
+   if(position.node->last_child!=0) {
+      position.node->last_child->next_sibling=tmp;
+      }
+   else {
+      position.node->first_child=tmp;
+      }
+   tmp->prev_sibling=position.node->last_child;
+   position.node->last_child=tmp;
+   tmp->next_sibling=0;
+   return tmp;
+   }
+
+template <class T, class tree_node_allocator>
+template <class iter>
+iter tree<T, tree_node_allocator>::prepend_child(iter position, const T& x)
+   {
+   assert(position.node!=head);
+   assert(position.node);
+
+   tree_node* tmp = alloc_.allocate(1,0);
+   kp::constructor(&tmp->data, x);
+   tmp->first_child=0;
+   tmp->last_child=0;
+
+   tmp->parent=position.node;
+   if(position.node->first_child!=0) {
+      position.node->first_child->prev_sibling=tmp;
+      }
+   else {
+      position.node->last_child=tmp;
+      }
+   tmp->next_sibling=position.node->first_child;
+   position.node->first_child=tmp;
+   tmp->prev_sibling=0;
+   return tmp;
+   }
+
+template <class T, class tree_node_allocator>
+template <class iter>
+iter tree<T, tree_node_allocator>::append_child(iter position, iter other)
+   {
+   assert(position.node!=head);
+   assert(position.node);
+
+   sibling_iterator aargh=append_child(position, value_type());
+   return replace(aargh, other);
+   }
+
+template <class T, class tree_node_allocator>
+template <class iter>
+iter tree<T, tree_node_allocator>::prepend_child(iter position, iter other)
+   {
+   assert(position.node!=head);
+   assert(position.node);
+
+   sibling_iterator aargh=prepend_child(position, value_type());
+   return replace(aargh, other);
+   }
+
+template <class T, class tree_node_allocator>
+template <class iter>
+iter tree<T, tree_node_allocator>::append_children(iter position, sibling_iterator from, sibling_iterator to)
+   {
+   assert(position.node!=head);
+   assert(position.node);
+
+   iter ret=from;
+
+   while(from!=to) {
+      insert_subtree(position.end(), from);
+      ++from;
+      }
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+template <class iter>
+iter tree<T, tree_node_allocator>::prepend_children(iter position, sibling_iterator from, sibling_iterator to)
+   {
+   assert(position.node!=head);
+   assert(position.node);
+
+   iter ret=from;
+
+   while(from!=to) {
+      insert_subtree(position.begin(), from);
+      ++from;
+      }
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::pre_order_iterator tree<T, tree_node_allocator>::set_head(const T& x)
+   {
+   assert(head->next_sibling==feet);
+   return insert(iterator(feet), x);
+   }
+
+template <class T, class tree_node_allocator>
+template <class iter>
+iter tree<T, tree_node_allocator>::insert(iter position, const T& x)
+   {
+   if(position.node==0) {
+      position.node=feet; // Backward compatibility: when calling insert on a null node,
+                          // insert before the feet.
+      }
+   tree_node* tmp = alloc_.allocate(1,0);
+   kp::constructor(&tmp->data, x);
+   tmp->first_child=0;
+   tmp->last_child=0;
+
+   tmp->parent=position.node->parent;
+   tmp->next_sibling=position.node;
+   tmp->prev_sibling=position.node->prev_sibling;
+   position.node->prev_sibling=tmp;
+
+   if(tmp->prev_sibling==0) {
+      if(tmp->parent) // when inserting nodes at the head, there is no parent
+         tmp->parent->first_child=tmp;
+      }
+   else
+      tmp->prev_sibling->next_sibling=tmp;
+   return tmp;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::insert(sibling_iterator position, const T& x)
+   {
+   tree_node* tmp = alloc_.allocate(1,0);
+   kp::constructor(&tmp->data, x);
+   tmp->first_child=0;
+   tmp->last_child=0;
+
+   tmp->next_sibling=position.node;
+   if(position.node==0) { // iterator points to end of a subtree
+      tmp->parent=position.parent_;
+      tmp->prev_sibling=position.range_last();
+      tmp->parent->last_child=tmp;
+      }
+   else {
+      tmp->parent=position.node->parent;
+      tmp->prev_sibling=position.node->prev_sibling;
+      position.node->prev_sibling=tmp;
+      }
+
+   if(tmp->prev_sibling==0) {
+      if(tmp->parent) // when inserting nodes at the head, there is no parent
+         tmp->parent->first_child=tmp;
+      }
+   else
+      tmp->prev_sibling->next_sibling=tmp;
+   return tmp;
+   }
+
+template <class T, class tree_node_allocator>
+template <class iter>
+iter tree<T, tree_node_allocator>::insert_after(iter position, const T& x)
+   {
+   tree_node* tmp = alloc_.allocate(1,0);
+   kp::constructor(&tmp->data, x);
+   tmp->first_child=0;
+   tmp->last_child=0;
+
+   tmp->parent=position.node->parent;
+   tmp->prev_sibling=position.node;
+   tmp->next_sibling=position.node->next_sibling;
+   position.node->next_sibling=tmp;
+
+   if(tmp->next_sibling==0) {
+      if(tmp->parent) // when inserting nodes at the head, there is no parent
+         tmp->parent->last_child=tmp;
+      }
+   else {
+      tmp->next_sibling->prev_sibling=tmp;
+      }
+   return tmp;
+   }
+
+template <class T, class tree_node_allocator>
+template <class iter>
+iter tree<T, tree_node_allocator>::insert_subtree(iter position, const iterator_base& subtree)
+   {
+   // insert dummy
+   iter it=insert(position, value_type());
+   // replace dummy with subtree
+   return replace(it, subtree);
+   }
+
+template <class T, class tree_node_allocator>
+template <class iter>
+iter tree<T, tree_node_allocator>::insert_subtree_after(iter position, const iterator_base& subtree)
+   {
+   // insert dummy
+   iter it=insert_after(position, value_type());
+   // replace dummy with subtree
+   return replace(it, subtree);
+   }
+
+// template <class T, class tree_node_allocator>
+// template <class iter>
+// iter tree<T, tree_node_allocator>::insert_subtree(sibling_iterator position, iter subtree)
+//    {
+//    // insert dummy
+//    iter it(insert(position, value_type()));
+//    // replace dummy with subtree
+//    return replace(it, subtree);
+//    }
+
+template <class T, class tree_node_allocator>
+template <class iter>
+iter tree<T, tree_node_allocator>::replace(iter position, const T& x)
+   {
+   kp::destructor(&position.node->data);
+   kp::constructor(&position.node->data, x);
+   return position;
+   }
+
+template <class T, class tree_node_allocator>
+template <class iter>
+iter tree<T, tree_node_allocator>::replace(iter position, const iterator_base& from)
+   {
+   assert(position.node!=head);
+   tree_node *current_from=from.node;
+   tree_node *start_from=from.node;
+   tree_node *current_to  =position.node;
+
+   // replace the node at position with head of the replacement tree at from
+// std::cout << "warning!" << position.node << std::endl;
+   erase_children(position);  
+// std::cout << "no warning!" << std::endl;
+   tree_node* tmp = alloc_.allocate(1,0);
+   kp::constructor(&tmp->data, (*from));
+   tmp->first_child=0;
+   tmp->last_child=0;
+   if(current_to->prev_sibling==0) {
+      if(current_to->parent!=0)
+         current_to->parent->first_child=tmp;
+      }
+   else {
+      current_to->prev_sibling->next_sibling=tmp;
+      }
+   tmp->prev_sibling=current_to->prev_sibling;
+   if(current_to->next_sibling==0) {
+      if(current_to->parent!=0)
+         current_to->parent->last_child=tmp;
+      }
+   else {
+      current_to->next_sibling->prev_sibling=tmp;
+      }
+   tmp->next_sibling=current_to->next_sibling;
+   tmp->parent=current_to->parent;
+   kp::destructor(&current_to->data);
+   alloc_.deallocate(current_to,1);
+   current_to=tmp;
+   
+   // only at this stage can we fix 'last'
+   tree_node *last=from.node->next_sibling;
+
+   pre_order_iterator toit=tmp;
+   // copy all children
+   do {
+      assert(current_from!=0);
+      if(current_from->first_child != 0) {
+         current_from=current_from->first_child;
+         toit=append_child(toit, current_from->data);
+         }
+      else {
+         while(current_from->next_sibling==0 && current_from!=start_from) {
+            current_from=current_from->parent;
+            toit=parent(toit);
+            assert(current_from!=0);
+            }
+         current_from=current_from->next_sibling;
+         if(current_from!=last) {
+            toit=append_child(parent(toit), current_from->data);
+            }
+         }
+      } while(current_from!=last);
+
+   return current_to;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::replace(
+   sibling_iterator orig_begin, 
+   sibling_iterator orig_end, 
+   sibling_iterator new_begin, 
+   sibling_iterator new_end)
+   {
+   tree_node *orig_first=orig_begin.node;
+   tree_node *new_first=new_begin.node;
+   tree_node *orig_last=orig_first;
+   while((++orig_begin)!=orig_end)
+      orig_last=orig_last->next_sibling;
+   tree_node *new_last=new_first;
+   while((++new_begin)!=new_end)
+      new_last=new_last->next_sibling;
+
+   // insert all siblings in new_first..new_last before orig_first
+   bool first=true;
+   pre_order_iterator ret;
+   while(1==1) {
+      pre_order_iterator tt=insert_subtree(pre_order_iterator(orig_first), pre_order_iterator(new_first));
+      if(first) {
+         ret=tt;
+         first=false;
+         }
+      if(new_first==new_last)
+         break;
+      new_first=new_first->next_sibling;
+      }
+
+   // erase old range of siblings
+   bool last=false;
+   tree_node *next=orig_first;
+   while(1==1) {
+      if(next==orig_last) 
+         last=true;
+      next=next->next_sibling;
+      erase((pre_order_iterator)orig_first);
+      if(last) 
+         break;
+      orig_first=next;
+      }
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter>
+iter tree<T, tree_node_allocator>::flatten(iter position)
+   {
+   if(position.node->first_child==0)
+      return position;
+
+   tree_node *tmp=position.node->first_child;
+   while(tmp) {
+      tmp->parent=position.node->parent;
+      tmp=tmp->next_sibling;
+      } 
+   if(position.node->next_sibling) {
+      position.node->last_child->next_sibling=position.node->next_sibling;
+      position.node->next_sibling->prev_sibling=position.node->last_child;
+      }
+   else {
+      position.node->parent->last_child=position.node->last_child;
+      }
+   position.node->next_sibling=position.node->first_child;
+   position.node->next_sibling->prev_sibling=position.node;
+   position.node->first_child=0;
+   position.node->last_child=0;
+
+   return position;
+   }
+
+
+template <class T, class tree_node_allocator>
+template <typename iter>
+iter tree<T, tree_node_allocator>::reparent(iter position, sibling_iterator begin, sibling_iterator end)
+   {
+   tree_node *first=begin.node;
+   tree_node *last=first;
+
+   assert(first!=position.node);
+   
+   if(begin==end) return begin;
+   // determine last node
+   while((++begin)!=end) {
+      last=last->next_sibling;
+      }
+   // move subtree
+   if(first->prev_sibling==0) {
+      first->parent->first_child=last->next_sibling;
+      }
+   else {
+      first->prev_sibling->next_sibling=last->next_sibling;
+      }
+   if(last->next_sibling==0) {
+      last->parent->last_child=first->prev_sibling;
+      }
+   else {
+      last->next_sibling->prev_sibling=first->prev_sibling;
+      }
+   if(position.node->first_child==0) {
+      position.node->first_child=first;
+      position.node->last_child=last;
+      first->prev_sibling=0;
+      }
+   else {
+      position.node->last_child->next_sibling=first;
+      first->prev_sibling=position.node->last_child;
+      position.node->last_child=last;
+      }
+   last->next_sibling=0;
+
+   tree_node *pos=first;
+   while(1==1) {
+      pos->parent=position.node;
+      if(pos==last) break;
+      pos=pos->next_sibling;
+      }
+
+   return first;
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter> iter tree<T, tree_node_allocator>::reparent(iter position, iter from)
+   {
+   if(from.node->first_child==0) return position;
+   return reparent(position, from.node->first_child, end(from));
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter> iter tree<T, tree_node_allocator>::wrap(iter position, const T& x)
+   {
+   assert(position.node!=0);
+   sibling_iterator fr=position, to=position;
+   ++to;
+   iter ret = insert(position, x);
+   reparent(ret, fr, to);
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter> iter tree<T, tree_node_allocator>::move_after(iter target, iter source)
+   {
+   tree_node *dst=target.node;
+   tree_node *src=source.node;
+   assert(dst);
+   assert(src);
+
+   if(dst==src) return source;
+   if(dst->next_sibling)
+      if(dst->next_sibling==src) // already in the right spot
+         return source;
+
+   // take src out of the tree
+   if(src->prev_sibling!=0) src->prev_sibling->next_sibling=src->next_sibling;
+   else                     src->parent->first_child=src->next_sibling;
+   if(src->next_sibling!=0) src->next_sibling->prev_sibling=src->prev_sibling;
+   else                     src->parent->last_child=src->prev_sibling;
+
+   // connect it to the new point
+   if(dst->next_sibling!=0) dst->next_sibling->prev_sibling=src;
+   else                     dst->parent->last_child=src;
+   src->next_sibling=dst->next_sibling;
+   dst->next_sibling=src;
+   src->prev_sibling=dst;
+   src->parent=dst->parent;
+   return src;
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter> iter tree<T, tree_node_allocator>::move_before(iter target, iter source)
+   {
+   tree_node *dst=target.node;
+   tree_node *src=source.node;
+   assert(dst);
+   assert(src);
+
+   if(dst==src) return source;
+   if(dst->prev_sibling)
+      if(dst->prev_sibling==src) // already in the right spot
+         return source;
+
+   // take src out of the tree
+   if(src->prev_sibling!=0) src->prev_sibling->next_sibling=src->next_sibling;
+   else                     src->parent->first_child=src->next_sibling;
+   if(src->next_sibling!=0) src->next_sibling->prev_sibling=src->prev_sibling;
+   else                     src->parent->last_child=src->prev_sibling;
+
+   // connect it to the new point
+   if(dst->prev_sibling!=0) dst->prev_sibling->next_sibling=src;
+   else                     dst->parent->first_child=src;
+   src->prev_sibling=dst->prev_sibling;
+   dst->prev_sibling=src;
+   src->next_sibling=dst;
+   src->parent=dst->parent;
+   return src;
+   }
+
+// specialisation for sibling_iterators
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::move_before(sibling_iterator target, 
+                                                                                         sibling_iterator source)
+   {
+   tree_node *dst=target.node;
+   tree_node *src=source.node;
+   tree_node *dst_prev_sibling;
+   if(dst==0) { // must then be an end iterator
+      dst_prev_sibling=target.parent_->last_child;
+      assert(dst_prev_sibling);
+      }
+   else dst_prev_sibling=dst->prev_sibling;
+   assert(src);
+
+   if(dst==src) return source;
+   if(dst_prev_sibling)
+      if(dst_prev_sibling==src) // already in the right spot
+         return source;
+
+   // take src out of the tree
+   if(src->prev_sibling!=0) src->prev_sibling->next_sibling=src->next_sibling;
+   else                     src->parent->first_child=src->next_sibling;
+   if(src->next_sibling!=0) src->next_sibling->prev_sibling=src->prev_sibling;
+   else                     src->parent->last_child=src->prev_sibling;
+
+   // connect it to the new point
+   if(dst_prev_sibling!=0) dst_prev_sibling->next_sibling=src;
+   else                    target.parent_->first_child=src;
+   src->prev_sibling=dst_prev_sibling;
+   if(dst) {
+      dst->prev_sibling=src;
+      src->parent=dst->parent;
+      }
+   src->next_sibling=dst;
+   return src;
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter> iter tree<T, tree_node_allocator>::move_ontop(iter target, iter source)
+   {
+   tree_node *dst=target.node;
+   tree_node *src=source.node;
+   assert(dst);
+   assert(src);
+
+   if(dst==src) return source;
+
+   // remember connection points
+   tree_node *b_prev_sibling=dst->prev_sibling;
+   tree_node *b_next_sibling=dst->next_sibling;
+   tree_node *b_parent=dst->parent;
+
+   // remove target
+   erase(target);
+
+   // take src out of the tree
+   if(src->prev_sibling!=0) src->prev_sibling->next_sibling=src->next_sibling;
+   else                     src->parent->first_child=src->next_sibling;
+   if(src->next_sibling!=0) src->next_sibling->prev_sibling=src->prev_sibling;
+   else                     src->parent->last_child=src->prev_sibling;
+
+   // connect it to the new point
+   if(b_prev_sibling!=0) b_prev_sibling->next_sibling=src;
+   else                  b_parent->first_child=src;
+   if(b_next_sibling!=0) b_next_sibling->prev_sibling=src;
+   else                  b_parent->last_child=src;
+   src->prev_sibling=b_prev_sibling;
+   src->next_sibling=b_next_sibling;
+   src->parent=b_parent;
+   return src;
+   }
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::merge(sibling_iterator to1,   sibling_iterator to2,
+                                          sibling_iterator from1, sibling_iterator from2,
+                                          bool duplicate_leaves)
+   {
+   sibling_iterator fnd;
+   while(from1!=from2) {
+      if((fnd=std::find(to1, to2, (*from1))) != to2) { // element found
+         if(from1.begin()==from1.end()) { // full depth reached
+            if(duplicate_leaves)
+               append_child(parent(to1), (*from1));
+            }
+         else { // descend further
+            merge(fnd.begin(), fnd.end(), from1.begin(), from1.end(), duplicate_leaves);
+            }
+         }
+      else { // element missing
+         insert_subtree(to2, from1);
+         }
+      ++from1;
+      }
+   }
+
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::sort(sibling_iterator from, sibling_iterator to, bool deep)
+   {
+   std::less<T> comp;
+   sort(from, to, comp, deep);
+   }
+
+template <class T, class tree_node_allocator>
+template <class StrictWeakOrdering>
+void tree<T, tree_node_allocator>::sort(sibling_iterator from, sibling_iterator to, 
+                                        StrictWeakOrdering comp, bool deep)
+   {
+   if(from==to) return;
+   // make list of sorted nodes
+   // CHECK: if multiset stores equivalent nodes in the order in which they
+   // are inserted, then this routine should be called 'stable_sort'.
+   std::multiset<tree_node *, compare_nodes<StrictWeakOrdering> > nodes(comp);
+   sibling_iterator it=from, it2=to;
+   while(it != to) {
+      nodes.insert(it.node);
+      ++it;
+      }
+   // reassemble
+   --it2;
+
+   // prev and next are the nodes before and after the sorted range
+   tree_node *prev=from.node->prev_sibling;
+   tree_node *next=it2.node->next_sibling;
+   typename std::multiset<tree_node *, compare_nodes<StrictWeakOrdering> >::iterator nit=nodes.begin(), eit=nodes.end();
+   if(prev==0) {
+      if((*nit)->parent!=0) // to catch "sorting the head" situations, when there is no parent
+         (*nit)->parent->first_child=(*nit);
+      }
+   else prev->next_sibling=(*nit);
+
+   --eit;
+   while(nit!=eit) {
+      (*nit)->prev_sibling=prev;
+      if(prev)
+         prev->next_sibling=(*nit);
+      prev=(*nit);
+      ++nit;
+      }
+   // prev now points to the last-but-one node in the sorted range
+   if(prev)
+      prev->next_sibling=(*eit);
+
+   // eit points to the last node in the sorted range.
+   (*eit)->next_sibling=next;
+   (*eit)->prev_sibling=prev; // missed in the loop above
+   if(next==0) {
+      if((*eit)->parent!=0) // to catch "sorting the head" situations, when there is no parent
+         (*eit)->parent->last_child=(*eit);
+      }
+   else next->prev_sibling=(*eit);
+
+   if(deep) {  // sort the children of each node too
+      sibling_iterator bcs(*nodes.begin());
+      sibling_iterator ecs(*eit);
+      ++ecs;
+      while(bcs!=ecs) {
+         sort(begin(bcs), end(bcs), comp, deep);
+         ++bcs;
+         }
+      }
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter>
+bool tree<T, tree_node_allocator>::equal(const iter& one_, const iter& two, const iter& three_) const
+   {
+   std::equal_to<T> comp;
+   return equal(one_, two, three_, comp);
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter>
+bool tree<T, tree_node_allocator>::equal_subtree(const iter& one_, const iter& two_) const
+   {
+   std::equal_to<T> comp;
+   return equal_subtree(one_, two_, comp);
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter, class BinaryPredicate>
+bool tree<T, tree_node_allocator>::equal(const iter& one_, const iter& two, const iter& three_, BinaryPredicate fun) const
+   {
+   pre_order_iterator one(one_), three(three_);
+
+// if(one==two && is_valid(three) && three.number_of_children()!=0)
+//    return false;
+   while(one!=two && is_valid(three)) {
+      if(!fun(*one,*three))
+         return false;
+      if(one.number_of_children()!=three.number_of_children()) 
+         return false;
+      ++one;
+      ++three;
+      }
+   return true;
+   }
+
+template <class T, class tree_node_allocator>
+template <typename iter, class BinaryPredicate>
+bool tree<T, tree_node_allocator>::equal_subtree(const iter& one_, const iter& two_, BinaryPredicate fun) const
+   {
+   pre_order_iterator one(one_), two(two_);
+
+   if(!fun(*one,*two)) return false;
+   if(number_of_children(one)!=number_of_children(two)) return false;
+   return equal(begin(one),end(one),begin(two),fun);
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator> tree<T, tree_node_allocator>::subtree(sibling_iterator from, sibling_iterator to) const
+   {
+   tree tmp;
+   tmp.set_head(value_type());
+   tmp.replace(tmp.begin(), tmp.end(), from, to);
+   return tmp;
+   }
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::subtree(tree& tmp, sibling_iterator from, sibling_iterator to) const
+   {
+   tmp.set_head(value_type());
+   tmp.replace(tmp.begin(), tmp.end(), from, to);
+   }
+
+template <class T, class tree_node_allocator>
+int tree<T, tree_node_allocator>::size() const
+   {
+   int i=0;
+   pre_order_iterator it=begin(), eit=end();
+   while(it!=eit) {
+      ++i;
+      ++it;
+      }
+   return i;
+   }
+
+template <class T, class tree_node_allocator>
+int tree<T, tree_node_allocator>::size(const iterator_base& top) const
+   {
+   int i=0;
+   pre_order_iterator it=top, eit=top;
+   eit.skip_children();
+   ++eit;
+   while(it!=eit) {
+      ++i;
+      ++it;
+      }
+   return i;
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::empty() const
+   {
+   pre_order_iterator it=begin(), eit=end();
+   return (it==eit);
+   }
+
+template <class T, class tree_node_allocator>
+int tree<T, tree_node_allocator>::depth(const iterator_base& it) const
+   {
+   tree_node* pos=it.node;
+   assert(pos!=0);
+   int ret=0;
+   while(pos->parent!=0) {
+      pos=pos->parent;
+      ++ret;
+      }
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+unsigned int tree<T, tree_node_allocator>::number_of_children(const iterator_base& it) 
+   {
+   tree_node *pos=it.node->first_child;
+   if(pos==0) return 0;
+   
+   unsigned int ret=1;
+//   while(pos!=it.node->last_child) {
+//      ++ret;
+//      pos=pos->next_sibling;
+//      }
+   while((pos=pos->next_sibling))
+      ++ret;
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+unsigned int tree<T, tree_node_allocator>::number_of_siblings(const iterator_base& it) const
+   {
+   tree_node *pos=it.node;
+   unsigned int ret=0;
+   // count forward
+   while(pos->next_sibling && 
+         pos->next_sibling!=head &&
+         pos->next_sibling!=feet) {
+      ++ret;
+      pos=pos->next_sibling;
+      }
+   // count backward
+   pos=it.node;
+   while(pos->prev_sibling && 
+         pos->prev_sibling!=head &&
+         pos->prev_sibling!=feet) {
+      ++ret;
+      pos=pos->prev_sibling;
+      }
+   
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::swap(sibling_iterator it)
+   {
+   tree_node *nxt=it.node->next_sibling;
+   if(nxt) {
+      if(it.node->prev_sibling)
+         it.node->prev_sibling->next_sibling=nxt;
+      else
+         it.node->parent->first_child=nxt;
+      nxt->prev_sibling=it.node->prev_sibling;
+      tree_node *nxtnxt=nxt->next_sibling;
+      if(nxtnxt)
+         nxtnxt->prev_sibling=it.node;
+      else
+         it.node->parent->last_child=it.node;
+      nxt->next_sibling=it.node;
+      it.node->prev_sibling=nxt;
+      it.node->next_sibling=nxtnxt;
+      }
+   }
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::swap(iterator one, iterator two)
+   {
+   // if one and two are adjacent siblings, use the sibling swap
+   if(one.node->next_sibling==two.node) swap(one);
+   else if(two.node->next_sibling==one.node) swap(two);
+   else {
+      tree_node *nxt1=one.node->next_sibling;
+      tree_node *nxt2=two.node->next_sibling;
+      tree_node *pre1=one.node->prev_sibling;
+      tree_node *pre2=two.node->prev_sibling;
+      tree_node *par1=one.node->parent;
+      tree_node *par2=two.node->parent;
+
+      // reconnect
+      one.node->parent=par2;
+      one.node->next_sibling=nxt2;
+      if(nxt2) nxt2->prev_sibling=one.node;
+      else     par2->last_child=one.node;
+      one.node->prev_sibling=pre2;
+      if(pre2) pre2->next_sibling=one.node;
+      else     par2->first_child=one.node;    
+
+      two.node->parent=par1;
+      two.node->next_sibling=nxt1;
+      if(nxt1) nxt1->prev_sibling=two.node;
+      else     par1->last_child=two.node;
+      two.node->prev_sibling=pre1;
+      if(pre1) pre1->next_sibling=two.node;
+      else     par1->first_child=two.node;
+      }
+   }
+
+// template <class BinaryPredicate>
+// tree<T, tree_node_allocator>::iterator tree<T, tree_node_allocator>::find_subtree(
+//    sibling_iterator subfrom, sibling_iterator subto, iterator from, iterator to, 
+//    BinaryPredicate fun) const
+//    {
+//    assert(1==0); // this routine is not finished yet.
+//    while(from!=to) {
+//       if(fun(*subfrom, *from)) {
+//          
+//          }
+//       }
+//    return to;
+//    }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::is_in_subtree(const iterator_base& it, const iterator_base& begin, 
+                                                 const iterator_base& end) const
+   {
+   // FIXME: this should be optimised.
+   pre_order_iterator tmp=begin;
+   while(tmp!=end) {
+      if(tmp==it) return true;
+      ++tmp;
+      }
+   return false;
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::is_valid(const iterator_base& it) const
+   {
+   if(it.node==0 || it.node==feet || it.node==head) return false;
+   else return true;
+   }
+
+template <class T, class tree_node_allocator>
+unsigned int tree<T, tree_node_allocator>::index(sibling_iterator it) const
+   {
+   unsigned int ind=0;
+   if(it.node->parent==0) {
+      while(it.node->prev_sibling!=head) {
+         it.node=it.node->prev_sibling;
+         ++ind;
+         }
+      }
+   else {
+      while(it.node->prev_sibling!=0) {
+         it.node=it.node->prev_sibling;
+         ++ind;
+         }
+      }
+   return ind;
+   }
+
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::child(const iterator_base& it, unsigned int num) const
+   {
+   tree_node *tmp=it.node->first_child;
+   while(num--) {
+      assert(tmp!=0);
+      tmp=tmp->next_sibling;
+      }
+   return tmp;
+   }
+
+
+
+
+// Iterator base
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::iterator_base::iterator_base()
+   : node(0), skip_current_children_(false)
+   {
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::iterator_base::iterator_base(tree_node *tn)
+   : node(tn), skip_current_children_(false)
+   {
+   }
+
+template <class T, class tree_node_allocator>
+T& tree<T, tree_node_allocator>::iterator_base::operator*() const
+   {
+   return node->data;
+   }
+
+template <class T, class tree_node_allocator>
+T* tree<T, tree_node_allocator>::iterator_base::operator->() const
+   {
+   return &(node->data);
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::post_order_iterator::operator!=(const post_order_iterator& other) const
+   {
+   if(other.node!=this->node) return true;
+   else return false;
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::post_order_iterator::operator==(const post_order_iterator& other) const
+   {
+   if(other.node==this->node) return true;
+   else return false;
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::pre_order_iterator::operator!=(const pre_order_iterator& other) const
+   {
+   if(other.node!=this->node) return true;
+   else return false;
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::pre_order_iterator::operator==(const pre_order_iterator& other) const
+   {
+   if(other.node==this->node) return true;
+   else return false;
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::sibling_iterator::operator!=(const sibling_iterator& other) const
+   {
+   if(other.node!=this->node) return true;
+   else return false;
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::sibling_iterator::operator==(const sibling_iterator& other) const
+   {
+   if(other.node==this->node) return true;
+   else return false;
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::leaf_iterator::operator!=(const leaf_iterator& other) const
+   {
+   if(other.node!=this->node) return true;
+   else return false;
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::leaf_iterator::operator==(const leaf_iterator& other) const
+   {
+   if(other.node==this->node) return true;
+   else return false;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::iterator_base::begin() const
+   {
+   if(node->first_child==0) 
+      return end();
+
+   sibling_iterator ret(node->first_child);
+   ret.parent_=this->node;
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::iterator_base::end() const
+   {
+   sibling_iterator ret(0);
+   ret.parent_=node;
+   return ret;
+   }
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::iterator_base::skip_children()
+   {
+   skip_current_children_=true;
+   }
+
+template <class T, class tree_node_allocator>
+unsigned int tree<T, tree_node_allocator>::iterator_base::number_of_children() const
+   {
+   tree_node *pos=node->first_child;
+   if(pos==0) return 0;
+   
+   unsigned int ret=1;
+   while(pos!=node->last_child) {
+      ++ret;
+      pos=pos->next_sibling;
+      }
+   return ret;
+   }
+
+
+
+// Pre-order iterator
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::pre_order_iterator::pre_order_iterator() 
+   : iterator_base(0)
+   {
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::pre_order_iterator::pre_order_iterator(tree_node *tn)
+   : iterator_base(tn)
+   {
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::pre_order_iterator::pre_order_iterator(const iterator_base &other)
+   : iterator_base(other.node)
+   {
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::pre_order_iterator::pre_order_iterator(const sibling_iterator& other)
+   : iterator_base(other.node)
+   {
+   if(this->node==0) {
+      if(other.range_last()!=0)
+         this->node=other.range_last();
+      else 
+         this->node=other.parent_;
+      this->skip_children();
+      ++(*this);
+      }
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::pre_order_iterator& tree<T, tree_node_allocator>::pre_order_iterator::operator++()
+   {
+   assert(this->node!=0);
+   if(!this->skip_current_children_ && this->node->first_child != 0) {
+      this->node=this->node->first_child;
+      }
+   else {
+      this->skip_current_children_=false;
+      while(this->node->next_sibling==0) {
+         this->node=this->node->parent;
+         if(this->node==0)
+            return *this;
+         }
+      this->node=this->node->next_sibling;
+      }
+   return *this;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::pre_order_iterator& tree<T, tree_node_allocator>::pre_order_iterator::operator--()
+   {
+   assert(this->node!=0);
+   if(this->node->prev_sibling) {
+      this->node=this->node->prev_sibling;
+      while(this->node->last_child)
+         this->node=this->node->last_child;
+      }
+   else {
+      this->node=this->node->parent;
+      if(this->node==0)
+         return *this;
+      }
+   return *this;
+}
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::pre_order_iterator tree<T, tree_node_allocator>::pre_order_iterator::operator++(int n)
+   {
+   pre_order_iterator copy = *this;
+   ++(*this);
+   return copy;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::pre_order_iterator tree<T, tree_node_allocator>::pre_order_iterator::operator--(int n)
+{
+  pre_order_iterator copy = *this;
+  --(*this);
+  return copy;
+}
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::pre_order_iterator& tree<T, tree_node_allocator>::pre_order_iterator::operator+=(unsigned int num)
+   {
+   while(num>0) {
+      ++(*this);
+      --num;
+      }
+   return (*this);
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::pre_order_iterator& tree<T, tree_node_allocator>::pre_order_iterator::operator-=(unsigned int num)
+   {
+   while(num>0) {
+      --(*this);
+      --num;
+      }
+   return (*this);
+   }
+
+
+
+// Post-order iterator
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::post_order_iterator::post_order_iterator() 
+   : iterator_base(0)
+   {
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::post_order_iterator::post_order_iterator(tree_node *tn)
+   : iterator_base(tn)
+   {
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::post_order_iterator::post_order_iterator(const iterator_base &other)
+   : iterator_base(other.node)
+   {
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::post_order_iterator::post_order_iterator(const sibling_iterator& other)
+   : iterator_base(other.node)
+   {
+   if(this->node==0) {
+      if(other.range_last()!=0)
+         this->node=other.range_last();
+      else 
+         this->node=other.parent_;
+      this->skip_children();
+      ++(*this);
+      }
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::post_order_iterator& tree<T, tree_node_allocator>::post_order_iterator::operator++()
+   {
+   assert(this->node!=0);
+   if(this->node->next_sibling==0) {
+      this->node=this->node->parent;
+      this->skip_current_children_=false;
+      }
+   else {
+      this->node=this->node->next_sibling;
+      if(this->skip_current_children_) {
+         this->skip_current_children_=false;
+         }
+      else {
+         while(this->node->first_child)
+            this->node=this->node->first_child;
+         }
+      }
+   return *this;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::post_order_iterator& tree<T, tree_node_allocator>::post_order_iterator::operator--()
+   {
+   assert(this->node!=0);
+   if(this->skip_current_children_ || this->node->last_child==0) {
+      this->skip_current_children_=false;
+      while(this->node->prev_sibling==0)
+         this->node=this->node->parent;
+      this->node=this->node->prev_sibling;
+      }
+   else {
+      this->node=this->node->last_child;
+      }
+   return *this;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::post_order_iterator tree<T, tree_node_allocator>::post_order_iterator::operator++(int)
+   {
+   post_order_iterator copy = *this;
+   ++(*this);
+   return copy;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::post_order_iterator tree<T, tree_node_allocator>::post_order_iterator::operator--(int)
+   {
+   post_order_iterator copy = *this;
+   --(*this);
+   return copy;
+   }
+
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::post_order_iterator& tree<T, tree_node_allocator>::post_order_iterator::operator+=(unsigned int num)
+   {
+   while(num>0) {
+      ++(*this);
+      --num;
+      }
+   return (*this);
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::post_order_iterator& tree<T, tree_node_allocator>::post_order_iterator::operator-=(unsigned int num)
+   {
+   while(num>0) {
+      --(*this);
+      --num;
+      }
+   return (*this);
+   }
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::post_order_iterator::descend_all()
+   {
+   assert(this->node!=0);
+   while(this->node->first_child)
+      this->node=this->node->first_child;
+   }
+
+
+// Breadth-first iterator
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::breadth_first_queued_iterator::breadth_first_queued_iterator()
+   : iterator_base()
+   {
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::breadth_first_queued_iterator::breadth_first_queued_iterator(tree_node *tn)
+   : iterator_base(tn)
+   {
+   traversal_queue.push(tn);
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::breadth_first_queued_iterator::breadth_first_queued_iterator(const iterator_base& other)
+   : iterator_base(other.node)
+   {
+   traversal_queue.push(other.node);
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::breadth_first_queued_iterator::operator!=(const breadth_first_queued_iterator& other) const
+   {
+   if(other.node!=this->node) return true;
+   else return false;
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::breadth_first_queued_iterator::operator==(const breadth_first_queued_iterator& other) const
+   {
+   if(other.node==this->node) return true;
+   else return false;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::breadth_first_queued_iterator& tree<T, tree_node_allocator>::breadth_first_queued_iterator::operator++()
+   {
+   assert(this->node!=0);
+
+   // Add child nodes and pop current node
+   sibling_iterator sib=this->begin();
+   while(sib!=this->end()) {
+      traversal_queue.push(sib.node);
+      ++sib;
+      }
+   traversal_queue.pop();
+   if(traversal_queue.size()>0)
+      this->node=traversal_queue.front();
+   else 
+      this->node=0;
+   return (*this);
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::breadth_first_queued_iterator tree<T, tree_node_allocator>::breadth_first_queued_iterator::operator++(int n)
+   {
+   breadth_first_queued_iterator copy = *this;
+   ++(*this);
+   return copy;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::breadth_first_queued_iterator& tree<T, tree_node_allocator>::breadth_first_queued_iterator::operator+=(unsigned int num)
+   {
+   while(num>0) {
+      ++(*this);
+      --num;
+      }
+   return (*this);
+   }
+
+
+
+// Fixed depth iterator
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::fixed_depth_iterator::fixed_depth_iterator()
+   : iterator_base()
+   {
+   set_first_parent_();
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::fixed_depth_iterator::fixed_depth_iterator(tree_node *tn)
+   : iterator_base(tn)
+   {
+   set_first_parent_();
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::fixed_depth_iterator::fixed_depth_iterator(const iterator_base& other)
+   : iterator_base(other.node)
+   {
+   set_first_parent_();
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::fixed_depth_iterator::fixed_depth_iterator(const sibling_iterator& other)
+   : iterator_base(other.node), first_parent_(other.parent_)
+   {
+   find_leftmost_parent_();
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::fixed_depth_iterator::fixed_depth_iterator(const fixed_depth_iterator& other)
+   : iterator_base(other.node), first_parent_(other.first_parent_)
+   {
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::fixed_depth_iterator::operator==(const fixed_depth_iterator& other) const
+   {
+   if(other.node==this->node && other.first_parent_==first_parent_) return true;
+   else return false;
+   }
+
+template <class T, class tree_node_allocator>
+bool tree<T, tree_node_allocator>::fixed_depth_iterator::operator!=(const fixed_depth_iterator& other) const
+   {
+   if(other.node!=this->node || other.first_parent_!=first_parent_) return true;
+   else return false;
+   }
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::fixed_depth_iterator::set_first_parent_()
+   {
+   return; // FIXME: we do not use first_parent_ yet, and it actually needs some serious reworking if
+           // it is ever to work at the 'head' level.
+   first_parent_=0;
+   if(this->node==0) return;
+   if(this->node->parent!=0)
+      first_parent_=this->node->parent;
+   if(first_parent_)
+      find_leftmost_parent_();
+   }
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::fixed_depth_iterator::find_leftmost_parent_()
+   {
+   return; // FIXME: see 'set_first_parent()'
+   tree_node *tmppar=first_parent_;
+   while(tmppar->prev_sibling) {
+      tmppar=tmppar->prev_sibling;
+      if(tmppar->first_child)
+         first_parent_=tmppar;
+      }
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::fixed_depth_iterator& tree<T, tree_node_allocator>::fixed_depth_iterator::operator++()
+   {
+   assert(this->node!=0);
+
+   if(this->node->next_sibling) {
+      this->node=this->node->next_sibling;
+      }
+   else { 
+      int relative_depth=0;
+      upper:
+      do {
+         this->node=this->node->parent;
+         if(this->node==0) return *this;
+         --relative_depth;
+         } while(this->node->next_sibling==0);
+      lower:
+      this->node=this->node->next_sibling;
+      while(this->node->first_child==0) {
+         if(this->node->next_sibling==0)
+            goto upper;
+         this->node=this->node->next_sibling;
+         if(this->node==0) return *this;
+         }
+      while(relative_depth<0 && this->node->first_child!=0) {
+         this->node=this->node->first_child;
+         ++relative_depth;
+         }
+      if(relative_depth<0) {
+         if(this->node->next_sibling==0) goto upper;
+         else                          goto lower;
+         }
+      }
+   return *this;
+
+// if(this->node->next_sibling!=0) {
+//    this->node=this->node->next_sibling;
+//    assert(this->node!=0);
+//    if(this->node->parent==0 && this->node->next_sibling==0) // feet element
+//       this->node=0;
+//    }
+// else {
+//    tree_node *par=this->node->parent;
+//    do {
+//       par=par->next_sibling;
+//       if(par==0) { // FIXME: need to keep track of this!
+//          this->node=0;
+//          return *this;
+//          }
+//       } while(par->first_child==0);
+//    this->node=par->first_child;
+//    }
+   return *this;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::fixed_depth_iterator& tree<T, tree_node_allocator>::fixed_depth_iterator::operator--()
+   {
+   assert(this->node!=0);
+   if(this->node->prev_sibling!=0) {
+      this->node=this->node->prev_sibling;
+      assert(this->node!=0);
+      if(this->node->parent==0 && this->node->prev_sibling==0) // head element
+         this->node=0;
+      }
+   else {
+      tree_node *par=this->node->parent;
+      do {
+         par=par->prev_sibling;
+         if(par==0) { // FIXME: need to keep track of this!
+            this->node=0;
+            return *this;
+            }
+         } while(par->last_child==0);
+      this->node=par->last_child;
+      }
+   return *this;
+}
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::fixed_depth_iterator tree<T, tree_node_allocator>::fixed_depth_iterator::operator++(int)
+   {
+   fixed_depth_iterator copy = *this;
+   ++(*this);
+   return copy;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::fixed_depth_iterator tree<T, tree_node_allocator>::fixed_depth_iterator::operator--(int)
+{
+  fixed_depth_iterator copy = *this;
+  --(*this);
+  return copy;
+}
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::fixed_depth_iterator& tree<T, tree_node_allocator>::fixed_depth_iterator::operator-=(unsigned int num)
+   {
+   while(num>0) {
+      --(*this);
+      --(num);
+      }
+   return (*this);
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::fixed_depth_iterator& tree<T, tree_node_allocator>::fixed_depth_iterator::operator+=(unsigned int num)
+   {
+   while(num>0) {
+      ++(*this);
+      --(num);
+      }
+   return *this;
+   }
+
+// FIXME: add the other members of fixed_depth_iterator.
+
+
+// Sibling iterator
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::sibling_iterator::sibling_iterator() 
+   : iterator_base()
+   {
+   set_parent_();
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::sibling_iterator::sibling_iterator(tree_node *tn)
+   : iterator_base(tn)
+   {
+   set_parent_();
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::sibling_iterator::sibling_iterator(const iterator_base& other)
+   : iterator_base(other.node)
+   {
+   set_parent_();
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::sibling_iterator::sibling_iterator(const sibling_iterator& other)
+   : iterator_base(other), parent_(other.parent_)
+   {
+   }
+
+template <class T, class tree_node_allocator>
+void tree<T, tree_node_allocator>::sibling_iterator::set_parent_()
+   {
+   parent_=0;
+   if(this->node==0) return;
+   if(this->node->parent!=0)
+      parent_=this->node->parent;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator& tree<T, tree_node_allocator>::sibling_iterator::operator++()
+   {
+   if(this->node)
+      this->node=this->node->next_sibling;
+   return *this;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator& tree<T, tree_node_allocator>::sibling_iterator::operator--()
+   {
+   if(this->node) this->node=this->node->prev_sibling;
+   else {
+      assert(parent_);
+      this->node=parent_->last_child;
+      }
+   return *this;
+}
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::sibling_iterator::operator++(int)
+   {
+   sibling_iterator copy = *this;
+   ++(*this);
+   return copy;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::sibling_iterator::operator--(int)
+   {
+   sibling_iterator copy = *this;
+   --(*this);
+   return copy;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator& tree<T, tree_node_allocator>::sibling_iterator::operator+=(unsigned int num)
+   {
+   while(num>0) {
+      ++(*this);
+      --num;
+      }
+   return (*this);
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::sibling_iterator& tree<T, tree_node_allocator>::sibling_iterator::operator-=(unsigned int num)
+   {
+   while(num>0) {
+      --(*this);
+      --num;
+      }
+   return (*this);
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::tree_node *tree<T, tree_node_allocator>::sibling_iterator::range_first() const
+   {
+   tree_node *tmp=parent_->first_child;
+   return tmp;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::tree_node *tree<T, tree_node_allocator>::sibling_iterator::range_last() const
+   {
+   return parent_->last_child;
+   }
+
+// Leaf iterator
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::leaf_iterator::leaf_iterator() 
+   : iterator_base(0)
+   {
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::leaf_iterator::leaf_iterator(tree_node *tn)
+   : iterator_base(tn)
+   {
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::leaf_iterator::leaf_iterator(const iterator_base &other)
+   : iterator_base(other.node)
+   {
+   }
+
+template <class T, class tree_node_allocator>
+tree<T, tree_node_allocator>::leaf_iterator::leaf_iterator(const sibling_iterator& other)
+   : iterator_base(other.node)
+   {
+   if(this->node==0) {
+      if(other.range_last()!=0)
+         this->node=other.range_last();
+      else 
+         this->node=other.parent_;
+      ++(*this);
+      }
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::leaf_iterator& tree<T, tree_node_allocator>::leaf_iterator::operator++()
+   {
+   assert(this->node!=0);
+   while(this->node->next_sibling==0) {
+      if (this->node->parent==0) return *this;
+      this->node=this->node->parent;
+      }
+   this->node=this->node->next_sibling;
+   while(this->node->first_child)
+      this->node=this->node->first_child;
+   return *this;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::leaf_iterator& tree<T, tree_node_allocator>::leaf_iterator::operator--()
+   {
+   assert(this->node!=0);
+   while (this->node->prev_sibling==0) {
+      if (this->node->parent==0) return *this;
+      this->node=this->node->parent;
+      }
+   this->node=this->node->prev_sibling;
+   while(this->node->last_child)
+      this->node=this->node->last_child;
+   return *this;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::leaf_iterator tree<T, tree_node_allocator>::leaf_iterator::operator++(int)
+   {
+   leaf_iterator copy = *this;
+   ++(*this);
+   return copy;
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::leaf_iterator tree<T, tree_node_allocator>::leaf_iterator::operator--(int)
+   {
+   leaf_iterator copy = *this;
+   --(*this);
+   return copy;
+   }
+
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::leaf_iterator& tree<T, tree_node_allocator>::leaf_iterator::operator+=(unsigned int num)
+   {
+   while(num>0) {
+      ++(*this);
+      --num;
+      }
+   return (*this);
+   }
+
+template <class T, class tree_node_allocator>
+typename tree<T, tree_node_allocator>::leaf_iterator& tree<T, tree_node_allocator>::leaf_iterator::operator-=(unsigned int num)
+   {
+   while(num>0) {
+      --(*this);
+      --num;
+      }
+   return (*this);
+   }
+
+#endif
+
+// Local variables:
+// default-tab-width: 3
+// End:

Index: libbase/tree.hpp
===================================================================
RCS file: libbase/tree.hpp
diff -N libbase/tree.hpp
--- libbase/tree.hpp	24 Aug 2007 03:10:56 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,2620 +0,0 @@
-/* 
-
-   $Id: tree.hpp,v 1.1 2007/08/24 03:10:56 nihilus Exp $
-
-   STL-like templated tree class.
-   Copyright (C) 2001-2006  Kasper Peeters <kasper.peeters@aei.mpg.de>.
-
-*/
-
-/** \mainpage tree.hh
-    \author   Kasper Peeters
-    \version  2.31
-    \date     21-Aug-2007
-    \see      http://www.aei.mpg.de/~peekas/tree/
-    \see      http://www.aei.mpg.de/~peekas/tree/ChangeLog
-
-   The tree.hh library for C++ provides an STL-like container class
-   for n-ary trees, templated over the data stored at the
-   nodes. Various types of iterators are provided (post-order,
-   pre-order, and others). Where possible the access methods are
-   compatible with the STL or alternative algorithms are
-   available. 
-*/
-
-
-/*
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 or 3.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-/** \todo 
-   - New-style move members are not completely finished yet.
-   - It would be good to have an iterator which can iterate over all
-     nodes below a given node.
-   - Fixed depth iterators do not iterate over the entire range if there
-     are 'holes' in the tree.
-   - If a range uses const iter_base& as end iterator, things will
-     inevitably go wrong, because upcast from iter_base to a non-sibling_iter
-     is incorrect. This upcast should be removed (and then all illegal uses
-     as previously in 'equal' will be flagged by the compiler). This requires
-     new copy constructors though.
-   - There's a bug in replace(sibling_iterator, ...) when the ranges
-     sit next to each other. Turned up in append_child(iter,iter)
-     but has been avoided now.
-   - "std::operator<" does not work correctly on our iterators, and for some
-     reason a globally defined template operator< did not get picked up. 
-     Using a comparison class now, but this should be investigated.
-*/
-
-#ifndef tree_hh_
-#define tree_hh_
-
-#include <cassert>
-#include <memory>
-#include <stdexcept>
-#include <iterator>
-#include <set>
-#include <queue>
-#include <iostream>
-
-// HP-style construct/destroy have gone from the standard,
-// so here is a copy.
-
-namespace kp {
-
-template <class T1, class T2>
-void constructor(T1* p, T2& val) 
-   {
-   new ((void *) p) T1(val);
-   }
-
-template <class T1>
-void constructor(T1* p) 
-   {
-   new ((void *) p) T1;
-   }
-
-template <class T1>
-void destructor(T1* p)
-   {
-   p->~T1();
-   }
-
-};
-
-/// A node in the tree, combining links to other nodes as well as the actual data.
-template<class T>
-class tree_node_ { // size: 5*4=20 bytes (on 32 bit arch), can be reduced by 8.
-   public:
-      tree_node_<T> *parent;
-      tree_node_<T> *first_child, *last_child;
-      tree_node_<T> *prev_sibling, *next_sibling;
-      T data;
-}; // __attribute__((packed));
-
-template <class T, class tree_node_allocator = std::allocator<tree_node_<T> > >
-class tree {
-   protected:
-      typedef tree_node_<T> tree_node;
-   public:
-      /// Value of the data stored at a node.
-      typedef T value_type;
-
-      class iterator_base;
-      class pre_order_iterator;
-      class post_order_iterator;
-      class sibling_iterator;
-      class leaf_iterator;
-
-      tree();
-      tree(const T&);
-      tree(const iterator_base&);
-      tree(const tree<T, tree_node_allocator>&);
-      ~tree();
-      void operator=(const tree<T, tree_node_allocator>&);
-
-      /// Base class for iterators, only pointers stored, no traversal logic.
-#ifdef __SGI_STL_PORT
-      class iterator_base : public stlport::bidirectional_iterator<T, ptrdiff_t> {
-#else
-      class iterator_base {
-#endif
-         public:
-            typedef T                               value_type;
-            typedef T*                              pointer;
-            typedef T&                              reference;
-            typedef size_t                          size_type;
-            typedef ptrdiff_t                       difference_type;
-            typedef std::bidirectional_iterator_tag iterator_category;
-
-            iterator_base();
-            iterator_base(tree_node *);
-
-            T&             operator*() const;
-            T*             operator->() const;
-
-            /// When called, the next increment/decrement skips children of this node.
-            void         skip_children();
-            /// Number of children of the node pointed to by the iterator.
-            unsigned int number_of_children() const;
-
-            sibling_iterator begin() const;
-            sibling_iterator end() const;
-
-            tree_node *node;
-         protected:
-            bool skip_current_children_;
-      };
-
-      /// Depth-first iterator, first accessing the node, then its children.
-      class pre_order_iterator : public iterator_base { 
-         public:
-            pre_order_iterator();
-            pre_order_iterator(tree_node *);
-            pre_order_iterator(const iterator_base&);
-            pre_order_iterator(const sibling_iterator&);
-
-            bool    operator==(const pre_order_iterator&) const;
-            bool    operator!=(const pre_order_iterator&) const;
-            pre_order_iterator&  operator++();
-            pre_order_iterator&  operator--();
-            pre_order_iterator   operator++(int);
-            pre_order_iterator   operator--(int);
-            pre_order_iterator&  operator+=(unsigned int);
-            pre_order_iterator&  operator-=(unsigned int);
-      };
-
-      /// Depth-first iterator, first accessing the children, then the node itself.
-      class post_order_iterator : public iterator_base {
-         public:
-            post_order_iterator();
-            post_order_iterator(tree_node *);
-            post_order_iterator(const iterator_base&);
-            post_order_iterator(const sibling_iterator&);
-
-            bool    operator==(const post_order_iterator&) const;
-            bool    operator!=(const post_order_iterator&) const;
-            post_order_iterator&  operator++();
-            post_order_iterator&  operator--();
-            post_order_iterator   operator++(int);
-            post_order_iterator   operator--(int);
-            post_order_iterator&  operator+=(unsigned int);
-            post_order_iterator&  operator-=(unsigned int);
-
-            /// Set iterator to the first child as deep as possible down the tree.
-            void descend_all();
-      };
-
-      /// Breadth-first iterator, using a queue
-      class breadth_first_queued_iterator : public iterator_base {
-         public:
-            breadth_first_queued_iterator();
-            breadth_first_queued_iterator(tree_node *);
-            breadth_first_queued_iterator(const iterator_base&);
-
-            bool    operator==(const breadth_first_queued_iterator&) const;
-            bool    operator!=(const breadth_first_queued_iterator&) const;
-            breadth_first_queued_iterator&  operator++();
-            breadth_first_queued_iterator   operator++(int);
-            breadth_first_queued_iterator&  operator+=(unsigned int);
-
-         private:
-            std::queue<tree_node *> traversal_queue;
-      };
-
-      /// The default iterator types throughout the tree class.
-      typedef pre_order_iterator            iterator;
-      typedef breadth_first_queued_iterator breadth_first_iterator;
-
-      /// Iterator which traverses only the nodes at a given depth from the root.
-      class fixed_depth_iterator : public iterator_base {
-         public:
-            fixed_depth_iterator();
-            fixed_depth_iterator(tree_node *);
-            fixed_depth_iterator(const iterator_base&);
-            fixed_depth_iterator(const sibling_iterator&);
-            fixed_depth_iterator(const fixed_depth_iterator&);
-
-            bool    operator==(const fixed_depth_iterator&) const;
-            bool    operator!=(const fixed_depth_iterator&) const;
-            fixed_depth_iterator&  operator++();
-            fixed_depth_iterator&  operator--();
-            fixed_depth_iterator   operator++(int);
-            fixed_depth_iterator   operator--(int);
-            fixed_depth_iterator&  operator+=(unsigned int);
-            fixed_depth_iterator&  operator-=(unsigned int);
-
-            tree_node *first_parent_;
-         private:
-            void set_first_parent_();
-            void find_leftmost_parent_();
-      };
-
-      /// Iterator which traverses only the nodes which are siblings of each other.
-      class sibling_iterator : public iterator_base {
-         public:
-            sibling_iterator();
-            sibling_iterator(tree_node *);
-            sibling_iterator(const sibling_iterator&);
-            sibling_iterator(const iterator_base&);
-
-            bool    operator==(const sibling_iterator&) const;
-            bool    operator!=(const sibling_iterator&) const;
-            sibling_iterator&  operator++();
-            sibling_iterator&  operator--();
-            sibling_iterator   operator++(int);
-            sibling_iterator   operator--(int);
-            sibling_iterator&  operator+=(unsigned int);
-            sibling_iterator&  operator-=(unsigned int);
-
-            tree_node *range_first() const;
-            tree_node *range_last() const;
-            tree_node *parent_;
-         private:
-            void set_parent_();
-      };
-
-      /// Iterator which traverses only the leaves.
-      class leaf_iterator : public iterator_base {
-         public:
-            leaf_iterator();
-            leaf_iterator(tree_node *);
-            leaf_iterator(const sibling_iterator&);
-            leaf_iterator(const iterator_base&);
-
-            bool    operator==(const leaf_iterator&) const;
-            bool    operator!=(const leaf_iterator&) const;
-            leaf_iterator&  operator++();
-            leaf_iterator&  operator--();
-            leaf_iterator   operator++(int);
-            leaf_iterator   operator--(int);
-            leaf_iterator&  operator+=(unsigned int);
-            leaf_iterator&  operator-=(unsigned int);
-      };
-
-      /// Return iterator to the beginning of the tree.
-      inline pre_order_iterator   begin() const;
-      /// Return iterator to the end of the tree.
-      inline pre_order_iterator   end() const;
-      /// Return post-order iterator to the beginning of the tree.
-      post_order_iterator  begin_post() const;
-      /// Return post-order iterator to the end of the tree.
-      post_order_iterator  end_post() const;
-      /// Return fixed-depth iterator to the first node at a given depth.
-      fixed_depth_iterator begin_fixed(const iterator_base&, unsigned int) const;
-      /// Return fixed-depth iterator to end of the nodes at given depth.
-      fixed_depth_iterator end_fixed(const iterator_base&, unsigned int) const;
-      /// Return breadth-first iterator to the first node at a given depth.
-      breadth_first_queued_iterator begin_breadth_first() const;
-      /// Return breadth-first iterator to end of the nodes at given depth.
-      breadth_first_queued_iterator end_breadth_first() const;
-      /// Return sibling iterator to the first child of given node.
-      sibling_iterator     begin(const iterator_base&) const;
-      /// Return sibling iterator to the end of the children of a given node.
-      sibling_iterator     end(const iterator_base&) const;
-      /// Return leaf iterator to the first leaf of the tree.
-      leaf_iterator   begin_leaf() const;
-      /// Return leaf iterator to the last leaf of the tree.
-      leaf_iterator   end_leaf() const;
-
-      /// Return iterator to the parent of a node.
-      template<typename iter> static iter parent(iter);
-      /// Return iterator to the previous sibling of a node.
-      template<typename iter> iter previous_sibling(iter) const;
-      /// Return iterator to the next sibling of a node.
-      template<typename iter> iter next_sibling(iter) const;
-      /// Return iterator to the next node at a given depth.
-      template<typename iter> iter next_at_same_depth(iter) const;
-
-      /// Erase all nodes of the tree.
-      void     clear();
-      /// Erase element at position pointed to by iterator, return incremented iterator.
-      template<typename iter> iter erase(iter);
-      /// Erase all children of the node pointed to by iterator.
-      void     erase_children(const iterator_base&);
-
-      /// Insert empty node as last/first child of node pointed to by position.
-      template<typename iter> iter append_child(iter position); 
-      template<typename iter> iter prepend_child(iter position); 
-      /// Insert node as last/first child of node pointed to by position.
-      template<typename iter> iter append_child(iter position, const T& x);
-      template<typename iter> iter prepend_child(iter position, const T& x);
-      /// Append the node (plus its children) at other_position as last/first child of position.
-      template<typename iter> iter append_child(iter position, iter other_position);
-      template<typename iter> iter prepend_child(iter position, iter other_position);
-      /// Append the nodes in the from-to range (plus their children) as last/first children of position.
-      template<typename iter> iter append_children(iter position, sibling_iterator from, sibling_iterator to);
-      template<typename iter> iter prepend_children(iter position, sibling_iterator from, sibling_iterator to);
-
-      /// Short-hand to insert topmost node in otherwise empty tree.
-      pre_order_iterator set_head(const T& x);
-      /// Insert node as previous sibling of node pointed to by position.
-      template<typename iter> iter insert(iter position, const T& x);
-      /// Specialisation of previous member.
-      sibling_iterator insert(sibling_iterator position, const T& x);
-      /// Insert node (with children) pointed to by subtree as previous sibling of node pointed to by position.
-      template<typename iter> iter insert_subtree(iter position, const iterator_base& subtree);
-      /// Insert node as next sibling of node pointed to by position.
-      template<typename iter> iter insert_after(iter position, const T& x);
-      /// Insert node (with children) pointed to by subtree as next sibling of node pointed to by position.
-      template<typename iter> iter insert_subtree_after(iter position, const iterator_base& subtree);
-
-      /// Replace node at 'position' with other node (keeping same children); 'position' becomes invalid.
-      template<typename iter> iter replace(iter position, const T& x);
-      /// Replace node at 'position' with subtree starting at 'from' (do not erase subtree at 'from'); see above.
-      template<typename iter> iter replace(iter position, const iterator_base& from);
-      /// Replace string of siblings (plus their children) with copy of a new string (with children); see above
-      sibling_iterator replace(sibling_iterator orig_begin, sibling_iterator orig_end, 
-                               sibling_iterator new_begin,  sibling_iterator new_end); 
-
-      /// Move all children of node at 'position' to be siblings, returns position.
-      template<typename iter> iter flatten(iter position);
-      /// Move nodes in range to be children of 'position'.
-      template<typename iter> iter reparent(iter position, sibling_iterator begin, sibling_iterator end);
-      /// Move all child nodes of 'from' to be children of 'position'.
-      template<typename iter> iter reparent(iter position, iter from);
-
-      /// Replace node with a new node, making the old node a child of the new node.
-      template<typename iter> iter wrap(iter position, const T& x);
-
-      /// Move 'source' node (plus its children) to become the next sibling of 'target'.
-      template<typename iter> iter move_after(iter target, iter source);
-      /// Move 'source' node (plus its children) to become the previous sibling of 'target'.
-      template<typename iter> iter move_before(iter target, iter source);
-      sibling_iterator move_before(sibling_iterator target, sibling_iterator source);
-      /// Move 'source' node (plus its children) to become the node at 'target' (erasing the node at 'target').
-      template<typename iter> iter move_ontop(iter target, iter source);
-
-      /// Merge with other tree, creating new branches and leaves only if they are not already present.
-      void     merge(sibling_iterator, sibling_iterator, sibling_iterator, sibling_iterator, 
-                     bool duplicate_leaves=false);
-      /// Sort (std::sort only moves values of nodes, this one moves children as well).
-      void     sort(sibling_iterator from, sibling_iterator to, bool deep=false);
-      template<class StrictWeakOrdering>
-      void     sort(sibling_iterator from, sibling_iterator to, StrictWeakOrdering comp, bool deep=false);
-      /// Compare two ranges of nodes (compares nodes as well as tree structure).
-      template<typename iter>
-      bool     equal(const iter& one, const iter& two, const iter& three) const;
-      template<typename iter, class BinaryPredicate>
-      bool     equal(const iter& one, const iter& two, const iter& three, BinaryPredicate) const;
-      template<typename iter>
-      bool     equal_subtree(const iter& one, const iter& two) const;
-      template<typename iter, class BinaryPredicate>
-      bool     equal_subtree(const iter& one, const iter& two, BinaryPredicate) const;
-      /// Extract a new tree formed by the range of siblings plus all their children.
-      tree     subtree(sibling_iterator from, sibling_iterator to) const;
-      void     subtree(tree&, sibling_iterator from, sibling_iterator to) const;
-      /// Exchange the node (plus subtree) with its sibling node (do nothing if no sibling present).
-      void     swap(sibling_iterator it);
-      /// Exchange two nodes (plus subtrees)
-      void     swap(iterator, iterator);
-      
-      /// Count the total number of nodes.
-      int      size() const;
-      /// Count the total number of nodes below the indicated node (plus one).
-      int      size(const iterator_base&) const;
-      /// Check if tree is empty.
-      bool     empty() const;
-      /// Compute the depth to the root.
-      int      depth(const iterator_base&) const;
-      /// Count the number of children of node at position.
-      static unsigned int number_of_children(const iterator_base&);
-      /// Count the number of 'next' siblings of node at iterator.
-      unsigned int number_of_siblings(const iterator_base&) const;
-      /// Determine whether node at position is in the subtrees with root in the range.
-      bool     is_in_subtree(const iterator_base& position, const iterator_base& begin, 
-                             const iterator_base& end) const;
-      /// Determine whether the iterator is an 'end' iterator and thus not actually pointing to a node.
-      bool     is_valid(const iterator_base&) const;
-
-      /// Determine the index of a node in the range of siblings to which it belongs.
-      unsigned int index(sibling_iterator it) const;
-      /// Inverse of 'index': return the n-th child of the node at position.
-      sibling_iterator  child(const iterator_base& position, unsigned int) const;
-      
-      /// Comparator class for iterators (compares pointer values; why doesn't this work automatically?)
-      class iterator_base_less {
-         public:
-            bool operator()(const typename tree<T, tree_node_allocator>::iterator_base& one,
-                            const typename tree<T, tree_node_allocator>::iterator_base& two) const
-               {
-               return one.node < two.node;
-               }
-      };
-      tree_node *head, *feet;    // head/feet are always dummy; if an iterator points to them it is invalid
-   private:
-      tree_node_allocator alloc_;
-      void head_initialise_();
-      void copy_(const tree<T, tree_node_allocator>& other);
-
-      /// Comparator class for two nodes of a tree (used for sorting and searching).
-      template<class StrictWeakOrdering>
-      class compare_nodes {
-         public:
-            compare_nodes(StrictWeakOrdering comp) : comp_(comp) {};
-            
-            bool operator()(const tree_node *a, const tree_node *b) 
-               {
-               static StrictWeakOrdering comp;
-               return comp(a->data, b->data);
-               }
-         private:
-            StrictWeakOrdering comp_;
-      };
-};
-
-//template <class T, class tree_node_allocator>
-//class iterator_base_less {
-// public:
-//    bool operator()(const typename tree<T, tree_node_allocator>::iterator_base& one,
-//                  const typename tree<T, tree_node_allocator>::iterator_base& two) const
-//       {
-//       txtout << "operatorclass<" << one.node < two.node << std::endl;
-//       return one.node < two.node;
-//       }
-//};
-
-// template <class T, class tree_node_allocator>
-// bool operator<(const typename tree<T, tree_node_allocator>::iterator& one,
-//                const typename tree<T, tree_node_allocator>::iterator& two)
-//    {
-//    txtout << "operator< " << one.node < two.node << std::endl;
-//    if(one.node < two.node) return true;
-//    return false;
-//    }
-// 
-// template <class T, class tree_node_allocator>
-// bool operator==(const typename tree<T, tree_node_allocator>::iterator& one,
-//                const typename tree<T, tree_node_allocator>::iterator& two)
-//    {
-//    txtout << "operator== " << one.node == two.node << std::endl;
-//    if(one.node == two.node) return true;
-//    return false;
-//    }
-// 
-// template <class T, class tree_node_allocator>
-// bool operator>(const typename tree<T, tree_node_allocator>::iterator_base& one,
-//                const typename tree<T, tree_node_allocator>::iterator_base& two)
-//    {
-//    txtout << "operator> " << one.node < two.node << std::endl;
-//    if(one.node > two.node) return true;
-//    return false;
-//    }
-
-
-
-// Tree
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::tree() 
-   {
-   head_initialise_();
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::tree(const T& x) 
-   {
-   head_initialise_();
-   set_head(x);
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::tree(const iterator_base& other)
-   {
-   head_initialise_();
-   set_head((*other));
-   replace(begin(), other);
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::~tree()
-   {
-   clear();
-   alloc_.deallocate(head,1);
-   alloc_.deallocate(feet,1);
-   }
-
-template <class T, class tree_node_allocator>
-void tree<T, tree_node_allocator>::head_initialise_() 
-   { 
-   head = alloc_.allocate(1,0); // MSVC does not have default second argument 
-   feet = alloc_.allocate(1,0);
-
-   head->parent=0;
-   head->first_child=0;
-   head->last_child=0;
-   head->prev_sibling=0; //head;
-   head->next_sibling=feet; //head;
-
-   feet->parent=0;
-   feet->first_child=0;
-   feet->last_child=0;
-   feet->prev_sibling=head;
-   feet->next_sibling=0;
-   }
-
-template <class T, class tree_node_allocator>
-void tree<T, tree_node_allocator>::operator=(const tree<T, tree_node_allocator>& other)
-   {
-   copy_(other);
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::tree(const tree<T, tree_node_allocator>& other)
-   {
-   head_initialise_();
-   copy_(other);
-   }
-
-template <class T, class tree_node_allocator>
-void tree<T, tree_node_allocator>::copy_(const tree<T, tree_node_allocator>& other) 
-   {
-   clear();
-   pre_order_iterator it=other.begin(), to=begin();
-   while(it!=other.end()) {
-      to=insert(to, (*it));
-      it.skip_children();
-      ++it;
-      }
-   to=begin();
-   it=other.begin();
-   while(it!=other.end()) {
-      to=replace(to, it);
-      to.skip_children();
-      it.skip_children();
-      ++to;
-      ++it;
-      }
-   }
-
-template <class T, class tree_node_allocator>
-void tree<T, tree_node_allocator>::clear()
-   {
-   if(head)
-      while(head->next_sibling!=feet)
-         erase(pre_order_iterator(head->next_sibling));
-   }
-
-template<class T, class tree_node_allocator> 
-void tree<T, tree_node_allocator>::erase_children(const iterator_base& it)
-   {
-// std::cout << "erase_children " << it.node << std::endl;
-   if(it.node==0) return;
-
-   tree_node *cur=it.node->first_child;
-   tree_node *prev=0;
-
-   while(cur!=0) {
-      prev=cur;
-      cur=cur->next_sibling;
-      erase_children(pre_order_iterator(prev));
-      kp::destructor(&prev->data);
-      alloc_.deallocate(prev,1);
-      }
-   it.node->first_child=0;
-   it.node->last_child=0;
-// std::cout << "exit" << std::endl;
-   }
-
-template<class T, class tree_node_allocator> 
-template<class iter>
-iter tree<T, tree_node_allocator>::erase(iter it)
-   {
-   tree_node *cur=it.node;
-   assert(cur!=head);
-   iter ret=it;
-   ret.skip_children();
-   ++ret;
-   erase_children(it);
-   if(cur->prev_sibling==0) {
-      cur->parent->first_child=cur->next_sibling;
-      }
-   else {
-      cur->prev_sibling->next_sibling=cur->next_sibling;
-      }
-   if(cur->next_sibling==0) {
-      cur->parent->last_child=cur->prev_sibling;
-      }
-   else {
-      cur->next_sibling->prev_sibling=cur->prev_sibling;
-      }
-
-   kp::destructor(&cur->data);
-   alloc_.deallocate(cur,1);
-   return ret;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::pre_order_iterator tree<T, tree_node_allocator>::begin() const
-   {
-   return pre_order_iterator(head->next_sibling);
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::pre_order_iterator tree<T, tree_node_allocator>::end() const
-   {
-   return pre_order_iterator(feet);
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::breadth_first_queued_iterator tree<T, tree_node_allocator>::begin_breadth_first() const
-   {
-   return breadth_first_queued_iterator(head->next_sibling);
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::breadth_first_queued_iterator tree<T, tree_node_allocator>::end_breadth_first() const
-   {
-   return breadth_first_queued_iterator();
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::post_order_iterator tree<T, tree_node_allocator>::begin_post() const
-   {
-   tree_node *tmp=head->next_sibling;
-   if(tmp!=feet) {
-      while(tmp->first_child)
-         tmp=tmp->first_child;
-      }
-   return post_order_iterator(tmp);
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::post_order_iterator tree<T, tree_node_allocator>::end_post() const
-   {
-   return post_order_iterator(feet);
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::fixed_depth_iterator tree<T, tree_node_allocator>::begin_fixed(const iterator_base& pos, unsigned int dp) const
-   {
-   tree_node *tmp=pos.node;
-   unsigned int curdepth=0;
-   while(curdepth<dp) { // go down one level
-      while(tmp->first_child==0) {
-         tmp=tmp->next_sibling;
-         if(tmp==0)
-            throw std::range_error("tree: begin_fixed out of range");
-         }
-      tmp=tmp->first_child;
-      ++curdepth;
-      }
-   return tmp;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::fixed_depth_iterator tree<T, tree_node_allocator>::end_fixed(const iterator_base& pos, unsigned int dp) const
-   {
-   assert(1==0); // FIXME: not correct yet
-   tree_node *tmp=pos.node;
-   unsigned int curdepth=1;
-   while(curdepth<dp) { // go down one level
-      while(tmp->first_child==0) {
-         tmp=tmp->next_sibling;
-         if(tmp==0)
-            throw std::range_error("tree: end_fixed out of range");
-         }
-      tmp=tmp->first_child;
-      ++curdepth;
-      }
-   return tmp;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::begin(const iterator_base& pos) const
-   {
-   assert(pos.node!=0);
-   if(pos.node->first_child==0) {
-      return end(pos);
-      }
-   return pos.node->first_child;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::end(const iterator_base& pos) const
-   {
-   sibling_iterator ret(0);
-   ret.parent_=pos.node;
-   return ret;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::leaf_iterator tree<T, tree_node_allocator>::begin_leaf() const
-   {
-   tree_node *tmp=head->next_sibling;
-   if(tmp!=feet) {
-      while(tmp->first_child)
-         tmp=tmp->first_child;
-      }
-   return leaf_iterator(tmp);
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::leaf_iterator tree<T, tree_node_allocator>::end_leaf() const
-   {
-   return leaf_iterator(feet);
-   }
-
-template <class T, class tree_node_allocator>
-template <typename iter>
-iter tree<T, tree_node_allocator>::parent(iter position) 
-   {
-   assert(position.node!=0);
-   return iter(position.node->parent);
-   }
-
-template <class T, class tree_node_allocator>
-template <typename iter>
-iter tree<T, tree_node_allocator>::previous_sibling(iter position) const
-   {
-   assert(position.node!=0);
-   iter ret(position);
-   ret.node=position.node->prev_sibling;
-   return ret;
-   }
-
-template <class T, class tree_node_allocator>
-template <typename iter>
-iter tree<T, tree_node_allocator>::next_sibling(iter position) const
-   {
-   assert(position.node!=0);
-   iter ret(position);
-   ret.node=position.node->next_sibling;
-   return ret;
-   }
-
-template <class T, class tree_node_allocator>
-template <typename iter>
-iter tree<T, tree_node_allocator>::next_at_same_depth(iter position) const
-   {
-   assert(position.node!=0);
-   iter ret(position);
-
-   if(position.node->next_sibling) {
-      ret.node=position.node->next_sibling;
-      }
-   else { 
-      int relative_depth=0;
-      upper:
-      do {
-         ret.node=ret.node->parent;
-         if(ret.node==0) return ret;
-         --relative_depth;
-         } while(ret.node->next_sibling==0);
-      lower:
-      ret.node=ret.node->next_sibling;
-      while(ret.node->first_child==0) {
-         if(ret.node->next_sibling==0)
-            goto upper;
-         ret.node=ret.node->next_sibling;
-         if(ret.node==0) return ret;
-         }
-      while(relative_depth<0 && ret.node->first_child!=0) {
-         ret.node=ret.node->first_child;
-         ++relative_depth;
-         }
-      if(relative_depth<0) {
-         if(ret.node->next_sibling==0) goto upper;
-         else                          goto lower;
-         }
-      }
-   return ret;
-   }
-
-template <class T, class tree_node_allocator>
-template <typename iter>
-iter tree<T, tree_node_allocator>::append_child(iter position)
-   {
-   assert(position.node!=head);
-   assert(position.node);
-
-   tree_node *tmp=alloc_.allocate(1,0);
-   kp::constructor(&tmp->data);
-   tmp->first_child=0;
-   tmp->last_child=0;
-
-   tmp->parent=position.node;
-   if(position.node->last_child!=0) {
-      position.node->last_child->next_sibling=tmp;
-      }
-   else {
-      position.node->first_child=tmp;
-      }
-   tmp->prev_sibling=position.node->last_child;
-   position.node->last_child=tmp;
-   tmp->next_sibling=0;
-   return tmp;
-   }
-
-template <class T, class tree_node_allocator>
-template <typename iter>
-iter tree<T, tree_node_allocator>::prepend_child(iter position)
-   {
-   assert(position.node!=head);
-   assert(position.node);
-
-   tree_node *tmp=alloc_.allocate(1,0);
-   kp::constructor(&tmp->data);
-   tmp->first_child=0;
-   tmp->last_child=0;
-
-   tmp->parent=position.node;
-   if(position.node->first_child!=0) {
-      position.node->first_child->prev_sibling=tmp;
-      }
-   else {
-      position.node->last_child=tmp;
-      }
-   tmp->next_sibling=position.node->first_child;
-   position.node->prev_child=tmp;
-   tmp->prev_sibling=0;
-   return tmp;
-   }
-
-template <class T, class tree_node_allocator>
-template <class iter>
-iter tree<T, tree_node_allocator>::append_child(iter position, const T& x)
-   {
-   // If your program fails here you probably used 'append_child' to add the top
-   // node to an empty tree. From version 1.45 the top element should be added
-   // using 'insert'. See the documentation for further information, and sorry about
-   // the API change.
-   assert(position.node!=head);
-   assert(position.node);
-
-   tree_node* tmp = alloc_.allocate(1,0);
-   kp::constructor(&tmp->data, x);
-   tmp->first_child=0;
-   tmp->last_child=0;
-
-   tmp->parent=position.node;
-   if(position.node->last_child!=0) {
-      position.node->last_child->next_sibling=tmp;
-      }
-   else {
-      position.node->first_child=tmp;
-      }
-   tmp->prev_sibling=position.node->last_child;
-   position.node->last_child=tmp;
-   tmp->next_sibling=0;
-   return tmp;
-   }
-
-template <class T, class tree_node_allocator>
-template <class iter>
-iter tree<T, tree_node_allocator>::prepend_child(iter position, const T& x)
-   {
-   assert(position.node!=head);
-   assert(position.node);
-
-   tree_node* tmp = alloc_.allocate(1,0);
-   kp::constructor(&tmp->data, x);
-   tmp->first_child=0;
-   tmp->last_child=0;
-
-   tmp->parent=position.node;
-   if(position.node->first_child!=0) {
-      position.node->first_child->prev_sibling=tmp;
-      }
-   else {
-      position.node->last_child=tmp;
-      }
-   tmp->next_sibling=position.node->first_child;
-   position.node->first_child=tmp;
-   tmp->prev_sibling=0;
-   return tmp;
-   }
-
-template <class T, class tree_node_allocator>
-template <class iter>
-iter tree<T, tree_node_allocator>::append_child(iter position, iter other)
-   {
-   assert(position.node!=head);
-   assert(position.node);
-
-   sibling_iterator aargh=append_child(position, value_type());
-   return replace(aargh, other);
-   }
-
-template <class T, class tree_node_allocator>
-template <class iter>
-iter tree<T, tree_node_allocator>::prepend_child(iter position, iter other)
-   {
-   assert(position.node!=head);
-   assert(position.node);
-
-   sibling_iterator aargh=prepend_child(position, value_type());
-   return replace(aargh, other);
-   }
-
-template <class T, class tree_node_allocator>
-template <class iter>
-iter tree<T, tree_node_allocator>::append_children(iter position, sibling_iterator from, sibling_iterator to)
-   {
-   assert(position.node!=head);
-   assert(position.node);
-
-   iter ret=from;
-
-   while(from!=to) {
-      insert_subtree(position.end(), from);
-      ++from;
-      }
-   return ret;
-   }
-
-template <class T, class tree_node_allocator>
-template <class iter>
-iter tree<T, tree_node_allocator>::prepend_children(iter position, sibling_iterator from, sibling_iterator to)
-   {
-   assert(position.node!=head);
-   assert(position.node);
-
-   iter ret=from;
-
-   while(from!=to) {
-      insert_subtree(position.begin(), from);
-      ++from;
-      }
-   return ret;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::pre_order_iterator tree<T, tree_node_allocator>::set_head(const T& x)
-   {
-   assert(head->next_sibling==feet);
-   return insert(iterator(feet), x);
-   }
-
-template <class T, class tree_node_allocator>
-template <class iter>
-iter tree<T, tree_node_allocator>::insert(iter position, const T& x)
-   {
-   if(position.node==0) {
-      position.node=feet; // Backward compatibility: when calling insert on a null node,
-                          // insert before the feet.
-      }
-   tree_node* tmp = alloc_.allocate(1,0);
-   kp::constructor(&tmp->data, x);
-   tmp->first_child=0;
-   tmp->last_child=0;
-
-   tmp->parent=position.node->parent;
-   tmp->next_sibling=position.node;
-   tmp->prev_sibling=position.node->prev_sibling;
-   position.node->prev_sibling=tmp;
-
-   if(tmp->prev_sibling==0) {
-      if(tmp->parent) // when inserting nodes at the head, there is no parent
-         tmp->parent->first_child=tmp;
-      }
-   else
-      tmp->prev_sibling->next_sibling=tmp;
-   return tmp;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::insert(sibling_iterator position, const T& x)
-   {
-   tree_node* tmp = alloc_.allocate(1,0);
-   kp::constructor(&tmp->data, x);
-   tmp->first_child=0;
-   tmp->last_child=0;
-
-   tmp->next_sibling=position.node;
-   if(position.node==0) { // iterator points to end of a subtree
-      tmp->parent=position.parent_;
-      tmp->prev_sibling=position.range_last();
-      tmp->parent->last_child=tmp;
-      }
-   else {
-      tmp->parent=position.node->parent;
-      tmp->prev_sibling=position.node->prev_sibling;
-      position.node->prev_sibling=tmp;
-      }
-
-   if(tmp->prev_sibling==0) {
-      if(tmp->parent) // when inserting nodes at the head, there is no parent
-         tmp->parent->first_child=tmp;
-      }
-   else
-      tmp->prev_sibling->next_sibling=tmp;
-   return tmp;
-   }
-
-template <class T, class tree_node_allocator>
-template <class iter>
-iter tree<T, tree_node_allocator>::insert_after(iter position, const T& x)
-   {
-   tree_node* tmp = alloc_.allocate(1,0);
-   kp::constructor(&tmp->data, x);
-   tmp->first_child=0;
-   tmp->last_child=0;
-
-   tmp->parent=position.node->parent;
-   tmp->prev_sibling=position.node;
-   tmp->next_sibling=position.node->next_sibling;
-   position.node->next_sibling=tmp;
-
-   if(tmp->next_sibling==0) {
-      if(tmp->parent) // when inserting nodes at the head, there is no parent
-         tmp->parent->last_child=tmp;
-      }
-   else {
-      tmp->next_sibling->prev_sibling=tmp;
-      }
-   return tmp;
-   }
-
-template <class T, class tree_node_allocator>
-template <class iter>
-iter tree<T, tree_node_allocator>::insert_subtree(iter position, const iterator_base& subtree)
-   {
-   // insert dummy
-   iter it=insert(position, value_type());
-   // replace dummy with subtree
-   return replace(it, subtree);
-   }
-
-template <class T, class tree_node_allocator>
-template <class iter>
-iter tree<T, tree_node_allocator>::insert_subtree_after(iter position, const iterator_base& subtree)
-   {
-   // insert dummy
-   iter it=insert_after(position, value_type());
-   // replace dummy with subtree
-   return replace(it, subtree);
-   }
-
-// template <class T, class tree_node_allocator>
-// template <class iter>
-// iter tree<T, tree_node_allocator>::insert_subtree(sibling_iterator position, iter subtree)
-//    {
-//    // insert dummy
-//    iter it(insert(position, value_type()));
-//    // replace dummy with subtree
-//    return replace(it, subtree);
-//    }
-
-template <class T, class tree_node_allocator>
-template <class iter>
-iter tree<T, tree_node_allocator>::replace(iter position, const T& x)
-   {
-   kp::destructor(&position.node->data);
-   kp::constructor(&position.node->data, x);
-   return position;
-   }
-
-template <class T, class tree_node_allocator>
-template <class iter>
-iter tree<T, tree_node_allocator>::replace(iter position, const iterator_base& from)
-   {
-   assert(position.node!=head);
-   tree_node *current_from=from.node;
-   tree_node *start_from=from.node;
-   tree_node *current_to  =position.node;
-
-   // replace the node at position with head of the replacement tree at from
-// std::cout << "warning!" << position.node << std::endl;
-   erase_children(position);  
-// std::cout << "no warning!" << std::endl;
-   tree_node* tmp = alloc_.allocate(1,0);
-   kp::constructor(&tmp->data, (*from));
-   tmp->first_child=0;
-   tmp->last_child=0;
-   if(current_to->prev_sibling==0) {
-      if(current_to->parent!=0)
-         current_to->parent->first_child=tmp;
-      }
-   else {
-      current_to->prev_sibling->next_sibling=tmp;
-      }
-   tmp->prev_sibling=current_to->prev_sibling;
-   if(current_to->next_sibling==0) {
-      if(current_to->parent!=0)
-         current_to->parent->last_child=tmp;
-      }
-   else {
-      current_to->next_sibling->prev_sibling=tmp;
-      }
-   tmp->next_sibling=current_to->next_sibling;
-   tmp->parent=current_to->parent;
-   kp::destructor(&current_to->data);
-   alloc_.deallocate(current_to,1);
-   current_to=tmp;
-   
-   // only at this stage can we fix 'last'
-   tree_node *last=from.node->next_sibling;
-
-   pre_order_iterator toit=tmp;
-   // copy all children
-   do {
-      assert(current_from!=0);
-      if(current_from->first_child != 0) {
-         current_from=current_from->first_child;
-         toit=append_child(toit, current_from->data);
-         }
-      else {
-         while(current_from->next_sibling==0 && current_from!=start_from) {
-            current_from=current_from->parent;
-            toit=parent(toit);
-            assert(current_from!=0);
-            }
-         current_from=current_from->next_sibling;
-         if(current_from!=last) {
-            toit=append_child(parent(toit), current_from->data);
-            }
-         }
-      } while(current_from!=last);
-
-   return current_to;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::replace(
-   sibling_iterator orig_begin, 
-   sibling_iterator orig_end, 
-   sibling_iterator new_begin, 
-   sibling_iterator new_end)
-   {
-   tree_node *orig_first=orig_begin.node;
-   tree_node *new_first=new_begin.node;
-   tree_node *orig_last=orig_first;
-   while((++orig_begin)!=orig_end)
-      orig_last=orig_last->next_sibling;
-   tree_node *new_last=new_first;
-   while((++new_begin)!=new_end)
-      new_last=new_last->next_sibling;
-
-   // insert all siblings in new_first..new_last before orig_first
-   bool first=true;
-   pre_order_iterator ret;
-   while(1==1) {
-      pre_order_iterator tt=insert_subtree(pre_order_iterator(orig_first), pre_order_iterator(new_first));
-      if(first) {
-         ret=tt;
-         first=false;
-         }
-      if(new_first==new_last)
-         break;
-      new_first=new_first->next_sibling;
-      }
-
-   // erase old range of siblings
-   bool last=false;
-   tree_node *next=orig_first;
-   while(1==1) {
-      if(next==orig_last) 
-         last=true;
-      next=next->next_sibling;
-      erase((pre_order_iterator)orig_first);
-      if(last) 
-         break;
-      orig_first=next;
-      }
-   return ret;
-   }
-
-template <class T, class tree_node_allocator>
-template <typename iter>
-iter tree<T, tree_node_allocator>::flatten(iter position)
-   {
-   if(position.node->first_child==0)
-      return position;
-
-   tree_node *tmp=position.node->first_child;
-   while(tmp) {
-      tmp->parent=position.node->parent;
-      tmp=tmp->next_sibling;
-      } 
-   if(position.node->next_sibling) {
-      position.node->last_child->next_sibling=position.node->next_sibling;
-      position.node->next_sibling->prev_sibling=position.node->last_child;
-      }
-   else {
-      position.node->parent->last_child=position.node->last_child;
-      }
-   position.node->next_sibling=position.node->first_child;
-   position.node->next_sibling->prev_sibling=position.node;
-   position.node->first_child=0;
-   position.node->last_child=0;
-
-   return position;
-   }
-
-
-template <class T, class tree_node_allocator>
-template <typename iter>
-iter tree<T, tree_node_allocator>::reparent(iter position, sibling_iterator begin, sibling_iterator end)
-   {
-   tree_node *first=begin.node;
-   tree_node *last=first;
-
-   assert(first!=position.node);
-   
-   if(begin==end) return begin;
-   // determine last node
-   while((++begin)!=end) {
-      last=last->next_sibling;
-      }
-   // move subtree
-   if(first->prev_sibling==0) {
-      first->parent->first_child=last->next_sibling;
-      }
-   else {
-      first->prev_sibling->next_sibling=last->next_sibling;
-      }
-   if(last->next_sibling==0) {
-      last->parent->last_child=first->prev_sibling;
-      }
-   else {
-      last->next_sibling->prev_sibling=first->prev_sibling;
-      }
-   if(position.node->first_child==0) {
-      position.node->first_child=first;
-      position.node->last_child=last;
-      first->prev_sibling=0;
-      }
-   else {
-      position.node->last_child->next_sibling=first;
-      first->prev_sibling=position.node->last_child;
-      position.node->last_child=last;
-      }
-   last->next_sibling=0;
-
-   tree_node *pos=first;
-   while(1==1) {
-      pos->parent=position.node;
-      if(pos==last) break;
-      pos=pos->next_sibling;
-      }
-
-   return first;
-   }
-
-template <class T, class tree_node_allocator>
-template <typename iter> iter tree<T, tree_node_allocator>::reparent(iter position, iter from)
-   {
-   if(from.node->first_child==0) return position;
-   return reparent(position, from.node->first_child, end(from));
-   }
-
-template <class T, class tree_node_allocator>
-template <typename iter> iter tree<T, tree_node_allocator>::wrap(iter position, const T& x)
-   {
-   assert(position.node!=0);
-   sibling_iterator fr=position, to=position;
-   ++to;
-   iter ret = insert(position, x);
-   reparent(ret, fr, to);
-   return ret;
-   }
-
-template <class T, class tree_node_allocator>
-template <typename iter> iter tree<T, tree_node_allocator>::move_after(iter target, iter source)
-   {
-   tree_node *dst=target.node;
-   tree_node *src=source.node;
-   assert(dst);
-   assert(src);
-
-   if(dst==src) return source;
-   if(dst->next_sibling)
-      if(dst->next_sibling==src) // already in the right spot
-         return source;
-
-   // take src out of the tree
-   if(src->prev_sibling!=0) src->prev_sibling->next_sibling=src->next_sibling;
-   else                     src->parent->first_child=src->next_sibling;
-   if(src->next_sibling!=0) src->next_sibling->prev_sibling=src->prev_sibling;
-   else                     src->parent->last_child=src->prev_sibling;
-
-   // connect it to the new point
-   if(dst->next_sibling!=0) dst->next_sibling->prev_sibling=src;
-   else                     dst->parent->last_child=src;
-   src->next_sibling=dst->next_sibling;
-   dst->next_sibling=src;
-   src->prev_sibling=dst;
-   src->parent=dst->parent;
-   return src;
-   }
-
-template <class T, class tree_node_allocator>
-template <typename iter> iter tree<T, tree_node_allocator>::move_before(iter target, iter source)
-   {
-   tree_node *dst=target.node;
-   tree_node *src=source.node;
-   assert(dst);
-   assert(src);
-
-   if(dst==src) return source;
-   if(dst->prev_sibling)
-      if(dst->prev_sibling==src) // already in the right spot
-         return source;
-
-   // take src out of the tree
-   if(src->prev_sibling!=0) src->prev_sibling->next_sibling=src->next_sibling;
-   else                     src->parent->first_child=src->next_sibling;
-   if(src->next_sibling!=0) src->next_sibling->prev_sibling=src->prev_sibling;
-   else                     src->parent->last_child=src->prev_sibling;
-
-   // connect it to the new point
-   if(dst->prev_sibling!=0) dst->prev_sibling->next_sibling=src;
-   else                     dst->parent->first_child=src;
-   src->prev_sibling=dst->prev_sibling;
-   dst->prev_sibling=src;
-   src->next_sibling=dst;
-   src->parent=dst->parent;
-   return src;
-   }
-
-// specialisation for sibling_iterators
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::move_before(sibling_iterator target, 
-                                                                                         sibling_iterator source)
-   {
-   tree_node *dst=target.node;
-   tree_node *src=source.node;
-   tree_node *dst_prev_sibling;
-   if(dst==0) { // must then be an end iterator
-      dst_prev_sibling=target.parent_->last_child;
-      assert(dst_prev_sibling);
-      }
-   else dst_prev_sibling=dst->prev_sibling;
-   assert(src);
-
-   if(dst==src) return source;
-   if(dst_prev_sibling)
-      if(dst_prev_sibling==src) // already in the right spot
-         return source;
-
-   // take src out of the tree
-   if(src->prev_sibling!=0) src->prev_sibling->next_sibling=src->next_sibling;
-   else                     src->parent->first_child=src->next_sibling;
-   if(src->next_sibling!=0) src->next_sibling->prev_sibling=src->prev_sibling;
-   else                     src->parent->last_child=src->prev_sibling;
-
-   // connect it to the new point
-   if(dst_prev_sibling!=0) dst_prev_sibling->next_sibling=src;
-   else                    target.parent_->first_child=src;
-   src->prev_sibling=dst_prev_sibling;
-   if(dst) {
-      dst->prev_sibling=src;
-      src->parent=dst->parent;
-      }
-   src->next_sibling=dst;
-   return src;
-   }
-
-template <class T, class tree_node_allocator>
-template <typename iter> iter tree<T, tree_node_allocator>::move_ontop(iter target, iter source)
-   {
-   tree_node *dst=target.node;
-   tree_node *src=source.node;
-   assert(dst);
-   assert(src);
-
-   if(dst==src) return source;
-
-   // remember connection points
-   tree_node *b_prev_sibling=dst->prev_sibling;
-   tree_node *b_next_sibling=dst->next_sibling;
-   tree_node *b_parent=dst->parent;
-
-   // remove target
-   erase(target);
-
-   // take src out of the tree
-   if(src->prev_sibling!=0) src->prev_sibling->next_sibling=src->next_sibling;
-   else                     src->parent->first_child=src->next_sibling;
-   if(src->next_sibling!=0) src->next_sibling->prev_sibling=src->prev_sibling;
-   else                     src->parent->last_child=src->prev_sibling;
-
-   // connect it to the new point
-   if(b_prev_sibling!=0) b_prev_sibling->next_sibling=src;
-   else                  b_parent->first_child=src;
-   if(b_next_sibling!=0) b_next_sibling->prev_sibling=src;
-   else                  b_parent->last_child=src;
-   src->prev_sibling=b_prev_sibling;
-   src->next_sibling=b_next_sibling;
-   src->parent=b_parent;
-   return src;
-   }
-
-template <class T, class tree_node_allocator>
-void tree<T, tree_node_allocator>::merge(sibling_iterator to1,   sibling_iterator to2,
-                                          sibling_iterator from1, sibling_iterator from2,
-                                          bool duplicate_leaves)
-   {
-   sibling_iterator fnd;
-   while(from1!=from2) {
-      if((fnd=std::find(to1, to2, (*from1))) != to2) { // element found
-         if(from1.begin()==from1.end()) { // full depth reached
-            if(duplicate_leaves)
-               append_child(parent(to1), (*from1));
-            }
-         else { // descend further
-            merge(fnd.begin(), fnd.end(), from1.begin(), from1.end(), duplicate_leaves);
-            }
-         }
-      else { // element missing
-         insert_subtree(to2, from1);
-         }
-      ++from1;
-      }
-   }
-
-
-template <class T, class tree_node_allocator>
-void tree<T, tree_node_allocator>::sort(sibling_iterator from, sibling_iterator to, bool deep)
-   {
-   std::less<T> comp;
-   sort(from, to, comp, deep);
-   }
-
-template <class T, class tree_node_allocator>
-template <class StrictWeakOrdering>
-void tree<T, tree_node_allocator>::sort(sibling_iterator from, sibling_iterator to, 
-                                        StrictWeakOrdering comp, bool deep)
-   {
-   if(from==to) return;
-   // make list of sorted nodes
-   // CHECK: if multiset stores equivalent nodes in the order in which they
-   // are inserted, then this routine should be called 'stable_sort'.
-   std::multiset<tree_node *, compare_nodes<StrictWeakOrdering> > nodes(comp);
-   sibling_iterator it=from, it2=to;
-   while(it != to) {
-      nodes.insert(it.node);
-      ++it;
-      }
-   // reassemble
-   --it2;
-
-   // prev and next are the nodes before and after the sorted range
-   tree_node *prev=from.node->prev_sibling;
-   tree_node *next=it2.node->next_sibling;
-   typename std::multiset<tree_node *, compare_nodes<StrictWeakOrdering> >::iterator nit=nodes.begin(), eit=nodes.end();
-   if(prev==0) {
-      if((*nit)->parent!=0) // to catch "sorting the head" situations, when there is no parent
-         (*nit)->parent->first_child=(*nit);
-      }
-   else prev->next_sibling=(*nit);
-
-   --eit;
-   while(nit!=eit) {
-      (*nit)->prev_sibling=prev;
-      if(prev)
-         prev->next_sibling=(*nit);
-      prev=(*nit);
-      ++nit;
-      }
-   // prev now points to the last-but-one node in the sorted range
-   if(prev)
-      prev->next_sibling=(*eit);
-
-   // eit points to the last node in the sorted range.
-   (*eit)->next_sibling=next;
-   (*eit)->prev_sibling=prev; // missed in the loop above
-   if(next==0) {
-      if((*eit)->parent!=0) // to catch "sorting the head" situations, when there is no parent
-         (*eit)->parent->last_child=(*eit);
-      }
-   else next->prev_sibling=(*eit);
-
-   if(deep) {  // sort the children of each node too
-      sibling_iterator bcs(*nodes.begin());
-      sibling_iterator ecs(*eit);
-      ++ecs;
-      while(bcs!=ecs) {
-         sort(begin(bcs), end(bcs), comp, deep);
-         ++bcs;
-         }
-      }
-   }
-
-template <class T, class tree_node_allocator>
-template <typename iter>
-bool tree<T, tree_node_allocator>::equal(const iter& one_, const iter& two, const iter& three_) const
-   {
-   std::equal_to<T> comp;
-   return equal(one_, two, three_, comp);
-   }
-
-template <class T, class tree_node_allocator>
-template <typename iter>
-bool tree<T, tree_node_allocator>::equal_subtree(const iter& one_, const iter& two_) const
-   {
-   std::equal_to<T> comp;
-   return equal_subtree(one_, two_, comp);
-   }
-
-template <class T, class tree_node_allocator>
-template <typename iter, class BinaryPredicate>
-bool tree<T, tree_node_allocator>::equal(const iter& one_, const iter& two, const iter& three_, BinaryPredicate fun) const
-   {
-   pre_order_iterator one(one_), three(three_);
-
-// if(one==two && is_valid(three) && three.number_of_children()!=0)
-//    return false;
-   while(one!=two && is_valid(three)) {
-      if(!fun(*one,*three))
-         return false;
-      if(one.number_of_children()!=three.number_of_children()) 
-         return false;
-      ++one;
-      ++three;
-      }
-   return true;
-   }
-
-template <class T, class tree_node_allocator>
-template <typename iter, class BinaryPredicate>
-bool tree<T, tree_node_allocator>::equal_subtree(const iter& one_, const iter& two_, BinaryPredicate fun) const
-   {
-   pre_order_iterator one(one_), two(two_);
-
-   if(!fun(*one,*two)) return false;
-   if(number_of_children(one)!=number_of_children(two)) return false;
-   return equal(begin(one),end(one),begin(two),fun);
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator> tree<T, tree_node_allocator>::subtree(sibling_iterator from, sibling_iterator to) const
-   {
-   tree tmp;
-   tmp.set_head(value_type());
-   tmp.replace(tmp.begin(), tmp.end(), from, to);
-   return tmp;
-   }
-
-template <class T, class tree_node_allocator>
-void tree<T, tree_node_allocator>::subtree(tree& tmp, sibling_iterator from, sibling_iterator to) const
-   {
-   tmp.set_head(value_type());
-   tmp.replace(tmp.begin(), tmp.end(), from, to);
-   }
-
-template <class T, class tree_node_allocator>
-int tree<T, tree_node_allocator>::size() const
-   {
-   int i=0;
-   pre_order_iterator it=begin(), eit=end();
-   while(it!=eit) {
-      ++i;
-      ++it;
-      }
-   return i;
-   }
-
-template <class T, class tree_node_allocator>
-int tree<T, tree_node_allocator>::size(const iterator_base& top) const
-   {
-   int i=0;
-   pre_order_iterator it=top, eit=top;
-   eit.skip_children();
-   ++eit;
-   while(it!=eit) {
-      ++i;
-      ++it;
-      }
-   return i;
-   }
-
-template <class T, class tree_node_allocator>
-bool tree<T, tree_node_allocator>::empty() const
-   {
-   pre_order_iterator it=begin(), eit=end();
-   return (it==eit);
-   }
-
-template <class T, class tree_node_allocator>
-int tree<T, tree_node_allocator>::depth(const iterator_base& it) const
-   {
-   tree_node* pos=it.node;
-   assert(pos!=0);
-   int ret=0;
-   while(pos->parent!=0) {
-      pos=pos->parent;
-      ++ret;
-      }
-   return ret;
-   }
-
-template <class T, class tree_node_allocator>
-unsigned int tree<T, tree_node_allocator>::number_of_children(const iterator_base& it) 
-   {
-   tree_node *pos=it.node->first_child;
-   if(pos==0) return 0;
-   
-   unsigned int ret=1;
-//   while(pos!=it.node->last_child) {
-//      ++ret;
-//      pos=pos->next_sibling;
-//      }
-   while((pos=pos->next_sibling))
-      ++ret;
-   return ret;
-   }
-
-template <class T, class tree_node_allocator>
-unsigned int tree<T, tree_node_allocator>::number_of_siblings(const iterator_base& it) const
-   {
-   tree_node *pos=it.node;
-   unsigned int ret=0;
-   // count forward
-   while(pos->next_sibling && 
-         pos->next_sibling!=head &&
-         pos->next_sibling!=feet) {
-      ++ret;
-      pos=pos->next_sibling;
-      }
-   // count backward
-   pos=it.node;
-   while(pos->prev_sibling && 
-         pos->prev_sibling!=head &&
-         pos->prev_sibling!=feet) {
-      ++ret;
-      pos=pos->prev_sibling;
-      }
-   
-   return ret;
-   }
-
-template <class T, class tree_node_allocator>
-void tree<T, tree_node_allocator>::swap(sibling_iterator it)
-   {
-   tree_node *nxt=it.node->next_sibling;
-   if(nxt) {
-      if(it.node->prev_sibling)
-         it.node->prev_sibling->next_sibling=nxt;
-      else
-         it.node->parent->first_child=nxt;
-      nxt->prev_sibling=it.node->prev_sibling;
-      tree_node *nxtnxt=nxt->next_sibling;
-      if(nxtnxt)
-         nxtnxt->prev_sibling=it.node;
-      else
-         it.node->parent->last_child=it.node;
-      nxt->next_sibling=it.node;
-      it.node->prev_sibling=nxt;
-      it.node->next_sibling=nxtnxt;
-      }
-   }
-
-template <class T, class tree_node_allocator>
-void tree<T, tree_node_allocator>::swap(iterator one, iterator two)
-   {
-   // if one and two are adjacent siblings, use the sibling swap
-   if(one.node->next_sibling==two.node) swap(one);
-   else if(two.node->next_sibling==one.node) swap(two);
-   else {
-      tree_node *nxt1=one.node->next_sibling;
-      tree_node *nxt2=two.node->next_sibling;
-      tree_node *pre1=one.node->prev_sibling;
-      tree_node *pre2=two.node->prev_sibling;
-      tree_node *par1=one.node->parent;
-      tree_node *par2=two.node->parent;
-
-      // reconnect
-      one.node->parent=par2;
-      one.node->next_sibling=nxt2;
-      if(nxt2) nxt2->prev_sibling=one.node;
-      else     par2->last_child=one.node;
-      one.node->prev_sibling=pre2;
-      if(pre2) pre2->next_sibling=one.node;
-      else     par2->first_child=one.node;    
-
-      two.node->parent=par1;
-      two.node->next_sibling=nxt1;
-      if(nxt1) nxt1->prev_sibling=two.node;
-      else     par1->last_child=two.node;
-      two.node->prev_sibling=pre1;
-      if(pre1) pre1->next_sibling=two.node;
-      else     par1->first_child=two.node;
-      }
-   }
-
-// template <class BinaryPredicate>
-// tree<T, tree_node_allocator>::iterator tree<T, tree_node_allocator>::find_subtree(
-//    sibling_iterator subfrom, sibling_iterator subto, iterator from, iterator to, 
-//    BinaryPredicate fun) const
-//    {
-//    assert(1==0); // this routine is not finished yet.
-//    while(from!=to) {
-//       if(fun(*subfrom, *from)) {
-//          
-//          }
-//       }
-//    return to;
-//    }
-
-template <class T, class tree_node_allocator>
-bool tree<T, tree_node_allocator>::is_in_subtree(const iterator_base& it, const iterator_base& begin, 
-                                                 const iterator_base& end) const
-   {
-   // FIXME: this should be optimised.
-   pre_order_iterator tmp=begin;
-   while(tmp!=end) {
-      if(tmp==it) return true;
-      ++tmp;
-      }
-   return false;
-   }
-
-template <class T, class tree_node_allocator>
-bool tree<T, tree_node_allocator>::is_valid(const iterator_base& it) const
-   {
-   if(it.node==0 || it.node==feet || it.node==head) return false;
-   else return true;
-   }
-
-template <class T, class tree_node_allocator>
-unsigned int tree<T, tree_node_allocator>::index(sibling_iterator it) const
-   {
-   unsigned int ind=0;
-   if(it.node->parent==0) {
-      while(it.node->prev_sibling!=head) {
-         it.node=it.node->prev_sibling;
-         ++ind;
-         }
-      }
-   else {
-      while(it.node->prev_sibling!=0) {
-         it.node=it.node->prev_sibling;
-         ++ind;
-         }
-      }
-   return ind;
-   }
-
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::child(const iterator_base& it, unsigned int num) const
-   {
-   tree_node *tmp=it.node->first_child;
-   while(num--) {
-      assert(tmp!=0);
-      tmp=tmp->next_sibling;
-      }
-   return tmp;
-   }
-
-
-
-
-// Iterator base
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::iterator_base::iterator_base()
-   : node(0), skip_current_children_(false)
-   {
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::iterator_base::iterator_base(tree_node *tn)
-   : node(tn), skip_current_children_(false)
-   {
-   }
-
-template <class T, class tree_node_allocator>
-T& tree<T, tree_node_allocator>::iterator_base::operator*() const
-   {
-   return node->data;
-   }
-
-template <class T, class tree_node_allocator>
-T* tree<T, tree_node_allocator>::iterator_base::operator->() const
-   {
-   return &(node->data);
-   }
-
-template <class T, class tree_node_allocator>
-bool tree<T, tree_node_allocator>::post_order_iterator::operator!=(const post_order_iterator& other) const
-   {
-   if(other.node!=this->node) return true;
-   else return false;
-   }
-
-template <class T, class tree_node_allocator>
-bool tree<T, tree_node_allocator>::post_order_iterator::operator==(const post_order_iterator& other) const
-   {
-   if(other.node==this->node) return true;
-   else return false;
-   }
-
-template <class T, class tree_node_allocator>
-bool tree<T, tree_node_allocator>::pre_order_iterator::operator!=(const pre_order_iterator& other) const
-   {
-   if(other.node!=this->node) return true;
-   else return false;
-   }
-
-template <class T, class tree_node_allocator>
-bool tree<T, tree_node_allocator>::pre_order_iterator::operator==(const pre_order_iterator& other) const
-   {
-   if(other.node==this->node) return true;
-   else return false;
-   }
-
-template <class T, class tree_node_allocator>
-bool tree<T, tree_node_allocator>::sibling_iterator::operator!=(const sibling_iterator& other) const
-   {
-   if(other.node!=this->node) return true;
-   else return false;
-   }
-
-template <class T, class tree_node_allocator>
-bool tree<T, tree_node_allocator>::sibling_iterator::operator==(const sibling_iterator& other) const
-   {
-   if(other.node==this->node) return true;
-   else return false;
-   }
-
-template <class T, class tree_node_allocator>
-bool tree<T, tree_node_allocator>::leaf_iterator::operator!=(const leaf_iterator& other) const
-   {
-   if(other.node!=this->node) return true;
-   else return false;
-   }
-
-template <class T, class tree_node_allocator>
-bool tree<T, tree_node_allocator>::leaf_iterator::operator==(const leaf_iterator& other) const
-   {
-   if(other.node==this->node) return true;
-   else return false;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::iterator_base::begin() const
-   {
-   if(node->first_child==0) 
-      return end();
-
-   sibling_iterator ret(node->first_child);
-   ret.parent_=this->node;
-   return ret;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::iterator_base::end() const
-   {
-   sibling_iterator ret(0);
-   ret.parent_=node;
-   return ret;
-   }
-
-template <class T, class tree_node_allocator>
-void tree<T, tree_node_allocator>::iterator_base::skip_children()
-   {
-   skip_current_children_=true;
-   }
-
-template <class T, class tree_node_allocator>
-unsigned int tree<T, tree_node_allocator>::iterator_base::number_of_children() const
-   {
-   tree_node *pos=node->first_child;
-   if(pos==0) return 0;
-   
-   unsigned int ret=1;
-   while(pos!=node->last_child) {
-      ++ret;
-      pos=pos->next_sibling;
-      }
-   return ret;
-   }
-
-
-
-// Pre-order iterator
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::pre_order_iterator::pre_order_iterator() 
-   : iterator_base(0)
-   {
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::pre_order_iterator::pre_order_iterator(tree_node *tn)
-   : iterator_base(tn)
-   {
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::pre_order_iterator::pre_order_iterator(const iterator_base &other)
-   : iterator_base(other.node)
-   {
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::pre_order_iterator::pre_order_iterator(const sibling_iterator& other)
-   : iterator_base(other.node)
-   {
-   if(this->node==0) {
-      if(other.range_last()!=0)
-         this->node=other.range_last();
-      else 
-         this->node=other.parent_;
-      this->skip_children();
-      ++(*this);
-      }
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::pre_order_iterator& tree<T, tree_node_allocator>::pre_order_iterator::operator++()
-   {
-   assert(this->node!=0);
-   if(!this->skip_current_children_ && this->node->first_child != 0) {
-      this->node=this->node->first_child;
-      }
-   else {
-      this->skip_current_children_=false;
-      while(this->node->next_sibling==0) {
-         this->node=this->node->parent;
-         if(this->node==0)
-            return *this;
-         }
-      this->node=this->node->next_sibling;
-      }
-   return *this;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::pre_order_iterator& tree<T, tree_node_allocator>::pre_order_iterator::operator--()
-   {
-   assert(this->node!=0);
-   if(this->node->prev_sibling) {
-      this->node=this->node->prev_sibling;
-      while(this->node->last_child)
-         this->node=this->node->last_child;
-      }
-   else {
-      this->node=this->node->parent;
-      if(this->node==0)
-         return *this;
-      }
-   return *this;
-}
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::pre_order_iterator tree<T, tree_node_allocator>::pre_order_iterator::operator++(int n)
-   {
-   pre_order_iterator copy = *this;
-   ++(*this);
-   return copy;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::pre_order_iterator tree<T, tree_node_allocator>::pre_order_iterator::operator--(int n)
-{
-  pre_order_iterator copy = *this;
-  --(*this);
-  return copy;
-}
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::pre_order_iterator& tree<T, tree_node_allocator>::pre_order_iterator::operator+=(unsigned int num)
-   {
-   while(num>0) {
-      ++(*this);
-      --num;
-      }
-   return (*this);
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::pre_order_iterator& tree<T, tree_node_allocator>::pre_order_iterator::operator-=(unsigned int num)
-   {
-   while(num>0) {
-      --(*this);
-      --num;
-      }
-   return (*this);
-   }
-
-
-
-// Post-order iterator
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::post_order_iterator::post_order_iterator() 
-   : iterator_base(0)
-   {
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::post_order_iterator::post_order_iterator(tree_node *tn)
-   : iterator_base(tn)
-   {
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::post_order_iterator::post_order_iterator(const iterator_base &other)
-   : iterator_base(other.node)
-   {
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::post_order_iterator::post_order_iterator(const sibling_iterator& other)
-   : iterator_base(other.node)
-   {
-   if(this->node==0) {
-      if(other.range_last()!=0)
-         this->node=other.range_last();
-      else 
-         this->node=other.parent_;
-      this->skip_children();
-      ++(*this);
-      }
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::post_order_iterator& tree<T, tree_node_allocator>::post_order_iterator::operator++()
-   {
-   assert(this->node!=0);
-   if(this->node->next_sibling==0) {
-      this->node=this->node->parent;
-      this->skip_current_children_=false;
-      }
-   else {
-      this->node=this->node->next_sibling;
-      if(this->skip_current_children_) {
-         this->skip_current_children_=false;
-         }
-      else {
-         while(this->node->first_child)
-            this->node=this->node->first_child;
-         }
-      }
-   return *this;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::post_order_iterator& tree<T, tree_node_allocator>::post_order_iterator::operator--()
-   {
-   assert(this->node!=0);
-   if(this->skip_current_children_ || this->node->last_child==0) {
-      this->skip_current_children_=false;
-      while(this->node->prev_sibling==0)
-         this->node=this->node->parent;
-      this->node=this->node->prev_sibling;
-      }
-   else {
-      this->node=this->node->last_child;
-      }
-   return *this;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::post_order_iterator tree<T, tree_node_allocator>::post_order_iterator::operator++(int)
-   {
-   post_order_iterator copy = *this;
-   ++(*this);
-   return copy;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::post_order_iterator tree<T, tree_node_allocator>::post_order_iterator::operator--(int)
-   {
-   post_order_iterator copy = *this;
-   --(*this);
-   return copy;
-   }
-
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::post_order_iterator& tree<T, tree_node_allocator>::post_order_iterator::operator+=(unsigned int num)
-   {
-   while(num>0) {
-      ++(*this);
-      --num;
-      }
-   return (*this);
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::post_order_iterator& tree<T, tree_node_allocator>::post_order_iterator::operator-=(unsigned int num)
-   {
-   while(num>0) {
-      --(*this);
-      --num;
-      }
-   return (*this);
-   }
-
-template <class T, class tree_node_allocator>
-void tree<T, tree_node_allocator>::post_order_iterator::descend_all()
-   {
-   assert(this->node!=0);
-   while(this->node->first_child)
-      this->node=this->node->first_child;
-   }
-
-
-// Breadth-first iterator
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::breadth_first_queued_iterator::breadth_first_queued_iterator()
-   : iterator_base()
-   {
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::breadth_first_queued_iterator::breadth_first_queued_iterator(tree_node *tn)
-   : iterator_base(tn)
-   {
-   traversal_queue.push(tn);
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::breadth_first_queued_iterator::breadth_first_queued_iterator(const iterator_base& other)
-   : iterator_base(other.node)
-   {
-   traversal_queue.push(other.node);
-   }
-
-template <class T, class tree_node_allocator>
-bool tree<T, tree_node_allocator>::breadth_first_queued_iterator::operator!=(const breadth_first_queued_iterator& other) const
-   {
-   if(other.node!=this->node) return true;
-   else return false;
-   }
-
-template <class T, class tree_node_allocator>
-bool tree<T, tree_node_allocator>::breadth_first_queued_iterator::operator==(const breadth_first_queued_iterator& other) const
-   {
-   if(other.node==this->node) return true;
-   else return false;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::breadth_first_queued_iterator& tree<T, tree_node_allocator>::breadth_first_queued_iterator::operator++()
-   {
-   assert(this->node!=0);
-
-   // Add child nodes and pop current node
-   sibling_iterator sib=this->begin();
-   while(sib!=this->end()) {
-      traversal_queue.push(sib.node);
-      ++sib;
-      }
-   traversal_queue.pop();
-   if(traversal_queue.size()>0)
-      this->node=traversal_queue.front();
-   else 
-      this->node=0;
-   return (*this);
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::breadth_first_queued_iterator tree<T, tree_node_allocator>::breadth_first_queued_iterator::operator++(int n)
-   {
-   breadth_first_queued_iterator copy = *this;
-   ++(*this);
-   return copy;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::breadth_first_queued_iterator& tree<T, tree_node_allocator>::breadth_first_queued_iterator::operator+=(unsigned int num)
-   {
-   while(num>0) {
-      ++(*this);
-      --num;
-      }
-   return (*this);
-   }
-
-
-
-// Fixed depth iterator
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::fixed_depth_iterator::fixed_depth_iterator()
-   : iterator_base()
-   {
-   set_first_parent_();
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::fixed_depth_iterator::fixed_depth_iterator(tree_node *tn)
-   : iterator_base(tn)
-   {
-   set_first_parent_();
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::fixed_depth_iterator::fixed_depth_iterator(const iterator_base& other)
-   : iterator_base(other.node)
-   {
-   set_first_parent_();
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::fixed_depth_iterator::fixed_depth_iterator(const sibling_iterator& other)
-   : iterator_base(other.node), first_parent_(other.parent_)
-   {
-   find_leftmost_parent_();
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::fixed_depth_iterator::fixed_depth_iterator(const fixed_depth_iterator& other)
-   : iterator_base(other.node), first_parent_(other.first_parent_)
-   {
-   }
-
-template <class T, class tree_node_allocator>
-bool tree<T, tree_node_allocator>::fixed_depth_iterator::operator==(const fixed_depth_iterator& other) const
-   {
-   if(other.node==this->node && other.first_parent_==first_parent_) return true;
-   else return false;
-   }
-
-template <class T, class tree_node_allocator>
-bool tree<T, tree_node_allocator>::fixed_depth_iterator::operator!=(const fixed_depth_iterator& other) const
-   {
-   if(other.node!=this->node || other.first_parent_!=first_parent_) return true;
-   else return false;
-   }
-
-template <class T, class tree_node_allocator>
-void tree<T, tree_node_allocator>::fixed_depth_iterator::set_first_parent_()
-   {
-   return; // FIXME: we do not use first_parent_ yet, and it actually needs some serious reworking if
-           // it is ever to work at the 'head' level.
-   first_parent_=0;
-   if(this->node==0) return;
-   if(this->node->parent!=0)
-      first_parent_=this->node->parent;
-   if(first_parent_)
-      find_leftmost_parent_();
-   }
-
-template <class T, class tree_node_allocator>
-void tree<T, tree_node_allocator>::fixed_depth_iterator::find_leftmost_parent_()
-   {
-   return; // FIXME: see 'set_first_parent()'
-   tree_node *tmppar=first_parent_;
-   while(tmppar->prev_sibling) {
-      tmppar=tmppar->prev_sibling;
-      if(tmppar->first_child)
-         first_parent_=tmppar;
-      }
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::fixed_depth_iterator& tree<T, tree_node_allocator>::fixed_depth_iterator::operator++()
-   {
-   assert(this->node!=0);
-
-   if(this->node->next_sibling) {
-      this->node=this->node->next_sibling;
-      }
-   else { 
-      int relative_depth=0;
-      upper:
-      do {
-         this->node=this->node->parent;
-         if(this->node==0) return *this;
-         --relative_depth;
-         } while(this->node->next_sibling==0);
-      lower:
-      this->node=this->node->next_sibling;
-      while(this->node->first_child==0) {
-         if(this->node->next_sibling==0)
-            goto upper;
-         this->node=this->node->next_sibling;
-         if(this->node==0) return *this;
-         }
-      while(relative_depth<0 && this->node->first_child!=0) {
-         this->node=this->node->first_child;
-         ++relative_depth;
-         }
-      if(relative_depth<0) {
-         if(this->node->next_sibling==0) goto upper;
-         else                          goto lower;
-         }
-      }
-   return *this;
-
-// if(this->node->next_sibling!=0) {
-//    this->node=this->node->next_sibling;
-//    assert(this->node!=0);
-//    if(this->node->parent==0 && this->node->next_sibling==0) // feet element
-//       this->node=0;
-//    }
-// else {
-//    tree_node *par=this->node->parent;
-//    do {
-//       par=par->next_sibling;
-//       if(par==0) { // FIXME: need to keep track of this!
-//          this->node=0;
-//          return *this;
-//          }
-//       } while(par->first_child==0);
-//    this->node=par->first_child;
-//    }
-   return *this;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::fixed_depth_iterator& tree<T, tree_node_allocator>::fixed_depth_iterator::operator--()
-   {
-   assert(this->node!=0);
-   if(this->node->prev_sibling!=0) {
-      this->node=this->node->prev_sibling;
-      assert(this->node!=0);
-      if(this->node->parent==0 && this->node->prev_sibling==0) // head element
-         this->node=0;
-      }
-   else {
-      tree_node *par=this->node->parent;
-      do {
-         par=par->prev_sibling;
-         if(par==0) { // FIXME: need to keep track of this!
-            this->node=0;
-            return *this;
-            }
-         } while(par->last_child==0);
-      this->node=par->last_child;
-      }
-   return *this;
-}
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::fixed_depth_iterator tree<T, tree_node_allocator>::fixed_depth_iterator::operator++(int)
-   {
-   fixed_depth_iterator copy = *this;
-   ++(*this);
-   return copy;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::fixed_depth_iterator tree<T, tree_node_allocator>::fixed_depth_iterator::operator--(int)
-{
-  fixed_depth_iterator copy = *this;
-  --(*this);
-  return copy;
-}
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::fixed_depth_iterator& tree<T, tree_node_allocator>::fixed_depth_iterator::operator-=(unsigned int num)
-   {
-   while(num>0) {
-      --(*this);
-      --(num);
-      }
-   return (*this);
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::fixed_depth_iterator& tree<T, tree_node_allocator>::fixed_depth_iterator::operator+=(unsigned int num)
-   {
-   while(num>0) {
-      ++(*this);
-      --(num);
-      }
-   return *this;
-   }
-
-// FIXME: add the other members of fixed_depth_iterator.
-
-
-// Sibling iterator
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::sibling_iterator::sibling_iterator() 
-   : iterator_base()
-   {
-   set_parent_();
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::sibling_iterator::sibling_iterator(tree_node *tn)
-   : iterator_base(tn)
-   {
-   set_parent_();
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::sibling_iterator::sibling_iterator(const iterator_base& other)
-   : iterator_base(other.node)
-   {
-   set_parent_();
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::sibling_iterator::sibling_iterator(const sibling_iterator& other)
-   : iterator_base(other), parent_(other.parent_)
-   {
-   }
-
-template <class T, class tree_node_allocator>
-void tree<T, tree_node_allocator>::sibling_iterator::set_parent_()
-   {
-   parent_=0;
-   if(this->node==0) return;
-   if(this->node->parent!=0)
-      parent_=this->node->parent;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::sibling_iterator& tree<T, tree_node_allocator>::sibling_iterator::operator++()
-   {
-   if(this->node)
-      this->node=this->node->next_sibling;
-   return *this;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::sibling_iterator& tree<T, tree_node_allocator>::sibling_iterator::operator--()
-   {
-   if(this->node) this->node=this->node->prev_sibling;
-   else {
-      assert(parent_);
-      this->node=parent_->last_child;
-      }
-   return *this;
-}
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::sibling_iterator::operator++(int)
-   {
-   sibling_iterator copy = *this;
-   ++(*this);
-   return copy;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::sibling_iterator tree<T, tree_node_allocator>::sibling_iterator::operator--(int)
-   {
-   sibling_iterator copy = *this;
-   --(*this);
-   return copy;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::sibling_iterator& tree<T, tree_node_allocator>::sibling_iterator::operator+=(unsigned int num)
-   {
-   while(num>0) {
-      ++(*this);
-      --num;
-      }
-   return (*this);
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::sibling_iterator& tree<T, tree_node_allocator>::sibling_iterator::operator-=(unsigned int num)
-   {
-   while(num>0) {
-      --(*this);
-      --num;
-      }
-   return (*this);
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::tree_node *tree<T, tree_node_allocator>::sibling_iterator::range_first() const
-   {
-   tree_node *tmp=parent_->first_child;
-   return tmp;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::tree_node *tree<T, tree_node_allocator>::sibling_iterator::range_last() const
-   {
-   return parent_->last_child;
-   }
-
-// Leaf iterator
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::leaf_iterator::leaf_iterator() 
-   : iterator_base(0)
-   {
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::leaf_iterator::leaf_iterator(tree_node *tn)
-   : iterator_base(tn)
-   {
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::leaf_iterator::leaf_iterator(const iterator_base &other)
-   : iterator_base(other.node)
-   {
-   }
-
-template <class T, class tree_node_allocator>
-tree<T, tree_node_allocator>::leaf_iterator::leaf_iterator(const sibling_iterator& other)
-   : iterator_base(other.node)
-   {
-   if(this->node==0) {
-      if(other.range_last()!=0)
-         this->node=other.range_last();
-      else 
-         this->node=other.parent_;
-      ++(*this);
-      }
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::leaf_iterator& tree<T, tree_node_allocator>::leaf_iterator::operator++()
-   {
-   assert(this->node!=0);
-   while(this->node->next_sibling==0) {
-      if (this->node->parent==0) return *this;
-      this->node=this->node->parent;
-      }
-   this->node=this->node->next_sibling;
-   while(this->node->first_child)
-      this->node=this->node->first_child;
-   return *this;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::leaf_iterator& tree<T, tree_node_allocator>::leaf_iterator::operator--()
-   {
-   assert(this->node!=0);
-   while (this->node->prev_sibling==0) {
-      if (this->node->parent==0) return *this;
-      this->node=this->node->parent;
-      }
-   this->node=this->node->prev_sibling;
-   while(this->node->last_child)
-      this->node=this->node->last_child;
-   return *this;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::leaf_iterator tree<T, tree_node_allocator>::leaf_iterator::operator++(int)
-   {
-   leaf_iterator copy = *this;
-   ++(*this);
-   return copy;
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::leaf_iterator tree<T, tree_node_allocator>::leaf_iterator::operator--(int)
-   {
-   leaf_iterator copy = *this;
-   --(*this);
-   return copy;
-   }
-
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::leaf_iterator& tree<T, tree_node_allocator>::leaf_iterator::operator+=(unsigned int num)
-   {
-   while(num>0) {
-      ++(*this);
-      --num;
-      }
-   return (*this);
-   }
-
-template <class T, class tree_node_allocator>
-typename tree<T, tree_node_allocator>::leaf_iterator& tree<T, tree_node_allocator>::leaf_iterator::operator-=(unsigned int num)
-   {
-   while(num>0) {
-      --(*this);
-      --num;
-      }
-   return (*this);
-   }
-
-#endif
-
-// Local variables:
-// default-tab-width: 3
-// End:



From MAILER-DAEMON Fri Aug 24 06:33:31 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IOWTr-0004yL-Bt
	for mharc-gnash-commit@gnu.org; Fri, 24 Aug 2007 06:33:31 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IOWTp-0004y7-67
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 06:33:29 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IOWTn-0004xv-7V
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 06:33:28 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IOWTn-0004xs-33
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 06:33:27 -0400
Received: from g78.mailsnare.net ([209.236.228.78] helo=mail.mailsnare.net)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <chadmusick@msbx.net>) id 1IOWTm-0002yD-3C
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 06:33:26 -0400
X-Virus-Scanned: by ClamAV at mailsnare.net
X-Message-ID: 00ff702db0dc1113dba21d7ff9204a39d6a357911d59be81
Received: from [192.168.1.103] (unknown [222.229.211.188])
	by mail.mailsnare.net (Postfix) with ESMTP id DCD7E7AD7D;
	Fri, 24 Aug 2007 10:33:23 +0000 (UTC)
Subject: Re: [Gnash-commit] gnash ChangeLog server/stream.h server/stream.cpp
From: Chad Musick <chadmusick@msbx.net>
To: strk <strk@keybit.net>
In-Reply-To: <20070824075522.GC81385@keybit.net>
References: <E1IORzU-0003Cy-3K@cvs.savannah.gnu.org>
	<20070824075522.GC81385@keybit.net>
Content-Type: text/plain
Date: Fri, 24 Aug 2007 19:33:38 +0900
Message-Id: <1187951618.7055.12.camel@ubuntu.sys76.lan>
Mime-Version: 1.0
X-Mailer: Evolution 2.10.1 
Content-Transfer-Encoding: 7bit
X-Detected-Kernel: Linux 2.6 (newer, 3)
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2007 10:33:29 -0000

I'm not sure if align() should be called -- I mimicked the read_fixed()
function in this.

On Fri, 2007-08-24 at 09:55 +0200, strk wrote:
> On Fri, Aug 24, 2007 at 05:45:52AM +0000, Chad Musick wrote:
> 
> > +                float   read_short_fixed();
> 
> Please document the functions you add, a single line would do.
> 
> > +        float   stream::read_short_fixed()
> > +        {
> > +                m_unused_bits = 0;
> > +                return (float) m_input->read_le16();
> > +        }
> >  
> >  	void	stream::align() { m_unused_bits = 0; m_current_byte = 0; }
> 
> Should you call align() instead of just setting m_unused_bits to 0 ?
> 
> --strk;




From MAILER-DAEMON Fri Aug 24 06:37:11 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IOWXO-0005jK-WC
	for mharc-gnash-commit@gnu.org; Fri, 24 Aug 2007 06:37:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IOWXM-0005iH-En
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 06:37:08 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IOWXL-0005hu-By
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 06:37:08 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IOWXK-0005hq-ND
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 06:37:07 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1IOWXF-0003q6-Uc
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 06:37:02 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l7OAasQ85650;
	Fri, 24 Aug 2007 12:36:54 +0200 (CEST)
	(envelope-from strk@keybit.net)
Date: Fri, 24 Aug 2007 12:36:54 +0200
From: strk <strk@keybit.net>
To: Chad Musick <chadmusick@msbx.net>
Subject: Re: [Gnash-commit] gnash ChangeLog server/stream.h server/stream.cpp
Message-ID: <20070824103654.GD82346@keybit.net>
Mail-Followup-To: Chad Musick <chadmusick@msbx.net>, gnash-commit@gnu.org
References: <E1IORzU-0003Cy-3K@cvs.savannah.gnu.org>
	<20070824075522.GC81385@keybit.net>
	<1187951618.7055.12.camel@ubuntu.sys76.lan>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1187951618.7055.12.camel@ubuntu.sys76.lan>
X-Detected-Kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2007 10:37:08 -0000

On Fri, Aug 24, 2007 at 07:33:38PM +0900, Chad Musick wrote:
> I'm not sure if align() should be called -- I mimicked the read_fixed()
> function in this.

It actually seems that m_unused_bits = 0 is enough to properly align
stuff, so we should likely always call align() and have align() only
set m_unused_bits = 0 (with setting m_current_byte = 0 just being
a waste of time).

Yes, seems a dangerous change, but I'm confident our internal and external
testcases would catch any problem with it.

--strk;



From MAILER-DAEMON Fri Aug 24 06:38:05 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IOWYH-0005qg-Cu
	for mharc-gnash-commit@gnu.org; Fri, 24 Aug 2007 06:38:05 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IOWYF-0005qQ-5R
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 06:38:03 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IOWYD-0005qE-N4
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 06:38:01 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IOWYD-0005qB-Ij
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 06:38:01 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IOWYC-00044O-O4
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 06:38:01 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IOWY9-0006JM-B2
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 10:37:57 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IOWY9-0006JJ-6X
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 10:37:57 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IOWY9-0006JJ-6X@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 24 Aug 2007 10:37:57 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/as_environment.cpp serve...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2007 10:38:03 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/24 10:37:57

Modified files:
	.              : ChangeLog 
	server         : as_environment.cpp as_environment.h 

Log message:
	        * server/as_environment.{cpp,h}: use a static const for expressing
	          number of global registers.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4093&r2=1.4094
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.83&r2=1.84
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.h?cvsroot=gnash&r1=1.55&r2=1.56

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4093
retrieving revision 1.4094
diff -u -b -r1.4093 -r1.4094
--- ChangeLog	24 Aug 2007 10:07:40 -0000	1.4093
+++ ChangeLog	24 Aug 2007 10:37:56 -0000	1.4094
@@ -1,5 +1,10 @@
 2007-08-24 Sandro Santilli <strk@keybit.net>
 
+	* server/as_environment.{cpp,h}: use a static const for expressing
+	  number of global registers.
+
+2007-08-24 Sandro Santilli <strk@keybit.net>
+
 	* libbase/: tree.hpp => tree.hh: don't change original name of
 	  external source code.
 	* libbase/Makefile.am: distribute tree.hh

Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- server/as_environment.cpp	24 Aug 2007 10:05:57 -0000	1.83
+++ server/as_environment.cpp	24 Aug 2007 10:37:56 -0000	1.84
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: as_environment.cpp,v 1.83 2007/08/24 10:05:57 strk Exp $ */
+/* $Id: as_environment.cpp,v 1.84 2007/08/24 10:37:56 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -938,7 +938,7 @@
 {
 	std::string registers;
 	int defined=0;
-	for (unsigned int i=0; i<4; ++i)
+	for (unsigned int i=0; i<numGlobalRegisters; ++i)
 	{
 		if (i) registers += std::string(" | ");
 		registers += std::string("\"") +
@@ -1072,7 +1072,7 @@
 void
 as_environment::markReachableResources() const
 {
-	for (size_t i=0, s=4; i<4; ++i)
+	for (size_t i=0; i<4; ++i)
 	{
 		m_global_register[i].setReachable();
 	}

Index: server/as_environment.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- server/as_environment.h	23 Aug 2007 16:50:56 -0000	1.55
+++ server/as_environment.h	24 Aug 2007 10:37:56 -0000	1.56
@@ -512,6 +512,8 @@
 
 private:
 
+	static const short unsigned int numGlobalRegisters = 4;
+
 	typedef std::vector<CallFrame> CallStack;
 		
 	CallStack _localFrames;
@@ -519,7 +521,7 @@
 	/// Variables available in this environment
 	Variables _variables;
 
-	as_value m_global_register[4];
+	as_value m_global_register[numGlobalRegisters];
 
 	/// Movie target. 
 	character* m_target;



From MAILER-DAEMON Fri Aug 24 09:52:33 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IOZaS-0004tp-UZ
	for mharc-gnash-commit@gnu.org; Fri, 24 Aug 2007 09:52:32 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IOZaR-0004sD-Lq
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 09:52:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IOZaQ-0004qn-Ix
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 09:52:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IOZaP-0004po-Rq
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 09:52:30 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IOZaM-0004DB-S3
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 09:52:27 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IOZaL-0003oW-10
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 13:52:25 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IOZaK-0003oT-PK
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 13:52:24 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IOZaK-0003oT-PK@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 24 Aug 2007 13:52:24 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/testsuite/actionscript.all MovieClip.as
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2007 13:52:32 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/24 13:52:24

Modified files:
	testsuite/actionscript.all: MovieClip.as 

Log message:
	minor thing: use check_equals

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.81&r2=1.82

Patches:
Index: MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- MovieClip.as	24 Aug 2007 10:05:58 -0000	1.81
+++ MovieClip.as	24 Aug 2007 13:52:24 -0000	1.82
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.81 2007/08/24 10:05:58 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.82 2007/08/24 13:52:24 strk Exp $";
 
 #include "check.as"
 
@@ -34,7 +34,7 @@
 
 // Get a reference to a MovieClip
 var mc = _root;
-check(typeof(mc)=="movieclip");
+check_equals(typeof(mc), "movieclip");
 
 // Check some references
 check_equals(typeof(this), 'movieclip');



From MAILER-DAEMON Fri Aug 24 09:55:11 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IOZd1-0008RR-S0
	for mharc-gnash-commit@gnu.org; Fri, 24 Aug 2007 09:55:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IOZd0-0008OP-DR
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 09:55:10 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IOZcz-0008Mg-P7
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 09:55:10 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IOZcz-0008MR-Io
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 09:55:09 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IOZcz-000518-6f
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 09:55:09 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IOZcy-0003s4-O0
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 13:55:08 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IOZcy-0003s1-JE
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 13:55:08 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IOZcy-0003s1-JE@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 24 Aug 2007 13:55:08 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/as_value.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2007 13:55:10 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/24 13:55:08

Modified files:
	.              : ChangeLog 
	server         : as_value.cpp 

Log message:
	        * server/as_value.cpp: fix build when MOVIECLIP_AS_SOFTREF is
	          undefined.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4095&r2=1.4096
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.64&r2=1.65

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4095
retrieving revision 1.4096
diff -u -b -r1.4095 -r1.4096
--- ChangeLog	24 Aug 2007 10:46:10 -0000	1.4095
+++ ChangeLog	24 Aug 2007 13:55:07 -0000	1.4096
@@ -1,5 +1,7 @@
 2007-08-24 Sandro Santilli <strk@keybit.net>
 
+	* server/as_value.cpp: fix build when MOVIECLIP_AS_SOFTREF is
+	  undefined.
 	* server/swf/PlaceObject2Tag.cpp (loader): remove unused variable.
 	* server/as_environment.{cpp,h}: use a static const for expressing
 	  number of global registers.

Index: server/as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- server/as_value.cpp	6 Aug 2007 20:42:57 -0000	1.64
+++ server/as_value.cpp	24 Aug 2007 13:55:08 -0000	1.65
@@ -69,14 +69,6 @@
     }
 }
 
-#if 0
-std::string
-as_value::to_std_string(as_environment* env) const
-{
-    return to_string(env);
-}
-#endif
-
 // Conversion to const std::string&.
 const std::string&
 as_value::to_string(as_environment* env) const
@@ -85,9 +77,22 @@
 	{
 
 		case STRING:
+			/* don't need to do anything */
+			break;
+
 		case MOVIECLIP:
+		{
+#ifdef MOVIECLIP_AS_SOFTREF
 			/* don't need to do anything */
+#else
+			sprite_instance* sp = m_object_value->to_movie();
+			assert(sp); // or return as in to_sprite() ?
+			if ( sp ) {
+				m_string_value = sp->getTarget();
+			}
+#endif
 			break;
+		}
 
 		case NUMBER:
 			m_string_value = doubleToString(m_number_value);
@@ -503,7 +508,7 @@
 
 #ifndef MOVIECLIP_AS_SOFTREF
 	sprite_instance* sp = m_object_value->to_movie();
-	if ( ! sp ) return NULL;
+	if ( ! sp ) return NULL; // shoudl we assert(sp) instead ?
 	if ( sp->isUnloaded() )
 	{
 		log_error(_("MovieClip value is a dangling reference: "
@@ -817,6 +822,10 @@
 bool
 as_value::equalsSameType(const as_value& v) const
 {
+#ifdef GNASH_DEBUG_EQUALITY
+    static int count=0;
+    log_debug("equalsSameType(%s, %s) called [%d]", to_debug_string().c_str(), v.to_debug_string().c_str(), count++);
+#endif
 	assert(m_type == v.m_type);
 	switch (m_type)
 	{
@@ -832,8 +841,14 @@
 			return m_boolean_value == v.m_boolean_value;
 
 		case STRING:
+			return m_string_value == v.m_string_value;
+
 		case MOVIECLIP:
+#ifdef MOVIECLIP_AS_SOFTREF
 			return m_string_value == v.m_string_value;
+#else
+			return m_object_value == v.m_object_value;
+#endif
 
 		case NUMBER:
 		{
@@ -912,7 +927,9 @@
 	else if (v.m_type == MOVIECLIP)
 	{
 #ifndef MOVIECLIP_AS_SOFTREF
-		set_sprite(*(v.to_sprite()));
+		sprite_instance* sp = dynamic_cast<sprite_instance*>(v.m_object_value);
+		assert(sp);
+		set_sprite(*sp);
 #else
 		set_sprite(v.m_string_value);
 #endif
@@ -1094,7 +1111,11 @@
 as_value::setReachable() const
 {
 #ifdef GNASH_USE_GC
+#ifdef MOVIECLIP_AS_SOFTREF
 	if ( m_type == OBJECT || m_type == AS_FUNCTION )
+#else
+	if ( m_type == OBJECT || m_type == AS_FUNCTION || m_type == MOVIECLIP)
+#endif
 	{
 		m_object_value->setReachable();
 	}



From MAILER-DAEMON Fri Aug 24 11:05:36 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IOaj9-0007pn-Up
	for mharc-gnash-commit@gnu.org; Fri, 24 Aug 2007 11:05:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IOaj8-0007m5-EI
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 11:05:34 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IOaj7-0007j8-F9
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 11:05:34 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IOaj7-0007iO-7W
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 11:05:33 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IOaj5-0007iv-Sw
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 11:05:32 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IOaix-0000CW-E8
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 15:05:23 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IOaix-0000CT-AE
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 15:05:23 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IOaix-0000CT-AE@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 24 Aug 2007 15:05:23 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/Movi...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2007 15:05:34 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/24 15:05:23

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: MovieClip.as 

Log message:
	        * testsuite/actionscript.all/MovieClip.as: more test for
	          soft references.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4096&r2=1.4097
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.82&r2=1.83

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4096
retrieving revision 1.4097
diff -u -b -r1.4096 -r1.4097
--- ChangeLog	24 Aug 2007 13:55:07 -0000	1.4096
+++ ChangeLog	24 Aug 2007 15:05:22 -0000	1.4097
@@ -1,5 +1,7 @@
 2007-08-24 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/actionscript.all/MovieClip.as: more test for 
+	  soft references.
 	* server/as_value.cpp: fix build when MOVIECLIP_AS_SOFTREF is
 	  undefined.
 	* server/swf/PlaceObject2Tag.cpp (loader): remove unused variable.

Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- testsuite/actionscript.all/MovieClip.as	24 Aug 2007 13:52:24 -0000	1.82
+++ testsuite/actionscript.all/MovieClip.as	24 Aug 2007 15:05:23 -0000	1.83
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.82 2007/08/24 13:52:24 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.83 2007/08/24 15:05:23 strk Exp $";
 
 #include "check.as"
 
@@ -437,11 +437,32 @@
 check_equals(typeof(softref), 'movieclip');
 check_equals(typeof(softref.member), 'undefined');
 check_equals(typeof(softref._target), 'undefined');
-_root.createEmptyMovieClip("hardref", 61);
+hardref = 4;
+check_equals(typeof(softref), 'movieclip'); // hardref doesn't hide this
+// Delete is needed, or further inspection functions will hit the variable before the character
+delete hardref;
+sr61 = _root.createEmptyMovieClip("hardref", 61);
 hardref.member = 2;
 check_equals(typeof(softref.member), 'number');
 check_equals(softref.member, 2);
 
+// Two movieclips can have the same name
+sr62 = _root.createEmptyMovieClip("hardref", 62);
+// Still, soft references correctly point each to
+// it's distinct clip !
+sr61.member = 6;
+check_equals(sr61.member, 6);
+xcheck_equals(typeof(sr62.member), 'undefined');
+check_equals(sr61._name, "hardref");
+check_equals(sr62._name, "hardref");
+
+// When getting a member by name, the one with lowest
+// depth comes up first
+check_equals(hardref.member, 6); // depth 61 < 62
+sr60 = _root.createEmptyMovieClip("hardref", 60);
+sr60.member = 60;
+check_equals(hardref.member, 60); // depth 60 < 61 < 62
+
 #endif // OUTPUT_VERSION >= 6
 
 //----------------------------------------------



From MAILER-DAEMON Fri Aug 24 11:42:06 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IObIT-0001Kz-IO
	for mharc-gnash-commit@gnu.org; Fri, 24 Aug 2007 11:42:05 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IObIP-0001KY-Mm
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 11:42:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IObIO-0001K4-NC
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 11:42:00 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IObIO-0001K1-8u
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 11:42:00 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1IObIM-0001Zb-VA
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 11:41:59 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <markus@unixrus.se>) id 1IObIL-0002l5-JX
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 15:41:57 +0000
Received: from nihilus by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <nihilus@savannah.gnu.org>) id 1IObIL-0002l1-CZ
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 15:41:57 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IObIL-0002l1-CZ@cvs.savannah.gnu.org>
From: Markus Gothe <markus@unixrus.se>
Date: Fri, 24 Aug 2007 15:41:57 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog plugin/klash/klash_part.cpp
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2007 15:42:02 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Markus Gothe <nihilus>	07/08/24 15:41:57

Modified files:
	.              : ChangeLog 
	plugin/klash   : klash_part.cpp 

Log message:
	Patch for GNASHEXE.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.60&r2=1.3971.2.61
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/klash_part.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.17.2.1&r2=1.17.2.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.60
retrieving revision 1.3971.2.61
diff -u -b -r1.3971.2.60 -r1.3971.2.61
--- ChangeLog	23 Aug 2007 14:18:16 -0000	1.3971.2.60
+++ ChangeLog	24 Aug 2007 15:41:56 -0000	1.3971.2.61
@@ -1,3 +1,7 @@
+2007-08-24 Miriam Ruiz
+
+	* plugins/klash/klash_part.cpp: Patch for GNASHEXE.
+
 2007-08-23 Sandro Santilli <strk@keybit.net>
 
 	* libamf/amf.{cpp,h}: fixed a bunch of memory errors, added

Index: plugin/klash/klash_part.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/klash_part.cpp,v
retrieving revision 1.17.2.1
retrieving revision 1.17.2.2
diff -u -b -r1.17.2.1 -r1.17.2.2
--- plugin/klash/klash_part.cpp	18 Aug 2007 03:02:30 -0000	1.17.2.1
+++ plugin/klash/klash_part.cpp	24 Aug 2007 15:41:57 -0000	1.17.2.2
@@ -162,8 +162,7 @@
     QString procname;
     char *gnash_env = getenv("KLASH_PLAYER");
     if (!gnash_env) {
-      procname = GNASHBINDIR;
-      procname += "/kde-gnash";
+      procname = GNASHBINDIR "/kde-gnash";
     } else {
       procname = gnash_env;
     }



From MAILER-DAEMON Fri Aug 24 11:50:01 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IObQ9-0003wq-Rs
	for mharc-gnash-commit@gnu.org; Fri, 24 Aug 2007 11:50:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IObQ8-0003wd-HH
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 11:50:00 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IObQ7-0003wO-6Q
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 11:50:00 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IObQ6-0003wK-U8
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 11:49:59 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <benjamin_pelican@yahoo.co.uk>)
	id 1IObQ4-0003vH-Fd
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 11:49:56 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <benjamin_pelican@yahoo.co.uk>) id 1IObQ2-0004Dv-J9
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 15:49:54 +0000
Received: from bwy by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <bwy@savannah.gnu.org>) id 1IObQ2-0004Ds-Ep
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 15:49:54 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IObQ2-0004Ds-Ep@cvs.savannah.gnu.org>
From: Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
Date: Fri, 24 Aug 2007 15:49:54 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/plugin/klash klash_part.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2007 15:50:00 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Benjamin Wolsey <bwy>	07/08/24 15:49:54

Modified files:
	plugin/klash   : klash_part.cpp 

Log message:
	Miriam Ruiz:
	* plugin/klash/klash_part.cpp: correct operator for konqueror plugin path.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/klash_part.cpp?cvsroot=gnash&r1=1.18&r2=1.19

Patches:
Index: klash_part.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/plugin/klash/klash_part.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- klash_part.cpp	18 Aug 2007 03:02:40 -0000	1.18
+++ klash_part.cpp	24 Aug 2007 15:49:54 -0000	1.19
@@ -162,8 +162,7 @@
     QString procname;
     char *gnash_env = getenv("KLASH_PLAYER");
     if (!gnash_env) {
-      procname = GNASHBINDIR;
-      procname += "/kde-gnash";
+      procname = GNASHBINDIR "/kde-gnash";
     } else {
       procname = gnash_env;
     }



From MAILER-DAEMON Fri Aug 24 11:50:09 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IObQH-0003za-0m
	for mharc-gnash-commit@gnu.org; Fri, 24 Aug 2007 11:50:09 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IObQF-0003z4-C6
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 11:50:07 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IObQE-0003ye-Ia
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 11:50:06 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IObQE-0003yT-Be
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 11:50:06 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1IObQD-0003yI-1P
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 11:50:05 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <markus@unixrus.se>) id 1IObQB-0004Ew-U1
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 15:50:04 +0000
Received: from nihilus by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <nihilus@savannah.gnu.org>) id 1IObQB-0004Eq-M1
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 15:50:03 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IObQB-0004Eq-M1@cvs.savannah.gnu.org>
From: Markus Gothe <markus@unixrus.se>
Date: Fri, 24 Aug 2007 15:50:03 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog [release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2007 15:50:07 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Markus Gothe <nihilus>	07/08/24 15:50:03

Modified files:
	.              : ChangeLog 

Log message:
	Updated with Miriam's mail-addr

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.61&r2=1.3971.2.62

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.61
retrieving revision 1.3971.2.62
diff -u -b -r1.3971.2.61 -r1.3971.2.62
--- ChangeLog	24 Aug 2007 15:41:56 -0000	1.3971.2.61
+++ ChangeLog	24 Aug 2007 15:50:02 -0000	1.3971.2.62
@@ -1,6 +1,6 @@
-2007-08-24 Miriam Ruiz
+2007-08-24 Miriam Ruiz <little_miry@yahoo.es>
 
-	* plugins/klash/klash_part.cpp: Patch for GNASHEXE.
+	* plugin/klash/klash_part.cpp: Patch for GNASHEXE.
 
 2007-08-23 Sandro Santilli <strk@keybit.net>
 



From MAILER-DAEMON Fri Aug 24 11:52:55 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IObSx-0004gy-H6
	for mharc-gnash-commit@gnu.org; Fri, 24 Aug 2007 11:52:55 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IObSu-0004fU-Qk
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 11:52:53 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IObSu-0004f9-5p
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 11:52:52 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IObSt-0004ex-SR
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 11:52:51 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1IObSs-0004fa-OS
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 11:52:50 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <markus@unixrus.se>) id 1IObSr-0004Gd-Sa
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 15:52:49 +0000
Received: from nihilus by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <nihilus@savannah.gnu.org>) id 1IObSr-0004Ga-OO
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 15:52:49 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IObSr-0004Ga-OO@cvs.savannah.gnu.org>
From: Markus Gothe <markus@unixrus.se>
Date: Fri, 24 Aug 2007 15:52:49 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2007 15:52:53 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Markus Gothe <nihilus>	07/08/24 15:52:49

Modified files:
	.              : ChangeLog 

Log message:
	Added Miriam.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4097&r2=1.4098

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4097
retrieving revision 1.4098
diff -u -b -r1.4097 -r1.4098
--- ChangeLog	24 Aug 2007 15:05:22 -0000	1.4097
+++ ChangeLog	24 Aug 2007 15:52:49 -0000	1.4098
@@ -1,3 +1,7 @@
+2007-08-24 Miriam Ruiz <little_miry@yahoo.es>
+
+        * plugin/klash/klash_part.cpp: Patch for GNASHEXE.
+
 2007-08-24 Sandro Santilli <strk@keybit.net>
 
 	* testsuite/actionscript.all/MovieClip.as: more test for 



From MAILER-DAEMON Fri Aug 24 12:07:33 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IObh6-0000RG-K6
	for mharc-gnash-commit@gnu.org; Fri, 24 Aug 2007 12:07:32 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IObh5-0000PU-AS
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 12:07:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IObh4-0000OS-6u
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 12:07:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IObh3-0000O7-Vk
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 12:07:30 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IObh3-0000T6-6t
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 12:07:29 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IObh2-0004ZN-4Q
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 16:07:28 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IObh2-0004ZK-19
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 16:07:28 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IObh2-0004ZK-19@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 24 Aug 2007 16:07:28 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/as_value.cpp server/dlis...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2007 16:07:31 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/24 16:07:27

Modified files:
	.              : ChangeLog 
	server         : as_value.cpp dlist.cpp dlist.h 
	testsuite/actionscript.all: MovieClip.as case.as 
	testsuite/misc-ming.all: displaylist_depths_test2.c 

Log message:
	        * server/dlist.{h,cpp} (replace_character): call unload() on replaced
	          character and document the fact.
	        * server/as_value.cpp: undefine the MOVIECLIP_AS_SOFTREF macro, tweak
	          equalSameType() and to_sprite() to use MOVIECLIP targets only when
	          they are unloaded.
	        * testsuite/misc-ming.all/displaylist_depths_test2.c: xcheck => check
	          (no more failures from this test)
	        * testsuite/actionscript.all/MovieClip.as: xcheck => check
	          (soft-references related)
	        * testsuite/actionscript.all/case.as: xcheck => check (soft refs).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4098&r2=1.4099
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.65&r2=1.66
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.cpp?cvsroot=gnash&r1=1.77&r2=1.78
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.h?cvsroot=gnash&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.83&r2=1.84
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/case.as?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/displaylist_depths_test2.c?cvsroot=gnash&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4098
retrieving revision 1.4099
diff -u -b -r1.4098 -r1.4099
--- ChangeLog	24 Aug 2007 15:52:49 -0000	1.4098
+++ ChangeLog	24 Aug 2007 16:07:26 -0000	1.4099
@@ -1,3 +1,16 @@
+2007-08-24 Sandro Santilli <strk@keybit.net>
+
+	* server/dlist.{h,cpp} (replace_character): call unload() on replaced
+	  character and document the fact.
+	* server/as_value.cpp: undefine the MOVIECLIP_AS_SOFTREF macro, tweak
+	  equalSameType() and to_sprite() to use MOVIECLIP targets only when 
+	  they are unloaded.
+	* testsuite/misc-ming.all/displaylist_depths_test2.c: xcheck => check
+	  (no more failures from this test)
+	* testsuite/actionscript.all/MovieClip.as: xcheck => check
+	  (soft-references related)
+	* testsuite/actionscript.all/case.as: xcheck => check (soft refs).
+
 2007-08-24 Miriam Ruiz <little_miry@yahoo.es>
 
         * plugin/klash/klash_part.cpp: Patch for GNASHEXE.

Index: server/as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- server/as_value.cpp	24 Aug 2007 13:55:08 -0000	1.65
+++ server/as_value.cpp	24 Aug 2007 16:07:27 -0000	1.66
@@ -44,7 +44,7 @@
 
 // Undefine this to keep MOVIECLIP values by pointer
 // rather then by "target" ref.
-#define MOVIECLIP_AS_SOFTREF
+//#define MOVIECLIP_AS_SOFTREF
 
 // Define the macro below to make abstract equality operator verbose
 //#define GNASH_DEBUG_EQUALITY
@@ -512,9 +512,11 @@
 	if ( sp->isUnloaded() )
 	{
 		log_error(_("MovieClip value is a dangling reference: "
-				"target %s was unloaded (should set to NULL?)"),
+				"target %s was unloaded (looking for a substitute on the same target))"),
 				sp->getTarget().c_str());
-		return NULL; 
+		sp = find_sprite_by_target(sp->getTarget());
+		return sp;
+		//return NULL;
 	}
 	return sp;
 #else
@@ -847,7 +849,7 @@
 #ifdef MOVIECLIP_AS_SOFTREF
 			return m_string_value == v.m_string_value;
 #else
-			return m_object_value == v.m_object_value;
+			return to_sprite() == v.to_sprite(); // m_object_value == v.m_object_value;
 #endif
 
 		case NUMBER:

Index: server/dlist.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.cpp,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- server/dlist.cpp	22 Aug 2007 04:54:56 -0000	1.77
+++ server/dlist.cpp	24 Aug 2007 16:07:27 -0000	1.78
@@ -311,6 +311,9 @@
 		// remember bounds of old char
 		oldch->add_invalidated_bounds(old_ranges, true);		
 
+		// Unload old char
+		(*it)->unload();
+
 		// replace existing char		
 		*it = di;
 		

Index: server/dlist.h
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- server/dlist.h	1 Jul 2007 10:54:21 -0000	1.45
+++ server/dlist.h	24 Aug 2007 16:07:27 -0000	1.46
@@ -98,6 +98,8 @@
 	/// Puts a new character at the specified depth, replacing any
 	/// existing character.
 	//
+	/// Calls unload on the removed character.
+	///
 	/// If use_cxform or use_matrix are false, and a character is
 	/// present at the given depth, then keep those respective
 	/// properties from the existing character.

Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- testsuite/actionscript.all/MovieClip.as	24 Aug 2007 15:05:23 -0000	1.83
+++ testsuite/actionscript.all/MovieClip.as	24 Aug 2007 16:07:27 -0000	1.84
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.83 2007/08/24 15:05:23 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.84 2007/08/24 16:07:27 strk Exp $";
 
 #include "check.as"
 
@@ -393,10 +393,10 @@
 check_equals(typeof(mc4), 'movieclip');
 check_equals(typeof(mc5), 'movieclip');
 // gah.. our "soft references" are bogus :(
-xcheck_equals(mc4._target, "/changed");
-xcheck_equals(mc5._target, "/changed/mc5_mc");
-xcheck_equals(targetPath(mc4), "_level0.changed");
-xcheck_equals(targetPath(mc5), "_level0.changed.mc5_mc");
+check_equals(mc4._target, "/changed");
+check_equals(mc5._target, "/changed/mc5_mc");
+check_equals(targetPath(mc4), "_level0.changed");
+check_equals(targetPath(mc5), "_level0.changed.mc5_mc");
 xcheck_equals(mc4.toString(), "[object Object]");
 xcheck_equals(mc5.toString(), "[object Object]");
 check_equals(changed._target, "/changed");
@@ -452,7 +452,7 @@
 // it's distinct clip !
 sr61.member = 6;
 check_equals(sr61.member, 6);
-xcheck_equals(typeof(sr62.member), 'undefined');
+check_equals(typeof(sr62.member), 'undefined');
 check_equals(sr61._name, "hardref");
 check_equals(sr62._name, "hardref");
 

Index: testsuite/actionscript.all/case.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/case.as,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- testsuite/actionscript.all/case.as	23 Aug 2007 16:50:56 -0000	1.8
+++ testsuite/actionscript.all/case.as	24 Aug 2007 16:07:27 -0000	1.9
@@ -22,7 +22,7 @@
  *  Test case sensitivity 
  */
 
-rcsid="$Id: case.as,v 1.8 2007/08/23 16:50:56 strk Exp $";
+rcsid="$Id: case.as,v 1.9 2007/08/24 16:07:27 strk Exp $";
 
 #include "check.as"
 
@@ -133,15 +133,15 @@
 check_equals(mcRef[1]._name, "CLIP"); 
 check_equals(mcRef[1]._target, "/CLIP"); 
 #else // OUTPUT_VERSION <= 6
-// Gnash fails these due to "soft references"
+// Gnash used to fail these due to "soft references"
 // Basically, a MOVIECLIP as_value stores the clip
 // target, but in SWF<7 the target is insensitive
 // so /clip and /CLIP both resolve to the *same*
 // character.
 //
-xcheck_equals(mcRef[1].getDepth(), 7);
-xcheck_equals(mcRef[1]._name, "CLIP"); 
-xcheck_equals(mcRef[1]._target, "/CLIP"); 
+check_equals(mcRef[1].getDepth(), 7);
+check_equals(mcRef[1]._name, "CLIP"); 
+check_equals(mcRef[1]._target, "/CLIP"); 
 #endif // OUTPUT_VERSION <= 6
 
 

Index: testsuite/misc-ming.all/displaylist_depths_test2.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/displaylist_depths_test2.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- testsuite/misc-ming.all/displaylist_depths_test2.c	1 Jul 2007 10:54:51 -0000	1.7
+++ testsuite/misc-ming.all/displaylist_depths_test2.c	24 Aug 2007 16:07:27 -0000	1.8
@@ -188,8 +188,8 @@
 		//       existance of the old (dynamicized) instance by looking
 		//       at the real DisplayList and at the rendered buffer
 		//
-		"xcheck_equals(dynRef.myThing, 'guess');"
-		"xcheck_equals(dynRef.getDepth(), 10);" 
+		"check_equals(dynRef.myThing, 'guess');"
+		"check_equals(dynRef.getDepth(), 10);" 
 
 		// Luckly we can query for depth chars with getInstanceAtDepth
 		"check_equals(typeof(getInstanceAtDepth(-16381)), 'movieclip');"



From MAILER-DAEMON Fri Aug 24 15:21:06 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IOeiQ-0007yz-Kn
	for mharc-gnash-commit@gnu.org; Fri, 24 Aug 2007 15:21:06 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IOeiO-0007ys-JG
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 15:21:04 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IOeiN-0007wY-6P
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 15:21:03 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IOeiM-0007vc-Jf
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 15:21:03 -0400
Received: from mx20.gnu.org ([199.232.41.8])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IOWy3-0002Mo-15
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 07:04:43 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by mx20.gnu.org with esmtp (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1IOWg7-0002EP-TH
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 06:46:12 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IOWg7-0006qK-HQ
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 10:46:11 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IOWg7-0006qF-CJ
	for gnash-commit@gnu.org; Fri, 24 Aug 2007 10:46:11 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IOWg7-0006qF-CJ@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 24 Aug 2007 10:46:11 +0000
X-detected-kernel: Linux 2.6 (newer, 3)
X-Detected-Kernel: Linux 2.6, seldom 2.4 (older, 4)
Subject: [Gnash-commit] gnash ChangeLog server/swf/PlaceObject2Tag.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2007 19:21:04 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/24 10:46:11

Modified files:
	.              : ChangeLog 
	server/swf     : PlaceObject2Tag.cpp 

Log message:
	        * server/swf/PlaceObject2Tag.cpp (loader): remove unused variable.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4094&r2=1.4095
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/PlaceObject2Tag.cpp?cvsroot=gnash&r1=1.18&r2=1.19

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4094
retrieving revision 1.4095
diff -u -b -r1.4094 -r1.4095
--- ChangeLog	24 Aug 2007 10:37:56 -0000	1.4094
+++ ChangeLog	24 Aug 2007 10:46:10 -0000	1.4095
@@ -1,5 +1,6 @@
 2007-08-24 Sandro Santilli <strk@keybit.net>
 
+	* server/swf/PlaceObject2Tag.cpp (loader): remove unused variable.
 	* server/as_environment.{cpp,h}: use a static const for expressing
 	  number of global registers.
 

Index: server/swf/PlaceObject2Tag.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/PlaceObject2Tag.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- server/swf/PlaceObject2Tag.cpp	24 Aug 2007 05:55:52 -0000	1.18
+++ server/swf/PlaceObject2Tag.cpp	24 Aug 2007 10:46:11 -0000	1.19
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: PlaceObject2Tag.cpp,v 1.18 2007/08/24 05:55:52 cmusick Exp $ */
+/* $Id: PlaceObject2Tag.cpp,v 1.19 2007/08/24 10:46:11 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -419,7 +419,6 @@
     m->add_execute_tag(ch);
 
     int depth = ch->getDepth();
-	int ratio = ch->getRatio();
     if ( depth < 0 && depth >= character::staticDepthOffset )
     {
     	m->addTimelineDepth(depth);



From MAILER-DAEMON Sat Aug 25 15:07:53 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IP0zA-0000cm-QV
	for mharc-gnash-commit@gnu.org; Sat, 25 Aug 2007 15:07:52 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IP0z9-0000cc-10
	for gnash-commit@gnu.org; Sat, 25 Aug 2007 15:07:51 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IP0z7-0000cQ-5X
	for gnash-commit@gnu.org; Sat, 25 Aug 2007 15:07:49 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IP0z6-0000cN-WF
	for gnash-commit@gnu.org; Sat, 25 Aug 2007 15:07:49 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IP0z5-00066D-Rr
	for gnash-commit@gnu.org; Sat, 25 Aug 2007 15:07:48 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IP0z4-0000yE-F9
	for gnash-commit@gnu.org; Sat, 25 Aug 2007 19:07:46 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IP0z4-0000yB-AZ
	for gnash-commit@gnu.org; Sat, 25 Aug 2007 19:07:46 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IP0z4-0000yB-AZ@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 25 Aug 2007 19:07:46 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/ops.as
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Aug 2007 19:07:51 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/25 19:07:46

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: ops.as 

Log message:
	        * testsuite/actionscript.all/ops.as: more tests about isNaN(x) when
	          x != NaN (odd)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4101&r2=1.4102
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/ops.as?cvsroot=gnash&r1=1.19&r2=1.20

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4101
retrieving revision 1.4102
diff -u -b -r1.4101 -r1.4102
--- ChangeLog	25 Aug 2007 16:10:37 -0000	1.4101
+++ ChangeLog	25 Aug 2007 19:07:45 -0000	1.4102
@@ -1,5 +1,10 @@
 2007-08-25 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/actionscript.all/ops.as: more tests about isNaN(x) when
+	  x != NaN (odd)
+
+2007-08-25 Sandro Santilli <strk@keybit.net>
+
 	* server/vm/ASHandlers.cpp (ActionNewLessThan): convert operands to
 	  primitive value before proceeding.
 	* testsuite/actionscript.all/ops.as: xcheck => check

Index: testsuite/actionscript.all/ops.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/ops.as,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- testsuite/actionscript.all/ops.as	25 Aug 2007 16:10:37 -0000	1.19
+++ testsuite/actionscript.all/ops.as	25 Aug 2007 19:07:46 -0000	1.20
@@ -20,7 +20,7 @@
  *  Test binary predicates (equal, less_then, greater_then, logical and bitwise ops)
  */
 
-rcsid="$Id: ops.as,v 1.19 2007/08/25 16:10:37 strk Exp $";
+rcsid="$Id: ops.as,v 1.20 2007/08/25 19:07:46 strk Exp $";
 
 #include "check.as"
 
@@ -550,8 +550,11 @@
 
 x = new String("a");
 y = --x;
-xcheck(y!=NaN);
+check_equals(typeof(y), 'number');
+xcheck(y!=NaN); // uh ? is it a different NaN ?
+check(! (NaN!=NaN));
 check(isNaN(y));
+check(isNaN(NaN));
 
 //------------------------------------------------
 // Increment Operator (ACTION_DECREMENT: 0x50)



From MAILER-DAEMON Sat Aug 25 17:10:11 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IP2tX-0001LJ-1G
	for mharc-gnash-commit@gnu.org; Sat, 25 Aug 2007 17:10:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IP2tV-0001Jk-9b
	for gnash-commit@gnu.org; Sat, 25 Aug 2007 17:10:09 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IP2tT-0001IZ-UM
	for gnash-commit@gnu.org; Sat, 25 Aug 2007 17:10:08 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IP2tT-0001IO-Nr
	for gnash-commit@gnu.org; Sat, 25 Aug 2007 17:10:07 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IOwQd-0005WQ-3A
	for gnash-commit@gnu.org; Sat, 25 Aug 2007 10:15:56 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IOwQa-0007W2-K1
	for gnash-commit@gnu.org; Sat, 25 Aug 2007 14:15:52 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IOwQa-0007Vv-3W
	for gnash-commit@gnu.org; Sat, 25 Aug 2007 14:15:52 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IOwQa-0007Vv-3W@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 25 Aug 2007 14:15:52 +0000
X-Detected-Kernel: Error: This connection is not (no longer?) in the cache.
Subject: [Gnash-commit] gnash ChangeLog server/as_value.cpp server/as_v...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Aug 2007 21:10:09 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/25 14:15:51

Modified files:
	.              : ChangeLog 
	server         : as_value.cpp as_value.h 
	server/vm      : ASHandlers.cpp 
	testsuite/actionscript.all: Number.as ops.as toString_valueOf.as 

Log message:
	        * server/vm/ASHandlers.cpp (ActionNewAdd): convert operands to
	          primitive value before proceeding.
	        * server/as_value.h: make to_primitive() public
	        * server/as_value.cpp (to_number): if valueOf returned a string value
	          call to_number() again on it; (equals): if one operand is a string
	          and the other is a number, don't compare unless the string converts
	          to a non-infinite number.
	        * testsuite/actionscript.all/Number.as: add test for 'string'
	          convertion to number returning NaN
	        * testsuite/actionscript.all/ops.as: xcheck => check
	        * testsuite/actionscript.all/toString_valueOf.as xcheck => check

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4099&r2=1.4100
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.h?cvsroot=gnash&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.125&r2=1.126
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Number.as?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/ops.as?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/toString_valueOf.as?cvsroot=gnash&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4099
retrieving revision 1.4100
diff -u -b -r1.4099 -r1.4100
--- ChangeLog	24 Aug 2007 16:07:26 -0000	1.4099
+++ ChangeLog	25 Aug 2007 14:15:49 -0000	1.4100
@@ -1,3 +1,17 @@
+2007-08-25 Sandro Santilli <strk@keybit.net>
+
+	* server/vm/ASHandlers.cpp (ActionNewAdd): convert operands to
+	  primitive value before proceeding.
+	* server/as_value.h: make to_primitive() public
+	* server/as_value.cpp (to_number): if valueOf returned a string value
+	  call to_number() again on it; (equals): if one operand is a string
+	  and the other is a number, don't compare unless the string converts
+	  to a non-infinite number.
+	* testsuite/actionscript.all/Number.as: add test for 'string'
+	  convertion to number returning NaN
+	* testsuite/actionscript.all/ops.as: xcheck => check
+	* testsuite/actionscript.all/toString_valueOf.as xcheck => check
+
 2007-08-24 Sandro Santilli <strk@keybit.net>
 
 	* server/dlist.{h,cpp} (replace_character): call unload() on replaced

Index: server/as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- server/as_value.cpp	24 Aug 2007 16:07:27 -0000	1.66
+++ server/as_value.cpp	25 Aug 2007 14:15:50 -0000	1.67
@@ -299,6 +299,10 @@
 					{
 						return ret.m_number_value;
 					}
+					else if ( ret.is_string() )
+					{
+						return ret.to_number();
+					}
 					else
 					{
 						log_msg(_("[object %p].%s() did not return a number: %s"),
@@ -687,14 +691,18 @@
     //    return the result of the comparison x == ToNumber(y).
     else if (m_type == NUMBER && v.m_type == STRING)
     {
-        return equalsSameType(v.to_number(&env)); 
+	double n = v.to_number(&env); // no need for the env actually
+	if ( ! isfinite(n) ) return false;
+        return equalsSameType(n);
     }
 
     // 17. If Type(x) is String and Type(y) is Number,
     //     return the result of the comparison ToNumber(x) == y.
     else if (v.m_type == NUMBER && m_type == STRING)
     {
-        return v.equalsSameType(to_number(&env)); 
+	double n = to_number(&env); // no need for the env actually
+	if ( ! isfinite(n) ) return false;
+        return v.equalsSameType(n); 
     }
 
     // 18. If Type(x) is Boolean, return the result of the comparison ToNumber(x) == y.

Index: server/as_value.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.h,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- server/as_value.h	13 Aug 2007 02:47:58 -0000	1.63
+++ server/as_value.h	25 Aug 2007 14:15:51 -0000	1.64
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: as_value.h,v 1.63 2007/08/13 02:47:58 strk Exp $ */
+/* $Id: as_value.h,v 1.64 2007/08/25 14:15:51 strk Exp $ */
 
 #ifndef GNASH_AS_VALUE_H
 #define GNASH_AS_VALUE_H
@@ -424,6 +424,16 @@
 	/// or NULL if it is not an ActionScript function.
 	as_function*	to_as_function() const;
 
+	/// Return value as a primitive type
+	//
+	/// Primitive types are: undefined, null, boolean, string, number.
+	/// See ECMA-2.6.2 (section 4.3.2).
+	///
+	/// @param env
+	/// 	The environment to use for calling the valueOf method.
+	///
+	as_value to_primitive(as_environment& env) const;
+
 	/// Force type to number.
 	//
 	/// @param env
@@ -573,16 +583,6 @@
 	void	set_sprite(const std::string& path);
 
 
-	/// Return value as a primitive type
-	//
-	/// Primitive types are: undefined, null, boolean, string, number.
-	/// See ECMA-2.6.2 (section 4.3.2).
-	///
-	/// @param env
-	/// 	The environment to use for calling the valueOf method.
-	///
-	as_value to_primitive(as_environment& env) const;
-
 	/// Compare values of the same type
 	//
 	/// NOTE: will abort if values are not of the same type!

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -b -r1.125 -r1.126
--- server/vm/ASHandlers.cpp	23 Aug 2007 16:50:56 -0000	1.125
+++ server/vm/ASHandlers.cpp	25 Aug 2007 14:15:51 -0000	1.126
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ASHandlers.cpp,v 1.125 2007/08/23 16:50:56 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.126 2007/08/25 14:15:51 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -2765,18 +2765,21 @@
 
     thread.ensureStack(2);
 
-    as_value& v1 = env.top(0);
-    as_value& v2 = env.top(1);
+    as_value& v1_in = env.top(0);
+    as_value& v2_in = env.top(1);
 
-    //log_msg(_("ActionNewAdd(%s, %s) called"), v1.to_debug_string().c_str(), v2.to_debug_string().c_str());
+    as_value v1 = v1_in.to_primitive(env);
+    as_value v2 = v2_in.to_primitive(env);
+
+    //log_msg(_("ActionNewAdd(%s, %s) [prim %s, %s] called"), v1_in.to_debug_string().c_str(), v2_in.to_debug_string().c_str(), v1.to_debug_string().c_str(), v2.to_debug_string().c_str());
 
 
     if (v1.is_string() || v2.is_string() )
     {
     	int version = env.get_version();
-        // modify env.top(1)
         v2.convert_to_string_versioned(version, &env);
         v2.string_concat(v1.to_string_versioned(version, &env));
+	v2_in = v2; // modify env.top(1)
     }
     else
     {
@@ -2786,7 +2789,9 @@
 	double v1num = v1.to_number(&env);
 	//log_msg(_("v1 num = %g"), v1num);
 
-        v2.set_double(v2num + v1num); // modify env.top(1)
+        v2.set_double(v2num + v1num); 
+
+	v2_in = v2; // modify env.top(1)
     }
     env.drop(1);
 }

Index: testsuite/actionscript.all/Number.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Number.as,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- testsuite/actionscript.all/Number.as	26 Jul 2007 03:41:19 -0000	1.27
+++ testsuite/actionscript.all/Number.as	25 Aug 2007 14:15:51 -0000	1.28
@@ -27,7 +27,7 @@
 // TODO: test with SWF target != 6 (the only one tested so far)
 //	
 
-rcsid="$Id: Number.as,v 1.27 2007/07/26 03:41:19 strk Exp $";
+rcsid="$Id: Number.as,v 1.28 2007/08/25 14:15:51 strk Exp $";
 
 #include "check.as"
 
@@ -346,6 +346,9 @@
 asm { push 'val','2p' tonumber setvariable };
 check(isNaN(val));
 
+asm { push 'val','string' tonumber setvariable };
+check(isNaN(val));
+
 asm { push 'val','NaN' tonumber setvariable };
 check(isNaN(val));
 

Index: testsuite/actionscript.all/ops.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/ops.as,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- testsuite/actionscript.all/ops.as	19 Aug 2007 23:34:55 -0000	1.17
+++ testsuite/actionscript.all/ops.as	25 Aug 2007 14:15:51 -0000	1.18
@@ -20,7 +20,7 @@
  *  Test binary predicates (equal, less_then, greater_then, logical and bitwise ops)
  */
 
-rcsid="$Id: ops.as,v 1.17 2007/08/19 23:34:55 strk Exp $";
+rcsid="$Id: ops.as,v 1.18 2007/08/25 14:15:51 strk Exp $";
 
 #include "check.as"
 
@@ -42,8 +42,12 @@
 check(! (0 == NaN) );
 check(! ('string' == 0) );
 check(! (0 == 'string') );
-xcheck(! ('string' == NaN) );
-xcheck(! (NaN == 'string') );
+check(! ('string' == NaN) );
+check(! (NaN == 'string') );
+check(! (Infinite == 'Infinite') );
+check(! ('Infinite' == Infinite) );
+check(! (-Infinite == '-Infinite') );
+check(! ('-Infinite' == -Infinite) );
 check(1==true);
 check(true==1);
 check(2!=true);
@@ -76,7 +80,7 @@
 check_equals( str3.toString(), 3.0 ); // str3 (primitive string) is automatically converted to a number 
 
 check( ! (str1 == 0) ); // str1 (object) is NOT converted to a number (due to NaN?)
-xcheck( ! (str1 == NaN) ); // str1 (object) is NOT converted to a number (due to NaN?)
+check( ! (str1 == NaN) ); // str1 (object) is NOT converted to a number (due to NaN?)
 
 #if OUTPUT_VERSION > 5
   check( ! (str1 == str2) ); // they are not the same object
@@ -102,7 +106,7 @@
 
 x=String("0.999");
 y=String("1.0");
-xcheck(x<y);
+check(x<y);
 
 x=String("A");
 y=String("a");
@@ -114,11 +118,11 @@
 
 x=0.999;
 y=String("1.000");
-xcheck(x<y);
+check(x<y);
 
 x=String("0.999");
 y=1.0;
-xcheck(x<y);
+check(x<y);
 
 check(! (NaN < NaN) );
 check(! (undefined < undefined) );
@@ -307,19 +311,19 @@
 
 x = new String("1");
 y = new String("3");
-xcheck_equals(x&y, 1); 
+check_equals(x&y, 1); 
 
 x = new String("1.0");
 y = new String("3.0");
-xcheck_equals(x&y, 1); 
+check_equals(x&y, 1); 
 
 x = new String("1.999");
 y = new String("3.999");
-xcheck_equals(x&y, 1); 
+check_equals(x&y, 1); 
 
 x = new String("3.999");
 y = 7;
-xcheck_equals(x&y, 3); 
+check_equals(x&y, 3); 
 
 x = Number("7.999");
 y = 3;
@@ -351,11 +355,11 @@
 
 x = new String("1.999");
 y = 8.999;
-xcheck_equals(x|y, 9); 
+check_equals(x|y, 9); 
 
 x = String("1.999");
 y = String("8.999");
-xcheck_equals(x|y, 9); 
+check_equals(x|y, 9); 
 
 x = 9;
 y = String("1.5");
@@ -399,15 +403,15 @@
 
 x = new String("1.999");
 y = new String("2.999");
-xcheck_equals(x^y, 3);
+check_equals(x^y, 3);
 
 x = new String("1.999");
 y = 2.999;
-xcheck_equals(x^y, 3);
+check_equals(x^y, 3);
 
 x = 1.999;
 y = new String("2.999");
-xcheck_equals(x^y, 3);
+check_equals(x^y, 3);
 
 
 //------------------------------------------------
@@ -463,11 +467,11 @@
 
 x = String("3");
 y = x << 1;
-xcheck_equals(y, 6);
+check_equals(y, 6);
 
 x = new String("3");
 y = x << 1;
-xcheck_equals(y, 6); 
+check_equals(y, 6); 
 
 //------------------------------------------------
 // Shift right operator (ACTION_SHIFTRIGHT : 0x64)
@@ -503,11 +507,11 @@
 
 x = String("7");
 y = x >> 1;
-xcheck_equals(y, 3);
+check_equals(y, 3);
 
 x = new String("7");
 y = x >> 1;
-xcheck_equals(y, 3);
+check_equals(y, 3);
 
 //-------------------------------------------------
 // Shift right2 operator (ACTION_SHIFTRIGHT2 : 0x65)
@@ -537,12 +541,12 @@
 x = new String("1.9");
 y = --x;
 //xcheck_equals(y, 0.9);
-xcheck( (y-0.9) < 0.001 );
+check( (y-0.9) < 0.001 );
 
 x = new String("0.0");
 y = --x;
 //xcheck_equals(y, -1.0);
-xcheck( (y+1.0) < 0.001 );
+check( (y+1.0) < 0.001 );
 
 x = new String("a");
 y = --x;
@@ -564,11 +568,11 @@
 x = new String("1.9");
 y = ++x;
 //xcheck_equals(y, 2.9);
-xcheck( (y-2.9) < 0.001 );
+check( (y-2.9) < 0.001 );
 
 x = new String("0.0");
 y = ++x;
-xcheck_equals(y, 1);
+check_equals(y, 1);
 
 x = new String("a");
 y = ++x;

Index: testsuite/actionscript.all/toString_valueOf.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/toString_valueOf.as,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- testsuite/actionscript.all/toString_valueOf.as	16 Aug 2007 06:09:14 -0000	1.5
+++ testsuite/actionscript.all/toString_valueOf.as	25 Aug 2007 14:15:51 -0000	1.6
@@ -99,7 +99,7 @@
 num2 = new Number(2);
 num3 = num1 + num2;
 //valueOf called;
-check(num3 == "TO_VALUETO_VALUE");
+check_equals(num3, "TO_VALUETO_VALUE");
 
 x = num1.toString();
 y = num1.valueOf();
@@ -138,8 +138,8 @@
 
 str2 = new String("2");
 str3 = str1+str2;
-xcheck(str3 == "102"); 
-xcheck(str3 == 102); 
+check(str3 == "102"); 
+check(str3 == 102); 
 
 String.prototype.toString = function () {return "TO_STRING";};
 String.prototype.valueOf = function () {return "TO_VALUE";};
@@ -147,9 +147,9 @@
 xcheck(parseInt(str1) == 10); 
 xcheck(parseInt(str2) == 2);  
 str3 =  str1 + str2;
-xcheck(typeof(str3) == "string");
+check(typeof(str3) == "string");
 //valueOf called
-check(str3 == "TO_VALUETO_VALUE"); 
+check_equals(str3, "TO_VALUETO_VALUE"); 
 // trace a string Object won't invoke the toString method.
 // I don't think it's a bug.
 //trace(str1); //output 10 !
@@ -313,7 +313,7 @@
 b2 = new Boolean(true);
 b3 = b1 + b2;
 check(typeof(b3) == 'number');
-xcheck(b3 == 1);
+check_equals(b3, 1);
 
 
 //



From MAILER-DAEMON Sat Aug 25 17:33:27 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IP3G3-0004bL-2X
	for mharc-gnash-commit@gnu.org; Sat, 25 Aug 2007 17:33:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IP3G0-0004Ww-KZ
	for gnash-commit@gnu.org; Sat, 25 Aug 2007 17:33:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IP3Fy-0004TE-FR
	for gnash-commit@gnu.org; Sat, 25 Aug 2007 17:33:23 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IP3Fy-0004Si-7l
	for gnash-commit@gnu.org; Sat, 25 Aug 2007 17:33:22 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IOyDm-00030g-BZ
	for gnash-commit@gnu.org; Sat, 25 Aug 2007 12:10:46 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IOyDe-0005fO-Cb
	for gnash-commit@gnu.org; Sat, 25 Aug 2007 16:10:38 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IOyDe-0005fG-52
	for gnash-commit@gnu.org; Sat, 25 Aug 2007 16:10:38 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IOyDe-0005fG-52@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 25 Aug 2007 16:10:38 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/vm/ASHandlers.cpp testsu...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Aug 2007 21:33:25 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/25 16:10:38

Modified files:
	.              : ChangeLog 
	server/vm      : ASHandlers.cpp 
	testsuite/actionscript.all: ops.as 

Log message:
	        * server/vm/ASHandlers.cpp (ActionNewLessThan): convert operands to
	          primitive value before proceeding.
	        * testsuite/actionscript.all/ops.as: xcheck => check

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4100&r2=1.4101
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.126&r2=1.127
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/ops.as?cvsroot=gnash&r1=1.18&r2=1.19

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4100
retrieving revision 1.4101
diff -u -b -r1.4100 -r1.4101
--- ChangeLog	25 Aug 2007 14:15:49 -0000	1.4100
+++ ChangeLog	25 Aug 2007 16:10:37 -0000	1.4101
@@ -1,5 +1,11 @@
 2007-08-25 Sandro Santilli <strk@keybit.net>
 
+	* server/vm/ASHandlers.cpp (ActionNewLessThan): convert operands to
+	  primitive value before proceeding.
+	* testsuite/actionscript.all/ops.as: xcheck => check
+
+2007-08-25 Sandro Santilli <strk@keybit.net>
+
 	* server/vm/ASHandlers.cpp (ActionNewAdd): convert operands to
 	  primitive value before proceeding.
 	* server/as_value.h: make to_primitive() public

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -b -r1.126 -r1.127
--- server/vm/ASHandlers.cpp	25 Aug 2007 14:15:51 -0000	1.126
+++ server/vm/ASHandlers.cpp	25 Aug 2007 16:10:37 -0000	1.127
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ASHandlers.cpp,v 1.126 2007/08/25 14:15:51 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.127 2007/08/25 16:10:37 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -2805,8 +2805,11 @@
 
 	thread.ensureStack(2);
 
-	as_value& operand1 = env.top(1);
-	as_value& operand2 = env.top(0);
+	as_value& op1_in = env.top(1);
+	as_value& op2_in = env.top(0);
+
+	as_value operand1 = op1_in.to_primitive(env);
+	as_value operand2 = op2_in.to_primitive(env);
 
 	if ( operand1.is_string() && operand2.is_string() )
 	{

Index: testsuite/actionscript.all/ops.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/ops.as,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- testsuite/actionscript.all/ops.as	25 Aug 2007 14:15:51 -0000	1.18
+++ testsuite/actionscript.all/ops.as	25 Aug 2007 16:10:37 -0000	1.19
@@ -20,7 +20,7 @@
  *  Test binary predicates (equal, less_then, greater_then, logical and bitwise ops)
  */
 
-rcsid="$Id: ops.as,v 1.18 2007/08/25 14:15:51 strk Exp $";
+rcsid="$Id: ops.as,v 1.19 2007/08/25 16:10:37 strk Exp $";
 
 #include "check.as"
 
@@ -110,11 +110,11 @@
 
 x=String("A");
 y=String("a");
-xcheck(x<y);
+check(x<y);
 
 x=String("abc");
 y=String("abcd");
-xcheck(x<y);
+check(x<y);
 
 x=0.999;
 y=String("1.000");



From MAILER-DAEMON Sat Aug 25 17:38:56 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IP3LL-0002Nn-Vg
	for mharc-gnash-commit@gnu.org; Sat, 25 Aug 2007 17:38:56 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IP3LK-0002N5-IQ
	for gnash-commit@gnu.org; Sat, 25 Aug 2007 17:38:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IP3LI-0002M0-H9
	for gnash-commit@gnu.org; Sat, 25 Aug 2007 17:38:53 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IP3LI-0002Ld-1x
	for gnash-commit@gnu.org; Sat, 25 Aug 2007 17:38:52 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IP3LH-0001fa-F0
	for gnash-commit@gnu.org; Sat, 25 Aug 2007 17:38:51 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IP3LF-0002fD-M4
	for gnash-commit@gnu.org; Sat, 25 Aug 2007 21:38:49 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IP3LF-0002f9-GY
	for gnash-commit@gnu.org; Sat, 25 Aug 2007 21:38:49 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IP3LF-0002f9-GY@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 25 Aug 2007 21:38:49 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/toSt...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Aug 2007 21:38:55 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/25 21:38:49

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: toString_valueOf.as 

Log message:
	        * testsuite/actionscript.all/toString_valueOf.as: note that any
	          function is equal to any other in SWF5...

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4102&r2=1.4103
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/toString_valueOf.as?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4102
retrieving revision 1.4103
diff -u -b -r1.4102 -r1.4103
--- ChangeLog	25 Aug 2007 19:07:45 -0000	1.4102
+++ ChangeLog	25 Aug 2007 21:38:48 -0000	1.4103
@@ -1,5 +1,7 @@
 2007-08-25 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/actionscript.all/toString_valueOf.as: note that any
+	  function is equal to any other in SWF5...
 	* testsuite/actionscript.all/ops.as: more tests about isNaN(x) when
 	  x != NaN (odd)
 

Index: testsuite/actionscript.all/toString_valueOf.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/toString_valueOf.as,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- testsuite/actionscript.all/toString_valueOf.as	25 Aug 2007 14:15:51 -0000	1.6
+++ testsuite/actionscript.all/toString_valueOf.as	25 Aug 2007 21:38:49 -0000	1.7
@@ -56,9 +56,10 @@
   check(obj.toString != Object.prototype.toString);
   check(obj.valueOf != Object.prototype.valueOf);
 #else
-  // this is true only in swf5
+  // this is true only in swf5 (any function is equal to any other in SWF5)
   xcheck(obj.toString == Object.prototype.toString);
   xcheck(obj.valueOf == Object.prototype.valueOf);
+  xcheck(obj.toString == obj.valueOf);
 #endif
 x = obj.toString();
 y = obj.valueOf();



From MAILER-DAEMON Sat Aug 25 19:11:08 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IP4ma-00038Y-Re
	for mharc-gnash-commit@gnu.org; Sat, 25 Aug 2007 19:11:08 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IP4mX-000376-DQ
	for gnash-commit@gnu.org; Sat, 25 Aug 2007 19:11:05 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IP4mV-00036u-Ny
	for gnash-commit@gnu.org; Sat, 25 Aug 2007 19:11:04 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IP4mV-00036r-J9
	for gnash-commit@gnu.org; Sat, 25 Aug 2007 19:11:03 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IP4mV-0005kV-96
	for gnash-commit@gnu.org; Sat, 25 Aug 2007 19:11:03 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IP4mT-0000Ox-KN
	for gnash-commit@gnu.org; Sat, 25 Aug 2007 23:11:01 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IP4mT-0000Oh-9S
	for gnash-commit@gnu.org; Sat, 25 Aug 2007 23:11:01 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IP4mT-0000Oh-9S@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 25 Aug 2007 23:11:01 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/asobj/string.cpp testsui...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Aug 2007 23:11:05 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/25 23:11:01

Modified files:
	.              : ChangeLog 
	server/asobj   : string.cpp 
	testsuite/actionscript.all: String.as 
	testsuite/swfdec: PASSING 

Log message:
	        * server/asobj/string.cpp (string_split): correctly handle some more
	          corner cases.
	        * testsuite/swfdec/PASSING: string-split-empty-*.swf tests succeed.
	        * testsuite/actionscript.all/String.as: some more testing for
	          String.split

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4103&r2=1.4104
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/string.cpp?cvsroot=gnash&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/String.as?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/PASSING?cvsroot=gnash&r1=1.25&r2=1.26

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4103
retrieving revision 1.4104
diff -u -b -r1.4103 -r1.4104
--- ChangeLog	25 Aug 2007 21:38:48 -0000	1.4103
+++ ChangeLog	25 Aug 2007 23:11:00 -0000	1.4104
@@ -1,3 +1,11 @@
+2007-08-26 Sandro Santilli <strk@keybit.net>
+
+	* server/asobj/string.cpp (string_split): correctly handle some more
+	  corner cases.
+	* testsuite/swfdec/PASSING: string-split-empty-*.swf tests succeed.
+	* testsuite/actionscript.all/String.as: some more testing for
+	  String.split
+
 2007-08-25 Sandro Santilli <strk@keybit.net>
 
 	* testsuite/actionscript.all/toString_valueOf.as: note that any

Index: server/asobj/string.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/string.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- server/asobj/string.cpp	1 Aug 2007 15:56:54 -0000	1.34
+++ server/asobj/string.cpp	25 Aug 2007 23:11:00 -0000	1.35
@@ -16,7 +16,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: string.cpp,v 1.34 2007/08/01 15:56:54 strk Exp $ */
+/* $Id: string.cpp,v 1.35 2007/08/25 23:11:00 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -223,7 +223,10 @@
 
     boost::intrusive_ptr<as_array_object> array(new as_array_object());
 
-    if (fn.nargs == 0) {
+    int SWFVersion = fn.env().get_version();
+
+    if (fn.nargs == 0)
+    {
         val.set_std_string(str);
         array->push(val);
 
@@ -233,7 +236,7 @@
     const std::string& delim = fn.arg(0).to_string(&(fn.env()));
 
     // SWF5 didn't support multichar or empty delimiter
-    if ( fn.env().get_version() < 6 )
+    if ( SWFVersion < 6 )
     {
 	    if ( delim.size() != 1 )
 	    {
@@ -245,10 +248,25 @@
 
     size_t max = str.size();
 
-    if (fn.nargs >= 2) {
-        max = iclamp(fn.arg(1).to_number<size_t>(), 0, str.size());
+    if (fn.nargs >= 2)
+    {
+	int max_in = fn.arg(1).to_number<int>();
+	if ( SWFVersion < 6 && max_in < 1 )
+	{
+		return as_value(array.get());
+	}
+        max = iclamp((size_t)max_in, 0, str.size());
     }
 
+    if ( str.empty() )
+    {
+        val.set_std_string(str);
+        array->push(val);
+
+        return as_value(array.get());
+    }
+
+
     //if (delim == "") {
     if ( delim.empty() ) {
         for (unsigned i=0; i <max; i++) {

Index: testsuite/actionscript.all/String.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/String.as,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- testsuite/actionscript.all/String.as	1 Jul 2007 10:54:40 -0000	1.19
+++ testsuite/actionscript.all/String.as	25 Aug 2007 23:11:00 -0000	1.20
@@ -16,7 +16,7 @@
 
 // Original author: Mike Carlson - June 19th, 2006
 
-rcsid="$Id: String.as,v 1.19 2007/07/01 10:54:40 bjacques Exp $";
+rcsid="$Id: String.as,v 1.20 2007/08/25 23:11:00 strk Exp $";
 
 #include "check.as"
 
@@ -75,13 +75,60 @@
 check_equals ( a.split("la").length, 1 );
 #endif
 
+// TODO: test String.split(delim, limit)  [ second arg ]
+
+primitiveString = '';
+ret = primitiveString.split('x');
+check_equals(typeof(ret), 'object');
+check_equals(ret.length, 1);
+check_equals(typeof(ret[0]), 'string');
+check_equals(ret[0], '');
+
+ret = primitiveString.split('x', -1);
+#if OUTPUT_VERSION < 6
+	check_equals(ret.length, 0); 
+#else // OUTPUT_VERSION >= 6
+	check_equals(ret.length, 1); 
+#endif // OUTPUT_VERSION >= 6
+ret = primitiveString.split('x', 0);
+#if OUTPUT_VERSION < 6
+	check_equals(ret.length, 0); 
+#else // OUTPUT_VERSION >= 6
+	check_equals(ret.length, 1); 
+#endif // OUTPUT_VERSION >= 6
+ret = primitiveString.split('x', 1);
+check_equals(ret.length, 1);
+ret = primitiveString.split('x', 2);
+check_equals(ret.length, 1);
+
+primitiveString = 'abcde';
+ret = primitiveString.split('x');
+check_equals(typeof(ret), 'object');
+check_equals(ret.length, 1);
+check_equals(typeof(ret[0]), 'string');
+check_equals(ret[0], 'abcde');
+
+
+//----------------------------------------
+// Check String.fromCharCode
+//-----------------------------------------
+
 
 // This is the correct usage pattern
 var b = String.fromCharCode(97,98,99,100);
 check_equals ( b, "abcd" );
 
+//-------------------------------------------
+// Check String.toUpperCase and toLowerCase
+//-------------------------------------------
+
 check_equals ( a.toUpperCase(), "WALLAWALLAWASHINGTON" );
 check_equals ( a.toLowerCase(), "wallawallawashington" );
+
+//-------------------------------------------
+// Check substr / slice / substring
+//-------------------------------------------
+
 a = new String("abcdefghijklmnopqrstuvwxyz");
 check_equals ( a.substr(5,2), "fg" );
 check_equals ( a.substr(5,7), "fghijkl" );

Index: testsuite/swfdec/PASSING
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/PASSING,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- testsuite/swfdec/PASSING	6 Aug 2007 20:42:57 -0000	1.25
+++ testsuite/swfdec/PASSING	25 Aug 2007 23:11:01 -0000	1.26
@@ -96,3 +96,6 @@
 bitwise-5.swf
 bitwise-6.swf
 bitwise-7.swf
+string-split-empty-5.swf
+string-split-empty-6.swf
+string-split-empty-7.swf



From MAILER-DAEMON Sun Aug 26 06:23:54 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPFHe-0002VY-1B
	for mharc-gnash-commit@gnu.org; Sun, 26 Aug 2007 06:23:54 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPFHc-0002VT-DE
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 06:23:52 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPFHb-0002VH-6r
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 06:23:51 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPFHb-0002VE-1O
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 06:23:51 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IPFHa-00016p-Pu
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 06:23:50 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IPFHZ-0002BC-AA
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 10:23:49 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IPFHY-0002B9-Ug
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 10:23:49 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPFHY-0002B9-Ug@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sun, 26 Aug 2007 10:23:48 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog configure.ac doc/C/usermanual/i...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Aug 2007 10:23:52 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/26 10:23:48

Modified files:
	.              : ChangeLog configure.ac 
	doc/C/usermanual/installation: feature_configuration.xml 
	gui            : gtk_glue_agg.cpp 

Log message:
	        * configure.ac: keep mit-shm enabled by default (use --disable-mit-shm
	          to disable).
	        * doc/C/usermanual/installation/feature_configuration.xml: update
	          documentation about --disable-mit-shm.
	
	Patch by Lauri Myllari  <lauri.myllari@gmail.com>:
	
	        * gui/gtk_glue_agg.cpp: fix expose events with mit-shm, by
	          disabling double buffering for _drawing_are

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4104&r2=1.4105
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.406&r2=1.407
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/installation/feature_configuration.xml?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk_glue_agg.cpp?cvsroot=gnash&r1=1.27&r2=1.28

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4104
retrieving revision 1.4105
diff -u -b -r1.4104 -r1.4105
--- ChangeLog	25 Aug 2007 23:11:00 -0000	1.4104
+++ ChangeLog	26 Aug 2007 10:23:47 -0000	1.4105
@@ -1,5 +1,17 @@
 2007-08-26 Sandro Santilli <strk@keybit.net>
 
+	* configure.ac: keep mit-shm enabled by default (use --disable-mit-shm
+	  to disable).
+	* doc/C/usermanual/installation/feature_configuration.xml: update
+	  documentation about --disable-mit-shm.
+
+2007-08-26 Lauri Myllari    <lauri.myllari@gmail.com>
+
+	* gui/gtk_glue_agg.cpp: fix expose events with mit-shm, by
+	  disabling double buffering for _drawing_are
+
+2007-08-26 Sandro Santilli <strk@keybit.net>
+
 	* server/asobj/string.cpp (string_split): correctly handle some more
 	  corner cases.
 	* testsuite/swfdec/PASSING: string-split-empty-*.swf tests succeed.

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -b -r1.406 -r1.407
--- configure.ac	23 Aug 2007 09:26:50 -0000	1.406
+++ configure.ac	26 Aug 2007 10:23:48 -0000	1.407
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.406 2007/08/23 09:26:50 strk Exp $
+dnl $Id: configure.ac,v 1.407 2007/08/26 10:23:48 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -410,12 +410,12 @@
 dnl --------------------------------------------------------
 
 AC_ARG_ENABLE(mit-shm,
-  AC_HELP_STRING([--enable-mit-shm], [Enable support for the MIT-SHM X extension]),
+  AC_HELP_STRING([--disablee-mit-shm], [Disable support for the MIT-SHM X extension]),
 [case "${enableval}" in
   yes) xmitshm=yes ;;
   no)  xmitshm=no ;;
   *)   AC_MSG_ERROR([bad value ${enableval} for --enable-mit-shm option]) ;;
-esac],xmitshm=no)
+esac],xmitshm=yes)
 if test "x${xmitshm}" = "xyes"; then
 	AC_DEFINE(ENABLE_MIT_SHM, [1], [Use MIT-SHM X extension if available])
 fi

Index: doc/C/usermanual/installation/feature_configuration.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/usermanual/installation/feature_configuration.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- doc/C/usermanual/installation/feature_configuration.xml	16 Aug 2007 14:27:35 -0000	1.14
+++ doc/C/usermanual/installation/feature_configuration.xml	26 Aug 2007 10:23:48 -0000	1.15
@@ -237,11 +237,13 @@
 </entry>
 </row>
 <row>
-  <entry><option>--enable-mit-shm</option>
+  <entry><option>--disable-mit-shm</option>
 </entry>
-  <entry>Add support for using the MIT-SHM X extensions when available. 
-	Currently only available using GTK gui and AGG renderer, and known to be
-	bogus in handling of expose events (http://savannah.gnu.org/bugs/?20301).</entry>
+  <entry>Disable support for the MIT-SHM X extensions.
+	Currently support is only available using GTK gui and AGG renderer.
+	Keeping it enabled is not a problem as it will not be used if not
+	available in the current X session.
+	</entry>
 </row>
 </tbody>
 </tgroup>

Index: gui/gtk_glue_agg.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk_glue_agg.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- gui/gtk_glue_agg.cpp	2 Aug 2007 07:54:33 -0000	1.27
+++ gui/gtk_glue_agg.cpp	26 Aug 2007 10:23:48 -0000	1.28
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: gtk_glue_agg.cpp,v 1.27 2007/08/02 07:54:33 udog Exp $ */
+/* $Id: gtk_glue_agg.cpp,v 1.28 2007/08/26 10:23:48 strk Exp $ */
 
 
 /// \page gtk_shm_support GTK shared memory extension support
@@ -206,8 +206,11 @@
     return;
   }
   
+  // Disable double buffering, otherwise gtk tries to update widget
+  // contents from offscreen buffer at the end of expose event
+  gtk_widget_set_double_buffered(_drawing_area, FALSE);
   //log_msg("create_shm_image() OK"); // <-- remove this
-#endif
+#endif // ENABLE_MIT_SHM
    
 }
 



From MAILER-DAEMON Sun Aug 26 11:14:28 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPJop-0000Um-RW
	for mharc-gnash-commit@gnu.org; Sun, 26 Aug 2007 11:14:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPJom-0000TH-8M
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 11:14:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPJoe-0000OR-SZ
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 11:14:22 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPJoe-0000NW-Br
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 11:14:16 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <chadmusick@msbx.net>) id 1IPJod-0004EZ-Ez
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 11:14:16 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <chadmusick@msbx.net>) id 1IPJoc-0004ru-1l
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 15:14:14 +0000
Received: from cmusick by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <cmusick@savannah.gnu.org>) id 1IPJob-0004rk-OB
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 15:14:13 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPJob-0004rk-OB@cvs.savannah.gnu.org>
From: Chad Musick <chadmusick@msbx.net>
Date: Sun, 26 Aug 2007 15:14:13 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/Makefile.am server/strea...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Aug 2007 15:14:24 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Chad Musick <cmusick>	07/08/26 15:14:13

Modified files:
	.              : ChangeLog 
	server         : Makefile.am stream.h stream.cpp 
	server/swf     : PlaceObject2Tag.cpp 
Added files:
	server         : BevelFilter.h BevelFilter.cpp BitmapFilter.h 
	                 BlurFilter.cpp BlurFilter.h 
	                 ColorMatrixFilter.cpp ColorMatrixFilter.h 
	                 ConvolutionFilter.cpp ConvolutionFilter.h 
	                 DropShadowFilter.cpp DropShadowFilter.h 
	                 GlowFilter.h GlowFilter.cpp 
	                 GradientBevelFilter.cpp GradientBevelFilter.h 
	                 GradientGlowFilter.cpp GradientGlowFilter.h 
	server/parser  : filter_factory.h filter_factory.cpp 

Log message:
	Splits the filters file into a separate class and files for each filter,
	since they are first class objects in ActionScript, so they need a bit
	more interface exposed.
	
	Changes to stream to make get_short_fixed() work correctly, as well as
	adding some unsigned versions of fixed routines and full float version.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4105&r2=1.4106
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Makefile.am?cvsroot=gnash&r1=1.122&r2=1.123
http://cvs.savannah.gnu.org/viewcvs/gnash/server/stream.h?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/server/stream.cpp?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/server/BevelFilter.h?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/BevelFilter.cpp?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/BitmapFilter.h?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/BlurFilter.cpp?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/BlurFilter.h?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/ColorMatrixFilter.cpp?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/ColorMatrixFilter.h?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/ConvolutionFilter.cpp?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/ConvolutionFilter.h?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/DropShadowFilter.cpp?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/DropShadowFilter.h?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/GlowFilter.h?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/GlowFilter.cpp?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/GradientBevelFilter.cpp?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/GradientBevelFilter.h?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/GradientGlowFilter.cpp?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/GradientGlowFilter.h?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/filter_factory.h?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/filter_factory.cpp?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/PlaceObject2Tag.cpp?cvsroot=gnash&r1=1.19&r2=1.20

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4105
retrieving revision 1.4106
diff -u -b -r1.4105 -r1.4106
--- ChangeLog	26 Aug 2007 10:23:47 -0000	1.4105
+++ ChangeLog	26 Aug 2007 15:14:09 -0000	1.4106
@@ -1,3 +1,21 @@
+2007-08-26 Chad Musick <chadmusick@msbx.net>
+
+	* server/Makefile.am: Add new files, remove obsolete ones.
+	* server/BevelFilter.h,.cpp: A Bevel display object filter
+	* server/BitmapFilter.h: Base class for other filters
+	* server/BlurFilter.h,.cpp: A Blur display object filter
+	* server/ColorMatrixFilter.h,.cpp: A color matrix display filter
+	* server/ConvolutionFilter.h,.cpp: A convolution display filter
+	* server/DropShadowFilter.h,.cpp: A drop shadow display filter
+	* server/GlowFilter.h,.cpp: A glow display filter
+	* server/GradientBevelFilter.h,.cpp: A gradient bevel filter
+	* server/GradientGlowFilter.h,.cpp: A gradient glow filter
+	* server/filters.h,.cpp: Removed (split to other files)
+	* server/stream.h,stream.cpp: Added read_float, read_short_ufixed,
+	  fixed calculation of value in read_short_fixed, added read_ufixed
+	* server/parser/filter_factory.h,.cpp: parsing code of filters
+	* server/swf/PlaceObject2Tag.cpp: Changed to use new filters
+
 2007-08-26 Sandro Santilli <strk@keybit.net>
 
 	* configure.ac: keep mit-shm enabled by default (use --disable-mit-shm

Index: server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/Makefile.am,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -b -r1.122 -r1.123
--- server/Makefile.am	24 Aug 2007 05:57:09 -0000	1.122
+++ server/Makefile.am	26 Aug 2007 15:14:10 -0000	1.123
@@ -18,7 +18,7 @@
 # 
 #
 
-# $Id: Makefile.am,v 1.122 2007/08/24 05:57:09 cmusick Exp $
+# $Id: Makefile.am,v 1.123 2007/08/26 15:14:10 cmusick Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -65,7 +65,15 @@
 	cxform.cpp \
 	DynamicShape.cpp	\
 	edit_text_character.cpp \
-        filters.cpp \
+        BlurFilter.cpp \
+        GlowFilter.cpp \
+        DropShadowFilter.cpp \
+        ConvolutionFilter.cpp \
+        ColorMatrixFilter.cpp \
+        GradientGlowFilter.cpp \
+        BevelFilter.cpp \
+        GradientBevelFilter.cpp \
+        parser/filter_factory.cpp \
 	generic_character.cpp \
 	matrix.cpp \
 	movie_instance.cpp \
@@ -129,7 +137,16 @@
 	event_id.h \
 	execute_tag.h \
 	fill_style.h \
-        filters.h \
+        BitmapFilter.h \
+        BlurFilter.h \
+        BevelFilter.h \
+        GradientBevelFilter.h \
+        GlowFilter.h \
+        GradientGlowFilter.h \
+        DropShadowFilter.h \
+        ConvolutionFilter.h \
+        ColorMatrixFilter.h \
+        parser/filter_factory.h \
 	font.h \
 	fontlib.h \
 	generic_character.h \

Index: server/stream.h
===================================================================
RCS file: /sources/gnash/gnash/server/stream.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- server/stream.h	24 Aug 2007 05:45:51 -0000	1.24
+++ server/stream.h	26 Aug 2007 15:14:12 -0000	1.25
@@ -51,8 +51,23 @@
 		/// number of bits to read.
 		int	read_sint(unsigned short bitcount);
 
+		/// \brief
+		/// Reads a little-endian decimal point value in the
+		/// format that the first half is before the decimal
+		/// point and the second half is after the decimal.
+		/// _fixed is 32 bits, short_fixed is 16. The _sfixed
+		/// versions read a signed fixed value.
 		float	read_fixed();
-                float   read_short_fixed();
+		float	read_ufixed();
+                float   read_short_ufixed();
+		float	read_short_sfixed();
+
+		/// \brief
+		/// Read floating point values, not in the fixed format.
+		float	read_float();
+
+		/// \brief
+		/// Correct for any unused bits from a uint read.
 		void	align();
 
 		unsigned read(char *buf, unsigned count);

Index: server/stream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/stream.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- server/stream.cpp	24 Aug 2007 05:45:51 -0000	1.24
+++ server/stream.cpp	26 Aug 2007 15:14:12 -0000	1.25
@@ -116,14 +116,43 @@
 
 	float	stream::read_fixed()
 	{
+#if 0 /* Chad */
 		m_unused_bits = 0;
 		int32_t	val = m_input->read_le32();
 		return (float) val / 65536.0f;
+#else
+		align();
+		return static_cast<float> (static_cast<double> (static_cast<long int> (m_input->read_le32())) / 65536.0f);
+#endif /* Chad */
 	}
-        float   stream::read_short_fixed()
+
+	// float is not large enough to hold a 32 bit value without doing the wrong thing with the sign.
+	// So we upgrade to double for the calculation and then resize when we know it's small enough.
+	float	stream::read_ufixed()
         {
-                m_unused_bits = 0;
-                return (float) m_input->read_le16();
+		align();
+		return static_cast<float> (static_cast<double> (static_cast<unsigned long int> (m_input->read_le32())) / 65536.0f);
+        }
+
+	// Read a short fixed value, unsigned.
+        float   stream::read_short_ufixed()
+        {
+		align();
+		return static_cast<float> (static_cast<uint16_t> (m_input->read_le16())) / 256.0f;
+        }
+
+	// Read a short fixed value, signed.
+	float	stream::read_short_sfixed()
+	{
+		align();
+		return static_cast<float> (static_cast<int16_t> (m_input->read_le16())) / 256.0f;
+	}
+
+	// Read a signed float value.
+	float	stream::read_float()
+	{
+		align();
+		return static_cast<float> (m_input->read_le32());
         }
 
 	void	stream::align() { m_unused_bits = 0; m_current_byte = 0; }

Index: server/swf/PlaceObject2Tag.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/PlaceObject2Tag.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/swf/PlaceObject2Tag.cpp	24 Aug 2007 10:46:11 -0000	1.19
+++ server/swf/PlaceObject2Tag.cpp	26 Aug 2007 15:14:13 -0000	1.20
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: PlaceObject2Tag.cpp,v 1.19 2007/08/24 10:46:11 strk Exp $ */
+/* $Id: PlaceObject2Tag.cpp,v 1.20 2007/08/26 15:14:13 cmusick Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -29,7 +29,7 @@
 #include "swf_event.h"
 #include "log.h"
 #include "stream.h"
-#include "filters.h"
+#include "filter_factory.h"
 
 namespace gnash {
 namespace SWF {
@@ -268,8 +268,8 @@
 
         if (has_filters)
         {
-            effect_filters::effect_filters_vec v; // TODO: Something should be done with the filters...
-            effect_filters::filter_factory::read(in, movie_version, true, &v);
+            Filters v; // TODO: Attach the filters to the display object.
+            filter_factory::read(in, movie_version, true, &v);
         }
 
         if (has_blend_mode)

Index: server/BevelFilter.h
===================================================================
RCS file: server/BevelFilter.h
diff -N server/BevelFilter.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/BevelFilter.h	26 Aug 2007 15:14:10 -0000	1.1
@@ -0,0 +1,85 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+/* $Id: BevelFilter.h,v 1.1 2007/08/26 15:14:10 cmusick Exp $ */
+
+#ifndef GNASH_BEVELFILTER_H
+#define GNASH_BEVELFILTER_H
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "BitmapFilter.h"
+
+namespace gnash {
+
+// A bevel effect filter.
+class BevelFilter : public BitmapFilter
+{
+public:
+    typedef enum
+    {
+        OUTER_BEVEL = 1,
+        INNER_BEVEL = 2,
+        FULL_BEVEL = 3
+    } bevel_type;
+
+    // Fill from a stream. See parser/filter_factory.cpp for the implementations.
+    virtual bool read(stream* in);
+
+    virtual ~BevelFilter() { return; }
+
+    // Clone this object and return a copy of it. (AS accessible function.)
+    // Guaranteed to return an object which can be cast to BlurFilter
+    Filter const clone();
+
+    BevelFilter() : 
+        m_distance(0.0f), m_angle(0.0f), m_highlightColor(0),
+        m_highlightAlpha(0), m_shadowColor(0), m_shadowAlpha(0),
+        m_blurX(0.0f), m_blurY(0.0f),  m_strength(0.0f), m_quality(0),
+        m_type(FULL_BEVEL), m_knockout(false)
+    { return; }
+
+    BevelFilter(float distance, float angle, uint32_t hcolor,
+        uint8_t halpha, uint32_t scolor, uint8_t salpha,
+        float blurX, float blurY, float strength,
+        uint8_t quality, bevel_type type, bool knockout) :
+        m_distance(distance), m_angle(angle), m_highlightColor(hcolor),
+        m_highlightAlpha(halpha), m_shadowColor(scolor), m_shadowAlpha(salpha),
+        m_blurX(blurX), m_blurY(blurY), m_strength(strength),
+        m_quality(quality), m_type(type), m_knockout(knockout)
+    { return; }
+
+private:
+    float m_distance; // Distance of the filter in pixels.
+    float m_angle; // Angle of the filter.
+    uint32_t m_highlightColor; // Color of the highlight.
+    uint8_t m_highlightAlpha; // Alpha of the highlight.
+    uint32_t m_shadowColor; // RGB color.
+    uint8_t m_shadowAlpha; // Alpha strength, as a percentage(?)
+    float m_blurX; // horizontal blur
+    float m_blurY; // vertical blur
+    float m_strength; // How strong is the filter.
+    uint8_t m_quality; // How many times to apply the filter.
+    bevel_type m_type; // The type of filter. (Rendered as string in AS)
+    bool m_knockout; // If true, render only the filter effect.
+};
+
+} // Namespace gnash
+
+#endif // GNASH_BEVELFILTER_H

Index: server/BevelFilter.cpp
===================================================================
RCS file: server/BevelFilter.cpp
diff -N server/BevelFilter.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/BevelFilter.cpp	26 Aug 2007 15:14:10 -0000	1.1
@@ -0,0 +1,37 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+/* $Id: BevelFilter.cpp,v 1.1 2007/08/26 15:14:10 cmusick Exp $ */
+
+#include "BevelFilter.h"
+
+namespace gnash {
+
+// See parser/filter_factory.cpp for the implementation. Purposefully not here.
+//bool BevelFilter::read(stream* in);
+
+Filter const
+BevelFilter::clone()
+{
+    Filter p(new BevelFilter(m_distance, m_angle, m_highlightColor,
+        m_highlightAlpha, m_shadowColor, m_shadowAlpha,
+        m_blurX, m_blurY, m_strength, m_quality, m_type, m_knockout));
+    return p;
+}
+
+} // Namespace gnash
+

Index: server/BitmapFilter.h
===================================================================
RCS file: server/BitmapFilter.h
diff -N server/BitmapFilter.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/BitmapFilter.h	26 Aug 2007 15:14:10 -0000	1.1
@@ -0,0 +1,51 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+/* $Id: BitmapFilter.h,v 1.1 2007/08/26 15:14:10 cmusick Exp $ */
+
+#ifndef GNASH_BITMAPFILTER_H
+#define GNASH_BITMAPFILTER_H
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "as_object.h"
+
+namespace gnash {
+
+class stream;
+class BitmapFilter;
+
+typedef boost::intrusive_ptr<BitmapFilter> Filter;
+
+// The common base class for AS display filters.
+class BitmapFilter : public as_object
+{
+public:
+    // Fill from a stream. See parser/filter_factory.cpp for the implementations.
+    virtual bool read(stream* in) = 0;
+
+    virtual ~BitmapFilter() { return; }
+
+    // Clone this object and return a copy of it. (AS accessible function.)
+    Filter const clone();
+};
+
+} // Namespace gnash
+
+#endif // GNASH_BITMAPFILTER_H

Index: server/BlurFilter.cpp
===================================================================
RCS file: server/BlurFilter.cpp
diff -N server/BlurFilter.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/BlurFilter.cpp	26 Aug 2007 15:14:11 -0000	1.1
@@ -0,0 +1,35 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+/* $Id: BlurFilter.cpp,v 1.1 2007/08/26 15:14:11 cmusick Exp $ */
+
+#include "BlurFilter.h"
+
+namespace gnash {
+
+// See parser/filter_factory.cpp for the implementation. Purposefully not here.
+//bool BlurFilter::read(stream* in);
+
+Filter const
+BlurFilter::clone()
+{
+    Filter p(new BlurFilter(m_blurX, m_blurY, m_quality));
+    return p;
+}
+
+} // Namespace gnash
+

Index: server/BlurFilter.h
===================================================================
RCS file: server/BlurFilter.h
diff -N server/BlurFilter.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/BlurFilter.h	26 Aug 2007 15:14:11 -0000	1.1
@@ -0,0 +1,60 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+/* $Id: BlurFilter.h,v 1.1 2007/08/26 15:14:11 cmusick Exp $ */
+
+#ifndef GNASH_BLURFILTER_H
+#define GNASH_BLURFILTER_H
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "BitmapFilter.h"
+
+namespace gnash {
+
+// A blur effect filter.
+class BlurFilter : public BitmapFilter
+{
+public:
+    // Fill from a stream. See parser/filter_factory.cpp for the implementations.
+    virtual bool read(stream* in);
+
+    virtual ~BlurFilter() { return; }
+
+    // Clone this object and return a copy of it. (AS accessible function.)
+    // Guaranteed to return an object which can be cast to BlurFilter
+    Filter const clone();
+
+    BlurFilter() : 
+        m_blurX(0.0f), m_blurY(0.0f), m_quality(0)
+    { return; }
+
+    BlurFilter(float blurX, float blurY, uint8_t quality) :
+        m_blurX(blurX), m_blurY(blurY), m_quality(quality)
+    { return; }
+
+private:
+    float m_blurX; // How much horizontal blur.
+    float m_blurY; // How much vertical blur.
+    uint8_t m_quality; // How many passes to take.
+};
+
+} // Namespace gnash
+
+#endif // GNASH_BLURFILTER_H

Index: server/ColorMatrixFilter.cpp
===================================================================
RCS file: server/ColorMatrixFilter.cpp
diff -N server/ColorMatrixFilter.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/ColorMatrixFilter.cpp	26 Aug 2007 15:14:11 -0000	1.1
@@ -0,0 +1,35 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+/* $Id: ColorMatrixFilter.cpp,v 1.1 2007/08/26 15:14:11 cmusick Exp $ */
+
+#include "ColorMatrixFilter.h"
+
+namespace gnash {
+
+// See parser/filter_factory.cpp for the implementation. Purposefully not here.
+//bool ConvolutionFilter::read(stream* in);
+
+Filter const
+ColorMatrixFilter::clone()
+{
+    Filter p(new ColorMatrixFilter(m_matrix));
+    return p;
+}
+
+} // Namespace gnash
+

Index: server/ColorMatrixFilter.h
===================================================================
RCS file: server/ColorMatrixFilter.h
diff -N server/ColorMatrixFilter.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/ColorMatrixFilter.h	26 Aug 2007 15:14:11 -0000	1.1
@@ -0,0 +1,59 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+/* $Id: ColorMatrixFilter.h,v 1.1 2007/08/26 15:14:11 cmusick Exp $ */
+
+#ifndef GNASH_COLORMATRIXFILTER_H
+#define GNASH_COLORMATRIXFILTER_H
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "array.h"
+#include "BitmapFilter.h"
+
+namespace gnash {
+
+// A color matrix effect filter.
+class ColorMatrixFilter : public BitmapFilter
+{
+public:
+    // Fill from a stream. See parser/filter_factory.cpp for the implementations.
+    virtual bool read(stream* in);
+
+    virtual ~ColorMatrixFilter() { return; }
+
+    // Clone this object and return a copy of it. (AS accessible function.)
+    // Guaranteed to return an object which can be cast to ColorMatrixFilter
+    Filter const clone();
+
+    ColorMatrixFilter() : 
+        m_matrix()
+    { return; }
+
+    ColorMatrixFilter(as_array_object a_matrix) :
+        m_matrix(a_matrix)
+    { return; }
+
+private:
+    as_array_object m_matrix; // The color matrix
+};
+
+} // Namespace gnash
+
+#endif // GNASH_CONVOLUTIONFILTER_H

Index: server/ConvolutionFilter.cpp
===================================================================
RCS file: server/ConvolutionFilter.cpp
diff -N server/ConvolutionFilter.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/ConvolutionFilter.cpp	26 Aug 2007 15:14:11 -0000	1.1
@@ -0,0 +1,36 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+/* $Id: ConvolutionFilter.cpp,v 1.1 2007/08/26 15:14:11 cmusick Exp $ */
+
+#include "ConvolutionFilter.h"
+
+namespace gnash {
+
+// See parser/filter_factory.cpp for the implementation. Purposefully not here.
+//bool ConvolutionFilter::read(stream* in);
+
+Filter const
+ConvolutionFilter::clone()
+{
+    Filter p(new ConvolutionFilter(m_matrixX, m_matrixY, m_matrix,
+        m_divisor, m_bias, m_preserveAlpha, m_clamp, m_color, m_alpha));
+    return p;
+}
+
+} // Namespace gnash
+

Index: server/ConvolutionFilter.h
===================================================================
RCS file: server/ConvolutionFilter.h
diff -N server/ConvolutionFilter.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/ConvolutionFilter.h	26 Aug 2007 15:14:11 -0000	1.1
@@ -0,0 +1,72 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+/* $Id: ConvolutionFilter.h,v 1.1 2007/08/26 15:14:11 cmusick Exp $ */
+
+#ifndef GNASH_CONVOLUTIONFILTER_H
+#define GNASH_CONVOLUTIONFILTER_H
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "array.h"
+#include "BitmapFilter.h"
+
+namespace gnash {
+
+// A convolution effect filter.
+class ConvolutionFilter : public BitmapFilter
+{
+public:
+    // Fill from a stream. See parser/filter_factory.cpp for the implementations.
+    virtual bool read(stream* in);
+
+    virtual ~ConvolutionFilter() { return; }
+
+    // Clone this object and return a copy of it. (AS accessible function.)
+    // Guaranteed to return an object which can be cast to BlurFilter
+    Filter const clone();
+
+    ConvolutionFilter() : 
+        m_matrixX(), m_matrixY(), m_matrix(), m_divisor(), m_bias(),
+        m_preserveAlpha(false), m_clamp(false), m_color(), m_alpha()
+    { return; }
+
+    ConvolutionFilter(uint8_t matrixX, uint8_t matrixY, as_array_object a_matrix,
+        float divisor, float bias, bool preserveAlpha, bool clamp, uint32_t color,
+        uint8_t alpha) :
+        m_matrixX(matrixX), m_matrixY(matrixY), m_matrix(a_matrix),
+        m_divisor(divisor), m_bias(bias), m_preserveAlpha(preserveAlpha),
+        m_clamp(clamp), m_color(color), m_alpha(alpha)
+    { return; }
+
+private:
+    uint8_t m_matrixX; // Number of columns
+    uint8_t m_matrixY; // Number of rows
+    as_array_object m_matrix; // The convolution matrix
+    float m_divisor;
+    float m_bias;
+    bool m_preserveAlpha; // If true, don't convolute the alpha channel
+    bool m_clamp; // Whether or not to clamp
+    uint32_t m_color; // For off-image pixels
+    uint8_t m_alpha; // For off-image pixels
+};
+
+} // Namespace gnash
+
+#endif // GNASH_CONVOLUTIONFILTER_H

Index: server/DropShadowFilter.cpp
===================================================================
RCS file: server/DropShadowFilter.cpp
diff -N server/DropShadowFilter.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/DropShadowFilter.cpp	26 Aug 2007 15:14:11 -0000	1.1
@@ -0,0 +1,37 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+/* $Id: DropShadowFilter.cpp,v 1.1 2007/08/26 15:14:11 cmusick Exp $ */
+
+#include "DropShadowFilter.h"
+
+namespace gnash {
+
+// See parser/filter_factory.cpp for the implementation. Purposefully not here.
+//bool DropShadowFilter::read(stream* in);
+
+Filter const
+DropShadowFilter::clone()
+{
+    Filter p(new DropShadowFilter(m_distance, m_angle, m_color, m_alpha,
+        m_blurX, m_blurY, m_strength, m_quality, m_inner, m_knockout,
+        m_hideObject));
+    return p;
+}
+
+} // Namespace gnash
+

Index: server/DropShadowFilter.h
===================================================================
RCS file: server/DropShadowFilter.h
diff -N server/DropShadowFilter.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/DropShadowFilter.h	26 Aug 2007 15:14:11 -0000	1.1
@@ -0,0 +1,75 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+/* $Id: DropShadowFilter.h,v 1.1 2007/08/26 15:14:11 cmusick Exp $ */
+
+#ifndef GNASH_DROPSHADOWFILTER_H
+#define GNASH_DROPSHADOWFILTER_H
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "BitmapFilter.h"
+
+namespace gnash {
+
+// A drop shadow effect filter.
+class DropShadowFilter : public BitmapFilter
+{
+public:
+    // Fill from a stream. See parser/filter_factory.cpp for the implementations.
+    virtual bool read(stream* in);
+
+    virtual ~DropShadowFilter() { return; }
+
+    // Clone this object and return a copy of it. (AS accessible function.)
+    // Guaranteed to return an object which can be cast to BlurFilter
+    Filter const clone();
+
+    DropShadowFilter() : 
+        m_distance(0.0f), m_angle(0.0f), m_color(0), m_alpha(0),
+        m_blurX(0.0f), m_blurY(0.0f),  m_strength(0.0f), m_quality(0),
+        m_inner(false), m_knockout(false), m_hideObject(false)
+    { return; }
+
+    DropShadowFilter(float distance, float angle, uint32_t color,
+        uint8_t alpha, float blurX, float blurY, float strength,
+        uint8_t quality, bool inner, bool knockout, bool hideObject) :
+        m_distance(distance), m_angle(angle), m_color(color),
+        m_alpha(alpha), m_blurX(blurX), m_blurY(blurY), m_strength(strength),
+        m_quality(quality), m_inner(inner), m_knockout(knockout),
+        m_hideObject(hideObject)
+    { return; }
+
+private:
+    float m_distance; // Distance of the filter in pixels.
+    float m_angle; // Angle of the filter.
+    uint32_t m_color; // RGB color.
+    uint8_t m_alpha; // Alpha strength, as a percentage(?)
+    float m_blurX; // horizontal blur
+    float m_blurY; // vertical blur
+    float m_strength; // How strong is the filter.
+    uint8_t m_quality; // How many times to apply the filter.
+    bool m_inner; // Is this an inner shadow?
+    bool m_knockout; // If true, render only the filter effect.
+    bool m_hideObject; // Does this hide the object?
+};
+
+} // Namespace gnash
+
+#endif // GNASH_DROPSHADOWFILTER_H

Index: server/GlowFilter.h
===================================================================
RCS file: server/GlowFilter.h
diff -N server/GlowFilter.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/GlowFilter.h	26 Aug 2007 15:14:12 -0000	1.1
@@ -0,0 +1,71 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+/* $Id: GlowFilter.h,v 1.1 2007/08/26 15:14:12 cmusick Exp $ */
+
+#ifndef GNASH_GLOWFILTER_H
+#define GNASH_GLOWFILTER_H
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "BitmapFilter.h"
+
+namespace gnash {
+
+// A glow effect filter.
+class GlowFilter : public BitmapFilter
+{
+public:
+    // Fill from a stream. See parser/filter_factory.cpp for the implementations.
+    virtual bool read(stream* in);
+
+    virtual ~GlowFilter() { return; }
+
+    // Clone this object and return a copy of it. (AS accessible function.)
+    // Guaranteed to return an object which can be cast to BlurFilter
+    Filter const clone();
+
+    GlowFilter() : 
+        m_color(0), m_alpha(0),
+        m_blurX(0.0f), m_blurY(0.0f),  m_strength(0.0f), m_quality(0),
+        m_inner(false), m_knockout(false)
+    { return; }
+
+    GlowFilter(uint32_t color,
+        uint8_t alpha, float blurX, float blurY, float strength,
+        uint8_t quality, bool inner, bool knockout) :
+        m_color(color),
+        m_alpha(alpha), m_blurX(blurX), m_blurY(blurY), m_strength(strength),
+        m_quality(quality), m_inner(inner), m_knockout(knockout)
+    { return; }
+
+private:
+    uint32_t m_color; // RGB color.
+    uint8_t m_alpha; // Alpha strength, as a percentage(?)
+    float m_blurX; // horizontal blur
+    float m_blurY; // vertical blur
+    float m_strength; // How strong is the filter.
+    uint8_t m_quality; // How many times to apply the filter.
+    bool m_inner; // Is this an inner shadow?
+    bool m_knockout; // If true, render only the filter effect.
+};
+
+} // Namespace gnash
+
+#endif // GNASH_GLOWFILTER_H

Index: server/GlowFilter.cpp
===================================================================
RCS file: server/GlowFilter.cpp
diff -N server/GlowFilter.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/GlowFilter.cpp	26 Aug 2007 15:14:12 -0000	1.1
@@ -0,0 +1,36 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+/* $Id: GlowFilter.cpp,v 1.1 2007/08/26 15:14:12 cmusick Exp $ */
+
+#include "GlowFilter.h"
+
+namespace gnash {
+
+// See parser/filter_factory.cpp for the implementation. Purposefully not here.
+//bool DropShadowFilter::read(stream* in);
+
+Filter const
+GlowFilter::clone()
+{
+    Filter p(new GlowFilter(m_color, m_alpha,
+        m_blurX, m_blurY, m_strength, m_quality, m_inner, m_knockout));
+    return p;
+}
+
+} // Namespace gnash
+

Index: server/GradientBevelFilter.cpp
===================================================================
RCS file: server/GradientBevelFilter.cpp
diff -N server/GradientBevelFilter.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/GradientBevelFilter.cpp	26 Aug 2007 15:14:12 -0000	1.1
@@ -0,0 +1,36 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+/* $Id: GradientBevelFilter.cpp,v 1.1 2007/08/26 15:14:12 cmusick Exp $ */
+
+#include "GradientBevelFilter.h"
+
+namespace gnash {
+
+// See parser/filter_factory.cpp for the implementation. Purposefully not here.
+//bool GradientBevelFilter::read(stream* in);
+
+Filter const
+GradientBevelFilter::clone()
+{
+    Filter p(new GradientBevelFilter(m_distance, m_angle, m_colors, m_alphas,
+        m_blurX, m_blurY, m_strength, m_quality, m_type, m_knockout));
+    return p;
+}
+
+} // Namespace gnash
+

Index: server/GradientBevelFilter.h
===================================================================
RCS file: server/GradientBevelFilter.h
diff -N server/GradientBevelFilter.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/GradientBevelFilter.h	26 Aug 2007 15:14:12 -0000	1.1
@@ -0,0 +1,82 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+/* $Id: GradientBevelFilter.h,v 1.1 2007/08/26 15:14:12 cmusick Exp $ */
+
+#ifndef GNASH_GRADIENTBEVELFILTER_H
+#define GNASH_GRADIENTBEVELFILTER_H
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "array.h"
+#include "BitmapFilter.h"
+
+namespace gnash {
+
+// A gradient bevel effect filter.
+class GradientBevelFilter : public BitmapFilter
+{
+public:
+    typedef enum
+    {
+        INNER_BEVEL = 2,
+        OUTER_BEVEL = 1,
+        FULL_BEVEL = 3
+    } glow_types;
+
+    // Fill from a stream. See parser/filter_factory.cpp for the implementations.
+    virtual bool read(stream* in);
+
+    virtual ~GradientBevelFilter() { return; }
+
+    // Clone this object and return a copy of it. (AS accessible function.)
+    // Guaranteed to return an object which can be cast to BlurFilter
+    Filter const clone();
+
+    GradientBevelFilter() : 
+        m_distance(0.0f), m_angle(0.0f), m_colors(), m_alphas(),
+        m_blurX(0.0f), m_blurY(0.0f),  m_strength(0.0f), m_quality(0),
+        m_type(INNER_BEVEL), m_knockout(false)
+    { return; }
+
+    GradientBevelFilter(float distance, float angle, as_array_object colors,
+        as_array_object alphas, float blurX, float blurY, float strength,
+        uint8_t quality, glow_types type, bool knockout) :
+        m_distance(distance), m_angle(angle), m_colors(colors),
+        m_alphas(alphas), m_blurX(blurX), m_blurY(blurY), m_strength(strength),
+        m_quality(quality), m_type(type), m_knockout(knockout)
+    { return; }
+
+private:
+    float m_distance; // Distance of the filter in pixels.
+    float m_angle; // Angle of the filter.
+    as_array_object m_colors; // Colors of the gradients.
+    as_array_object m_alphas; // Alphas of the gradients.
+    as_array_object m_ratios; // Ratios of the gradients.
+    float m_blurX; // horizontal blur
+    float m_blurY; // vertical blur
+    float m_strength; // How strong is the filter.
+    uint8_t m_quality; // How many times to apply the filter.
+    glow_types m_type; // What type of effect.
+    bool m_knockout; // If true, render only the filter effect.
+};
+
+} // Namespace gnash
+
+#endif // GNASH_GRADIENTBEVELFILTER_H

Index: server/GradientGlowFilter.cpp
===================================================================
RCS file: server/GradientGlowFilter.cpp
diff -N server/GradientGlowFilter.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/GradientGlowFilter.cpp	26 Aug 2007 15:14:12 -0000	1.1
@@ -0,0 +1,36 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+/* $Id: GradientGlowFilter.cpp,v 1.1 2007/08/26 15:14:12 cmusick Exp $ */
+
+#include "GradientGlowFilter.h"
+
+namespace gnash {
+
+// See parser/filter_factory.cpp for the implementation. Purposefully not here.
+//bool GradientGlowFilter::read(stream* in);
+
+Filter const
+GradientGlowFilter::clone()
+{
+    Filter p(new GradientGlowFilter(m_distance, m_angle, m_colors, m_alphas,
+        m_blurX, m_blurY, m_strength, m_quality, m_type, m_knockout));
+    return p;
+}
+
+} // Namespace gnash
+

Index: server/GradientGlowFilter.h
===================================================================
RCS file: server/GradientGlowFilter.h
diff -N server/GradientGlowFilter.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/GradientGlowFilter.h	26 Aug 2007 15:14:12 -0000	1.1
@@ -0,0 +1,82 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+/* $Id: GradientGlowFilter.h,v 1.1 2007/08/26 15:14:12 cmusick Exp $ */
+
+#ifndef GNASH_GRADIENTGLOWFILTER_H
+#define GNASH_GRADIENTGLOWFILTER_H
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "array.h"
+#include "BitmapFilter.h"
+
+namespace gnash {
+
+// A gradient glow effect filter.
+class GradientGlowFilter : public BitmapFilter
+{
+public:
+    typedef enum
+    {
+        INNER_GLOW = 2,
+        OUTER_GLOW = 1,
+        FULL_GLOW = 3
+    } glow_types;
+
+    // Fill from a stream. See parser/filter_factory.cpp for the implementations.
+    virtual bool read(stream* in);
+
+    virtual ~GradientGlowFilter() { return; }
+
+    // Clone this object and return a copy of it. (AS accessible function.)
+    // Guaranteed to return an object which can be cast to BlurFilter
+    Filter const clone();
+
+    GradientGlowFilter() : 
+        m_distance(0.0f), m_angle(0.0f), m_colors(), m_alphas(),
+        m_blurX(0.0f), m_blurY(0.0f),  m_strength(0.0f), m_quality(0),
+        m_type(INNER_GLOW), m_knockout(false)
+    { return; }
+
+    GradientGlowFilter(float distance, float angle, as_array_object colors,
+        as_array_object alphas, float blurX, float blurY, float strength,
+        uint8_t quality, glow_types type, bool knockout) :
+        m_distance(distance), m_angle(angle), m_colors(colors),
+        m_alphas(alphas), m_blurX(blurX), m_blurY(blurY), m_strength(strength),
+        m_quality(quality), m_type(type), m_knockout(knockout)
+    { return; }
+
+private:
+    float m_distance; // Distance of the filter in pixels.
+    float m_angle; // Angle of the filter.
+    as_array_object m_colors; // Colors of the gradients.
+    as_array_object m_alphas; // Alphas of the gradients.
+    as_array_object m_ratios; // Ratios of the gradients.
+    float m_blurX; // horizontal blur
+    float m_blurY; // vertical blur
+    float m_strength; // How strong is the filter.
+    uint8_t m_quality; // How many times to apply the filter.
+    glow_types m_type; // What type of effect.
+    bool m_knockout; // If true, render only the filter effect.
+};
+
+} // Namespace gnash
+
+#endif // GNASH_GRADIENTGLOWFILTER_H

Index: server/parser/filter_factory.h
===================================================================
RCS file: server/parser/filter_factory.h
diff -N server/parser/filter_factory.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/parser/filter_factory.h	26 Aug 2007 15:14:13 -0000	1.1
@@ -0,0 +1,49 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+/* $Id: filter_factory.h,v 1.1 2007/08/26 15:14:13 cmusick Exp $ */
+
+#ifndef GNASH_FILTER_FACTORY_H
+#define GNASH_FILTER_FACTORY_H
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <vector>
+#include "BitmapFilter.h"
+
+namespace gnash {
+
+class stream;
+
+typedef std::vector<Filter> Filters;
+
+class filter_factory
+{
+public:
+    /// \brief Read one, possibly multiple filters from the stream,
+    /// and push them into the vector store. Returns the number read.
+    /// If read_multiple is true, the first byte of the stream is
+    /// expected to contain the number of filters to be read.
+    static int const read(stream* in, int movie_version, bool read_multiple,
+        Filters* store);
+};
+
+} // Namespace gnash
+
+#endif // GNASH_FILTER_FACTORY_H

Index: server/parser/filter_factory.cpp
===================================================================
RCS file: server/parser/filter_factory.cpp
diff -N server/parser/filter_factory.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/parser/filter_factory.cpp	26 Aug 2007 15:14:13 -0000	1.1
@@ -0,0 +1,301 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+/* $Id: filter_factory.cpp,v 1.1 2007/08/26 15:14:13 cmusick Exp $ */
+
+#include "filter_factory.h"
+#include "BitmapFilter.h"
+#include "BlurFilter.h"
+#include "DropShadowFilter.h"
+#include "GlowFilter.h"
+#include "BevelFilter.h"
+#include "GradientGlowFilter.h"
+#include "ConvolutionFilter.h"
+#include "ColorMatrixFilter.h"
+#include "GradientBevelFilter.h"
+
+#include "log.h"
+#include "stream.h"
+
+namespace gnash {
+
+typedef enum
+{
+    DROP_SHADOW = 0,
+    BLUR = 1,
+    GLOW = 2,
+    BEVEL = 3,
+    GRADIENT_GLOW = 4,
+    CONVOLUTION = 5,
+    COLOR_MATRIX = 6,
+    GRADIENT_BEVEL = 7
+} filter_types;
+
+int const filter_factory::read(stream* in, int /* movie_version */,
+    bool read_multiple, Filters* store)
+{
+    int count = 1;
+
+    if (read_multiple)
+    {
+        in->ensureBytes(1);
+        count = static_cast<int> (in->read_u8());
+    }
+
+    for (int i = 0; i < count; ++i)
+    {
+        BitmapFilter *the_filter = NULL;
+
+        filter_types filter_type = static_cast<filter_types> (in->read_u8());
+
+        switch (filter_type)
+        {
+            case DROP_SHADOW:
+                the_filter = new DropShadowFilter;
+                break;
+            case BLUR:
+                the_filter = new BlurFilter; 
+                break;
+            case GLOW:
+                the_filter = new GlowFilter;
+                break;
+            case BEVEL:
+                the_filter = new BevelFilter;
+                break;
+            case GRADIENT_GLOW:
+                the_filter = new GradientGlowFilter;
+                break;
+            case CONVOLUTION:
+                the_filter = new ConvolutionFilter;
+                break;
+            case COLOR_MATRIX:
+                the_filter = new ColorMatrixFilter;
+                break;
+            case GRADIENT_BEVEL:
+                the_filter = new GradientBevelFilter;
+                break;
+            default:
+                IF_VERBOSE_MALFORMED_SWF(
+                log_swferror(_("Invalid filter type %d."), filter_type);
+                );
+                return i; // We're already broken, no need to cause more pain.
+        }
+
+        // Protect against exceptions and such by storing before we read.
+        Filter p(the_filter);
+        if (!p->read(in))
+        {
+            IF_VERBOSE_MALFORMED_SWF(
+            log_swferror(_("Filter %d could not read."), filter_type);
+            );
+            return i; // We're already broken.
+        }
+        store->push_back(p);
+    }
+
+    return count;
+}
+
+bool DropShadowFilter::read(stream* in)
+{
+    m_color = in->read_u8() << 16 + in->read_u8() << 8 + in->read_u8();
+    m_alpha = in->read_u8();
+
+    m_blurX = in->read_fixed();
+    m_blurY = in->read_fixed();
+
+    m_angle = in->read_fixed();
+    m_distance = in->read_fixed();
+
+    m_strength = in->read_short_sfixed();
+
+    m_inner = in->read_uint(1) ? true : false;
+    m_knockout = in->read_uint(1) ? true : false;
+    m_hideObject = in->read_uint(1) ? true : false;
+
+    static_cast<void> (in->read_uint(5)); // Throw these away on purpose.
+
+    return true;
+}
+
+bool BlurFilter::read(stream* in)
+{
+    m_blurX = in->read_ufixed();
+    m_blurY = in->read_ufixed();
+
+    m_quality = static_cast<uint8_t> (in->read_uint(5));
+
+    static_cast<void> (in->read_uint(3)); // Throw these away.
+
+    return true;
+}
+
+bool GlowFilter::read(stream* in)
+{
+    m_color = in->read_u8() << 16 + in->read_u8() << 8 + in->read_u8();
+    m_alpha = in->read_u8();
+
+    m_blurX = in->read_fixed();
+    m_blurY = in->read_fixed();
+
+    m_strength = in->read_short_sfixed();
+
+    m_inner = in->read_uint(1) ? true : false;
+    m_knockout = in->read_uint(1) ? true : false;
+
+    static_cast<void> (in->read_uint(6)); // Throw these away.
+
+    return true;
+}
+
+bool BevelFilter::read(stream* in)
+{
+    // TODO: It is possible that the order of these two should be reversed.
+    // highlight might come first. Find out for sure and then fix and remove
+    // this comment.
+    m_shadowColor = in->read_u8() << 16 + in->read_u8() << 8 + in->read_u8();
+    m_shadowAlpha = in->read_u8();
+
+    m_highlightColor = in->read_u8() << 16 + in->read_u8() << 8 + in->read_u8();
+    m_highlightAlpha = in->read_u8();
+
+    m_blurX = in->read_fixed();
+    m_blurY = in->read_fixed();
+
+    m_angle = in->read_fixed();
+    m_distance = in->read_fixed();
+    
+    m_strength = in->read_short_sfixed();
+
+    bool inner_shadow = in->read_uint(1) ? true : false;
+    m_knockout = in->read_uint(1) ? true : false;
+    static_cast<void> (in->read_uint(1));
+    bool on_top = in->read_uint(1) ? true : false;
+
+    // Set the bevel type. top and inner is full, top is outer, inner is inner
+    m_type = on_top ? (inner_shadow ? FULL_BEVEL : OUTER_BEVEL) : INNER_BEVEL;
+    
+    static_cast<void> (in->read_uint(4)); // Throw these away.
+
+    return true;
+}
+
+bool GradientGlowFilter::read(stream* in)
+{
+    bool count = in->read_u8(); // How many colorings.
+
+    for (int i = 0; i < count; ++i)
+    {
+        m_colors.push(as_value(in->read_u8() << 16 + in->read_u8() << 8 + in->read_u8()));
+        m_alphas.push(as_value(in->read_u8()));
+    }
+
+    for (int i = 0; i < count; ++i)
+    {
+        m_ratios.push(as_value(in->read_u8()));
+    }
+
+    m_blurX = in->read_fixed();
+    m_blurY = in->read_fixed();
+
+    m_angle = in->read_fixed();
+    m_distance = in->read_fixed();
+
+    m_strength = in->read_short_sfixed();
+
+    bool inner = in->read_uint(1) ? true : false;
+    m_knockout = in->read_uint(1) ? true : false;
+    static_cast<void> (in->read_uint(1));
+    bool outer = in->read_uint(1) ? true : false;
+
+    m_type = outer ? (inner ? FULL_GLOW : OUTER_GLOW) : INNER_GLOW;
+
+    m_quality = static_cast<uint8_t> (in->read_uint(4));
+
+    return true;
+}
+
+bool ConvolutionFilter::read(stream* in)
+{
+    m_matrixX = in->read_u8();
+    m_matrixY = in->read_u8();
+
+    m_divisor = in->read_float();
+    m_bias = in->read_float();
+
+    for (int i = 0; i < m_matrixX * m_matrixY; ++i)
+    {
+        m_matrix.push(as_value(in->read_float()));
+    }
+
+    m_color = in->read_u8() << 16 + in->read_u8() << 8 + in->read_u8();
+    m_alpha = in->read_u8();
+
+    static_cast<void> (in->read_uint(6)); // Throw away.
+
+    m_clamp = in->read_uint(1) ? true : false;
+    m_preserveAlpha = in->read_uint(1) ? true : false;
+
+    return true;
+}
+
+bool ColorMatrixFilter::read(stream* in)
+{
+    for (int i = 0; i < 20; ++i)
+    {
+        m_matrix.push(in->read_float());
+    }
+
+    return true;
+}
+
+bool GradientBevelFilter::read(stream* in)
+{
+    bool count = in->read_u8(); // How many colorings.
+
+    for (int i = 0; i < count; ++i)
+    {
+        m_colors.push(as_value(in->read_u8() << 16 + in->read_u8() << 8 + in->read_u8()));
+        m_alphas.push(as_value(in->read_u8()));
+    }
+
+    for (int i = 0; i < count; ++i)
+    {
+        m_ratios.push(as_value(in->read_u8()));
+    }
+
+    m_blurX = in->read_fixed();
+    m_blurY = in->read_fixed();
+
+    m_angle = in->read_fixed();
+    m_distance = in->read_fixed();
+
+    m_strength = in->read_short_sfixed();
+
+    bool inner = in->read_uint(1) ? true : false;
+    m_knockout = in->read_uint(1) ? true : false;
+    static_cast<void> (in->read_uint(1));
+    bool outer = in->read_uint(1) ? true : false;
+
+    m_type = outer ? (inner ? FULL_BEVEL : OUTER_BEVEL) : INNER_BEVEL;
+
+    m_quality = static_cast<uint8_t> (in->read_uint(4));
+
+    return true;
+}
+
+} // gnash namespace



From MAILER-DAEMON Sun Aug 26 11:37:09 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPKAn-00067U-Am
	for mharc-gnash-commit@gnu.org; Sun, 26 Aug 2007 11:37:09 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPKAm-00066N-4n
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 11:37:08 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPKAl-00065v-94
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 11:37:07 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPKAk-00065s-Vp
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 11:37:07 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1IPKAk-0008LI-Bj
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 11:37:06 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l7QFb0V46109;
	Sun, 26 Aug 2007 17:37:00 +0200 (CEST)
	(envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Sun, 26 Aug 2007 17:37:00 +0200
To: Chad Musick <chadmusick@msbx.net>
Subject: Re: [Gnash-commit] gnash ChangeLog server/Makefile.am server/strea...
Message-ID: <20070826153700.GA44957@keybit.net>
Mail-Followup-To: Chad Musick <chadmusick@msbx.net>, gnash-commit@gnu.org
References: <E1IPJob-0004rk-OB@cvs.savannah.gnu.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1IPJob-0004rk-OB@cvs.savannah.gnu.org>
X-Detected-Kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Aug 2007 15:37:08 -0000

On Sun, Aug 26, 2007 at 03:14:13PM +0000, Chad Musick wrote:

>  	float	stream::read_fixed()
>  	{
> +#if 0 /* Chad */
>  		m_unused_bits = 0;
>  		int32_t	val = m_input->read_le32();
>  		return (float) val / 65536.0f;
> +#else
> +		align();
> +		return static_cast<float> (static_cast<double> (static_cast<long int> (m_input->read_le32())) / 65536.0f);
> +#endif /* Chad */
>  	}

Have align() just set m_unused_bits = 0 and inlined to get the same performance.
Should be all ok, and something a bit faster...

--strk;



From MAILER-DAEMON Sun Aug 26 11:46:39 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPKJz-0007Ka-5z
	for mharc-gnash-commit@gnu.org; Sun, 26 Aug 2007 11:46:39 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPKJx-0007K9-7f
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 11:46:37 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPKJv-0007Jx-O7
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 11:46:35 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPKJv-0007Ju-Il
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 11:46:35 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <benjamin_pelican@yahoo.co.uk>)
	id 1IPKJv-0001vf-78
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 11:46:35 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <benjamin_pelican@yahoo.co.uk>) id 1IPKJt-00072w-KA
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 15:46:33 +0000
Received: from bwy by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <bwy@savannah.gnu.org>) id 1IPKJt-00072t-8n
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 15:46:33 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPKJt-00072t-8n@cvs.savannah.gnu.org>
From: Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
Date: Sun, 26 Aug 2007 15:46:33 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash gui/gtk.cpp gui/gtksup.h ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Aug 2007 15:46:37 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Benjamin Wolsey <bwy>	07/08/26 15:46:33

Modified files:
	gui            : gtk.cpp gtksup.h 
	.              : ChangeLog 

Log message:
	* gui/gtk.cpp, gui/gtksup.h: Add treeview to Movie Properties
	ready for InfoTree display.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.105&r2=1.106
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtksup.h?cvsroot=gnash&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4106&r2=1.4107

Patches:
Index: gui/gtk.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -b -r1.105 -r1.106
--- gui/gtk.cpp	22 Aug 2007 21:38:22 -0000	1.105
+++ gui/gtk.cpp	26 Aug 2007 15:46:32 -0000	1.106
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: gtk.cpp,v 1.105 2007/08/22 21:38:22 strk Exp $ */
+/* $Id: gtk.cpp,v 1.106 2007/08/26 15:46:32 bwy Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -942,12 +942,7 @@
                    NULL);
 }
 
-
-//Movie information / properties dialogue
-//
-//
-//
-
+//Movie Properties dialogue
 void
 GtkGui::menuitem_movieinfo_callback(GtkMenuItem* /*menuitem*/, gpointer data)
 {
@@ -965,7 +960,7 @@
     gtk_container_add (GTK_CONTAINER (window1), main_vbox);
 
     GtkWidget *frame1 = gtk_frame_new("Movie Properties");
-    gtk_box_pack_start (GTK_BOX (main_vbox), frame1, FALSE, FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (main_vbox), frame1, TRUE, TRUE, 0);
 
     GtkWidget *vbox1 = gtk_vbox_new (FALSE, 3);
     gtk_container_add (GTK_CONTAINER (frame1), vbox1);
@@ -979,7 +974,23 @@
     GtkWidget *table1 = gtk_table_new(4, 2, FALSE);
     gtk_box_pack_start (GTK_BOX (vbox2), table1, FALSE, FALSE, 0);
 
+
+    gtk_box_pack_start (
+	GTK_BOX (vbox1), gtk_hseparator_new (), FALSE, FALSE, 0);
+
+    GtkWidget *vbox3 = gtk_vbox_new (FALSE, 3);
+    gtk_box_pack_start (
+	GTK_BOX (vbox1), vbox3, TRUE, TRUE, 0);
+
+    GtkWidget *scrollwindow1 = gtk_scrolled_window_new (NULL, NULL);
+    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrollwindow1),
+				      GTK_POLICY_AUTOMATIC,
+				      GTK_POLICY_AUTOMATIC);
+    gtk_box_pack_start (
+	 GTK_BOX (vbox3), scrollwindow1, TRUE, TRUE, 0);
+
     std::auto_ptr<InfoTree> infoptr = gui->getMovieInfo();
+
     if ( ! infoptr.get() )
     {
             label = gtk_label_new (_("VM not initialized yet"));
@@ -988,11 +999,17 @@
             return;
     }
 
+    else {
+
+            // Table display
+            // This left in while tree information isn't selectable
+
     InfoTree& info = *infoptr;
     
     size_t size = info.size();
 
-    for (InfoTree::leaf_iterator i=info.begin_leaf(), e=info.end_leaf(); i!=e; ++i)
+            for (InfoTree::leaf_iterator i=info.begin_leaf(), e=info.end_leaf();
+                 i!=e; ++i)
     {
         StringPair& p = *i;
         guint up = size;
@@ -1015,16 +1032,81 @@
         --size;
     }
 
-     GtkWidget *bbox1 = gtk_hbutton_box_new ();
-     gtk_box_pack_start (
-	GTK_BOX (main_vbox), bbox1, FALSE, FALSE, 0);
+            // Tree display
+            // Should replace table display when proper
+            // InfoTrees are available 
 
-     gtk_box_pack_start (
-	GTK_BOX (vbox1), gtk_hseparator_new (), FALSE, FALSE, 0);
+            enum
+            {
+                NODENAME_COLUMN = 0,
+                STRING1_COLUMN,
+                STRING2_COLUMN,
+                COMMENT_COLUMN,
+                NUM_COLUMNS
+            };
 
-     GtkWidget *vbox3 = gtk_vbox_new (FALSE, 3);
+            GtkTreeModel *model = makeTreeModel(infoptr);
+
+            GtkWidget *treeview = gtk_tree_view_new_with_model (model);
+
+            g_object_unref (model);
+
+            gint col_offset;
+            GtkCellRenderer *renderer;
+            GtkTreeViewColumn *column;
+
+            //Add columns:
+            //First column:
+            renderer = gtk_cell_renderer_text_new ();
+            g_object_set (renderer, "xalign", 0.0, NULL);
+            col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW(treeview),
+	       						       -1, "Node",
+							       renderer, "text",
+							       NODENAME_COLUMN,
+							       NULL);
+            column = gtk_tree_view_get_column (GTK_TREE_VIEW(treeview), col_offset - 1);
+
+            //Second column:
+
+            renderer = gtk_cell_renderer_text_new ();
+            g_object_set (renderer, "xalign", 0.0, NULL);
+            col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW(treeview),
+							       -1, "Variable",
+							       renderer, "text",
+							       STRING1_COLUMN,
+							       NULL);
+            column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1);
+
+            //Third column:
+
+            renderer = gtk_cell_renderer_text_new ();
+            g_object_set (renderer, "xalign", 0.0, NULL);
+            col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW(treeview),
+							       -1, "Value",
+							       renderer, "text",
+							       STRING2_COLUMN,
+							       NULL);
+            column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1);
+
+            //Third column:
+
+            renderer = gtk_cell_renderer_text_new ();
+            g_object_set (renderer, "xalign", 0.0, NULL);
+            col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW(treeview),
+							       -1, "Comment",
+							       renderer, "text",
+							       COMMENT_COLUMN,
+							       NULL);
+            column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1);
+
+            //Add tree to scrollwindow.
+            gtk_container_add (GTK_CONTAINER (scrollwindow1), treeview);
+
+            }
+
+     GtkWidget *bbox1 = gtk_hbutton_box_new ();
      gtk_box_pack_start (
-	GTK_BOX (vbox1), vbox3, FALSE, FALSE, 0);
+	GTK_BOX (main_vbox), bbox1, FALSE, FALSE, 0);
 
 
      GtkWidget *button_ok = gtk_button_new_from_stock (GTK_STOCK_OK);
@@ -1037,6 +1119,71 @@
 }
 
 
+GtkTreeModel*
+GtkGui::makeTreeModel (std::auto_ptr<InfoTree> treepointer)
+
+{
+
+     InfoTree& info = *treepointer;
+
+     enum
+     {
+       NODENAME_COLUMN = 0,
+       STRING1_COLUMN,
+       STRING2_COLUMN,
+       COMMENT_COLUMN,
+       NUM_COLUMNS
+     };
+    
+     GtkTreeStore *model = gtk_tree_store_new (NUM_COLUMNS,
+                          G_TYPE_STRING,
+                          G_TYPE_STRING,
+                          G_TYPE_STRING,
+                          G_TYPE_STRING);
+    
+     GtkTreeIter iter;
+     GtkTreeIter child_iter;
+     GtkTreeIter parent_iter;
+
+     int depth = 0;                    // Depth within the gtk tree.    
+
+     for (InfoTree::iterator i=info.begin_leaf(), e=info.end_leaf(); i!=e; ++i)
+     {
+          StringPair& p = *i;
+
+          int infotreedepth = info.depth(i);  
+          char buf[8];
+          sprintf(buf, "%d", infotreedepth);
+          buf[7] = '\0';                     
+
+          if (info.depth(i) > depth) {          // Align Gtk tree depth.
+               depth++;                   
+               iter=child_iter;                  
+          }
+
+          if (info.depth(i) < depth) {        // Align Gtk tree depth.
+               depth -= (depth - info.depth(i));
+               gtk_tree_model_iter_parent (GTK_TREE_MODEL(model), &parent_iter, &iter);  // Get parent iter.
+               iter = parent_iter;
+          }
+
+          //Read in data from present node
+          if (depth == 0) gtk_tree_store_append (model, &child_iter, NULL);
+          else gtk_tree_store_append (model, &child_iter, &iter);
+
+          gtk_tree_store_set (model, &child_iter,
+                            NODENAME_COLUMN, buf,   //infotree
+                            STRING1_COLUMN, p.first.c_str(),     //infotree
+    		            STRING2_COLUMN, p.second.c_str(),     //infotree
+                            COMMENT_COLUMN, "Comment",     //infotree
+			    -1);
+
+     }
+
+     return GTK_TREE_MODEL(model);
+
+}
+
 // This pops up the menu when the right mouse button is clicked
 gint
 GtkGui::popup_handler(GtkWidget *widget, GdkEvent *event)
@@ -1056,8 +1203,6 @@
     return FALSE;
 }
 
-
-
 /// \brief Toggle the sound on or off
 void
 GtkGui::menuitem_sound_callback(GtkMenuItem* /*menuitem*/, gpointer data)
@@ -1205,7 +1350,6 @@
     return TRUE;
 }
 
-
 gboolean
 GtkGui::realize_event(GtkWidget* /*widget*/, GdkEvent* /*event*/,
 		gpointer /*data*/)

Index: gui/gtksup.h
===================================================================
RCS file: /cvsroot/gnash/gnash/gui/gtksup.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- gui/gtksup.h	18 Aug 2007 13:08:15 -0000	1.49
+++ gui/gtksup.h	26 Aug 2007 15:46:32 -0000	1.50
@@ -137,6 +137,7 @@
 
     virtual void setCursor(gnash_cursor_type newcursor);
     GtkWidget *getWindow() { return _window; };
+
  private:
     GtkWidget   *_window;
     GdkPixbuf 	*_window_icon_pixbuf;
@@ -152,6 +153,8 @@
     static int gdk_to_gnash_modifier(int state);
     static void             open_file(GtkWidget* dialog, gpointer data);
 
+    static GtkTreeModel* makeTreeModel (std::auto_ptr<InfoTree> treepointer);
+
 };
 
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.4106
retrieving revision 1.4107
diff -u -b -r1.4106 -r1.4107
--- ChangeLog	26 Aug 2007 15:14:09 -0000	1.4106
+++ ChangeLog	26 Aug 2007 15:46:32 -0000	1.4107
@@ -1,3 +1,8 @@
+2007-08-26 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
+
+	* gui/gtk.cpp, gui/gtksup.h: Add treeview to Movie Properties
+          ready for InfoTree display.
+
 2007-08-26 Chad Musick <chadmusick@msbx.net>
 
 	* server/Makefile.am: Add new files, remove obsolete ones.



From MAILER-DAEMON Sun Aug 26 16:56:58 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPPAI-0007th-Bu
	for mharc-gnash-commit@gnu.org; Sun, 26 Aug 2007 16:56:58 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPPAG-0007tM-2m
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 16:56:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPPAD-0007sk-AA
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 16:56:54 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPPAD-0007sf-6Z
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 16:56:53 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1IPPAC-0004li-OV
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 16:56:52 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <markus@unixrus.se>) id 1IPPAB-0003Qy-1p
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 20:56:51 +0000
Received: from nihilus by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <nihilus@savannah.gnu.org>) id 1IPPAA-0003Qv-Sv
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 20:56:50 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPPAA-0003Qv-Sv@cvs.savannah.gnu.org>
From: Markus Gothe <markus@unixrus.se>
Date: Sun, 26 Aug 2007 20:56:50 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog doc/gnash.1
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Aug 2007 20:56:56 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Markus Gothe <nihilus>	07/08/26 20:56:50

Modified files:
	.              : ChangeLog 
	doc            : gnash.1 

Log message:
	Deanna updated the man-page for us, thx.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4107&r2=1.4108
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/gnash.1?cvsroot=gnash&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4107
retrieving revision 1.4108
diff -u -b -r1.4107 -r1.4108
--- ChangeLog	26 Aug 2007 15:46:32 -0000	1.4107
+++ ChangeLog	26 Aug 2007 20:56:50 -0000	1.4108
@@ -1,3 +1,7 @@
+2007-08-26 Deanna Phillips <deanna>
+
+	* doc/gnash.1: Updated.
+
 2007-08-26 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
 
 	* gui/gtk.cpp, gui/gtksup.h: Add treeview to Movie Properties

Index: doc/gnash.1
===================================================================
RCS file: /sources/gnash/gnash/doc/gnash.1,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- doc/gnash.1	17 Oct 2006 16:37:47 -0000	1.7
+++ doc/gnash.1	26 Aug 2007 20:56:50 -0000	1.8
@@ -1,4 +1,4 @@
-.TH gnash 1 "$Date: 2006/10/17 16:37:47 $" "$Author: nihilus $" "GNU Flash Player" \" -*- $Id: gnash.1,v 1.7 2006/10/17 16:37:47 nihilus Exp $ -*-
+.TH gnash 1 "$Date: 2007/08/26 20:56:50 $" "$Author: nihilus $" "GNU Flash Player" \" -*- $Id: gnash.1,v 1.8 2007/08/26 20:56:50 nihilus Exp $ -*-
 .SH NAME
 gnash \- GNU Flash Player
 .SH SYNOPSIS
@@ -104,6 +104,110 @@
 .TP 
 CTRL\-B
 Toggle background color
+.SH "CONFIGURATION FILE FORMAT"
+The configuration file, .gnashrc, contains default settings which will
+be used by Gnash when running standalone or as a browser plugin.  Any
+command line options override these values.
+
+The configuration file contains keywords that accept three types of
+values: on/off, integer, and colon-separated hostname lists for access
+control.
+.TP
+.B localdomain [ on/off ]
+If set to on, Gnash will only load movies from the local domain.
+Defaults to off.
+.TP
+.B
+localhost [ on/off ]
+If set to on, Gnash will only load movies from localhost.  Defaults to
+off.
+
+.TP
+.B whitelist [ access list ]
+A list of hostnames, separated by colons.  This is an explicit list of
+hosts which are always allowed to load movies in Gnash.  Any hosts not
+on the list will be denied.  Use this list if you would like to run
+gnash with a default deny policy.
+
+.TP
+.B blacklist [ access list ]
+A list of hostnames, separated by colons.  This is an explicit list of
+hosts which are never allowed to load movies in Gnash.  Any hosts not
+on the list will be allowed.  Use this list if you would like to run
+gnash with a default allow policy.
+
+.TP
+.B delay [ integer ]
+Gnash uses a timer based event mechanism to advance frames at a steady
+rate. This lets one override the default delay in Gnash to play a
+movie slower or faster.
+
+.TP
+.B
+verbosity [ integer ]
+Specifies the debug level.  Higher values increase verbosity; a value
+of zero disables debug output altogether.
+
+.TP
+.B
+MalformedSWFVerbosity [ on/off ]
+Controls whether malformed SWF errors should be printed.
+
+.TP
+.B
+ASCodingErrorsVerbosity [ on/off ]
+Controls whether ActionScript coding errors should be printed.
+
+.TP
+.B
+debuglog <path>
+Specifies an alternate name and location for the debug logfile.  The
+default is gnash-dbg.log in Gnash's current working directory.
+
+.TP
+.B
+writelog [ on | off ] 
+Controls where debug output will be directed.  If set to on,
+output is written to debuglog; otherwise, output is written to
+standard error.
+
+.TP
+.B
+sound [ on | off ]
+Controls whether sound is enabled in the standalone player.  Defaults
+to on.
+
+.TP
+.B
+pluginsound [ on | off ]
+Controls whether sound is enabled in the plugin.  Defaults to on.
+
+.TP
+.B
+EnableExtensions [ on | off ] 
+Controls whether extensions will be enabled.  Defaults to off.
+
+.TP
+.B
+StartStopped [ on | off ]
+Controls the GUI startup behavior.  If set to on, movies must be
+explicitly started in order to play.  This is particularly useful for
+the plugin.  Off by default.
+
+.SH "FILES"
+.TP
+.B ~/.gnashrc
+Contains user settings which will be used by Gnash when running
+standalone or as a browser plugin.  Any command line options will
+override these values.
+
+.TP
+.B gnash-dbg.log
+If writelog is set to on, gnash will log debug output to this file,
+Its location may be set with the debuglog keyword in the user's
+.gnashrc.  By default, it is located in Gnash's
+current working directory.
+
 .SH "BUGS"
 The best way to report a bug is to use the form at
 http://savannah.gnu.org/bugs/?group=gnash.  



From MAILER-DAEMON Sun Aug 26 19:41:12 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPRjD-0005b9-Uz
	for mharc-gnash-commit@gnu.org; Sun, 26 Aug 2007 19:41:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPRjC-0005b3-S7
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 19:41:10 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPRjB-0005ar-W1
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 19:41:10 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPRjB-0005ao-TM
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 19:41:09 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <chadmusick@msbx.net>) id 1IPRjB-0005bu-Eh
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 19:41:09 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <chadmusick@msbx.net>) id 1IPRj5-0004yA-Tx
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 23:41:04 +0000
Received: from cmusick by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <cmusick@savannah.gnu.org>) id 1IPRj5-0004y5-M9
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 23:41:03 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPRj5-0004y5-M9@cvs.savannah.gnu.org>
From: Chad Musick <chadmusick@msbx.net>
Date: Sun, 26 Aug 2007 23:41:03 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/server filters.cpp filters.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Aug 2007 23:41:11 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Chad Musick <cmusick>	07/08/26 23:41:03

Removed files:
	server         : filters.cpp filters.h 

Log message:
	Removed unneeded files.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/filters.cpp?cvsroot=gnash&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/gnash/server/filters.h?cvsroot=gnash&r1=1.1&r2=0

Patches:
Index: filters.cpp
===================================================================
RCS file: filters.cpp
diff -N filters.cpp
--- filters.cpp	24 Aug 2007 05:44:18 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,516 +0,0 @@
-// 
-//   Copyright (C) 2007 Free Software Foundation, Inc.
-// 
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-/* $Id: filters.cpp,v 1.1 2007/08/24 05:44:18 cmusick Exp $ */
-
-#include "filters.h"
-
-#include "cxform.h"
-#include "log.h"
-#include "stream.h"
-
-namespace gnash {
-namespace effect_filters {
-
-typedef enum
-{
-    DROP_SHADOW = 0,
-    BLUR = 1,
-    GLOW = 2,
-    BEVEL = 3,
-    GRADIENT_GLOW = 4,
-    CONVOLUTION = 5,
-    COLOR_MATRIX = 6,
-    GRADIENT_BEVEL = 7
-} filter_types;
-
-class drop_shadow_filter : public effect_filter
-{
-public:
-    friend class filter_factory;
-
-    bool read(stream* in);
-
-private:
-    drop_shadow_filter() : 
-        m_rgba(), m_blur_horizontal(), m_blur_vertical(),
-        m_radian_angle(), m_distance(), m_strength(),
-        m_inner_shadow(), m_knock_out(), m_composite_source()
-   { return; }
-
-    cxform m_rgba;
-
-    float m_blur_horizontal;
-    float m_blur_vertical;
-
-    float m_radian_angle;
-    float m_distance;
-
-    float m_strength;
-
-    bool m_inner_shadow;
-    bool m_knock_out;
-    bool m_composite_source;
-};
-
-class blur_filter : public effect_filter
-{
-public:
-    friend class filter_factory;
-
-    bool read(stream* in);
-
-private:
-    blur_filter() :
-        m_blur_horizontal(), m_blur_vertical(), m_passes()
-    { return; }
-
-    float m_blur_horizontal;
-    float m_blur_vertical;
-
-    uint8_t m_passes;
-};
-
-class glow_filter : public effect_filter
-{
-public:
-    friend class filter_factory;
-
-    bool read(stream* in);
-
-private:
-    glow_filter() :
-        m_rgba(), m_blur_horizontal(), m_blur_vertical(), m_strength(),
-        m_inner_shadow(), m_knock_out(), m_composite_source()
-    { return; }
-
-    cxform m_rgba;
-
-    float m_blur_horizontal;
-    float m_blur_vertical;
-
-    float m_strength;
-
-    bool m_inner_shadow;
-    bool m_knock_out;
-    bool m_composite_source;
-};
-
-class bevel_filter : public effect_filter
-{
-public:
-    friend class filter_factory;
-
-    bool read(stream* in);
-
-private:
-    bevel_filter() :
-        m_rgba(), m_highlight_rgba(), m_blur_horizontal(), m_blur_vertical(),
-        m_radian_angle(), m_distance(), m_strength(), m_inner_shadow(),
-        m_composite_source(), m_on_top()
-    { return; }
-
-    cxform m_rgba;
-    cxform m_highlight_rgba;
-
-    float m_blur_horizontal;
-    float m_blur_vertical;
-
-    float m_radian_angle;
-    float m_distance;
-
-    float m_strength;
-
-    bool m_inner_shadow;
-    bool m_knock_out;
-    bool m_composite_source;
-    bool m_on_top; // Overlay.
-};
-
-class gradient_glow_filter : public effect_filter
-{
-public:
-    friend class filter_factory;
-
-    bool read(stream* in);
-
-private:
-    gradient_glow_filter() :
-        m_count(), m_rgba_array(), m_positions(), m_blur_horizontal(),
-        m_blur_vertical(), m_radian_angle(), m_distance(), m_strength(),
-        m_inner_shadow(), m_knock_out(), m_composite_source(),
-        m_passes()
-    { return; }
-
-    uint8_t m_count;
-    std::vector<boost::shared_ptr<cxform> > m_rgba_array;
-    std::vector<uint8_t> m_positions;
-
-    float m_blur_horizontal;
-    float m_blur_vertical;
-
-    float m_radian_angle;
-    float m_distance;
-
-    float m_strength;
-
-    bool m_inner_shadow;
-    bool m_knock_out;
-    bool m_composite_source;
-
-    uint8_t m_passes;
-};
-
-class convolution_filter : public effect_filter
-{
-public:
-    friend class filter_factory;
-
-    bool read(stream* in);
-
-private:
-    convolution_filter() :
-         m_columns(), m_rows(), m_divisor(), m_bias(), m_weights(),
-         m_default_rgba(), m_clamp(), m_reserve_alpha()
-    { return; }
-
-    uint8_t m_columns;
-    uint8_t m_rows;
-
-    float m_divisor;
-    float m_bias;
-
-    std::vector<float> m_weights;
-
-    cxform m_default_rgba;
-
-    bool m_clamp;
-    bool m_reserve_alpha;
-};
-
-class color_matrix_filter : public effect_filter
-{
-public:
-    friend class filter_factory;
-
-    bool read(stream* in);
-
-private:
-    color_matrix_filter() :
-        m_matrix()
-    { return; }
-
-    float m_matrix[25]; // Fixed size for color_matrix filters.
-};
-
-class gradient_bevel_filter : public effect_filter
-{
-public:
-    friend class filter_factory;
-
-    bool read(stream* in);
-
-private:
-    gradient_bevel_filter() :
-        m_count(), m_rgba_array(), m_positions(), m_blur_horizontal(),
-        m_blur_vertical(), m_radian_angle(), m_distance(), m_strength(),
-        m_inner_shadow(), m_knock_out(), m_composite_source(),
-        m_passes()
-    { return; }
-
-    uint8_t m_count;
-    std::vector<boost::shared_ptr<cxform> > m_rgba_array;
-    std::vector<uint8_t> m_positions;
-
-    float m_blur_horizontal;
-    float m_blur_vertical;
-
-    float m_radian_angle;
-    float m_distance;
-
-    float m_strength;
-
-    bool m_inner_shadow;
-    bool m_knock_out;
-    bool m_composite_source;
-
-    uint8_t m_passes;
-};
-
-int const filter_factory::read(stream* in, int /* movie_version */,
-    bool read_multiple, effect_filters_vec *store)
-{
-    int count = 1;
-
-    if (read_multiple)
-    {
-        in->ensureBytes(1);
-        count = static_cast<int> (in->read_u8());
-    }
-
-    for (int i = 0; i < count; ++i)
-    {
-        effect_filter *the_filter = NULL;
-
-        uint8_t filter_type = in->read_u8();
-
-        switch (filter_type)
-        {
-            case DROP_SHADOW:
-                the_filter = new drop_shadow_filter;
-                break;
-            case BLUR:
-                the_filter = new blur_filter; 
-                break;
-            case GLOW:
-                the_filter = new glow_filter;
-                break;
-            case BEVEL:
-                the_filter = new bevel_filter;
-                break;
-            case GRADIENT_GLOW:
-                the_filter = new gradient_glow_filter;
-                break;
-            case CONVOLUTION:
-                the_filter = new convolution_filter;
-                break;
-            case COLOR_MATRIX:
-                the_filter = new color_matrix_filter;
-                break;
-            case GRADIENT_BEVEL:
-                the_filter = new gradient_bevel_filter;
-                break;
-            default:
-                IF_VERBOSE_MALFORMED_SWF(
-                log_swferror(_("Invalid filter type %d."), filter_type);
-                );
-                return i; // We're already broken, no need to cause more pain.
-        }
-
-        // Protect against exceptions and such by storing before we read.
-        effect_filter_ptr p(the_filter);
-        if (!p->read(in))
-        {
-            IF_VERBOSE_MALFORMED_SWF(
-            log_swferror(_("Filter %d could not read."), filter_type);
-            );
-            return i; // We're already broken.
-        }
-        store->push_back(p);
-    }
-
-    return count;
-}
-
-bool drop_shadow_filter::read(stream* in)
-{
-    m_rgba.read_rgba(in);
-
-    m_blur_horizontal = in->read_fixed();
-    m_blur_vertical = in->read_fixed();
-
-    m_radian_angle = in->read_fixed();
-    m_distance = in->read_fixed();
-
-    m_strength = in->read_short_fixed();
-
-    m_inner_shadow = in->read_uint(1) ? true : false;
-    m_knock_out = in->read_uint(1) ? true : false;
-    m_composite_source = in->read_uint(1) ? true : false;
-
-    static_cast<void> (in->read_uint(5)); // Throw these away on purpose.
-
-    return true;
-}
-
-bool blur_filter::read(stream* in)
-{
-    m_blur_horizontal = in->read_fixed();
-    m_blur_vertical = in->read_fixed();
-
-    m_passes = static_cast<uint8_t> (in->read_uint(5));
-
-    static_cast<void> (in->read_uint(3)); // Throw these away.
-
-    return true;
-}
-
-bool glow_filter::read(stream* in)
-{
-    m_rgba.read_rgba(in);
-
-    m_blur_horizontal = in->read_fixed();
-    m_blur_vertical = in->read_fixed();
-
-    m_strength = in->read_short_fixed();
-
-    m_inner_shadow = in->read_uint(1) ? true : false;
-    m_knock_out = in->read_uint(1) ? true : false;
-    m_composite_source = in->read_uint(1) ? true : false;
-
-    static_cast<void> (in->read_uint(5)); // Throw these away.
-
-    return true;
-}
-
-bool bevel_filter::read(stream* in)
-{
-    m_rgba.read_rgba(in);
-    m_highlight_rgba.read_rgba(in);
-
-    m_blur_horizontal = in->read_fixed();
-    m_blur_vertical = in->read_fixed();
-
-    m_radian_angle = in->read_fixed();
-    m_distance = in->read_fixed();
-    
-    m_strength = in->read_short_fixed();
-
-    m_inner_shadow = in->read_uint(1) ? true : false;
-    m_knock_out = in->read_uint(1) ? true : false;
-    m_composite_source = in->read_uint(1) ? true : false;
-    m_on_top = in->read_uint(1) ? true : false;
-
-    static_cast<void> (in->read_uint(4)); // Throw these away.
-
-    return true;
-}
-
-bool gradient_glow_filter::read(stream* in)
-{
-    m_count = in->read_u8();
-
-    m_rgba_array.reserve(m_count);
-    for (int i = 0; i < m_count; ++i)
-    {
-        boost::shared_ptr<cxform> rgba(new cxform);
-        rgba->read_rgba(in);
-        m_rgba_array.push_back(rgba);
-    }
-
-    m_positions.reserve(m_count);
-    for (int i = 0; i < m_count; ++i)
-    {
-        m_positions.push_back(in->read_u8());
-    }
-
-    m_blur_horizontal = in->read_fixed();
-    m_blur_vertical = in->read_fixed();
-
-    m_radian_angle = in->read_fixed();
-    m_distance = in->read_fixed();
-
-    m_strength = in->read_short_fixed();
-
-    m_inner_shadow = in->read_uint(1) ? true : false;
-    m_knock_out = in->read_uint(1) ? true : false;
-    m_composite_source = in->read_uint(1) ? true : false;
-
-    static_cast<void> (in->read_uint(1)); // Throw away.
-
-    m_passes = static_cast<uint8_t> (in->read_uint(4));
-
-    return true;
-}
-
-// TODO: Be sure that read_fixed is doing the right thing with
-// values that are stored as floats rather than as fixed point
-// values! If they are not, define such a function in the
-// stream and remove this #define.
-#define read_float read_fixed
-
-bool convolution_filter::read(stream* in)
-{
-    m_columns = in->read_u8();
-    m_rows = in->read_u8();
-
-    m_divisor = in->read_float();
-    m_bias = in->read_float();
-
-    m_weights.reserve(m_columns * m_rows);
-    for (int i = 0; i < m_columns * m_rows; ++i)
-    {
-        m_weights.push_back(in->read_float());
-    }
-
-    m_default_rgba.read_rgba(in);
-
-    static_cast<void> (in->read_uint(6)); // Throw away.
-
-    m_clamp = in->read_uint(1) ? true : false;
-    m_reserve_alpha = in->read_uint(1) ? true : false;
-
-    return true;
-}
-
-bool color_matrix_filter::read(stream* in)
-{
-    for (int i = 0; i < 20; ++i)
-    {
-        m_matrix[i] = in->read_float();
-    }
-
-    m_matrix[20] = m_matrix[21] = m_matrix[22] = m_matrix[23] = 0.0;
-    m_matrix[24] = 1.0;
-
-    return true;
-}
-
-#undef read_float
-
-// This is the same code as gradient_glow_filter,
-// however, there is no intrinsic reason this must be the case,
-// so these two functions are separated.
-bool gradient_bevel_filter::read(stream* in)
-{
-    m_count = in->read_u8();
-
-    m_rgba_array.reserve(m_count);
-    for (int i = 0; i < m_count; ++i)
-    {
-        boost::shared_ptr<cxform> rgba(new cxform);
-        rgba->read_rgba(in);
-        m_rgba_array.push_back(rgba);
-    }
-
-    m_positions.reserve(m_count);
-    for (int i = 0; i < m_count; ++i)
-    {
-        m_positions.push_back(in->read_u8());
-    }
-
-    m_blur_horizontal = in->read_fixed();
-    m_blur_vertical = in->read_fixed();
-
-    m_radian_angle = in->read_fixed();
-    m_distance = in->read_fixed();
-
-    m_strength = in->read_short_fixed();
-
-    m_inner_shadow = in->read_uint(1) ? true : false;
-    m_knock_out = in->read_uint(1) ? true : false;
-    m_composite_source = in->read_uint(1) ? true : false;
-
-    static_cast<void> (in->read_uint(1)); // Throw away.
-
-    m_passes = static_cast<uint8_t> (in->read_uint(4));
-
-    return true;
-}
-
-} // effect_filters namespace
-} // gnash namespace

Index: filters.h
===================================================================
RCS file: filters.h
diff -N filters.h
--- filters.h	24 Aug 2007 05:44:18 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,65 +0,0 @@
-// 
-//   Copyright (C) 2007 Free Software Foundation, Inc.
-// 
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-/* $Id: filters.h,v 1.1 2007/08/24 05:44:18 cmusick Exp $ */
-
-#ifndef GNASH_FILTERS
-#define GNASH_FILTERS
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <vector>
-#include <boost/shared_ptr.hpp>
-
-namespace gnash {
-
-class stream;
-
-namespace effect_filters {
-
-class effect_filter;
-
-typedef boost::shared_ptr<effect_filter> effect_filter_ptr;
-typedef std::vector<effect_filter_ptr> effect_filters_vec;
-
-class filter_factory
-{
-public:
-    /// \brief Read one, possibly multiple filters from the stream,
-    /// and push them into the vector store. Returns the number read.
-    /// If read_multiple is true, the first byte of the stream is
-    /// expected to contain the number of filters to be read.
-    static int const read(stream* in, int movie_version, bool read_multiple,
-        effect_filters_vec *store);
-};
-
-// Common base class for the filters.
-class effect_filter
-{
-public:
-    // Fill from a stream.
-    virtual bool read(stream* in) = 0;
-
-    virtual ~effect_filter() { return; }
-};
-
-} // Namespace effect_filters
-} // Namespace gnash
-
-#endif // GNASH_FILTERS



From MAILER-DAEMON Sun Aug 26 21:26:59 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPTNb-0003Uy-3h
	for mharc-gnash-commit@gnu.org; Sun, 26 Aug 2007 21:26:59 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPTNZ-0003SD-8p
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 21:26:57 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPTNY-0003RO-Ir
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 21:26:56 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPTNY-0003R8-EN
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 21:26:56 -0400
Received: from wr-out-0506.google.com ([64.233.184.239])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1IPTNY-0004zH-0g
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 21:26:56 -0400
Received: by wr-out-0506.google.com with SMTP id 50so937442wra
	for <gnash-commit@gnu.org>; Sun, 26 Aug 2007 18:26:54 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=LF1OGCQY6DT0VuL6ZXQ9pau7islQ8fJKl12mnrXGaE4TQkXkQeMQ8THHCPKIClC9wo6D5g7JyQaO8cizD81i8jRDotuvO6IHXMXoI8nUxqUEcy0RUPZskGP/9g1Jr8mA8U8S912ZTPfR/UmHzZorJydiyxxm18wslSxssWF0zhE=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=Xdql1tzGJ21LKitDTy8Ca1crSK+oMq7pkODTcPvFiVM5ZL3VeT3g+rFzQYKXkY2iex2TErKzzyG5PUljjartcDXo/yLLstFq1pyck5JRFrb3Uakns0v43Z/LsDDNc1k6VCvCOy7rp4RkcPmsOLT651OrO+BHHQUHS5FF07aOBV0=
Received: by 10.114.159.1 with SMTP id h1mr1034960wae.1188178013680;
	Sun, 26 Aug 2007 18:26:53 -0700 (PDT)
Received: by 10.114.12.7 with HTTP; Sun, 26 Aug 2007 18:26:53 -0700 (PDT)
Message-ID: <ca4b43ff0708261826m5cfe495cy7886345e93b54bab@mail.gmail.com>
Date: Mon, 27 Aug 2007 09:26:53 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "Sandro Santilli" <strk@keybit.net>
Subject: Re: [Gnash-commit] gnash ChangeLog server/as_value.cpp server/dlis...
In-Reply-To: <E1IObh2-0004ZK-19@cvs.savannah.gnu.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1IObh2-0004ZK-19@cvs.savannah.gnu.org>
X-Detected-Kernel: Linux 2.4-2.6 (Google crawlbot)
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 01:26:57 -0000

How is the status of Soft Reference now?  I see lots of them have been fixed.


On 8/25/07, Sandro Santilli <strk@keybit.net> wrote:
> CVSROOT:        /sources/gnash
> Module name:    gnash
> Changes by:     Sandro Santilli <strk>  07/08/24 16:07:27
>
> Modified files:
>         .              : ChangeLog
>         server         : as_value.cpp dlist.cpp dlist.h
>         testsuite/actionscript.all: MovieClip.as case.as
>         testsuite/misc-ming.all: displaylist_depths_test2.c
>
> Log message:
>                 * server/dlist.{h,cpp} (replace_character): call unload() on replaced
>                   character and document the fact.
>                 * server/as_value.cpp: undefine the MOVIECLIP_AS_SOFTREF macro, tweak
>                   equalSameType() and to_sprite() to use MOVIECLIP targets only when
>                   they are unloaded.
>                 * testsuite/misc-ming.all/displaylist_depths_test2.c: xcheck => check
>                   (no more failures from this test)
>                 * testsuite/actionscript.all/MovieClip.as: xcheck => check
>                   (soft-references related)
>                 * testsuite/actionscript.all/case.as: xcheck => check (soft refs).
>
> CVSWeb URLs:
> http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4098&r2=1.4099
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.65&r2=1.66
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.cpp?cvsroot=gnash&r1=1.77&r2=1.78
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.h?cvsroot=gnash&r1=1.45&r2=1.46
> http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.83&r2=1.84
> http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/case.as?cvsroot=gnash&r1=1.8&r2=1.9
> http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/displaylist_depths_test2.c?cvsroot=gnash&r1=1.7&r2=1.8
>
> Patches:
> Index: ChangeLog
> ===================================================================
> RCS file: /sources/gnash/gnash/ChangeLog,v
> retrieving revision 1.4098
> retrieving revision 1.4099
> diff -u -b -r1.4098 -r1.4099
> --- ChangeLog   24 Aug 2007 15:52:49 -0000      1.4098
> +++ ChangeLog   24 Aug 2007 16:07:26 -0000      1.4099
> @@ -1,3 +1,16 @@
> +2007-08-24 Sandro Santilli <strk@keybit.net>
> +
> +       * server/dlist.{h,cpp} (replace_character): call unload() on replaced
> +         character and document the fact.
> +       * server/as_value.cpp: undefine the MOVIECLIP_AS_SOFTREF macro, tweak
> +         equalSameType() and to_sprite() to use MOVIECLIP targets only when
> +         they are unloaded.
> +       * testsuite/misc-ming.all/displaylist_depths_test2.c: xcheck => check
> +         (no more failures from this test)
> +       * testsuite/actionscript.all/MovieClip.as: xcheck => check
> +         (soft-references related)
> +       * testsuite/actionscript.all/case.as: xcheck => check (soft refs).
> +
>  2007-08-24 Miriam Ruiz <little_miry@yahoo.es>
>
>          * plugin/klash/klash_part.cpp: Patch for GNASHEXE.
>
> Index: server/as_value.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/server/as_value.cpp,v
> retrieving revision 1.65
> retrieving revision 1.66
> diff -u -b -r1.65 -r1.66
> --- server/as_value.cpp 24 Aug 2007 13:55:08 -0000      1.65
> +++ server/as_value.cpp 24 Aug 2007 16:07:27 -0000      1.66
> @@ -44,7 +44,7 @@
>
>  // Undefine this to keep MOVIECLIP values by pointer
>  // rather then by "target" ref.
> -#define MOVIECLIP_AS_SOFTREF
> +//#define MOVIECLIP_AS_SOFTREF
>
>  // Define the macro below to make abstract equality operator verbose
>  //#define GNASH_DEBUG_EQUALITY
> @@ -512,9 +512,11 @@
>         if ( sp->isUnloaded() )
>         {
>                 log_error(_("MovieClip value is a dangling reference: "
> -                               "target %s was unloaded (should set to NULL?)"),
> +                               "target %s was unloaded (looking for a substitute on the same target))"),
>                                 sp->getTarget().c_str());
> -               return NULL;
> +               sp = find_sprite_by_target(sp->getTarget());
> +               return sp;
> +               //return NULL;
>         }
>         return sp;
>  #else
> @@ -847,7 +849,7 @@
>  #ifdef MOVIECLIP_AS_SOFTREF
>                         return m_string_value == v.m_string_value;
>  #else
> -                       return m_object_value == v.m_object_value;
> +                       return to_sprite() == v.to_sprite(); // m_object_value == v.m_object_value;
>  #endif
>
>                 case NUMBER:
>
> Index: server/dlist.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/server/dlist.cpp,v
> retrieving revision 1.77
> retrieving revision 1.78
> diff -u -b -r1.77 -r1.78
> --- server/dlist.cpp    22 Aug 2007 04:54:56 -0000      1.77
> +++ server/dlist.cpp    24 Aug 2007 16:07:27 -0000      1.78
> @@ -311,6 +311,9 @@
>                 // remember bounds of old char
>                 oldch->add_invalidated_bounds(old_ranges, true);
>
> +               // Unload old char
> +               (*it)->unload();
> +
>                 // replace existing char
>                 *it = di;
>
>
> Index: server/dlist.h
> ===================================================================
> RCS file: /sources/gnash/gnash/server/dlist.h,v
> retrieving revision 1.45
> retrieving revision 1.46
> diff -u -b -r1.45 -r1.46
> --- server/dlist.h      1 Jul 2007 10:54:21 -0000       1.45
> +++ server/dlist.h      24 Aug 2007 16:07:27 -0000      1.46
> @@ -98,6 +98,8 @@
>         /// Puts a new character at the specified depth, replacing any
>         /// existing character.
>         //
> +       /// Calls unload on the removed character.
> +       ///
>         /// If use_cxform or use_matrix are false, and a character is
>         /// present at the given depth, then keep those respective
>         /// properties from the existing character.
>
> Index: testsuite/actionscript.all/MovieClip.as
> ===================================================================
> RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
> retrieving revision 1.83
> retrieving revision 1.84
> diff -u -b -r1.83 -r1.84
> --- testsuite/actionscript.all/MovieClip.as     24 Aug 2007 15:05:23 -0000      1.83
> +++ testsuite/actionscript.all/MovieClip.as     24 Aug 2007 16:07:27 -0000      1.84
> @@ -20,7 +20,7 @@
>  // compile this test case with Ming makeswf, and then
>  // execute it like this gnash -1 -r 0 -v out.swf
>
> -rcsid="$Id: MovieClip.as,v 1.83 2007/08/24 15:05:23 strk Exp $";
> +rcsid="$Id: MovieClip.as,v 1.84 2007/08/24 16:07:27 strk Exp $";
>
>  #include "check.as"
>
> @@ -393,10 +393,10 @@
>  check_equals(typeof(mc4), 'movieclip');
>  check_equals(typeof(mc5), 'movieclip');
>  // gah.. our "soft references" are bogus :(
> -xcheck_equals(mc4._target, "/changed");
> -xcheck_equals(mc5._target, "/changed/mc5_mc");
> -xcheck_equals(targetPath(mc4), "_level0.changed");
> -xcheck_equals(targetPath(mc5), "_level0.changed.mc5_mc");
> +check_equals(mc4._target, "/changed");
> +check_equals(mc5._target, "/changed/mc5_mc");
> +check_equals(targetPath(mc4), "_level0.changed");
> +check_equals(targetPath(mc5), "_level0.changed.mc5_mc");
>  xcheck_equals(mc4.toString(), "[object Object]");
>  xcheck_equals(mc5.toString(), "[object Object]");
>  check_equals(changed._target, "/changed");
> @@ -452,7 +452,7 @@
>  // it's distinct clip !
>  sr61.member = 6;
>  check_equals(sr61.member, 6);
> -xcheck_equals(typeof(sr62.member), 'undefined');
> +check_equals(typeof(sr62.member), 'undefined');
>  check_equals(sr61._name, "hardref");
>  check_equals(sr62._name, "hardref");
>
>
> Index: testsuite/actionscript.all/case.as
> ===================================================================
> RCS file: /sources/gnash/gnash/testsuite/actionscript.all/case.as,v
> retrieving revision 1.8
> retrieving revision 1.9
> diff -u -b -r1.8 -r1.9
> --- testsuite/actionscript.all/case.as  23 Aug 2007 16:50:56 -0000      1.8
> +++ testsuite/actionscript.all/case.as  24 Aug 2007 16:07:27 -0000      1.9
> @@ -22,7 +22,7 @@
>   *  Test case sensitivity
>   */
>
> -rcsid="$Id: case.as,v 1.8 2007/08/23 16:50:56 strk Exp $";
> +rcsid="$Id: case.as,v 1.9 2007/08/24 16:07:27 strk Exp $";
>
>  #include "check.as"
>
> @@ -133,15 +133,15 @@
>  check_equals(mcRef[1]._name, "CLIP");
>  check_equals(mcRef[1]._target, "/CLIP");
>  #else // OUTPUT_VERSION <= 6
> -// Gnash fails these due to "soft references"
> +// Gnash used to fail these due to "soft references"
>  // Basically, a MOVIECLIP as_value stores the clip
>  // target, but in SWF<7 the target is insensitive
>  // so /clip and /CLIP both resolve to the *same*
>  // character.
>  //
> -xcheck_equals(mcRef[1].getDepth(), 7);
> -xcheck_equals(mcRef[1]._name, "CLIP");
> -xcheck_equals(mcRef[1]._target, "/CLIP");
> +check_equals(mcRef[1].getDepth(), 7);
> +check_equals(mcRef[1]._name, "CLIP");
> +check_equals(mcRef[1]._target, "/CLIP");
>  #endif // OUTPUT_VERSION <= 6
>
>
>
> Index: testsuite/misc-ming.all/displaylist_depths_test2.c
> ===================================================================
> RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/displaylist_depths_test2.c,v
> retrieving revision 1.7
> retrieving revision 1.8
> diff -u -b -r1.7 -r1.8
> --- testsuite/misc-ming.all/displaylist_depths_test2.c  1 Jul 2007 10:54:51 -0000       1.7
> +++ testsuite/misc-ming.all/displaylist_depths_test2.c  24 Aug 2007 16:07:27 -0000      1.8
> @@ -188,8 +188,8 @@
>                 //       existance of the old (dynamicized) instance by looking
>                 //       at the real DisplayList and at the rendered buffer
>                 //
> -               "xcheck_equals(dynRef.myThing, 'guess');"
> -               "xcheck_equals(dynRef.getDepth(), 10);"
> +               "check_equals(dynRef.myThing, 'guess');"
> +               "check_equals(dynRef.getDepth(), 10);"
>
>                 // Luckly we can query for depth chars with getInstanceAtDepth
>                 "check_equals(typeof(getInstanceAtDepth(-16381)), 'movieclip');"
>
>
> _______________________________________________
> Gnash-commit mailing list
> Gnash-commit@gnu.org
> http://lists.gnu.org/mailman/listinfo/gnash-commit
>



From MAILER-DAEMON Sun Aug 26 21:35:11 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPTVX-0004d1-5V
	for mharc-gnash-commit@gnu.org; Sun, 26 Aug 2007 21:35:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPTVU-0004cn-PP
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 21:35:08 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPTVS-0004cO-ML
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 21:35:07 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPTVS-0004cL-Ik
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 21:35:06 -0400
Received: from wa-out-1112.google.com ([209.85.146.181])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1IPTVS-00060r-49
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 21:35:06 -0400
Received: by wa-out-1112.google.com with SMTP id j4so1837974wah
	for <gnash-commit@gnu.org>; Sun, 26 Aug 2007 18:35:04 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=oGyKgIqHMJiQyF8tpRIt5vVtmEa+H2MSR7czVrCEXxSiN29DgnVJHcsi4yrQUS01iIE/0OVSZTe8L3oXc6iPm1hVpFY8GoD+9NEMXsy5R8lyoBane//x5i6Yu4UXYbYEWCmNAqMTqUkj8euAAsbX2QvoDAZb2D6kmdl3q4jQNaE=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=flfSRtPAUbaqYtoLokJy62OYRfVaqD7O/ir0Vok+POdYCFLwBg1rONhluNI7yGLySxz5Mge4qju8zJddLlcVLTqbFyLN7BLF3YiVZdv/uLTq1oXxrBOVXTbFSHOXekDOafGeae8+/bl81hbd9uQvvVExK7xUzV0QzlFN41Cb1LA=
Received: by 10.114.174.2 with SMTP id w2mr1257086wae.1188178504678;
	Sun, 26 Aug 2007 18:35:04 -0700 (PDT)
Received: by 10.114.12.7 with HTTP; Sun, 26 Aug 2007 18:35:04 -0700 (PDT)
Message-ID: <ca4b43ff0708261835w2e513dfbv94d875851630962e@mail.gmail.com>
Date: Mon, 27 Aug 2007 09:35:04 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "Chad Musick" <chadmusick@msbx.net>, gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash/server/vm ASHandlers.cpp ASHandlers.h
In-Reply-To: <20070820084505.GB70316@keybit.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1IMxt8-0003P7-4n@cvs.savannah.gnu.org>
	<20070820084505.GB70316@keybit.net>
X-Detected-Kernel: Linux 2.6 (newer, 2)
Cc: 
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 01:35:09 -0000

>+    string str = string_val.to_string(&env);
>+    int length = 0;
>+    int offsets[str.length() + 1];

We didn't use any variable length array before, which is compiler
dependent. Maybe you can replace it with std::vector or some other
containers. We met this before. See patch#6149.

http://savannah.gnu.org/patch/index.php?6149

zou

On 8/20/07, strk <strk@keybit.net> wrote:
> On Mon, Aug 20, 2007 at 03:25:10AM +0000, Chad Musick wrote:
> > CVSROOT:      /sources/gnash
> > Module name:  gnash
> > Changes by:   Chad Musick <cmusick>   07/08/20 03:25:10
> >
> > Modified files:
> >       server/vm      : ASHandlers.cpp ASHandlers.h
>
> Chad, please update the ChangeLog with any commit. We're doing that manually.
>
> --strk;
>
>
>
> _______________________________________________
> Gnash-commit mailing list
> Gnash-commit@gnu.org
> http://lists.gnu.org/mailman/listinfo/gnash-commit
>



From MAILER-DAEMON Sun Aug 26 21:47:58 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPThu-0002gh-4r
	for mharc-gnash-commit@gnu.org; Sun, 26 Aug 2007 21:47:58 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPTht-0002dz-0C
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 21:47:57 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPThq-0002ZL-Rs
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 21:47:56 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPThq-0002Z6-Nq
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 21:47:54 -0400
Received: from wa-out-1112.google.com ([209.85.146.183])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1IPThq-0007vK-As
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 21:47:54 -0400
Received: by wa-out-1112.google.com with SMTP id j4so1841016wah
	for <gnash-commit@gnu.org>; Sun, 26 Aug 2007 18:47:53 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=JtdkGIcZOq4aP4oORwa7+gdHD4BUmDouF85L4fQi4r5e8BzfZ0QDfkSpRlwfH4mpIuYvAXcamtvY4EkSphbq7vUWbjxyeFjkKTi5nWzu5DV6nbHeT6xCMp0c65s4LkMaaqeCMhmAuzKprp3o80HK/RLjyl0AtGWWesG8lWsc99U=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=LHmgpZAOjczkTJXrGmrLCmJAIzUh7zZzTRwTWjuV5KugtHIEZwUk2OW++ARDRwPR1Qptx5AGUP5o21Z6uS9Gyi1VY2LwrzlfPzFx5G75sjaW1DWHKX1D9RiPKdNqricaS6s6EFViqLga2z3Ja+uFJZfLjzZS08+Bk6gYQe6mD6I=
Received: by 10.114.93.17 with SMTP id q17mr2063011wab.1188179272873;
	Sun, 26 Aug 2007 18:47:52 -0700 (PDT)
Received: by 10.114.12.7 with HTTP; Sun, 26 Aug 2007 18:47:52 -0700 (PDT)
Message-ID: <ca4b43ff0708261847y66912edbl5f4d082bdd61c4f6@mail.gmail.com>
Date: Mon, 27 Aug 2007 09:47:52 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "Chad Musick" <chadmusick@msbx.net>, gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash ChangeLog server/Makefile.am server/strea...
In-Reply-To: <20070826153700.GA44957@keybit.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1IPJob-0004rk-OB@cvs.savannah.gnu.org>
	<20070826153700.GA44957@keybit.net>
X-Detected-Kernel: Linux 2.6 (newer, 2)
Cc: 
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 01:47:57 -0000

> +bool GradientGlowFilter::read(stream* in)
> +{
> +    bool count = in->read_u8(); // How many colorings.

Any reason for 'count' to be bool?


On 8/26/07, strk <strk@keybit.net> wrote:
> On Sun, Aug 26, 2007 at 03:14:13PM +0000, Chad Musick wrote:
>
> >       float   stream::read_fixed()
> >       {
> > +#if 0 /* Chad */
> >               m_unused_bits = 0;
> >               int32_t val = m_input->read_le32();
> >               return (float) val / 65536.0f;
> > +#else
> > +             align();
> > +             return static_cast<float> (static_cast<double> (static_cast<long int> (m_input->read_le32())) / 65536.0f);
> > +#endif /* Chad */
> >       }
>
> Have align() just set m_unused_bits = 0 and inlined to get the same performance.
> Should be all ok, and something a bit faster...
>
> --strk;
>
>
> _______________________________________________
> Gnash-commit mailing list
> Gnash-commit@gnu.org
> http://lists.gnu.org/mailman/listinfo/gnash-commit
>



From MAILER-DAEMON Sun Aug 26 22:15:00 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPU84-0007Bg-7l
	for mharc-gnash-commit@gnu.org; Sun, 26 Aug 2007 22:15:00 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPU82-000786-Gv
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 22:14:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPU80-00074E-Rr
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 22:14:58 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPU80-00073q-N8
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 22:14:56 -0400
Received: from g78.mailsnare.net ([209.236.228.78] helo=mail.mailsnare.net)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <chadmusick@msbx.net>) id 1IPU80-000326-FA
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 22:14:56 -0400
X-Virus-Scanned: by ClamAV at mailsnare.net
X-Message-ID: 00ff702db0dc1113dba21d7ff9204a39d6a357911d59be81
Received: from [222.229.211.164] (unknown [222.229.211.164])
	by mail.mailsnare.net (Postfix) with ESMTP id 2A8167A9CB;
	Mon, 27 Aug 2007 02:14:51 +0000 (UTC)
Subject: Re: [Gnash-commit] gnash ChangeLog server/Makefile.am server/strea...
From: Chad Musick <chadmusick@msbx.net>
To: zou lunkai <zoulunkai@gmail.com>
In-Reply-To: <ca4b43ff0708261847y66912edbl5f4d082bdd61c4f6@mail.gmail.com>
References: <E1IPJob-0004rk-OB@cvs.savannah.gnu.org>
	<20070826153700.GA44957@keybit.net>
	<ca4b43ff0708261847y66912edbl5f4d082bdd61c4f6@mail.gmail.com>
Content-Type: text/plain
Date: Mon, 27 Aug 2007 11:14:51 +0900
Message-Id: <1188180891.7921.0.camel@ubuntu.sys76.lan>
Mime-Version: 1.0
X-Mailer: Evolution 2.10.1 
Content-Transfer-Encoding: 7bit
X-Detected-Kernel: Linux 2.6 (newer, 3)
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 02:14:58 -0000

No there's not, thanks for the catch, I'll correct it.

On Mon, 2007-08-27 at 09:47 +0800, zou lunkai wrote:
> > +bool GradientGlowFilter::read(stream* in)
> > +{
> > +    bool count = in->read_u8(); // How many colorings.
> 
> Any reason for 'count' to be bool?
> 





From MAILER-DAEMON Sun Aug 26 23:06:48 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPUwC-0004Tl-PZ
	for mharc-gnash-commit@gnu.org; Sun, 26 Aug 2007 23:06:48 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPUwB-0004QW-7J
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 23:06:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPUw9-0004M6-47
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 23:06:46 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPUw8-0004LS-UV
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 23:06:44 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <chadmusick@msbx.net>) id 1IPUw8-0000Vw-B7
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 23:06:44 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <chadmusick@msbx.net>) id 1IPUw7-0002F6-P8
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 03:06:43 +0000
Received: from cmusick by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <cmusick@savannah.gnu.org>) id 1IPUw7-0002F3-I7
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 03:06:43 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPUw7-0002F3-I7@cvs.savannah.gnu.org>
From: Chad Musick <chadmusick@msbx.net>
Date: Mon, 27 Aug 2007 03:06:43 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash server/BevelFilter.cpp server/BevelFilter...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 03:06:47 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Chad Musick <cmusick>	07/08/27 03:06:43

Modified files:
	server         : BevelFilter.cpp BevelFilter.h BitmapFilter.h 
	                 stream.cpp 
	server/asobj   : Makefile.am 
	server/parser  : filter_factory.cpp 
	server/vm      : ASHandlers.cpp ASHandlers.h 
	.              : ChangeLog 
Added files:
	server/asobj   : BevelFilter_as.cpp BevelFilter_as.h 
	                 BitmapFilter_as.h BitmapFilter_as.cpp 

Log message:
	Make Filters more compatible with ActionScript -- this commit includes such
	changes for BitmapFilter and BevelFilter. More to follow.
	Remove some dead code from stream.cpp and fix some compiler dependant code
	in ASHandlers.  Fix a typing bug in filter_factory.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/BevelFilter.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/BevelFilter.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/BitmapFilter.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/stream.cpp?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Makefile.am?cvsroot=gnash&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/BevelFilter_as.cpp?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/BevelFilter_as.h?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/BitmapFilter_as.h?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/BitmapFilter_as.cpp?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/filter_factory.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.127&r2=1.128
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.h?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4108&r2=1.4109

Patches:
Index: server/BevelFilter.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/BevelFilter.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/BevelFilter.cpp	26 Aug 2007 15:14:10 -0000	1.1
+++ server/BevelFilter.cpp	27 Aug 2007 03:06:41 -0000	1.2
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: BevelFilter.cpp,v 1.1 2007/08/26 15:14:10 cmusick Exp $ */
+/* $Id: BevelFilter.cpp,v 1.2 2007/08/27 03:06:41 cmusick Exp $ */
 
 #include "BevelFilter.h"
 
@@ -30,6 +30,9 @@
     Filter p(new BevelFilter(m_distance, m_angle, m_highlightColor,
         m_highlightAlpha, m_shadowColor, m_shadowAlpha,
         m_blurX, m_blurY, m_strength, m_quality, m_type, m_knockout));
+    p->set_prototype(get_prototype());
+    p->copyProperties(*this);
+
     return p;
 }
 

Index: server/BevelFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/BevelFilter.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/BevelFilter.h	26 Aug 2007 15:14:10 -0000	1.1
+++ server/BevelFilter.h	27 Aug 2007 03:06:41 -0000	1.2
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: BevelFilter.h,v 1.1 2007/08/26 15:14:10 cmusick Exp $ */
+/* $Id: BevelFilter.h,v 1.2 2007/08/27 03:06:41 cmusick Exp $ */
 
 #ifndef GNASH_BEVELFILTER_H
 #define GNASH_BEVELFILTER_H
@@ -28,10 +28,14 @@
 
 namespace gnash {
 
+class BevelFilter_as; // Adapter class for AS use.
+
 // A bevel effect filter.
 class BevelFilter : public BitmapFilter
 {
 public:
+    friend class BevelFilter_as;
+
     typedef enum
     {
         OUTER_BEVEL = 1,
@@ -48,6 +52,13 @@
     // Guaranteed to return an object which can be cast to BlurFilter
     Filter const clone();
 
+    BevelFilter(as_object* o) : BitmapFilter(o),
+        m_distance(0.0f), m_angle(0.0f), m_highlightColor(0),
+        m_highlightAlpha(0), m_shadowColor(0), m_shadowAlpha(0),
+        m_blurX(0.0f), m_blurY(0.0f),  m_strength(0.0f), m_quality(0),
+        m_type(FULL_BEVEL), m_knockout(false)
+    { return; }
+
     BevelFilter() : 
         m_distance(0.0f), m_angle(0.0f), m_highlightColor(0),
         m_highlightAlpha(0), m_shadowColor(0), m_shadowAlpha(0),

Index: server/BitmapFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/BitmapFilter.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/BitmapFilter.h	26 Aug 2007 15:14:10 -0000	1.1
+++ server/BitmapFilter.h	27 Aug 2007 03:06:41 -0000	1.2
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: BitmapFilter.h,v 1.1 2007/08/26 15:14:10 cmusick Exp $ */
+/* $Id: BitmapFilter.h,v 1.2 2007/08/27 03:06:41 cmusick Exp $ */
 
 #ifndef GNASH_BITMAPFILTER_H
 #define GNASH_BITMAPFILTER_H
@@ -30,20 +30,26 @@
 
 class stream;
 class BitmapFilter;
-
+class BitmapFilter_as; // Adapter pattern to ActionScript
 typedef boost::intrusive_ptr<BitmapFilter> Filter;
 
 // The common base class for AS display filters.
 class BitmapFilter : public as_object
 {
 public:
+    friend class BitmapFilter_as;
+
     // Fill from a stream. See parser/filter_factory.cpp for the implementations.
-    virtual bool read(stream* in) = 0;
+    virtual bool read(stream* /*in*/) { return true; }
 
+    // Pass the interface up the chain.
+    BitmapFilter(as_object *interface) : as_object(interface) { return; }
+    // For non-ActionScript use.
+    BitmapFilter() { return; }
     virtual ~BitmapFilter() { return; }
 
     // Clone this object and return a copy of it. (AS accessible function.)
-    Filter const clone();
+    virtual Filter const clone() { return NULL; }
 };
 
 } // Namespace gnash

Index: server/stream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/stream.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- server/stream.cpp	26 Aug 2007 15:14:12 -0000	1.25
+++ server/stream.cpp	27 Aug 2007 03:06:41 -0000	1.26
@@ -116,14 +116,8 @@
 
 	float	stream::read_fixed()
 	{
-#if 0 /* Chad */
-		m_unused_bits = 0;
-		int32_t	val = m_input->read_le32();
-		return (float) val / 65536.0f;
-#else
 		align();
 		return static_cast<float> (static_cast<double> (static_cast<long int> (m_input->read_le32())) / 65536.0f);
-#endif /* Chad */
 	}
 
 	// float is not large enough to hold a 32 bit value without doing the wrong thing with the sign.

Index: server/asobj/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Makefile.am,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- server/asobj/Makefile.am	1 Jul 2007 10:54:28 -0000	1.41
+++ server/asobj/Makefile.am	27 Aug 2007 03:06:42 -0000	1.42
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.41 2007/07/01 10:54:28 bjacques Exp $
+# $Id: Makefile.am,v 1.42 2007/08/27 03:06:42 cmusick Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -43,6 +43,8 @@
 
 
 libgnashasobjs_la_SOURCES = \
+        BevelFilter_as.cpp \
+        BitmapFilter_as.cpp \
 	Boolean.cpp	\
 	Camera.cpp	\
 	Color.cpp	\
@@ -76,6 +78,8 @@
 	$(NULL)
 
 noinst_HEADERS = \
+        BevelFilter_as.h \
+        BitmapFilter_as.h \
 	Boolean.h	\
 	Camera.h	\
 	Color.h		\

Index: server/parser/filter_factory.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/filter_factory.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/parser/filter_factory.cpp	26 Aug 2007 15:14:13 -0000	1.1
+++ server/parser/filter_factory.cpp	27 Aug 2007 03:06:42 -0000	1.2
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: filter_factory.cpp,v 1.1 2007/08/26 15:14:13 cmusick Exp $ */
+/* $Id: filter_factory.cpp,v 1.2 2007/08/27 03:06:42 cmusick Exp $ */
 
 #include "filter_factory.h"
 #include "BitmapFilter.h"
@@ -196,7 +196,7 @@
 
 bool GradientGlowFilter::read(stream* in)
 {
-    bool count = in->read_u8(); // How many colorings.
+    uint8_t count = in->read_u8(); // How many colorings.
 
     for (int i = 0; i < count; ++i)
     {
@@ -265,7 +265,7 @@
 
 bool GradientBevelFilter::read(stream* in)
 {
-    bool count = in->read_u8(); // How many colorings.
+    uint8_t count = in->read_u8(); // How many colorings.
 
     for (int i = 0; i < count; ++i)
     {

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -b -r1.127 -r1.128
--- server/vm/ASHandlers.cpp	25 Aug 2007 16:10:37 -0000	1.127
+++ server/vm/ASHandlers.cpp	27 Aug 2007 03:06:42 -0000	1.128
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ASHandlers.cpp,v 1.127 2007/08/25 16:10:37 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.128 2007/08/27 03:06:42 cmusick Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1386,7 +1386,7 @@
 }
 
 as_encoding_guess_t
-SWFHandlers::GuessEncoding(std::string &str, int &length, int *offsets)
+SWFHandlers::GuessEncoding(std::string &str, int &length, std::vector<int>& offsets)
 {
     const char *cstr = str.c_str();
     const char *i = cstr;
@@ -1409,7 +1409,7 @@
             continue;
         }
         ++length;
-        *(offsets + length - 1) = index;
+        offsets[length - 1] = index;
 
         if ((j & 0xC0) == 0x80)
             continue; // A 1 byte character.
@@ -1422,7 +1422,7 @@
         else if (j & 0x80)
             is_sought = false;
     }
-    *(offsets + length - 1) = index;
+    offsets[length - 1] = index;
     if (!width && is_sought) // No width left, so it's almost certainly UTF8.
         return ENCGUESS_UNICODE;
 
@@ -1448,7 +1448,7 @@
         }
 
         ++length;
-        *(offsets + length - 1) = index;
+        offsets[length - 1] = index;
 
         if ((j == 0x80) || (j == 0xA0) || (j >= 0xF0))
         {
@@ -1464,7 +1464,7 @@
         }
         
     }
-    *(offsets + length - 1) = index;
+    offsets[length - 1] = index;
     if (!width && is_sought) // No width left, so it's probably SHIFT_JIS.
         return ENCGUESS_JIS;
 
@@ -1491,7 +1491,8 @@
     else
     {
         int length;
-        (void) GuessEncoding(str, length, NULL);
+        std::vector<int> unused;
+        (void) GuessEncoding(str, length, unused);
         env.top(0).set_int(length);
     }
 }
@@ -1571,7 +1572,8 @@
 
     string str = string_val.to_string(&env);
     int length = 0;
-    int offsets[str.length() + 1];
+    std::vector<int> offsets;
+    offsets.reserve(str.length() + 1);
 
     as_encoding_guess_t encoding = GuessEncoding(str, length, offsets);
 

Index: server/vm/ASHandlers.h
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/vm/ASHandlers.h	20 Aug 2007 03:25:09 -0000	1.9
+++ server/vm/ASHandlers.h	27 Aug 2007 03:06:42 -0000	1.10
@@ -165,7 +165,8 @@
         // and the offsets to the characters in offsets, if offsets is not NULL.
         // If not NULL, offsets should be at least s.length().
         // offsets are not accurate if the return value is GUESSENC_OTHER
-        static as_encoding_guess_t GuessEncoding(std::string& s, int& length, int *offsets);
+        static as_encoding_guess_t GuessEncoding(std::string& s, int& length,
+            std::vector<int>& offsets);
 
 	static void ActionEnd(ActionExec& thread);
 	static void ActionNextFrame(ActionExec& thread);

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4108
retrieving revision 1.4109
diff -u -b -r1.4108 -r1.4109
--- ChangeLog	26 Aug 2007 20:56:50 -0000	1.4108
+++ ChangeLog	27 Aug 2007 03:06:42 -0000	1.4109
@@ -1,3 +1,17 @@
+2007-08-27 Chad Musick <chadmusick@msbx.net>
+
+	* server/BevelFilter.cpp,.h: Fuller conversion to AS compatible
+	* server/BitmapFilter.h: Fuller conversion to AS compatible
+	* server/stream.cpp: Remove dead code from read_fixed
+	* server/asobj/Makefile.am Add new files
+	* server/parser/filter_factory.cpp: Removed typo bug pointed out by
+	  Zou.
+	* server/vm/ASHandlers.cpp,.h: Remove use of variable sized array.
+	* server/asobj/BevelFilter_as.cpp,.h: Adapter pattern object for using
+	  BevelFilter inside of ActionScript (not yet put in global)
+	* server/asobj/BitmapFilter_as.cpp,.h: Adapater pattern object for
+	  using BitmapFilter inside of ActionScript (not yet put in global)
+
 2007-08-26 Deanna Phillips <deanna>
 
 	* doc/gnash.1: Updated.

Index: server/asobj/BevelFilter_as.cpp
===================================================================
RCS file: server/asobj/BevelFilter_as.cpp
diff -N server/asobj/BevelFilter_as.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/asobj/BevelFilter_as.cpp	27 Aug 2007 03:06:42 -0000	1.1
@@ -0,0 +1,362 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+/* $Id: BevelFilter_as.cpp,v 1.1 2007/08/27 03:06:42 cmusick Exp $ */
+
+#include "BitmapFilter_as.h"
+#include "BevelFilter.h"
+#include "VM.h"
+#include "builtin_function.h"
+
+namespace gnash {
+
+class BevelFilter_as
+{
+public:
+    static as_object* Interface(); // To a BitmapFilter
+    static void attachInterface(as_object& o); // Attach the interface.
+    static void attachProperties(as_object& o); // Attach the properties.
+
+    static void registerCtor(as_object& global); // public ctor
+    static as_value ctor(const fn_call& fn); // constructor for BitmapFilter
+
+    // Get set functions for ActionScript
+    static as_value distance_gs(const fn_call& fn);
+    static as_value angle_gs(const fn_call& fn);
+    static as_value highlightColor_gs(const fn_call& fn);
+    static as_value highlightAlpha_gs(const fn_call& fn);
+    static as_value shadowColor_gs(const fn_call& fn);
+    static as_value shadowAlpha_gs(const fn_call& fn);
+    static as_value blurX_gs(const fn_call& fn);
+    static as_value blurY_gs(const fn_call& fn);
+    static as_value strength_gs(const fn_call& fn);
+    static as_value quality_gs(const fn_call& fn);
+    static as_value type_gs(const fn_call& fn);
+    static as_value knockout_gs(const fn_call& fn);
+
+private:
+    static boost::intrusive_ptr<as_object> s_interface;
+    static boost::intrusive_ptr<builtin_function> s_ctor;
+};
+
+boost::intrusive_ptr<as_object> BevelFilter_as::s_interface;
+boost::intrusive_ptr<builtin_function> BevelFilter_as::s_ctor;
+
+as_object*
+BevelFilter_as::Interface()
+{
+    if (BevelFilter_as::s_interface == NULL)
+    {
+        BevelFilter_as::s_interface = new as_object(bitmapFilter_interface());
+        VM::get().addStatic(BevelFilter_as::s_interface.get());
+
+        BevelFilter_as::attachInterface(*BevelFilter_as::s_interface);
+    }
+
+    return BevelFilter_as::s_interface.get();
+}
+
+void
+BevelFilter_as::attachInterface(as_object& /*o*/)
+{
+    // Filters are all properties.
+    return;
+}
+
+void
+BevelFilter_as::attachProperties(as_object& o)
+{
+    boost::intrusive_ptr<builtin_function> gs;
+
+    gs = new builtin_function(BevelFilter_as::distance_gs, NULL);
+    o.init_property("distance", *gs, *gs);
+
+    gs = new builtin_function(BevelFilter_as::angle_gs, NULL);
+    o.init_property("angle", *gs, *gs);
+
+    gs = new builtin_function(BevelFilter_as::highlightColor_gs, NULL);
+    o.init_property("highlightColor", *gs, *gs);
+
+    gs = new builtin_function(BevelFilter_as::highlightAlpha_gs, NULL);
+    o.init_property("highlightAlpha", *gs, *gs);
+
+    gs = new builtin_function(BevelFilter_as::shadowColor_gs, NULL);
+    o.init_property("shadowColor", *gs, *gs);
+
+    gs = new builtin_function(BevelFilter_as::shadowAlpha_gs, NULL);
+    o.init_property("shadowAlpha", *gs, *gs);
+
+    gs = new builtin_function(BevelFilter_as::blurX_gs, NULL);
+    o.init_property("blurX", *gs, *gs);
+
+    gs = new builtin_function(BevelFilter_as::blurY_gs, NULL);
+    o.init_property("blurY", *gs, *gs);
+
+    gs = new builtin_function(BevelFilter_as::strength_gs, NULL);
+    o.init_property("strength", *gs, *gs);
+
+    gs = new builtin_function(BevelFilter_as::quality_gs, NULL);
+    o.init_property("quality", *gs, *gs);
+
+    gs = new builtin_function(BevelFilter_as::type_gs, NULL);
+    o.init_property("type", *gs, *gs);
+
+    gs = new builtin_function(BevelFilter_as::knockout_gs, NULL);
+    o.init_property("knockout", *gs, *gs);
+}
+
+as_value
+BevelFilter_as::distance_gs(const fn_call& fn)
+{
+    boost::intrusive_ptr<BevelFilter> ptr = ensureType<BevelFilter>(fn.this_ptr);
+
+    if (fn.nargs == 0) // getter
+    {
+        return as_value(ptr->m_distance);
+    }
+    // setter
+    float distance = fn.arg(0).to_number<float>();
+    ptr->m_distance = distance;
+
+    return as_value();
+}
+
+as_value
+BevelFilter_as::angle_gs(const fn_call& fn)
+{
+    boost::intrusive_ptr<BevelFilter> ptr = ensureType<BevelFilter>(fn.this_ptr);
+
+    if (fn.nargs == 0) // getter
+    {
+        return as_value(ptr->m_angle);
+    }
+    // setter
+    float angle = fn.arg(0).to_number<float>();
+    ptr->m_angle = angle;
+
+    return as_value();
+}
+
+as_value
+BevelFilter_as::highlightColor_gs(const fn_call& fn)
+{
+    boost::intrusive_ptr<BevelFilter> ptr = ensureType<BevelFilter>(fn.this_ptr);
+
+    if (fn.nargs == 0) // getter
+    {
+        return as_value(ptr->m_highlightColor);
+    }
+    // setter
+    uint32_t highlightColor = fn.arg(0).to_number<uint32_t>();
+    ptr->m_highlightColor = highlightColor;
+
+    return as_value();
+}
+
+as_value
+BevelFilter_as::highlightAlpha_gs(const fn_call& fn)
+{
+    boost::intrusive_ptr<BevelFilter> ptr = ensureType<BevelFilter>(fn.this_ptr);
+
+    if (fn.nargs == 0) // getter
+    {
+        return as_value(ptr->m_highlightAlpha);
+    }
+    // setter
+    uint8_t highlightAlpha = fn.arg(0).to_number<uint8_t>();
+    ptr->m_highlightAlpha = highlightAlpha;
+
+    return as_value();
+}
+
+as_value
+BevelFilter_as::shadowColor_gs(const fn_call& fn)
+{
+    boost::intrusive_ptr<BevelFilter> ptr = ensureType<BevelFilter>(fn.this_ptr);
+
+    if (fn.nargs == 0) // getter
+    {
+        return as_value(ptr->m_shadowColor);
+    }
+    // setter
+    uint32_t shadowColor = fn.arg(0).to_number<uint32_t>();
+    ptr->m_shadowColor = shadowColor;
+
+    return as_value();
+}
+
+as_value
+BevelFilter_as::shadowAlpha_gs(const fn_call& fn)
+{
+    boost::intrusive_ptr<BevelFilter> ptr = ensureType<BevelFilter>(fn.this_ptr);
+
+    if (fn.nargs == 0) // getter
+    {
+        return as_value(ptr->m_shadowAlpha);
+    }
+    // setter
+    uint8_t shadowAlpha = fn.arg(0).to_number<uint8_t>();
+    ptr->m_shadowAlpha = shadowAlpha;
+
+    return as_value();
+}
+
+as_value
+BevelFilter_as::blurX_gs(const fn_call& fn)
+{
+    boost::intrusive_ptr<BevelFilter> ptr = ensureType<BevelFilter>(fn.this_ptr);
+
+    if (fn.nargs == 0) // getter
+    {
+        return as_value(ptr->m_blurX);
+    }
+    // setter
+    float blurX = fn.arg(0).to_number<float>();
+    ptr->m_blurX = blurX;
+
+    return as_value();
+}
+
+as_value
+BevelFilter_as::blurY_gs(const fn_call& fn)
+{
+    boost::intrusive_ptr<BevelFilter> ptr = ensureType<BevelFilter>(fn.this_ptr);
+
+    if (fn.nargs == 0) // getter
+    {
+        return as_value(ptr->m_blurY);
+    }
+    // setter
+    float blurY = fn.arg(0).to_number<float>();
+    ptr->m_blurY = blurY;
+
+    return as_value();
+}
+
+as_value
+BevelFilter_as::strength_gs(const fn_call& fn)
+{
+    boost::intrusive_ptr<BevelFilter> ptr = ensureType<BevelFilter>(fn.this_ptr);
+
+    if (fn.nargs == 0) // getter
+    {
+        return as_value(ptr->m_strength);
+    }
+    // setter
+    float strength = fn.arg(0).to_number<float>();
+    ptr->m_strength = strength;
+
+    return as_value();
+}
+
+void
+BevelFilter_as::registerCtor(as_object& global)
+{
+    if (BevelFilter_as::s_ctor != NULL)
+        return;
+
+    BevelFilter_as::s_ctor = new builtin_function(&BevelFilter_as::ctor,
+        BevelFilter_as::Interface());
+    VM::get().addStatic(BevelFilter_as::s_ctor.get());
+
+    // TODO: Is this correct?
+    BevelFilter_as::attachInterface(*BevelFilter_as::s_ctor);
+
+    global.init_member("BevelFilter", BevelFilter_as::s_ctor.get());
+}
+
+as_value
+BevelFilter_as::quality_gs(const fn_call& fn)
+{
+    boost::intrusive_ptr<BevelFilter> ptr = ensureType<BevelFilter>(fn.this_ptr);
+
+    if (fn.nargs == 0) // getter
+    {
+        return as_value(ptr->m_quality);
+    }
+    // setter
+    uint8_t quality = fn.arg(0).to_number<uint8_t>();
+    ptr->m_quality = quality;
+
+    return as_value();
+}
+
+as_value
+BevelFilter_as::type_gs(const fn_call& fn)
+{
+    boost::intrusive_ptr<BevelFilter> ptr = ensureType<BevelFilter>(fn.this_ptr);
+
+    if (fn.nargs == 0) // getter
+    {
+        switch (ptr->m_type)
+        {
+            case BevelFilter::FULL_BEVEL:
+                return as_value("full");
+                break;
+            default:
+            case BevelFilter::INNER_BEVEL:
+                return as_value("inner");
+                break;
+            case BevelFilter::OUTER_BEVEL:
+                return as_value("outer");
+                break;
+        }
+    }
+    // setter
+    string type = fn.arg(0).to_string();
+    if (type == "outer")
+        ptr->m_type = BevelFilter::OUTER_BEVEL;
+    if (type == "inner")
+        ptr->m_type = BevelFilter::INNER_BEVEL;
+    if (type == "full")
+        ptr->m_type = BevelFilter::FULL_BEVEL;
+
+    return as_value();
+}
+
+as_value
+BevelFilter_as::knockout_gs(const fn_call& fn)
+{
+    boost::intrusive_ptr<BevelFilter> ptr = ensureType<BevelFilter>(fn.this_ptr);
+
+    if (fn.nargs == 0) // getter
+    {
+        return as_value(ptr->m_knockout);
+    }
+    // setter
+    bool knockout = fn.arg(0).to_bool();
+    ptr->m_knockout = knockout;
+
+    return as_value();
+}
+
+as_value
+BevelFilter_as::ctor(const fn_call& /*fn*/)
+{
+    boost::intrusive_ptr<as_object> obj = new BevelFilter(BevelFilter_as::Interface());
+    BevelFilter_as::attachProperties(*obj);
+
+    return as_value(obj.get());
+}
+
+void bevelFilter_class_init(as_object& global)
+{
+   BevelFilter_as::registerCtor(global);
+}
+
+} // Namespace gnash
+

Index: server/asobj/BevelFilter_as.h
===================================================================
RCS file: server/asobj/BevelFilter_as.h
diff -N server/asobj/BevelFilter_as.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/asobj/BevelFilter_as.h	27 Aug 2007 03:06:42 -0000	1.1
@@ -0,0 +1,37 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
+
+#ifndef __GNASH_ASOBJ_BEVELFILTER_H__
+#define __GNASH_ASOBJ_BEVELFILTER_H__
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+namespace gnash {
+
+class as_object;
+
+/// Initialize the global BitmapFilter class
+void bevelFilter_class_init(as_object& global);
+
+} // end of gnash namespace
+
+// __GNASH_ASOBJ_BEVELFILTER_H__
+#endif
+

Index: server/asobj/BitmapFilter_as.h
===================================================================
RCS file: server/asobj/BitmapFilter_as.h
diff -N server/asobj/BitmapFilter_as.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/asobj/BitmapFilter_as.h	27 Aug 2007 03:06:42 -0000	1.1
@@ -0,0 +1,40 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
+
+#ifndef __GNASH_ASOBJ_BITMAPFILTER_H__
+#define __GNASH_ASOBJ_BITMAPFILTER_H__
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+namespace gnash {
+
+class as_object;
+
+/// Initialize the global BitmapFilter class
+void bitmapFilter_class_init(as_object& global);
+
+/// Get the interface, for inheritance.
+as_object *bitmapFilter_interface();
+
+} // end of gnash namespace
+
+// __GNASH_ASOBJ_BITMAPFILTER_H__
+#endif
+

Index: server/asobj/BitmapFilter_as.cpp
===================================================================
RCS file: server/asobj/BitmapFilter_as.cpp
diff -N server/asobj/BitmapFilter_as.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/asobj/BitmapFilter_as.cpp	27 Aug 2007 03:06:42 -0000	1.1
@@ -0,0 +1,108 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+/* $Id: BitmapFilter_as.cpp,v 1.1 2007/08/27 03:06:42 cmusick Exp $ */
+
+#include "BitmapFilter.h"
+#include "VM.h"
+#include "builtin_function.h"
+
+namespace gnash {
+
+class BitmapFilter_as
+{
+public:
+    static as_object* Interface(); // To a BitmapFilter
+    static void attachInterface(as_object& o); // Attach the interface.
+    static void registerCtor(as_object& global); // public ctor
+    static as_value ctor(const fn_call& fn); // constructor for BitmapFilter
+
+    static as_value bitmap_clone(const fn_call& fn);
+
+private:
+    static boost::intrusive_ptr<as_object> s_interface;
+    static boost::intrusive_ptr<builtin_function> s_ctor;
+};
+
+boost::intrusive_ptr<as_object> BitmapFilter_as::s_interface;
+boost::intrusive_ptr<builtin_function> BitmapFilter_as::s_ctor;
+
+as_object*
+BitmapFilter_as::Interface()
+{
+    if (BitmapFilter_as::s_interface == NULL)
+    {
+        BitmapFilter_as::s_interface = new as_object;
+        VM::get().addStatic(BitmapFilter_as::s_interface.get());
+
+        BitmapFilter_as::attachInterface(*BitmapFilter_as::s_interface);
+    }
+
+    return BitmapFilter_as::s_interface.get();
+}
+
+void
+BitmapFilter_as::attachInterface(as_object& o)
+{
+    o.init_member("clone", new builtin_function(bitmap_clone));
+}
+
+void
+BitmapFilter_as::registerCtor(as_object& global)
+{
+    if (BitmapFilter_as::s_ctor != NULL)
+        return;
+
+    BitmapFilter_as::s_ctor = new builtin_function(&BitmapFilter_as::ctor,
+        BitmapFilter_as::Interface());
+    VM::get().addStatic(BitmapFilter_as::s_ctor.get());
+
+    // TODO: Is this correct?
+    BitmapFilter_as::attachInterface(*BitmapFilter_as::s_ctor);
+
+    global.init_member("BitmapFilter", BitmapFilter_as::s_ctor.get());
+}
+
+as_value
+BitmapFilter_as::ctor(const fn_call& /*fn*/)
+{
+    boost::intrusive_ptr<as_object> obj = new BitmapFilter(BitmapFilter_as::Interface());
+    return as_value(obj.get());
+}
+
+as_value BitmapFilter_as::bitmap_clone(const fn_call& fn)
+{
+    boost::intrusive_ptr<BitmapFilter> filter = ensureType<BitmapFilter> (fn.this_ptr);
+    boost::intrusive_ptr<as_object> retval = filter->clone();
+    retval->set_prototype(filter->get_prototype());
+
+    return as_value(retval);
+}
+
+void bitmapFilter_class_init(as_object& global)
+{
+   BitmapFilter_as::registerCtor(global);
+}
+
+as_object*
+bitmapFilter_interface()
+{
+    return BitmapFilter_as::Interface();
+}
+
+} // Namespace gnash
+



From MAILER-DAEMON Sun Aug 26 23:41:47 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPVU3-00062d-62
	for mharc-gnash-commit@gnu.org; Sun, 26 Aug 2007 23:41:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPVU2-00062O-HD
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 23:41:46 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPVU1-00062C-3x
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 23:41:45 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPVU0-000629-UI
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 23:41:44 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IPVU0-0004oM-Hd
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 23:41:44 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IPVTz-0004Ml-Hp
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 03:41:43 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IPVTz-0004Mi-Bx
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 03:41:43 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPVTz-0004Mi-Bx@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Mon, 27 Aug 2007 03:41:43 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/ops.as
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 03:41:46 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/27 03:41:43

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: ops.as 

Log message:
	* testsuite/actionscript.all/ops.as: more tests about NaN.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4109&r2=1.4110
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/ops.as?cvsroot=gnash&r1=1.20&r2=1.21

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4109
retrieving revision 1.4110
diff -u -b -r1.4109 -r1.4110
--- ChangeLog	27 Aug 2007 03:06:42 -0000	1.4109
+++ ChangeLog	27 Aug 2007 03:41:42 -0000	1.4110
@@ -1,3 +1,7 @@
+2007-08-27 Zou Lunkai <zoulunkai@gmail.com>
+	
+	* testsuite/actionscript.all/ops.as: more tests about NaN.
+	  
 2007-08-27 Chad Musick <chadmusick@msbx.net>
 
 	* server/BevelFilter.cpp,.h: Fuller conversion to AS compatible

Index: testsuite/actionscript.all/ops.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/ops.as,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- testsuite/actionscript.all/ops.as	25 Aug 2007 19:07:46 -0000	1.20
+++ testsuite/actionscript.all/ops.as	27 Aug 2007 03:41:43 -0000	1.21
@@ -20,7 +20,7 @@
  *  Test binary predicates (equal, less_then, greater_then, logical and bitwise ops)
  */
 
-rcsid="$Id: ops.as,v 1.20 2007/08/25 19:07:46 strk Exp $";
+rcsid="$Id: ops.as,v 1.21 2007/08/27 03:41:43 zoulunkai Exp $";
 
 #include "check.as"
 
@@ -61,6 +61,17 @@
 check_equals(false, 0);
 check_equals(false+false, 0);
 
+// for Number
+x = new Number(3);
+y = 3;
+check(x == y);
+
+x = new Number(NaN);
+y = NaN;
+check(isNaN(x));
+check(isNaN(y));
+xcheck(x != y);
+
 // for Arrays
 ary1 = [1,2,3];
 ary2 = [1,2,3];



From MAILER-DAEMON Sun Aug 26 23:50:12 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPVcC-00041n-6D
	for mharc-gnash-commit@gnu.org; Sun, 26 Aug 2007 23:50:12 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPVc9-0003wg-Eb
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 23:50:09 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPVc7-0003t7-KJ
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 23:50:08 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPVc7-0003sr-D4
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 23:50:07 -0400
Received: from wa-out-1112.google.com ([209.85.146.180])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1IPVc6-0005wy-Mt
	for gnash-commit@gnu.org; Sun, 26 Aug 2007 23:50:07 -0400
Received: by wa-out-1112.google.com with SMTP id j4so1870392wah
	for <gnash-commit@gnu.org>; Sun, 26 Aug 2007 20:50:03 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=ptYjmxLn0YbzY5YxcWLdu0u6Lo/3iV0jDgGubHO20SwYM2TFtaQfOTOSJknj7+Ncb0pZVoNrC7bGEugG+GwT9vJZHhxmkvrtpplRA1J0WMUGDgWCfx+4Icx4ID/w2GNepooChNU0tW4NyKhD4iqVr963wJMFf6QV6I3A6YM19+g=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=E681gxxEQ9EW3duwW6DVDOIK5GaXJVB7w9547VKTP/JxMF4Xjybg1QkthSRtJFvxy90FyVAlrUbKoVJejaTQPjtZmrE9n0KNphSjiYYlDDYKXPl37oiRilQ1Avar07wIMhFB3H+QXX7Ev2MneweT+AV0VqfcDAt/k912Qaaa82Q=
Received: by 10.115.61.1 with SMTP id o1mr1610456wak.1188186603223;
	Sun, 26 Aug 2007 20:50:03 -0700 (PDT)
Received: by 10.114.12.7 with HTTP; Sun, 26 Aug 2007 20:50:03 -0700 (PDT)
Message-ID: <ca4b43ff0708262050l45a49bc0iabfe06abe2bf75d0@mail.gmail.com>
Date: Mon, 27 Aug 2007 11:50:03 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "Sandro Santilli" <strk@keybit.net>
Subject: Re: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/ops.as
In-Reply-To: <E1IP0z4-0000yB-AZ@cvs.savannah.gnu.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1IP0z4-0000yB-AZ@cvs.savannah.gnu.org>
X-Detected-Kernel: Linux 2.6 (newer, 2)
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 03:50:10 -0000

>  x = new String("a");
>  y = --x;
> +check_equals(typeof(y), 'number');
> +xcheck(y!=NaN); // uh ? is it a different NaN ?
> +check(! (NaN!=NaN));
> check(isNaN(y));
> +check(isNaN(NaN));

Tests confirmed.

yes, y might be a differnt NaN(y is an object).

see added tests below:

+x = new Number(NaN);
+y = NaN;
+check(isNaN(x));
+check(isNaN(y));
+xcheck(x != y);      ----->[1]

As we see,  [1] should return true.  All I can think about is that x
is an Number object, and y is a primitive number.  Doesn't mean much,
but might help the valueOf model...

zou

On 8/26/07, Sandro Santilli <strk@keybit.net> wrote:
> CVSROOT:        /sources/gnash
> Module name:    gnash
> Changes by:     Sandro Santilli <strk>  07/08/25 19:07:46
>
> Modified files:
>        .              : ChangeLog
>        testsuite/actionscript.all: ops.as
>
> Log message:
>                * testsuite/actionscript.all/ops.as: more tests about isNaN(x) when
>                  x != NaN (odd)
>
> CVSWeb URLs:
> http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4101&r2=1.4102
> http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/ops.as?cvsroot=gnash&r1=1.19&r2=1.20
>
> Patches:
> Index: ChangeLog
> ===================================================================
> RCS file: /sources/gnash/gnash/ChangeLog,v
> retrieving revision 1.4101
> retrieving revision 1.4102
> diff -u -b -r1.4101 -r1.4102
> --- ChangeLog   25 Aug 2007 16:10:37 -0000      1.4101
> +++ ChangeLog   25 Aug 2007 19:07:45 -0000      1.4102
> @@ -1,5 +1,10 @@
>  2007-08-25 Sandro Santilli <strk@keybit.net>
>
> +       * testsuite/actionscript.all/ops.as: more tests about isNaN(x) when
> +         x != NaN (odd)
> +
> +2007-08-25 Sandro Santilli <strk@keybit.net>
> +
>        * server/vm/ASHandlers.cpp (ActionNewLessThan): convert operands to
>          primitive value before proceeding.
>        * testsuite/actionscript.all/ops.as: xcheck => check
>
> Index: testsuite/actionscript.all/ops.as
> ===================================================================
> RCS file: /sources/gnash/gnash/testsuite/actionscript.all/ops.as,v
> retrieving revision 1.19
> retrieving revision 1.20
> diff -u -b -r1.19 -r1.20
> --- testsuite/actionscript.all/ops.as   25 Aug 2007 16:10:37 -0000      1.19
> +++ testsuite/actionscript.all/ops.as   25 Aug 2007 19:07:46 -0000      1.20
> @@ -20,7 +20,7 @@
>  *  Test binary predicates (equal, less_then, greater_then, logical and bitwise ops)
>  */
>
> -rcsid="$Id: ops.as,v 1.19 2007/08/25 16:10:37 strk Exp $";
> +rcsid="$Id: ops.as,v 1.20 2007/08/25 19:07:46 strk Exp $";
>
>  #include "check.as"
>
> @@ -550,8 +550,11 @@
>
>  x = new String("a");
>  y = --x;
> -xcheck(y!=NaN);
> +check_equals(typeof(y), 'number');
> +xcheck(y!=NaN); // uh ? is it a different NaN ?
> +check(! (NaN!=NaN));
>  check(isNaN(y));
> +check(isNaN(NaN));
>
>  //------------------------------------------------
>  // Increment Operator (ACTION_DECREMENT: 0x50)
>
>
> _______________________________________________
> Gnash-commit mailing list
> Gnash-commit@gnu.org
> http://lists.gnu.org/mailman/listinfo/gnash-commit
>



From MAILER-DAEMON Mon Aug 27 00:06:39 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPVs7-0005GN-1m
	for mharc-gnash-commit@gnu.org; Mon, 27 Aug 2007 00:06:39 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPVs5-0005G3-St
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 00:06:37 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPVs4-0005Fr-OT
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 00:06:37 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPVs4-0005Fo-Lw
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 00:06:36 -0400
Received: from g78.mailsnare.net ([209.236.228.78] helo=mail.mailsnare.net)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <chadmusick@msbx.net>) id 1IPVs4-000057-6g
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 00:06:36 -0400
X-Virus-Scanned: by ClamAV at mailsnare.net
X-Message-ID: 00ff702db0dc1113dba21d7ff9204a39d6a357911d59be81
Received: from [222.229.211.164] (unknown [222.229.211.164])
	by mail.mailsnare.net (Postfix) with ESMTP id 120257ACBC;
	Mon, 27 Aug 2007 04:06:33 +0000 (UTC)
Subject: Re: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/ops.as
From: Chad Musick <chadmusick@msbx.net>
To: zou lunkai <zoulunkai@gmail.com>
In-Reply-To: <ca4b43ff0708262050l45a49bc0iabfe06abe2bf75d0@mail.gmail.com>
References: <E1IP0z4-0000yB-AZ@cvs.savannah.gnu.org>
	<ca4b43ff0708262050l45a49bc0iabfe06abe2bf75d0@mail.gmail.com>
Content-Type: text/plain
Date: Mon, 27 Aug 2007 13:06:33 +0900
Message-Id: <1188187593.7921.14.camel@ubuntu.sys76.lan>
Mime-Version: 1.0
X-Mailer: Evolution 2.10.1 
Content-Transfer-Encoding: 7bit
X-Detected-Kernel: Linux 2.6 (newer, 3)
Cc: gnash-commit@gnu.org, Sandro Santilli <strk@keybit.net>
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 04:06:38 -0000

Hmm. Is this behavior based on the PP?  The ECMAScript 3 standard says
that all NaN values are equal to each other (Section 8.5), even if the
implementation can tell them apart. The proposed ECMAScript 4 standard
says there should be a single global NaN object.

On Mon, 2007-08-27 at 11:50 +0800, zou lunkai wrote:
> >  x = new String("a");
> >  y = --x;
> > +check_equals(typeof(y), 'number');
> > +xcheck(y!=NaN); // uh ? is it a different NaN ?
> > +check(! (NaN!=NaN));
> > check(isNaN(y));
> > +check(isNaN(NaN));
> 
> Tests confirmed.
> 
> yes, y might be a differnt NaN(y is an object).
> 
> see added tests below:
> 
> +x = new Number(NaN);
> +y = NaN;
> +check(isNaN(x));
> +check(isNaN(y));
> +xcheck(x != y);      ----->[1]
> 
> As we see,  [1] should return true.  All I can think about is that x
> is an Number object, and y is a primitive number.  Doesn't mean much,
> but might help the valueOf model...
> 
> zou
> 
> On 8/26/07, Sandro Santilli <strk@keybit.net> wrote:
> > CVSROOT:        /sources/gnash
> > Module name:    gnash
> > Changes by:     Sandro Santilli <strk>  07/08/25 19:07:46
> >
> > Modified files:
> >        .              : ChangeLog
> >        testsuite/actionscript.all: ops.as
> >
> > Log message:
> >                * testsuite/actionscript.all/ops.as: more tests about isNaN(x) when
> >                  x != NaN (odd)
> >
> > CVSWeb URLs:
> > http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4101&r2=1.4102
> > http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/ops.as?cvsroot=gnash&r1=1.19&r2=1.20
> >
> > Patches:
> > Index: ChangeLog
> > ===================================================================
> > RCS file: /sources/gnash/gnash/ChangeLog,v
> > retrieving revision 1.4101
> > retrieving revision 1.4102
> > diff -u -b -r1.4101 -r1.4102
> > --- ChangeLog   25 Aug 2007 16:10:37 -0000      1.4101
> > +++ ChangeLog   25 Aug 2007 19:07:45 -0000      1.4102
> > @@ -1,5 +1,10 @@
> >  2007-08-25 Sandro Santilli <strk@keybit.net>
> >
> > +       * testsuite/actionscript.all/ops.as: more tests about isNaN(x) when
> > +         x != NaN (odd)
> > +
> > +2007-08-25 Sandro Santilli <strk@keybit.net>
> > +
> >        * server/vm/ASHandlers.cpp (ActionNewLessThan): convert operands to
> >          primitive value before proceeding.
> >        * testsuite/actionscript.all/ops.as: xcheck => check
> >
> > Index: testsuite/actionscript.all/ops.as
> > ===================================================================
> > RCS file: /sources/gnash/gnash/testsuite/actionscript.all/ops.as,v
> > retrieving revision 1.19
> > retrieving revision 1.20
> > diff -u -b -r1.19 -r1.20
> > --- testsuite/actionscript.all/ops.as   25 Aug 2007 16:10:37 -0000      1.19
> > +++ testsuite/actionscript.all/ops.as   25 Aug 2007 19:07:46 -0000      1.20
> > @@ -20,7 +20,7 @@
> >  *  Test binary predicates (equal, less_then, greater_then, logical and bitwise ops)
> >  */
> >
> > -rcsid="$Id: ops.as,v 1.19 2007/08/25 16:10:37 strk Exp $";
> > +rcsid="$Id: ops.as,v 1.20 2007/08/25 19:07:46 strk Exp $";
> >
> >  #include "check.as"
> >
> > @@ -550,8 +550,11 @@
> >
> >  x = new String("a");
> >  y = --x;
> > -xcheck(y!=NaN);
> > +check_equals(typeof(y), 'number');
> > +xcheck(y!=NaN); // uh ? is it a different NaN ?
> > +check(! (NaN!=NaN));
> >  check(isNaN(y));
> > +check(isNaN(NaN));
> >
> >  //------------------------------------------------
> >  // Increment Operator (ACTION_DECREMENT: 0x50)
> >
> >
> > _______________________________________________
> > Gnash-commit mailing list
> > Gnash-commit@gnu.org
> > http://lists.gnu.org/mailman/listinfo/gnash-commit
> >
> 
> 
> _______________________________________________
> Gnash-commit mailing list
> Gnash-commit@gnu.org
> http://lists.gnu.org/mailman/listinfo/gnash-commit




From MAILER-DAEMON Mon Aug 27 01:17:20 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPWyW-0005Nq-2D
	for mharc-gnash-commit@gnu.org; Mon, 27 Aug 2007 01:17:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPWyT-0005Km-NM
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 01:17:17 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPWyT-0005K9-3h
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 01:17:17 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPWyS-0005Jj-OW
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 01:17:16 -0400
Received: from nz-out-0506.google.com ([64.233.162.227])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1IPWyS-0000jI-Fi
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 01:17:16 -0400
Received: by nz-out-0506.google.com with SMTP id f1so972851nzc
	for <gnash-commit@gnu.org>; Sun, 26 Aug 2007 22:17:14 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=RdpXqPQYStSyXxVWO+tqlB1gaCT1rK1Vyijq5yd/S5h5ASRLr7mRrMaeJapOBN5vEUXWzEvNYhp1AGDbbV+z4PrLYHcnOtrPOAF4/nITMq1T05SrQxFs89WzYuchl/tO/4B2KbqcRL/oLEqvAiMcf+hP6zg7el/j/M+XnicVLC8=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=lO32t3ekCgf/ie2bC+x+69555Pyy03Efrdt0mi4D5P82FGNSqYyR//H4AiS/ceREHTO6HiZTj7E+K2afasv2ARR4+pJ2sdiWd8jp3g0WZ4HTDWtdcsnl70GywysR/rxtZpNL4cx/ySR+2KevgqqOxqVj6Kh+WY7nLE7VpPXI/9k=
Received: by 10.114.57.1 with SMTP id f1mr1171223waa.1188191833420;
	Sun, 26 Aug 2007 22:17:13 -0700 (PDT)
Received: by 10.114.12.7 with HTTP; Sun, 26 Aug 2007 22:17:13 -0700 (PDT)
Message-ID: <ca4b43ff0708262217g7e3ad3e1ja6bc39596f4cbe2b@mail.gmail.com>
Date: Mon, 27 Aug 2007 13:17:13 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "Chad Musick" <chadmusick@msbx.net>
Subject: Re: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/ops.as
In-Reply-To: <1188187593.7921.14.camel@ubuntu.sys76.lan>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1IP0z4-0000yB-AZ@cvs.savannah.gnu.org>
	<ca4b43ff0708262050l45a49bc0iabfe06abe2bf75d0@mail.gmail.com>
	<1188187593.7921.14.camel@ubuntu.sys76.lan>
X-Detected-Kernel: Linux 2.6 (newer, 2)
Cc: gnash-commit@gnu.org, Sandro Santilli <strk@keybit.net>
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 05:17:18 -0000

yes. All tests in ops.as has been verified.

NaN == NaN does returns true,
but Number(NaN) == NaN returns false according to tests.  There might
be some subtle difference between the Object NaN and primitive NaN.

On 8/27/07, Chad Musick <chadmusick@msbx.net> wrote:
> Hmm. Is this behavior based on the PP?  The ECMAScript 3 standard says
> that all NaN values are equal to each other (Section 8.5), even if the
> implementation can tell them apart. The proposed ECMAScript 4 standard
> says there should be a single global NaN object.
>
> On Mon, 2007-08-27 at 11:50 +0800, zou lunkai wrote:
> > >  x = new String("a");
> > >  y = --x;
> > > +check_equals(typeof(y), 'number');
> > > +xcheck(y!=NaN); // uh ? is it a different NaN ?
> > > +check(! (NaN!=NaN));
> > > check(isNaN(y));
> > > +check(isNaN(NaN));
> >
> > Tests confirmed.
> >
> > yes, y might be a differnt NaN(y is an object).
> >
> > see added tests below:
> >
> > +x = new Number(NaN);
> > +y = NaN;
> > +check(isNaN(x));
> > +check(isNaN(y));
> > +xcheck(x != y);      ----->[1]
> >
> > As we see,  [1] should return true.  All I can think about is that x
> > is an Number object, and y is a primitive number.  Doesn't mean much,
> > but might help the valueOf model...
> >
> > zou
> >
> > On 8/26/07, Sandro Santilli <strk@keybit.net> wrote:
> > > CVSROOT:        /sources/gnash
> > > Module name:    gnash
> > > Changes by:     Sandro Santilli <strk>  07/08/25 19:07:46
> > >
> > > Modified files:
> > >        .              : ChangeLog
> > >        testsuite/actionscript.all: ops.as
> > >
> > > Log message:
> > >                * testsuite/actionscript.all/ops.as: more tests about isNaN(x) when
> > >                  x != NaN (odd)
> > >
> > > CVSWeb URLs:
> > > http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4101&r2=1.4102
> > > http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/ops.as?cvsroot=gnash&r1=1.19&r2=1.20
> > >
> > > Patches:
> > > Index: ChangeLog
> > > ===================================================================
> > > RCS file: /sources/gnash/gnash/ChangeLog,v
> > > retrieving revision 1.4101
> > > retrieving revision 1.4102
> > > diff -u -b -r1.4101 -r1.4102
> > > --- ChangeLog   25 Aug 2007 16:10:37 -0000      1.4101
> > > +++ ChangeLog   25 Aug 2007 19:07:45 -0000      1.4102
> > > @@ -1,5 +1,10 @@
> > >  2007-08-25 Sandro Santilli <strk@keybit.net>
> > >
> > > +       * testsuite/actionscript.all/ops.as: more tests about isNaN(x) when
> > > +         x != NaN (odd)
> > > +
> > > +2007-08-25 Sandro Santilli <strk@keybit.net>
> > > +
> > >        * server/vm/ASHandlers.cpp (ActionNewLessThan): convert operands to
> > >          primitive value before proceeding.
> > >        * testsuite/actionscript.all/ops.as: xcheck => check
> > >
> > > Index: testsuite/actionscript.all/ops.as
> > > ===================================================================
> > > RCS file: /sources/gnash/gnash/testsuite/actionscript.all/ops.as,v
> > > retrieving revision 1.19
> > > retrieving revision 1.20
> > > diff -u -b -r1.19 -r1.20
> > > --- testsuite/actionscript.all/ops.as   25 Aug 2007 16:10:37 -0000      1.19
> > > +++ testsuite/actionscript.all/ops.as   25 Aug 2007 19:07:46 -0000      1.20
> > > @@ -20,7 +20,7 @@
> > >  *  Test binary predicates (equal, less_then, greater_then, logical and bitwise ops)
> > >  */
> > >
> > > -rcsid="$Id: ops.as,v 1.19 2007/08/25 16:10:37 strk Exp $";
> > > +rcsid="$Id: ops.as,v 1.20 2007/08/25 19:07:46 strk Exp $";
> > >
> > >  #include "check.as"
> > >
> > > @@ -550,8 +550,11 @@
> > >
> > >  x = new String("a");
> > >  y = --x;
> > > -xcheck(y!=NaN);
> > > +check_equals(typeof(y), 'number');
> > > +xcheck(y!=NaN); // uh ? is it a different NaN ?
> > > +check(! (NaN!=NaN));
> > >  check(isNaN(y));
> > > +check(isNaN(NaN));
> > >
> > >  //------------------------------------------------
> > >  // Increment Operator (ACTION_DECREMENT: 0x50)
> > >
> > >
> > > _______________________________________________
> > > Gnash-commit mailing list
> > > Gnash-commit@gnu.org
> > > http://lists.gnu.org/mailman/listinfo/gnash-commit
> > >
> >
> >
> > _______________________________________________
> > Gnash-commit mailing list
> > Gnash-commit@gnu.org
> > http://lists.gnu.org/mailman/listinfo/gnash-commit
>
>



From MAILER-DAEMON Mon Aug 27 02:38:29 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPYF3-0001pD-Fn
	for mharc-gnash-commit@gnu.org; Mon, 27 Aug 2007 02:38:29 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPYF1-0001p7-IG
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 02:38:27 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPYF0-0001ov-20
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 02:38:26 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPYEz-0001os-TI
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 02:38:25 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IPYEz-0004X9-Gt
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 02:38:25 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IPYEy-0000kG-UG
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 06:38:25 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IPYEy-0000kC-NU
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 06:38:24 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPYEy-0000kC-NU@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Mon, 27 Aug 2007 06:38:24 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/toSt...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 06:38:27 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/27 06:38:24

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: toString_valueOf.as 

Log message:
	* testsuite/actionscript.all/toString_valueOf.as: more tests for deduction.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4110&r2=1.4111
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/toString_valueOf.as?cvsroot=gnash&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4110
retrieving revision 1.4111
diff -u -b -r1.4110 -r1.4111
--- ChangeLog	27 Aug 2007 03:41:42 -0000	1.4110
+++ ChangeLog	27 Aug 2007 06:38:23 -0000	1.4111
@@ -1,6 +1,7 @@
 2007-08-27 Zou Lunkai <zoulunkai@gmail.com>
 	
 	* testsuite/actionscript.all/ops.as: more tests about NaN.
+	* testsuite/actionscript.all/toString_valueOf.as: more tests for deduction.
 	  
 2007-08-27 Chad Musick <chadmusick@msbx.net>
 

Index: testsuite/actionscript.all/toString_valueOf.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/toString_valueOf.as,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- testsuite/actionscript.all/toString_valueOf.as	25 Aug 2007 21:38:49 -0000	1.7
+++ testsuite/actionscript.all/toString_valueOf.as	27 Aug 2007 06:38:24 -0000	1.8
@@ -24,6 +24,38 @@
 #include "check.as"
 
 //
+//Testing toString and valueOf of Function
+//
+#if OUTPUT_VERSION > 5
+	check_equals(typeof(Function), 'function');
+	
+	check(Function.prototype.hasOwnProperty('apply'));
+	check(Function.prototype.hasOwnProperty('call'));
+	xcheck(Function.prototype.hasOwnProperty('__proto__'));
+	check(Function.prototype.hasOwnProperty('constructor'));
+	
+	check(!Function.prototype.hasOwnProperty('toString'));
+	check(!Function.prototype.hasOwnProperty('valueOf'));
+	
+	check(Function.prototype.__proto__.hasOwnProperty('toString'));
+	check(Function.prototype.__proto__.hasOwnProperty('valueOf'));
+	
+  check_equals(typeof(Function.prototype['toString']), 'function');
+  check_equals(typeof(Function.prototype['valueOf']), 'function');
+#else
+	// No Function Object in swf5???
+	xcheck_equals(typeof(Function), 'undefined');
+	
+	// Function Object in swf5 does not support toString and valueOf
+	xcheck_equals(Function.prototype['toString'], undefined);
+  xcheck_equals(Function.prototype['valueOf'], undefined);
+  
+  // test 'function' is supported in swf5:)
+  x = function () {};
+	check_equals(typeof(x), 'function');
+#endif
+
+//
 //Testing toString and valueOf of Object
 //
 #if OUTPUT_VERSION > 5
@@ -32,8 +64,13 @@
 #else
   // swf5 does not support hasOwnProperty method
   check(typeof(hasOwnProperty) == 'undefined');
-  check(!Object.prototype.hasOwnProperty('toString'));
-  check(!Object.prototype.hasOwnProperty('valueOf'));
+  // Object object still supports toString and valueOf in swf5
+  check_equals(typeof(Object.prototype['toString']), 'function');
+  check_equals(typeof(Object.prototype['valueOf']), 'function');
+  // this is true because Function object in swf5 does not 
+  // support toString and valueOf.
+  xcheck_equals(Object.prototype.toString, undefined);
+  xcheck_equals(Object.prototype.valueOf,  undefined);
 #endif
 
 obj = new Object();
@@ -57,9 +94,11 @@
   check(obj.valueOf != Object.prototype.valueOf);
 #else
   // this is true only in swf5 (any function is equal to any other in SWF5)
-  xcheck(obj.toString == Object.prototype.toString);
-  xcheck(obj.valueOf == Object.prototype.valueOf);
+  xcheck(obj.toString == undefined);
+  xcheck(obj.valueOf == undefined);
   xcheck(obj.toString == obj.valueOf);
+  xcheck(Object.prototype.toString == undefined);
+  xcheck(Object.prototype.valueOf == undefined);
 #endif
 x = obj.toString();
 y = obj.valueOf();
@@ -81,8 +120,8 @@
   check(Number.prototype.valueOf != Object.prototype.valueOf);
 #else
   // this is true only in swf5
-  xcheck(Number.prototype.toString == Object.prototype.toString);
-  xcheck(Number.prototype.valueOf == Object.prototype.valueOf);
+  xcheck(Number.prototype.toString == undefined);
+  xcheck(Number.prototype.valueOf == undefined);
 #endif
 
 
@@ -121,8 +160,8 @@
   check(String.prototype.valueOf != Object.prototype.valueOf);
 #else
   // this is true only in swf5
-  xcheck(String.prototype.toString == Object.prototype.toString);
-  xcheck(String.prototype.valueOf == Object.prototype.valueOf);
+  xcheck(String.prototype.toString == undefined);
+  xcheck(String.prototype.valueOf == undefined);
 #endif
 
 str1 = new String("10");
@@ -275,6 +314,10 @@
 // For Buttons, this true from swf5~swf8!
 xcheck(Button.prototype.toString == Object.prototype.toString);
 xcheck(Button.prototype.valueOf == Object.prototype.valueOf);
+#if OUTPUT_VERSION == 5
+check_equals(Button.prototype.toString, undefined);
+check_equals(Button.prototype.valueOf, undefined);
+#endif
 
 btn1 = new Button();
 xcheck(typeof(btn1) == "object");
@@ -297,8 +340,8 @@
   check(Boolean.prototype.toString != Object.prototype.toString);
   check(Boolean.prototype.valueOf != Object.prototype.valueOf);
 #else
-  xcheck(Boolean.prototype.toString == Object.prototype.toString);
-  xcheck(Boolean.prototype.valueOf == Object.prototype.valueOf);
+  xcheck(Boolean.prototype.toString == undefined);
+  xcheck(Boolean.prototype.valueOf == undefined);
 #endif
 
 b1 = new Boolean(false);
@@ -325,8 +368,8 @@
   check(Date.prototype.toString != Object.prototype.toString);
   check(Date.prototype.valueOf != Object.prototype.valueOf);
 #else
-  xcheck(Date.prototype.toString == Object.prototype.toString);
-  xcheck(Date.prototype.valueOf == Object.prototype.valueOf);
+  xcheck(Date.prototype.toString == undefined);
+  xcheck(Date.prototype.valueOf == undefined);
 #endif
 
 d1 = new Date(0);
@@ -364,7 +407,7 @@
   check(!Array.prototype.hasOwnProperty('valueOf'));
   check(Array.prototype.toString != Object.prototype.toString);
 #else
-  xcheck(Array.prototype.toString == Object.prototype.toString);
+  xcheck(Array.prototype.toString == undefined);
 #endif
 
 check(Array.prototype.valueOf == Object.prototype.valueOf);



From MAILER-DAEMON Mon Aug 27 02:41:32 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPYI0-00034o-ID
	for mharc-gnash-commit@gnu.org; Mon, 27 Aug 2007 02:41:32 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPYHz-00033q-L7
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 02:41:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPYHy-000335-UV
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 02:41:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPYHy-00032u-PA
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 02:41:30 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IPYHy-00059K-7Z
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 02:41:30 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IPYHx-0000zy-Io
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 06:41:29 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IPYHx-0000zs-CR
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 06:41:29 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPYHx-0000zs-CR@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Mon, 27 Aug 2007 06:41:29 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/testsuite/actionscript.all toString_value...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 06:41:31 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/27 06:41:29

Modified files:
	testsuite/actionscript.all: toString_valueOf.as 

Log message:
	indent

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/toString_valueOf.as?cvsroot=gnash&r1=1.8&r2=1.9

Patches:
Index: toString_valueOf.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/toString_valueOf.as,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9



From MAILER-DAEMON Mon Aug 27 02:46:02 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPYML-00061w-Ri
	for mharc-gnash-commit@gnu.org; Mon, 27 Aug 2007 02:46:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPYMJ-0005yg-Ij
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 02:45:59 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPYMI-0005xd-Oc
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 02:45:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPYMI-0005xP-Gj
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 02:45:58 -0400
Received: from mx20.gnu.org ([199.232.41.8])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IPYMH-0005qa-Vq
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 02:45:58 -0400
Received: from nz-out-0506.google.com ([64.233.162.236])
	by mx20.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1IPYMH-0004bS-8f
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 02:45:57 -0400
Received: by nz-out-0506.google.com with SMTP id f1so986973nzc
	for <gnash-commit@gnu.org>; Sun, 26 Aug 2007 23:45:55 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=NnbtCvS0lGOwC4xq2buvRDfRd3uMSv4m3dXBrsFlNSExiTeXhzsTsam7DjhdfSbAvU6Y4nu4FP1qSfjwWt1o6SvIfDOa0ViMzsNR1vlLW7p8wL9nLbxu1snSec3VQvMYpBFtglIjHBbX1tuByGLrf0HfEm6cSDe9KSIip7pulIY=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=Q+el67Fyqtlzmf2c00LypVXSpZkBeBhM6YF6Q47NIGjQy9RbvDcP+qIUr9YioAkmLU2yeKvQqAWDY+vFWvXBJFNFoELkPNopeHKyTTX6e76R+z6yqelJz5C3MSClOmIA2vvq1PYAlchK7Y3gXfi5JykW6ozhW/bmK+vZs52Qs5k=
Received: by 10.115.76.1 with SMTP id d1mr3798985wal.1188197154972;
	Sun, 26 Aug 2007 23:45:54 -0700 (PDT)
Received: by 10.114.12.7 with HTTP; Sun, 26 Aug 2007 23:45:54 -0700 (PDT)
Message-ID: <ca4b43ff0708262345v4ffb500er6569ea9e39161a7c@mail.gmail.com>
Date: Mon, 27 Aug 2007 14:45:54 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "Sandro Santilli" <strk@keybit.net>
Subject: Re: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/toSt...
In-Reply-To: <E1IP3LF-0002f9-GY@cvs.savannah.gnu.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1IP3LF-0002f9-GY@cvs.savannah.gnu.org>
X-detected-kernel: Linux 2.6 (newer, 2)
X-Detected-Kernel: Linux 2.6, seldom 2.4 (older, 4)
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 06:45:59 -0000

> +  // this is true only in swf5 (any function is equal to any other in SWF5)
>  xcheck(obj.toString == Object.prototype.toString);
>  xcheck(obj.valueOf == Object.prototype.valueOf);
> +  xcheck(obj.toString == obj.valueOf);

see added tests in toString_valueOf.as.  This is due to functions in
SWF5 do not support valueOf and toString. And there is no Function
object in SWF5(need a double check).

zou

On 8/26/07, Sandro Santilli <strk@keybit.net> wrote:
> CVSROOT:        /sources/gnash
> Module name:    gnash
> Changes by:     Sandro Santilli <strk>  07/08/25 21:38:49
>
> Modified files:
>        .              : ChangeLog
>        testsuite/actionscript.all: toString_valueOf.as
>
> Log message:
>                * testsuite/actionscript.all/toString_valueOf.as: note that any
>                  function is equal to any other in SWF5...
>
> CVSWeb URLs:
> http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4102&r2=1.4103
> http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/toString_valueOf.as?cvsroot=gnash&r1=1.6&r2=1.7
>
> Patches:
> Index: ChangeLog
> ===================================================================
> RCS file: /sources/gnash/gnash/ChangeLog,v
> retrieving revision 1.4102
> retrieving revision 1.4103
> diff -u -b -r1.4102 -r1.4103
> --- ChangeLog   25 Aug 2007 19:07:45 -0000      1.4102
> +++ ChangeLog   25 Aug 2007 21:38:48 -0000      1.4103
> @@ -1,5 +1,7 @@
>  2007-08-25 Sandro Santilli <strk@keybit.net>
>
> +       * testsuite/actionscript.all/toString_valueOf.as: note that any
> +         function is equal to any other in SWF5...
>        * testsuite/actionscript.all/ops.as: more tests about isNaN(x) when
>          x != NaN (odd)
>
>
> Index: testsuite/actionscript.all/toString_valueOf.as
> ===================================================================
> RCS file: /sources/gnash/gnash/testsuite/actionscript.all/toString_valueOf.as,v
> retrieving revision 1.6
> retrieving revision 1.7
> diff -u -b -r1.6 -r1.7
> --- testsuite/actionscript.all/toString_valueOf.as      25 Aug 2007 14:15:51 -0000      1.6
> +++ testsuite/actionscript.all/toString_valueOf.as      25 Aug 2007 21:38:49 -0000      1.7
> @@ -56,9 +56,10 @@
>   check(obj.toString != Object.prototype.toString);
>   check(obj.valueOf != Object.prototype.valueOf);
>  #else
> -  // this is true only in swf5
> +  // this is true only in swf5 (any function is equal to any other in SWF5)
>   xcheck(obj.toString == Object.prototype.toString);
>   xcheck(obj.valueOf == Object.prototype.valueOf);
> +  xcheck(obj.toString == obj.valueOf);
>  #endif
>  x = obj.toString();
>  y = obj.valueOf();
>
>
> _______________________________________________
> Gnash-commit mailing list
> Gnash-commit@gnu.org
> http://lists.gnu.org/mailman/listinfo/gnash-commit
>



From MAILER-DAEMON Mon Aug 27 03:13:50 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPYnG-0002sv-Fd
	for mharc-gnash-commit@gnu.org; Mon, 27 Aug 2007 03:13:50 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPYnD-0002lL-B4
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 03:13:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPYnC-0002jn-My
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 03:13:46 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPYnC-0002jM-A6
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 03:13:46 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IPYnB-0001dW-Le
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 03:13:45 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IPYnA-0004YZ-EF
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 07:13:44 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IPYnA-0004YS-6D
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 07:13:44 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPYnA-0004YS-6D@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Mon, 27 Aug 2007 07:13:44 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/testsuite/actionscript.all toString_value...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 07:13:48 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/27 07:13:44

Modified files:
	testsuite/actionscript.all: toString_valueOf.as 

Log message:
	more tests

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/toString_valueOf.as?cvsroot=gnash&r1=1.9&r2=1.10

Patches:
Index: toString_valueOf.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/toString_valueOf.as,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- toString_valueOf.as	27 Aug 2007 06:41:29 -0000	1.9
+++ toString_valueOf.as	27 Aug 2007 07:13:44 -0000	1.10
@@ -39,6 +39,8 @@
   
   check(Function.prototype.__proto__.hasOwnProperty('toString'));
   check(Function.prototype.__proto__.hasOwnProperty('valueOf'));
+  check_equals(Function.prototype.__proto__, Object.prototype);
+  xcheck_equals(Object.prototype.__proto__, undefined);
   
   check_equals(typeof(Function.prototype['toString']), 'function');
   check_equals(typeof(Function.prototype['valueOf']), 'function');



From MAILER-DAEMON Mon Aug 27 03:19:44 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPYsy-00067A-HD
	for mharc-gnash-commit@gnu.org; Mon, 27 Aug 2007 03:19:44 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPYsw-000662-To
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 03:19:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPYsv-00064E-FB
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 03:19:42 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPYsv-00063y-AS
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 03:19:41 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1IPYsu-0002u3-Ml
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 03:19:41 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l7R7JS261959;
	Mon, 27 Aug 2007 09:19:28 +0200 (CEST)
	(envelope-from strk@keybit.net)
Date: Mon, 27 Aug 2007 09:19:28 +0200
From: Sandro Santilli <strk@keybit.net>
To: zou lunkai <zoulunkai@gmail.com>
Subject: Re: [Gnash-commit] gnash ChangeLog server/as_value.cpp server/dlis...
Message-ID: <20070827071928.GB44957@keybit.net>
Mail-Followup-To: zou lunkai <zoulunkai@gmail.com>, gnash-commit@gnu.org
References: <E1IObh2-0004ZK-19@cvs.savannah.gnu.org>
	<ca4b43ff0708261826m5cfe495cy7886345e93b54bab@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <ca4b43ff0708261826m5cfe495cy7886345e93b54bab@mail.gmail.com>
X-Detected-Kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 07:19:43 -0000

On Mon, Aug 27, 2007 at 09:26:53AM +0800, zou lunkai wrote:
> How is the status of Soft Reference now?  I see lots of them have been fixed.

Probably all known ones, looking forward for some breaking the new model.

--strk;



From MAILER-DAEMON Mon Aug 27 03:25:22 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPYyQ-0005F6-0K
	for mharc-gnash-commit@gnu.org; Mon, 27 Aug 2007 03:25:22 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPYyN-0005EK-Bw
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 03:25:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPYyL-0005DY-Nd
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 03:25:18 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPYyL-0005DT-KH
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 03:25:17 -0400
Received: from nz-out-0506.google.com ([64.233.162.225])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1IPYyL-0003kq-DO
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 03:25:17 -0400
Received: by nz-out-0506.google.com with SMTP id f1so993309nzc
	for <gnash-commit@gnu.org>; Mon, 27 Aug 2007 00:25:16 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=bGSWehUwMvZMbRiOufsKQP91vpU4Yirek+WFbKhGsUu1FHabVniPP7vt5eb92vLGQnXVg0t3rfyHxjV2UuG+u2c0slbEwLg3BW74Vt7QtBRq27i0LHdKhPdxyUoGsAT+uc65G7SUir5PbXTf3FEEyOUMFbifyjdEgK9rH8GE+v8=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=Vtmwly3ZQKHm8EfsF/7DJbjqtGUtBwe7ZyOwDW/FZhT/t3tSnvCwTLGZdiYiTgVIqiJ0eXz164DiMefsyX1H/tcuYnNuWA8p3jh79G3/9wIf6k8ldwaqgObtoF5upop8fJQsx0kHWIBDlNq+nfUmfrG99cZ0eopwDANDALGtVc4=
Received: by 10.114.120.1 with SMTP id s1mr1322377wac.1188199515930;
	Mon, 27 Aug 2007 00:25:15 -0700 (PDT)
Received: by 10.114.12.7 with HTTP; Mon, 27 Aug 2007 00:25:15 -0700 (PDT)
Message-ID: <ca4b43ff0708270025n45ee209au37f1c620cb9503da@mail.gmail.com>
Date: Mon, 27 Aug 2007 15:25:15 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "Sandro Santilli" <strk@keybit.net>
Subject: Re: [Gnash-commit] gnash ChangeLog server/as_value.cpp server/dlis...
In-Reply-To: <20070827071928.GB44957@keybit.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1IObh2-0004ZK-19@cvs.savannah.gnu.org>
	<ca4b43ff0708261826m5cfe495cy7886345e93b54bab@mail.gmail.com>
	<20070827071928.GB44957@keybit.net>
X-Detected-Kernel: Linux 2.6 (newer, 2)
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 07:25:19 -0000

Then could you provide a description about the new model? That helps
me for breaking:)  Actually, I'm not sure about the direction now if
most of the exists have been fixed.

On 8/27/07, Sandro Santilli <strk@keybit.net> wrote:
> On Mon, Aug 27, 2007 at 09:26:53AM +0800, zou lunkai wrote:
> > How is the status of Soft Reference now?  I see lots of them have been fixed.
>
> Probably all known ones, looking forward for some breaking the new model.
>
> --strk;
>



From MAILER-DAEMON Mon Aug 27 03:32:20 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPZ5A-0007im-Dv
	for mharc-gnash-commit@gnu.org; Mon, 27 Aug 2007 03:32:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPZ59-0007iR-AT
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 03:32:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPZ57-0007hg-L0
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 03:32:18 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPZ57-0007hb-Df
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 03:32:17 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1IPZ56-0004wk-Jp
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 03:32:17 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l7R7WBH62255;
	Mon, 27 Aug 2007 09:32:11 +0200 (CEST)
	(envelope-from strk@keybit.net)
Date: Mon, 27 Aug 2007 09:32:11 +0200
From: Sandro Santilli <strk@keybit.net>
To: zou lunkai <zoulunkai@gmail.com>
Subject: Re: [Gnash-commit] gnash ChangeLog server/as_value.cpp server/dlis...
Message-ID: <20070827073211.GC44957@keybit.net>
Mail-Followup-To: zou lunkai <zoulunkai@gmail.com>, gnash-commit@gnu.org
References: <E1IObh2-0004ZK-19@cvs.savannah.gnu.org>
	<ca4b43ff0708261826m5cfe495cy7886345e93b54bab@mail.gmail.com>
	<20070827071928.GB44957@keybit.net>
	<ca4b43ff0708270025n45ee209au37f1c620cb9503da@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <ca4b43ff0708270025n45ee209au37f1c620cb9503da@mail.gmail.com>
X-Detected-Kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 07:32:19 -0000

On Mon, Aug 27, 2007 at 03:25:15PM +0800, zou lunkai wrote:
> Then could you provide a description about the new model? That helps
> me for breaking:)  Actually, I'm not sure about the direction now if
> most of the exists have been fixed.

movieclips are stored by pointer.
when converting the value to an object or sprite (to_object,to_sprite)
then a check is performed to see if the object was unloaded, if so,
it's target is used to find another object having replaced it.
If found, the new object is returned, otherwise NULL is returned.

It's all pretty confusing, I'm sure you'll break it easily.

--strk



From MAILER-DAEMON Mon Aug 27 04:11:48 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPZhM-0006E6-K4
	for mharc-gnash-commit@gnu.org; Mon, 27 Aug 2007 04:11:48 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPZhL-0006DT-2P
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 04:11:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPZhJ-0006Cx-Sx
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 04:11:46 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPZhJ-0006Cq-Ik
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 04:11:45 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IPZhJ-00047r-85
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 04:11:45 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IPZhH-0000Ir-Om
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 08:11:43 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IPZhH-0000Ij-Hw
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 08:11:43 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPZhH-0000Ij-Hw@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 27 Aug 2007 08:11:43 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/server/Makefile.am te...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 08:11:47 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/27 08:11:43

Modified files:
	.              : ChangeLog 
	testsuite/server: Makefile.am 
Added files:
	testsuite/server: StreamTest.cpp 

Log message:
	        * testsuite/server/: Makefile.am, StreamTest.cpp:
	          gnash::stream testing (for now it's just bit streaming, as a tool
	          for optimization of the read_uint)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4111&r2=1.4112
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/server/Makefile.am?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/server/StreamTest.cpp?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4111
retrieving revision 1.4112
diff -u -b -r1.4111 -r1.4112
--- ChangeLog	27 Aug 2007 06:38:23 -0000	1.4111
+++ ChangeLog	27 Aug 2007 08:11:42 -0000	1.4112
@@ -1,3 +1,9 @@
+2007-08-27 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/server/: Makefile.am, StreamTest.cpp:
+	  gnash::stream testing (for now it's just bit streaming, as a tool
+	  for optimization of the read_uint)
+
 2007-08-27 Zou Lunkai <zoulunkai@gmail.com>
 	
 	* testsuite/actionscript.all/ops.as: more tests about NaN.

Index: testsuite/server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/server/Makefile.am,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- testsuite/server/Makefile.am	1 Jul 2007 10:55:13 -0000	1.31
+++ testsuite/server/Makefile.am	27 Aug 2007 08:11:43 -0000	1.32
@@ -34,6 +34,7 @@
 	$(NULL)
 
 check_PROGRAMS = \
+	StreamTest \
 	MatrixTest \
 	PointTest \
 	EdgeTest \
@@ -61,6 +62,11 @@
 	GNASH_LIBS += $(FFMPEG_LIBS)
 endif
 
+StreamTest_SOURCES = StreamTest.cpp
+StreamTest_LDADD = \
+	$(GNASH_LIBS) \
+	$(NULL)
+
 MatrixTest_SOURCES = MatrixTest.cpp
 MatrixTest_LDADD = \
 	$(GNASH_LIBS) \

Index: testsuite/server/StreamTest.cpp
===================================================================
RCS file: testsuite/server/StreamTest.cpp
diff -N testsuite/server/StreamTest.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/server/StreamTest.cpp	27 Aug 2007 08:11:43 -0000	1.1
@@ -0,0 +1,206 @@
+// 
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#undef HAVE_DEJAGNU_H
+
+#ifdef HAVE_DEJAGNU_H
+#include "dejagnu.h"
+#else
+#include "check.h"
+#endif
+
+#include "tu_file.h"
+#include "stream.h"
+
+#include <cstdio>
+#include <iostream>
+#include <cassert>
+
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <string.h>
+#include <sstream>
+
+using namespace std;
+using namespace gnash;
+
+#define CHUNK_SIZE 4
+
+TestState runtest;
+
+struct ByteReader
+{
+	unsigned char b;
+
+	ByteReader(unsigned char by)
+		:
+		b(by)
+	{}
+
+	static int readFunc(void* dst, int bytes, void* appdata) 
+	{
+	    assert(bytes == 1);
+	    ByteReader* br = (ByteReader*) appdata;
+	    
+	    memcpy(dst, &(br->b), sizeof(unsigned char));
+
+		return 1;
+	}
+};
+
+int
+main(int /*argc*/, char** /*argv*/)
+{
+	ByteReader br(0xAA);
+
+	tu_file fakeIn(
+		&br,
+		ByteReader::readFunc,
+		0, // write_func wf,
+		0, //seek_func sf,
+		0, //seek_to_end_func ef,
+		0, //tell_func tf,
+		0, //get_eof_func gef,
+		0, //get_err_func ger
+		0, // get_stream_size_func gss,
+		0 // close_func cf
+	);
+
+	stream s(&fakeIn);
+
+	int ret;
+
+	/// bits: 10101010 (0xAA)
+
+	s.align();
+	ret = s.read_uint(1); check_equals(ret, 1);
+	ret = s.read_uint(1); check_equals(ret, 0);
+	ret = s.read_uint(1); check_equals(ret, 1);
+	ret = s.read_uint(1); check_equals(ret, 0);
+
+	/// bits: 10101010 (0xAA)
+
+	s.align();
+	ret = s.read_uint(1); check_equals(ret, 1);
+	ret = s.read_uint(1); check_equals(ret, 0);
+	ret = s.read_uint(1); check_equals(ret, 1);
+	ret = s.read_uint(1); check_equals(ret, 0);
+
+	/// bits: 10101010 (0xAA)
+
+	s.align();
+	ret = s.read_uint(2); check_equals(ret, 2);
+	ret = s.read_uint(2); check_equals(ret, 2);
+	ret = s.read_uint(2); check_equals(ret, 2);
+	ret = s.read_uint(2); check_equals(ret, 2);
+
+	/// bits: 10101010 (0xAA)
+
+	s.align();
+	ret = s.read_uint(3); check_equals(ret, 5);
+	ret = s.read_uint(3); check_equals(ret, 2);
+	ret = s.read_uint(2); check_equals(ret, 2);
+
+	/// bits: 10101010 (0xAA)
+
+	s.align();
+	ret = s.read_uint(3); check_equals(ret, 5);
+	ret = s.read_uint(2); check_equals(ret, 1);
+	ret = s.read_uint(3); check_equals(ret, 2);
+
+	/// bits: 10101010 (0xAA)
+
+	s.align();
+	ret = s.read_uint(2); check_equals(ret, 2);
+	ret = s.read_uint(3); check_equals(ret, 5);
+	ret = s.read_uint(3); check_equals(ret, 2);
+
+	/// bits: 10101010 (0xAA)
+
+	s.align();
+	ret = s.read_uint(4); check_equals(ret, 10);
+	ret = s.read_uint(4); check_equals(ret, 10);
+
+	/// bits: 10101010 (0xAA)
+
+	s.align();
+	ret = s.read_uint(5); check_equals(ret, 21);
+	ret = s.read_uint(3); check_equals(ret, 2);
+
+	/// bits: 10101010 (0xAA)
+
+	s.align();
+	ret = s.read_uint(3); check_equals(ret, 5);
+	ret = s.read_uint(5); check_equals(ret, 10);
+
+	/// bits: 10101010 (0xAA)
+
+	s.align();
+	ret = s.read_uint(6); check_equals(ret, 42);
+	ret = s.read_uint(2); check_equals(ret, 2);
+
+	/// bits: 10101010 (0xAA)
+
+	s.align();
+	ret = s.read_uint(2); check_equals(ret, 2);
+	ret = s.read_uint(6); check_equals(ret, 42);
+
+	/// bits: 10101010 (0xAA)
+
+	s.align();
+	ret = s.read_uint(7); check_equals(ret, 85);
+	ret = s.read_uint(1); check_equals(ret, 0);
+
+	/// bits: 10101010 (0xAA)
+
+	s.align();
+	ret = s.read_uint(1); check_equals(ret, 1);
+	ret = s.read_uint(7); check_equals(ret, 42);
+
+	/// bits: 10101010 (0xAA)
+
+	s.align();
+	ret = s.read_uint(8); check_equals(ret, 170);
+
+	/// bits: 10101 01010 10101 0 (0xAAAA)
+
+	s.align();
+	ret = s.read_uint(5); check_equals(ret, 21);
+	ret = s.read_uint(5); check_equals(ret, 10);
+	ret = s.read_uint(5); check_equals(ret, 21);
+
+	/// bits: 101010 101 0101010 (0xAAAA)
+
+	s.align();
+	ret = s.read_uint(6); check_equals(ret, 42);
+	ret = s.read_uint(3); check_equals(ret, 5);
+	ret = s.read_uint(7); check_equals(ret, 42);
+
+	/// bits: 1010101010101010 (0xAAAA)
+
+	s.align();
+	ret = s.read_uint(16); check_equals(ret, 43690);
+
+	return 0;
+}
+



From MAILER-DAEMON Mon Aug 27 04:28:47 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPZxn-00055X-Bn
	for mharc-gnash-commit@gnu.org; Mon, 27 Aug 2007 04:28:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPZxl-00053Q-QI
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 04:28:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPZxk-00051b-Nh
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 04:28:45 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPZxk-00051J-HH
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 04:28:44 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IPZxk-0006hh-AR
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 04:28:44 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IPZxj-0002Pz-2k
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 08:28:43 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IPZxi-0002Pw-Tp
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 08:28:43 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPZxi-0002Pw-Tp@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 27 Aug 2007 08:28:42 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/testsuite/server StreamTest.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 08:28:46 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/27 08:28:42

Modified files:
	testsuite/server: StreamTest.cpp 

Log message:
	few more tests with 3 bytes

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/server/StreamTest.cpp?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: StreamTest.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/server/StreamTest.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- StreamTest.cpp	27 Aug 2007 08:11:43 -0000	1.1
+++ StreamTest.cpp	27 Aug 2007 08:28:42 -0000	1.2
@@ -201,6 +201,18 @@
 	s.align();
 	ret = s.read_uint(16); check_equals(ret, 43690);
 
+	/// bits: 101010 10101010101010 1010 (0xAAAAAA)
+
+	s.align();
+	ret = s.read_uint(6); check_equals(ret, 42);
+	ret = s.read_uint(14); check_equals(ret, 10922);
+	ret = s.read_uint(4); check_equals(ret, 10);
+
+	/// bits: 101010101010101010101010 (0xAAAAAA)
+
+	s.align();
+	ret = s.read_uint(24); check_equals(ret, 11184810);
+
 	return 0;
 }
 



From MAILER-DAEMON Mon Aug 27 05:56:06 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPbKI-0004AD-7N
	for mharc-gnash-commit@gnu.org; Mon, 27 Aug 2007 05:56:06 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPbKG-00049o-6h
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 05:56:04 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPbKF-00049X-8R
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 05:56:03 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPbKF-00049U-1y
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 05:56:03 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IPbKE-0005mC-L4
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 05:56:02 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IPbKE-0000Vs-2w
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 09:56:02 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IPbKD-0000Vk-RY
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 09:56:01 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPbKD-0000Vk-RY@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Mon, 27 Aug 2007 09:56:01 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/DefineE...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 09:56:04 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/27 09:56:01

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: DefineEditTextVariableNameTest2.c 
	                         Makefile.am 

Log message:
	* testsuite/misc-ming.all/DefineEditTextVariableNameTest2.c,
	  testsuite/misc-ming.all/Makefile.am:  more tests, finished
	  deduction, testcase now enabled.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4112&r2=1.4113
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DefineEditTextVariableNameTest2.c?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.148&r2=1.149

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4112
retrieving revision 1.4113
diff -u -b -r1.4112 -r1.4113
--- ChangeLog	27 Aug 2007 08:11:42 -0000	1.4112
+++ ChangeLog	27 Aug 2007 09:56:00 -0000	1.4113
@@ -1,3 +1,9 @@
+2007-08-27 Zou Lunkai <zoulunkai@gmail.com>
+	
+	* testsuite/misc-ming.all/DefineEditTextVariableNameTest2.c,
+	  testsuite/misc-ming.all/Makefile.am:  more tests, finished
+	  deduction, testcase now enabled.	  
+	
 2007-08-27 Sandro Santilli <strk@keybit.net>
 
 	* testsuite/server/: Makefile.am, StreamTest.cpp:

Index: testsuite/misc-ming.all/DefineEditTextVariableNameTest2.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/DefineEditTextVariableNameTest2.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/misc-ming.all/DefineEditTextVariableNameTest2.c	24 Aug 2007 07:36:25 -0000	1.1
+++ testsuite/misc-ming.all/DefineEditTextVariableNameTest2.c	27 Aug 2007 09:56:01 -0000	1.2
@@ -1,5 +1,5 @@
 /* 
- *   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+ *   Copyright (C)  2007 Free Software Foundation, Inc.
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,7 +22,20 @@
  *
  * Test DefineEditText tag with VariableName
  *
- * TODO: review this testcase later.
+ * Description:
+ *  Frame2: add dtext1, associate it with a variable 'edit_text_var'
+ *  Frame3: add dtext2, associate it with a variable 'edit_text_var' again
+ *  Frame4: add dtext2, associate it with a variable 'edit_text_var' again
+ *  Frame5: set edit_text_var to 'Hahaha'
+ *  Frame6: remove dtext1
+ *  Frame7: remove dtext2
+ *  Frame8: remove dtext3
+ *  Frame 9: add dtext4, associate it with a variable 'edit_text_var' again
+ *  Frame 10: set edit_text_var to a new Object
+ *  Frame 11: provide a user defined toString for edit_text_var
+ *  Frame 12: some checks
+ *  Frame 13: set edit_text_var to a new Object again
+ *  Frame 14: end  
  *
  * run as ./DefineEditTextVariableNameTest2
  */
@@ -141,24 +154,28 @@
   SWFMovie_nextFrame(mo); 
   
   // Frame6: remove dtext1
+  
   SWFDisplayItem_remove(it1);
   check_equals(mo, "typeof(edit_text_var)", "'string'" );
   check_equals(mo, "edit_text_var", "'Hahaha'");
   SWFMovie_nextFrame(mo); 
   
   // Frame7: remove dtext2
+  
   SWFDisplayItem_remove(it2);
   check_equals(mo, "typeof(edit_text_var)", "'string'" );
   check_equals(mo, "edit_text_var", "'Hahaha'");
   SWFMovie_nextFrame(mo); 
 
   // Frame8: remove dtext3
+  
   SWFDisplayItem_remove(it3);
   check_equals(mo, "typeof(edit_text_var)", "'string'" );
   check_equals(mo, "edit_text_var", "'Hahaha'");
   SWFMovie_nextFrame(mo); 
   
   // Frame 9: add dtext4, associate it with a variable 'edit_text_var' again. 
+  
   it4 = add_text_field(mo, (SWFBlock)bfont, "edit_text_var",  "Hello");
   SWFDisplayItem_setName(it4, "dtext4");
   SWFDisplayItem_moveTo(it4, 0, 400);
@@ -167,35 +184,41 @@
   SWFMovie_nextFrame(mo); 
   
   // Frame10: set edit_text_var to a new Object
+  
   add_actions(mo, "edit_text_var = new Object();");
   check_equals(mo, "typeof(edit_text_var)", "'object'");
   check_equals(mo, "typeof(dtext4.text)", "'string'");
-  // dtext4.text == Object.toString() 
   xcheck_equals(mo, "dtext4.text", "'[object Object]'");
   SWFMovie_nextFrame(mo);
   
   // Frame 11: provide a user defined toString for edit_text_var
-  //
-  add_actions(mo, "Object.prototype.toString = function() {return 'Hello world';}; ");
+
+  add_actions(mo, "Object.prototype.toString = function() {return 'TO_STRING';}; ");
   check_equals(mo, "typeof(dtext4.text)", "'string'");
-  // Object.prototype.toString not invoked here!
-  // Strange!!!
+  // Object.prototype.toString not invoked for dtext4.text!
   xcheck_equals(mo, "dtext4.text", "'[object Object]'");
   check_equals(mo, "typeof(dtext4.text.toString)", "'function'");
   xcheck_equals(mo, "dtext4.text.toString()", "'[object Object]'");
   xcheck_equals(mo, "dtext4.text.valueOf()", "'[object Object]'");
   SWFMovie_nextFrame(mo);
   
-  // Frame 13: prints 'Hello world', but the text in dtext4 is '[object Object]'
-  // Strange!!!
-  add_actions(mo, "_root.note(edit_text_var);");
+  // Frame 12: dtext4.text still not updated
+  // Deduction: dtext4.text won't update if edit_text_var is untouched.
+  check_equals(mo, "edit_text_var.toString()", "'TO_STRING'");
+  xcheck_equals(mo, "dtext4.text", "'[object Object]'");
+  SWFMovie_nextFrame(mo);
+  
+  // Frame 13: dtext4.text updated. 
+  // Deduction: setting edit_text_var triggered updating dtext4.text.
+  add_actions(mo, "edit_text_var = new Object();");
+  check_equals(mo, "edit_text_var.toString()", "'TO_STRING'");
+  xcheck_equals(mo, "dtext4.text", "'TO_STRING'");
   SWFMovie_nextFrame(mo);
   
   // Frame 14: end
   add_actions(mo, "totals(); stop();");
   SWFMovie_nextFrame(mo); 
  
-
   // Output movie
   puts("Saving " OUTPUT_FILENAME );
   SWFMovie_save(mo, OUTPUT_FILENAME);

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -b -r1.148 -r1.149
--- testsuite/misc-ming.all/Makefile.am	22 Aug 2007 05:55:09 -0000	1.148
+++ testsuite/misc-ming.all/Makefile.am	27 Aug 2007 09:56:01 -0000	1.149
@@ -61,6 +61,8 @@
 	DefineEditTextTest-Runner \
 	DefineEditTextVariableNameTest \
 	DefineEditTextVariableNameTest-Runner \
+	DefineEditTextVariableNameTest2 \
+	DefineEditTextVariableNameTest2-Runner \
 	Dejagnu \
 	Dejagnu.swf \
 	PlaceObject2Test \
@@ -236,6 +238,7 @@
 	loop_test8runner \
 	shape_testrunner \
 	registerClassTest2runner \
+	DefineEditTextVariableNameTest-Runner \
 	$(NULL)
 
 if MAKESWF_SUPPORTS_PREBUILT_CLIPS
@@ -271,6 +274,8 @@
 
 definebitsjpeg2_SOURCES = definebitsjpeg2.c
 definebitsjpeg2_LDADD = $(MING_LIBS)
+definebitsjpeg2.swf: definebitsjpeg2
+	./definebitsjpeg2 $(srcdir)/../media/lynch.jpg
 
 moviecliploader_test_SOURCES =  moviecliploader_test.c
 moviecliploader_test_LDADD = $(MING_LIBS)
@@ -307,11 +312,6 @@
 	DefineEditTextTest.swf      \
 	$(NULL)
 
-DefineEditTextVariableNameTest_SOURCES =	\
-	DefineEditTextVariableNameTest.c	\
-	$(NULL)
-DefineEditTextVariableNameTest_LDADD = libgnashmingutils.la
-
 spritehier_SOURCES =  spritehier.c
 spritehier_LDADD = $(MING_LIBS)
 
@@ -343,8 +343,10 @@
 	eventSoundTest1.swf      \
 	$(NULL)
 
-definebitsjpeg2.swf: definebitsjpeg2
-	./definebitsjpeg2 $(srcdir)/../media/lynch.jpg
+DefineEditTextVariableNameTest_SOURCES =	\
+	DefineEditTextVariableNameTest.c	\
+	$(NULL)
+DefineEditTextVariableNameTest_LDADD = libgnashmingutils.la
 
 DefineEditTextVariableNameTest.swf: DefineEditTextVariableNameTest
 	./DefineEditTextVariableNameTest $(top_srcdir)/testsuite/media
@@ -360,6 +362,19 @@
 	DefineEditTextVariableNameTest.swf      \
 	$(NULL)
 
+
+DefineEditTextVariableNameTest2_SOURCES =	\
+	DefineEditTextVariableNameTest2.c	\
+	$(NULL)
+DefineEditTextVariableNameTest2_LDADD = libgnashmingutils.la
+
+DefineEditTextVariableNameTest2.swf: DefineEditTextVariableNameTest2
+	./DefineEditTextVariableNameTest2 $(top_srcdir)/testsuite/media
+
+DefineEditTextVariableNameTest2-Runner: $(srcdir)/../generic-testrunner.sh DefineEditTextVariableNameTest2.swf
+	sh $< $(top_builddir) DefineEditTextVariableNameTest2.swf > $@
+	chmod 755 $@
+
 timeline_var_test_SOURCES =	\
 	timeline_var_test.c	\
 	$(NULL)
@@ -1617,6 +1632,7 @@
 TEST_DRIVERS = ../simple.exp
 TEST_CASES = \
 	DefineEditTextVariableNameTest-Runner \
+	DefineEditTextVariableNameTest2-Runner \
 	DefineEditTextTest-Runner \
 	RollOverOutTest-Runner \
 	ButtonEventsTest-Runner \



From MAILER-DAEMON Mon Aug 27 07:58:54 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPdF8-0000cg-Gh
	for mharc-gnash-commit@gnu.org; Mon, 27 Aug 2007 07:58:54 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPdF4-0000Yz-Vc
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 07:58:51 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPdF3-0000Xk-V6
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 07:58:50 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPdF3-0000XF-Mu
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 07:58:49 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1IPdF3-00005f-Do
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 07:58:49 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <markus@unixrus.se>) id 1IPdF2-00019H-3O
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 11:58:48 +0000
Received: from nihilus by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <nihilus@savannah.gnu.org>) id 1IPdF1-00019E-Ty
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 11:58:47 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPdF1-00019E-Ty@cvs.savannah.gnu.org>
From: Markus Gothe <markus@unixrus.se>
Date: Mon, 27 Aug 2007 11:58:47 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog libbase/utility.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 11:58:51 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Markus Gothe <nihilus>	07/08/27 11:58:47

Modified files:
	.              : ChangeLog 
	libbase        : utility.h 

Log message:
	defined exp2() as it's missing on some BSDen. Thx to deanna for the 
	patch.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4113&r2=1.4114
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/utility.h?cvsroot=gnash&r1=1.25&r2=1.26

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4113
retrieving revision 1.4114
diff -u -b -r1.4113 -r1.4114
--- ChangeLog	27 Aug 2007 09:56:00 -0000	1.4113
+++ ChangeLog	27 Aug 2007 11:58:46 -0000	1.4114
@@ -1,3 +1,7 @@
+2007-08-27 Markus Gothe <nietzsche@lysator.liu.se>
+
+	* libbase/utility.h: defined exp2() as it's missing on some BSDen.
+
 2007-08-27 Zou Lunkai <zoulunkai@gmail.com>
 	
 	* testsuite/misc-ming.all/DefineEditTextVariableNameTest2.c,

Index: libbase/utility.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/utility.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- libbase/utility.h	23 Jul 2007 22:07:59 -0000	1.25
+++ libbase/utility.h	27 Aug 2007 11:58:47 -0000	1.26
@@ -114,6 +114,8 @@
 const float LN_2 = 0.693147180559945f;
 // the overridden log(f) will use logf IFF f is a float
 inline float	log2(float f) { return std::log(f) / LN_2; }
+//exp2 might be missing on Net-/OpenBSD.
+inline float	exp2(double d, double x) { return std::pow((double)d, double(x)); }
 inline int	fchop( float f ) { return (int) f; }	// replace w/ inline asm if desired
 inline int	frnd(float f) { return fchop(f + 0.5f); }	// replace with inline asm if desired
 



From MAILER-DAEMON Mon Aug 27 08:03:17 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPdJN-0002mO-0t
	for mharc-gnash-commit@gnu.org; Mon, 27 Aug 2007 08:03:17 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPdJL-0002mI-Q8
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 08:03:15 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPdJL-0002m6-Ca
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 08:03:15 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPdJL-0002m3-9m
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 08:03:15 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1IPdJK-00015P-Qp
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 08:03:14 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <markus@unixrus.se>) id 1IPdJK-0001h8-Gw
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 12:03:14 +0000
Received: from nihilus by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <nihilus@savannah.gnu.org>) id 1IPdJK-0001h5-CY
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 12:03:14 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPdJK-0001h5-CY@cvs.savannah.gnu.org>
From: Markus Gothe <markus@unixrus.se>
Date: Mon, 27 Aug 2007 12:03:14 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog libbase/utility.h [release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 12:03:15 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Markus Gothe <nihilus>	07/08/27 12:03:14

Modified files:
	.              : ChangeLog 
	libbase        : utility.h 

Log message:
	defined exp2() as it's missing on some BSDen.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.62&r2=1.3971.2.63
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/utility.h?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.25&r2=1.25.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.62
retrieving revision 1.3971.2.63
diff -u -b -r1.3971.2.62 -r1.3971.2.63
--- ChangeLog	24 Aug 2007 15:50:02 -0000	1.3971.2.62
+++ ChangeLog	27 Aug 2007 12:03:13 -0000	1.3971.2.63
@@ -1,3 +1,7 @@
+2007-08-27 Deanna Philips <deanna>
+
+        * libbase/utility.h: defined exp2() as it's missing on some BSDen.
+
 2007-08-24 Miriam Ruiz <little_miry@yahoo.es>
 
 	* plugin/klash/klash_part.cpp: Patch for GNASHEXE.

Index: libbase/utility.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/utility.h,v
retrieving revision 1.25
retrieving revision 1.25.2.1
diff -u -b -r1.25 -r1.25.2.1
--- libbase/utility.h	23 Jul 2007 22:07:59 -0000	1.25
+++ libbase/utility.h	27 Aug 2007 12:03:14 -0000	1.25.2.1
@@ -114,6 +114,8 @@
 const float LN_2 = 0.693147180559945f;
 // the overridden log(f) will use logf IFF f is a float
 inline float	log2(float f) { return std::log(f) / LN_2; }
+//exp2 might be missing on Net-/OpenBSD.
+inline float    exp2(double d, double x) { return std::pow((double)d, double(x)); }
 inline int	fchop( float f ) { return (int) f; }	// replace w/ inline asm if desired
 inline int	frnd(float f) { return fchop(f + 0.5f); }	// replace with inline asm if desired
 



From MAILER-DAEMON Mon Aug 27 08:09:11 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPdP5-00041I-02
	for mharc-gnash-commit@gnu.org; Mon, 27 Aug 2007 08:09:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPdP2-0003zi-Th
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 08:09:08 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPdP2-0003zW-Cr
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 08:09:08 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPdP2-0003zT-2Y
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 08:09:08 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IPdP1-0001yT-K0
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 08:09:07 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IPdP0-0001qM-CT
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 12:09:06 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IPdP0-0001qJ-6M
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 12:09:06 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPdP0-0001qJ-6M@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 27 Aug 2007 12:09:06 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/stream.cpp server/stream...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 12:09:09 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/27 12:09:06

Modified files:
	.              : ChangeLog 
	server         : stream.cpp stream.h 
	server/parser  : shape_character_def.cpp 
	testsuite/server: StreamTest.cpp 

Log message:
	        * server/stream.{cpp,h}: add read_bit(), optimize read_uint()
	          a little-bit (there are likely more optimization options).
	        * server/parser/shape_character_def.cpp (read): use read_bit()
	          instead of read_uint(1).
	        * testsuite/server/StreamTest.cpp: more tests for read_bit().

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4114&r2=1.4115
http://cvs.savannah.gnu.org/viewcvs/gnash/server/stream.cpp?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/server/stream.h?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/shape_character_def.cpp?cvsroot=gnash&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/server/StreamTest.cpp?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4114
retrieving revision 1.4115
diff -u -b -r1.4114 -r1.4115
--- ChangeLog	27 Aug 2007 11:58:46 -0000	1.4114
+++ ChangeLog	27 Aug 2007 12:09:04 -0000	1.4115
@@ -1,3 +1,11 @@
+2007-08-27 Sandro Santilli <strk@keybit.net>
+
+	* server/stream.{cpp,h}: add read_bit(), optimize read_uint()
+	  a little-bit (there are likely more optimization options).
+	* server/parser/shape_character_def.cpp (read): use read_bit()
+	  instead of read_uint(1).
+	* testsuite/server/StreamTest.cpp: more tests for read_bit().
+
 2007-08-27 Markus Gothe <nietzsche@lysator.liu.se>
 
 	* libbase/utility.h: defined exp2() as it's missing on some BSDen.

Index: server/stream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/stream.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- server/stream.cpp	27 Aug 2007 03:06:41 -0000	1.26
+++ server/stream.cpp	27 Aug 2007 12:09:05 -0000	1.27
@@ -54,44 +54,71 @@
 // 	}
 
 	
+	bool stream::read_bit()
+	{
+		if (!m_unused_bits)
+		{
+			m_current_byte = m_input->read_byte();
+			m_unused_bits = 7;
+			return (m_current_byte&0x80);
+		}
+		else
+		{
+			return ( m_current_byte & (1<<(--m_unused_bits)) );
+		}
+	}
+
 	unsigned stream::read_uint(unsigned short bitcount)
 	{
-		assert(bitcount <= 32);
+		assert(bitcount <= 24);
+
+		if (!m_unused_bits)
+		{
+			m_current_byte = m_input->read_byte();
+			m_unused_bits = 8;
+		}
 			
 		uint32_t	value = 0;
 
 		unsigned short bits_needed = bitcount;
-		while (bits_needed > 0)
+		do
+		{
+			// TODO: cache this mask instead of m_unused_bits ?
+			int unusedMask = (1 << m_unused_bits)-1;
+
+			if (bits_needed == m_unused_bits)
 		{
-			if (m_unused_bits) {
-				if (bits_needed >= m_unused_bits) {
 					// Consume all the unused bits.
-					value |= (m_current_byte << (bits_needed - m_unused_bits));
+				value |= (m_current_byte&unusedMask);
+				m_unused_bits = 0;
+				break;
 
-					bits_needed -= m_unused_bits;
+			}
+			else if (bits_needed > m_unused_bits)
+			{
+				// Consume all the unused bits.
 
-					m_current_byte = 0;
-					m_unused_bits = 0;
+				bits_needed -= m_unused_bits; // assert(bits_needed>0)
 
-				} else {
-					// Consume some of the unused bits.
-					value |= (m_current_byte >> (m_unused_bits - bits_needed));
+				value |= ((m_current_byte&unusedMask) << bits_needed);
 
-					// mask off the bits we consumed.
-					m_current_byte &= ((1 << (m_unused_bits - bits_needed)) - 1);
+				m_current_byte = m_input->read_byte();
+				m_unused_bits = 8;
+
+			}
+			else
+			{
+				// Consume some of the unused bits.
 
 					m_unused_bits -= bits_needed;
 
+				value |= ((m_current_byte&unusedMask) >> m_unused_bits);
+
 					// We're done.
-					bits_needed = 0;
+				break;
 				}
-			} else {
-				m_current_byte = m_input->read_byte();
-				m_unused_bits = 8;
 			}
-		}
-
-		assert(bits_needed == 0);
+		while (bits_needed > 0);
 
 		return value;
 	}

Index: server/stream.h
===================================================================
RCS file: /sources/gnash/gnash/server/stream.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- server/stream.h	26 Aug 2007 15:14:12 -0000	1.25
+++ server/stream.h	27 Aug 2007 12:09:05 -0000	1.26
@@ -46,6 +46,11 @@
 		unsigned read_uint(unsigned short bitcount);
 
 		/// \brief
+		/// Reads a single bit off the stream
+		/// and returns it.  
+		bool read_bit();
+
+		/// \brief
 		/// Reads a bit-packed little-endian signed integer
 		/// from the stream.  The given bitcount determines the
 		/// number of bits to read.

Index: server/parser/shape_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/shape_character_def.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- server/parser/shape_character_def.cpp	23 Aug 2007 15:10:51 -0000	1.33
+++ server/parser/shape_character_def.cpp	27 Aug 2007 12:09:05 -0000	1.34
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: shape_character_def.cpp,v 1.33 2007/08/23 15:10:51 strk Exp $ */
+/* $Id: shape_character_def.cpp,v 1.34 2007/08/27 12:09:05 strk Exp $ */
 
 // Based on the public domain shape.cpp of Thatcher Ulrich <tu@tulrich.com> 2003
 
@@ -226,8 +226,8 @@
 
     // SHAPERECORDS
     for (;;) {
-	int	type_flag = in->read_uint(1);
-	if (type_flag == 0) {
+	bool isEdgeRecord = in->read_bit();
+	if (!isEdgeRecord) {
 	    // Parse the record.
 	    int	flags = in->read_uint(5);
 	    if (flags == flagEnd) {
@@ -430,7 +430,7 @@
 	    }
 	} else {
 	    // EDGERECORD
-	    int	edge_flag = in->read_uint(1);
+	    bool edge_flag = in->read_bit();
 	    if (edge_flag == 0) {
 		// curved edge
 		int num_bits = 2 + in->read_uint(4);
@@ -453,14 +453,14 @@
 	    } else {
 		// straight edge
 		int	num_bits = 2 + in->read_uint(4);
-		int	line_flag = in->read_uint(1);
+		bool line_flag = in->read_bit();
 		float	dx = 0, dy = 0;
 		if (line_flag) {
 		    // General line.
 		    dx = (float) in->read_sint(num_bits);
 		    dy = (float) in->read_sint(num_bits);
 		} else {
-		    int	vert_flag = in->read_uint(1);
+		    bool vert_flag = in->read_bit();
 		    if (vert_flag == 0) {
 			// Horizontal line.
 			dx = (float) in->read_sint(num_bits);

Index: testsuite/server/StreamTest.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/server/StreamTest.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/server/StreamTest.cpp	27 Aug 2007 08:28:42 -0000	1.2
+++ testsuite/server/StreamTest.cpp	27 Aug 2007 12:09:05 -0000	1.3
@@ -57,6 +57,11 @@
 		b(by)
 	{}
 
+	void setByte(unsigned char by)
+	{
+		b=by;
+	}
+
 	static int readFunc(void* dst, int bytes, void* appdata) 
 	{
 	    assert(bytes == 1);
@@ -97,10 +102,6 @@
 	ret = s.read_uint(1); check_equals(ret, 0);
 	ret = s.read_uint(1); check_equals(ret, 1);
 	ret = s.read_uint(1); check_equals(ret, 0);
-
-	/// bits: 10101010 (0xAA)
-
-	s.align();
 	ret = s.read_uint(1); check_equals(ret, 1);
 	ret = s.read_uint(1); check_equals(ret, 0);
 	ret = s.read_uint(1); check_equals(ret, 1);
@@ -213,6 +214,39 @@
 	s.align();
 	ret = s.read_uint(24); check_equals(ret, 11184810);
 
+	/// bits: 1010101010101010 (0xAAAA)
+
+	s.align();
+	ret = s.read_bit(); check_equals(ret, 1);
+	ret = s.read_bit(); check_equals(ret, 0);
+	ret = s.read_bit(); check_equals(ret, 1);
+	ret = s.read_bit(); check_equals(ret, 0);
+	ret = s.read_bit(); check_equals(ret, 1);
+	ret = s.read_bit(); check_equals(ret, 0);
+	ret = s.read_bit(); check_equals(ret, 1);
+	ret = s.read_bit(); check_equals(ret, 0);
+	ret = s.read_bit(); check_equals(ret, 1);
+	ret = s.read_bit(); check_equals(ret, 0);
+	ret = s.read_bit(); check_equals(ret, 1);
+	ret = s.read_bit(); check_equals(ret, 0);
+	ret = s.read_bit(); check_equals(ret, 1);
+	ret = s.read_bit(); check_equals(ret, 0);
+	ret = s.read_bit(); check_equals(ret, 1);
+	ret = s.read_bit(); check_equals(ret, 0);
+
+	/// bits: 10011001 (0x99)
+
+	br.setByte(0x99);
+	s.align();
+	ret = s.read_bit(); check_equals(ret, 1);
+	ret = s.read_bit(); check_equals(ret, 0);
+	ret = s.read_bit(); check_equals(ret, 0);
+	ret = s.read_bit(); check_equals(ret, 1);
+	ret = s.read_bit(); check_equals(ret, 1);
+	ret = s.read_bit(); check_equals(ret, 0);
+	ret = s.read_bit(); check_equals(ret, 0);
+	ret = s.read_bit(); check_equals(ret, 1);
+
 	return 0;
 }
 



From MAILER-DAEMON Mon Aug 27 08:44:36 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPdxM-00026e-D2
	for mharc-gnash-commit@gnu.org; Mon, 27 Aug 2007 08:44:36 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPdxK-00026X-2o
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 08:44:34 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPdxI-00026L-2h
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 08:44:32 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPdxH-00026G-T2
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 08:44:31 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IPdxH-0007Vq-Cm
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 08:44:31 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IPdxG-0004mb-8x
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 12:44:30 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IPdxF-0004mV-Vy
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 12:44:30 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPdxF-0004mV-Vy@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 27 Aug 2007 12:44:29 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/cxform.cpp server/font.c...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 12:44:34 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/27 12:44:29

Modified files:
	.              : ChangeLog 
	server         : cxform.cpp font.cpp matrix.cpp stream.cpp 
	server/parser  : button_character_def.cpp 
	                 edit_text_character_def.cpp filter_factory.cpp 
	                 sound_definition.cpp video_stream_def.cpp 
	server/swf     : PlaceObject2Tag.cpp tag_loaders.cpp 
	utilities      : parser.cpp 

Log message:
	        * server/cxform.cpp, server/font.cpp, server/matrix.cpp,                                                                                                         server/stream.h, server/parser/button_character_def.cpp,                                                                                                       server/parser/edit_text_character_def.cpp,
	          server/parser/filter_factory.cpp,
	          server/parser/sound_definition.cpp,
	          server/parser/video_stream_def.cpp,
	          server/swf/PlaceObject2Tag.cpp, server/swf/tag_loaders.cpp,
	          utilities/parser.cpp: read_uint(1) => read_bit();
	        * server/stream.cpp (read_uint): htf_sweet.swf aborts if we
	          assert bit_count <= 24, so change this base to <= 32 (will
	          inspect later).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4115&r2=1.4116
http://cvs.savannah.gnu.org/viewcvs/gnash/server/cxform.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/font.cpp?cvsroot=gnash&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/gnash/server/matrix.cpp?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/server/stream.cpp?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/button_character_def.cpp?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/edit_text_character_def.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/filter_factory.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/sound_definition.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/video_stream_def.cpp?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/PlaceObject2Tag.cpp?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.131&r2=1.132
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/parser.cpp?cvsroot=gnash&r1=1.41&r2=1.42

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4115
retrieving revision 1.4116
diff -u -b -r1.4115 -r1.4116
--- ChangeLog	27 Aug 2007 12:09:04 -0000	1.4115
+++ ChangeLog	27 Aug 2007 12:44:27 -0000	1.4116
@@ -1,5 +1,19 @@
 2007-08-27 Sandro Santilli <strk@keybit.net>
 
+	* server/cxform.cpp, server/font.cpp, server/matrix.cpp,
+	  server/stream.h, server/parser/button_character_def.cpp,
+	  server/parser/edit_text_character_def.cpp,
+	  server/parser/filter_factory.cpp,
+	  server/parser/sound_definition.cpp,
+	  server/parser/video_stream_def.cpp,
+	  server/swf/PlaceObject2Tag.cpp, server/swf/tag_loaders.cpp,
+	  utilities/parser.cpp: read_uint(1) => read_bit();
+	* server/stream.cpp (read_uint): htf_sweet.swf aborts if we
+	  assert bit_count <= 24, so change this base to <= 32 (will
+	  inspect later).
+
+2007-08-27 Sandro Santilli <strk@keybit.net>
+
 	* server/stream.{cpp,h}: add read_bit(), optimize read_uint()
 	  a little-bit (there are likely more optimization options).
 	* server/parser/shape_character_def.cpp (read): use read_bit()

Index: server/cxform.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/cxform.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/cxform.cpp	1 Jul 2007 10:54:21 -0000	1.4
+++ server/cxform.cpp	27 Aug 2007 12:44:28 -0000	1.5
@@ -16,7 +16,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // 
-// $Id: cxform.cpp,v 1.4 2007/07/01 10:54:21 bjacques Exp $ 
+// $Id: cxform.cpp,v 1.5 2007/08/27 12:44:28 strk Exp $ 
 //
 
 #ifdef HAVE_CONFIG_H
@@ -87,8 +87,8 @@
 {
 	in->align();
 
-	int	has_add = in->read_uint(1);
-	int	has_mult = in->read_uint(1);
+	bool	has_add = in->read_bit();
+	bool	has_mult = in->read_bit();
 	int	nbits = in->read_uint(4);
 
 	if (has_mult) {
@@ -115,8 +115,8 @@
 {
 	in->align();
 
-	int	has_add = in->read_uint(1);
-	int	has_mult = in->read_uint(1);
+	bool	has_add = in->read_bit();
+	bool	has_mult = in->read_bit();
 	int	nbits = in->read_uint(4);
 
 	if (has_mult) {

Index: server/font.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/font.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- server/font.cpp	22 Aug 2007 13:09:10 -0000	1.46
+++ server/font.cpp	27 Aug 2007 12:44:28 -0000	1.47
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: font.cpp,v 1.46 2007/08/22 13:09:10 cmusick Exp $ */
+/* $Id: font.cpp,v 1.47 2007/08/27 12:44:28 strk Exp $ */
 
 // Based on the public domain work of Thatcher Ulrich <tu@tulrich.com> 2003
 
@@ -255,14 +255,14 @@
 		log_parse(_("reading DefineFont2 or DefineFont3"));
 		);
 
-		bool	has_layout = (in->read_uint(1) != 0);
-		m_shift_jis_chars = (in->read_uint(1) != 0);
-		m_unicode_chars = (in->read_uint(1) != 0);
-		m_ansi_chars = (in->read_uint(1) != 0);
-		bool	wide_offsets = (in->read_uint(1) != 0);
-		m_wide_codes = (in->read_uint(1) != 0);
-		m_is_italic = (in->read_uint(1) != 0);
-		m_is_bold = (in->read_uint(1) != 0);
+		bool	has_layout = in->read_bit();
+		m_shift_jis_chars = in->read_bit();
+		m_unicode_chars = in->read_bit();
+		m_ansi_chars = in->read_bit();
+		bool	wide_offsets = in->read_bit();
+		m_wide_codes = in->read_bit();
+		m_is_italic = in->read_bit();
+		m_is_bold = in->read_bit();
 		uint8_t	reserved = in->read_u8();
 
 		IF_VERBOSE_PARSE (

Index: server/matrix.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/matrix.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- server/matrix.cpp	7 Aug 2007 20:53:10 -0000	1.17
+++ server/matrix.cpp	27 Aug 2007 12:44:28 -0000	1.18
@@ -19,7 +19,7 @@
 //
 // Original author: Thatcher Ulrich <tu@tulrich.com> 2003
 //
-// $Id: matrix.cpp,v 1.17 2007/08/07 20:53:10 strk Exp $ 
+// $Id: matrix.cpp,v 1.18 2007/08/27 12:44:28 strk Exp $ 
 //
 
 #ifdef HAVE_CONFIG_H
@@ -213,14 +213,14 @@
 
 	set_identity();
 
-	int	has_scale = in->read_uint(1);
+	bool	has_scale = in->read_bit(); 
 	if (has_scale)
 	{
 		int	scale_nbits = in->read_uint(5);
 		m_[0][0] = in->read_sint(scale_nbits) / 65536.0f;
 		m_[1][1] = in->read_sint(scale_nbits) / 65536.0f;
 	}
-	int	has_rotate = in->read_uint(1);
+	bool	has_rotate = in->read_bit();
 	if (has_rotate)
 	{
 		int	rotate_nbits = in->read_uint(5);

Index: server/stream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/stream.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/stream.cpp	27 Aug 2007 12:09:05 -0000	1.27
+++ server/stream.cpp	27 Aug 2007 12:44:28 -0000	1.28
@@ -70,7 +70,9 @@
 
 	unsigned stream::read_uint(unsigned short bitcount)
 	{
-		assert(bitcount <= 24);
+		//assert(bitcount <= 24);
+		// should be 24, check why htf_sweet.swf fails this assertion
+		assert(bitcount <= 32);
 
 		if (!m_unused_bits)
 		{

Index: server/parser/button_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/button_character_def.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- server/parser/button_character_def.cpp	10 Jul 2007 16:16:00 -0000	1.17
+++ server/parser/button_character_def.cpp	27 Aug 2007 12:44:28 -0000	1.18
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: button_character_def.cpp,v 1.17 2007/07/10 16:16:00 strk Exp $ */
+/* $Id: button_character_def.cpp,v 1.18 2007/08/27 12:44:28 strk Exp $ */
 
 // Based on the public domain work of Thatcher Ulrich <tu@tulrich.com> 2003
 
@@ -163,12 +163,12 @@
 {
 	m_in_point = m_out_point = m_loop_count = 0;
 	in->read_uint(2);	// skip reserved bits.
-	m_stop_playback = in->read_uint(1) ? true : false;
-	m_no_multiple = in->read_uint(1) ? true : false;
-	m_has_envelope = in->read_uint(1) ? true : false;
-	m_has_loops = in->read_uint(1) ? true : false;
-	m_has_out_point = in->read_uint(1) ? true : false;
-	m_has_in_point = in->read_uint(1) ? true : false;
+	m_stop_playback = in->read_bit(); 
+	m_no_multiple = in->read_bit(); 
+	m_has_envelope = in->read_bit();
+	m_has_loops = in->read_bit(); 
+	m_has_out_point = in->read_bit();
+	m_has_in_point = in->read_bit(); 
 	if (m_has_in_point) m_in_point = in->read_u32();
 	if (m_has_out_point) m_out_point = in->read_u32();
 	if (m_has_loops) m_loop_count = in->read_u16();

Index: server/parser/edit_text_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/edit_text_character_def.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/parser/edit_text_character_def.cpp	11 Jul 2007 16:52:47 -0000	1.12
+++ server/parser/edit_text_character_def.cpp	27 Aug 2007 12:44:28 -0000	1.13
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: edit_text_character_def.cpp,v 1.12 2007/07/11 16:52:47 strk Exp $ */
+/* $Id: edit_text_character_def.cpp,v 1.13 2007/08/27 12:44:28 strk Exp $ */
 
 // Based on the public domain text.cpp of Thatcher Ulrich <tu@tulrich.com> 2003
 
@@ -44,23 +44,23 @@
 	m_rect.read(in);
 
 	in->align();
-	bool	has_text = in->read_uint(1) ? true : false;
-	m_word_wrap = in->read_uint(1) ? true : false;
-	m_multiline = in->read_uint(1) ? true : false;
-	m_password = in->read_uint(1) ? true : false;
-	m_readonly = in->read_uint(1) ? true : false;
-	bool	has_color = in->read_uint(1) ? true : false;
-	bool	has_max_length = in->read_uint(1) ? true : false;
-	bool	has_font = in->read_uint(1) ? true : false;
-
-	in->read_uint(1);	// reserved
-	m_auto_size = in->read_uint(1) ? true : false;
-	bool	has_layout = in->read_uint(1) ? true : false;
-	m_no_select = in->read_uint(1) ? true : false;
-	m_border = in->read_uint(1) ? true : false;
-	in->read_uint(1);	// reserved
-	m_html = in->read_uint(1) ? true : false;
-	m_use_outlines = in->read_uint(1) ? true : false;
+	bool	has_text = in->read_bit();
+	m_word_wrap = in->read_bit();
+	m_multiline = in->read_bit();
+	m_password = in->read_bit();
+	m_readonly = in->read_bit(); 
+	bool	has_color = in->read_bit(); 
+	bool	has_max_length = in->read_bit(); 
+	bool	has_font = in->read_bit(); 
+
+	in->read_bit();	// reserved
+	m_auto_size = in->read_bit(); 
+	bool	has_layout = in->read_bit(); 
+	m_no_select = in->read_bit(); 
+	m_border = in->read_bit(); 
+	in->read_bit(); // reserved
+	m_html = in->read_bit(); 
+	m_use_outlines = in->read_bit(); 
 
 	if (has_font)
 	{

Index: server/parser/filter_factory.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/filter_factory.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/parser/filter_factory.cpp	27 Aug 2007 03:06:42 -0000	1.2
+++ server/parser/filter_factory.cpp	27 Aug 2007 12:44:28 -0000	1.3
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: filter_factory.cpp,v 1.2 2007/08/27 03:06:42 cmusick Exp $ */
+/* $Id: filter_factory.cpp,v 1.3 2007/08/27 12:44:28 strk Exp $ */
 
 #include "filter_factory.h"
 #include "BitmapFilter.h"
@@ -123,9 +123,9 @@
 
     m_strength = in->read_short_sfixed();
 
-    m_inner = in->read_uint(1) ? true : false;
-    m_knockout = in->read_uint(1) ? true : false;
-    m_hideObject = in->read_uint(1) ? true : false;
+    m_inner = in->read_bit(); 
+    m_knockout = in->read_bit(); 
+    m_hideObject = in->read_bit(); 
 
     static_cast<void> (in->read_uint(5)); // Throw these away on purpose.
 
@@ -154,8 +154,8 @@
 
     m_strength = in->read_short_sfixed();
 
-    m_inner = in->read_uint(1) ? true : false;
-    m_knockout = in->read_uint(1) ? true : false;
+    m_inner = in->read_bit(); 
+    m_knockout = in->read_bit(); 
 
     static_cast<void> (in->read_uint(6)); // Throw these away.
 
@@ -181,10 +181,10 @@
     
     m_strength = in->read_short_sfixed();
 
-    bool inner_shadow = in->read_uint(1) ? true : false;
-    m_knockout = in->read_uint(1) ? true : false;
-    static_cast<void> (in->read_uint(1));
-    bool on_top = in->read_uint(1) ? true : false;
+    bool inner_shadow = in->read_bit(); 
+    m_knockout = in->read_bit(); 
+    in->read_bit();  // reserved ?
+    bool on_top = in->read_bit(); 
 
     // Set the bevel type. top and inner is full, top is outer, inner is inner
     m_type = on_top ? (inner_shadow ? FULL_BEVEL : OUTER_BEVEL) : INNER_BEVEL;
@@ -217,10 +217,10 @@
 
     m_strength = in->read_short_sfixed();
 
-    bool inner = in->read_uint(1) ? true : false;
-    m_knockout = in->read_uint(1) ? true : false;
-    static_cast<void> (in->read_uint(1));
-    bool outer = in->read_uint(1) ? true : false;
+    bool inner = in->read_bit();
+    m_knockout = in->read_bit();
+    in->read_bit(); // reserved ?
+    bool outer = in->read_bit(); 
 
     m_type = outer ? (inner ? FULL_GLOW : OUTER_GLOW) : INNER_GLOW;
 
@@ -247,8 +247,8 @@
 
     static_cast<void> (in->read_uint(6)); // Throw away.
 
-    m_clamp = in->read_uint(1) ? true : false;
-    m_preserveAlpha = in->read_uint(1) ? true : false;
+    m_clamp = in->read_bit(); 
+    m_preserveAlpha = in->read_bit(); 
 
     return true;
 }
@@ -286,10 +286,10 @@
 
     m_strength = in->read_short_sfixed();
 
-    bool inner = in->read_uint(1) ? true : false;
-    m_knockout = in->read_uint(1) ? true : false;
-    static_cast<void> (in->read_uint(1));
-    bool outer = in->read_uint(1) ? true : false;
+    bool inner = in->read_bit();
+    m_knockout = in->read_bit();
+    in->read_bit(); // reserved ?
+    bool outer = in->read_bit();
 
     m_type = outer ? (inner ? FULL_BEVEL : OUTER_BEVEL) : INNER_BEVEL;
 

Index: server/parser/sound_definition.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/sound_definition.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/parser/sound_definition.cpp	24 May 2007 08:48:03 -0000	1.4
+++ server/parser/sound_definition.cpp	27 Aug 2007 12:44:28 -0000	1.5
@@ -37,12 +37,12 @@
 	assert(sam);
 
 	in->read_uint(2);	// skip reserved bits.
-	m_stop_playback = in->read_uint(1) ? true : false;
-	bool	no_multiple = in->read_uint(1) ? true : false;
-	bool	has_envelope = in->read_uint(1) ? true : false;
-	bool	has_loops = in->read_uint(1) ? true : false;
-	bool	has_out_point = in->read_uint(1) ? true : false;
-	bool	has_in_point = in->read_uint(1) ? true : false;
+	m_stop_playback = in->read_bit(); 
+	bool	no_multiple = in->read_bit(); 
+	bool	has_envelope = in->read_bit();
+	bool	has_loops = in->read_bit(); 
+	bool	has_out_point = in->read_bit(); 
+	bool	has_in_point = in->read_bit(); 
 
 	UNUSED(no_multiple);
 	UNUSED(has_envelope);

Index: server/parser/video_stream_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/video_stream_def.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/parser/video_stream_def.cpp	24 Jul 2007 22:48:12 -0000	1.11
+++ server/parser/video_stream_def.cpp	27 Aug 2007 12:44:29 -0000	1.12
@@ -16,7 +16,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // 
-// $Id: video_stream_def.cpp,v 1.11 2007/07/24 22:48:12 tgc Exp $
+// $Id: video_stream_def.cpp,v 1.12 2007/08/27 12:44:29 strk Exp $
 
 #include "video_stream_def.h"
 #include "video_stream_instance.h"
@@ -67,7 +67,7 @@
 
 		m_reserved_flags = in->read_uint(5);
 		m_deblocking_flags = in->read_uint(2);
-		m_smoothing_flags = in->read_uint(1) ? true : false;
+		m_smoothing_flags = in->read_bit(); 
 
 		m_codec_id = in->read_u8();
 

Index: server/swf/PlaceObject2Tag.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/PlaceObject2Tag.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/swf/PlaceObject2Tag.cpp	26 Aug 2007 15:14:13 -0000	1.20
+++ server/swf/PlaceObject2Tag.cpp	27 Aug 2007 12:44:29 -0000	1.21
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: PlaceObject2Tag.cpp,v 1.20 2007/08/26 15:14:13 cmusick Exp $ */
+/* $Id: PlaceObject2Tag.cpp,v 1.21 2007/08/27 12:44:29 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -221,21 +221,21 @@
         bool has_blend_mode = false;
         bool has_filters = false;
 
-	bool	has_actions = in->read_uint(1) ? true : false;
-	bool	has_clip_bracket = in->read_uint(1) ? true : false;
-	bool	has_name = in->read_uint(1) ? true : false;
-	bool	has_ratio = in->read_uint(1) ? true : false;
-	bool	has_cxform = in->read_uint(1) ? true : false;
-	bool	has_matrix = in->read_uint(1) ? true : false;
-	bool	has_char = in->read_uint(1) ? true : false;
-	bool	flag_move = in->read_uint(1) ? true : false;
+	bool	has_actions = in->read_bit(); 
+	bool	has_clip_bracket = in->read_bit(); 
+	bool	has_name = in->read_bit();
+	bool	has_ratio = in->read_bit();
+	bool	has_cxform = in->read_bit();
+	bool	has_matrix = in->read_bit(); 
+	bool	has_char = in->read_bit(); 
+	bool	flag_move = in->read_bit(); 
 
         if (!place_2 && movie_version >= 8)
         {
-            static_cast<void> (in->read_uint(5)); // Ignore on purpose.
-            has_bitmap_caching = in->read_uint(1) ? true : false;
-            has_blend_mode = in->read_uint(1) ? true : false;
-            has_filters = in->read_uint(1) ? true : false;
+            in->read_uint(5); // Ignore on purpose.
+            has_bitmap_caching = in->read_bit(); 
+            has_blend_mode = in->read_bit(); 
+            has_filters = in->read_bit(); 
         }
 
 	m_depth = in->read_u16()+character::staticDepthOffset;

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -b -r1.131 -r1.132
--- server/swf/tag_loaders.cpp	22 Aug 2007 13:09:10 -0000	1.131
+++ server/swf/tag_loaders.cpp	27 Aug 2007 12:44:29 -0000	1.132
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: tag_loaders.cpp,v 1.131 2007/08/22 13:09:10 cmusick Exp $ */
+/* $Id: tag_loaders.cpp,v 1.132 2007/08/27 12:44:29 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1390,8 +1390,8 @@
 	sound_handler::format_type	format = static_cast<sound_handler::format_type>(in->read_uint(4));
 	sound_handler::format_type	orgFormat = format;
 	int	sample_rate = in->read_uint(2);	// multiples of 5512.5
-	bool	sample_16bit = in->read_uint(1) ? true : false;
-	bool	stereo = in->read_uint(1) ? true : false;
+	bool	sample_16bit = in->read_bit(); 
+	bool	stereo = in->read_bit(); 
 
 	unsigned int	sample_count = in->read_u32();
 
@@ -1509,8 +1509,8 @@
     sound_handler::format_type format = static_cast<sound_handler::format_type>(in->read_uint(4));
 	sound_handler::format_type orgFormat = format;
     int sample_rate = in->read_uint(2);	// multiples of 5512.5
-    bool sample_16bit = in->read_uint(1) ? true : false;
-    bool stereo = in->read_uint(1) ? true : false;
+    bool sample_16bit = in->read_bit(); 
+    bool stereo = in->read_bit(); 
 
     // checks if this is a new streams header or just one in the row
     if (format == 0 && sample_rate == 0 && !sample_16bit && !stereo) return;
@@ -1786,9 +1786,9 @@
     file_attrs_flags flags;
 
     flags.reserved1 = in->read_uint(3);
-    flags.has_metadata = in->read_uint(1);
+    flags.has_metadata = in->read_bit(); 
     flags.reserved2 = in->read_uint(3);
-    flags.use_network = in->read_uint(1);
+    flags.use_network = in->read_bit(); 
     flags.reserved3 = in->read_uint(24);
 
     IF_VERBOSE_PARSE

Index: utilities/parser.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/parser.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- utilities/parser.cpp	1 Jul 2007 10:55:16 -0000	1.41
+++ utilities/parser.cpp	27 Aug 2007 12:44:29 -0000	1.42
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 
-/* $Id: parser.cpp,v 1.41 2007/07/01 10:55:16 bjacques Exp $ */
+/* $Id: parser.cpp,v 1.42 2007/08/27 12:44:29 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -116,13 +116,13 @@
 	    m_[0][0] = 1;
 	    m_[1][1] = 1;
       
-	    int	has_scale = in->read_uint(1);
+	    bool has_scale = in->read_bit();
 	    if (has_scale) {
 		int	scale_nbits = in->read_uint(5);
 		m_[0][0] = in->read_sint(scale_nbits) / 65536.0f;
 		m_[1][1] = in->read_sint(scale_nbits) / 65536.0f;
 	    }
-	    int	has_rotate = in->read_uint(1);
+	    bool has_rotate = in->read_bit();
 	    if (has_rotate) {
 		int	rotate_nbits = in->read_uint(5);
 		m_[1][0] = in->read_sint(rotate_nbits) / 65536.0f;
@@ -224,8 +224,8 @@
 	{
 	    in->align();
 	    
-	    int	has_add = in->read_uint(1);
-	    int	has_mult = in->read_uint(1);
+	    bool has_add = in->read_bit();
+	    bool has_mult = in->read_bit();
 	    int	nbits = in->read_uint(4);
 	    
 	    if (has_mult) {
@@ -251,8 +251,8 @@
 	{
 	    in->align();
 	    
-	    int	has_add = in->read_uint(1);
-	    int	has_mult = in->read_uint(1);
+	    bool has_add = in->read_bit();
+	    bool has_mult = in->read_bit();
 	    int	nbits = in->read_uint(4);
 	    
 	    if (has_mult) {
@@ -357,14 +357,14 @@
 	log_msg("place_object2:\n");
 	ident++;
 	
-	bool	has_actions = input->read_uint(1) ? true : false;
-	bool	has_clip_depth = input->read_uint(1) ? true : false;
-	bool	has_name = input->read_uint(1) ? true : false;
-	bool	has_ratio = input->read_uint(1) ? true : false;
-	bool	has_cxform = input->read_uint(1) ? true : false;
-	bool	has_matrix = input->read_uint(1) ? true : false;
-	bool	has_char = input->read_uint(1) ? true : false;
-	bool	flag_move = input->read_uint(1) ? true : false;
+	bool	has_actions = input->read_bit();
+	bool	has_clip_depth = input->read_bit();
+	bool	has_name = input->read_bit();
+	bool	has_ratio = input->read_bit();
+	bool	has_cxform = input->read_bit();
+	bool	has_matrix = input->read_bit();
+	bool	has_char = input->read_bit();
+	bool	flag_move = input->read_bit();
 	
 	UNUSED(has_actions);
 	



From MAILER-DAEMON Mon Aug 27 10:41:01 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPfm1-0008Jo-E2
	for mharc-gnash-commit@gnu.org; Mon, 27 Aug 2007 10:41:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPflz-0008Jh-G8
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 10:40:59 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPfly-0008JP-3S
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 10:40:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPflx-0008JL-Ua
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 10:40:57 -0400
Received: from moongulch.net ([69.15.127.230] helo=darkstar.welcomehome.org)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60)
	(envelope-from <rob@welcomehome.org>) id 1IPflx-0007qk-Hu
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 10:40:57 -0400
Received: from deal.welcomehome.org (linksys.welcomehome.org [10.0.1.2])
	by darkstar.welcomehome.org (8.13.8/8.13.8) with ESMTP id
	l7REetH6004562; Mon, 27 Aug 2007 08:40:55 -0600
Message-ID: <46D2E272.2050403@welcomehome.org>
Date: Mon, 27 Aug 2007 08:40:50 -0600
From: Rob Savoye <rob@welcomehome.org>
User-Agent: Thunderbird 2.0.0.5 (X11/20070719)
MIME-Version: 1.0
To: Markus Gothe <markus@unixrus.se>
Subject: Re: [Gnash-commit] gnash ChangeLog doc/gnash.1
References: <E1IPPAA-0003Qv-Sv@cvs.savannah.gnu.org>
In-Reply-To: <E1IPPAA-0003Qv-Sv@cvs.savannah.gnu.org>
X-Enigmail-Version: 0.95.2
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
X-Detected-Kernel: Linux 2.6 (newer, 3)
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 14:40:59 -0000

Markus Gothe wrote:
> CVSROOT:	/sources/gnash
> Module name:	gnash
> Changes by:	Markus Gothe <nihilus>	07/08/26 20:56:50
> 
> Modified files:
> 	.              : ChangeLog 
> 	doc            : gnash.1 
> 
> Log message:
> 	Deanna updated the man-page for us, thx.

  The man page is actually generated from gnash-man.xml, so we shouldn't
be editing the raw .1 nroff file.

	- rob -



From MAILER-DAEMON Mon Aug 27 11:18:35 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPgMM-0005gj-Uy
	for mharc-gnash-commit@gnu.org; Mon, 27 Aug 2007 11:18:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPgML-0005ff-76
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 11:18:33 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPgMJ-0005eZ-JI
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 11:18:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPgMJ-0005eS-AP
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 11:18:31 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IPgMJ-0007mC-1F
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 11:18:31 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IPgMG-000835-W3
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 15:18:29 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IPgMG-000832-K1
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 15:18:28 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPgMG-000832-K1@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 27 Aug 2007 15:18:28 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/server/StreamTest.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 15:18:33 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/27 15:18:28

Modified files:
	.              : ChangeLog 
	testsuite/server: StreamTest.cpp 

Log message:
	        * testsuite/server/StreamTest.cpp: more read_uint() tests.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4116&r2=1.4117
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/server/StreamTest.cpp?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4116
retrieving revision 1.4117
diff -u -b -r1.4116 -r1.4117
--- ChangeLog	27 Aug 2007 12:44:27 -0000	1.4116
+++ ChangeLog	27 Aug 2007 15:18:27 -0000	1.4117
@@ -1,5 +1,9 @@
 2007-08-27 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/server/StreamTest.cpp: more read_uint() tests.
+
+2007-08-27 Sandro Santilli <strk@keybit.net>
+
 	* server/cxform.cpp, server/font.cpp, server/matrix.cpp,
 	  server/stream.h, server/parser/button_character_def.cpp,
 	  server/parser/edit_text_character_def.cpp,

Index: testsuite/server/StreamTest.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/server/StreamTest.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- testsuite/server/StreamTest.cpp	27 Aug 2007 12:09:05 -0000	1.3
+++ testsuite/server/StreamTest.cpp	27 Aug 2007 15:18:28 -0000	1.4
@@ -64,10 +64,13 @@
 
 	static int readFunc(void* dst, int bytes, void* appdata) 
 	{
-	    assert(bytes == 1);
 	    ByteReader* br = (ByteReader*) appdata;
 	    
-	    memcpy(dst, &(br->b), sizeof(unsigned char));
+		unsigned char* ptr = static_cast<unsigned char*>(dst);
+		for (int i=0; i<bytes; ++i)
+		{
+			memcpy(ptr+i, &(br->b), sizeof(unsigned char));
+		}
 
 		return 1;
 	}
@@ -247,6 +250,45 @@
 	ret = s.read_bit(); check_equals(ret, 0);
 	ret = s.read_bit(); check_equals(ret, 1);
 
+	/// bits: 10011001 10011001 (0x999999)
+
+	int16_t s16 = s.read_s16(); check_equals(s16, (int16_t)0x9999);
+	uint16_t u16 = s.read_u16(); check_equals(u16, (uint16_t)0x9999);
+	int32_t s32 = s.read_s32(); check_equals(s32, (int32_t)0x99999999);
+	uint32_t u32 = s.read_u32(); check_equals(u32, (uint32_t)0x99999999);
+
+	/// bits: 10011001 10011001 10011001 10011001 (0x99999999)
+	///       -
+	///        ------- -------- --
+	///                           --------
+
+	s.align();
+	ret = s.read_bit(); check_equals(ret, 1);
+	u16 = s.read_uint(17); check_equals(u16, 26214);
+	u16 = s.read_uint(7); check_equals(u16, 51);
+
+	/// bits: 10011001 10011001 10011001 10011001 (0x99999999)
+	///       -
+	///        ------- --------   
+	///                         ----------
+
+	s.align();
+	ret = s.read_bit(); check_equals(ret, 1);
+	u16 = s.read_uint(15); check_equals(u16, 6553);
+	u16 = s.read_uint(9); check_equals(u16, 307);
+
+	/// bits: 10011001 10011001 10011001 10011001 (0x99999999)
+	///       -
+	///        ------- -------- ---       
+	///                            ----- -----
+	///                                       ---
+
+	s.align();
+	ret = s.read_bit(); check_equals(ret, 1);
+	u32 = s.read_uint(18); check_equals(u32, 52428);
+	u16 = s.read_uint(10); check_equals(u16, 819);
+	u16 = s.read_uint(3); check_equals(u16, 1);
+
 	return 0;
 }
 



From MAILER-DAEMON Mon Aug 27 11:56:36 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPgxA-0000Kf-IM
	for mharc-gnash-commit@gnu.org; Mon, 27 Aug 2007 11:56:36 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPgx9-0000KE-N0
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 11:56:35 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPgx8-0000Jb-F2
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 11:56:34 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPgx8-0000JX-9p
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 11:56:34 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IPgx7-0007Pd-U2
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 11:56:34 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IPgx6-00027Y-RV
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 15:56:32 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IPgx6-00027V-MV
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 15:56:32 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPgx6-00027V-MV@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 27 Aug 2007 15:56:32 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/stream.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 15:56:36 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/27 15:56:32

Modified files:
	.              : ChangeLog 
	server         : stream.cpp 

Log message:
	        * server/stream.cpp (read_uint): optimize multi-byte reads:
	          less read_byte(), more read_bytes().

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4117&r2=1.4118
http://cvs.savannah.gnu.org/viewcvs/gnash/server/stream.cpp?cvsroot=gnash&r1=1.28&r2=1.29

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4117
retrieving revision 1.4118
diff -u -b -r1.4117 -r1.4118
--- ChangeLog	27 Aug 2007 15:18:27 -0000	1.4117
+++ ChangeLog	27 Aug 2007 15:56:31 -0000	1.4118
@@ -1,5 +1,7 @@
 2007-08-27 Sandro Santilli <strk@keybit.net>
 
+	* server/stream.cpp (read_uint): optimize multi-byte reads:
+	  less read_byte(), more read_bytes().
 	* testsuite/server/StreamTest.cpp: more read_uint() tests.
 
 2007-08-27 Sandro Santilli <strk@keybit.net>

Index: server/stream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/stream.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- server/stream.cpp	27 Aug 2007 12:44:28 -0000	1.28
+++ server/stream.cpp	27 Aug 2007 15:56:32 -0000	1.29
@@ -14,6 +14,7 @@
 #include "tu_file.h"
 #include "swf.h"
 #include <cstring>
+//#include <iostream> // debugging only
 
 namespace gnash {
 	
@@ -74,18 +75,85 @@
 		// should be 24, check why htf_sweet.swf fails this assertion
 		assert(bitcount <= 32);
 
+		uint32_t value = 0;
+
+#define OPTIMIZE_FOR_MULTIBYTE_BITS_READ 1
+
+#ifdef OPTIMIZE_FOR_MULTIBYTE_BITS_READ
+		// Optimization for multibyte read
+		if ( bitcount > m_unused_bits )
+		{
+			typedef unsigned char byte;
+
+			if (m_unused_bits) // Consume all the unused bits.
+			{
+				int unusedMask = (1 << m_unused_bits)-1;
+				bitcount -= m_unused_bits; 
+				value |= ((m_current_byte&unusedMask) << bitcount);
+			}
+
+			int bytesToRead = bitcount/8;
+			int spareBits = bitcount%8; // additional bits to read
+
+			//std::cerr << "BytesToRead: " << bytesToRead << " spareBits: " << spareBits << " unusedBits: " << (int)m_unused_bits << std::endl;
+
+			byte cache[4]; // at most 4 bytes in the cache
+
+			if ( spareBits ) m_input->read_bytes(&cache, bytesToRead+1);
+			else m_input->read_bytes(&cache, bytesToRead);
+
+			for (int i=0; i<bytesToRead; ++i)
+			{
+				bitcount -= 8;
+				value |= cache[i] << bitcount; 
+			}
+
+			//assert(bitcount == spareBits);
+			if ( bitcount )
+			{
+				m_current_byte = cache[bytesToRead];
+				m_unused_bits = 8-bitcount;
+				value |= m_current_byte >> m_unused_bits;
+			}
+			else
+			{
+				m_unused_bits = 0;
+			}
+			
+		}
+		else
+		{
 		if (!m_unused_bits)
 		{
 			m_current_byte = m_input->read_byte();
 			m_unused_bits = 8;
 		}
 
-		uint32_t value = 0;
+			// TODO: optimize unusedMask creation ?
+			//       (it's 0xFF if ! m_unused_bits above)
+			int unusedMask = (1 << m_unused_bits)-1;
+
+			if (bitcount == m_unused_bits)
+			{
+				// Consume all the unused bits.
+				value |= (m_current_byte&unusedMask);
+				m_unused_bits = 0;
+			}
+			else
+			{
+				assert(bitcount < m_unused_bits);
+				// Consume some of the unused bits.
+
+				m_unused_bits -= bitcount;
+				value |= ((m_current_byte&unusedMask) >> m_unused_bits);
+			}
+		}
+
+#else // ndef OPTIMIZE_FOR_MULTIBYTE_BITS_READ
 
 		unsigned short bits_needed = bitcount;
 		do
 		{
-			// TODO: cache this mask instead of m_unused_bits ?
 			int unusedMask = (1 << m_unused_bits)-1;
 
 			if (bits_needed == m_unused_bits)
@@ -96,7 +164,7 @@
 				break;
 
 			}
-			else if (bits_needed > m_unused_bits)
+			else if (bits_needed > m_unused_bits) // TODO: obsolete this !!
 			{
 				// Consume all the unused bits.
 
@@ -110,6 +178,7 @@
 			}
 			else
 			{
+				assert(bits_needed <= m_unused_bits);
 				// Consume some of the unused bits.
 
 				m_unused_bits -= bits_needed;
@@ -121,7 +190,9 @@
 			}
 		}
 		while (bits_needed > 0);
+#endif // ndef OPTIMIZE_FOR_MULTIBYTE_BITS_READ
 
+		//std::cerr << "Returning value: " << value << " unused bits: " << (int)m_unused_bits << std::endl;
 		return value;
 	}
 



From MAILER-DAEMON Mon Aug 27 12:19:35 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPhJP-0000eG-Ro
	for mharc-gnash-commit@gnu.org; Mon, 27 Aug 2007 12:19:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPhJO-0000dD-Pb
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 12:19:34 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPhJN-0000av-Ay
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 12:19:34 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPhJN-0000aT-4w
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 12:19:33 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IPhJM-0004MY-Q4
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 12:19:32 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IPhJL-0003y0-J5
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 16:19:31 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IPhJL-0003xx-Bg
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 16:19:31 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPhJL-0003xx-Bg@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 27 Aug 2007 16:19:31 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/stream.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 16:19:35 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/27 16:19:31

Modified files:
	.              : ChangeLog 
	server         : stream.cpp 

Log message:
	        * server/stream.cpp (read_sint): remove useless assertion.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4118&r2=1.4119
http://cvs.savannah.gnu.org/viewcvs/gnash/server/stream.cpp?cvsroot=gnash&r1=1.29&r2=1.30

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4118
retrieving revision 1.4119
diff -u -b -r1.4118 -r1.4119
--- ChangeLog	27 Aug 2007 15:56:31 -0000	1.4118
+++ ChangeLog	27 Aug 2007 16:19:30 -0000	1.4119
@@ -1,5 +1,9 @@
 2007-08-27 Sandro Santilli <strk@keybit.net>
 
+	* server/stream.cpp (read_sint): remove useless assertion.
+
+2007-08-27 Sandro Santilli <strk@keybit.net>
+
 	* server/stream.cpp (read_uint): optimize multi-byte reads:
 	  less read_byte(), more read_bytes().
 	* testsuite/server/StreamTest.cpp: more read_uint() tests.

Index: server/stream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/stream.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- server/stream.cpp	27 Aug 2007 15:56:32 -0000	1.29
+++ server/stream.cpp	27 Aug 2007 16:19:31 -0000	1.30
@@ -199,7 +199,7 @@
 
 	int	stream::read_sint(unsigned short bitcount)
 	{
-		assert(bitcount <= 32);
+		//assert(bitcount <= 32); // already asserted in read_uint
 
 		int32_t	value = int32_t(read_uint(bitcount));
 



From MAILER-DAEMON Mon Aug 27 12:28:19 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPhRr-0005Dp-1A
	for mharc-gnash-commit@gnu.org; Mon, 27 Aug 2007 12:28:19 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPhRp-0005Cx-6Q
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 12:28:17 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPhRn-0005Bz-Kx
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 12:28:16 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPhRn-0005Bu-HX
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 12:28:15 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1IPhRn-0006K4-AR
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 12:28:15 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <markus@unixrus.se>) id 1IPhRm-0004AK-Ax
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 16:28:14 +0000
Received: from nihilus by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <nihilus@savannah.gnu.org>) id 1IPhRm-0004AH-60
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 16:28:14 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPhRm-0004AH-60@cvs.savannah.gnu.org>
From: Markus Gothe <markus@unixrus.se>
Date: Mon, 27 Aug 2007 16:28:14 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/libbase utility.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 16:28:17 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Markus Gothe <nihilus>	07/08/27 16:28:14

Modified files:
	libbase        : utility.h 

Log message:
	Fixed typo...

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/utility.h?cvsroot=gnash&r1=1.26&r2=1.27

Patches:
Index: utility.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/utility.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- utility.h	27 Aug 2007 11:58:47 -0000	1.26
+++ utility.h	27 Aug 2007 16:28:13 -0000	1.27
@@ -115,7 +115,7 @@
 // the overridden log(f) will use logf IFF f is a float
 inline float	log2(float f) { return std::log(f) / LN_2; }
 //exp2 might be missing on Net-/OpenBSD.
-inline float	exp2(double d, double x) { return std::pow((double)d, double(x)); }
+inline float	exp2(double x) { return std::pow((double)2, double(x)); }
 inline int	fchop( float f ) { return (int) f; }	// replace w/ inline asm if desired
 inline int	frnd(float f) { return fchop(f + 0.5f); }	// replace with inline asm if desired
 



From MAILER-DAEMON Mon Aug 27 12:29:27 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPhSx-0006Dm-8V
	for mharc-gnash-commit@gnu.org; Mon, 27 Aug 2007 12:29:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPhSv-0006C2-Ck
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 12:29:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPhSu-0006Be-TI
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 12:29:25 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPhSu-0006Bb-Qm
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 12:29:24 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1IPhSu-0006Wv-ID
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 12:29:24 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <markus@unixrus.se>) id 1IPhSu-0004B2-6N
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 16:29:24 +0000
Received: from nihilus by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <nihilus@savannah.gnu.org>) id 1IPhSt-0004Az-VH
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 16:29:24 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPhSt-0004Az-VH@cvs.savannah.gnu.org>
From: Markus Gothe <markus@unixrus.se>
Date: Mon, 27 Aug 2007 16:29:23 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/libbase utility.h [release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 16:29:25 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Markus Gothe <nihilus>	07/08/27 16:29:23

Modified files:
	libbase        : utility.h 

Log message:
	Typo fix

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/utility.h?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.25.2.1&r2=1.25.2.2

Patches:
Index: utility.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/utility.h,v
retrieving revision 1.25.2.1
retrieving revision 1.25.2.2
diff -u -b -r1.25.2.1 -r1.25.2.2
--- utility.h	27 Aug 2007 12:03:14 -0000	1.25.2.1
+++ utility.h	27 Aug 2007 16:29:23 -0000	1.25.2.2
@@ -115,7 +115,7 @@
 // the overridden log(f) will use logf IFF f is a float
 inline float	log2(float f) { return std::log(f) / LN_2; }
 //exp2 might be missing on Net-/OpenBSD.
-inline float    exp2(double d, double x) { return std::pow((double)d, double(x)); }
+inline float    exp2(double x) { return std::pow((double)2, double(x)); }
 inline int	fchop( float f ) { return (int) f; }	// replace w/ inline asm if desired
 inline int	frnd(float f) { return fchop(f + 0.5f); }	// replace with inline asm if desired
 



From MAILER-DAEMON Mon Aug 27 12:52:33 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPhpJ-0005z7-QZ
	for mharc-gnash-commit@gnu.org; Mon, 27 Aug 2007 12:52:33 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPhpH-0005yw-V0
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 12:52:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPhpG-0005ya-DX
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 12:52:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPhpG-0005yS-7W
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 12:52:30 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IPhpF-0003FK-SQ
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 12:52:29 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IPhpE-0005xm-TJ
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 16:52:28 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IPhpE-0005xj-M7
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 16:52:28 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPhpE-0005xj-M7@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 27 Aug 2007 16:52:28 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/parser/shape_character_d...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 16:52:32 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/27 16:52:28

Modified files:
	.              : ChangeLog 
	server/parser  : shape_character_def.cpp 

Log message:
	        * server/parser/shape_character_def.cpp (read): use ints for twips
	          values, convert to float only when needed (construction of the
	          edges and paths).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4119&r2=1.4120
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/shape_character_def.cpp?cvsroot=gnash&r1=1.34&r2=1.35

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4119
retrieving revision 1.4120
diff -u -b -r1.4119 -r1.4120
--- ChangeLog	27 Aug 2007 16:19:30 -0000	1.4119
+++ ChangeLog	27 Aug 2007 16:52:28 -0000	1.4120
@@ -1,5 +1,11 @@
 2007-08-27 Sandro Santilli <strk@keybit.net>
 
+	* server/parser/shape_character_def.cpp (read): use ints for twips
+	  values, convert to float only when needed (construction of the
+	  edges and paths).
+
+2007-08-27 Sandro Santilli <strk@keybit.net>
+
 	* server/stream.cpp (read_sint): remove useless assertion.
 
 2007-08-27 Sandro Santilli <strk@keybit.net>

Index: server/parser/shape_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/shape_character_def.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- server/parser/shape_character_def.cpp	27 Aug 2007 12:09:05 -0000	1.34
+++ server/parser/shape_character_def.cpp	27 Aug 2007 16:52:28 -0000	1.35
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: shape_character_def.cpp,v 1.34 2007/08/27 12:09:05 strk Exp $ */
+/* $Id: shape_character_def.cpp,v 1.35 2007/08/27 16:52:28 strk Exp $ */
 
 // Based on the public domain shape.cpp of Thatcher Ulrich <tu@tulrich.com> 2003
 
@@ -453,14 +453,14 @@
 	    } else {
 		// straight edge
 		int	num_bits = 2 + in->read_uint(4);
-		bool line_flag = in->read_bit();
+		int	line_flag = in->read_uint(1);
 		float	dx = 0, dy = 0;
 		if (line_flag) {
 		    // General line.
 		    dx = (float) in->read_sint(num_bits);
 		    dy = (float) in->read_sint(num_bits);
 		} else {
-		    bool vert_flag = in->read_bit();
+		    int	vert_flag = in->read_uint(1);
 		    if (vert_flag == 0) {
 			// Horizontal line.
 			dx = (float) in->read_sint(num_bits);



From MAILER-DAEMON Mon Aug 27 13:09:54 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPi66-0002CF-6R
	for mharc-gnash-commit@gnu.org; Mon, 27 Aug 2007 13:09:54 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPi64-0002CA-Hx
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 13:09:52 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPi61-0002By-8I
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 13:09:51 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPi61-0002Bv-2L
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 13:09:49 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1IPi5z-0006qc-Ul
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 13:09:48 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l7RH9Z573447;
	Mon, 27 Aug 2007 19:09:35 +0200 (CEST)
	(envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Mon, 27 Aug 2007 19:09:35 +0200
To: Markus Gothe <markus@unixrus.se>
Subject: Re: [Gnash-commit] gnash/libbase utility.h
Message-ID: <20070827170935.GA73383@keybit.net>
Mail-Followup-To: Markus Gothe <markus@unixrus.se>, gnash-commit@gnu.org
References: <E1IPhRm-0004AH-60@cvs.savannah.gnu.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1IPhRm-0004AH-60@cvs.savannah.gnu.org>
X-Detected-Kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 17:09:52 -0000

On Mon, Aug 27, 2007 at 04:28:14PM +0000, Markus Gothe wrote:
> CVSROOT:	/sources/gnash
> Module name:	gnash
> Changes by:	Markus Gothe <nihilus>	07/08/27 16:28:14
> 
> Modified files:
> 	libbase        : utility.h 
> 
> Log message:
> 	Fixed typo...
> 
> CVSWeb URLs:
> http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/utility.h?cvsroot=gnash&r1=1.26&r2=1.27
> 
> Patches:
> Index: utility.h
> ===================================================================
> RCS file: /sources/gnash/gnash/libbase/utility.h,v
> retrieving revision 1.26
> retrieving revision 1.27
> diff -u -b -r1.26 -r1.27
> --- utility.h	27 Aug 2007 11:58:47 -0000	1.26
> +++ utility.h	27 Aug 2007 16:28:13 -0000	1.27
> @@ -115,7 +115,7 @@
>  // the overridden log(f) will use logf IFF f is a float
>  inline float	log2(float f) { return std::log(f) / LN_2; }
>  //exp2 might be missing on Net-/OpenBSD.
> -inline float	exp2(double d, double x) { return std::pow((double)d, double(x)); }
> +inline float	exp2(double x) { return std::pow((double)2, double(x)); }

I was wondering why I wasn't getting this before ...

/home/strk/src/gnash/gnash-head/libbase/utility.h:118: error: new declaration 'float exp2(double)'
/usr/include/bits/mathcalls.h:142: error: ambiguates old declaration 'double exp2(double)'

Please use a macro to detect availability of that function .
Note: this is a BLOCKER for 0.8.1 (you committed there too, right?)

--strk;




From MAILER-DAEMON Mon Aug 27 13:28:07 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPiNj-0006jW-Bh
	for mharc-gnash-commit@gnu.org; Mon, 27 Aug 2007 13:28:07 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPiNh-0006i4-Oh
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 13:28:05 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPiNg-0006hH-Sp
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 13:28:05 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPiNg-0006h6-Mn
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 13:28:04 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IPiNg-0002I6-Cw
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 13:28:04 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IPiNf-00087A-Be
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 17:28:03 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IPiNf-000877-5C
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 17:28:03 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPiNf-000877-5C@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 27 Aug 2007 17:28:03 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/parser/shape_character_d...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 17:28:06 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/27 17:28:03

Modified files:
	.              : ChangeLog 
	server/parser  : shape_character_def.cpp 

Log message:
	        * server/parser/shape_character_def.cpp (read): make effective
	          use of the SHAPE_LOG compile-time macro, by removing any overhead
	          associated with it, when set to something != 0.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4120&r2=1.4121
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/shape_character_def.cpp?cvsroot=gnash&r1=1.35&r2=1.36

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4120
retrieving revision 1.4121
diff -u -b -r1.4120 -r1.4121
--- ChangeLog	27 Aug 2007 16:52:28 -0000	1.4120
+++ ChangeLog	27 Aug 2007 17:28:02 -0000	1.4121
@@ -1,5 +1,11 @@
 2007-08-27 Sandro Santilli <strk@keybit.net>
 
+	* server/parser/shape_character_def.cpp (read): make effective
+	  use of the SHAPE_LOG compile-time macro, by removing any overhead
+	  associated with it, when set to something != 0.
+
+2007-08-27 Sandro Santilli <strk@keybit.net>
+
 	* server/parser/shape_character_def.cpp (read): use ints for twips
 	  values, convert to float only when needed (construction of the
 	  edges and paths).

Index: server/parser/shape_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/shape_character_def.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- server/parser/shape_character_def.cpp	27 Aug 2007 16:52:28 -0000	1.35
+++ server/parser/shape_character_def.cpp	27 Aug 2007 17:28:02 -0000	1.36
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: shape_character_def.cpp,v 1.35 2007/08/27 16:52:28 strk Exp $ */
+/* $Id: shape_character_def.cpp,v 1.36 2007/08/27 17:28:02 strk Exp $ */
 
 // Based on the public domain shape.cpp of Thatcher Ulrich <tu@tulrich.com> 2003
 
@@ -262,11 +262,12 @@
 		current_path.m_ax = x;
 		current_path.m_ay = y;
 
+#if SHAPE_LOG
 		IF_VERBOSE_PARSE
 		(
-		if (SHAPE_LOG)
 		    log_parse(_("  shape_character read: moveto %4g %4g"), x, y);
 		);
+#endif
 	    }
 	    if ((flags & flagFillStyle0Change) && num_fill_bits > 0)
 	    {
@@ -304,11 +305,11 @@
 		}
 
 		current_path.setLeftFill(style);
+#if SHAPE_LOG
 		IF_VERBOSE_PARSE(
-		if (SHAPE_LOG) {
 		    log_parse(_("  shape_character read: fill0 (left) = %d"), current_path.getLeftFill());
-		}
 		);
+#endif
 
 	    }
 	    if ((flags & flagFillStyle1Change) && num_fill_bits > 0)
@@ -346,11 +347,11 @@
 			}
 		}
 		current_path.setRightFill(style); // getRightFill() = style;
+#if SHAPE_LOG
 		IF_VERBOSE_PARSE (
-		if (SHAPE_LOG) {
 		    log_parse(_("  shape_character read: fill1 (right) = %d"), current_path.getRightFill());
-		}
 		)
+#endif
 	    }
 	    if ((flags & flagLineStyleChange) && num_line_bits > 0)
 	    {
@@ -386,12 +387,11 @@
 			}
 		}
 		current_path.setLineStyle(style);
+#if SHAPE_LOG
 		IF_VERBOSE_PARSE (
-		if (SHAPE_LOG)
-		{
 		    log_parse(_("  shape_character_read: line = %d"), current_path.getLineStyle());
-		}
 		)
+#endif
 	    }
 	    if (flags & flagHasNewStyles)
 	    {
@@ -439,12 +439,11 @@
 		float	ax = cx + in->read_sint(num_bits);
 		float	ay = cy + in->read_sint(num_bits);
 
+#if SHAPE_LOG
 		IF_VERBOSE_PARSE (
-		if (SHAPE_LOG)
-		{
 		    log_parse(_("  shape_character read: curved edge   = %4g %4g - %4g %4g - %4g %4g"), x, y, cx, cy, ax, ay);
-		}
 		);
+#endif
 
 		current_path.m_edges.push_back(edge(cx, cy, ax, ay));
 
@@ -470,12 +469,11 @@
 		    }
 		}
 
+#if SHAPE_LOG
 		IF_VERBOSE_PARSE (
-		if (SHAPE_LOG)
-		{
 		    log_parse(_("  shape_character_read: straight edge = %4g %4g - %4g %4g"), x, y, x + dx, y + dy);
-		}
 		);
+#endif
 
 		current_path.m_edges.push_back(edge(x + dx, y + dy, x + dx, y + dy));
 



From MAILER-DAEMON Mon Aug 27 13:45:36 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPiee-00006i-LC
	for mharc-gnash-commit@gnu.org; Mon, 27 Aug 2007 13:45:36 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPiec-0008Vi-LO
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 13:45:34 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPieb-0008UO-SM
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 13:45:34 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPieb-0008U7-Ky
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 13:45:33 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IPieb-0007B7-7o
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 13:45:33 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IPiea-0000zl-3s
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 17:45:32 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IPieZ-0000zf-VF
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 17:45:32 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPieZ-0000zf-VF@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 27 Aug 2007 17:45:31 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/NetStre...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 17:45:35 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/27 17:45:31

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: NetStream-SquareTestRunner.cpp 

Log message:
	Patch by deanna:
	
	        * testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp: include
	          <unistd.h>

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4121&r2=1.4122
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp?cvsroot=gnash&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4121
retrieving revision 1.4122
diff -u -b -r1.4121 -r1.4122
--- ChangeLog	27 Aug 2007 17:28:02 -0000	1.4121
+++ ChangeLog	27 Aug 2007 17:45:31 -0000	1.4122
@@ -1,3 +1,8 @@
+2007-08-27 Deanna Phillips <deanna>
+
+	* testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp: include
+	  <unistd.h>
+
 2007-08-27 Sandro Santilli <strk@keybit.net>
 
 	* server/parser/shape_character_def.cpp (read): make effective

Index: testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp	1 Jul 2007 10:54:46 -0000	1.5
+++ testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp	27 Aug 2007 17:45:31 -0000	1.6
@@ -30,6 +30,7 @@
 #include "check.h"
 #include <string>
 #include <cassert>
+#include <unistd.h>
 
 using namespace gnash;
 using namespace std;



From MAILER-DAEMON Mon Aug 27 13:49:14 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPiiA-00025X-01
	for mharc-gnash-commit@gnu.org; Mon, 27 Aug 2007 13:49:14 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPii8-00025S-GI
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 13:49:12 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPii7-00025F-Vb
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 13:49:12 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPii7-00025C-Qa
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 13:49:11 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IPii7-0008BQ-FA
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 13:49:11 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IPii7-0001eU-0O
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 17:49:11 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IPii6-0001eR-T6
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 17:49:10 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPii6-0001eR-T6@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 27 Aug 2007 17:49:10 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/NetStre...
	[release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 17:49:13 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/27 17:49:10

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: NetStream-SquareTestRunner.cpp 

Log message:
	Patch by deanna:
	        * testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp: include
	          <unistd.h>

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.63&r2=1.3971.2.64
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.5&r2=1.5.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.63
retrieving revision 1.3971.2.64
diff -u -b -r1.3971.2.63 -r1.3971.2.64
--- ChangeLog	27 Aug 2007 12:03:13 -0000	1.3971.2.63
+++ ChangeLog	27 Aug 2007 17:49:09 -0000	1.3971.2.64
@@ -1,3 +1,8 @@
+2007-08-27 Deanna Phillips <deanna>
+
+        * testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp: include
+	  <unistd.h>
+
 2007-08-27 Deanna Philips <deanna>
 
         * libbase/utility.h: defined exp2() as it's missing on some BSDen.

Index: testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -b -r1.5 -r1.5.2.1
--- testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp	1 Jul 2007 10:54:46 -0000	1.5
+++ testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp	27 Aug 2007 17:49:10 -0000	1.5.2.1
@@ -30,6 +30,7 @@
 #include "check.h"
 #include <string>
 #include <cassert>
+#include <unistd.h>
 
 using namespace gnash;
 using namespace std;



From MAILER-DAEMON Mon Aug 27 14:11:16 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPj3U-00018O-9W
	for mharc-gnash-commit@gnu.org; Mon, 27 Aug 2007 14:11:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPj3S-00017m-EP
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 14:11:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPj3R-00017K-6Q
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 14:11:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPj3R-00017G-2z
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 14:11:13 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IPj3Q-0005I9-JI
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 14:11:12 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IPj3P-0002Pw-JA
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 18:11:11 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IPj3P-0002Pp-DD
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 18:11:11 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPj3P-0002Pp-DD@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 27 Aug 2007 18:11:11 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog libbase/utility.h [release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 18:11:14 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/27 18:11:11

Modified files:
	.              : ChangeLog 
	libbase        : utility.h 

Log message:
	        * libbase/utility.h: don't define exp2(), it's going to clash
	          with existing symbol on most systems (except some BSDen)...
	          Please provide a better patch for BSD.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.64&r2=1.3971.2.65
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/utility.h?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.25.2.2&r2=1.25.2.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.64
retrieving revision 1.3971.2.65
diff -u -b -r1.3971.2.64 -r1.3971.2.65
--- ChangeLog	27 Aug 2007 17:49:09 -0000	1.3971.2.64
+++ ChangeLog	27 Aug 2007 18:11:10 -0000	1.3971.2.65
@@ -1,3 +1,9 @@
+2007-08-27 Sandro Santilli <strk@keybit.net>
+
+	* libbase/utility.h: don't define exp2(), it's going to clash
+	  with existing symbol on most systems (except some BSDen)...
+	  Please provide a better patch for BSD.
+
 2007-08-27 Deanna Phillips <deanna>
 
         * testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp: include

Index: libbase/utility.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/utility.h,v
retrieving revision 1.25.2.2
retrieving revision 1.25.2.3
diff -u -b -r1.25.2.2 -r1.25.2.3
--- libbase/utility.h	27 Aug 2007 16:29:23 -0000	1.25.2.2
+++ libbase/utility.h	27 Aug 2007 18:11:11 -0000	1.25.2.3
@@ -115,7 +115,8 @@
 // the overridden log(f) will use logf IFF f is a float
 inline float	log2(float f) { return std::log(f) / LN_2; }
 //exp2 might be missing on Net-/OpenBSD.
-inline float    exp2(double x) { return std::pow((double)2, double(x)); }
+// TODO: check availability with a configure macro 
+//inline float    exp2(double x) { return std::pow((double)2, double(x)); }
 inline int	fchop( float f ) { return (int) f; }	// replace w/ inline asm if desired
 inline int	frnd(float f) { return fchop(f + 0.5f); }	// replace with inline asm if desired
 



From MAILER-DAEMON Mon Aug 27 14:12:34 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPj4k-0001lI-Of
	for mharc-gnash-commit@gnu.org; Mon, 27 Aug 2007 14:12:34 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPj4j-0001kH-8X
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 14:12:33 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPj4i-0001jR-Cw
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 14:12:32 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPj4i-0001jK-9O
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 14:12:32 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IPj4h-0005bR-W9
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 14:12:32 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IPj4g-0002nq-NG
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 18:12:30 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IPj4g-0002nj-Iv
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 18:12:30 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPj4g-0002nj-Iv@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 27 Aug 2007 18:12:30 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog libbase/utility.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 18:12:33 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/27 18:12:30

Modified files:
	.              : ChangeLog 
	libbase        : utility.h 

Log message:
	        * libbase/utility.h: don't define exp2(), it's going to clash
	          with existing symbol on most systems (except some BSDen)...
	          Please provide a better patch for BSD.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4122&r2=1.4123
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/utility.h?cvsroot=gnash&r1=1.27&r2=1.28

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4122
retrieving revision 1.4123
diff -u -b -r1.4122 -r1.4123
--- ChangeLog	27 Aug 2007 17:45:31 -0000	1.4122
+++ ChangeLog	27 Aug 2007 18:12:29 -0000	1.4123
@@ -1,3 +1,9 @@
+2007-08-27 Sandro Santilli <strk@keybit.net>
+
+	* libbase/utility.h: don't define exp2(), it's going to clash
+	  with existing symbol on most systems (except some BSDen)...
+	  Please provide a better patch for BSD.
+
 2007-08-27 Deanna Phillips <deanna>
 
 	* testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp: include

Index: libbase/utility.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/utility.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- libbase/utility.h	27 Aug 2007 16:28:13 -0000	1.27
+++ libbase/utility.h	27 Aug 2007 18:12:30 -0000	1.28
@@ -115,7 +115,8 @@
 // the overridden log(f) will use logf IFF f is a float
 inline float	log2(float f) { return std::log(f) / LN_2; }
 //exp2 might be missing on Net-/OpenBSD.
-inline float	exp2(double x) { return std::pow((double)2, double(x)); }
+// TODO: check availability with a configure macro 
+//inline float	exp2(double x) { return std::pow((double)2, double(x)); }
 inline int	fchop( float f ) { return (int) f; }	// replace w/ inline asm if desired
 inline int	frnd(float f) { return fchop(f + 0.5f); }	// replace with inline asm if desired
 



From MAILER-DAEMON Mon Aug 27 14:13:52 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPj60-00028L-2x
	for mharc-gnash-commit@gnu.org; Mon, 27 Aug 2007 14:13:52 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPj5y-000288-Bp
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 14:13:50 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPj5w-00027v-60
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 14:13:49 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPj5v-00027s-VD
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 14:13:48 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <chadmusick@msbx.net>) id 1IPj5v-0005qh-1S
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 14:13:47 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <chadmusick@msbx.net>) id 1IPj5s-0003GC-NS
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 18:13:44 +0000
Received: from cmusick by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <cmusick@savannah.gnu.org>) id 1IPj5s-0003G1-DW
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 18:13:44 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPj5s-0003G1-DW@cvs.savannah.gnu.org>
From: Chad Musick <chadmusick@msbx.net>
Date: Mon, 27 Aug 2007 18:13:44 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/BevelFilter.h server/Blu...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 18:13:50 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Chad Musick <cmusick>	07/08/27 18:13:44

Modified files:
	.              : ChangeLog 
	server         : BevelFilter.h BlurFilter.cpp BlurFilter.h 
	                 ColorMatrixFilter.cpp ColorMatrixFilter.h 
	                 ConvolutionFilter.cpp ConvolutionFilter.h 
	                 DropShadowFilter.cpp DropShadowFilter.h 
	                 GlowFilter.cpp GlowFilter.h 
	                 GradientBevelFilter.cpp GradientBevelFilter.h 
	                 GradientGlowFilter.cpp GradientGlowFilter.h 
	server/asobj   : BevelFilter_as.cpp BevelFilter_as.h 
	                 BitmapFilter_as.cpp BitmapFilter_as.h 
	                 Makefile.am 
	server/parser  : filter_factory.cpp 
Added files:
	server/asobj   : BlurFilter_as.cpp BlurFilter_as.h 
	                 ColorMatrixFilter_as.cpp ColorMatrixFilter_as.h 
	                 ConvolutionFilter_as.cpp ConvolutionFilter_as.h 
	                 DropShadowFilter_as.cpp DropShadowFilter_as.h 
	                 GlowFilter_as.cpp GlowFilter_as.h 
	                 GradientBevelFilter_as.cpp 
	                 GradientBevelFilter_as.h 
	                 GradientGlowFilter_as.cpp 
	                 GradientGlowFilter_as.h prophelper.h 

Log message:
	Adding functionality to support the Filter type objects in ActionScript.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4123&r2=1.4124
http://cvs.savannah.gnu.org/viewcvs/gnash/server/BevelFilter.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/BlurFilter.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/BlurFilter.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/ColorMatrixFilter.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/ColorMatrixFilter.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/ConvolutionFilter.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/ConvolutionFilter.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/DropShadowFilter.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/DropShadowFilter.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/GlowFilter.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/GlowFilter.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/GradientBevelFilter.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/GradientBevelFilter.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/GradientGlowFilter.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/GradientGlowFilter.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/BevelFilter_as.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/BevelFilter_as.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/BitmapFilter_as.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/BitmapFilter_as.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Makefile.am?cvsroot=gnash&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/BlurFilter_as.cpp?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/BlurFilter_as.h?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/ColorMatrixFilter_as.cpp?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/ColorMatrixFilter_as.h?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/ConvolutionFilter_as.cpp?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/ConvolutionFilter_as.h?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/DropShadowFilter_as.cpp?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/DropShadowFilter_as.h?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/GlowFilter_as.cpp?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/GlowFilter_as.h?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/GradientBevelFilter_as.cpp?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/GradientBevelFilter_as.h?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/GradientGlowFilter_as.cpp?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/GradientGlowFilter_as.h?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/prophelper.h?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/filter_factory.cpp?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4123
retrieving revision 1.4124
diff -u -b -r1.4123 -r1.4124
--- ChangeLog	27 Aug 2007 18:12:29 -0000	1.4123
+++ ChangeLog	27 Aug 2007 18:13:38 -0000	1.4124
@@ -1,9 +1,38 @@
+<<<<<<< ChangeLog
+2007-08-28 Chad Musick <chadmusick@msbx.net>
+
+	* server/asobj/BlurFilter_as.cpp,.h
+	* server/asobj/ColorMatrixFilter_as.cpp,.h
+	* server/asobj/ConvolutionFilter_as.cpp,.h
+	* server/asobj/DropShadowFilter_as.cpp,.h
+	* server/asobj/GlowFilter_as.cpp,.h
+	* server/asobj/GradientBevelFilter_as.cpp,.h
+	* server/asobj/GradientGlowFilter_as.cpp,.h
+	* server/asobj/BevelFilter_as.cpp,.h
+	* server/asobj/BitmapFilter_as.cpp,.h
+	  Make ActionScript compatible filters
+	* server/BevelFilter.h,.cpp
+	* server/BlurFilter.h,.cpp
+	* server/ColorMatrixFilter.h,.cpp
+	* server/ConvolutionFilter.h,.cpp
+	* server/DropShadowFilter.h,.cpp
+	* server/GlowFilter.h,.cpp
+	* server/GradientBevelFilter.h,.cpp
+	* server/GradientGlowFilter.h,.cpp
+	  Changes necessary for adapter compatibility
+	* server/asobj/prophelper.h
+	  File to make writing AS classes easier using an adapter
+	* server/asobj/Makefile.am
+	  Add new files
+	 
+=======
 2007-08-27 Sandro Santilli <strk@keybit.net>
 
 	* libbase/utility.h: don't define exp2(), it's going to clash
 	  with existing symbol on most systems (except some BSDen)...
 	  Please provide a better patch for BSD.
 
+>>>>>>> 1.4123
 2007-08-27 Deanna Phillips <deanna>
 
 	* testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp: include

Index: server/BevelFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/BevelFilter.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/BevelFilter.h	27 Aug 2007 03:06:41 -0000	1.2
+++ server/BevelFilter.h	27 Aug 2007 18:13:39 -0000	1.3
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: BevelFilter.h,v 1.2 2007/08/27 03:06:41 cmusick Exp $ */
+/* $Id: BevelFilter.h,v 1.3 2007/08/27 18:13:39 cmusick Exp $ */
 
 #ifndef GNASH_BEVELFILTER_H
 #define GNASH_BEVELFILTER_H
@@ -49,7 +49,7 @@
     virtual ~BevelFilter() { return; }
 
     // Clone this object and return a copy of it. (AS accessible function.)
-    // Guaranteed to return an object which can be cast to BlurFilter
+    // Guaranteed to return an object which can be cast to BevelFilter
     Filter const clone();
 
     BevelFilter(as_object* o) : BitmapFilter(o),

Index: server/BlurFilter.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/BlurFilter.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/BlurFilter.cpp	26 Aug 2007 15:14:11 -0000	1.1
+++ server/BlurFilter.cpp	27 Aug 2007 18:13:39 -0000	1.2
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: BlurFilter.cpp,v 1.1 2007/08/26 15:14:11 cmusick Exp $ */
+/* $Id: BlurFilter.cpp,v 1.2 2007/08/27 18:13:39 cmusick Exp $ */
 
 #include "BlurFilter.h"
 
@@ -28,6 +28,9 @@
 BlurFilter::clone()
 {
     Filter p(new BlurFilter(m_blurX, m_blurY, m_quality));
+    p->set_prototype(get_prototype());
+    p->copyProperties(*this);
+
     return p;
 }
 

Index: server/BlurFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/BlurFilter.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/BlurFilter.h	26 Aug 2007 15:14:11 -0000	1.1
+++ server/BlurFilter.h	27 Aug 2007 18:13:39 -0000	1.2
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: BlurFilter.h,v 1.1 2007/08/26 15:14:11 cmusick Exp $ */
+/* $Id: BlurFilter.h,v 1.2 2007/08/27 18:13:39 cmusick Exp $ */
 
 #ifndef GNASH_BLURFILTER_H
 #define GNASH_BLURFILTER_H
@@ -28,10 +28,14 @@
 
 namespace gnash {
 
+class BlurFilter_as; // Adapater for ActionScript
+
 // A blur effect filter.
 class BlurFilter : public BitmapFilter
 {
 public:
+    friend class BlurFilter_as;
+
     // Fill from a stream. See parser/filter_factory.cpp for the implementations.
     virtual bool read(stream* in);
 
@@ -41,6 +45,10 @@
     // Guaranteed to return an object which can be cast to BlurFilter
     Filter const clone();
 
+    BlurFilter(as_object* obj) : BitmapFilter(obj),
+        m_blurX(0.0f), m_blurY(0.0f), m_quality(0)
+    { return; }
+
     BlurFilter() : 
         m_blurX(0.0f), m_blurY(0.0f), m_quality(0)
     { return; }

Index: server/ColorMatrixFilter.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/ColorMatrixFilter.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/ColorMatrixFilter.cpp	26 Aug 2007 15:14:11 -0000	1.1
+++ server/ColorMatrixFilter.cpp	27 Aug 2007 18:13:39 -0000	1.2
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: ColorMatrixFilter.cpp,v 1.1 2007/08/26 15:14:11 cmusick Exp $ */
+/* $Id: ColorMatrixFilter.cpp,v 1.2 2007/08/27 18:13:39 cmusick Exp $ */
 
 #include "ColorMatrixFilter.h"
 
@@ -28,6 +28,9 @@
 ColorMatrixFilter::clone()
 {
     Filter p(new ColorMatrixFilter(m_matrix));
+    p->set_prototype(get_prototype());
+    p->copyProperties(*this);
+
     return p;
 }
 

Index: server/ColorMatrixFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/ColorMatrixFilter.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/ColorMatrixFilter.h	26 Aug 2007 15:14:11 -0000	1.1
+++ server/ColorMatrixFilter.h	27 Aug 2007 18:13:39 -0000	1.2
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: ColorMatrixFilter.h,v 1.1 2007/08/26 15:14:11 cmusick Exp $ */
+/* $Id: ColorMatrixFilter.h,v 1.2 2007/08/27 18:13:39 cmusick Exp $ */
 
 #ifndef GNASH_COLORMATRIXFILTER_H
 #define GNASH_COLORMATRIXFILTER_H
@@ -29,10 +29,14 @@
 
 namespace gnash {
 
+class ColorMatrixFilter_as; // Adapter for ActionScript
+
 // A color matrix effect filter.
 class ColorMatrixFilter : public BitmapFilter
 {
 public:
+    friend class ColorMatrixFilter_as;
+
     // Fill from a stream. See parser/filter_factory.cpp for the implementations.
     virtual bool read(stream* in);
 
@@ -42,16 +46,20 @@
     // Guaranteed to return an object which can be cast to ColorMatrixFilter
     Filter const clone();
 
+    ColorMatrixFilter(as_object* obj) : BitmapFilter(obj),
+        m_matrix()
+    { return; }
+
     ColorMatrixFilter() : 
         m_matrix()
     { return; }
 
-    ColorMatrixFilter(as_array_object a_matrix) :
+    ColorMatrixFilter(boost::intrusive_ptr<as_array_object> a_matrix) :
         m_matrix(a_matrix)
     { return; }
 
 private:
-    as_array_object m_matrix; // The color matrix
+    boost::intrusive_ptr<as_array_object> m_matrix; // The color matrix
 };
 
 } // Namespace gnash

Index: server/ConvolutionFilter.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/ConvolutionFilter.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/ConvolutionFilter.cpp	26 Aug 2007 15:14:11 -0000	1.1
+++ server/ConvolutionFilter.cpp	27 Aug 2007 18:13:39 -0000	1.2
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: ConvolutionFilter.cpp,v 1.1 2007/08/26 15:14:11 cmusick Exp $ */
+/* $Id: ConvolutionFilter.cpp,v 1.2 2007/08/27 18:13:39 cmusick Exp $ */
 
 #include "ConvolutionFilter.h"
 
@@ -29,6 +29,9 @@
 {
     Filter p(new ConvolutionFilter(m_matrixX, m_matrixY, m_matrix,
         m_divisor, m_bias, m_preserveAlpha, m_clamp, m_color, m_alpha));
+    p->set_prototype(get_prototype());
+    p->copyProperties(*this);
+
     return p;
 }
 

Index: server/ConvolutionFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/ConvolutionFilter.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/ConvolutionFilter.h	26 Aug 2007 15:14:11 -0000	1.1
+++ server/ConvolutionFilter.h	27 Aug 2007 18:13:39 -0000	1.2
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: ConvolutionFilter.h,v 1.1 2007/08/26 15:14:11 cmusick Exp $ */
+/* $Id: ConvolutionFilter.h,v 1.2 2007/08/27 18:13:39 cmusick Exp $ */
 
 #ifndef GNASH_CONVOLUTIONFILTER_H
 #define GNASH_CONVOLUTIONFILTER_H
@@ -29,25 +29,35 @@
 
 namespace gnash {
 
+class ConvolutionFilter_as; // Adapter to ActionScript
+
 // A convolution effect filter.
 class ConvolutionFilter : public BitmapFilter
 {
 public:
+    friend class ConvolutionFilter_as;
+
     // Fill from a stream. See parser/filter_factory.cpp for the implementations.
     virtual bool read(stream* in);
 
     virtual ~ConvolutionFilter() { return; }
 
     // Clone this object and return a copy of it. (AS accessible function.)
-    // Guaranteed to return an object which can be cast to BlurFilter
+    // Guaranteed to return an object which can be cast to ConvolutionFilter
     Filter const clone();
 
+    ConvolutionFilter(as_object* obj) : BitmapFilter(obj),
+        m_matrixX(), m_matrixY(), m_matrix(), m_divisor(), m_bias(),
+        m_preserveAlpha(false), m_clamp(false), m_color(), m_alpha()
+    { return; }
+
     ConvolutionFilter() : 
         m_matrixX(), m_matrixY(), m_matrix(), m_divisor(), m_bias(),
         m_preserveAlpha(false), m_clamp(false), m_color(), m_alpha()
     { return; }
 
-    ConvolutionFilter(uint8_t matrixX, uint8_t matrixY, as_array_object a_matrix,
+    ConvolutionFilter(uint8_t matrixX, uint8_t matrixY, 
+        boost::intrusive_ptr<as_array_object> a_matrix,
         float divisor, float bias, bool preserveAlpha, bool clamp, uint32_t color,
         uint8_t alpha) :
         m_matrixX(matrixX), m_matrixY(matrixY), m_matrix(a_matrix),
@@ -58,7 +68,7 @@
 private:
     uint8_t m_matrixX; // Number of columns
     uint8_t m_matrixY; // Number of rows
-    as_array_object m_matrix; // The convolution matrix
+    boost::intrusive_ptr<as_array_object> m_matrix; // The convolution matrix
     float m_divisor;
     float m_bias;
     bool m_preserveAlpha; // If true, don't convolute the alpha channel

Index: server/DropShadowFilter.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/DropShadowFilter.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/DropShadowFilter.cpp	26 Aug 2007 15:14:11 -0000	1.1
+++ server/DropShadowFilter.cpp	27 Aug 2007 18:13:39 -0000	1.2
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: DropShadowFilter.cpp,v 1.1 2007/08/26 15:14:11 cmusick Exp $ */
+/* $Id: DropShadowFilter.cpp,v 1.2 2007/08/27 18:13:39 cmusick Exp $ */
 
 #include "DropShadowFilter.h"
 
@@ -30,6 +30,8 @@
     Filter p(new DropShadowFilter(m_distance, m_angle, m_color, m_alpha,
         m_blurX, m_blurY, m_strength, m_quality, m_inner, m_knockout,
         m_hideObject));
+    p->set_prototype(get_prototype());
+    p->copyProperties(*this);
     return p;
 }
 

Index: server/DropShadowFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/DropShadowFilter.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/DropShadowFilter.h	26 Aug 2007 15:14:11 -0000	1.1
+++ server/DropShadowFilter.h	27 Aug 2007 18:13:40 -0000	1.2
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: DropShadowFilter.h,v 1.1 2007/08/26 15:14:11 cmusick Exp $ */
+/* $Id: DropShadowFilter.h,v 1.2 2007/08/27 18:13:40 cmusick Exp $ */
 
 #ifndef GNASH_DROPSHADOWFILTER_H
 #define GNASH_DROPSHADOWFILTER_H
@@ -28,10 +28,14 @@
 
 namespace gnash {
 
+class DropShadowFilter_as;
+
 // A drop shadow effect filter.
 class DropShadowFilter : public BitmapFilter
 {
 public:
+    friend class DropShadowFilter_as;
+
     // Fill from a stream. See parser/filter_factory.cpp for the implementations.
     virtual bool read(stream* in);
 
@@ -41,6 +45,12 @@
     // Guaranteed to return an object which can be cast to BlurFilter
     Filter const clone();
 
+    DropShadowFilter(as_object* obj) : BitmapFilter(obj),
+        m_distance(0.0f), m_angle(0.0f), m_color(0), m_alpha(0),
+        m_blurX(0.0f), m_blurY(0.0f),  m_strength(0.0f), m_quality(0),
+        m_inner(false), m_knockout(false), m_hideObject(false)
+    { return; }
+
     DropShadowFilter() : 
         m_distance(0.0f), m_angle(0.0f), m_color(0), m_alpha(0),
         m_blurX(0.0f), m_blurY(0.0f),  m_strength(0.0f), m_quality(0),

Index: server/GlowFilter.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/GlowFilter.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/GlowFilter.cpp	26 Aug 2007 15:14:12 -0000	1.1
+++ server/GlowFilter.cpp	27 Aug 2007 18:13:40 -0000	1.2
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: GlowFilter.cpp,v 1.1 2007/08/26 15:14:12 cmusick Exp $ */
+/* $Id: GlowFilter.cpp,v 1.2 2007/08/27 18:13:40 cmusick Exp $ */
 
 #include "GlowFilter.h"
 
@@ -29,6 +29,8 @@
 {
     Filter p(new GlowFilter(m_color, m_alpha,
         m_blurX, m_blurY, m_strength, m_quality, m_inner, m_knockout));
+    p->set_prototype(get_prototype());
+    p->copyProperties(*this);
     return p;
 }
 

Index: server/GlowFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/GlowFilter.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/GlowFilter.h	26 Aug 2007 15:14:12 -0000	1.1
+++ server/GlowFilter.h	27 Aug 2007 18:13:40 -0000	1.2
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: GlowFilter.h,v 1.1 2007/08/26 15:14:12 cmusick Exp $ */
+/* $Id: GlowFilter.h,v 1.2 2007/08/27 18:13:40 cmusick Exp $ */
 
 #ifndef GNASH_GLOWFILTER_H
 #define GNASH_GLOWFILTER_H
@@ -28,10 +28,14 @@
 
 namespace gnash {
 
+class GlowFilter_as;
+
 // A glow effect filter.
 class GlowFilter : public BitmapFilter
 {
 public:
+    friend class GlowFilter_as;
+
     // Fill from a stream. See parser/filter_factory.cpp for the implementations.
     virtual bool read(stream* in);
 
@@ -41,6 +45,12 @@
     // Guaranteed to return an object which can be cast to BlurFilter
     Filter const clone();
 
+    GlowFilter(as_object* obj) : BitmapFilter(obj),
+        m_color(0), m_alpha(0),
+        m_blurX(0.0f), m_blurY(0.0f),  m_strength(0.0f), m_quality(0),
+        m_inner(false), m_knockout(false)
+    { return; }
+
     GlowFilter() : 
         m_color(0), m_alpha(0),
         m_blurX(0.0f), m_blurY(0.0f),  m_strength(0.0f), m_quality(0),

Index: server/GradientBevelFilter.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/GradientBevelFilter.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/GradientBevelFilter.cpp	26 Aug 2007 15:14:12 -0000	1.1
+++ server/GradientBevelFilter.cpp	27 Aug 2007 18:13:40 -0000	1.2
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: GradientBevelFilter.cpp,v 1.1 2007/08/26 15:14:12 cmusick Exp $ */
+/* $Id: GradientBevelFilter.cpp,v 1.2 2007/08/27 18:13:40 cmusick Exp $ */
 
 #include "GradientBevelFilter.h"
 
@@ -28,7 +28,9 @@
 GradientBevelFilter::clone()
 {
     Filter p(new GradientBevelFilter(m_distance, m_angle, m_colors, m_alphas,
-        m_blurX, m_blurY, m_strength, m_quality, m_type, m_knockout));
+        m_ratios, m_blurX, m_blurY, m_strength, m_quality, m_type, m_knockout));
+    p->set_prototype(get_prototype());
+    p->copyProperties(*this);
     return p;
 }
 

Index: server/GradientBevelFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/GradientBevelFilter.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/GradientBevelFilter.h	26 Aug 2007 15:14:12 -0000	1.1
+++ server/GradientBevelFilter.h	27 Aug 2007 18:13:40 -0000	1.2
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: GradientBevelFilter.h,v 1.1 2007/08/26 15:14:12 cmusick Exp $ */
+/* $Id: GradientBevelFilter.h,v 1.2 2007/08/27 18:13:40 cmusick Exp $ */
 
 #ifndef GNASH_GRADIENTBEVELFILTER_H
 #define GNASH_GRADIENTBEVELFILTER_H
@@ -29,10 +29,14 @@
 
 namespace gnash {
 
+class GradientBevelFilter_as;
+
 // A gradient bevel effect filter.
 class GradientBevelFilter : public BitmapFilter
 {
 public:
+    friend class GradientBevelFilter_as;
+
     typedef enum
     {
         INNER_BEVEL = 2,
@@ -49,26 +53,36 @@
     // Guaranteed to return an object which can be cast to BlurFilter
     Filter const clone();
 
+    GradientBevelFilter(as_object *obj) : BitmapFilter(obj),
+        m_distance(0.0f), m_angle(0.0f), m_colors(), m_alphas(), m_ratios(),
+        m_blurX(0.0f), m_blurY(0.0f),  m_strength(0.0f), m_quality(0),
+        m_type(INNER_BEVEL), m_knockout(false)
+    { return; }
+
     GradientBevelFilter() : 
-        m_distance(0.0f), m_angle(0.0f), m_colors(), m_alphas(),
+        m_distance(0.0f), m_angle(0.0f), m_colors(), m_alphas(), m_ratios(),
         m_blurX(0.0f), m_blurY(0.0f),  m_strength(0.0f), m_quality(0),
         m_type(INNER_BEVEL), m_knockout(false)
     { return; }
 
-    GradientBevelFilter(float distance, float angle, as_array_object colors,
-        as_array_object alphas, float blurX, float blurY, float strength,
+    GradientBevelFilter(float distance, float angle,
+        boost::intrusive_ptr<as_array_object> colors,
+        boost::intrusive_ptr<as_array_object> alphas,
+        boost::intrusive_ptr<as_array_object> ratios,
+        float blurX, float blurY, float strength,
         uint8_t quality, glow_types type, bool knockout) :
-        m_distance(distance), m_angle(angle), m_colors(colors),
-        m_alphas(alphas), m_blurX(blurX), m_blurY(blurY), m_strength(strength),
+        m_distance(distance), m_angle(angle),
+        m_colors(colors), m_alphas(alphas), m_ratios(ratios),
+        m_blurX(blurX), m_blurY(blurY), m_strength(strength),
         m_quality(quality), m_type(type), m_knockout(knockout)
     { return; }
 
 private:
     float m_distance; // Distance of the filter in pixels.
     float m_angle; // Angle of the filter.
-    as_array_object m_colors; // Colors of the gradients.
-    as_array_object m_alphas; // Alphas of the gradients.
-    as_array_object m_ratios; // Ratios of the gradients.
+    boost::intrusive_ptr<as_array_object> m_colors; // Colors of the gradients.
+    boost::intrusive_ptr<as_array_object> m_alphas; // Alphas of the gradients.
+    boost::intrusive_ptr<as_array_object> m_ratios; // Ratios of the gradients.
     float m_blurX; // horizontal blur
     float m_blurY; // vertical blur
     float m_strength; // How strong is the filter.

Index: server/GradientGlowFilter.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/GradientGlowFilter.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/GradientGlowFilter.cpp	26 Aug 2007 15:14:12 -0000	1.1
+++ server/GradientGlowFilter.cpp	27 Aug 2007 18:13:40 -0000	1.2
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: GradientGlowFilter.cpp,v 1.1 2007/08/26 15:14:12 cmusick Exp $ */
+/* $Id: GradientGlowFilter.cpp,v 1.2 2007/08/27 18:13:40 cmusick Exp $ */
 
 #include "GradientGlowFilter.h"
 
@@ -28,7 +28,9 @@
 GradientGlowFilter::clone()
 {
     Filter p(new GradientGlowFilter(m_distance, m_angle, m_colors, m_alphas,
-        m_blurX, m_blurY, m_strength, m_quality, m_type, m_knockout));
+        m_ratios, m_blurX, m_blurY, m_strength, m_quality, m_type, m_knockout));
+    p->set_prototype(get_prototype());
+    p->copyProperties(*this);
     return p;
 }
 

Index: server/GradientGlowFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/GradientGlowFilter.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/GradientGlowFilter.h	26 Aug 2007 15:14:12 -0000	1.1
+++ server/GradientGlowFilter.h	27 Aug 2007 18:13:40 -0000	1.2
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: GradientGlowFilter.h,v 1.1 2007/08/26 15:14:12 cmusick Exp $ */
+/* $Id: GradientGlowFilter.h,v 1.2 2007/08/27 18:13:40 cmusick Exp $ */
 
 #ifndef GNASH_GRADIENTGLOWFILTER_H
 #define GNASH_GRADIENTGLOWFILTER_H
@@ -29,10 +29,14 @@
 
 namespace gnash {
 
+class GradientGlowFilter_as;
+
 // A gradient glow effect filter.
 class GradientGlowFilter : public BitmapFilter
 {
 public:
+    friend class GradientGlowFilter_as;
+
     typedef enum
     {
         INNER_GLOW = 2,
@@ -49,26 +53,35 @@
     // Guaranteed to return an object which can be cast to BlurFilter
     Filter const clone();
 
+    GradientGlowFilter(as_object* obj) : BitmapFilter(obj),
+        m_distance(0.0f), m_angle(0.0f), m_colors(), m_alphas(), m_ratios(),
+        m_blurX(0.0f), m_blurY(0.0f),  m_strength(0.0f), m_quality(0),
+        m_type(INNER_GLOW), m_knockout(false)
+    { return; }
+
     GradientGlowFilter() : 
-        m_distance(0.0f), m_angle(0.0f), m_colors(), m_alphas(),
+        m_distance(0.0f), m_angle(0.0f), m_colors(), m_alphas(), m_ratios(),
         m_blurX(0.0f), m_blurY(0.0f),  m_strength(0.0f), m_quality(0),
         m_type(INNER_GLOW), m_knockout(false)
     { return; }
 
-    GradientGlowFilter(float distance, float angle, as_array_object colors,
-        as_array_object alphas, float blurX, float blurY, float strength,
+    GradientGlowFilter(float distance, float angle,
+        boost::intrusive_ptr<as_array_object> colors,
+        boost::intrusive_ptr<as_array_object> alphas,
+        boost::intrusive_ptr<as_array_object> ratios,
+        float blurX, float blurY, float strength,
         uint8_t quality, glow_types type, bool knockout) :
-        m_distance(distance), m_angle(angle), m_colors(colors),
-        m_alphas(alphas), m_blurX(blurX), m_blurY(blurY), m_strength(strength),
+        m_distance(distance), m_angle(angle), m_colors(colors), m_alphas(alphas),
+        m_ratios(ratios), m_blurX(blurX), m_blurY(blurY), m_strength(strength),
         m_quality(quality), m_type(type), m_knockout(knockout)
     { return; }
 
 private:
     float m_distance; // Distance of the filter in pixels.
     float m_angle; // Angle of the filter.
-    as_array_object m_colors; // Colors of the gradients.
-    as_array_object m_alphas; // Alphas of the gradients.
-    as_array_object m_ratios; // Ratios of the gradients.
+    boost::intrusive_ptr<as_array_object> m_colors; // Colors of the gradients.
+    boost::intrusive_ptr<as_array_object> m_alphas; // Alphas of the gradients.
+    boost::intrusive_ptr<as_array_object> m_ratios; // Ratios of the gradients.
     float m_blurX; // horizontal blur
     float m_blurY; // vertical blur
     float m_strength; // How strong is the filter.

Index: server/asobj/BevelFilter_as.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/BevelFilter_as.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/asobj/BevelFilter_as.cpp	27 Aug 2007 03:06:42 -0000	1.1
+++ server/asobj/BevelFilter_as.cpp	27 Aug 2007 18:13:40 -0000	1.2
@@ -15,285 +15,71 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: BevelFilter_as.cpp,v 1.1 2007/08/27 03:06:42 cmusick Exp $ */
+/* $Id: BevelFilter_as.cpp,v 1.2 2007/08/27 18:13:40 cmusick Exp $ */
 
 #include "BitmapFilter_as.h"
 #include "BevelFilter.h"
 #include "VM.h"
 #include "builtin_function.h"
 
+// These _must_ be defined for prophelpers to work correctly.
+// This is enforced by the file itself.
+#define phelp_helper BevelFilter_as
+#define phelp_class BevelFilter
+#include "prophelper.h"
+
 namespace gnash {
 
 class BevelFilter_as
 {
+    phelp_base_def;
 public:
-    static as_object* Interface(); // To a BitmapFilter
-    static void attachInterface(as_object& o); // Attach the interface.
-    static void attachProperties(as_object& o); // Attach the properties.
-
-    static void registerCtor(as_object& global); // public ctor
-    static as_value ctor(const fn_call& fn); // constructor for BitmapFilter
-
-    // Get set functions for ActionScript
-    static as_value distance_gs(const fn_call& fn);
-    static as_value angle_gs(const fn_call& fn);
-    static as_value highlightColor_gs(const fn_call& fn);
-    static as_value highlightAlpha_gs(const fn_call& fn);
-    static as_value shadowColor_gs(const fn_call& fn);
-    static as_value shadowAlpha_gs(const fn_call& fn);
-    static as_value blurX_gs(const fn_call& fn);
-    static as_value blurY_gs(const fn_call& fn);
-    static as_value strength_gs(const fn_call& fn);
-    static as_value quality_gs(const fn_call& fn);
-    static as_value type_gs(const fn_call& fn);
-    static as_value knockout_gs(const fn_call& fn);
-
-private:
-    static boost::intrusive_ptr<as_object> s_interface;
-    static boost::intrusive_ptr<builtin_function> s_ctor;
+    phelp_gs(distance);
+    phelp_gs(angle);
+    phelp_gs(highlightColor);
+    phelp_gs(highlightAlpha);
+    phelp_gs(shadowColor);
+    phelp_gs(shadowAlpha);
+    phelp_gs(blurX);
+    phelp_gs(blurY);
+    phelp_gs(strength);
+    phelp_gs(quality);
+    phelp_gs(type);
+    phelp_gs(knockout);
 };
 
-boost::intrusive_ptr<as_object> BevelFilter_as::s_interface;
-boost::intrusive_ptr<builtin_function> BevelFilter_as::s_ctor;
-
-as_object*
-BevelFilter_as::Interface()
-{
-    if (BevelFilter_as::s_interface == NULL)
-    {
-        BevelFilter_as::s_interface = new as_object(bitmapFilter_interface());
-        VM::get().addStatic(BevelFilter_as::s_interface.get());
-
-        BevelFilter_as::attachInterface(*BevelFilter_as::s_interface);
-    }
-
-    return BevelFilter_as::s_interface.get();
-}
-
-void
-BevelFilter_as::attachInterface(as_object& /*o*/)
-{
-    // Filters are all properties.
-    return;
-}
-
-void
-BevelFilter_as::attachProperties(as_object& o)
-{
-    boost::intrusive_ptr<builtin_function> gs;
-
-    gs = new builtin_function(BevelFilter_as::distance_gs, NULL);
-    o.init_property("distance", *gs, *gs);
-
-    gs = new builtin_function(BevelFilter_as::angle_gs, NULL);
-    o.init_property("angle", *gs, *gs);
-
-    gs = new builtin_function(BevelFilter_as::highlightColor_gs, NULL);
-    o.init_property("highlightColor", *gs, *gs);
-
-    gs = new builtin_function(BevelFilter_as::highlightAlpha_gs, NULL);
-    o.init_property("highlightAlpha", *gs, *gs);
-
-    gs = new builtin_function(BevelFilter_as::shadowColor_gs, NULL);
-    o.init_property("shadowColor", *gs, *gs);
-
-    gs = new builtin_function(BevelFilter_as::shadowAlpha_gs, NULL);
-    o.init_property("shadowAlpha", *gs, *gs);
-
-    gs = new builtin_function(BevelFilter_as::blurX_gs, NULL);
-    o.init_property("blurX", *gs, *gs);
-
-    gs = new builtin_function(BevelFilter_as::blurY_gs, NULL);
-    o.init_property("blurY", *gs, *gs);
+phelp_base_imp((bitmapFilter_interface()), BevelFilter);
 
-    gs = new builtin_function(BevelFilter_as::strength_gs, NULL);
-    o.init_property("strength", *gs, *gs);
+// Filters are purely property based.
+phelp_i_attach_empty
 
-    gs = new builtin_function(BevelFilter_as::quality_gs, NULL);
-    o.init_property("quality", *gs, *gs);
-
-    gs = new builtin_function(BevelFilter_as::type_gs, NULL);
-    o.init_property("type", *gs, *gs);
-
-    gs = new builtin_function(BevelFilter_as::knockout_gs, NULL);
-    o.init_property("knockout", *gs, *gs);
-}
-
-as_value
-BevelFilter_as::distance_gs(const fn_call& fn)
-{
-    boost::intrusive_ptr<BevelFilter> ptr = ensureType<BevelFilter>(fn.this_ptr);
-
-    if (fn.nargs == 0) // getter
-    {
-        return as_value(ptr->m_distance);
-    }
-    // setter
-    float distance = fn.arg(0).to_number<float>();
-    ptr->m_distance = distance;
-
-    return as_value();
-}
-
-as_value
-BevelFilter_as::angle_gs(const fn_call& fn)
-{
-    boost::intrusive_ptr<BevelFilter> ptr = ensureType<BevelFilter>(fn.this_ptr);
-
-    if (fn.nargs == 0) // getter
-    {
-        return as_value(ptr->m_angle);
-    }
-    // setter
-    float angle = fn.arg(0).to_number<float>();
-    ptr->m_angle = angle;
-
-    return as_value();
-}
-
-as_value
-BevelFilter_as::highlightColor_gs(const fn_call& fn)
-{
-    boost::intrusive_ptr<BevelFilter> ptr = ensureType<BevelFilter>(fn.this_ptr);
-
-    if (fn.nargs == 0) // getter
-    {
-        return as_value(ptr->m_highlightColor);
-    }
-    // setter
-    uint32_t highlightColor = fn.arg(0).to_number<uint32_t>();
-    ptr->m_highlightColor = highlightColor;
-
-    return as_value();
-}
-
-as_value
-BevelFilter_as::highlightAlpha_gs(const fn_call& fn)
-{
-    boost::intrusive_ptr<BevelFilter> ptr = ensureType<BevelFilter>(fn.this_ptr);
-
-    if (fn.nargs == 0) // getter
-    {
-        return as_value(ptr->m_highlightAlpha);
-    }
-    // setter
-    uint8_t highlightAlpha = fn.arg(0).to_number<uint8_t>();
-    ptr->m_highlightAlpha = highlightAlpha;
-
-    return as_value();
-}
-
-as_value
-BevelFilter_as::shadowColor_gs(const fn_call& fn)
-{
-    boost::intrusive_ptr<BevelFilter> ptr = ensureType<BevelFilter>(fn.this_ptr);
-
-    if (fn.nargs == 0) // getter
-    {
-        return as_value(ptr->m_shadowColor);
-    }
-    // setter
-    uint32_t shadowColor = fn.arg(0).to_number<uint32_t>();
-    ptr->m_shadowColor = shadowColor;
-
-    return as_value();
-}
-
-as_value
-BevelFilter_as::shadowAlpha_gs(const fn_call& fn)
-{
-    boost::intrusive_ptr<BevelFilter> ptr = ensureType<BevelFilter>(fn.this_ptr);
-
-    if (fn.nargs == 0) // getter
-    {
-        return as_value(ptr->m_shadowAlpha);
-    }
-    // setter
-    uint8_t shadowAlpha = fn.arg(0).to_number<uint8_t>();
-    ptr->m_shadowAlpha = shadowAlpha;
-
-    return as_value();
-}
-
-as_value
-BevelFilter_as::blurX_gs(const fn_call& fn)
-{
-    boost::intrusive_ptr<BevelFilter> ptr = ensureType<BevelFilter>(fn.this_ptr);
-
-    if (fn.nargs == 0) // getter
-    {
-        return as_value(ptr->m_blurX);
-    }
-    // setter
-    float blurX = fn.arg(0).to_number<float>();
-    ptr->m_blurX = blurX;
-
-    return as_value();
-}
-
-as_value
-BevelFilter_as::blurY_gs(const fn_call& fn)
-{
-    boost::intrusive_ptr<BevelFilter> ptr = ensureType<BevelFilter>(fn.this_ptr);
-
-    if (fn.nargs == 0) // getter
-    {
-        return as_value(ptr->m_blurY);
-    }
-    // setter
-    float blurY = fn.arg(0).to_number<float>();
-    ptr->m_blurY = blurY;
-
-    return as_value();
-}
-
-as_value
-BevelFilter_as::strength_gs(const fn_call& fn)
-{
-    boost::intrusive_ptr<BevelFilter> ptr = ensureType<BevelFilter>(fn.this_ptr);
-
-    if (fn.nargs == 0) // getter
-    {
-        return as_value(ptr->m_strength);
-    }
-    // setter
-    float strength = fn.arg(0).to_number<float>();
-    ptr->m_strength = strength;
-
-    return as_value();
-}
-
-void
-BevelFilter_as::registerCtor(as_object& global)
-{
-    if (BevelFilter_as::s_ctor != NULL)
-        return;
-
-    BevelFilter_as::s_ctor = new builtin_function(&BevelFilter_as::ctor,
-        BevelFilter_as::Interface());
-    VM::get().addStatic(BevelFilter_as::s_ctor.get());
-
-    // TODO: Is this correct?
-    BevelFilter_as::attachInterface(*BevelFilter_as::s_ctor);
-
-    global.init_member("BevelFilter", BevelFilter_as::s_ctor.get());
-}
-
-as_value
-BevelFilter_as::quality_gs(const fn_call& fn)
-{
-    boost::intrusive_ptr<BevelFilter> ptr = ensureType<BevelFilter>(fn.this_ptr);
-
-    if (fn.nargs == 0) // getter
-    {
-        return as_value(ptr->m_quality);
-    }
-    // setter
-    uint8_t quality = fn.arg(0).to_number<uint8_t>();
-    ptr->m_quality = quality;
-
-    return as_value();
-}
+// Begin attaching properties, then attach them, then end.
+phelp_gs_attach_begin
+phelp_gs_attach(distance);
+phelp_gs_attach(angle);
+phelp_gs_attach(highlightColor);
+phelp_gs_attach(highlightAlpha);
+phelp_gs_attach(shadowColor);
+phelp_gs_attach(shadowAlpha);
+phelp_gs_attach(blurX);
+phelp_gs_attach(blurY);
+phelp_gs_attach(strength);
+phelp_gs_attach(quality);
+phelp_gs_attach(type);
+phelp_gs_attach(knockout);
+phelp_gs_attach_end
+
+phelp_property(float, number<float>, distance)
+phelp_property(float, number<float>, angle)
+phelp_property(uint32_t, number<uint32_t>, highlightColor)
+phelp_property(uint8_t, number<uint8_t>, highlightAlpha)
+phelp_property(uint32_t, number<uint32_t>, shadowColor)
+phelp_property(uint8_t, number<uint8_t>, shadowAlpha)
+phelp_property(float, number<float>, blurX)
+phelp_property(float, number<float>, blurY)
+phelp_property(float, number<float>, strength)
+phelp_property(uint8_t, number<uint8_t>, quality)
+phelp_property(bool, bool, knockout)
 
 as_value
 BevelFilter_as::type_gs(const fn_call& fn)
@@ -329,22 +115,6 @@
 }
 
 as_value
-BevelFilter_as::knockout_gs(const fn_call& fn)
-{
-    boost::intrusive_ptr<BevelFilter> ptr = ensureType<BevelFilter>(fn.this_ptr);
-
-    if (fn.nargs == 0) // getter
-    {
-        return as_value(ptr->m_knockout);
-    }
-    // setter
-    bool knockout = fn.arg(0).to_bool();
-    ptr->m_knockout = knockout;
-
-    return as_value();
-}
-
-as_value
 BevelFilter_as::ctor(const fn_call& /*fn*/)
 {
     boost::intrusive_ptr<as_object> obj = new BevelFilter(BevelFilter_as::Interface());
@@ -353,10 +123,5 @@
     return as_value(obj.get());
 }
 
-void bevelFilter_class_init(as_object& global)
-{
-   BevelFilter_as::registerCtor(global);
-}
-
 } // Namespace gnash
 

Index: server/asobj/BevelFilter_as.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/BevelFilter_as.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/asobj/BevelFilter_as.h	27 Aug 2007 03:06:42 -0000	1.1
+++ server/asobj/BevelFilter_as.h	27 Aug 2007 18:13:40 -0000	1.2
@@ -28,7 +28,7 @@
 class as_object;
 
 /// Initialize the global BitmapFilter class
-void bevelFilter_class_init(as_object& global);
+void BevelFilter_class_init(as_object& global);
 
 } // end of gnash namespace
 

Index: server/asobj/BitmapFilter_as.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/BitmapFilter_as.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/asobj/BitmapFilter_as.cpp	27 Aug 2007 03:06:42 -0000	1.1
+++ server/asobj/BitmapFilter_as.cpp	27 Aug 2007 18:13:40 -0000	1.2
@@ -15,67 +15,30 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: BitmapFilter_as.cpp,v 1.1 2007/08/27 03:06:42 cmusick Exp $ */
+/* $Id: BitmapFilter_as.cpp,v 1.2 2007/08/27 18:13:40 cmusick Exp $ */
 
 #include "BitmapFilter.h"
 #include "VM.h"
 #include "builtin_function.h"
 
+#define phelp_helper BitmapFilter_as
+#define phelp_class BitmapFilter
+#include "prophelper.h"
+
 namespace gnash {
 
 class BitmapFilter_as
 {
+    phelp_base_def;
 public:
-    static as_object* Interface(); // To a BitmapFilter
-    static void attachInterface(as_object& o); // Attach the interface.
-    static void registerCtor(as_object& global); // public ctor
-    static as_value ctor(const fn_call& fn); // constructor for BitmapFilter
-
-    static as_value bitmap_clone(const fn_call& fn);
-
-private:
-    static boost::intrusive_ptr<as_object> s_interface;
-    static boost::intrusive_ptr<builtin_function> s_ctor;
+    phelp_i(bitmap_clone);
 };
 
-boost::intrusive_ptr<as_object> BitmapFilter_as::s_interface;
-boost::intrusive_ptr<builtin_function> BitmapFilter_as::s_ctor;
-
-as_object*
-BitmapFilter_as::Interface()
-{
-    if (BitmapFilter_as::s_interface == NULL)
-    {
-        BitmapFilter_as::s_interface = new as_object;
-        VM::get().addStatic(BitmapFilter_as::s_interface.get());
-
-        BitmapFilter_as::attachInterface(*BitmapFilter_as::s_interface);
-    }
-
-    return BitmapFilter_as::s_interface.get();
-}
-
-void
-BitmapFilter_as::attachInterface(as_object& o)
-{
-    o.init_member("clone", new builtin_function(bitmap_clone));
-}
-
-void
-BitmapFilter_as::registerCtor(as_object& global)
-{
-    if (BitmapFilter_as::s_ctor != NULL)
-        return;
+phelp_base_imp( , BitmapFilter);
 
-    BitmapFilter_as::s_ctor = new builtin_function(&BitmapFilter_as::ctor,
-        BitmapFilter_as::Interface());
-    VM::get().addStatic(BitmapFilter_as::s_ctor.get());
-
-    // TODO: Is this correct?
-    BitmapFilter_as::attachInterface(*BitmapFilter_as::s_ctor);
-
-    global.init_member("BitmapFilter", BitmapFilter_as::s_ctor.get());
-}
+phelp_i_attach_begin
+phelp_i_attach(clone, bitmap_clone);
+phelp_i_attach_end
 
 as_value
 BitmapFilter_as::ctor(const fn_call& /*fn*/)
@@ -93,11 +56,6 @@
     return as_value(retval);
 }
 
-void bitmapFilter_class_init(as_object& global)
-{
-   BitmapFilter_as::registerCtor(global);
-}
-
 as_object*
 bitmapFilter_interface()
 {

Index: server/asobj/BitmapFilter_as.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/BitmapFilter_as.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/asobj/BitmapFilter_as.h	27 Aug 2007 03:06:42 -0000	1.1
+++ server/asobj/BitmapFilter_as.h	27 Aug 2007 18:13:41 -0000	1.2
@@ -28,7 +28,7 @@
 class as_object;
 
 /// Initialize the global BitmapFilter class
-void bitmapFilter_class_init(as_object& global);
+void BitmapFilter_class_init(as_object& global);
 
 /// Get the interface, for inheritance.
 as_object *bitmapFilter_interface();

Index: server/asobj/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Makefile.am,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- server/asobj/Makefile.am	27 Aug 2007 03:06:42 -0000	1.42
+++ server/asobj/Makefile.am	27 Aug 2007 18:13:43 -0000	1.43
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.42 2007/08/27 03:06:42 cmusick Exp $
+# $Id: Makefile.am,v 1.43 2007/08/27 18:13:43 cmusick Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -46,13 +46,20 @@
         BevelFilter_as.cpp \
         BitmapFilter_as.cpp \
 	Boolean.cpp	\
+        BlurFilter_as.cpp \
 	Camera.cpp	\
 	Color.cpp	\
+	ColorMatrixFilter_as.cpp \
 	ContextMenu.cpp	\
+	ConvolutionFilter_as.cpp \
 	CustomActions.cpp\
 	Date.cpp	\
+	DropShadowFilter_as.cpp \
 	Error.cpp	\
 	Global.cpp	\
+	GlowFilter_as.cpp \
+	GradientBevelFilter_as.cpp \
+	GradientGlowFilter_as.cpp \
 	Key.cpp		\
 	LoadVars.cpp	\
 	LocalConnection.cpp\
@@ -81,14 +88,21 @@
         BevelFilter_as.h \
         BitmapFilter_as.h \
 	Boolean.h	\
+	BlurFilter_as.h \
 	Camera.h	\
 	Color.h		\
+	ColorMatrixFilter_as.h \
 	ContextMenu.h	\
+	ConvolutionFilter_as.h \
 	CustomActions.h	\
 	Date.h		\
+	DropShadowFilter_as.h \
 	Error.h		\
 	GMath.h		\
 	Global.h	\
+	GlowFilter_as.h \
+	GradientBevelFilter_as.h \
+	GradientGlowFilter_as.h \
 	Key.h 		\
 	LoadVars.h	\
 	LocalConnection.h\
@@ -101,6 +115,7 @@
 	NetStreamGst.h \
 	Number.h	\
 	Object.h	\
+	prophelper.h \
 	Selection.h	\
 	SharedObject.h	\
 	Sound.h 	\

Index: server/parser/filter_factory.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/filter_factory.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/parser/filter_factory.cpp	27 Aug 2007 12:44:28 -0000	1.3
+++ server/parser/filter_factory.cpp	27 Aug 2007 18:13:43 -0000	1.4
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: filter_factory.cpp,v 1.3 2007/08/27 12:44:28 strk Exp $ */
+/* $Id: filter_factory.cpp,v 1.4 2007/08/27 18:13:43 cmusick Exp $ */
 
 #include "filter_factory.h"
 #include "BitmapFilter.h"
@@ -200,13 +200,13 @@
 
     for (int i = 0; i < count; ++i)
     {
-        m_colors.push(as_value(in->read_u8() << 16 + in->read_u8() << 8 + in->read_u8()));
-        m_alphas.push(as_value(in->read_u8()));
+        m_colors->push(as_value(in->read_u8() << 16 + in->read_u8() << 8 + in->read_u8()));
+        m_alphas->push(as_value(in->read_u8()));
     }
 
     for (int i = 0; i < count; ++i)
     {
-        m_ratios.push(as_value(in->read_u8()));
+        m_ratios->push(as_value(in->read_u8()));
     }
 
     m_blurX = in->read_fixed();
@@ -237,9 +237,14 @@
     m_divisor = in->read_float();
     m_bias = in->read_float();
 
+    if (m_matrix == NULL)
+    {
+        m_matrix = new as_array_object;
+    }
+
     for (int i = 0; i < m_matrixX * m_matrixY; ++i)
     {
-        m_matrix.push(as_value(in->read_float()));
+        m_matrix->push(as_value(in->read_float()));
     }
 
     m_color = in->read_u8() << 16 + in->read_u8() << 8 + in->read_u8();
@@ -255,9 +260,12 @@
 
 bool ColorMatrixFilter::read(stream* in)
 {
+    if (m_matrix == NULL)
+        m_matrix = new as_array_object;
+
     for (int i = 0; i < 20; ++i)
     {
-        m_matrix.push(in->read_float());
+        m_matrix->push(in->read_float());
     }
 
     return true;
@@ -269,13 +277,13 @@
 
     for (int i = 0; i < count; ++i)
     {
-        m_colors.push(as_value(in->read_u8() << 16 + in->read_u8() << 8 + in->read_u8()));
-        m_alphas.push(as_value(in->read_u8()));
+        m_colors->push(as_value(in->read_u8() << 16 + in->read_u8() << 8 + in->read_u8()));
+        m_alphas->push(as_value(in->read_u8()));
     }
 
     for (int i = 0; i < count; ++i)
     {
-        m_ratios.push(as_value(in->read_u8()));
+        m_ratios->push(as_value(in->read_u8()));
     }
 
     m_blurX = in->read_fixed();

Index: server/asobj/BlurFilter_as.cpp
===================================================================
RCS file: server/asobj/BlurFilter_as.cpp
diff -N server/asobj/BlurFilter_as.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/asobj/BlurFilter_as.cpp	27 Aug 2007 18:13:41 -0000	1.1
@@ -0,0 +1,66 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+/* $Id: BlurFilter_as.cpp,v 1.1 2007/08/27 18:13:41 cmusick Exp $ */
+
+#include "BitmapFilter_as.h"
+#include "BlurFilter.h"
+#include "VM.h"
+#include "builtin_function.h"
+
+// These _must_ be defined.
+#define phelp_helper BlurFilter_as
+#define phelp_class BlurFilter
+#include "prophelper.h"
+
+namespace gnash {
+
+class BlurFilter_as
+{
+    phelp_base_def;
+public:
+    phelp_gs(blurX);
+    phelp_gs(blurY);
+    phelp_gs(quality);
+};
+
+phelp_base_imp((bitmapFilter_interface()), BlurFilter);
+
+// Filters are property based.
+phelp_i_attach_empty
+
+phelp_gs_attach_begin
+phelp_gs_attach(blurX);
+phelp_gs_attach(blurY);
+phelp_gs_attach(quality);
+phelp_gs_attach_end
+
+phelp_property(float, number<float>, blurX)
+phelp_property(float, number<float>, blurY)
+phelp_property(uint8_t, number<uint8_t>, quality)
+
+as_value
+BlurFilter_as::ctor(const fn_call& /*fn*/)
+{
+    boost::intrusive_ptr<as_object> obj = new BlurFilter(BlurFilter_as::Interface());
+    BlurFilter_as::attachProperties(*obj);
+
+    return as_value(obj.get());
+}
+
+} // Namespace gnash
+

Index: server/asobj/BlurFilter_as.h
===================================================================
RCS file: server/asobj/BlurFilter_as.h
diff -N server/asobj/BlurFilter_as.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/asobj/BlurFilter_as.h	27 Aug 2007 18:13:41 -0000	1.1
@@ -0,0 +1,37 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
+
+#ifndef __GNASH_ASOBJ_BLURFILTER_H__
+#define __GNASH_ASOBJ_BLURFILTER_H__
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+namespace gnash {
+
+class as_object;
+
+/// Initialize the global BlurFilter class
+void BlurFilter_class_init(as_object& global);
+
+} // end of gnash namespace
+
+// __GNASH_ASOBJ_BLURFILTER_H__
+#endif
+

Index: server/asobj/ColorMatrixFilter_as.cpp
===================================================================
RCS file: server/asobj/ColorMatrixFilter_as.cpp
diff -N server/asobj/ColorMatrixFilter_as.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/asobj/ColorMatrixFilter_as.cpp	27 Aug 2007 18:13:41 -0000	1.1
@@ -0,0 +1,59 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+/* $Id: ColorMatrixFilter_as.cpp,v 1.1 2007/08/27 18:13:41 cmusick Exp $ */
+
+#include "BitmapFilter_as.h"
+#include "ColorMatrixFilter.h"
+#include "VM.h"
+#include "builtin_function.h"
+
+#define phelp_helper ColorMatrixFilter_as
+#define phelp_class ColorMatrixFilter
+#include "prophelper.h"
+
+namespace gnash {
+
+class ColorMatrixFilter_as
+{
+    phelp_base_def;
+public:
+    phelp_gs(matrix);
+};
+
+phelp_base_imp((bitmapFilter_interface()), ColorMatrixFilter);
+
+// Filters are purely property based.
+phelp_i_attach_empty
+
+phelp_gs_attach_begin
+phelp_gs_attach(matrix);
+phelp_gs_attach_end
+
+phelp_array_property(matrix);
+
+as_value
+ColorMatrixFilter_as::ctor(const fn_call& /*fn*/)
+{
+    boost::intrusive_ptr<as_object> obj = new ColorMatrixFilter(ColorMatrixFilter_as::Interface());
+    ColorMatrixFilter_as::attachProperties(*obj);
+
+    return as_value(obj.get());
+}
+
+} // Namespace gnash
+

Index: server/asobj/ColorMatrixFilter_as.h
===================================================================
RCS file: server/asobj/ColorMatrixFilter_as.h
diff -N server/asobj/ColorMatrixFilter_as.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/asobj/ColorMatrixFilter_as.h	27 Aug 2007 18:13:41 -0000	1.1
@@ -0,0 +1,37 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
+
+#ifndef __GNASH_ASOBJ_COLORMATRIXFILTER_H__
+#define __GNASH_ASOBJ_COLORMATRIXFILTER_H__
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+namespace gnash {
+
+class as_object;
+
+/// Initialize the global ColorMatrixFilter class
+void ColorMatrixFilter_class_init(as_object& global);
+
+} // end of gnash namespace
+
+// __GNASH_ASOBJ_COLORMATRIXFILTER_H__
+#endif
+

Index: server/asobj/ConvolutionFilter_as.cpp
===================================================================
RCS file: server/asobj/ConvolutionFilter_as.cpp
diff -N server/asobj/ConvolutionFilter_as.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/asobj/ConvolutionFilter_as.cpp	27 Aug 2007 18:13:41 -0000	1.1
@@ -0,0 +1,82 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+/* $Id: ConvolutionFilter_as.cpp,v 1.1 2007/08/27 18:13:41 cmusick Exp $ */
+
+#include "BitmapFilter_as.h"
+#include "ConvolutionFilter.h"
+#include "VM.h"
+#include "builtin_function.h"
+
+#define phelp_helper ConvolutionFilter_as
+#define phelp_class ConvolutionFilter
+#include "prophelper.h"
+
+namespace gnash {
+
+class ConvolutionFilter_as
+{
+    phelp_base_def;
+public:
+    phelp_gs(matrixX);
+    phelp_gs(matrixY);
+    phelp_gs(matrix);
+    phelp_gs(divisor);
+    phelp_gs(bias);
+    phelp_gs(preserveAlpha);
+    phelp_gs(clamp);
+    phelp_gs(color);
+    phelp_gs(alpha);
+};
+
+phelp_base_imp((bitmapFilter_interface()), ConvolutionFilter);
+
+phelp_i_attach_empty
+
+phelp_gs_attach_begin
+phelp_gs_attach(matrixX);
+phelp_gs_attach(matrixY);
+phelp_gs_attach(matrix);
+phelp_gs_attach(divisor);
+phelp_gs_attach(bias);
+phelp_gs_attach(preserveAlpha);
+phelp_gs_attach(clamp);
+phelp_gs_attach(color);
+phelp_gs_attach(alpha);
+phelp_gs_attach_end
+
+phelp_property(uint8_t, number<uint8_t>, matrixX)
+phelp_property(uint8_t, number<uint8_t>, matrixY)
+phelp_property(float, number<float>, divisor)
+phelp_property(float, number<float>, bias)
+phelp_property(bool, bool, preserveAlpha)
+phelp_property(bool, bool, clamp)
+phelp_property(uint32_t, number<uint32_t>, color)
+phelp_property(uint8_t, number<uint8_t>, alpha)
+phelp_array_property(matrix)
+
+as_value
+ConvolutionFilter_as::ctor(const fn_call& /*fn*/)
+{
+    boost::intrusive_ptr<as_object> obj = new ConvolutionFilter(ConvolutionFilter_as::Interface());
+    ConvolutionFilter_as::attachProperties(*obj);
+
+    return as_value(obj.get());
+}
+
+} // Namespace gnash
+

Index: server/asobj/ConvolutionFilter_as.h
===================================================================
RCS file: server/asobj/ConvolutionFilter_as.h
diff -N server/asobj/ConvolutionFilter_as.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/asobj/ConvolutionFilter_as.h	27 Aug 2007 18:13:42 -0000	1.1
@@ -0,0 +1,37 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
+
+#ifndef __GNASH_ASOBJ_CONVOLUTIONFILTER_H__
+#define __GNASH_ASOBJ_CONVOLUTIONFILTER_H__
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+namespace gnash {
+
+class as_object;
+
+/// Initialize the global ConvolutionFilter class
+void ConvolutionFilter_class_init(as_object& global);
+
+} // end of gnash namespace
+
+// __GNASH_ASOBJ_CONVOLUTIONFILTER_H__
+#endif
+

Index: server/asobj/DropShadowFilter_as.cpp
===================================================================
RCS file: server/asobj/DropShadowFilter_as.cpp
diff -N server/asobj/DropShadowFilter_as.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/asobj/DropShadowFilter_as.cpp	27 Aug 2007 18:13:42 -0000	1.1
@@ -0,0 +1,90 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+/* $Id: DropShadowFilter_as.cpp,v 1.1 2007/08/27 18:13:42 cmusick Exp $ */
+
+#include "BitmapFilter_as.h"
+#include "DropShadowFilter.h"
+#include "VM.h"
+#include "builtin_function.h"
+
+// These _must_ be defined.
+#define phelp_helper DropShadowFilter_as
+#define phelp_class DropShadowFilter
+#include "prophelper.h"
+
+namespace gnash {
+
+class DropShadowFilter_as
+{
+    phelp_base_def;
+public:
+    phelp_gs(distance);
+    phelp_gs(angle);
+    phelp_gs(color);
+    phelp_gs(alpha);
+    phelp_gs(blurX);
+    phelp_gs(blurY);
+    phelp_gs(strength);
+    phelp_gs(quality);
+    phelp_gs(inner); 
+    phelp_gs(knockout);
+    phelp_gs(hideObject);
+};
+
+phelp_base_imp((bitmapFilter_interface()), DropShadowFilter);
+
+// Filters are property based.
+phelp_i_attach_empty
+
+phelp_gs_attach_begin
+phelp_gs_attach(distance);
+phelp_gs_attach(angle);
+phelp_gs_attach(color);
+phelp_gs_attach(alpha);
+phelp_gs_attach(blurX);
+phelp_gs_attach(blurY);
+phelp_gs_attach(strength);
+phelp_gs_attach(quality);
+phelp_gs_attach(inner);
+phelp_gs_attach(knockout);
+phelp_gs_attach(hideObject);
+phelp_gs_attach_end
+
+phelp_property(float, number<float>, distance)
+phelp_property(float, number<float>, angle)
+phelp_property(uint32_t, number<uint32_t>, color)
+phelp_property(uint8_t, number<uint8_t>, alpha)
+phelp_property(float, number<float>, blurX)
+phelp_property(float, number<float>, blurY)
+phelp_property(float, number<float>, strength)
+phelp_property(uint8_t, number<uint8_t>, quality)
+phelp_property(bool, bool, inner)
+phelp_property(bool, bool, knockout)
+phelp_property(bool, bool, hideObject)
+
+as_value
+DropShadowFilter_as::ctor(const fn_call& /*fn*/)
+{
+    boost::intrusive_ptr<as_object> obj = new DropShadowFilter(DropShadowFilter_as::Interface());
+    DropShadowFilter_as::attachProperties(*obj);
+
+    return as_value(obj.get());
+}
+
+} // Namespace gnash
+

Index: server/asobj/DropShadowFilter_as.h
===================================================================
RCS file: server/asobj/DropShadowFilter_as.h
diff -N server/asobj/DropShadowFilter_as.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/asobj/DropShadowFilter_as.h	27 Aug 2007 18:13:42 -0000	1.1
@@ -0,0 +1,37 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
+
+#ifndef __GNASH_ASOBJ_DROPSHADOWFILTER_H__
+#define __GNASH_ASOBJ_DROPSHADOWFILTER_H__
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+namespace gnash {
+
+class as_object;
+
+/// Initialize the global DropShadowFilter class
+void DropShadowFilter_class_init(as_object& global);
+
+} // end of gnash namespace
+
+// __GNASH_ASOBJ_DROPSHADOWFILTER_H__
+#endif
+

Index: server/asobj/GlowFilter_as.cpp
===================================================================
RCS file: server/asobj/GlowFilter_as.cpp
diff -N server/asobj/GlowFilter_as.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/asobj/GlowFilter_as.cpp	27 Aug 2007 18:13:42 -0000	1.1
@@ -0,0 +1,81 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+/* $Id: GlowFilter_as.cpp,v 1.1 2007/08/27 18:13:42 cmusick Exp $ */
+
+#include "BitmapFilter_as.h"
+#include "GlowFilter.h"
+#include "VM.h"
+#include "builtin_function.h"
+
+// These _must_ be defined.
+#define phelp_helper GlowFilter_as
+#define phelp_class GlowFilter
+#include "prophelper.h"
+
+namespace gnash {
+
+class GlowFilter_as
+{
+    phelp_base_def;
+public:
+    phelp_gs(color);
+    phelp_gs(alpha);
+    phelp_gs(blurX);
+    phelp_gs(blurY);
+    phelp_gs(strength);
+    phelp_gs(quality);
+    phelp_gs(inner); 
+    phelp_gs(knockout);
+};
+
+phelp_base_imp((bitmapFilter_interface()), GlowFilter);
+
+// Filters are property based.
+phelp_i_attach_empty
+
+phelp_gs_attach_begin
+phelp_gs_attach(color);
+phelp_gs_attach(alpha);
+phelp_gs_attach(blurX);
+phelp_gs_attach(blurY);
+phelp_gs_attach(strength);
+phelp_gs_attach(quality);
+phelp_gs_attach(inner);
+phelp_gs_attach(knockout);
+phelp_gs_attach_end
+
+phelp_property(uint32_t, number<uint32_t>, color)
+phelp_property(uint8_t, number<uint8_t>, alpha)
+phelp_property(float, number<float>, blurX)
+phelp_property(float, number<float>, blurY)
+phelp_property(float, number<float>, strength)
+phelp_property(uint8_t, number<uint8_t>, quality)
+phelp_property(bool, bool, inner)
+phelp_property(bool, bool, knockout)
+
+as_value
+GlowFilter_as::ctor(const fn_call& /*fn*/)
+{
+    boost::intrusive_ptr<as_object> obj = new GlowFilter(GlowFilter_as::Interface());
+    GlowFilter_as::attachProperties(*obj);
+
+    return as_value(obj.get());
+}
+
+} // Namespace gnash
+

Index: server/asobj/GlowFilter_as.h
===================================================================
RCS file: server/asobj/GlowFilter_as.h
diff -N server/asobj/GlowFilter_as.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/asobj/GlowFilter_as.h	27 Aug 2007 18:13:42 -0000	1.1
@@ -0,0 +1,37 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
+
+#ifndef __GNASH_ASOBJ_GLOWFILTER_H__
+#define __GNASH_ASOBJ_GLOWFILTER_H__
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+namespace gnash {
+
+class as_object;
+
+/// Initialize the global GlowFilter class
+void GlowFilter_class_init(as_object& global);
+
+} // end of gnash namespace
+
+// __GNASH_ASOBJ_GLOWFILTER_H__
+#endif
+

Index: server/asobj/GradientBevelFilter_as.cpp
===================================================================
RCS file: server/asobj/GradientBevelFilter_as.cpp
diff -N server/asobj/GradientBevelFilter_as.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/asobj/GradientBevelFilter_as.cpp	27 Aug 2007 18:13:43 -0000	1.1
@@ -0,0 +1,125 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+/* $Id: GradientBevelFilter_as.cpp,v 1.1 2007/08/27 18:13:43 cmusick Exp $ */
+
+#include "BitmapFilter_as.h"
+#include "GradientBevelFilter.h"
+#include "VM.h"
+#include "builtin_function.h"
+
+// These _must_ be defined for prophelpers to work correctly.
+// This is enforced by the file itself.
+#define phelp_helper GradientBevelFilter_as
+#define phelp_class GradientBevelFilter
+#include "prophelper.h"
+
+namespace gnash {
+
+class GradientBevelFilter_as
+{
+    phelp_base_def;
+public:
+    phelp_gs(distance);
+    phelp_gs(angle);
+    phelp_gs(colors);
+    phelp_gs(alphas);
+    phelp_gs(ratios);
+    phelp_gs(blurX);
+    phelp_gs(blurY);
+    phelp_gs(strength);
+    phelp_gs(quality);
+    phelp_gs(type); // No automation
+    phelp_gs(knockout);
+};
+
+phelp_base_imp((bitmapFilter_interface()), GradientBevelFilter);
+
+// Filters are purely property based.
+phelp_i_attach_empty
+
+// Begin attaching properties, then attach them, then end.
+phelp_gs_attach_begin
+phelp_gs_attach(distance);
+phelp_gs_attach(angle);
+phelp_gs_attach(colors);
+phelp_gs_attach(alphas);
+phelp_gs_attach(ratios);
+phelp_gs_attach(blurX);
+phelp_gs_attach(blurY);
+phelp_gs_attach(strength);
+phelp_gs_attach(quality);
+phelp_gs_attach(type);
+phelp_gs_attach(knockout);
+phelp_gs_attach_end
+
+phelp_property(float, number<float>, distance)
+phelp_property(float, number<float>, angle)
+phelp_array_property(colors)
+phelp_array_property(alphas)
+phelp_array_property(ratios)
+phelp_property(float, number<float>, blurX)
+phelp_property(float, number<float>, blurY)
+phelp_property(float, number<float>, strength)
+phelp_property(uint8_t, number<uint8_t>, quality)
+// Type is not automatable.
+phelp_property(bool, bool, knockout)
+
+as_value
+GradientBevelFilter_as::type_gs(const fn_call& fn)
+{
+    boost::intrusive_ptr<GradientBevelFilter> ptr = ensureType<GradientBevelFilter>(fn.this_ptr);
+
+    if (fn.nargs == 0) // getter
+    {
+        switch (ptr->m_type)
+        {
+            case GradientBevelFilter::FULL_BEVEL:
+                return as_value("full");
+                break;
+            default:
+            case GradientBevelFilter::INNER_BEVEL:
+                return as_value("inner");
+                break;
+            case GradientBevelFilter::OUTER_BEVEL:
+                return as_value("outer");
+                break;
+        }
+    }
+    // setter
+    string type = fn.arg(0).to_string();
+    if (type == "outer")
+        ptr->m_type = GradientBevelFilter::OUTER_BEVEL;
+    if (type == "inner")
+        ptr->m_type = GradientBevelFilter::INNER_BEVEL;
+    if (type == "full")
+        ptr->m_type = GradientBevelFilter::FULL_BEVEL;
+
+    return as_value();
+}
+
+as_value
+GradientBevelFilter_as::ctor(const fn_call& /*fn*/)
+{
+    boost::intrusive_ptr<as_object> obj = new GradientBevelFilter(GradientBevelFilter_as::Interface());
+    GradientBevelFilter_as::attachProperties(*obj);
+
+    return as_value(obj.get());
+}
+
+} // Namespace gnash
+

Index: server/asobj/GradientBevelFilter_as.h
===================================================================
RCS file: server/asobj/GradientBevelFilter_as.h
diff -N server/asobj/GradientBevelFilter_as.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/asobj/GradientBevelFilter_as.h	27 Aug 2007 18:13:43 -0000	1.1
@@ -0,0 +1,37 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
+
+#ifndef __GNASH_ASOBJ_GRADIENTBEVELFILTER_H__
+#define __GNASH_ASOBJ_GRADIENTBEVELFILTER_H__
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+namespace gnash {
+
+class as_object;
+
+/// Initialize the global GradientBevelFilter class
+void GradientBevelFilter_class_init(as_object& global);
+
+} // end of gnash namespace
+
+// __GNASH_ASOBJ_GRADIENTBEVELFILTER_H__
+#endif
+

Index: server/asobj/GradientGlowFilter_as.cpp
===================================================================
RCS file: server/asobj/GradientGlowFilter_as.cpp
diff -N server/asobj/GradientGlowFilter_as.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/asobj/GradientGlowFilter_as.cpp	27 Aug 2007 18:13:43 -0000	1.1
@@ -0,0 +1,125 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+/* $Id: GradientGlowFilter_as.cpp,v 1.1 2007/08/27 18:13:43 cmusick Exp $ */
+
+#include "BitmapFilter_as.h"
+#include "GradientGlowFilter.h"
+#include "VM.h"
+#include "builtin_function.h"
+
+// These _must_ be defined for prophelpers to work correctly.
+// This is enforced by the file itself.
+#define phelp_helper GradientGlowFilter_as
+#define phelp_class GradientGlowFilter
+#include "prophelper.h"
+
+namespace gnash {
+
+class GradientGlowFilter_as
+{
+    phelp_base_def;
+public:
+    phelp_gs(distance);
+    phelp_gs(angle);
+    phelp_gs(colors);
+    phelp_gs(alphas);
+    phelp_gs(ratios);
+    phelp_gs(blurX);
+    phelp_gs(blurY);
+    phelp_gs(strength);
+    phelp_gs(quality);
+    phelp_gs(type); // No automation
+    phelp_gs(knockout);
+};
+
+phelp_base_imp((bitmapFilter_interface()), GradientGlowFilter);
+
+// Filters are purely property based.
+phelp_i_attach_empty
+
+// Begin attaching properties, then attach them, then end.
+phelp_gs_attach_begin
+phelp_gs_attach(distance);
+phelp_gs_attach(angle);
+phelp_gs_attach(colors);
+phelp_gs_attach(alphas);
+phelp_gs_attach(ratios);
+phelp_gs_attach(blurX);
+phelp_gs_attach(blurY);
+phelp_gs_attach(strength);
+phelp_gs_attach(quality);
+phelp_gs_attach(type);
+phelp_gs_attach(knockout);
+phelp_gs_attach_end
+
+phelp_property(float, number<float>, distance)
+phelp_property(float, number<float>, angle)
+phelp_array_property(colors)
+phelp_array_property(alphas)
+phelp_array_property(ratios)
+phelp_property(float, number<float>, blurX)
+phelp_property(float, number<float>, blurY)
+phelp_property(float, number<float>, strength)
+phelp_property(uint8_t, number<uint8_t>, quality)
+// Type is not automatable.
+phelp_property(bool, bool, knockout)
+
+as_value
+GradientGlowFilter_as::type_gs(const fn_call& fn)
+{
+    boost::intrusive_ptr<GradientGlowFilter> ptr = ensureType<GradientGlowFilter>(fn.this_ptr);
+
+    if (fn.nargs == 0) // getter
+    {
+        switch (ptr->m_type)
+        {
+            case GradientGlowFilter::FULL_GLOW:
+                return as_value("full");
+                break;
+            default:
+            case GradientGlowFilter::INNER_GLOW:
+                return as_value("inner");
+                break;
+            case GradientGlowFilter::OUTER_GLOW:
+                return as_value("outer");
+                break;
+        }
+    }
+    // setter
+    string type = fn.arg(0).to_string();
+    if (type == "outer")
+        ptr->m_type = GradientGlowFilter::OUTER_GLOW;
+    if (type == "inner")
+        ptr->m_type = GradientGlowFilter::INNER_GLOW;
+    if (type == "full")
+        ptr->m_type = GradientGlowFilter::FULL_GLOW;
+
+    return as_value();
+}
+
+as_value
+GradientGlowFilter_as::ctor(const fn_call& /*fn*/)
+{
+    boost::intrusive_ptr<as_object> obj = new GradientGlowFilter(GradientGlowFilter_as::Interface());
+    GradientGlowFilter_as::attachProperties(*obj);
+
+    return as_value(obj.get());
+}
+
+} // Namespace gnash
+

Index: server/asobj/GradientGlowFilter_as.h
===================================================================
RCS file: server/asobj/GradientGlowFilter_as.h
diff -N server/asobj/GradientGlowFilter_as.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/asobj/GradientGlowFilter_as.h	27 Aug 2007 18:13:43 -0000	1.1
@@ -0,0 +1,37 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
+
+#ifndef __GNASH_ASOBJ_GRADIENTGLOWFILTER_H__
+#define __GNASH_ASOBJ_GRADIENTGLOWFILTER_H__
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+namespace gnash {
+
+class as_object;
+
+/// Initialize the global GradientGlowFilter class
+void GradientGlowFilter_class_init(as_object& global);
+
+} // end of gnash namespace
+
+// __GNASH_ASOBJ_GRADIENTGLOWFILTER_H__
+#endif
+

Index: server/asobj/prophelper.h
===================================================================
RCS file: server/asobj/prophelper.h
diff -N server/asobj/prophelper.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/asobj/prophelper.h	27 Aug 2007 18:13:43 -0000	1.1
@@ -0,0 +1,191 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
+
+// A few defines to make life easier on standard properties.
+// #include this where you need it, not at the top.
+// First invoke: start_properties(phelp_helper, phelp_class) with
+// the helper class (adapter) name and the object class name.
+// sp_type -- the C++ type of the member
+// sp_convert -- the conversion function from as_value
+// sp_name -- the name of the property.
+//   Defines a function in phelp_helper with sp_name##_gs as its name
+//   that depends on m_##sp_name being the member of the class which
+//   corresponds to the sp_name property in ActionScript.
+//   See BlurFilter_as.cpp for usage.
+//
+#ifdef phelp_done
+#undef phelp_helper
+#undef phelp_class
+#undef phelp_property
+#undef phelp_array_property
+#undef phelp_base_def
+#undef phelp_base_imp
+#undef phelp_gs
+#undef phelp_gs_attach
+#undef phelp_gs_attach_begin
+#undef phelp_gs_attach_end
+#undef phelp_gs_attach_empty
+#undef phelp_i
+#undef phelp_i_attach
+#undef phelp_i_attach_begin
+#undef phelp_i_attach_end
+#undef phelp_i_attach_empty
+#else /* phelp_done */
+#ifdef phelp_helper
+#ifdef phelp_class
+
+#define phelp_property(sp_type, sp_convert, sp_name) \
+as_value \
+phelp_helper::sp_name##_gs(const fn_call& fn) \
+{ \
+    boost::intrusive_ptr<phelp_class> ptr = ensureType<phelp_class>(fn.this_ptr); \
+\
+    if (fn.nargs == 0) /* getter */ \
+    { \
+        return as_value(ptr->m_##sp_name ); \
+    } \
+    /* setter */ \
+    sp_type sp_##sp_name = fn.arg(0).to_##sp_convert (); \
+    ptr->m_##sp_name = sp_##sp_name; \
+\
+    return as_value(); \
+}
+
+#define phelp_array_property(sp_name) \
+as_value \
+phelp_helper::sp_name##_gs(const fn_call& fn) \
+{ \
+    boost::intrusive_ptr<phelp_class> ptr = ensureType<phelp_class>(fn.this_ptr); \
+\
+    if (fn.nargs == 0) /* getter */ \
+    { \
+        boost::intrusive_ptr<as_object> tmp = ensureType<as_object>(ptr->m_##sp_name); \
+        return as_value(tmp); \
+    } \
+    /* setter */ \
+    boost::intrusive_ptr<as_object> obj = fn.arg(0).to_object(); \
+    boost::intrusive_ptr<as_array_object> ap = ensureType<as_array_object>(obj); \
+    ptr->m_##sp_name = ap; \
+\
+    return as_value(); \
+}
+
+#define phelp_base_def \
+public: \
+    static as_object* Interface(); \
+    static void attachInterface(as_object& o); \
+    static void attachProperties(as_object& o); \
+\
+    static void registerCtor(as_object& global); \
+\
+    static as_value ctor(const fn_call& fn); \
+private: \
+    static boost::intrusive_ptr<as_object> s_interface; \
+    static boost::intrusive_ptr<builtin_function> s_ctor
+
+#define phelp_base_imp(sp_interface, sp_regname) \
+boost::intrusive_ptr<as_object> phelp_helper::s_interface; \
+boost:: intrusive_ptr<builtin_function> phelp_helper::s_ctor; \
+\
+as_object* \
+phelp_helper::Interface() \
+{ \
+    if (phelp_helper::s_interface == NULL) \
+    { \
+        phelp_helper::s_interface = new as_object sp_interface; \
+        VM::get().addStatic(phelp_helper::s_interface.get()); \
+\
+        phelp_helper::attachInterface(*phelp_helper::s_interface); \
+     } \
+\
+     return phelp_helper::s_interface.get(); \
+} \
+\
+void \
+phelp_helper::registerCtor(as_object& global) \
+{ \
+    if (phelp_helper::s_ctor != NULL) \
+        return; \
+\
+    phelp_helper::s_ctor = new builtin_function(&phelp_helper::ctor, \
+        phelp_helper::Interface()); \
+    VM::get().addStatic(phelp_helper::s_ctor.get()); \
+\
+    /* TODO: Is this correct? */ \
+    phelp_helper::attachInterface(*phelp_helper::s_ctor); \
+\
+    global.init_member(#sp_regname , phelp_helper::s_ctor.get()); \
+} \
+\
+void sp_regname##_class_init(as_object& global) \
+{ \
+    phelp_helper::registerCtor(global); \
+} 
+
+#define phelp_i(sp_name) \
+    static as_value sp_name(const fn_call& fn)
+
+#define phelp_gs(sp_name) \
+    static as_value sp_name##_gs(const fn_call& fn)
+
+#define phelp_gs_attach_begin \
+void \
+phelp_helper::attachProperties(as_object& o) \
+{ \
+    boost::intrusive_ptr<builtin_function> gs;
+
+#define phelp_gs_attach_end \
+}
+
+#define phelp_gs_attach_empty \
+void \
+phelp_helper::attachProperties(as_object& /* o */) \
+{ \
+    return; \
+}
+
+#define phelp_gs_attach(sp_name) \
+    gs = new builtin_function(phelp_helper::sp_name##_gs, NULL); \
+    o.init_property(#sp_name , *gs, *gs)
+
+#define phelp_i_attach_begin \
+void \
+phelp_helper::attachInterface(as_object& o) \
+{ \
+    boost::intrusive_ptr<builtin_function> gs; 
+
+#define phelp_i_attach_end \
+}
+
+#define phelp_i_attach_empty \
+void \
+phelp_helper::attachInterface(as_object& /* o */) \
+{ \
+}
+
+#define phelp_i_attach(sp_name, sp_code_name) \
+    o.init_member(#sp_name , new builtin_function(sp_code_name))
+
+#else /* phelp_class */
+#error phelp_class must be defined.
+#endif /* phelp_class */
+#else /* phelp_helper */
+#error phelp_helper must be defined.
+#endif /* phelp_helper */
+#endif /* phelp_done */
+



From MAILER-DAEMON Mon Aug 27 14:14:48 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPj6u-0002DJ-BR
	for mharc-gnash-commit@gnu.org; Mon, 27 Aug 2007 14:14:48 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPj6s-0002Cv-KZ
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 14:14:46 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPj6s-0002CU-5u
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 14:14:46 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPj6s-0002CK-2b
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 14:14:46 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <chadmusick@msbx.net>) id 1IPj6r-00061x-TA
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 14:14:45 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <chadmusick@msbx.net>) id 1IPj6r-0003bV-FA
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 18:14:45 +0000
Received: from cmusick by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <cmusick@savannah.gnu.org>) id 1IPj6r-0003bL-7Z
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 18:14:45 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPj6r-0003bL-7Z@cvs.savannah.gnu.org>
From: Chad Musick <chadmusick@msbx.net>
Date: Mon, 27 Aug 2007 18:14:45 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 18:14:46 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Chad Musick <cmusick>	07/08/27 18:14:45

Modified files:
	.              : ChangeLog 

Log message:
	Remove conflict indicators.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4124&r2=1.4125

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4124
retrieving revision 1.4125
diff -u -b -r1.4124 -r1.4125
--- ChangeLog	27 Aug 2007 18:13:38 -0000	1.4124
+++ ChangeLog	27 Aug 2007 18:14:44 -0000	1.4125
@@ -1,4 +1,3 @@
-<<<<<<< ChangeLog
 2007-08-28 Chad Musick <chadmusick@msbx.net>
 
 	* server/asobj/BlurFilter_as.cpp,.h
@@ -25,14 +24,12 @@
 	* server/asobj/Makefile.am
 	  Add new files
 	 
-=======
 2007-08-27 Sandro Santilli <strk@keybit.net>
 
 	* libbase/utility.h: don't define exp2(), it's going to clash
 	  with existing symbol on most systems (except some BSDen)...
 	  Please provide a better patch for BSD.
 
->>>>>>> 1.4123
 2007-08-27 Deanna Phillips <deanna>
 
 	* testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp: include



From MAILER-DAEMON Mon Aug 27 14:39:24 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPjUi-0005tC-Kt
	for mharc-gnash-commit@gnu.org; Mon, 27 Aug 2007 14:39:24 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPjUh-0005t7-Ky
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 14:39:23 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPjUg-0005sv-14
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 14:39:22 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPjUf-0005ss-Rn
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 14:39:21 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IPjUf-0005gm-Ib
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 14:39:21 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IPjUe-0004v7-GQ
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 18:39:20 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IPjUe-0004v4-BW
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 18:39:20 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPjUe-0004v4-BW@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 27 Aug 2007 18:39:20 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/parser/shape_character_d...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 18:39:23 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/27 18:39:20

Modified files:
	.              : ChangeLog 
	server/parser  : shape_character_def.cpp 

Log message:
	        * server/parser/shape_character_def.cpp (read): use ints for twips
	          values, convert to float only when needed (construction of the
	          edges and paths). [last patch was bogus]

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4125&r2=1.4126
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/shape_character_def.cpp?cvsroot=gnash&r1=1.36&r2=1.37

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4125
retrieving revision 1.4126
diff -u -b -r1.4125 -r1.4126
--- ChangeLog	27 Aug 2007 18:14:44 -0000	1.4125
+++ ChangeLog	27 Aug 2007 18:39:19 -0000	1.4126
@@ -1,3 +1,9 @@
+2007-08-28 Sandro Santilli <strk@keybit.net>
+
+	* server/parser/shape_character_def.cpp (read): use ints for twips
+	  values, convert to float only when needed (construction of the
+	  edges and paths). [last patch was bogus]
+
 2007-08-28 Chad Musick <chadmusick@msbx.net>
 
 	* server/asobj/BlurFilter_as.cpp,.h

Index: server/parser/shape_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/shape_character_def.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- server/parser/shape_character_def.cpp	27 Aug 2007 17:28:02 -0000	1.36
+++ server/parser/shape_character_def.cpp	27 Aug 2007 18:39:19 -0000	1.37
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: shape_character_def.cpp,v 1.36 2007/08/27 17:28:02 strk Exp $ */
+/* $Id: shape_character_def.cpp,v 1.37 2007/08/27 18:39:19 strk Exp $ */
 
 // Based on the public domain shape.cpp of Thatcher Ulrich <tu@tulrich.com> 2003
 
@@ -219,7 +219,7 @@
     // is simple but not optimally efficient.
     int	fill_base = 0;
     int	line_base = 0;
-    float	x = 0, y = 0;
+    int		x = 0, y = 0;
     path	current_path;
 
 #define SHAPE_LOG 0
@@ -255,8 +255,8 @@
 		int	move_x = in->read_sint(num_move_bits);
 		int	move_y = in->read_sint(num_move_bits);
 
-		x = (float) move_x;
-		y = (float) move_y;
+		x = move_x;
+		y = move_y;
 
 		// Set the beginning of the path.
 		current_path.m_ax = x;
@@ -434,10 +434,10 @@
 	    if (edge_flag == 0) {
 		// curved edge
 		int num_bits = 2 + in->read_uint(4);
-		float	cx = x + in->read_sint(num_bits);
-		float	cy = y + in->read_sint(num_bits);
-		float	ax = cx + in->read_sint(num_bits);
-		float	ay = cy + in->read_sint(num_bits);
+		int	cx = x + in->read_sint(num_bits);
+		int	cy = y + in->read_sint(num_bits);
+		int	ax = cx + in->read_sint(num_bits);
+		int	ay = cy + in->read_sint(num_bits);
 
 #if SHAPE_LOG
 		IF_VERBOSE_PARSE (
@@ -452,20 +452,20 @@
 	    } else {
 		// straight edge
 		int	num_bits = 2 + in->read_uint(4);
-		int	line_flag = in->read_uint(1);
-		float	dx = 0, dy = 0;
+		bool	line_flag = in->read_bit();
+		int	dx = 0, dy = 0;
 		if (line_flag) {
 		    // General line.
-		    dx = (float) in->read_sint(num_bits);
-		    dy = (float) in->read_sint(num_bits);
+		    dx = in->read_sint(num_bits);
+		    dy = in->read_sint(num_bits);
 		} else {
-		    int	vert_flag = in->read_uint(1);
+		    bool vert_flag = in->read_bit();
 		    if (vert_flag == 0) {
 			// Horizontal line.
-			dx = (float) in->read_sint(num_bits);
+			dx = in->read_sint(num_bits);
 		    } else {
 			// Vertical line.
-			dy = (float) in->read_sint(num_bits);
+			dy = in->read_sint(num_bits);
 		    }
 		}
 



From MAILER-DAEMON Mon Aug 27 14:53:12 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPji4-0002qD-FK
	for mharc-gnash-commit@gnu.org; Mon, 27 Aug 2007 14:53:12 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPji2-0002oX-CK
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 14:53:10 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPji1-0002nn-0V
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 14:53:09 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPji0-0002nZ-GH
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 14:53:08 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IPjhz-0001Uk-EO
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 14:53:08 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IPjhq-0006b5-CV
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 18:52:58 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IPjhq-0006b2-8n
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 18:52:58 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPjhq-0006b2-8n@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 27 Aug 2007 18:52:58 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/stream.cpp server/stream.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 18:53:10 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/27 18:52:58

Modified files:
	.              : ChangeLog 
	server         : stream.cpp stream.h 

Log message:
	        * server/stream.{cpp,h}: inlined align(), cleanups in read_uint().

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4126&r2=1.4127
http://cvs.savannah.gnu.org/viewcvs/gnash/server/stream.cpp?cvsroot=gnash&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/gnash/server/stream.h?cvsroot=gnash&r1=1.26&r2=1.27

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4126
retrieving revision 1.4127
diff -u -b -r1.4126 -r1.4127
--- ChangeLog	27 Aug 2007 18:39:19 -0000	1.4126
+++ ChangeLog	27 Aug 2007 18:52:57 -0000	1.4127
@@ -1,5 +1,9 @@
 2007-08-28 Sandro Santilli <strk@keybit.net>
 
+	* server/stream.{cpp,h}: inlined align(), cleanups in read_uint().
+
+2007-08-28 Sandro Santilli <strk@keybit.net>
+
 	* server/parser/shape_character_def.cpp (read): use ints for twips
 	  values, convert to float only when needed (construction of the
 	  edges and paths). [last patch was bogus]

Index: server/stream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/stream.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- server/stream.cpp	27 Aug 2007 16:19:31 -0000	1.30
+++ server/stream.cpp	27 Aug 2007 18:52:58 -0000	1.31
@@ -75,16 +75,18 @@
 		// should be 24, check why htf_sweet.swf fails this assertion
 		assert(bitcount <= 32);
 
-		uint32_t value = 0;
 
 #define OPTIMIZE_FOR_MULTIBYTE_BITS_READ 1
 
 #ifdef OPTIMIZE_FOR_MULTIBYTE_BITS_READ
+
 		// Optimization for multibyte read
 		if ( bitcount > m_unused_bits )
 		{
 			typedef unsigned char byte;
 
+			uint32_t value = 0;
+
 			if (m_unused_bits) // Consume all the unused bits.
 			{
 				int unusedMask = (1 << m_unused_bits)-1;
@@ -120,9 +122,10 @@
 				m_unused_bits = 0;
 			}
 			
+			return value;
+			
 		}
-		else
-		{
+
 			if (!m_unused_bits)
 			{
 				m_current_byte = m_input->read_byte();
@@ -136,8 +139,8 @@
 			if (bitcount == m_unused_bits)
 			{
 				// Consume all the unused bits.
-				value |= (m_current_byte&unusedMask);
 				m_unused_bits = 0;
+			return (m_current_byte&unusedMask);
 			}
 			else
 			{
@@ -145,12 +148,13 @@
 				// Consume some of the unused bits.
 
 				m_unused_bits -= bitcount;
-				value |= ((m_current_byte&unusedMask) >> m_unused_bits);
-			}
+			return ((m_current_byte&unusedMask) >> m_unused_bits);
 		}
 
 #else // ndef OPTIMIZE_FOR_MULTIBYTE_BITS_READ
 
+		uint32_t value = 0;
+
 		unsigned short bits_needed = bitcount;
 		do
 		{
@@ -190,10 +194,11 @@
 			}
 		}
 		while (bits_needed > 0);
-#endif // ndef OPTIMIZE_FOR_MULTIBYTE_BITS_READ
 
 		//std::cerr << "Returning value: " << value << " unused bits: " << (int)m_unused_bits << std::endl;
 		return value;
+#endif // ndef OPTIMIZE_FOR_MULTIBYTE_BITS_READ
+
 	}
 
 
@@ -249,8 +254,6 @@
 		return static_cast<float> (m_input->read_le32());
 	}
 
-	void	stream::align() { m_unused_bits = 0; m_current_byte = 0; }
-
 	uint8_t	stream::read_u8() { align(); return m_input->read_byte(); }
 	int8_t	stream::read_s8() { align(); return m_input->read_byte(); }
 	uint16_t	stream::read_u16()

Index: server/stream.h
===================================================================
RCS file: /sources/gnash/gnash/server/stream.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- server/stream.h	27 Aug 2007 12:09:05 -0000	1.26
+++ server/stream.h	27 Aug 2007 18:52:58 -0000	1.27
@@ -72,8 +72,12 @@
 		float	read_float();
 
 		/// \brief
-		/// Correct for any unused bits from a uint read.
-		void	align();
+		/// Discard any left-over bits from previous bit reads
+		void	align()
+		{
+			m_unused_bits=0;
+			// m_current_byte = 0; // this is not needed
+		}
 
 		unsigned read(char *buf, unsigned count);
 		uint8_t  read_u8();



From MAILER-DAEMON Mon Aug 27 17:15:19 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPlvb-0006UD-Fh
	for mharc-gnash-commit@gnu.org; Mon, 27 Aug 2007 17:15:19 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPlva-0006TX-Ay
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 17:15:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPlvZ-0006So-K4
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 17:15:17 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPlvZ-0006Sj-Ci
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 17:15:17 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1IPlvZ-00033C-6e
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 17:15:17 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <markus@unixrus.se>) id 1IPlvU-000808-5B
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 21:15:12 +0000
Received: from nihilus by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <nihilus@savannah.gnu.org>) id 1IPlvT-000800-PW
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 21:15:11 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPlvT-000800-PW@cvs.savannah.gnu.org>
From: Markus Gothe <markus@unixrus.se>
Date: Mon, 27 Aug 2007 21:15:11 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog configure.ac libbase/utility.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 21:15:18 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Markus Gothe <nihilus>	07/08/27 21:15:11

Modified files:
	.              : ChangeLog configure.ac 
	libbase        : utility.h 

Log message:
	Check for exp2() and log2()

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4127&r2=1.4128
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.407&r2=1.408
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/utility.h?cvsroot=gnash&r1=1.28&r2=1.29

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4127
retrieving revision 1.4128
diff -u -b -r1.4127 -r1.4128
--- ChangeLog	27 Aug 2007 18:52:57 -0000	1.4127
+++ ChangeLog	27 Aug 2007 21:15:10 -0000	1.4128
@@ -92,6 +92,7 @@
 2007-08-27 Markus Gothe <nietzsche@lysator.liu.se>
 
 	* libbase/utility.h: defined exp2() as it's missing on some BSDen.
+	* configure.ac check for exp2() and log2().
 
 2007-08-27 Zou Lunkai <zoulunkai@gmail.com>
 	

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.407
retrieving revision 1.408
diff -u -b -r1.407 -r1.408
--- configure.ac	26 Aug 2007 10:23:48 -0000	1.407
+++ configure.ac	27 Aug 2007 21:15:10 -0000	1.408
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.407 2007/08/26 10:23:48 strk Exp $
+dnl $Id: configure.ac,v 1.408 2007/08/27 21:15:10 nihilus Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -777,6 +777,9 @@
 AC_CHECK_LIB(m, sqrt)
 AC_CHECK_LIB(c, getpwnam,AC_DEFINE(HAVE_GETPWNAM, 1, [Has getpwnam] ))
 
+AC_CHECK_LIB(m, exp2, AC_DEFINE(HAVE_EXP2, 1, [Has exp2()]))
+AC_CHECK_LIB(m, log2, AC_DEFINE(HAVE_LOG2, 1, [Has log2()]))
+
 dnl don't look for X11 when using a raw framebuffer for the GUI
 if test x$build_gtk = xyes -o x$build_kde = xyes -o x$build_fltk = xyes -o x$build_sdl = xyes; then
 dnl AC_PATH_XTRA

Index: libbase/utility.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/utility.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- libbase/utility.h	27 Aug 2007 18:12:30 -0000	1.28
+++ libbase/utility.h	27 Aug 2007 21:15:11 -0000	1.29
@@ -113,10 +113,13 @@
 //This is from C99.
 const float LN_2 = 0.693147180559945f;
 // the overridden log(f) will use logf IFF f is a float
+#ifndef HAVE_LOG2
 inline float	log2(float f) { return std::log(f) / LN_2; }
+#endif
 //exp2 might be missing on Net-/OpenBSD.
-// TODO: check availability with a configure macro 
-//inline float	exp2(double x) { return std::pow((double)2, double(x)); }
+#ifndef HAVE_EXP2
+inline float	exp2(double x) { return std::pow((double)2, double(x)); }
+#endif
 inline int	fchop( float f ) { return (int) f; }	// replace w/ inline asm if desired
 inline int	frnd(float f) { return fchop(f + 0.5f); }	// replace with inline asm if desired
 



From MAILER-DAEMON Mon Aug 27 17:18:15 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPlyR-0001K7-Cl
	for mharc-gnash-commit@gnu.org; Mon, 27 Aug 2007 17:18:15 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPlyQ-0001I5-5J
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 17:18:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPlyO-0001Fp-Vi
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 17:18:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPlyO-0001FU-Ox
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 17:18:12 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1IPlyO-0003Xb-9D
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 17:18:12 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <markus@unixrus.se>) id 1IPlyN-0008Ni-HQ
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 21:18:11 +0000
Received: from nihilus by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <nihilus@savannah.gnu.org>) id 1IPlyN-0008Ne-7p
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 21:18:11 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPlyN-0008Ne-7p@cvs.savannah.gnu.org>
From: Markus Gothe <markus@unixrus.se>
Date: Mon, 27 Aug 2007 21:18:11 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash configure.ac libbase/utility.h [release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 21:18:14 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Markus Gothe <nihilus>	07/08/27 21:18:11

Modified files:
	.              : configure.ac 
	libbase        : utility.h 

Log message:
	Backport

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.396.2.9&r2=1.396.2.10
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/utility.h?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.25.2.3&r2=1.25.2.4

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.396.2.9
retrieving revision 1.396.2.10
diff -u -b -r1.396.2.9 -r1.396.2.10
--- configure.ac	23 Aug 2007 09:26:22 -0000	1.396.2.9
+++ configure.ac	27 Aug 2007 21:18:10 -0000	1.396.2.10
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.396.2.9 2007/08/23 09:26:22 strk Exp $
+dnl $Id: configure.ac,v 1.396.2.10 2007/08/27 21:18:10 nihilus Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, 0.8.1)
@@ -777,6 +777,9 @@
 AC_CHECK_LIB(m, sqrt)
 AC_CHECK_LIB(c, getpwnam,AC_DEFINE(HAVE_GETPWNAM, 1, [Has getpwnam] ))
 
+AC_CHECK_LIB(m, exp2, AC_DEFINE(HAVE_EXP2, 1, [Has exp2()]))
+AC_CHECK_LIB(m, log2, AC_DEFINE(HAVE_LOG2, 1, [Has log2()]))
+
 dnl don't look for X11 when using a raw framebuffer for the GUI
 if test x$build_gtk = xyes -o x$build_kde = xyes -o x$build_fltk = xyes -o x$build_sdl = xyes; then
 dnl AC_PATH_XTRA

Index: libbase/utility.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/utility.h,v
retrieving revision 1.25.2.3
retrieving revision 1.25.2.4
diff -u -b -r1.25.2.3 -r1.25.2.4
--- libbase/utility.h	27 Aug 2007 18:11:11 -0000	1.25.2.3
+++ libbase/utility.h	27 Aug 2007 21:18:11 -0000	1.25.2.4
@@ -113,10 +113,13 @@
 //This is from C99.
 const float LN_2 = 0.693147180559945f;
 // the overridden log(f) will use logf IFF f is a float
+#ifndef HAVE_LOG2
 inline float	log2(float f) { return std::log(f) / LN_2; }
+#endif
 //exp2 might be missing on Net-/OpenBSD.
-// TODO: check availability with a configure macro 
-//inline float    exp2(double x) { return std::pow((double)2, double(x)); }
+#ifndef HAVE_EXP2
+inline float    exp2(double x) { return std::pow((double)2, double(x)); }
+#endif
 inline int	fchop( float f ) { return (int) f; }	// replace w/ inline asm if desired
 inline int	frnd(float f) { return fchop(f + 0.5f); }	// replace with inline asm if desired
 



From MAILER-DAEMON Mon Aug 27 18:48:01 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPnNJ-0002b0-AY
	for mharc-gnash-commit@gnu.org; Mon, 27 Aug 2007 18:48:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPnNH-0002ae-68
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 18:47:59 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPnNE-0002aS-RF
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 18:47:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPnNE-0002aP-LA
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 18:47:56 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1IPnNE-0000Xx-At
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 18:47:56 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <markus@unixrus.se>) id 1IPnND-0006fY-51
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 22:47:55 +0000
Received: from nihilus by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <nihilus@savannah.gnu.org>) id 1IPnND-0006fV-1f
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 22:47:55 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPnND-0006fV-1f@cvs.savannah.gnu.org>
From: Markus Gothe <markus@unixrus.se>
Date: Mon, 27 Aug 2007 22:47:55 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/libbase utility.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 22:47:59 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Markus Gothe <nihilus>	07/08/27 22:47:55

Modified files:
	libbase        : utility.h 

Log message:
	Clean up.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/utility.h?cvsroot=gnash&r1=1.29&r2=1.30

Patches:
Index: utility.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/utility.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- utility.h	27 Aug 2007 21:15:11 -0000	1.29
+++ utility.h	27 Aug 2007 22:47:54 -0000	1.30
@@ -92,11 +92,8 @@
 //
 
 inline float infinite_to_fzero(float x) {	return isfinite(x) ? x : 0.0f; }
-inline int	iabs(int i) { if (i < 0) return -i; else return i; }
 inline int	imax(int a, int b) { if (a < b) return b; else return a; }
-inline float	fmax(float a, float b) { if (a < b) return b; else return a; }
 inline int	imin(int a, int b) { if (a < b) return a; else return b; }
-inline float	fmin(float a, float b) { if (a < b) return a; else return b; }
 
 inline int	iclamp(int i, int min, int max) {
 	assert( min <= max );
@@ -114,14 +111,13 @@
 const float LN_2 = 0.693147180559945f;
 // the overridden log(f) will use logf IFF f is a float
 #ifndef HAVE_LOG2
-inline float	log2(float f) { return std::log(f) / LN_2; }
+inline double	log2(double f) { return std::log(f) / LN_2; }
 #endif
 //exp2 might be missing on Net-/OpenBSD.
 #ifndef HAVE_EXP2
-inline float	exp2(double x) { return std::pow((double)2, double(x)); }
+inline double	exp2(double x) { return std::pow((double)2, double(x)); }
 #endif
-inline int	fchop( float f ) { return (int) f; }	// replace w/ inline asm if desired
-inline int	frnd(float f) { return fchop(f + 0.5f); }	// replace with inline asm if desired
+inline int	frnd(float f) { return (int)rint(f + 0.5f); }	// replace with inline asm if desired
 
 
 // Handy macro to quiet compiler warnings about unused parameters/variables.



From MAILER-DAEMON Mon Aug 27 19:12:34 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPnl3-00058r-S4
	for mharc-gnash-commit@gnu.org; Mon, 27 Aug 2007 19:12:33 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPnl1-000540-Ei
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 19:12:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPnl0-00051C-DA
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 19:12:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPnl0-00050x-3a
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 19:12:30 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1IPnkz-0004mL-Sd
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 19:12:29 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <markus@unixrus.se>) id 1IPnkz-0007Yi-14
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 23:12:29 +0000
Received: from nihilus by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <nihilus@savannah.gnu.org>) id 1IPnky-0007Yd-TT
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 23:12:28 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPnky-0007Yd-TT@cvs.savannah.gnu.org>
From: Markus Gothe <markus@unixrus.se>
Date: Mon, 27 Aug 2007 23:12:28 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog libbase/tu_math.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2007 23:12:31 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Markus Gothe <nihilus>	07/08/27 23:12:28

Modified files:
	.              : ChangeLog 
	libbase        : tu_math.h 

Log message:
	OS X has xF() in math.h, good riddance.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4128&r2=1.4129
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_math.h?cvsroot=gnash&r1=1.19&r2=1.20

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4128
retrieving revision 1.4129
diff -u -b -r1.4128 -r1.4129
--- ChangeLog	27 Aug 2007 21:15:10 -0000	1.4128
+++ ChangeLog	27 Aug 2007 23:12:28 -0000	1.4129
@@ -92,6 +92,7 @@
 2007-08-27 Markus Gothe <nietzsche@lysator.liu.se>
 
 	* libbase/utility.h: defined exp2() as it's missing on some BSDen.
+	* libbase/math.h OS X has got xF().
 	* configure.ac check for exp2() and log2().
 
 2007-08-27 Zou Lunkai <zoulunkai@gmail.com>

Index: libbase/tu_math.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_math.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- libbase/tu_math.h	10 Feb 2007 18:22:46 -0000	1.19
+++ libbase/tu_math.h	27 Aug 2007 23:12:28 -0000	1.20
@@ -12,22 +12,6 @@
 #include <cmath>
 #include <cfloat>
 
-// OSX doesn't have single precision math functions defined in math.h
-#ifdef __MACH__
-    #define sinf sin
-    #define cosf cos
-    #define tanf tan
-    #define asinf asin
-    #define acosf acos
-    #define atanf atan
-    #define atan2f atan2
-    #define sqrtf sqrt
-    #define logf log
-    #define expf exp
-    #define fabsf fabs
-    #define powf pow
-#endif
-
 // isfinite() comes with C99; fake version here in case compiler lacks it.
 #ifndef isfinite
 #define isfinite(x) (sizeof(x) == sizeof(float) ? isfinitef(x) : isfinited(x))



From MAILER-DAEMON Mon Aug 27 20:59:11 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPpQF-0006Ky-T9
	for mharc-gnash-commit@gnu.org; Mon, 27 Aug 2007 20:59:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPpQE-0006Kt-Et
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 20:59:10 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPpQC-0006Kh-VE
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 20:59:10 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPpQC-0006Ke-PD
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 20:59:08 -0400
Received: from wa-out-1112.google.com ([209.85.146.182])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1IPpQC-0005M1-3N
	for gnash-commit@gnu.org; Mon, 27 Aug 2007 20:59:08 -0400
Received: by wa-out-1112.google.com with SMTP id k34so2062449wah
	for <gnash-commit@gnu.org>; Mon, 27 Aug 2007 17:59:06 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=Gqo5hROrXDSmt4tI6JYkj8zjUr6o+O5g5vx9vABRNGCqoR9eucvFc/7GckJNhOypsqC+RlCb2We/JzR4ecIVaILNJG7HjX6c7ZHol/Ytv2tcSh5lMPn+hizPz8/TWT0l0eZPsxtiplD+dlP6iaVtfHVM/q+f0EgYBy9DWgzEXjo=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=i9MreSo+PQAjZbqvGAIWauWGfGJl3x7hHjZuKRiPB61UDJ+XQ6JulRuOWS0tGNvO68Hg4uhyHRqChySIMJVdr/L/cTvH0AbI3D/JvgL+Lz9SLLLkgn1ZOC7XINoFo8F1C2Zqte028eL/0nz0ZuKjC/EaIjzZtMc5a5X+cg98vTc=
Received: by 10.114.112.1 with SMTP id k1mr129126wac.1188262745519;
	Mon, 27 Aug 2007 17:59:05 -0700 (PDT)
Received: by 10.114.12.7 with HTTP; Mon, 27 Aug 2007 17:59:05 -0700 (PDT)
Message-ID: <ca4b43ff0708271759qc5295d0v8dcdb0c8ec78949b@mail.gmail.com>
Date: Tue, 28 Aug 2007 08:59:05 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "Sandro Santilli" <strk@keybit.net>
Subject: Re: [Gnash-commit] gnash ChangeLog server/parser/shape_character_d...
In-Reply-To: <E1IPjUe-0004v4-BW@cvs.savannah.gnu.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1IPjUe-0004v4-BW@cvs.savannah.gnu.org>
X-Detected-Kernel: Linux 2.6 (newer, 2)
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Aug 2007 00:59:10 -0000

> -               float   cx = x + in->read_sint(num_bits);
> -               float   cy = y + in->read_sint(num_bits);
> -               float   ax = cx + in->read_sint(num_bits);
> -               float   ay = cy + in->read_sint(num_bits);
> +               int     cx = x + in->read_sint(num_bits);
> +               int     cy = y + in->read_sint(num_bits);
> +               int     ax = cx + in->read_sint(num_bits);
> +               int     ay = cy + in->read_sint(num_bits);
...

Good to see these changes.  It really meaningless to convert to float
numbers at parse time.  And AGG seldom uses float numbers(double and
integral numbers are choosed internally, IIRC).


On 8/28/07, Sandro Santilli <strk@keybit.net> wrote:
> CVSROOT:        /sources/gnash
> Module name:    gnash
> Changes by:     Sandro Santilli <strk>  07/08/27 18:39:20
>
> Modified files:
>        .              : ChangeLog
>        server/parser  : shape_character_def.cpp
>
> Log message:
>                * server/parser/shape_character_def.cpp (read): use ints for twips
>                  values, convert to float only when needed (construction of the
>                  edges and paths). [last patch was bogus]
>
> CVSWeb URLs:
> http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4125&r2=1.4126
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/shape_character_def.cpp?cvsroot=gnash&r1=1.36&r2=1.37
>
> Patches:
> Index: ChangeLog
> ===================================================================
> RCS file: /sources/gnash/gnash/ChangeLog,v
> retrieving revision 1.4125
> retrieving revision 1.4126
> diff -u -b -r1.4125 -r1.4126
> --- ChangeLog   27 Aug 2007 18:14:44 -0000      1.4125
> +++ ChangeLog   27 Aug 2007 18:39:19 -0000      1.4126
> @@ -1,3 +1,9 @@
> +2007-08-28 Sandro Santilli <strk@keybit.net>
> +
> +       * server/parser/shape_character_def.cpp (read): use ints for twips
> +         values, convert to float only when needed (construction of the
> +         edges and paths). [last patch was bogus]
> +
>  2007-08-28 Chad Musick <chadmusick@msbx.net>
>
>        * server/asobj/BlurFilter_as.cpp,.h
>
> Index: server/parser/shape_character_def.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/server/parser/shape_character_def.cpp,v
> retrieving revision 1.36
> retrieving revision 1.37
> diff -u -b -r1.36 -r1.37
> --- server/parser/shape_character_def.cpp       27 Aug 2007 17:28:02 -0000      1.36
> +++ server/parser/shape_character_def.cpp       27 Aug 2007 18:39:19 -0000      1.37
> @@ -17,7 +17,7 @@
>  // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  //
>
> -/* $Id: shape_character_def.cpp,v 1.36 2007/08/27 17:28:02 strk Exp $ */
> +/* $Id: shape_character_def.cpp,v 1.37 2007/08/27 18:39:19 strk Exp $ */
>
>  // Based on the public domain shape.cpp of Thatcher Ulrich <tu@tulrich.com> 2003
>
> @@ -219,7 +219,7 @@
>     // is simple but not optimally efficient.
>     int        fill_base = 0;
>     int        line_base = 0;
> -    float      x = 0, y = 0;
> +    int                x = 0, y = 0;
>     path       current_path;
>
>  #define SHAPE_LOG 0
> @@ -255,8 +255,8 @@
>                int     move_x = in->read_sint(num_move_bits);
>                int     move_y = in->read_sint(num_move_bits);
>
> -               x = (float) move_x;
> -               y = (float) move_y;
> +               x = move_x;
> +               y = move_y;
>
>                // Set the beginning of the path.
>                current_path.m_ax = x;
> @@ -434,10 +434,10 @@
>            if (edge_flag == 0) {
>                // curved edge
>                int num_bits = 2 + in->read_uint(4);
> -               float   cx = x + in->read_sint(num_bits);
> -               float   cy = y + in->read_sint(num_bits);
> -               float   ax = cx + in->read_sint(num_bits);
> -               float   ay = cy + in->read_sint(num_bits);
> +               int     cx = x + in->read_sint(num_bits);
> +               int     cy = y + in->read_sint(num_bits);
> +               int     ax = cx + in->read_sint(num_bits);
> +               int     ay = cy + in->read_sint(num_bits);
>
>  #if SHAPE_LOG
>                IF_VERBOSE_PARSE (
> @@ -452,20 +452,20 @@
>            } else {
>                // straight edge
>                int     num_bits = 2 + in->read_uint(4);
> -               int     line_flag = in->read_uint(1);
> -               float   dx = 0, dy = 0;
> +               bool    line_flag = in->read_bit();
> +               int     dx = 0, dy = 0;
>                if (line_flag) {
>                    // General line.
> -                   dx = (float) in->read_sint(num_bits);
> -                   dy = (float) in->read_sint(num_bits);
> +                   dx = in->read_sint(num_bits);
> +                   dy = in->read_sint(num_bits);
>                } else {
> -                   int vert_flag = in->read_uint(1);
> +                   bool vert_flag = in->read_bit();
>                    if (vert_flag == 0) {
>                        // Horizontal line.
> -                       dx = (float) in->read_sint(num_bits);
> +                       dx = in->read_sint(num_bits);
>                    } else {
>                        // Vertical line.
> -                       dy = (float) in->read_sint(num_bits);
> +                       dy = in->read_sint(num_bits);
>                    }
>                }
>
>
>
> _______________________________________________
> Gnash-commit mailing list
> Gnash-commit@gnu.org
> http://lists.gnu.org/mailman/listinfo/gnash-commit
>



From MAILER-DAEMON Tue Aug 28 03:20:58 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPvNi-0008DZ-G2
	for mharc-gnash-commit@gnu.org; Tue, 28 Aug 2007 03:20:58 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPvNf-0008CF-TL
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 03:20:55 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPvNe-0008BY-O4
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 03:20:55 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPvNe-0008BT-Jr
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 03:20:54 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IPvNe-00030Q-Bn
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 03:20:54 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IPvNW-00063d-NQ
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 07:20:46 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IPvNW-00063a-Ez
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 07:20:46 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPvNW-00063a-Ez@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 28 Aug 2007 07:20:46 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog [release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Aug 2007 07:20:56 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/28 07:20:46

Modified files:
	.              : ChangeLog 

Log message:
	Add missing entry for deanna's exp2/log2 patch

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.65&r2=1.3971.2.66

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.65
retrieving revision 1.3971.2.66
diff -u -b -r1.3971.2.65 -r1.3971.2.66
--- ChangeLog	27 Aug 2007 18:11:10 -0000	1.3971.2.65
+++ ChangeLog	28 Aug 2007 07:20:45 -0000	1.3971.2.66
@@ -1,3 +1,9 @@
+2007-08-28 Deanna Phillips <deanna>
+
+	* libbase/utility.h: define exp2 and log2 if not available
+	  based on HAVE_LOG2 and HAVE_EXP2
+	* configure.ac: detect availability of log2 and exp2
+
 2007-08-27 Sandro Santilli <strk@keybit.net>
 
 	* libbase/utility.h: don't define exp2(), it's going to clash



From MAILER-DAEMON Tue Aug 28 03:21:31 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPvOF-0000BF-6E
	for mharc-gnash-commit@gnu.org; Tue, 28 Aug 2007 03:21:31 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPvOC-00009u-NG
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 03:21:28 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPvOB-00009H-QX
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 03:21:28 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPvOB-00009B-MM
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 03:21:27 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IPvOB-00036k-FQ
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 03:21:27 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IPvOA-00065H-PX
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 07:21:26 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IPvOA-00065E-Iw
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 07:21:26 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPvOA-00065E-Iw@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 28 Aug 2007 07:21:26 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Aug 2007 07:21:29 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/28 07:21:26

Modified files:
	.              : ChangeLog 

Log message:
	Add missing entry for deanna's exp2/log2 patch

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4129&r2=1.4130

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4129
retrieving revision 1.4130
diff -u -b -r1.4129 -r1.4130
--- ChangeLog	27 Aug 2007 23:12:28 -0000	1.4129
+++ ChangeLog	28 Aug 2007 07:21:25 -0000	1.4130
@@ -1,3 +1,9 @@
+2007-08-28 Deanna Phillips <deanna>
+
+        * libbase/utility.h: define exp2 and log2 if not available
+          based on HAVE_LOG2 and HAVE_EXP2
+        * configure.ac: detect availability of log2 and exp2
+
 2007-08-28 Sandro Santilli <strk@keybit.net>
 
 	* server/stream.{cpp,h}: inlined align(), cleanups in read_uint().



From MAILER-DAEMON Tue Aug 28 03:25:58 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPvSX-0005z7-V3
	for mharc-gnash-commit@gnu.org; Tue, 28 Aug 2007 03:25:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPvSW-0005xD-SG
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 03:25:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPvSW-0005wF-Az
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 03:25:56 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPvSV-0005w1-V4
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 03:25:56 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1IPvSV-0003rF-9F
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 03:25:55 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l7S7Po091041;
	Tue, 28 Aug 2007 09:25:50 +0200 (CEST)
	(envelope-from strk@keybit.net)
Date: Tue, 28 Aug 2007 09:25:50 +0200
From: Sandro Santilli <strk@keybit.net>
To: zou lunkai <zoulunkai@gmail.com>
Subject: Re: [Gnash-commit] gnash ChangeLog server/parser/shape_character_d...
Message-ID: <20070828072550.GC78446@keybit.net>
Mail-Followup-To: zou lunkai <zoulunkai@gmail.com>, gnash-commit@gnu.org
References: <E1IPjUe-0004v4-BW@cvs.savannah.gnu.org>
	<ca4b43ff0708271759qc5295d0v8dcdb0c8ec78949b@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <ca4b43ff0708271759qc5295d0v8dcdb0c8ec78949b@mail.gmail.com>
X-Detected-Kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Aug 2007 07:25:57 -0000

On Tue, Aug 28, 2007 at 08:59:05AM +0800, zou lunkai wrote:
> > -               float   cx = x + in->read_sint(num_bits);
> > -               float   cy = y + in->read_sint(num_bits);
> > -               float   ax = cx + in->read_sint(num_bits);
> > -               float   ay = cy + in->read_sint(num_bits);
> > +               int     cx = x + in->read_sint(num_bits);
> > +               int     cy = y + in->read_sint(num_bits);
> > +               int     ax = cx + in->read_sint(num_bits);
> > +               int     ay = cy + in->read_sint(num_bits);
> ...
> 
> Good to see these changes.  It really meaningless to convert to float
> numbers at parse time.  And AGG seldom uses float numbers(double and
> integral numbers are choosed internally, IIRC).

Unfortunately, edges are still made of floats, so conversion will still happen
when creating them. I'm not sure about effects of making edges made of ints
as they'll eventually be scaled and need to be floats anyway.

We should probably make edge a template itself (and move under libgeometry).

--strk;



From MAILER-DAEMON Tue Aug 28 03:49:26 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPvpG-0000lK-9r
	for mharc-gnash-commit@gnu.org; Tue, 28 Aug 2007 03:49:26 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPvpE-0000kT-A0
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 03:49:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPvpC-0000jG-Tw
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 03:49:23 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPvpC-0000jA-LG
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 03:49:22 -0400
Received: from wa-out-1112.google.com ([209.85.146.176])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1IPvpC-0007Tn-6h
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 03:49:22 -0400
Received: by wa-out-1112.google.com with SMTP id k34so2152929wah
	for <gnash-commit@gnu.org>; Tue, 28 Aug 2007 00:49:20 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=qJ1EuhB5xq8W0S/t9kSsE4JG5fd06xHeb1EixGmH0VtwOXRF8E9onHlS0vMlMvUH8IehnZ1ob+i/WCFMXAfyjc5jnXtCjJRgpqgab/L2ShH4emwND+uUbhAV60u1/gtYUhv4I+e6m4XTWxgCJieZXO2oYGvrqLmrfLu1sO+Br3o=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=G7Ro7jbK1PrU21zdvNYt3n/AM7RVJ+6zMN8XxWEYYDrzrP5a8hTKLNt6sbLlznRrLeJLBUmITmn8u6fn7dmHLd9SqLCB12QPqJZ//GCOxDfiWQMAfY7HjoD+LnnTJAwS5mkTemOhz/FK/52zkqnwosgZAQB1vAQ9YLS7axei/Vc=
Received: by 10.114.124.1 with SMTP id w1mr258615wac.1188287359769;
	Tue, 28 Aug 2007 00:49:19 -0700 (PDT)
Received: by 10.114.12.7 with HTTP; Tue, 28 Aug 2007 00:49:19 -0700 (PDT)
Message-ID: <ca4b43ff0708280049j720d53b1r3981e68ee74aef30@mail.gmail.com>
Date: Tue, 28 Aug 2007 15:49:19 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "Udo Giacomozzi" <udo.gnu@nova-sys.net>
Subject: Re: Re[2]: [Gnash-commit] gnash ChangeLog
	server/parser/shape_character_d...
In-Reply-To: <1129116764.20070828093816@nova-sys.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1IPjUe-0004v4-BW@cvs.savannah.gnu.org>
	<ca4b43ff0708271759qc5295d0v8dcdb0c8ec78949b@mail.gmail.com>
	<1129116764.20070828093816@nova-sys.net>
X-Detected-Kernel: Linux 2.6 (newer, 2)
Cc: gnash-commit@gnu.org, Sandro Santilli <strk@keybit.net>
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Aug 2007 07:49:25 -0000

> Nope, it uses floats for the coordinares (see apply_matrix_to_path()
> which uses "point"). This is necessary because all coordinates need to
> be matrix-transformed.

Ah,  apply_matrix_to_path() is part of agg renderer, using floats.

I meant agg library:)   agg library seldom uses float. edges are
stored in double or int.

On 8/28/07, Udo Giacomozzi <udo.gnu@nova-sys.net> wrote:
> Hello zou,
>
> Tuesday, August 28, 2007, 2:59:05 AM, you wrote:
> zl> And AGG seldom uses float numbers(double and
> zl> integral numbers are choosed internally, IIRC).
>
> Nope, it uses floats for the coordinares (see apply_matrix_to_path()
> which uses "point"). This is necessary because all coordinates need to
> be matrix-transformed.
>
> Udo
>
>



From MAILER-DAEMON Tue Aug 28 03:54:37 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPvuH-0002T0-7i
	for mharc-gnash-commit@gnu.org; Tue, 28 Aug 2007 03:54:37 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPvuF-0002SJ-Go
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 03:54:35 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPvuD-0002Rs-W3
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 03:54:34 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPvuD-0002Rj-Sa
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 03:54:33 -0400
Received: from nz-out-0506.google.com ([64.233.162.235])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1IPvuD-0008Mt-Gx
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 03:54:33 -0400
Received: by nz-out-0506.google.com with SMTP id f1so1254037nzc
	for <gnash-commit@gnu.org>; Tue, 28 Aug 2007 00:54:32 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=Q6nBhvXJEiPbNdqTTwGfFTb0qGHyZ//lbONvzfZL9aPIiIDJmtCQH5jlIYe4HnJRFMVpXUHUGGg/z3+c0/1ruiNZ0JY2hIqZKR3C3vep0fpbpE0VlSyAlv8j0fBWs/UHJ0Xr5YRdzpYhdou5R6Z6mp1e9f2CcPbo8Sb20cZU8mk=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=O8PL0OBMkSmn1rIZ4THZCfeSX+Ysmyc3TYeo91CsqRD+bgF8STXZU9qjDoZExUFAfsPVHMXZclhcZGiFPvUV11SVNW62ASQdNBW2HP2Sx6z4fpZMuEzC1dojwP3LK4pxC2xwIKz12U3Xg+nS1Rv9czXGuYj2JL9rh7tIqLXpovc=
Received: by 10.115.22.1 with SMTP id z1mr1080712wai.1188287672004;
	Tue, 28 Aug 2007 00:54:32 -0700 (PDT)
Received: by 10.114.12.7 with HTTP; Tue, 28 Aug 2007 00:54:31 -0700 (PDT)
Message-ID: <ca4b43ff0708280054v558952e7s90ec7cee656dc3b8@mail.gmail.com>
Date: Tue, 28 Aug 2007 15:54:31 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "Sandro Santilli" <strk@keybit.net>, 
	"Udo Giacomozzi" <udo.gnash@nova-sys.net>
Subject: Re: [Gnash-commit] gnash ChangeLog server/parser/shape_character_d...
In-Reply-To: <20070828072550.GC78446@keybit.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1IPjUe-0004v4-BW@cvs.savannah.gnu.org>
	<ca4b43ff0708271759qc5295d0v8dcdb0c8ec78949b@mail.gmail.com>
	<20070828072550.GC78446@keybit.net>
X-Detected-Kernel: Linux 2.6 (newer, 2)
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Aug 2007 07:54:36 -0000

> Unfortunately, edges are still made of floats, so conversion will still happen
> when creating them. I'm not sure about effects of making edges made of ints
> as they'll eventually be scaled and need to be floats anyway.
>
> We should probably make edge a template itself (and move under libgeometry).

What about using TWIPS(int) in edges, leave the convertion tho the
renderer interfacea? I guess agg renderer won't have much difficulty
about this(UdoG:)?).  But besides renderers,  there are still a lot to
change in the ActionScript core...

On 8/28/07, Sandro Santilli <strk@keybit.net> wrote:
> On Tue, Aug 28, 2007 at 08:59:05AM +0800, zou lunkai wrote:
> > > -               float   cx = x + in->read_sint(num_bits);
> > > -               float   cy = y + in->read_sint(num_bits);
> > > -               float   ax = cx + in->read_sint(num_bits);
> > > -               float   ay = cy + in->read_sint(num_bits);
> > > +               int     cx = x + in->read_sint(num_bits);
> > > +               int     cy = y + in->read_sint(num_bits);
> > > +               int     ax = cx + in->read_sint(num_bits);
> > > +               int     ay = cy + in->read_sint(num_bits);
> > ...
> >
> > Good to see these changes.  It really meaningless to convert to float
> > numbers at parse time.  And AGG seldom uses float numbers(double and
> > integral numbers are choosed internally, IIRC).
>
> Unfortunately, edges are still made of floats, so conversion will still happen
> when creating them. I'm not sure about effects of making edges made of ints
> as they'll eventually be scaled and need to be floats anyway.
>
> We should probably make edge a template itself (and move under libgeometry).
>
> --strk;
>



From MAILER-DAEMON Tue Aug 28 04:37:42 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPwZy-0001rZ-SY
	for mharc-gnash-commit@gnu.org; Tue, 28 Aug 2007 04:37:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPwZx-0001r5-An
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 04:37:41 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPwZs-0001qg-UF
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 04:37:41 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPwZs-0001qd-OR
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 04:37:36 -0400
Received: from wa-out-1112.google.com ([209.85.146.177])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1IPwZs-0007Mz-9t
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 04:37:36 -0400
Received: by wa-out-1112.google.com with SMTP id k34so2164586wah
	for <gnash-commit@gnu.org>; Tue, 28 Aug 2007 01:37:35 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=l3lkNfQzOzG8KRapnUGoxEEKn7ejlhuRuvPY0SRkNAxu71DWKYPOPLggMHB3BIerUdghE3VfbIi525s8gnm4tAOrVr+V9678z6sZPt9X3Cf8zauMk2U6b1wZU2oPAqUVNlMWwME414NMv/i8YuYGagev/hGh0h+O2gy7Eu+QhC0=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=QwkXVQas2pV9qmEtl2vXjNua3DUx30q1p98pD6qKP3pKTlMEpSQ34UqoQ0cJKsRsFc4LDdu1vevlCoYFI1bLDztJ0WipTA+mPtoig79Ovm/uY8cZ0Jgyvwf7FoEd75RUQ7GGVAcdyKriuuIp54Ki6aO7MdaFPoBDJYSsWtgO4xs=
Received: by 10.115.61.1 with SMTP id o1mr489298wak.1188290254829;
	Tue, 28 Aug 2007 01:37:34 -0700 (PDT)
Received: by 10.114.12.7 with HTTP; Tue, 28 Aug 2007 01:37:33 -0700 (PDT)
Message-ID: <ca4b43ff0708280137q7243dfefhe3e26976700e4288@mail.gmail.com>
Date: Tue, 28 Aug 2007 16:37:33 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "Udo Giacomozzi" <udo.gnu@nova-sys.net>
Subject: Re: Re[2]: [Gnash-commit] gnash ChangeLog
	server/parser/shape_character_d...
In-Reply-To: <1083592545.20070828100319@nova-sys.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1IPjUe-0004v4-BW@cvs.savannah.gnu.org>
	<ca4b43ff0708271759qc5295d0v8dcdb0c8ec78949b@mail.gmail.com>
	<20070828072550.GC78446@keybit.net>
	<ca4b43ff0708280054v558952e7s90ec7cee656dc3b8@mail.gmail.com>
	<1083592545.20070828100319@nova-sys.net>
X-Detected-Kernel: Linux 2.6 (newer, 2)
Cc: gnash-commit@gnu.org, Sandro Santilli <strk@keybit.net>
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Aug 2007 08:37:41 -0000

Hello, UdoG

> A different question is if is CPU-expensive to convert integer to
> floats (ie. if it adds additional processor cycles when multiplicating
> an integer with a float)...?

A small tests could answer this. A single conversion shouldn't be
CPU-expensive, but edges are the most fundamental elements in Flash.
Not sure if the whole conversion is expensive. Anyhow,  we have done
two conversions for a single coordinates
currently(TWIPS-->float-->double), which is suboptimal.  Maybe we need
a task item for this as a future work.

On 8/28/07, Udo Giacomozzi <udo.gnu@nova-sys.net> wrote:
> Hello zou,
>
> Tuesday, August 28, 2007, 9:54:31 AM, you wrote:
> zl> What about using TWIPS(int) in edges, leave the convertion tho the
> zl> renderer interfacea? I guess agg renderer won't have much difficulty
> zl> about this(UdoG:)?).  But besides renderers,  there are still a lot to
> zl> change in the ActionScript core...
>
> Edges could be stored in integer TWIPS or perhaps it should be even so
> by definition (ie. align any edge to TWIPS).
>
> FYI, don't confuse the shape TWIPS scale with the TWIPS scale of the
> stage: a shape may be scaled down much and thus has very precise PIXEL
> coordinates - it's just the *definition* that has a limited accuracy.
>
> AGG (and most probably tri. renderers as well) have no problems with
> integer edges.
>
> A different question is if is CPU-expensive to convert integer to
> floats (ie. if it adds additional processor cycles when multiplicating
> an integer with a float)...?
>
> Udo
>
>



From MAILER-DAEMON Tue Aug 28 04:45:18 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPwhK-0003FO-GM
	for mharc-gnash-commit@gnu.org; Tue, 28 Aug 2007 04:45:18 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPwhI-0003FC-02
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 04:45:16 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPwhG-0003F0-1O
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 04:45:14 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPwhF-0003Ew-Ps
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 04:45:13 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IPwhF-0000ND-Bk
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 04:45:13 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IPwhD-0003DG-VY
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 08:45:12 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IPwhD-0003DA-Ng
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 08:45:11 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPwhD-0003DA-Ng@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 28 Aug 2007 08:45:11 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/Makefile.am testsuite/se...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Aug 2007 08:45:16 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/28 08:45:11

Modified files:
	.              : ChangeLog 
	server         : Makefile.am 
	testsuite/server: Makefile.am 
Added files:
	server         : BitsReader.cpp BitsReader.h 
	testsuite/server: BitsReaderTest.cpp 

Log message:
	        * server/: Makefile.am, BitsReader.{cpp,h}: new memory bits reader.
	        * testsuite/server/: Makefile.am, BitsReaderTest.cpp: unit testing
	          for the new bits reader.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4130&r2=1.4131
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Makefile.am?cvsroot=gnash&r1=1.123&r2=1.124
http://cvs.savannah.gnu.org/viewcvs/gnash/server/BitsReader.cpp?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/BitsReader.h?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/server/Makefile.am?cvsroot=gnash&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/server/BitsReaderTest.cpp?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4130
retrieving revision 1.4131
diff -u -b -r1.4130 -r1.4131
--- ChangeLog	28 Aug 2007 07:21:25 -0000	1.4130
+++ ChangeLog	28 Aug 2007 08:45:10 -0000	1.4131
@@ -1,3 +1,9 @@
+2007-08-28 Sandro Santilli <strk@keybit.net>
+
+	* server/: Makefile.am, BitsReader.{cpp,h}: new memory bits reader.
+	* testsuite/server/: Makefile.am, BitsReaderTest.cpp: unit testing
+	  for the new bits reader.
+
 2007-08-28 Deanna Phillips <deanna>
 
         * libbase/utility.h: define exp2 and log2 if not available

Index: server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/Makefile.am,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -b -r1.123 -r1.124
--- server/Makefile.am	26 Aug 2007 15:14:10 -0000	1.123
+++ server/Makefile.am	28 Aug 2007 08:45:11 -0000	1.124
@@ -18,7 +18,7 @@
 # 
 #
 
-# $Id: Makefile.am,v 1.123 2007/08/26 15:14:10 cmusick Exp $
+# $Id: Makefile.am,v 1.124 2007/08/28 08:45:11 strk Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -54,6 +54,7 @@
 
 libgnashserver_la_SOURCES = \
 	BitmapMovieInstance.cpp \
+	BitsReader.cpp \
 	GetterSetter.cpp \
 	PropertyList.cpp \
 	URLAccessManager.cpp \
@@ -110,6 +111,7 @@
 	$(NULL)
 
 noinst_HEADERS = \
+	BitsReader.h \
 	GetterSetter.h \
 	Property.h \
 	PropertyList.h \

Index: testsuite/server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/server/Makefile.am,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- testsuite/server/Makefile.am	27 Aug 2007 08:11:43 -0000	1.32
+++ testsuite/server/Makefile.am	28 Aug 2007 08:45:11 -0000	1.33
@@ -35,6 +35,7 @@
 
 check_PROGRAMS = \
 	StreamTest \
+	BitsReaderTest \
 	MatrixTest \
 	PointTest \
 	EdgeTest \
@@ -62,6 +63,11 @@
 	GNASH_LIBS += $(FFMPEG_LIBS)
 endif
 
+BitsReaderTest_SOURCES = BitsReaderTest.cpp
+BitsReaderTest_LDADD = \
+	$(GNASH_LIBS) \
+	$(NULL)
+
 StreamTest_SOURCES = StreamTest.cpp
 StreamTest_LDADD = \
 	$(GNASH_LIBS) \

Index: server/BitsReader.cpp
===================================================================
RCS file: server/BitsReader.cpp
diff -N server/BitsReader.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/BitsReader.cpp	28 Aug 2007 08:45:10 -0000	1.1
@@ -0,0 +1,104 @@
+// BitsReader.cpp:  bits reader, for Gnash.
+// 
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "BitsReader.h"
+
+#include "log.h"
+
+namespace gnash {
+	
+bool BitsReader::read_bit()
+{
+	bool ret = (*ptr&(128>>usedBits));
+	if ( ++usedBits == 8 ) advanceToNextByte();
+	return ret;
+}
+
+unsigned BitsReader::read_uint(unsigned short bitcount)
+{
+	assert(bitcount <= 32);
+
+	uint32_t value = 0;
+
+	unsigned short bits_needed = bitcount;
+	do
+	{
+		int unusedMask = 0xFF >> usedBits;
+		int unusedBits = 8-usedBits;
+
+		if (bits_needed == unusedBits)
+		{
+			// Consume all the unused bits.
+			value |= (*ptr&unusedMask);
+			advanceToNextByte();
+			break;
+
+		}
+		else if (bits_needed > unusedBits)
+		{
+			// Consume all the unused bits.
+
+			bits_needed -= unusedBits; // assert(bits_needed>0)
+
+			value |= ((*ptr&unusedMask) << bits_needed);
+			advanceToNextByte();
+		}
+		else
+		{
+			assert(bits_needed <= unusedBits);
+
+			// Consume some of the unused bits.
+
+			unusedBits -= bits_needed;
+
+			value |= ((*ptr&unusedMask) >> unusedBits);
+
+			usedBits += bits_needed;
+			if ( usedBits >= 8 ) advanceToNextByte();
+
+			// We're done.
+			break;
+		}
+	}
+	while (bits_needed > 0);
+
+	//std::cerr << "Returning value: " << value << " unused bits: " << (int)m_unused_bits << std::endl;
+	return value;
+
+}
+
+
+int32_t BitsReader::read_sint(unsigned short bitcount)
+{
+	int32_t	value = int32_t(read_uint(bitcount));
+
+	// Sign extend...
+	if (value & (1 << (bitcount - 1))) 
+		value |= -1 << bitcount;
+
+	return value;
+}
+
+
+} // end namespace gnash
+

Index: server/BitsReader.h
===================================================================
RCS file: server/BitsReader.h
diff -N server/BitsReader.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/BitsReader.h	28 Aug 2007 08:45:11 -0000	1.1
@@ -0,0 +1,180 @@
+// BitsReader.h:  bits reader, for Gnash.
+// 
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
+
+
+
+#ifndef BITSREADER_H
+#define BITSREADER_H
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "container.h"
+#include "swf.h"
+#include "tu_config.h"
+#include "GnashException.h"
+#include "log.h"
+
+#include <string>
+#include <sstream>
+
+namespace gnash {
+
+/// BitsReader is used to encapsulate bit-packed buffer reads.
+//
+/// TODO: implement boundary checking, maybe by throwing an exception
+///       when attempts are made to read past end of buffer
+///
+class DSOEXPORT BitsReader 
+{
+public:
+	typedef unsigned char byte;
+
+	/// Ownership of buffer left to caller
+	BitsReader(byte* input, size_t len)
+		:
+		start(input),
+		ptr(input),
+		end(ptr+len),
+		usedBits(0)
+	{
+	}
+
+	~BitsReader() {}
+
+	/// Set a new buffer to work with
+	void setBuffer(byte* input, size_t len)
+	{
+		start = ptr = input;
+		end = start+len;
+		usedBits = 0;
+	}
+
+	/// \brief
+	/// Reads a bit-packed unsigned integer from the stream
+	/// and returns it.  The given bitcount determines the
+	/// number of bits to read.
+	unsigned read_uint(unsigned short bitcount);
+
+	/// \brief
+	/// Reads a single bit off the stream
+	/// and returns it.  
+	bool read_bit();
+
+	/// \brief
+	/// Reads a bit-packed little-endian signed integer
+	/// from the stream.  The given bitcount determines the
+	/// number of bits to read.
+	int32_t read_sint(unsigned short bitcount);
+
+	/// Read a byte as an unsigned int (aligned)
+	uint8_t  read_u8()
+	{
+		align();
+		return *ptr++;
+	}
+
+	/// Read one bytes as a signed int (aligned)
+	int8_t	read_s8()
+	{
+		return static_cast<int8_t>(read_u8());
+	}
+
+	/// Read two bytes as an unsigned int (aligned)
+	uint16_t read_u16()
+	{
+		align();
+		assert(ptr+2 < end);
+		uint16_t result = *ptr++;
+		result |= *ptr++ << 8;
+		return result ;
+	}
+
+	/// Read two bytes as a signed int (aligned)
+	int16_t	read_s16()
+	{
+		return static_cast<int16_t>(read_u16());
+	}
+
+	/// Read four bytes as an unsigned int (aligned)
+	uint32_t read_u32()
+	{
+		align();
+		assert(ptr+4 < end);
+		uint32_t result = *ptr++;
+		result |= *ptr++ << 8;
+		result |= *ptr++ << 16;
+		result |= *ptr++ << 24;
+		return(result);
+	}
+
+	/// Read four bytes as an signed int (aligned)
+	int32_t read_s32()
+	{
+		return static_cast<int32_t>(read_u32());
+	}
+
+	/// \brief
+	/// Discard any unused bit in the current byte
+	/// and advance to next
+	void align()
+	{
+		if ( usedBits ) advanceToNextByte();
+	}
+
+private:
+
+	void advanceToNextByte()
+	{
+		if ( ++ptr == end )
+		{
+			log_debug("Going round");
+			ptr=start;
+		}
+		usedBits=0;
+	}
+
+	/// Pointer to first byte
+	byte* start;
+
+	/// Pointer to current byte
+	byte* ptr;
+
+	/// Pointer to one past last byte
+	byte* end;
+
+	/// Number of used bits in current byte
+	unsigned usedBits;
+
+};
+
+
+}	// end namespace gnash
+
+
+#endif // BITSREADER_H
+
+
+// Local Variables:
+// mode: C++
+// c-basic-offset: 8 
+// tab-width: 8
+// indent-tabs-mode: t
+// End:

Index: testsuite/server/BitsReaderTest.cpp
===================================================================
RCS file: testsuite/server/BitsReaderTest.cpp
diff -N testsuite/server/BitsReaderTest.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/server/BitsReaderTest.cpp	28 Aug 2007 08:45:11 -0000	1.1
@@ -0,0 +1,286 @@
+// 
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#undef HAVE_DEJAGNU_H
+
+#ifdef HAVE_DEJAGNU_H
+#include "dejagnu.h"
+#else
+#include "check.h"
+#endif
+
+#include "BitsReader.h"
+
+#include <cstdio>
+#include <iostream>
+#include <cassert>
+
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <string.h>
+#include <sstream>
+#include <boost/scoped_array.hpp>
+
+using namespace std;
+using namespace gnash;
+
+#define CHUNK_SIZE 4
+
+TestState runtest;
+
+struct ByteReader
+{
+	unsigned char b;
+
+	ByteReader(unsigned char by)
+		:
+		b(by)
+	{}
+
+	void setByte(unsigned char by)
+	{
+		b=by;
+	}
+
+	size_t read(void *dst, size_t bytes)
+	{
+		unsigned char* ptr = static_cast<unsigned char*>(dst);
+		for (size_t i=0; i<bytes; ++i)
+		{
+			memcpy(ptr+i, &b, sizeof(unsigned char));
+		}
+		return bytes;
+	}
+
+};
+
+int
+main(int /*argc*/, char** /*argv*/)
+{
+	ByteReader in(0xAA);
+
+	boost::scoped_array<unsigned char> buf(new unsigned char[1024]);
+
+	in.read(buf.get(), 1024);
+
+	BitsReader s(buf.get(), 1024);
+
+	int ret;
+
+	/// bits: 10101010 (0xAA)
+
+	s.align();
+	ret = s.read_uint(1); check_equals(ret, 1);
+	ret = s.read_uint(1); check_equals(ret, 0);
+	ret = s.read_uint(1); check_equals(ret, 1);
+	ret = s.read_uint(1); check_equals(ret, 0);
+	ret = s.read_uint(1); check_equals(ret, 1);
+	ret = s.read_uint(1); check_equals(ret, 0);
+	ret = s.read_uint(1); check_equals(ret, 1);
+	ret = s.read_uint(1); check_equals(ret, 0);
+
+	/// bits: 10101010 (0xAA)
+
+	s.align();
+	ret = s.read_uint(2); check_equals(ret, 2);
+	ret = s.read_uint(2); check_equals(ret, 2);
+	ret = s.read_uint(2); check_equals(ret, 2);
+	ret = s.read_uint(2); check_equals(ret, 2);
+
+	/// bits: 10101010 (0xAA)
+
+	s.align();
+	ret = s.read_uint(3); check_equals(ret, 5);
+	ret = s.read_uint(3); check_equals(ret, 2);
+	ret = s.read_uint(2); check_equals(ret, 2);
+
+	/// bits: 10101010 (0xAA)
+
+	s.align();
+	ret = s.read_uint(3); check_equals(ret, 5);
+	ret = s.read_uint(2); check_equals(ret, 1);
+	ret = s.read_uint(3); check_equals(ret, 2);
+
+	/// bits: 10101010 (0xAA)
+
+	s.align();
+	ret = s.read_uint(2); check_equals(ret, 2);
+	ret = s.read_uint(3); check_equals(ret, 5);
+	ret = s.read_uint(3); check_equals(ret, 2);
+
+	/// bits: 10101010 (0xAA)
+
+	s.align();
+	ret = s.read_uint(4); check_equals(ret, 10);
+	ret = s.read_uint(4); check_equals(ret, 10);
+
+	/// bits: 10101010 (0xAA)
+
+	s.align();
+	ret = s.read_uint(5); check_equals(ret, 21);
+	ret = s.read_uint(3); check_equals(ret, 2);
+
+	/// bits: 10101010 (0xAA)
+
+	s.align();
+	ret = s.read_uint(3); check_equals(ret, 5);
+	ret = s.read_uint(5); check_equals(ret, 10);
+
+	/// bits: 10101010 (0xAA)
+
+	s.align();
+	ret = s.read_uint(6); check_equals(ret, 42);
+	ret = s.read_uint(2); check_equals(ret, 2);
+
+	/// bits: 10101010 (0xAA)
+
+	s.align();
+	ret = s.read_uint(2); check_equals(ret, 2);
+	ret = s.read_uint(6); check_equals(ret, 42);
+
+	/// bits: 10101010 (0xAA)
+
+	s.align();
+	ret = s.read_uint(7); check_equals(ret, 85);
+	ret = s.read_uint(1); check_equals(ret, 0);
+
+	/// bits: 10101010 (0xAA)
+
+	s.align();
+	ret = s.read_uint(1); check_equals(ret, 1);
+	ret = s.read_uint(7); check_equals(ret, 42);
+
+	/// bits: 10101010 (0xAA)
+
+	s.align();
+	ret = s.read_uint(8); check_equals(ret, 170);
+
+	/// bits: 10101 01010 10101 0 (0xAAAA)
+
+	s.align();
+	ret = s.read_uint(5); check_equals(ret, 21);
+	ret = s.read_uint(5); check_equals(ret, 10);
+	ret = s.read_uint(5); check_equals(ret, 21);
+
+	/// bits: 101010 101 0101010 (0xAAAA)
+
+	s.align();
+	ret = s.read_uint(6); check_equals(ret, 42);
+	ret = s.read_uint(3); check_equals(ret, 5);
+	ret = s.read_uint(7); check_equals(ret, 42);
+
+	/// bits: 1010101010101010 (0xAAAA)
+
+	s.align();
+	ret = s.read_uint(16); check_equals(ret, 43690);
+
+	/// bits: 101010 10101010101010 1010 (0xAAAAAA)
+
+	s.align();
+	ret = s.read_uint(6); check_equals(ret, 42);
+	ret = s.read_uint(14); check_equals(ret, 10922);
+	ret = s.read_uint(4); check_equals(ret, 10);
+
+	/// bits: 101010101010101010101010 (0xAAAAAA)
+
+	s.align();
+	ret = s.read_uint(24); check_equals(ret, 11184810);
+
+	/// bits: 1010101010101010 (0xAAAA)
+
+	s.align();
+	ret = s.read_bit(); check_equals(ret, 1);
+	ret = s.read_bit(); check_equals(ret, 0);
+	ret = s.read_bit(); check_equals(ret, 1);
+	ret = s.read_bit(); check_equals(ret, 0);
+
+	ret = s.read_bit(); check_equals(ret, 1);
+	ret = s.read_bit(); check_equals(ret, 0);
+	ret = s.read_bit(); check_equals(ret, 1);
+	ret = s.read_bit(); check_equals(ret, 0);
+	ret = s.read_bit(); check_equals(ret, 1);
+	ret = s.read_bit(); check_equals(ret, 0);
+	ret = s.read_bit(); check_equals(ret, 1);
+	ret = s.read_bit(); check_equals(ret, 0);
+	ret = s.read_bit(); check_equals(ret, 1);
+	ret = s.read_bit(); check_equals(ret, 0);
+	ret = s.read_bit(); check_equals(ret, 1);
+	ret = s.read_bit(); check_equals(ret, 0);
+
+	/// bits: 10011001 (0x99)
+
+	in.setByte(0x99);
+	in.read(buf.get(), 1024);
+
+	s.align();
+	ret = s.read_bit(); check_equals(ret, 1);
+	ret = s.read_bit(); check_equals(ret, 0);
+	ret = s.read_bit(); check_equals(ret, 0);
+	ret = s.read_bit(); check_equals(ret, 1);
+	ret = s.read_bit(); check_equals(ret, 1);
+	ret = s.read_bit(); check_equals(ret, 0);
+	ret = s.read_bit(); check_equals(ret, 0);
+	ret = s.read_bit(); check_equals(ret, 1);
+
+	/// bits: 10011001 10011001 (0x999999)
+
+	int16_t s16 = s.read_s16(); check_equals(s16, (int16_t)0x9999);
+	uint16_t u16 = s.read_u16(); check_equals(u16, (uint16_t)0x9999);
+	int32_t s32 = s.read_s32(); check_equals(s32, (int32_t)0x99999999);
+	uint32_t u32 = s.read_u32(); check_equals(u32, (uint32_t)0x99999999);
+
+	/// bits: 10011001 10011001 10011001 10011001 (0x99999999)
+	///       -
+	///        ------- -------- --
+	///                           --------
+
+	s.align();
+	ret = s.read_bit(); check_equals(ret, 1);
+	u16 = s.read_uint(17); check_equals(u16, 26214);
+	u16 = s.read_uint(7); check_equals(u16, 51);
+
+	/// bits: 10011001 10011001 10011001 10011001 (0x99999999)
+	///       -
+	///        ------- --------   
+	///                         ----------
+
+	s.align();
+	ret = s.read_bit(); check_equals(ret, 1);
+	u16 = s.read_uint(15); check_equals(u16, 6553);
+	u16 = s.read_uint(9); check_equals(u16, 307);
+
+	/// bits: 10011001 10011001 10011001 10011001 (0x99999999)
+	///       -
+	///        ------- -------- ---       
+	///                            ----- -----
+	///                                       ---
+
+	s.align();
+	ret = s.read_bit(); check_equals(ret, 1);
+	u32 = s.read_uint(18); check_equals(u32, 52428);
+	u16 = s.read_uint(10); check_equals(u16, 819);
+	u16 = s.read_uint(3); check_equals(u16, 1);
+
+	return 0;
+}
+



From MAILER-DAEMON Tue Aug 28 05:01:34 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPwx4-0003OT-NH
	for mharc-gnash-commit@gnu.org; Tue, 28 Aug 2007 05:01:34 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPwx2-0003KY-J4
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 05:01:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPwx1-0003Hp-EU
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 05:01:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPwx1-0003HV-6U
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 05:01:31 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1IPwx0-0003aq-B5
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 05:01:30 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l7S91Lj92819;
	Tue, 28 Aug 2007 11:01:21 +0200 (CEST)
	(envelope-from strk@keybit.net)
Date: Tue, 28 Aug 2007 11:01:21 +0200
From: Sandro Santilli <strk@keybit.net>
To: zou lunkai <zoulunkai@gmail.com>
Subject: Re: [Gnash-commit] gnash ChangeLog server/parser/shape_character_d...
Message-ID: <20070828090121.GE78446@keybit.net>
Mail-Followup-To: zou lunkai <zoulunkai@gmail.com>,
	Udo Giacomozzi <udo.gnash@nova-sys.net>, gnash-commit@gnu.org
References: <E1IPjUe-0004v4-BW@cvs.savannah.gnu.org>
	<ca4b43ff0708271759qc5295d0v8dcdb0c8ec78949b@mail.gmail.com>
	<20070828072550.GC78446@keybit.net>
	<ca4b43ff0708280054v558952e7s90ec7cee656dc3b8@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <ca4b43ff0708280054v558952e7s90ec7cee656dc3b8@mail.gmail.com>
X-Detected-Kernel: FreeBSD 2.0-4.2
Cc: Udo Giacomozzi <udo.gnash@nova-sys.net>, gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Aug 2007 09:01:32 -0000

On Tue, Aug 28, 2007 at 03:54:31PM +0800, zou lunkai wrote:
> > Unfortunately, edges are still made of floats, so conversion will still happen
> > when creating them. I'm not sure about effects of making edges made of ints
> > as they'll eventually be scaled and need to be floats anyway.
> >
> > We should probably make edge a template itself (and move under libgeometry).
> 
> What about using TWIPS(int) in edges, leave the convertion tho the
> renderer interfacea? I guess agg renderer won't have much difficulty
> about this(UdoG:)?).  But besides renderers,  there are still a lot to
> change in the ActionScript core...

Yes, that would be the idea of a templated edge. Like Range2d<> we use ints
or floats with automatic conversion when needed.
In this case, edge<int> could be converted to edge<float> when aplying matrices.

--strk;



From MAILER-DAEMON Tue Aug 28 05:37:15 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPxVb-0003Kl-PO
	for mharc-gnash-commit@gnu.org; Tue, 28 Aug 2007 05:37:15 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPxVZ-0003FY-6d
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 05:37:13 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPxVY-0003Dk-Jj
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 05:37:12 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPxVX-0003DM-Vj
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 05:37:12 -0400
Received: from server2.indunet.it ([217.70.144.109])
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <udo.gnu@nova-sys.net>) id 1IPxVX-000330-4k
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 05:37:11 -0400
Received: from UDO-LAPTOP.kundenpc.indunet.it (sadsl-246098.rol.raiffeisen.net
	[195.254.246.98]) (authenticated bits=0)
	by server2.indunet.it (8.12.8/8.12.5) with ESMTP id l7S7cIU4004562;
	Tue, 28 Aug 2007 09:38:33 +0200
Date: Tue, 28 Aug 2007 09:38:16 +0200
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
X-Mailer: The Bat! (v3.99.3) Professional
Organization: NOVASYS
X-Priority: 3 (Normal)
Message-ID: <1129116764.20070828093816@nova-sys.net>
To: "zou lunkai" <zoulunkai@gmail.com>
Subject: Re[2]: [Gnash-commit] gnash ChangeLog
	server/parser/shape_character_d...
In-Reply-To: <ca4b43ff0708271759qc5295d0v8dcdb0c8ec78949b@mail.gmail.com>
References: <E1IPjUe-0004v4-BW@cvs.savannah.gnu.org>
	<ca4b43ff0708271759qc5295d0v8dcdb0c8ec78949b@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
X-Detected-Kernel: Linux 2.4-2.6
Cc: gnash-commit@gnu.org, Sandro Santilli <strk@keybit.net>
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Udo Giacomozzi <udo.gnu@nova-sys.net>
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Aug 2007 09:37:13 -0000

Hello zou,

Tuesday, August 28, 2007, 2:59:05 AM, you wrote:
zl> And AGG seldom uses float numbers(double and
zl> integral numbers are choosed internally, IIRC).

Nope, it uses floats for the coordinares (see apply_matrix_to_path()
which uses "point"). This is necessary because all coordinates need to
be matrix-transformed.

Udo




From MAILER-DAEMON Tue Aug 28 05:38:06 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPxWP-0004mZ-VW
	for mharc-gnash-commit@gnu.org; Tue, 28 Aug 2007 05:38:05 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPxWO-0004ka-8l
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 05:38:04 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPxWN-0004ja-LS
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 05:38:03 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPxWN-0004jR-G4
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 05:38:03 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IPxWN-0003Dz-55
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 05:38:03 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IPxWM-0006eI-K1
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 09:38:02 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IPxWM-0006eF-FU
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 09:38:02 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPxWM-0006eF-FU@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Tue, 28 Aug 2007 09:38:02 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/swf_function.h testsuite...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Aug 2007 09:38:04 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/28 09:38:02

Modified files:
	.              : ChangeLog 
	server         : swf_function.h 
	testsuite/actionscript.all: case.as 

Log message:
	* testsuite/actionscript.all/case.as: more tests.
	* server/swf_function.h: set function args to lower case when needed.
	  fix bug #20833.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4131&r2=1.4132
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf_function.h?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/case.as?cvsroot=gnash&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4131
retrieving revision 1.4132
diff -u -b -r1.4131 -r1.4132
--- ChangeLog	28 Aug 2007 08:45:10 -0000	1.4131
+++ ChangeLog	28 Aug 2007 09:38:01 -0000	1.4132
@@ -1,3 +1,9 @@
+2007-08-28 Zou Lunkai <zoulunkai@gmail.com>
+	
+	* testsuite/actionscript.all/case.as: more tests.
+	* server/swf_function.h: set function args to lower case when needed.
+	  fix bug #20833.
+	  
 2007-08-28 Sandro Santilli <strk@keybit.net>
 
 	* server/: Makefile.am, BitsReader.{cpp,h}: new memory bits reader.

Index: server/swf_function.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf_function.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/swf_function.h	1 Jul 2007 10:54:25 -0000	1.16
+++ server/swf_function.h	28 Aug 2007 09:38:02 -0000	1.17
@@ -25,8 +25,10 @@
 #include "impl.h"
 #include "as_function.h" // for inheritance
 #include "as_object.h" // for composition (vector element)
+#include "VM.h" //fow SWF version
 //#include "with_stack_entry.h" // for composition (vector element)
 
+#include <boost/algorithm/string/case_conv.hpp> 
 #include <cassert>
 #include <string>
 
@@ -218,7 +220,7 @@
 		assert(arg_register == 0 || m_is_function2 == true);
 		m_args.resize(m_args.size() + 1);
 		m_args.back().m_register = arg_register;
-		m_args.back().m_name = name;
+		m_args.back().m_name = PROPNAME(name);
 	}
 
 	void	set_length(int len);

Index: testsuite/actionscript.all/case.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/case.as,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- testsuite/actionscript.all/case.as	24 Aug 2007 16:07:27 -0000	1.9
+++ testsuite/actionscript.all/case.as	28 Aug 2007 09:38:02 -0000	1.10
@@ -22,7 +22,7 @@
  *  Test case sensitivity 
  */
 
-rcsid="$Id: case.as,v 1.9 2007/08/24 16:07:27 strk Exp $";
+rcsid="$Id: case.as,v 1.10 2007/08/28 09:38:02 zoulunkai Exp $";
 
 #include "check.as"
 
@@ -171,3 +171,30 @@
 #endif
 
 #endif // OUTPUT_VERSION >= 6 }
+
+//
+// Test function args
+//
+func = function (xYz)
+{
+  check_equals(xYz, 100);
+#if OUTPUT_VERSION < 7
+  check_equals(xyz, 100);
+#endif 
+  this.testVar = xYz;
+  check_equals(this.testVar, 100);
+#if OUTPUT_VERSION < 7
+  check_equals(this.testvar, 100);
+#endif 
+};
+// call the function above,
+// trigger tests in it.
+func(100);
+
+#if OUTPUT_VERSION > 5
+  mcRef = _root.createEmptyMovieClip("mc_XYZ", 3);
+  check_equals(typeof(_root['mc_XYZ']), 'movieclip');
+  check_equals(typeof(_root['mcRef']), 'movieclip');
+  check_equals(typeof(mcRef['gotoAndStop']), 'function');
+#endif 
+



From MAILER-DAEMON Tue Aug 28 05:50:47 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPxih-0000Ba-R4
	for mharc-gnash-commit@gnu.org; Tue, 28 Aug 2007 05:50:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPxif-0000BM-Ln
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 05:50:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPxif-0000Aj-0Q
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 05:50:45 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPxie-0000AQ-PL
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 05:50:44 -0400
Received: from server2.indunet.it ([217.70.144.109])
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <udo.gnu@nova-sys.net>) id 1IPxie-0005YH-8k
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 05:50:44 -0400
Received: from UDO-LAPTOP.kundenpc.indunet.it (sadsl-246098.rol.raiffeisen.net
	[195.254.246.98]) (authenticated bits=0)
	by server2.indunet.it (8.12.8/8.12.5) with ESMTP id l7S9oPU4020965;
	Tue, 28 Aug 2007 11:50:40 +0200
Date: Tue, 28 Aug 2007 11:50:23 +0200
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
X-Mailer: The Bat! (v3.99.3) Professional
Organization: NOVASYS
X-Priority: 3 (Normal)
Message-ID: <96247442.20070828115023@nova-sys.net>
To: "zou lunkai" <zoulunkai@gmail.com>
Subject: Re[4]: [Gnash-commit] gnash ChangeLog
	server/parser/shape_character_d...
In-Reply-To: <ca4b43ff0708280049j720d53b1r3981e68ee74aef30@mail.gmail.com>
References: <E1IPjUe-0004v4-BW@cvs.savannah.gnu.org>
	<ca4b43ff0708271759qc5295d0v8dcdb0c8ec78949b@mail.gmail.com>
	<1129116764.20070828093816@nova-sys.net>
	<ca4b43ff0708280049j720d53b1r3981e68ee74aef30@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
X-Detected-Kernel: Linux 2.4-2.6
Cc: Sandro Santilli <strk@keybit.net>, gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Udo Giacomozzi <udo.gnu@nova-sys.net>
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Aug 2007 09:50:46 -0000

Hello zou,

Tuesday, August 28, 2007, 9:49:19 AM, you wrote:
zl> I meant agg library:)   agg library seldom uses float. edges are
zl> stored in double or int.

Ah, sorry :) Yes, AGG internally uses integers whenever it's possible
and double otherwise. I thought the discussion was about integer vs.
floating point.

Anyway, before any data is fed to AGG it is heavily transformed in the
Gnash AGG renderer so the AGG library doesn't care about Gnash
edges.

Udo




From MAILER-DAEMON Tue Aug 28 06:01:41 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPxtE-0000jm-I2
	for mharc-gnash-commit@gnu.org; Tue, 28 Aug 2007 06:01:40 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPxtC-0000jT-Vx
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 06:01:39 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPxtB-0000j7-Ej
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 06:01:38 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPxtB-0000j4-BI
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 06:01:37 -0400
Received: from mx20.gnu.org ([199.232.41.8])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1IPxtA-0007lg-MV
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 06:01:36 -0400
Received: from server2.indunet.it ([217.70.144.109])
	by mx20.gnu.org with esmtp (Exim 4.60)
	(envelope-from <udo.gnu@nova-sys.net>) id 1IPwao-0008Eq-AF
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 04:38:34 -0400
Received: from UDO-LAPTOP.kundenpc.indunet.it (sadsl-246098.rol.raiffeisen.net
	[195.254.246.98]) (authenticated bits=0)
	by server2.indunet.it (8.12.8/8.12.5) with ESMTP id l7S83LU4007898;
	Tue, 28 Aug 2007 10:03:36 +0200
Date: Tue, 28 Aug 2007 10:03:19 +0200
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
X-Mailer: The Bat! (v3.99.3) Professional
Organization: NOVASYS
X-Priority: 3 (Normal)
Message-ID: <1083592545.20070828100319@nova-sys.net>
To: "zou lunkai" <zoulunkai@gmail.com>
Subject: Re[2]: [Gnash-commit] gnash ChangeLog
	server/parser/shape_character_d...
In-Reply-To: <ca4b43ff0708280054v558952e7s90ec7cee656dc3b8@mail.gmail.com>
References: <E1IPjUe-0004v4-BW@cvs.savannah.gnu.org>
	<ca4b43ff0708271759qc5295d0v8dcdb0c8ec78949b@mail.gmail.com>
	<20070828072550.GC78446@keybit.net>
	<ca4b43ff0708280054v558952e7s90ec7cee656dc3b8@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
X-detected-kernel: Linux 2.4-2.6
X-Detected-Kernel: Linux 2.6, seldom 2.4 (older, 4)
Cc: Udo Giacomozzi <udo.gnash@nova-sys.net>, gnash-commit@gnu.org,
	Sandro Santilli <strk@keybit.net>
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Udo Giacomozzi <udo.gnu@nova-sys.net>
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Aug 2007 10:01:39 -0000

Hello zou,

Tuesday, August 28, 2007, 9:54:31 AM, you wrote:
zl> What about using TWIPS(int) in edges, leave the convertion tho the
zl> renderer interfacea? I guess agg renderer won't have much difficulty
zl> about this(UdoG:)?).  But besides renderers,  there are still a lot to
zl> change in the ActionScript core...

Edges could be stored in integer TWIPS or perhaps it should be even so
by definition (ie. align any edge to TWIPS).

FYI, don't confuse the shape TWIPS scale with the TWIPS scale of the
stage: a shape may be scaled down much and thus has very precise PIXEL
coordinates - it's just the *definition* that has a limited accuracy.

AGG (and most probably tri. renderers as well) have no problems with
integer edges.

A different question is if is CPU-expensive to convert integer to
floats (ie. if it adds additional processor cycles when multiplicating
an integer with a float)...?

Udo




From MAILER-DAEMON Tue Aug 28 06:21:03 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPyBz-0001F9-26
	for mharc-gnash-commit@gnu.org; Tue, 28 Aug 2007 06:21:03 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPyBx-0001CX-2P
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 06:21:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPyBw-0001Ar-2u
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 06:21:00 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPyBv-0001AX-UU
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 06:20:59 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IPyBv-0002cU-F9
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 06:20:59 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IPyBu-0002Oo-BV
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 10:20:58 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IPyBt-0002Ol-Sc
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 10:20:58 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPyBt-0002Ol-Sc@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 28 Aug 2007 10:20:57 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog libbase/jpeg.cpp libbase/jpeg.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Aug 2007 10:21:01 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/28 10:20:57

Modified files:
	.              : ChangeLog 
	libbase        : jpeg.cpp jpeg.h 

Log message:
	        * libbase/jpeg.{cpp,h}: cleanups, aimed at eventually implement
	          different inputs then tu_file (stream, buffer).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4132&r2=1.4133
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/jpeg.cpp?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/jpeg.h?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4132
retrieving revision 1.4133
diff -u -b -r1.4132 -r1.4133
--- ChangeLog	28 Aug 2007 09:38:01 -0000	1.4132
+++ ChangeLog	28 Aug 2007 10:20:56 -0000	1.4133
@@ -1,3 +1,8 @@
+2007-08-28 Sandro Santilli <strk@keybit.net>
+
+	* libbase/jpeg.{cpp,h}: cleanups, aimed at eventually implement
+	  different inputs then tu_file (stream, buffer).
+
 2007-08-28 Zou Lunkai <zoulunkai@gmail.com>
 	
 	* testsuite/actionscript.all/case.as: more tests.

Index: libbase/jpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/jpeg.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- libbase/jpeg.cpp	18 Aug 2007 05:04:00 -0000	1.18
+++ libbase/jpeg.cpp	28 Aug 2007 10:20:57 -0000	1.19
@@ -23,23 +23,30 @@
 
 namespace jpeg
 {
-	// jpeglib data source constructors, for using tu_file* instead
-	// of stdio for jpeg IO.
-	void	setup_rw_source(jpeg_decompress_struct* cinfo, tu_file* instream);
-	void	setup_rw_dest(jpeg_compress_struct* cinfo, tu_file* outstream);
 
 
+// Called when jpeglib has a fatal error.
+static void	jpeg_error_exit(j_common_ptr cinfo);
+
+// Set up some error handlers for the jpeg lib.
+static void	setup_jpeg_err(jpeg_error_mgr* jerr);
+
+
+/// input/output wrappers for tu_file
+namespace tu_file_wrappers
+{
+
 	// Helper object for reading jpeg image data.  Basically a thin
 	static const int	IO_BUF_SIZE = 4096;
 
 	// A jpeglib source manager that reads from a tu_file.  Paraphrased
 	// from IJG jpeglib jdatasrc.c.
-	class rw_source
+	class rw_source_tu_file
 	{
 	public:
 		struct jpeg_source_mgr	m_pub;		/* public fields */
 
-		rw_source(tu_file* in)
+		rw_source_tu_file(tu_file* in)
 			:
 			m_in_stream(in),
 			m_start_of_file(true)
@@ -58,7 +65,7 @@
 
 		static void init_source(j_decompress_ptr cinfo)
 		{
-			rw_source*	src = (rw_source*) cinfo->src;
+			rw_source_tu_file*	src = (rw_source_tu_file*) cinfo->src;
 			src->m_start_of_file = true;
 		}
 
@@ -66,7 +73,7 @@
 		// when it needs more data from the file.
 		static boolean fill_input_buffer(j_decompress_ptr cinfo)
 		{
-			rw_source*	src = (rw_source*) cinfo->src;
+			rw_source_tu_file*	src = (rw_source_tu_file*) cinfo->src;
 
 			size_t	bytes_read = src->m_in_stream->read_bytes(src->m_buffer, IO_BUF_SIZE);
 
@@ -112,7 +119,7 @@
 		// uninteresting data.
 		static void	skip_input_data(j_decompress_ptr cinfo, long num_bytes)
 		{
-			rw_source*	src = (rw_source*) cinfo->src;
+			rw_source_tu_file*	src = (rw_source_tu_file*) cinfo->src;
 
 			// According to jpeg docs, large skips are
 			// infrequent.  So let's just do it the simple
@@ -131,7 +138,7 @@
 		static void term_source(j_decompress_ptr /* cinfo */)
 		// Terminate the source.  Make sure we get deleted.
 		{
-			/*rw_source*	src = (rw_source*) cinfo->src;
+			/*rw_source_tu_file*	src = (rw_source_tu_file*) cinfo->src;
 			assert(src);
 
 			// @@ it's kind of bogus to be deleting here
@@ -151,25 +158,29 @@
 			m_pub.bytes_in_buffer = 0;
 			m_pub.next_input_byte = NULL;
 		}
+
+		// Set up the given decompress object to read from the given
+		// stream.
+		static void setup(jpeg_decompress_struct* cinfo, tu_file* instream)
+		{
+			// assert(cinfo->src == NULL);
+			cinfo->src = (jpeg_source_mgr*) (new rw_source_tu_file(instream));
+		}
+
 	private:
 		tu_file*	m_in_stream;		/* source stream */
 		bool	m_start_of_file;		/* have we gotten any data yet? */
 		JOCTET	m_buffer[IO_BUF_SIZE];		/* start of buffer */
+
+
 	};
 
 	
-	void	setup_rw_source(jpeg_decompress_struct* cinfo, tu_file* instream)
-	// Set up the given decompress object to read from the given
-	// stream.
-	{
-		// assert(cinfo->src == NULL);
-		cinfo->src = (jpeg_source_mgr*) (new rw_source(instream));
-	}
 
 
 	// A jpeglib destination manager that writes to a tu_file.
 	// Paraphrased from IJG jpeglib jdatadst.c.
-	class rw_dest
+	class rw_dest_tu_file
 	{
 	public:
 		struct jpeg_destination_mgr	m_pub;	/* public fields */
@@ -182,7 +193,7 @@
 		/// @param out
 		///	The output stream, externally owned.
 		///
-		rw_dest(tu_file* out)
+		rw_dest_tu_file(tu_file* out)
 			:
 			m_out_stream(out)
 		{
@@ -197,24 +208,31 @@
 
 		static void init_destination(j_compress_ptr cinfo)
 		{
-			rw_dest*	dest = (rw_dest*) cinfo->dest;
+			rw_dest_tu_file*	dest = (rw_dest_tu_file*) cinfo->dest;
 			assert(dest);
 
 			dest->m_pub.next_output_byte = dest->m_buffer;
 			dest->m_pub.free_in_buffer = IO_BUF_SIZE;
 		}
 
+		// Set up the given compress object to write to the given
+		// output stream.
+		static void setup(j_compress_ptr cinfo, tu_file* outstream)
+		{
+			cinfo->dest = (jpeg_destination_mgr*) (new rw_dest_tu_file(outstream));
+		}
+
 		/// Write the output buffer into the stream.
 		static boolean	empty_output_buffer(j_compress_ptr cinfo)
 		{
-			rw_dest*	dest = (rw_dest*) cinfo->dest;
+			rw_dest_tu_file*	dest = (rw_dest_tu_file*) cinfo->dest;
 			assert(dest);
 
 			if (dest->m_out_stream->write_bytes(dest->m_buffer, IO_BUF_SIZE) != IO_BUF_SIZE)
 			{
 				// Error.
 				// @@ bah, exceptions suck.  TODO consider alternatives.
-				gnash::log_error("jpeg::rw_dest couldn't write data.");
+				gnash::log_error("jpeg::rw_dest_tu_file couldn't write data.");
 				return false;
 			}
 
@@ -230,7 +248,7 @@
 		///
 		static void term_destination(j_compress_ptr cinfo)
 		{
-			rw_dest*	dest = (rw_dest*) cinfo->dest;
+			rw_dest_tu_file*	dest = (rw_dest_tu_file*) cinfo->dest;
 			assert(dest);
 
 			// Write any remaining data.
@@ -239,7 +257,7 @@
 				if (dest->m_out_stream->write_bytes(dest->m_buffer, datacount) != datacount)
 				{
 					// Error.
-					gnash::log_error("jpeg::rw_dest::term_destination couldn't write data.");
+					gnash::log_error("jpeg::rw_dest_tu_file::term_destination couldn't write data.");
 				}
 			}
 
@@ -254,42 +272,11 @@
 		tu_file*	m_out_stream;	
 
 		JOCTET	m_buffer[IO_BUF_SIZE];		/* start of buffer */
-	};
-
-
-	// Set up the given compress object to write to the given
-	// output stream.
-	void	setup_rw_dest(j_compress_ptr cinfo, tu_file* outstream)
-	{
-		cinfo->dest = (jpeg_destination_mgr*) (new rw_dest(outstream));
-	}
-
-
-	//
-	// Error handler
-	//
-
-
-	// Called when jpeglib has a fatal error.
-	static void	jpeg_error_exit(j_common_ptr cinfo);
-
-	// Set up some error handlers for the jpeg lib.
-	static void	setup_jpeg_err(jpeg_error_mgr* jerr)
-	{
-		// Set up defaults.
-		jpeg_std_error(jerr);
-
-		jerr->error_exit = jpeg_error_exit;
-	}
-
-
-	//
-	// wrappers
-	//
 
+	};
 
 	/// Bascially this is a thin wrapper around jpeg_decompress object.
-	class input_impl : public input
+	class input_tu_file : public input
 	{
 	public:
 		// State needed for input.
@@ -298,21 +285,14 @@
 
 		bool	m_compressor_opened;
 
-		/// This flag will be set to true by the error callback
-		/// invoked by jpeg lib. Will be later used to throw
-		/// a ParserException.
-		///
-		bool errorOccurred;
-
 		enum SWF_DEFINE_BITS_JPEG2 { SWF_JPEG2 };
 		enum SWF_DEFINE_BITS_JPEG2_HEADER_ONLY { SWF_JPEG2_HEADER_ONLY };
 
 		// Constructor.  Read the header data from in, and
 		// prepare to read data.
-		input_impl(tu_file* in)
+		input_tu_file(tu_file* in)
 			:
-			m_compressor_opened(false),
-			errorOccurred(false)
+			m_compressor_opened(false)
 		{
 			setup_jpeg_err(&m_jerr);
 			m_cinfo.err = &m_jerr;
@@ -321,7 +301,7 @@
 			// Initialize decompression object.
 			jpeg_create_decompress(&m_cinfo);
 
-			setup_rw_source(&m_cinfo, in);
+			rw_source_tu_file::setup(&m_cinfo, in);
 
 			start_image();
 		}
@@ -334,10 +314,9 @@
 		// start_image() and finish_image() around any calls
 		// to get_width/height/components and read_scanline.
 		//
-		input_impl(SWF_DEFINE_BITS_JPEG2_HEADER_ONLY /* e */, tu_file* in)
+		input_tu_file(SWF_DEFINE_BITS_JPEG2_HEADER_ONLY /* e */, tu_file* in)
 			:
-			m_compressor_opened(false),
-			errorOccurred(false)
+			m_compressor_opened(false)
 		{
 			setup_jpeg_err(&m_jerr);
 			m_cinfo.err = &m_jerr;
@@ -346,7 +325,7 @@
 			// Initialize decompression object.
 			jpeg_create_decompress(&m_cinfo);
 
-			setup_rw_source(&m_cinfo, in);
+			rw_source_tu_file::setup(&m_cinfo, in);
 
 			// Read the encoding tables.
 			int ret = jpeg_read_header(&m_cinfo, FALSE);
@@ -367,7 +346,7 @@
 					break;
 			}
 
-			if ( errorOccurred )
+			if ( _errorOccurred )
 			{
 				throw gnash::ParserException("errors during JPEG header parsing");
 			}
@@ -377,11 +356,11 @@
 		}
 
 		// Destructor.  Clean up our jpeg reader state.
-		~input_impl()
+		~input_tu_file()
 		{
 			finish_image();
 
-			rw_source* src = (rw_source*) m_cinfo.src;
+			rw_source_tu_file* src = (rw_source_tu_file*) m_cinfo.src;
 			delete src;
 			m_cinfo.src = NULL;
 
@@ -395,7 +374,7 @@
 		// data, to avoid screwing up future reads.
 		void	discard_partial_buffer()
 		{
-			rw_source* src = (rw_source*) m_cinfo.src;
+			rw_source_tu_file* src = (rw_source_tu_file*) m_cinfo.src;
 
 			// We only have to discard the input buffer after reading the tables.
 			if (src)
@@ -438,14 +417,14 @@
 				}
 			}
 
-			if ( errorOccurred )
+			if ( _errorOccurred )
 			{
 				throw gnash::ParserException("errors during JPEG header parsing");
 			}
 
 			jpeg_start_decompress(&m_cinfo);
 
-			if ( errorOccurred )
+			if ( _errorOccurred )
 			{
 				throw gnash::ParserException("errors during JPEG decompression");
 			}
@@ -514,43 +493,9 @@
 		}
 	};
 
-	static void	jpeg_error_exit(j_common_ptr cinfo)
-	{
-        IF_VERBOSE_MALFORMED_SWF(
-		gnash::log_swferror("Internal jpeg error: %s", cinfo->err->jpeg_message_table[cinfo->err->msg_code]);
-        );
-
-		// Set a flag to stop parsing 
-		input_impl* impl = static_cast<input_impl*>(cinfo->client_data);
-		impl->errorOccurred = true;
-	}
-
-
-
-	/*static*/
-	input*
-	input::create(tu_file* in)
-	{
-		input* ret = new input_impl(in);
-		return ret;
-	}
-
-	/*static*/
-	input*
-	input::create_swf_jpeg2_header_only(tu_file* in)
-	{
-		input* ret = new input_impl(input_impl::SWF_JPEG2_HEADER_ONLY, in);
-		return ret;
-	}
-
-
-	// Default destructor.
-	input::~input() {}
-
-
-	class output_impl : public output
 	// Basically this is a thin wrapper around jpeg_compress
 	// object.
+	class output_tu_file : public output
 	{
 	public:
 		// State needed for output.
@@ -561,14 +506,14 @@
 		//
 		/// Read the header data from in, and
 		///  prepare to read data.
-		output_impl(tu_file* out, int width, int height, int quality)
+		output_tu_file(tu_file* out, int width, int height, int quality)
 		{
 			m_cinfo.err = jpeg_std_error(&m_jerr);
 
 			// Initialize decompression object.
 			jpeg_create_compress(&m_cinfo);
 
-			setup_rw_dest(&m_cinfo, out);
+			rw_dest_tu_file::setup(&m_cinfo, out);
 			m_cinfo.image_width = width;
 			m_cinfo.image_height = height;
 			m_cinfo.input_components = 3;
@@ -580,12 +525,12 @@
 		}
 
 
-		~output_impl()
+		~output_tu_file()
 		// Destructor.  Clean up our jpeg reader state.
 		{
 			jpeg_finish_compress(&m_cinfo);
 /*
-			rw_dest* src = (rw_source*) m_cinfo.dest;
+			rw_dest_tu_file* src = (rw_source_tu_file*) m_cinfo.dest;
 			delete dest;
 			m_cinfo.dest = NULL;
 */
@@ -601,19 +546,62 @@
 	};
 
 
-	/*static*/ output*	output::create(tu_file* in, int width, int height, int quality)
-	// Create and return a jpeg-input object that will read from the
-	// given input stream.
-	{
-		return new output_impl(in, width, height, quality);
-	}
 
+} // namespace tu_file_wrappers
 
-	// Default constructor.
-	output::~output() {}
+
+// Set up some error handlers for the jpeg lib.
+static void	setup_jpeg_err(jpeg_error_mgr* jerr)
+{
+	// Set up defaults.
+	jpeg_std_error(jerr);
+
+	jerr->error_exit = jpeg_error_exit;
+}
+
+
+static void	jpeg_error_exit(j_common_ptr cinfo)
+{
+	IF_VERBOSE_MALFORMED_SWF(
+	gnash::log_swferror(_("Internal jpeg error: %s"),
+		cinfo->err->jpeg_message_table[cinfo->err->msg_code]);
+	);
+
+	// Set a flag to stop parsing 
+	input* in = static_cast<input*>(cinfo->client_data);
+	in->errorOccurred(); 
 }
 
 
+
+/*static*/
+input*
+input::create(tu_file* in)
+{
+	input* ret = new tu_file_wrappers::input_tu_file(in);
+	return ret;
+}
+
+/*static*/
+input*
+input::create_swf_jpeg2_header_only(tu_file* in)
+{
+	using tu_file_wrappers::input_tu_file;
+	input* ret = new input_tu_file(input_tu_file::SWF_JPEG2_HEADER_ONLY, in);
+	return ret;
+}
+
+
+/*static*/
+output*
+output::create(tu_file* in, int width, int height, int quality)
+{
+	return new tu_file_wrappers::output_tu_file(in, width, height, quality);
+}
+
+} // namespace jpeg
+
+
 // Local Variables:
 // mode: C++
 // c-basic-offset: 8 

Index: libbase/jpeg.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/jpeg.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libbase/jpeg.h	15 May 2007 12:46:15 -0000	1.6
+++ libbase/jpeg.h	28 Aug 2007 10:20:57 -0000	1.7
@@ -29,8 +29,20 @@
 
 	public:
 
-		/// Read header and create a jpeg input object.
+		input()
+			:
+			_errorOccurred(false)
+		{}
+
+		virtual ~input() {}
+
+
+		/// \brief
+		/// Create and return a jpeg-input object that will read from the
+		/// given input stream.
 		//
+		/// The created input reads the jpeg header
+		///
 		/// @return NULL on error
 		///
 		DSOEXPORT static input*	create(tu_file* in);
@@ -45,8 +57,6 @@
 		///
 		DSOEXPORT static input*	create_swf_jpeg2_header_only(tu_file* in);
 
-		virtual ~input();
-
 		/// Discard existing bytes in our buffer.
 		virtual void	discard_partial_buffer() = 0;
 
@@ -56,6 +66,19 @@
 		virtual int	get_height() const = 0;
 		virtual int	get_width() const = 0;
 		virtual void	read_scanline(unsigned char* rgb_data) = 0;
+
+		void    errorOccurred()
+		{
+			_errorOccurred = true;
+		}
+
+	protected:
+
+		/// This flag will be set to true by the error callback
+		/// invoked by jpeg lib. Will be later used to throw
+		/// a ParserException.
+		///
+		bool _errorOccurred;
 	};
 
 
@@ -63,15 +86,20 @@
 	class output
 	{
 	public:
-		// Create an output object.   Quality goes from 1-100.
+		/// Create an output object bount to a tu_file
+		//
+		/// @param quality
+		///	Quality goes from 1-100.
+		///
 		DSOEXPORT static output*	create(tu_file* out, int width, int height, int quality);
 
-		virtual ~output();
+		virtual ~output() {}
 
 		// ...
 		virtual void	write_scanline(unsigned char* rgb_data) = 0;
 	};
-}
+
+} // namespace jpeg
 
 
 #endif // JPEG_H



From MAILER-DAEMON Tue Aug 28 07:32:50 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPzJS-00009c-C7
	for mharc-gnash-commit@gnu.org; Tue, 28 Aug 2007 07:32:50 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPzJQ-00009H-GE
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 07:32:48 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPzJO-000088-On
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 07:32:47 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPzJO-00007y-Fj
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 07:32:46 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1IPzJO-00020Z-01
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 07:32:46 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <udo.gnu@nova-sys.net>) id 1IPzJN-0006pX-Aq
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 11:32:45 +0000
Received: from udog by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <udog@savannah.gnu.org>) id 1IPzJN-0006pU-6G
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 11:32:45 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPzJN-0006pU-6G@cvs.savannah.gnu.org>
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
Date: Tue, 28 Aug 2007 11:32:45 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash server/sprite_instance.cpp ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Aug 2007 11:32:48 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Udo Giacomozzi <udog>	07/08/28 11:32:45

Modified files:
	server         : sprite_instance.cpp 
	.              : ChangeLog 

Log message:
	one comment less (replace_if_depth_is_occupied unused)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.312&r2=1.313
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4133&r2=1.4134

Patches:
Index: server/sprite_instance.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -b -r1.312 -r1.313
--- server/sprite_instance.cpp	24 Aug 2007 10:05:57 -0000	1.312
+++ server/sprite_instance.cpp	28 Aug 2007 11:32:44 -0000	1.313
@@ -2793,7 +2793,7 @@
     const char* name,
     const std::vector<swf_event*>& event_handlers,
     int depth, 
-    bool replace_if_depth_is_occupied,
+    bool /*replace_if_depth_is_occupied*/,
     const cxform& color_transform, const matrix& mat,
     int ratio, int clip_depth)
 {

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.4133
retrieving revision 1.4134
diff -u -b -r1.4133 -r1.4134
--- ChangeLog	28 Aug 2007 10:20:56 -0000	1.4133
+++ ChangeLog	28 Aug 2007 11:32:44 -0000	1.4134
@@ -1,3 +1,7 @@
+2007-08-28 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* server/sprite_instance.cpp: comment unused parameter 	
+
 2007-08-28 Sandro Santilli <strk@keybit.net>
 
 	* libbase/jpeg.{cpp,h}: cleanups, aimed at eventually implement



From MAILER-DAEMON Tue Aug 28 08:01:36 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IPzlH-0004xy-M4
	for mharc-gnash-commit@gnu.org; Tue, 28 Aug 2007 08:01:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IPzlF-0004vm-NY
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 08:01:33 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IPzlE-0004uE-Is
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 08:01:33 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IPzlE-0004u2-BO
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 08:01:32 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IPzlD-00074X-SU
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 08:01:32 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IPzlC-0000jx-EH
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 12:01:30 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IPzlC-0000jt-AV
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 12:01:30 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IPzlC-0000jt-AV@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 28 Aug 2007 12:01:30 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/swf/tag_loaders.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Aug 2007 12:01:34 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/28 12:01:30

Modified files:
	.              : ChangeLog 
	server/swf     : tag_loaders.cpp 

Log message:
	        * server/swf/tag_loaders.cpp: remove all bug jpeg-related
	          calls to stream::get_underlying_stream.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4134&r2=1.4135
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.132&r2=1.133

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4134
retrieving revision 1.4135
diff -u -b -r1.4134 -r1.4135
--- ChangeLog	28 Aug 2007 11:32:44 -0000	1.4134
+++ ChangeLog	28 Aug 2007 12:01:29 -0000	1.4135
@@ -1,3 +1,8 @@
+2007-08-28 Sandro Santilli <strk@keybit.net>
+
+	* server/swf/tag_loaders.cpp: remove all bug jpeg-related
+	  calls to stream::get_underlying_stream.
+
 2007-08-28 Udo Giacomozzi <udo.gnu@nova-sys.net>
 
 	* server/sprite_instance.cpp: comment unused parameter 	

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -b -r1.132 -r1.133
--- server/swf/tag_loaders.cpp	27 Aug 2007 12:44:29 -0000	1.132
+++ server/swf/tag_loaders.cpp	28 Aug 2007 12:01:30 -0000	1.133
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: tag_loaders.cpp,v 1.132 2007/08/27 12:44:29 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.133 2007/08/28 12:01:30 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -602,12 +602,11 @@
 
 
 #ifdef HAVE_ZLIB_H
-void inflate_wrapper(tu_file* in, void* buffer, int buffer_bytes)
+void inflate_wrapper(stream& in, void* buffer, int buffer_bytes)
     // Wrapper function -- uses Zlib to uncompress in_bytes worth
     // of data from the input file into buffer_bytes worth of data
     // into *buffer.
 {
-    assert(in);
     assert(buffer);
     assert(buffer_bytes > 0);
 
@@ -635,7 +634,8 @@
 
     for (;;) {
 	// Fill a one-byte (!) buffer.
-	buf[0] = in->read_byte();
+	// TODO: sub-optimal, read_u8 also calls align needlessly
+	buf[0] = in.read_u8();
 	d_stream.next_in = &buf[0];
 	d_stream.avail_in = 1;
 
@@ -697,7 +697,7 @@
 	int	buffer_bytes = im->m_width * im->m_height;
 	uint8_t*      buffer = new uint8_t[buffer_bytes];
 
-	inflate_wrapper(in->get_underlying_stream(), buffer, buffer_bytes);
+	inflate_wrapper(*in, buffer, buffer_bytes);
 
 	for (int i = 0; i < buffer_bytes; i++)
 	{
@@ -765,7 +765,7 @@
 		int buffer_bytes = color_table_size * 3 + pitch * height;
 		boost::scoped_array<uint8_t> buffer ( new uint8_t[buffer_bytes] );
 
-		inflate_wrapper(in->get_underlying_stream(), buffer.get(), buffer_bytes);
+		inflate_wrapper(*in, buffer.get(), buffer_bytes);
 		assert(in->get_position() <= in->get_tag_end_position());
 
 		uint8_t* color_table = buffer.get();
@@ -793,7 +793,7 @@
 		int buffer_bytes = pitch * height;
 		boost::scoped_array<uint8_t> buffer ( new uint8_t[buffer_bytes] );
 
-		inflate_wrapper(in->get_underlying_stream(), buffer.get(), buffer_bytes);
+		inflate_wrapper(*in, buffer.get(), buffer_bytes);
 		assert(in->get_position() <= in->get_tag_end_position());
 
 		for (int j = 0; j < height; j++)
@@ -821,7 +821,7 @@
 		int buffer_bytes = pitch * height;
 		boost::scoped_array<uint8_t> buffer ( new uint8_t[buffer_bytes] );
 
-		inflate_wrapper(in->get_underlying_stream(), buffer.get(), buffer_bytes);
+		inflate_wrapper(*in, buffer.get(), buffer_bytes);
 		assert(in->get_position() <= in->get_tag_end_position());
 
 		// Need to re-arrange ARGB into RGB.
@@ -879,7 +879,7 @@
 		int buffer_bytes = color_table_size * 4 + pitch * height;
 		boost::scoped_array<uint8_t> buffer ( new uint8_t[buffer_bytes] );
 
-		inflate_wrapper(in->get_underlying_stream(), buffer.get(), buffer_bytes);
+		inflate_wrapper(*in, buffer.get(), buffer_bytes);
 		assert(in->get_position() <= in->get_tag_end_position());
 
 		uint8_t* color_table = buffer.get();
@@ -908,7 +908,7 @@
 		int buffer_bytes = pitch * height;
 		boost::scoped_array<uint8_t> buffer ( new uint8_t[buffer_bytes] );
 
-		inflate_wrapper(in->get_underlying_stream(), buffer.get(), buffer_bytes);
+		inflate_wrapper(*in, buffer.get(), buffer_bytes);
 		assert(in->get_position() <= in->get_tag_end_position());
 
 		for (int j = 0; j < height; j++)
@@ -932,7 +932,7 @@
 	    {
 		// 32 bits / pixel, input is ARGB format
 
-		inflate_wrapper(in->get_underlying_stream(), image->m_data, width * height * 4);
+		inflate_wrapper(*in, image->m_data, width * height * 4);
 		assert(in->get_position() <= in->get_tag_end_position());
 
 		// Need to re-arrange ARGB into RGBA.



From MAILER-DAEMON Tue Aug 28 08:39:21 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQ0Lp-0008Vd-9a
	for mharc-gnash-commit@gnu.org; Tue, 28 Aug 2007 08:39:21 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQ0Ln-0008UL-Pq
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 08:39:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQ0Li-0008ON-Ob
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 08:39:19 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQ0Li-0008OB-K0
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 08:39:14 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1IQ0Li-0005qH-7s
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 08:39:14 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <udo.gnu@nova-sys.net>) id 1IQ0Lh-0002r3-6o
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 12:39:13 +0000
Received: from udog by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <udog@savannah.gnu.org>) id 1IQ0Lh-0002r0-0f
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 12:39:13 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQ0Lh-0002r0-0f@cvs.savannah.gnu.org>
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
Date: Tue, 28 Aug 2007 12:39:13 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash server/stream.h ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Aug 2007 12:39:20 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Udo Giacomozzi <udog>	07/08/28 12:39:12

Modified files:
	server         : stream.h 
	.              : ChangeLog 

Log message:
	server/stream.h: documented some functions

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/stream.h?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4135&r2=1.4136

Patches:
Index: server/stream.h
===================================================================
RCS file: /cvsroot/gnash/gnash/server/stream.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/stream.h	27 Aug 2007 18:52:58 -0000	1.27
+++ server/stream.h	28 Aug 2007 12:39:12 -0000	1.28
@@ -79,12 +79,33 @@
 			// m_current_byte = 0; // this is not needed
 		}
 
+		/// \brief
+		/// Read <count> bytes from the source stream and copy that data to <buf>.
+		/// Implicitely aligns to the next byte.
 		unsigned read(char *buf, unsigned count);
+		
+		/// \brief
+		/// Read a aligned unsigned 8-bit value from the stream.		
 		uint8_t  read_u8();
+
+		/// \brief
+		/// Read a aligned signed 8-bit value from the stream.		
 		int8_t   read_s8();
+
+		/// \brief
+		/// Read a aligned unsigned 16-bit value from the stream.		
 		uint16_t read_u16();
+
+		/// \brief
+		/// Read a aligned signed 16-bit value from the stream.		
 		int16_t  read_s16();
+
+		/// \brief
+		/// Read a aligned unsigned 32-bit value from the stream.		
 		uint32_t read_u32();
+
+		/// \brief
+		/// Read a aligned signed 32-bit value from the stream.		
 		int32_t  read_s32();
 
 		/// \brief

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.4135
retrieving revision 1.4136
diff -u -b -r1.4135 -r1.4136
--- ChangeLog	28 Aug 2007 12:01:29 -0000	1.4135
+++ ChangeLog	28 Aug 2007 12:39:12 -0000	1.4136
@@ -1,3 +1,7 @@
+2007-08-28 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* server/stream.h: documented some functions
+	
 2007-08-28 Sandro Santilli <strk@keybit.net>
 
 	* server/swf/tag_loaders.cpp: remove all bug jpeg-related



From MAILER-DAEMON Tue Aug 28 09:12:43 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQ0s7-00020L-H1
	for mharc-gnash-commit@gnu.org; Tue, 28 Aug 2007 09:12:43 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQ0s6-0001yH-4l
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 09:12:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQ0s5-0001xB-Bl
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 09:12:41 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQ0s4-0001wp-S6
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 09:12:40 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IQ0s4-0003me-Fb
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 09:12:40 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IQ0s3-0005Vv-3o
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 13:12:39 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IQ0s2-0005Vm-UV
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 13:12:39 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQ0s2-0005Vm-UV@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 28 Aug 2007 13:12:38 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog libbase/image.h libbase/jpeg.cp...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Aug 2007 13:12:42 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/28 13:12:38

Modified files:
	.              : ChangeLog 
	libbase        : image.h jpeg.cpp jpeg.h 
	server         : stream.h 
	server/swf     : tag_loaders.cpp 

Log message:
	        * libbase/: image.{cpp,h}, jpeg.{cpp,h}: extend interface
	          for jpeg creators taking tu_file to specify
	          ownership of the input stream.
	        * server/swf/tag_loaders.cpp: substitute calls to
	          stream::get_underlying_stream with use of a quick&dirty
	          tu_file adpater using stream underneath.
	        * server/stream.h: remove get_underlying_stream method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4136&r2=1.4137
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/image.h?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/jpeg.cpp?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/jpeg.h?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/stream.h?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.133&r2=1.134

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4136
retrieving revision 1.4137
diff -u -b -r1.4136 -r1.4137
--- ChangeLog	28 Aug 2007 12:39:12 -0000	1.4136
+++ ChangeLog	28 Aug 2007 13:12:37 -0000	1.4137
@@ -1,3 +1,13 @@
+2007-08-28 Sandro Santilli <strk@keybit.net>
+
+	* libbase/: image.{cpp,h}, jpeg.{cpp,h}: extend interface
+	  for jpeg creators taking tu_file to specify
+	  ownership of the input stream.
+	* server/swf/tag_loaders.cpp: substitute calls to
+	  stream::get_underlying_stream with use of a quick&dirty
+	  tu_file adpater using stream underneath.
+	* server/stream.h: remove get_underlying_stream method.
+
 2007-08-28 Udo Giacomozzi <udo.gnu@nova-sys.net>
 
 	* server/stream.h: documented some functions

Index: libbase/image.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/image.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- libbase/image.h	16 Jun 2007 12:47:53 -0000	1.14
+++ libbase/image.h	28 Aug 2007 13:12:38 -0000	1.15
@@ -155,6 +155,11 @@
 	DSOEXPORT rgb*	read_jpeg(const char* filename);
 
 	/// Create and read a new image from the stream.
+	//
+	/// @param in
+	/// 	Stream to read from. Ownership to the caller,
+	///	not needed after return.
+	///
 	DSOEXPORT rgb*	read_jpeg(tu_file* in);
 
 	/// \brief

Index: libbase/jpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/jpeg.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- libbase/jpeg.cpp	28 Aug 2007 10:20:57 -0000	1.19
+++ libbase/jpeg.cpp	28 Aug 2007 13:12:38 -0000	1.20
@@ -46,21 +46,29 @@
 	public:
 		struct jpeg_source_mgr	m_pub;		/* public fields */
 
+		// Constructor.  The caller is responsible for closing the input stream
+		// after it's done using us.
+		//
 		rw_source_tu_file(tu_file* in)
 			:
+			_ownSourceStream(false),
 			m_in_stream(in),
 			m_start_of_file(true)
-		// Constructor.  The caller is responsible for closing the input stream
-		// after it's done using us.
 		{
-			// fill in function pointers...
-			m_pub.init_source = init_source;
-			m_pub.fill_input_buffer = fill_input_buffer;
-			m_pub.skip_input_data = skip_input_data;
-			m_pub.resync_to_restart = jpeg_resync_to_restart;	// use default method
-			m_pub.term_source = term_source;
-			m_pub.bytes_in_buffer = 0;
-			m_pub.next_input_byte = NULL;
+			init();
+		}
+
+		void takeStreamOwnership()
+		{
+			_ownSourceStream=true;
+		}
+
+		~rw_source_tu_file()
+		{
+			if ( _ownSourceStream )
+			{
+				delete m_in_stream;
+			}
 		}
 
 		static void init_source(j_decompress_ptr cinfo)
@@ -159,15 +167,40 @@
 			m_pub.next_input_byte = NULL;
 		}
 
-		// Set up the given decompress object to read from the given
-		// stream.
-		static void setup(jpeg_decompress_struct* cinfo, tu_file* instream)
+		/// Set up the given decompress object to read from the given
+		/// stream.
+		///
+		/// @param instream
+		/// 	Stream to read from. Ownership decided by last arg.
+		///
+		/// @param takeOwnership
+		///	If false, ownership of the stream 
+		///	is left to caller, otherwise we take it.
+		//
+		static void setup(jpeg_decompress_struct* cinfo, tu_file* instream,
+			bool takeOwnership=false)
 		{
 			// assert(cinfo->src == NULL);
-			cinfo->src = (jpeg_source_mgr*) (new rw_source_tu_file(instream));
+			rw_source_tu_file* source = new rw_source_tu_file(instream);
+			if ( takeOwnership ) source->takeStreamOwnership();
+			cinfo->src = (jpeg_source_mgr*)source;
 		}
 
 	private:
+
+		void init()
+		{
+			// fill in function pointers...
+			m_pub.init_source = init_source;
+			m_pub.fill_input_buffer = fill_input_buffer;
+			m_pub.skip_input_data = skip_input_data;
+			m_pub.resync_to_restart = jpeg_resync_to_restart;	// use default method
+			m_pub.term_source = term_source;
+			m_pub.bytes_in_buffer = 0;
+			m_pub.next_input_byte = NULL;
+		}
+
+		bool _ownSourceStream;
 		tu_file*	m_in_stream;		/* source stream */
 		bool	m_start_of_file;		/* have we gotten any data yet? */
 		JOCTET	m_buffer[IO_BUF_SIZE];		/* start of buffer */
@@ -288,9 +321,18 @@
 		enum SWF_DEFINE_BITS_JPEG2 { SWF_JPEG2 };
 		enum SWF_DEFINE_BITS_JPEG2_HEADER_ONLY { SWF_JPEG2_HEADER_ONLY };
 
-		// Constructor.  Read the header data from in, and
-		// prepare to read data.
-		input_tu_file(tu_file* in)
+		/// \brief
+		/// Constructor.  Read the header data from in, and
+		/// prepare to read data.
+		//
+		/// @param in
+		/// 	The stream to read from. Ownership specified by
+		///	second argument.
+		///
+		/// @param takeOwnership
+		///	If true, we take ownership of the input stream. 
+		///
+		input_tu_file(tu_file* in, bool takeOwnership=false)
 			:
 			m_compressor_opened(false)
 		{
@@ -301,7 +343,7 @@
 			// Initialize decompression object.
 			jpeg_create_decompress(&m_cinfo);
 
-			rw_source_tu_file::setup(&m_cinfo, in);
+			rw_source_tu_file::setup(&m_cinfo, in, takeOwnership);
 
 			start_image();
 		}
@@ -314,7 +356,15 @@
 		// start_image() and finish_image() around any calls
 		// to get_width/height/components and read_scanline.
 		//
-		input_tu_file(SWF_DEFINE_BITS_JPEG2_HEADER_ONLY /* e */, tu_file* in)
+		/// @param in
+		/// 	The stream to read from. Ownership specified by
+		///	last argument.
+		///
+		/// @param takeOwnership
+		///	If true, we take ownership of the input stream. 
+		///
+		input_tu_file(SWF_DEFINE_BITS_JPEG2_HEADER_ONLY /* e */, tu_file* in,
+				bool takeOwnership=false)
 			:
 			m_compressor_opened(false)
 		{
@@ -325,7 +375,7 @@
 			// Initialize decompression object.
 			jpeg_create_decompress(&m_cinfo);
 
-			rw_source_tu_file::setup(&m_cinfo, in);
+			rw_source_tu_file::setup(&m_cinfo, in, takeOwnership);
 
 			// Read the encoding tables.
 			int ret = jpeg_read_header(&m_cinfo, FALSE);
@@ -364,7 +414,6 @@
 			delete src;
 			m_cinfo.src = NULL;
 
-
 			jpeg_destroy_decompress(&m_cinfo);
 		}
 
@@ -576,18 +625,18 @@
 
 /*static*/
 input*
-input::create(tu_file* in)
+input::create(tu_file* in, bool takeOwnership)
 {
-	input* ret = new tu_file_wrappers::input_tu_file(in);
+	input* ret = new tu_file_wrappers::input_tu_file(in, takeOwnership);
 	return ret;
 }
 
 /*static*/
 input*
-input::create_swf_jpeg2_header_only(tu_file* in)
+input::create_swf_jpeg2_header_only(tu_file* in, bool takeOwnership)
 {
 	using tu_file_wrappers::input_tu_file;
-	input* ret = new input_tu_file(input_tu_file::SWF_JPEG2_HEADER_ONLY, in);
+	input* ret = new input_tu_file(input_tu_file::SWF_JPEG2_HEADER_ONLY, in, takeOwnership);
 	return ret;
 }
 

Index: libbase/jpeg.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/jpeg.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- libbase/jpeg.h	28 Aug 2007 10:20:57 -0000	1.7
+++ libbase/jpeg.h	28 Aug 2007 13:12:38 -0000	1.8
@@ -43,9 +43,19 @@
 		//
 		/// The created input reads the jpeg header
 		///
+		/// @param in
+		///	The stream to read from. Ownership specified by last arg.
+		///
+		/// @param takeOwnership
+		///	If false, ownership of the stream 
+		///	is left to caller, otherwise we take it.
+		///	NOTE: In case the caller retains ownership, it must
+		///	make sure the stream is alive and not modified
+		///	for the whole lifetime of the returned instance.
+		///
 		/// @return NULL on error
 		///
-		DSOEXPORT static input*	create(tu_file* in);
+		DSOEXPORT static input*	create(tu_file* in, bool takeOwnership=false);
 
 		/// Read SWF JPEG2-style header. 
 		//
@@ -53,9 +63,21 @@
 		/// image data.  Multiple images can be loaded by
 		/// bracketing within start_image()/finish_image() pairs.
 		///
+		/// @param in
+		///	The tu_file to use for input. Ownership specified
+		///	by last arg.
+		///
+		/// @param takeOwnership
+		///	If false, ownership of the stream 
+		///	is left to caller, otherwise we take it.
+		///	NOTE: In case the caller retains ownership, it must
+		///	make sure the stream is alive and not modified
+		///	for the whole lifetime of the returned instance.
+		///
 		/// @return NULL on error
 		///
-		DSOEXPORT static input*	create_swf_jpeg2_header_only(tu_file* in);
+		DSOEXPORT static input*	create_swf_jpeg2_header_only(tu_file* in,
+				bool takeOwnership=false);
 
 		/// Discard existing bytes in our buffer.
 		virtual void	discard_partial_buffer() = 0;

Index: server/stream.h
===================================================================
RCS file: /sources/gnash/gnash/server/stream.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- server/stream.h	28 Aug 2007 12:39:12 -0000	1.28
+++ server/stream.h	28 Aug 2007 13:12:38 -0000	1.29
@@ -203,7 +203,7 @@
 		/// Seek to the end of the most-recently-opened tag.
 		void	close_tag();
 
-		tu_file*	get_underlying_stream() { return m_input; }
+		//tu_file*	get_underlying_stream() { return m_input; }
 
 		/// Discard given number of bytes
 		//

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -b -r1.133 -r1.134
--- server/swf/tag_loaders.cpp	28 Aug 2007 12:01:30 -0000	1.133
+++ server/swf/tag_loaders.cpp	28 Aug 2007 13:12:38 -0000	1.134
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: tag_loaders.cpp,v 1.133 2007/08/28 12:01:30 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.134 2007/08/28 13:12:38 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -80,6 +80,62 @@
 namespace SWF {
 namespace tag_loaders {
 
+
+namespace { // anonymous
+
+///
+/// tu_file adapter using a stream underneath
+///
+
+/// Provide a tu_file interface around a gnash::stream
+class StreamAdapter
+{
+	stream& s;
+
+	StreamAdapter(stream& str)
+		:
+		s(str)
+	{}
+
+	static int readFunc(void* dst, int bytes, void* appdata) 
+	{
+		StreamAdapter* br = (StreamAdapter*) appdata;
+		return br->s.read((char*)dst, bytes);
+	}
+
+	static int closeFunc(void* appdata)
+	{
+		StreamAdapter* br = (StreamAdapter*) appdata;
+		delete br;
+		return 0; // ok ? or TU_FILE_CLOSE_ERROR ?
+	}
+
+public:
+
+	/// Get a tu_file from a gnash::stream
+	static std::auto_ptr<tu_file> getFile(stream& str)
+	{
+		std::auto_ptr<tu_file> ret ( 
+			new tu_file (
+				new StreamAdapter(str),
+				readFunc,
+				0, // write_func wf,
+				0, //seek_func sf,
+				0, //seek_to_end_func ef,
+				0, //tell_func tf,
+				0, //get_eof_func gef,
+				0, //get_err_func ger
+				0, // get_stream_size_func gss,
+				closeFunc
+			)
+		);
+
+		return ret;
+	}
+};
+
+} // anonymous namespace
+
 // ----------------------------------------------------------------------------
 // ADPCMDecoder class
 // ----------------------------------------------------------------------------
@@ -488,7 +544,11 @@
 
     try
     {
-        j_in.reset(jpeg::input::create_swf_jpeg2_header_only(in->get_underlying_stream()));
+	std::auto_ptr<tu_file> ad( StreamAdapter::getFile(*in) );
+	//  transfer ownerhip to the jpeg::input
+        j_in.reset(jpeg::input::create_swf_jpeg2_header_only(ad.release(), true));
+
+        //j_in.reset(jpeg::input::create_swf_jpeg2_header_only(in->get_underlying_stream()));
     }
     catch (std::exception& e)
     {
@@ -579,12 +639,9 @@
 
     if (m->get_create_bitmaps() == DO_LOAD_BITMAPS)
     {
-	//bitmap_info*	bi = NULL;
-	std::auto_ptr<image::rgb> im ( image::read_jpeg(in->get_underlying_stream()) );
-	//bi = render::create_bitmap_info_rgb(im);
-	//delete im;
-
-	//assert(bi->get_ref_count() == 0);
+	std::auto_ptr<tu_file> ad( StreamAdapter::getFile(*in) );
+	std::auto_ptr<image::rgb> im ( image::read_jpeg(ad.get()) );
+	//std::auto_ptr<image::rgb> im ( image::read_jpeg(in->get_underlying_stream()) );
 
 	if ( m->get_bitmap_character_def(character_id) )
 	{
@@ -689,7 +746,9 @@
 	//
 
 	// Read rgb data.
-	std::auto_ptr<image::rgba> im( image::read_swf_jpeg3(in->get_underlying_stream()) );
+	std::auto_ptr<tu_file> ad( StreamAdapter::getFile(*in) );
+	std::auto_ptr<image::rgba> im( image::read_swf_jpeg3(ad.get()) );
+	//std::auto_ptr<image::rgba> im( image::read_swf_jpeg3(in->get_underlying_stream()) );
 
 	// Read alpha channel.
 	in->set_position(alpha_position);



From MAILER-DAEMON Tue Aug 28 20:19:11 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQBH5-000392-EA
	for mharc-gnash-commit@gnu.org; Tue, 28 Aug 2007 20:19:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQBH3-00038n-TG
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 20:19:09 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQBH3-00038O-3W
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 20:19:09 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQBH2-00038L-U6
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 20:19:08 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IQBH2-0005fT-NB
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 20:19:08 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IQBH1-00082P-25
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 00:19:07 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IQBH0-00082M-QZ
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 00:19:06 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQBH0-00082M-QZ@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 29 Aug 2007 00:19:06 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash NEWS [release_0_8_1]
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Aug 2007 00:19:10 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Branch:		release_0_8_1
Changes by:	Sandro Santilli <strk>	07/08/29 00:19:06

Modified files:
	.              : NEWS 

Log message:
	Updated release date to Aug, 29 2007

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/NEWS?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.4.6.3&r2=1.4.6.4

Patches:
Index: NEWS
===================================================================
RCS file: /sources/gnash/gnash/NEWS,v
retrieving revision 1.4.6.3
retrieving revision 1.4.6.4
diff -u -b -r1.4.6.3 -r1.4.6.4
--- NEWS	22 Aug 2007 16:11:43 -0000	1.4.6.3
+++ NEWS	29 Aug 2007 00:19:06 -0000	1.4.6.4
@@ -1,4 +1,4 @@
-2007-08-23  Sandro Santilli <strk@keybit.net>
+2007-08-29  Sandro Santilli <strk@keybit.net>
 
 Fourth alpha release of Gnash (0.8.1).
 Improvements since 0.8.0 release are:



From MAILER-DAEMON Tue Aug 28 20:36:38 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQBXx-0000Sw-U1
	for mharc-gnash-commit@gnu.org; Tue, 28 Aug 2007 20:36:37 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQBXw-0000R3-32
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 20:36:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQBXt-0000P7-QT
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 20:36:34 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQBXt-0000P4-Lo
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 20:36:33 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IQBXt-00006N-DQ
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 20:36:33 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IQBXs-0008KK-9O
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 00:36:32 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IQBXs-0008KH-2t
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 00:36:32 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQBXs-0008KH-2t@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 29 Aug 2007 00:36:32 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/text.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Aug 2007 00:36:36 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/29 00:36:31

Modified files:
	.              : ChangeLog 
	server         : text.h 

Log message:
	        * server/text.h: fix signature of setFont(font*):
	          return void.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4137&r2=1.4138
http://cvs.savannah.gnu.org/viewcvs/gnash/server/text.h?cvsroot=gnash&r1=1.20&r2=1.21

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4137
retrieving revision 1.4138
diff -u -b -r1.4137 -r1.4138
--- ChangeLog	28 Aug 2007 13:12:37 -0000	1.4137
+++ ChangeLog	29 Aug 2007 00:36:31 -0000	1.4138
@@ -1,3 +1,8 @@
+2007-08-29 Sandro Santilli <strk@keybit.net>
+
+	* server/text.h: fix signature of setFont(font*):
+	  return void.
+
 2007-08-28 Sandro Santilli <strk@keybit.net>
 
 	* libbase/: image.{cpp,h}, jpeg.{cpp,h}: extend interface

Index: server/text.h
===================================================================
RCS file: /sources/gnash/gnash/server/text.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/text.h	21 Aug 2007 14:42:12 -0000	1.20
+++ server/text.h	29 Aug 2007 00:36:31 -0000	1.21
@@ -79,7 +79,7 @@
 		///	The font pointer.
 		///	Must not be NULL or an assertion will fail.
 		///
-		bool setFont(const font* fnt)
+		void setFont(const font* fnt)
 		{
 			assert(fnt);
 			m_font = fnt;



From MAILER-DAEMON Tue Aug 28 20:56:53 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQBrZ-0003vW-Du
	for mharc-gnash-commit@gnu.org; Tue, 28 Aug 2007 20:56:53 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQBrX-0003u5-VO
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 20:56:52 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQBrQ-0003nu-0q
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 20:56:51 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQBrP-0003nd-DH
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 20:56:43 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IQBrN-0003hV-17
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 20:56:43 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IQBrK-0001ee-Vx
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 00:56:39 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IQBrK-0001eb-N3
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 00:56:38 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQBrK-0001eb-N3@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 29 Aug 2007 00:56:38 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog ChangeLog-0.8.1
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Aug 2007 00:56:52 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/29 00:56:38

Modified files:
	.              : ChangeLog 
Added files:
	.              : ChangeLog-0.8.1 

Log message:
	Copied ChangeLog from 0.8.1 final to ChangeLog-0.8.1, reset our ChangeLog
	to contain all changes since branching of the 0.8.1 series

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4138&r2=1.4139
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog-0.8.1?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4138
retrieving revision 1.4139
diff -u -b -r1.4138 -r1.4139
--- ChangeLog	29 Aug 2007 00:36:31 -0000	1.4138
+++ ChangeLog	29 Aug 2007 00:56:38 -0000	1.4139
@@ -943,2639 +943,3 @@
 	* testsuite/misc-swfc.all/check.sc, Dejagnu.sc, sound.sc, hello.sc,
 	  sound.wav, Makefile.am: new test framework by using swfc.
 
-2007-08-09 Sandro Santilli <strk@keybit.net>
-
-	* server/stream.h (ensureBytes): be more verbose about the lack of
-	  data. Fix signed/unsigned comparison.
-	* server/swf/tag_loaders.cpp (adpcm_expand): fix count of needed
-	  bytes. Fixes bug #20725.
-
-2007-08-08 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
-
-	* plugin/plugin.cpp: replicate compatibility version to the end, to
-	  make UFO flash version detector happy. Fixes bug #20696.
-
-2007-08-08 Sandro Santilli <strk@keybit.net>
-
-	* server/sprite_instance.cpp: drop set_variable() methods.
-	  Have setVariables() call set_member directly (might change in the
-	  future to call as_environment's set_variable, if we find out
-	  variables in query string, FlashParams and loadVariable loaded text
-	  files can contain path elements).
-
-2007-08-08 Sandro Santilli <strk@keybit.net>
-
-	* testsuite/actionscript.all/LoadVars.as: enabled tests erroneously
-	  committed disabled.
-	* server/sprite_instance.cpp (processCompletedLoadVariableRequests):
-	  use set_member, not set_variable - the latter is only meant to be
-	  called on the root movie.
-	* server/impl.cpp, server/swf/tag_loaders.{cpp,h}: stub parsing
-	  of REFLEX tag.
-	* server/asobj/Mouse.cpp: make the global Mouse symbol point
-	  to an object, not a constructor.
-	* testsuite/actionscript.all/Mouse.as: xcheck -> check.
-
-2007-08-08 Tomas Groth Christensen <tomasgroth@yahoo.dk>
-
-	* backend/sound_handler_{sdl,gst}.cpp: Detect and fix if a soundstream
-	  is out of sync (after position-jump or general out of sync issue),
-	  fixes bug #20681.
-
-2007-08-08 Tomas Groth Christensen <tomasgroth@yahoo.dk>
-
-	* backend/sound_handler_sdl.cpp: Fix counting of samples played,
-	  and use the output samplerate to calculate the playhead position
-	  in time, fixes/improves bug #20684.
-
-2007-08-07 Sandro Santilli <strk@keybit.net>
-
-	* gui/Makefile.am: clean the 'gnash' script on make clean. 
-	* server/sprite_instance.cpp (processCompletedLoadVariableRequest):
-	  fix attempt to increment past-the-end iterator.
-	* libbase/zlib_adaptar.cpp: don't hang on corrupted input.
-	* libbase/jpeg.{cpp,h}: don't segfault on corrupted input.
-	* server/matrix.cpp (read): add TODO item (check input)
-	* server/rect.cpp (read): add TODO item (check input)
-	* server/movie_instance.cpp (advance): warn only once about movie
-	  containing no frames.
-	* server/parser/morph2_character_def.{cpp,h} (read): document,
-	  don't read past end of tag.
-	* server/stream.h (read_variable_count): document and add
-	  integrity checks. Add a GNASH_TRUST_SWF macro to turn ensureBytes
-	  to a no-op.
-	* server/parser/shape_character_def.cpp (read_fill_styles,
-	  read_line_styles, read): don't read past end of tag. Don't try to
-	  recover if an exception is thrown by fill style parser.
-	* server/styles.{cpp,h} (line_style::read): don't read past end of tag.
-	* server/fill_style.{cpp,h} (read): don't read past end of tag.
-	* server/types.{cpp,h} (rgba::read_rgba, rgbe::read): don't read past end
-	  of tag.
-	* server/parser/action_buffer.cpp (read): don't read past end of tag.
-	* Makefile.am: don't list 'doc' twice in subdirs. Fixes 'distclean'
-	  rule.
-
-2007-08-07 Sergio Costas <raster (at) rastersoft.com>
-
-	* backend/sound_handler_gst.cpp: Fix returns from getPosition
-	  (patch #6140), and fix a segfault when asking for position
-	  before sound has been started (patch #6138).
-	* backend/sound_handler_sdl.cpp: Fix returns from getPosition
-	  (patch #6140).
-
-2007-08-06 Sandro Santilli <strk@keybit.net>
-
-	* doc/xmldocs.make: fix uninstall rule to properly remove images
-	  of the manual.
-	* doc/C/Makefile.am, doc/C/asspec/Makefile.am: don't list entities
-	  twice for distribution (fixed make uninstall for the most part,
-	  needs some other tweak for png files)
-	* testsuite/actionscript.all/toString_valueOf.as: fix some
-	  of the tests, disable a test depending on timezone. Please
-	  further tests on Date go to the Date.as file.
-	* server/as_value.{cpp,h}: add a to_int() method taking
-	  care of compatible integer conversion. Add note about
-	  deprecation of templated to_number<>.
-	* server/vm/ASHandlers.cpp: explicitly use to_int() in bitwise
-	  ops. Fixes ops.as testcases built with newer Ming. Add TODO
-	  lines about possible other uses.
-	* testsuite/swfdec/PASSING: bitwise-{5,6,7}.swf now pass.
-
-2007-08-06 Sandro Santilli <strk@keybit.net>
-
-	* testsuite/actionscript.all/ops.as: add test for 0xffffffff
-	  conversion to integer needing to be -1 (gnash fails, need Ming head
-	  to reproduce)
-	* server/video_stream_instance.cpp (markReachableResources): don't
-	  forget to call the character's version of resource marking !!
-	  Fixes bug #20657.
-
-2007-08-06 Zou Lunkai <zoulunkai@gmail.com>
-	
-	* testsuite/actionscript.all/ops.as: xcheck to check, it passed here.
-	  
-2007-08-05 Sandro Santilli <strk@keybit.net>
-
-	* server/parser/character_def.h: provide a protected copy constructor
-	  resetting the render_cache_manager to NULL in the copy, to avoid
-	  multiple destruction of the same object. Add private and aborting
-	  assignment operator. Fixes bug #20694.
-	* server/parser/shape_character_def.{cpp,h}: implement copy
-	  constructor. Add private and aborting assignment operator.
-	  Deprecate input/output cache methods and data.
-	* server/DynamicShape.cpp: update after deprecation of cache
-	  data for input/output stuff.
-
-2007-08-05 Sandro Santilli <strk@keybit.net>
-
-	* server/vm/VM.h: make gnash buildable with GC unused.
-
-2007-08-05 Zou Lunkai <zoulunkai@gmail.com>
-	
-	* testsuite/actionscript.all/toString_valueOf.as, Makefile.am: focused tests, 
-	  hopefully helps the model("String" object is not bogus, and "trace" is also sane).
-	
-2007-08-04 Sandro Santilli <strk@keybit.net>
-
-	* testsuite/actionscript.all/array.as: fixed testcase.
-
-2007-08-04 Sandro Santilli <strk@keybit.net>
-
-	* testsuite/generic-testrunner.sh: it seems 'read' w/out arg
-	  starts being a problem with some shells.
-
-2007-08-04 Sandro Santilli <strk@keybit.net>
-
-	* gui/gnash.in: add missing she bang.
-
-2007-08-04 Ivor Blockley <meteoryte@yahoo.com.au>
-
-	* server/array.cpp:
-	  Pointers to the as_environment object in the as_value comparison
-	  functors are now references.
-	  Fix a bug caused by a missing return statement in the get_basic_eq
-	  function.
-	* testsuite/actionscript.all/array.as:
-	  UNIQUE -> UNIQUESORT flag.
-	  add some tests to see how AS objects implementing the valueOf method
-	  interact with array class methods.
-
-2007-08-04 Sandro Santilli <strk@keybit.net>
-
-	* server/asobj/xmlnode.{cpp,h}: mark reachable resources
-	  (childs and parent).
-
-2007-08-03 Sandro Santilli <strk@keybit.net>
-
-	* server/asobj/Stage.cpp (notifyResize): use PROPNAME()
-	  for proper case of notification event. Finish the dangling
-	  referneces drop thing.
-
-2007-08-03 Sandro Santilli <strk@keybit.net>
-
-	* server/asobj/Stage.{cpp,h}: Mark all listeners as reachable,
-	  drop the unused dropDanglingListeners (since it's verified
-	  the Stage doesn't store *weak* pointers).
-
-2007-08-03 Sandro Santilli <strk@keybit.net>
-
-	* server/movie_root.cpp (getStage): properly convert case when
-	  fetching the "Stage" object from SWF6 or lower.
-	* server/asobj/Stage.cpp (onResize): properly convert case
-	  when fetching the "scaleMode" property from SWF6 or lower.
-
-2007-08-03 Sandro Santilli <strk@keybit.net>
-
-	* testsuite/actionscript.all/Stage.as: test deleting an object
-	  which is also a listener (Gnash segfaults).
-
-2007-08-03 Ivor Blockley <meteoryte@yahoo.com.au>
-
-	* server/array.{cpp,h}: fixes previously identified issues with
-	  array.cpp involving functions that needed to be environment and
-	  SWF-version aware (mainly functions involved in sorting). 
-	* testsuite/actionscript.all/array.as: xcheck->check, few more
-	  tests.
-
-2007-08-03 Sandro Santilli <strk@keybit.net>
-
-	* server/asobj/NetStream.{cpp,h}: mark associated as_environment
-	  as reachable (but I think there are ownership problem there,
-	  the as_environment might be deleted before the NetStream object
-	  is, in which case we'd access random memory).
-
-2007-08-03 Sandro Santilli <strk@keybit.net>
-
-	* configure.ac: make sure PKG_CONFIG is defined before calling 
-	  GNAH_PATH_XXX. Made the notice clearer about GNASH_PATH_XX
-	  need to be put after it.
-
-2007-08-03 Sandro Santilli <strk@keybit.net>
-
-	* configure.ac: move GTK detection code *after* the cross-compiling
-	  section, so that $incllist is properly set. Add notice about
-	  the fact that any GNASH_PATH_XX must be invoked after that one.
-
-2007-08-03 Sandro Santilli <strk@keybit.net>
-
-	* Makefile.am: only descend in doc/ subdir if DOCBOOK is enabled.
-
-2007-08-03 Sandro Santilli <strk@keybit.net>
-
-	* configure.ac: check GTK dependencies only if $build_gtk=yes.
-	  print a WARNING and set $build_gtk=no if deps are not met.
-	  All of this is done *before* NSAPI is checked, so it would
-	  correctly be built or not depending on $build_gtk only.
-
-2007-08-03 Sandro Santilli <strk@keybit.net>
-
-	* configure.ac: fix automatic kparts/nsapi plugin build
-	  based on gui availability.
-
-2007-08-03 Sandro Santilli <strk@keybit.net>
-
-	* configure.ac: fix misleading warning about KDE/GTK gui 
-	  not being built while KPARTS/NSAPI plugin is when instead
-	  the guis are actually being built.
-
-2007-08-03 Ivor Blockley <meteoryte@yahoo.com.au>
-
-	* server/array.cpp: fix iterators invalidation (bug #20667).
-
-2007-08-03  Rob Savoye  <rob@deal.welcomehome.org>
-
-	* configure.ac: Fix typo so --disable-nsapi works. Cleanup the
-	logic of what gets built when. Add a few warnings.
-
-2007-08-02 Sandro Santilli <strk@keybit.net>
-
-	* Makefile.am: add plugins info to 'dumpconfig' output,
-	  simplify the SUBDIR construction (side-effect is we always
-	  descend to most subdirs, even if there's nothing to do in them)
-	* plugin/Makefile.am: don't build libgnashplugin if NSAPI
-	  conditional is false; always descend to klash/ subdir
-	  and let the inner Makefile.am handle conditionals for KPARTS.
-	* plugin/klash/Makefile.am: don't override the 'all' target.
-
-2007-08-02  Rob Savoye  <rob@deal.welcomehome.org>
-
-	* plugin/Makefile.am: Use BUILD_KDE_GUI instead of KLASH. Use
-	NSAPI instead of PLUGIN, KPARTS instead of KLASH.
-	* Makefile.am: Change from PLUGIN to NSAPI and KPARTS for conditionals. 
-	* configure.ac: Change --disable-klash to --disable-kparts, add
-	--disable-nsapi to replace the older --disable-plugin
-	setting. Make building the plugins conditional on the gui being
-	selected and if the development libraries exist.
-	* gui/Makefile.am: Comment out the dyna,ic vs static support, it's
-	uneeded for now.
-	* macros/firefox.m4: Use nsapi instead of plugin as the
-	conditional.
-	* macros/kde.m4: set has_kde to yes by default. It can get
-	disabled later.
-	* plugin/klash/Makefile.am: Use KPARTS instead of KLASH.
-
-2007-08-02 Sandro Santilli <strk@keybit.net>
-
-	* server/asobj/gen-asclass.sh: add the addStatic call to statics.
-	* server/movie_root.{cpp,h}: use a member (and a getter) for the global
-	  key object, and properly mark it as alive.
-
-2007-08-02 Sandro Santilli <strk@keybit.net>
-
-	* server/edit_text_character.cpp: register statics.
-	* server/sprite_instance.cpp: register statics.
-	* server/video_stream_instance.cpp: register statics.
-	* server/array.cpp: register static constructor and prototype,
-	  since arrays are used by the core independentely of their
-	  availability as global classes (function arguments are arrays).
-	* server/as_function.cpp: register static constructor and prototype,
-	  since functions are used by the core independently of their
-	  availability as global classes (each function uses the Function
-	  prototype).
-
-2007-08-02 Sandro Santilli <strk@keybit.net>
-
-	* testsuite/actionscript.all/ops.as: more tests for 'string' == NaN.
-	* server/as_value.cpp (equals): yet another pass at
-	  abstract equality operator. We're still not there, but
-	  getting closer.
-	* testsuite/actionscript.all/ops.as: xcheck -> check.
-
-2007-08-02 Sandro Santilli <strk@keybit.net>
-
-	* testsuite/actionscript.all/: Function.as, ops.as:
-	  Moved tests for equality operator against MovieClip where
-	  it belongs.
-
-2007-08-02 Sandro Santilli <strk@keybit.net>
-
-	* testsuite/actionscript.all/MovieClip.as: test MovieClip.valueOf().
-	* server/as_value.{cpp,h}: as_environment parameter made mandatory
-	  for the equals() method.
-	* server/vm/ASHandlers.cpp (ActionEquals): update calls to
-	  as_value::equals().
-
-2007-08-02 Sandro Santilli <strk@keybit.net>
-
-	* testsuite/actionscript.all/array.as: add test for Array.valueOf().
-	* server/as_value.cpp (equals) : fix true==1 and true!=2
-	  (was failing).
-	* server/vm/ASHandlers.cpp: shift right/left : take undefined
-	  values as zeroes.
-	* testsuite/actionscript.all/ops.as: minor additions, xcheck to
-	  check.
-
-2007-08-02 Sandro Santilli <strk@keybit.net>
-
-	* server/PropertyList.cpp: add compile-time macro for debugging
-	  property allocations.
-
-2007-08-02 Udo Giacomozzi <udo.gnu@nova-sys.net>
-
-	* gui/gtk_glue_agg.cpp: Warn when compiling for OLPC, change compile-time
-	  error to runtime error to be multi-GUI friendly.
-
-2007-08-02 Sandro Santilli <strk@keybit.net>
-
-	* server/asobj/NetConnection.h: remove the unused _owner method.
-
-2007-08-02 Zou Lunkai <zoulunkai@gmail.com>
-	
-	* testsuite/actionscript.all/ops.as: more tests, checks to xchecks.
-	  
-2007-08-02 Sandro Santilli <strk@keybit.net>
-
-	* gui/Makefile.am: comment out the _DEPENDENCIES lines. Properly
-	  rebuilds the binaries when needed (might be breaking another kind
-	  of dependency, but this one was pretty disturbing for me in that
-	  it didn't trigger rebuil when _LIBS changed)
-	* server/asobj/MovieClipLoader.cpp: implement reachable resources
-	  marker (listeners).
-	* server/movie_root.cpp: set background to white by default.
-	  Should fix bug #20655.
-
-2007-08-02 Zou Lunkai <zoulunkai@gmail.com>
-	
-	* testsuite/actionscript.all/ops.as: more tests and more failures. still
-	  need more, we don't want fail on those basic logical operations.
-	  
-2007-08-01 Sandro Santilli <strk@keybit.net>
-
-	* server/swf/tag_loaders.cpp (define_sound_loader): fix a bug
-	  introduced by last commit (sorry)
-
-2007-08-01 Sandro Santilli <strk@keybit.net>
-
-	* server/swf/tag_loaders.cpp: completely remove the bogus assertion
-	  about the required input bytes in relation to the number of samples.
-	  Rather, add more ensureBytes() uses, closer to where the data is
-	  actually read from the stream.
-
-2007-08-01 Sandro Santilli <strk@keybit.net>
-
-	* server/swf/tag_loaders.cpp (sound_expand): fix assertion
-	  checking; added some uses of the new stream::ensureBytes() method;
-	  add more scoped_array uses.
-
-2007-08-01 Sandro Santilli <strk@keybit.net>
-
-	* server/stream.h: add ensureBytes() method to verify
-	  SWF integrity.
-
-2007-08-01 Sandro Santilli <strk@keybit.net>
-
-	* server/swf/tag_loaders.cpp: (define_sound_loader) check if number of
-	  samples exceed available bytes in the tag. (sound_expand) assertion
-	  checking. (u8_expand) use a scoped_array in the easy case (we'll
-	  need more smart pointers in general).
-	* backend/sound_handler.h (create_sound, fill_stream_data): document ownership
-	  of the 'data' argument, and add a TODO item about changing
-	  the interface.
-
-2007-08-01 Udo Giacomozzi <udo.gnu@nova-sys.net>
-
-	* gui/gtk_glue_agg.cpp: Support the OLPC again
-
-2007-08-01 Sandro Santilli <strk@keybit.net>
-
-	* server/asobj/: Boolean.cpp, Number.cpp, string.cpp:
-	  register static constructors and prototypes with the VM.
-	* server/vm/VM.{cpp,h}: Add support for registering
-	  arbitrary as_object for reachability. Intended to
-	  be used whenever a static as_object pointer is allocated.
-
-2007-08-01 Sandro Santilli <strk@keybit.net>
-
-	* gui/gnash.in: don't loose parameters layout. Fixes bug #20651.
-	* gui/Makefile.am: distribute gnash.in
-
-2007-08-01 Udo Giacomozzi <udo.gnu@nova-sys.net>
-
-	* gui/gtk_glue_agg.{cpp,h}: stubbed pixel format detection. Will
-	  break OLPC support but fix bug #20649 for all others.
-
-2007-08-01 Tomas Groth Christensen <tomasgroth@yahoo.dk>
-
-	* backend/sound_handler_gst.{h,cpp}: Switch to try_mutex, and in 
-	  callback_handoff only try to lock, and return if unsuccesfull
-	  to avoid a potential deadlock, fixes bug #20596. Warning fixes.
-
-2007-08-01 Sandro Santilli <strk@keybit.net>
-
-	* plugin/plugin.cpp: run 'gtk-gnash' by default.
-
-2007-07-31 Sandro Santilli <strk@keybit.net>
-
-	* configure.ac, gui/Makefile.am: comment out --enable-dynamic-gui
-	  and related conditionals use.
-
-2007-07-31 Sandro Santilli <strk@keybit.net>
-
-	* testsuite/actionscript.all/array.as: more tests for Array.sort()
-	  and Array.sortOn(). These tests are mainly to explore the behavior
-	  of sorting arrays of objects that override the toString() method and
-	  sortOn using properties specified by such objects. 
-	  Tests provided by Ivor Blockley and cleaned up/fixed by me.
-
-2007-07-31 Sandro Santilli <strk@keybit.net>
-
-	* plugin/klash/klash_part.cpp: run 'kde-gnash' by default
-	  (not 'klash')
-	* gui/gnash.in: don't pass -G over to the actual executable;
-	  translate gui name to lowercase.
-
-2007-07-31 Sandro Santilli <strk@keybit.net>
-
-	* gui/: Makefile.am, gnash.in:
-	  Initial draft of a 'gnash' wrapper.
-
-2007-07-31 Sandro Santilli <strk@keybit.net>
-
-	* configure.ac: rename GUI_CONFIG to SUPPORTED_GUIS to
-	  avoid confusion with the define later set by gui/Makefile.am
-	* gui/Makefile.am: build an executable for each supported
-	  GUI, named <gui>-gnash
-	* gui/Player.{cpp,h}: drop runtime parsing of gui name, just
-	  use whatever gui is specified by the GUI_CONFIG macro set
-	  by the Makefile.
-	* gui/gnash.cpp: drop runtime GUI selection  (and -G switch).
-
-2007-07-31 Sandro Santilli <strk@keybit.net>
-
-	* testsuite/misc-ming.all/ming_utils.c: add word wrapping
-	  to the xtrace window.
-
-2007-07-31 Sandro Santilli <strk@keybit.net>
-
-	* doc/C/usermanual/installation/feature_configuration.xml:
-	  Document --enable-mit-shm
-	* configure.ac: add --enable-mit-shm
-	* gui/gtk_glue_agg.h: don't redefine ENABLE_MIT_SHM, use definition
-	  from config.h
-
-2007-07-31 Udo Giacomozzi <udo.gnu@nova-sys.net>
-
-	* gui/gtk_glue_agg.h: disable MIT-SHM by default (see bug #20301)
-
-2007-07-31 Sandro Santilli <strk@keybit.net>
-
-	* server/vm/ASHandlers.cpp (ActionBitwiseAnd):
-	  take nan operands as zero.
-	* testsuite/actionscript.all/: Makefile.am, ops.as:
-	  new testcase for primitive operations (to complete)
-
-2007-07-31 Sandro Santilli <strk@keybit.net>
-
-	* server/vm/ASHandlers.cpp (ActionBitwiseXor, ActionBitwiseOr): 
-	  take nan operands as zero.
-	* testsuite/actionscript.all/array.as: expect less failures.
-
-2007-07-31 Zou Lunkai <zoulunkai@gmail.com>
-	
-	* testsuite/misc-ming.all/place_object_test2.c, Makefile.am
-	  activate the testcase, fix setting the ratio value(0~1.0 in Ming).
-	  
-2007-07-31 Sandro Santilli <strk@keybit.net>
-
-	* testsuite/actionscript.all/array.as: expect a failure
-	  in the case-insensitive descending sort tested for SWF>6
-
-2007-07-31 Sandro Santilli <strk@keybit.net>
-
-	* server/array.cpp (join): use the SWF-version aware version
-	  of as_value to string conversion. Add TODO items.
-	* testsuite/actionscript.all/array.as: don't expect a failure
-	  in the descending numeric sort
-
-2007-07-31 Zou Lunkai <zoulunkai@gmail.com>
-	
-	* testsuite/misc-ming.all/duplicate_movie_clip_test.c, place_object_test.c,
-	  place_object_test2.c: trivial comments cleanups.
-	  
-2007-07-30 Sandro Santilli <strk@keybit.net>
-
-	* libamf/Makefile.am: add BOOST libs
-	* testsuite/samples/Makefile.am: link in
-	  libgnashserver.la, libgnashbase.la and
-	  libgnashamf.la.
-
-2007-07-29 Sandro Santilli <strk@keybit.net>
-
-	* backend/render_handler_tri.cpp: implemented world_to_pixel and
-	  pixel_to_world (to check, UdoG, can you ?)
-	* gui/gtksup.h: remove any use of RENDERER_XXY defines, use 
-	  the GtkGlue interface only (keep by auto_ptr)
-	* gui/gtk_glue.h: header guard (no code was including this :/)
-	* gui/gtk.cpp: updated use of the glue, remove as much as possible
-	  uses of RENDERER_XXY, the only left are for glue initialization
-	  (headers and constructions) and for the call to prepDrawingArea
-	  which needs to be ordered differently for OGL and for other
-	  renderers.
-
-2007-07-29 Sandro Santilli <strk@keybit.net>
-
-	* configure.ac: Change --enable-renderer to accept a *single* renderer
-	  as the gui code / build scripts are not ready to handle multiple ones
-	  currently (temp hack for 0.8.1). By default, renderer is AGG now.
-
-2007-07-29 Sandro Santilli <strk@keybit.net>
-
-	* server/asobj/SoundGst.cpp (getPosition): fix typo (len=>pos).
-	* server/parser/edit_text_character_def.h: use device fonts
-	  by default (matches the comment near it, was just a typo).
-	  Fixes dynamic textfields using device fonts.
-	* testsuite/actionscript.all/TextField.as: expect one failure
-	  less.
-
-2007-07-30 Sergio Costas <raster (at) rastersoft.com>
-
-	* backend/sound_handler_gst.cpp: Use the audioconverter element
-	  to get the current position, to avoid delay.
-	* server/asobj/SoundGst.cpp: Fixed some faulty conversions to
-	  milliseconds.
-
-2007-07-30 Alexander Sack <asac@jwsdot.com>
-
-	* server/asobj/NetStreamGst.cpp: Fix plugin loading
-	  for non-modern Gstreamer versions.
-
-2007-07-30 Markus Gothe <nietzsche@lysator.liu.se>
-
-	* gui/Info.plist.in: Tidy up the version info, fixed icon.
-	* gui/Makefile.am: Build OS X bundle if GUI == AQUA.
-	* gui/aqua.cpp: Implemented OS-version checking and setCursor.
-	  Added 'About' and 'Preferences...' menus.
-
-2007-07-29  Rob Savoye  <rob@deal.welcomehome.org>
-
-	* macros/firefox.m4: Always install the plugin in ~/.mozilla/plugins.
-
-2007-07-29 Sandro Santilli <strk@keybit.net>
-
-	* configure.ac: drop add_gui variable again, use another way to
-	  handle a missing --enable-gui.
-
-2007-07-29 Sandro Santilli <strk@keybit.net>
-
-	* configure.ac: don't force KDE gui everytime plugin is disabled (sic).
-
-2007-07-29 Nick Warne <nick@ukfsn.org>
-
-	* configure.ac: don't rely on has_kde *before* it is attempted to be
-	  set.
-
-2007-07-29 Ivor Blockley <meteoryte@yahoo.com.au>
-
-	* server/array.{cpp,h}: implement remaining array.sort(..) functionality
-	  (flags UNIQUE and RETURNINDEXEDARRAY) all of array.sortOn(...)
-	* testsuite/actionscript.all/array.as: test for Array.sort and
-	  Array.sortOn
-
-2007-07-29 Ivor Blockley <meteoryte@yahoo.com.au>
-
-	* server/array.cpp: Fix bug in the array.splice(index) method to
-	  prevent an incorrect number of elements being spliced; fix bug
-	  in the array.slice(startindex, endindex) method for certain
-	  negative endindexes; elements in a newly created array with
-	  non-zero size are now assigned a value of 'undefined' rather
-	  than 'null'; trivial optimizations/clean-ups.
-	* testsuite/actionscript.all/array.as: more tests.
-
-2007-07-28  Rob Savoye  <rob@deal.welcomehome.org>
-
-	* macros/ffmpeg.m4: Add test for libswscale, which is needed if
-	ffmpeg is configured with --enable-gpl --enable-swscale. bug #20002.
-
-2007-07-28 Sandro Santilli <strk@keybit.net>
-
-	* configure.ac: re-introduce the $add_gui variable, so that a vanilla
-	  configuration still tries to build gtk and kde guis; don't make fb
-	  renderer and cairo gui incompatible (other guis might be requested,
-	  we'd need a better test to check that at least one compatible with
-	  cairo is there)
-
-2007-07-28 Sandro Santilli <strk@keybit.net>
-
-	* configure.ac: don't miss to set add_renderer when no
-	  --enable-renderer is given, and only abort complaining if NO
-	  GUI supporting opengl is built while also requesting to build opengl
-	  renderer.
-
-2007-07-28 Sandro Santilli <strk@keybit.net>
-
-	* configure.ac: proper quote args given to test (in the code
-	  snippet handling --enable-gui)
-
-2007-07-28 Sandro Santilli <strk@keybit.net>
-
-	* po/Makefile.am: use GMSGFMT, rather then verbatim 'msgfmt'.
-	* configure.ac: simplify gui selection code, fix bug listing
-	  same gui twice.
-	* gui/gui_fb.cpp: typo fix (FbGui => FBGui).
-	* testsuite/misc-mtasc.all/Makefile.am: distribute
-	  mtasc related files even if mtasc is not detected.
-
-2007-07-28 Markus Gothe <nietzsche@lysator.liu.se>
-	
-	* configure.ac: Don't try building KDE/Klash if we'vent got the libs...
-	* gui/aqua*, gui/Info.pist, gui/images/GnashG.icns, gui/Makefile.am: 
-	  Now we can build a bundle by running 'make bundle', albeit I must
-	  fix the linkage.
-
-2007-07-27 Nick Warne <nick@ukfsn.org>
-
-	* plugin/klash/klash_part.cpp: typo (0l => 0L)
-
-2007-07-27 Tomas Groth Christensen <tomasgroth@yahoo.dk>
-
-	* backend/sound_handler.h, backend/sound_handler_gst.{cpp,h},
-	backend/sound_handler_sdl.{cpp,h}, server/asobj/SoundFfmpeg.{h,cpp},
-	server/asobj/SoundGst.{h,cpp}, server/asobj/SoundMad.{h,cpp}:
-	Implement duration and position properties when using Sound objects
-	to control an eventsound, patch partly by Sergio Costas.
-	* server/swf/tag_loaders.cpp: Fix warnings.
-
-2007-07-27 Sandro Santilli <strk@keybit.net>
-
-	* gui/Makefile.am: distribute kde_glue_opengl.h.
-
-2007-07-27 Markus Gothe <nietzsche@lysator.liu.se>
-
-	* gui/DESIGN: Added some docmentation on the GUI-API.
-	* gui/Player.cpp: define DEAFULT_GUI as a string instead of enum.
-
-2007-07-26 Sandro Santilli <strk@keybit.net>
-
-	* configure.ac: Don't threat static linking specially, multiple
-	  GUIs can still be supported by that.
-
-2007-07-26 Sandro Santilli <strk@keybit.net>
-
-	* configure.ac: don't assume that if GTK gui is used only the
-	  GTK-pixelformat is needed (other GUIs might be built).
-	  Fixes bug #20586.
-	* gui/Player.{cpp,h}: Be more verbose on gui initialization error.
-	* gui/kde.cpp (createWindow): return false if renderer creation
-	  failed.
-	* gui/kde_glue_agg.cpp (createRenderHandler): throw an exception if
-	  render handler could not be created.
-	
-2007-07-26 Sandro Santilli <strk@keybit.net>
-
-	* gui/gnash.cpp: scan argv[0] and select KDE gui if it contains
-	  the string 'klash'.
-	* Makefile.am, configure.ac, gui/Makefile.am:
-	  Don't miss to list 'kde' as a gui when built as a side-effect
-	  of enabling klash: fixes proper report of which GUI have been
-	  compiled-in; Take first gui given to --enable-gui as the default
-	  one.
-	* gui/Player.cpp: don't force a default gui, take the one defined
-	  by build line (or default to nullGui).
-	* gui/gnash.cpp: print default gui from --version.
-
-2007-07-26 Alexander Sack <asac@jwsdot.com>
-
-	* server/asobj/NetStreamGst.cpp: Don't use a variable before it 
-	  has been initialized.
-
-2007-07-25 Sandro Santilli <strk@keybit.net>
-
-	* gui/Makefile.am: build libgnashplayer again,
-	  linked against libgnashgui, which is linked
-	  against any gui/renderer specific lib that was
-	  built
-	* gui/Player.{cpp,h}: use named constructors to create
-	  guis, so to avoid the need of including GUI-specific
-	  headers (which do conflict).
-	* gui/gui.h: make constructors protected, provide named
-	  (free functions) constructors for the different guis.
-	* gui/: gui_aqua.cpp, gui_fb.cpp, gui_fltk.cpp, gui_gtk.cpp,
-	  gui_kde.cpp, gui_riscos.cpp, gui_sdl.cpp: modules implementing
-	  the GUI named constructors.
-
-2007-07-25 Sandro Santilli <strk@keybit.net>
-
-	* gui/Player.{cpp,h}: add support for multiple GUI libs.
-	  They can be statically or dynamically linked (not loaded as plugins
-	  yet).
-	* gui/gnash.cpp: add a -G switch to select GUI. If the gui wasn't
-	  compiled in an exception will be thrown (and dunno why not propery
-	  cought..).
-
-2007-07-25 Sandro Santilli <strk@keybit.net>
-
-	* configure.ac: set the BUILD_<gui> conditionals *after* giving kde
-	  gui a chance to be picked back as a dependency of 'klash'.
-	  This fixes a buil bug when klash is enabled by only gtk gui is
-	  selected.
-	* lots of files : fixed Copyright info (delete spurious empty line,
-	  add year 2007).
-
-2007-07-25 Sandro Santilli <strk@keybit.net>
-
-	* server/as_value.h: remove unneeded "container.h" include.
-	* server/as_value.cpp (equalsSameType): fixed nan comparison.
-	* testsuite/actionscript.all/Number.as: fixed NaN != NaN test
-	  (should return false). Add NaN == NaN test (should return true);
-	  Add (0/2) == (0/5) (shoudl return true).
-
-2007-07-25 Sandro Santilli <strk@keybit.net>
-
-	* server/as_value.cpp: drop lowercase_if_needed, substitute with
-	  the PROPNAME macro.
-	* server/as_value.h: add a PROPNAME macro to perform the lowercase
-	  conversion of property names when needed (copies arg)
-	* server/as_environment.h: added some notes about variable name
-	  case conversion.
-	* server/edit_text_character.cpp: removed unused lowercase_if_needed
-	  function.
-	* gui/Makefile.am: build klash when conditinally enabled
-	* gui/gnash.cpp: add missing newline after Gstreamer version
-	  (--version).
-
-2007-07-24 Sandro Santilli <strk@keybit.net>
-
-	* testsuite/actionscript.all/MovieClip.as: minor test for
-	  proper properties 'loadMovie' and 'loadMovieNum'.
-	* server/edit_text_character.cpp: make the
-	  PP_COMPATIBLE_DEVICE_FONT_HANDLING back to undefined
-	  by default. It's incomplete and premature to attempt
-	  limitation-level compatibility.
-	* configure.ac: don't take absence of libAGG as if an
-	  old version was found. Fixes bug #20011.
-
-2007-07-24 Tomas Groth Christensen <tomasgroth@yahoo.dk>
-
-	* server/parser/video_stream_def.cpp: Free the video frames
-	  when deleting the video_stream_def object. Make the buffer
-	  containing the video data 4 bytes bigger than needed to avoid
-	  illegal reads from ffmpeg. Fixes bug #20440.
-
-2007-07-24 Sandro Santilli <strk@keybit.net>
-
-	* Makefile.am: define PHONY rules.
-
-2007-07-24 Sandro Santilli <strk@keybit.net>
-
-	* server/edit_text_character.cpp: add a
-	  PP_COMPATIBLE_DEVICE_FONT_HANDLING macro to mimic
-	  limitation of proprietary player in handling textfields
-	  using device fonts. See DeviceFonts wiki page for more
-	  information. (The macro defaults to being defined)
-
-2007-07-24 Sandro Santilli <strk@keybit.net>
-
-	* server/asobj/SoundFfmpeg.h: Provide a constructor
-	  for proper initialization of members.
-	  YOU CAN NOT ASSUME POINTERS WILL BE INITIALIZED TO NULL.
-	  Fixes bug #20578.
-
-2007-07-24 Sandro Santilli <strk@keybit.net>
-
-	* server/text.cpp (display_glyph_records): don't render invalid glyphs
-	  as empty boxes, unless a DRAW_INVALID_GLYPHS_AS_EMPTY_BOXES macro
-	  is defined.
-	* server/edit_text_character.cpp (setEmbedFonts):
-	  Set _embedFonts *before* calling format_text, or
-	  glyph indexes will be messed up.
-
-2007-07-24 Sandro Santilli <strk@keybit.net>
-
-	* server/font.{cpp,h}: Refactor class definition
-	  to maintain two separate glyph information sets:
-	  one for device and one for embedded glyphs. Added
-	  a parameter to glyph-related accessors and mutators
-	  to specify which set to use.
-	* server/edit_text_character.{cpp,h}: update gnash::font
-	  services call to select embedded or device fonts.
-	* server/fontlib.cpp: updated calls to gnash::font so
-	  to always use embedded ones (mostly caching stuff, which
-	  is currently disabled)
-	* server/text.{cpp,h}: add a boolean parameter to
-	  display_glyph_records to specify wheter to use embedded
-	  or device glyphs when fetching them from the font.
-	* server/parser/text_character_def.cpp: use embedded glyphs.
-
-2007-07-24 Sandro Santilli <strk@keybit.net>
-
-	* server/parser/edit_text_character_def.h:
-	  initialize m_use_outlines to true (so dynamically-created
-	  textfields will use device fonts by default), provide
-	  a getUseEmbeddedGlyphs() public method.
-	* server/edit_text_character.{cpp,h}: add an _embedFonts member
-	  initialized using edit_text_character_def::getUseEmbeddedGlyphs(),
-	  provide the "embedFonts" getter-setter for it.
-	* testsuite/: actionscript.all/TextField.as,
-	  misc-ming.all/DefineEditTextTest.c: less failures.
-
-2007-07-24 Sandro Santilli <strk@keybit.net>
-
-	* testsuite/misc-ming.all/: DefineEditTextTest.c,
-	  DefineEditTextTest-Runner.cpp: a small additional
-	  test for runtime-changing the .embedFont member of a TextField.
-	* testsuite/actionscript.all/TextField.as: more tests
-	  for embedFont member.
-
-2007-07-24 Sandro Santilli <strk@keybit.net>
-
-	* server/font.cpp: more parser verbosity.
-	* server/movie_root.cpp (notify_global_key): Key object
-	  existed since SWF5, not SWF6. Fixes pacman-flash.swf.
-	* server/gnash.h: fix PGDN and PGUP key constants
-	* server/asobj/Global.cpp: initialize the "Key" class
-	  even in SWF5.
-	* server/asobj/Key.cpp: use init_member rather then set_member
-	  when initializing constants, reduce complexity of compile-time
-	  switches for NEW_KEY_LISTENER_LIST_DESIGN, general cleanups.
-	* testsuite/actionscript.all/: Makefile.am, Key.as: new testcase
-	  for Key object
-
-2007-07-24 Udo Giacomozzi <udo.gnu@nova-sys.net>
-
-	* server/dlist.cpp: handle masks of certain malformed(?) movies correctly
-	  (see bug #20527)	
-
-2007-07-24 Sandro Santilli <strk@keybit.net>
-
-	* testsuite/actionscript.all/: case.as, enumerate.as: add rcsid.
-	* server/as_object.{cpp,h}: Add a virtual enumerateNonProperties,
-	  called by enumerateProperties, to allow for enumeration of non-proper
-	  properties (in particular sprite childs).
-	* server/sprite_instance.{cpp,h}: Implement enumerateNonProperties to
-	  enumerate child characters.
-	* testsuite/actionscript.all/enumerate.as: don't expect failures while
-	  enumerating childs.
-
-2007-07-24 Tomas Groth Christensen <tomasgroth@yahoo.dk>
-
-	* server/parser/video_stream_def.cpp: Convert width and height to
-	  the correct format before using them. Fixes bug #20526 and #20440.
-
-2007-07-23 Sandro Santilli <strk@keybit.net>
-
-	* backend/: sound_handler_gst.{cpp,h},
-	  sound_handler_sdl.{cpp,h}:
-	  Define sound handlers inside the gnash namespace.
-
-2007-07-23 Sandro Santilli <strk@keybit.net>
-
-	* plugin/klash/Makefile.am: fix uninstall rule.
-	  Make distcheck works fine on gnashdev now.
-
-2007-07-23 Sandro Santilli <strk@keybit.net>
-
-	* libbase/embedVideoDecoderGst.cpp (createDecoder): fix use of
-	  possibly undefined variable warning, added a couple of assertions
-	  and comments about the why.
-
-2007-07-23 Sandro Santilli <strk@keybit.net>
-
-	* backend/: sound_handler.{cpp,h}, Makefile.am,
-	  sound_handler_gst.cpp, sound_handler_sdl.cpp,
-	  libbase/: utility.{cpp,h}, server/asobj/SoundMad.cpp:
-	  Moved convert_raw_data from libgnashbackend
-	  to libgnashbase. Should fix bug #20110.
-
-2007-07-23 Sandro Santilli <strk@keybit.net>
-
-	* configure.ac: still create Makefile under cygnal
-	  subdirs, or 'dist' rule will fail.
-
-2007-07-23 Sandro Santilli <strk@keybit.net>
-
-	* configure.ac: make sure $add_renderer contain
-	  well-defined values (not arbitrary ones). This is
-	  to make sure RENDERER_LIBS is always meaningful.
-
-2007-07-23 Sandro Santilli <strk@keybit.net>
-
-	* plugin/klash/Makefile.am: define GNASHBINDIR.
-        * configure.ac: don't define RENDERER_AGG *before* the build_agg
-	  variable it is based on has a chance to change value.
-	  Fixes bug #20563
-
-2007-07-23 Sandro Santilli <strk@keybit.net>
-
-	* configure.ac: Fix help strings: --with-{gui,renderer} => --enable-{gui,renderer}
-	* plugin/klash/klash_part.cpp: invoke "klash", not "gnash".
-	  Allow KLASH_PLAYER environment variable to change what's
-	  invoked. The plan is that "klash" would be an alias for
-	  "gnash --gui=kde".
-
-2007-07-23 Udo Giacomozzi <udo.gnu@nova-sys.net>
-
-	* server/edit_text_character.cpp: make get_world_cxform() again
-	  Windows-compatible (relevant code is still disabled, so no
-	  visible difference until we have finished discussing this)
-
-2007-07-23 Sandro Santilli <strk@keybit.net>
-
-	* gui/Makefile.am, testsuite/misc-mtasc.all/Makefile.am:
-	  Fix 'dist' rule.
-	* testsuite/misc-ming.all/: DefineEditTextTest-Runner.cpp,
-	  Makefile.am: skeleton for a MovieTester based runner.
-	* testsuite/misc-ming.all/DefineEditTextTest.c: fixed expected
-	  results.
-	* autogen.sh: libtoolize is in the 'libtool' package.
-	* plugin/plugin.h: remove unneeded include.
-
-2007-07-22 Sandro Santilli <strk@keybit.net>
-
-	* server/edit_text_character.cpp: (get_world_cxform):
-	  return the identity transform in the (disabled) 
-	  "device font" section.
-
-2007-07-22 Udo Giacomozzi <udo.gnu@nova-sys.net>
-
-	* testsuite/samples/input-fields.swf: sample movie
-	  for textfields.
-
-2007-07-22 Sandro Santilli <strk@keybit.net>
-
-	* server/edit_text_character.{cpp,h} (setTextColor): 
-	  update text glyph records color.
-
-2007-07-21 Sandro Santilli <strk@keybit.net>
-
-	* testsuite/actionscript.all/TextField.as: update expected
-	  results for 'textColor' member.
-	* server/types.h (rgba::toRGB): const-corrected.
-	* server/edit_text_character.{cpp,h}: Add a member for text color,
-	  make 'textColor' a proper property.
-
-2007-07-21 Markus Gothe <nietzsche@lysator.liu.se>
-
-	* gui/Makefile.am: Added BUILD_GUI_AQUA.
-
-2007-07-20 Udo Giacomozzi <udo.gnu@nova-sys.net>
-
-	* server/edit_text_character.cpp: fix background and cxform for
-	  text fields
-	* server/edit_text_character.{h,cpp}: special get_world_cxform() 
-	  handler to make input fields opaque for device fonts (currently
-    no effect, since it can't be detected yet)
-
-2007-07-20 Sandro Santilli <strk@keybit.net>
-
-	* server/edit_text_character.cpp (display): make the default
-	  background color solid white (but still background is only drawn
-	  if either 'background' or 'border' are set to true).
-	* testsuite/misc-ming.all/DefineEditTextTest.c: don't include gnash
-	  headers from SWF *generators* !
-	* configure.ac: provide a RENDERER_LIBS listing all built renderer
-	  libraries
-	* testsuite/Makefile.am: link libgnashtestsuite against all built 
-	  renderer libraries.
-
-2007-07-20 Sandro Santilli <strk@keybit.net>
-
-	* configure.ac: rename the gui/renderer selection switch
-	  back to --enable-{gui,renderer} so we don't need to update
-	  our existing configuration wrapper scripts; dynamic loading
-	  of gui/renderer is disabled by default, so advertise the switch
-	  to enable.
-
-2007-07-20 Zou Lunkai <zoulunkai@gmail.com>
-	
-	* testsuite/misc-ming.all/unload_movieclip_test1.c: comments
-	* testsuite/misc-ming.all/DefineEditTextTest.c: removed some incorrect
-	  tests.
-	  
-2007-07-19  Rob Savoye  <rob@deal.welcomehome.org>
-
-	* gui/Makefile.am: Use *_CONFIG variables instead of *_OPT
-	ones. Use BUILD_* conditionals instead of USE_GUI.
-	* backend/Makefile.am: Build seperate libraries for each backend.
-	* configure.ac: Don't pass the data to AM_INIT_AUTOMAKE. Don't
-	disable static libs. Add option for dynamically loading
-	guis. (disabled by default for now). Don't build cygnal by
-	default. Remove --enable-gui and --enable-renderer with new
-	options, --with-gui and --with-renderer to list multiple options
-	for guis and renderers. Don't configure cygnal sub directories yet.
-	* Makefile.am: Use *_CONFIG variables instead of *_OPT ones.
-	* extensions/Makefile.am: Use BUILD_* conditionals instead of
-	USE_GUI.
-	* libbase/Makefile.am: Use HAVE_SDL instead of HAS_SDL.
-	* macros/gtkglext.m4: Use --libs-only-l insted of --libs.
-	* testsuite/misc-ming.all/DefineEditTextTest.c: Include fontlib.h.
-	* macros/libltdl.m4: Move the serial numbers to the top to keep
-	automate 1.19 happy.  
-	* macros/x11.m4: Don't put a conditional in an if block.
-
-2007-07-15  Rob Savoye  <rob@deal.welcomehome.org>
-
-	* po/Makefile.am: Add -Wno-portability to AUTOMAKE_OPTIONS to
-	stop complaints we don't care about. 
-	* gui/Makefile.am: Add -Wno-portability to AUTOMAKE_OPTIONS to
-	stop complaints we don't care about. 
-	* testsuite/misc-ming.all/Makefile.am: Add -Wno-portability to
-	AUTOMAKE_OPTIONS to stop complaints we don't care about.
-	* testsuite/misc-swfmill.all/Makefile.am: Add -Wno-portability to
-	AUTOMAKE_OPTIONS to stop complaints we don't care about.
-	* testsuite/swfdec/Makefile.am: Add -Wno-portability to
-	AUTOMAKE_OPTIONS to stop complaints we don't care about.
-
-2007-07-14  Rob Savoye  <rob@bertha.welcomehome.org>
-
-	* configure.ac: Add new Cygnal directories.
-
-2007-07-19 Sandro Santilli <strk@keybit.net>
-
-	* testsuite/actionscript.all/TextField.as: more successes.
-	* server/edit_text_character.cpp (attachTextFieldInterface): 
-	  fix a bug swapping .border and .borderColor semantic (!).
-	* configure.ac: test(1) string equality operator is "=",
-	  not "==". Other attempt at fixing bug #20525.
-
-2007-07-18 Sandro Santilli <strk@keybit.net>
-
-	* configure.ac: quote `backticked commands` when assigning to
-	  variables. Should fix bug #20525.
-
-2007-07-18 Sandro Santilli <strk@keybit.net>
-
-	* backend/render_handler_agg_style.h: fixed initialization order
-	  warnings.
-	* backend/render_handler_agg.cpp: signedness and initialization list
-	  order warnings fix. This code is a jungle, would be *really* useful
-	  to split class declarations and definition.
-
-2007-07-18 Sandro Santilli <strk@keybit.net>
-
-	* server/impl.cpp (clear): don't attempt to cleanup the
-	  GC if no GC is being used.
-	* cygnal/Makefile.am : Don't build the cygnal stuff,
-	  it's alpha after all... But still include in distribution.
-
-2007-07-18 Sandro Santilli <strk@keybit.net>
-
-	* cygnal/ACT/ACT.{cpp,hpp}: throw runtime_error if in need for a
-	  message string (std::exception ctor doesn't accept a string arg)
-	* cygnal/ACT/Handle.hpp: fix *a few* build errors, more available.
-	* cygnal/Makefile.am: Add all subdirs to SUBDIRS. Fixes bug #20509.
-
-2007-07-18 Sandro Santilli <strk@keybit.net>
-
-	* gui/gtksup.h: Fix extra qualification 'gnash::GtkGui::' on member 'rerenderPixels'
-
-2007-07-18 Udo Giacomozzi <udo.gnu@nova-sys.net>
-	
-	* gui/gtk.cpp: Make the drawing area resize also vertically with the window,
-	  fixes bug #18871
-	* backend/render_handler.h, backend/render_handler_agg.cpp, 
-	  backend/render_handler_tri.{cpp,h}: new methods "pixel_to_world"
-	* gui/gtk.cpp, gui/gtksup.h: Fix re-rendering on expose for scaled movies
-
-2007-07-18 Zou Lunkai <zoulunkai@gmail.com>
-	
-	* testsuite/misc-ming.all/unload_movieclip_test1.c, DefineEditTextTest.c:
-	  more tests.
-	  
-2007-07-18 Zou Lunkai <zoulunkai@gmail.com>
-	
-	* testsuite/misc-ming.all/Makefile.am, unload_movieclip_test1.c: add
-	  a testcase for unloaded movieclips, Gnash fails.
-	
-2007-07-18 Sandro Santilli <strk@keybit.net>
-
-	* testsuite/actionscript.all/TextField.as: Updated test results.
-	* testsuite/misc-ming.all/DefineEditTextTest.c: Updated test results.
-	* server/types.h: Add rgba::toRGB for serializing back to a number.
-	* server/edit_text_character.{cpp,h}: use instance members and
-	  getter-setters to keep info about background and border.
-	  This should fix invalidated bounds computation.
-
-2007-07-18 Zou Lunkai <zoulunkai@gmail.com>
-
-	* testsuite/misc-ming.all/DefineEditTextTest.c: xchecks to checks, more
-	  passed.
-	
-2007-07-17 Sandro Santilli <strk@keybit.net>
-
-	* server/edit_text_character.{cpp,h}: Initial support for background,
-	  backgroundColor, border and borderColor. Lacks proper management
-	  of invalidated bounds and class properties. 
-	* server/types.h: Add rgba::parseRGB() for converting an integer
-	  to an rgb value.
-	* server/as_object.h: fix comments about case sensitiveness of
-	  get_member* and set_member*.
-	* gui/Makefile.am: add gtk_cairo_create.h in GTK_CAIRO_SRCS.
-
-2007-07-18 Markus Gothe <nietzsche@lysator.liu.se>
-
-	* macros/opengl.m4: Typo fix on Darwin.
-
-2007-07-17 Nick Warne <nickw>
-
-	* backend/sound_handler_sdl.h, libbase/embedVideoDecoderFfmpeg.{cpp,h},
-	  server/asobj/{Sound, Netstream}Ffmpeg.h, gui/gnash.cpp: Fix for
-	 linking.
-
-2007-07-17 Zou Lunkai <zoulunkai@gmail.com>
-
-	* testsuite/actionscript.all/MovieClip.as: more tests, all passed.
-	  
-2007-07-17 Zou Lunkai <zoulunkai@gmail.com>
-
-	* testsuite/misc-ming.all/key_event_test5.c: make tests not dependent
-	  on the time of a key press, better self-contained.
-	* testsuite/actionscript.all/MovieClip.as: fix unsafe floating number
-	  comparison, better self-contained.
-	
-2007-07-17 Zou Lunkai <zoulunkai@gmail.com>
-
-	* server/asobj/Key.h, server/asobj/Key.cpp, 
-	  server/button_character_instance.cpp
-	  server/edit_text_character.cpp, server/movie_root.h, 
-	  sever/movie_root.cpp, server/sprite_instance.cpp: key listener
-	  handling cleanups, for better management of key listeners. change
-	  key listeners container from std::vector to std::set. Correct indent.
-	
-2007-07-14  Rob Savoye  <rob@bertha.welcomehome.org>
-
-	* configure.ac: Add new Cygnal directories.
-
-2007-07-13 Sandro Santilli <strk@keybit.net>
-
-	* server/sprite_instance.cpp (sprite_droptarget_getset): 
-	  Always return a string.
-	* testsuite/actionscript.all/MovieClip.as: fixed expected results.
-
-2007-07-13 Sandro Santilli <strk@keybit.net>
-
-	* server/sprite_instance.cpp (sprite_create_text_field): when
-	  targetting SWF8, return the newly created TextField.
-	* testsuite/actionscript.all/MovieClip.as: more successes.
-	* testsuite/actionscript.all/TextField.as: more successes; other fixes
-	  to expected results.
-
-2007-07-13 Sandro Santilli <strk@keybit.net>
-
-	* testsuite/actionscript.all/MovieClip.as: add notes about where we
-	  have been reported differences between proprietary player versions; 
-	  fix check for return code of createTextField for SWF8.
-	* testsuite/actionscript.all/TextField.as:
-	  fix check for return code of createTextField for SWF8;
-	  fix expected failures.
-
-2007-07-13 Sandro Santilli <strk@keybit.net>
-
-	* testsuite/actionscript.all/CustomActions.as: add a note about why
-	  no tests are run.
-	* server/asobj/Mouse.cpp: fix case of addListener and removeListener
-	  methods, add TODO for fixing all.
-	* testsuite/actionscript.all/Mouse.as: fix the test (case issue, and
-	  poor comparisons).
-
-2007-07-13 Sandro Santilli <strk@keybit.net>
-
-	* testsuite/actionscript.all/TextField.as: an hopefully complete
-	  testcase for the TextField class. Reveals a pattern in the
-	  TextField.prototype properties being created on first call to 
-	  createTextField() which looks interesting. Gnash fails about
-	  half of the over 250 tests.
-
-2007-07-13 Sandro Santilli <strk@keybit.net>
-
-	* backend/render_handler.h, backend/render_handler_agg.cpp,
-	  backend/render_handler_cairo.cpp,
-	  backend/render_handler_ogl.cpp, backend/render_handler_tri.cpp,
-	  backend/render_handler_tri.h, server/fontlib.cpp,
-	  server/fontlib.h, server/render.cpp, server/render.h:
-	  Updated renderer interface to always take gnash::rgba by const ref
-	  rather then by value. Should improve performance (removes double
-	  copy of 4 float values for each glyph, bitmap, line strip!).
-
-2007-07-13 Sandro Santilli <strk@keybit.net>
-
-	* testsuite/actionscript.all/TextField.as:
-	  Add test for TextField.prototype.hasOwnProperty('background')
-	  returning false (weird, returns true in
-	  misc.ming-all/DefineEditTestTest.c!)
-	* testsuite/misc-ming.all/DefineEditTextTest.c:
-	  Add test for TextField.prototype.hasOwnProperty('background')
-	  returning true (weird, returns false in actionscript.all/TextField.as!)
-
-2007-07-13 Sandro Santilli <strk@keybit.net>
-
-	* testsuite/actionscript.all/Microphone.as: test cleanup
-	  (see bug #20472).
-	* testsuite/misc-ming.all/Makefile.am: Fix linking
-	  for DefineEditTextTest, add rule to build the corresponding
-	  SWF file.
-
-2007-07-13 Zou Lunkai <zoulunkai@gmail.com>
-
-	* testsuite/misc-ming.all/DefineEditTextTest.c: more tests.
-	  	  
-2007-07-13 Zou Lunkai <zoulunkai@gmail.com>
-
-	* testsuite/misc-ming.all/DefineEditTextTest.c:
-	  include dejagnuclip, make it to be a self-contained one.
-	  
-2007-07-12 Ivor Blockley <meteoryte@yahoo.com.au>
-
-	Applied patch #6081
-	* server/array.{cpp,h}: fix user-defined comparator for sort()
-	  operation. There's a minor failure with definition of 'this'
-	  inside the comparator.
-	* testsuite/actionscript.all/array.as: add test for sort based
-	  on custom function.
-
-2007-07-12 Sandro Santilli <strk@keybit.net>
-
-	* testsuite/libbase/Makefile.am: gnash libs must be in LDADD, not
-	  AM_LDFLAGS, for dependencies to work fine.
-	* server/font.cpp (get_advance): fix passing non-POD type to
-	  printf-like function.
-	* libbase/rc.{cpp,h}: make the constructor and destructor private.
-	* testsuite/libbase/TCXXRc.cpp: use the default instance.
-
-2007-07-12 David Rorex <drorex@gmail.com>
-
-	* testsuite/misc-mtasc.all/: Dejagnu.as, Makefile.am,
-	  README, TestClass.as, check.as, enum.as, function.as, hello.as,
-	  inheritance.as, level5.as, level99.as, levels.as:
-	  Reorganized MTASC framework to avoid hackish use of Ming, and using
-	  the new dynamic textfield support. Added test for _level loading.
-
-2007-07-12 Martin Guy <martinwguy@yahoo.it>
-
-	* configure.ac,macros/docbook.m4,:
-	  Document "make pdf and "make html" commands near --enable-docbook
-	* doc/C/usermanual/installation/feature_configuration.xml:
-	  document --enable-docbook configuration flag.
-	* fb/gui.cpp: Add newline to end of fatal messages.
-	* server/stream.cpp: Remove silly assert to remove compiler warning
-	  about signed/unsigned
-
-2007-07-12 Zou Lunkai <zoulunkai@gmail.com>
-
-	* testsuite/actionscript.all/case.as: add tests for _name and _target,
-	  they are not converted to lower case with swf6.
-
-2007-07-12 Zou Lunkai <zoulunkai@gmail.com>
-
-	* testsuite/actionscript.all/case.as: add macros for version dependent
-	  tests.
-	* testsuite/actionscript.all/Makefile.am: activate enumerate.as and
-	  case.as.
-
-2007-07-11 Sandro Santilli <strk@keybit.net>
-
-	* server/edit_text_character.cpp (remove the "default" font logic,
-	  leave that to edit_text_character_def instead).
-	* server/sprite_instance.cpp (add_textfield): finish implementation,
-	  use an hard-coded 10 pixel of font height.
-	* server/text.cpp: more debugging (when activated)
-	* server/parser/edit_text_character_def.{cpp,h}: add set_bounds
-	  and set_font_height for dynamic textfields, use a default font
-	  when none is specified or the one specified is not found.
-
-2007-07-11 Sandro Santilli <strk@keybit.net>
-
-	* server/font.{cpp,h}: Store name by std::string
-	  rather then by char*, Provide a constructor for
-	  device-only font.
-	* server/fontlib.{cpp,h}: Add a get_default_font.
-	* server/edit_text_character.cpp: Use the default
-	  font if no font is specified in the definition.
-	* server/parser/edit_text_character_def.cpp: not having
-	  a font in the definition isn't an error, turn it into
-	  a debugging message instead.
-
-2007-07-11 Timothy Lee <timothy.lee@siriushk.com>
-
-	* backend/render_handler_cairo.cpp: correct scaling and offset
-	  in video rendering. Optimize RGB data conversion as suggested
-	  by John Gilmore. Fix a bug in rgba_to_cairo_argb32(), which
-	  incremented only 3 instead of 4 bytes per pixel.
-
-2007-07-11 Udo Giacomozzi <udo.gnu@nova-sys.net>
-
-	* gui/fb.cpp: print fatal error messages to stdout (workaround),
-	  fixes bug #20012
-
-2007-07-11 Zou Lunkai <zoulunkai@gmail.com>
-
-	* testsuite/actionscript.all/case.as: add a testcase for testing 
-	  case senstivity for SWF < 7.
-	  
-2007-07-11 Zou Lunkai <zoulunkai@gmail.com>
-
-	* testsuite/misc-ming.all/key_event_test4.c, key_event_test5.c: call totals()
-	  instead of total() to give a final report, the later one is an undefined function.
-	* testsuite/misc-ming.all/key_event_test5runner.c: add comments why Gnash fails, 
-	  it forgets to do the case conversion, a big bug!
-	  
-2007-07-10 Sandro Santilli <strk@keybit.net>
-
-	* server/: fontlib.h, gnash.h: move fontlib namespace
-	  declaration where it belong.
-
-2007-07-10 Sandro Santilli <strk@keybit.net>
-
-	* server/movie_root.cpp (display): fix calls to
-	  begin_display/end_display. Fixes playback of multi-level movies.
-	* testsuite/swfdec/PASSING: three more tests succeed (name
-	  of loaded instances).
-	* server/character.cpp (getTarget): remove the hard-coded
-	  _level0 lead, substitute with a correct level number.
-	* server/: as_environment.cpp, character.cpp,
-	  sprite_instance.cpp: properly evaluate _level#
-	  path components.
-
-2007-07-10 Sandro Santilli <strk@keybit.net>
-
-	* server/vm/ASHandlers.cpp (CommonGetUrl): implement _level loading.
-	  Fixes bug #19968.
-	* server/movie_root.{cpp,h}: add loadLevel() method, store levels in
-	  a map rather then a vector.
-
-2007-07-10 Sandro Santilli <strk@keybit.net>
-
-	* server/: movie_instance.h, character.h: make get_root() a const
-	  method.
-	* server/movie_root.{cpp,h}: support multiple levels. Untested.
-
-2007-07-10 Sandro Santilli <strk@keybit.net>
-
-	* server/parser/movie_def_impl.cpp (add_sound_sample): fix verbosity
-	  to use log_parse and depend on IF_VERBOSE_PARSE.
-	* server/button_character_instance.cpp (on_event): don't require a
-	  button's parent to be a sprite. Fixes bug #20436.
-	* server/parser/button_character_def.cpp: verbose button_record
-	  parsing.
-	* libbase/utility.h (typeName): arg by *const* ref.
-
-2007-07-10 Timothy Lee <timothy.lee@siriushk.com>
-
-	* backend/render_handler_cairo.cpp: initial pass at video rendering for cairo.
-	  (scale and offset don't work consistently yet).
-
-2007-07-10 Zou Lunkai <zoulunkai@gmail.com>
-
-	* server/movie_root.cpp: remove the key listener from the listener container, 
-	  not just unregister it.
-	* server/movie_root.h: add a public getKeyListeners() to return the key listener set.
-	* server/asobj/key.cpp: unregister the key listener. Hopefully fix bug #20317, will
-	  do more tests later.
-	  
-2007-07-10 Zou Lunkai <zoulunkai@gmail.com>
-
-	* testsuite/misc-ming.all/key_event_test5.c: more tests.
-	* testsuite/misc-ming.all/key_event_test5runner.c: add a testrunner.
-	* testsuite/misc-ming.all/Makefile.am: enable key_event_test4runner,
-	  enable key_event_test5runner
-	  
-2007-07-10 Sandro Santilli <strk@keybit.net>
-
-	* testsuite/misc-ming.all/Makefile.am: add rules for building
-	  key_event_test4.swf and key_event_test5.swf - test *runners* still
-	  missing.
-	* server/movie_root.{cpp,h}: mark key listeners as reachable.
-	* server/asobj/Key.{cpp,h}: mark key listeners as reachable.
-
-2007-07-10 Zou Lunkai <zoulunkai@gmail.com>
-
-	* testsuite/misc-ming.all/key_event_test5.c: new testcase for key listeners,
-	  would cause a segfault when any key pressed, so not enabled.
-	  
-2007-07-09 Sandro Santilli <strk@keybit.net>
-
-	* server/swf.h: add defines and links to alexis for SCRIPTLIMITS (SWF8),
-	  DOABCDEFINE and SYMBOLCLASS (SWF9).
-
-2007-07-09 Bernhard Rosenkraenzer <bero@arklinux.org>
-
-	* macros/ffmpeg.m4: don't assume FFMPEG CFLAGS only contain a single
-	  -I switch.
-
-2007-07-09 Sandro Santilli <strk@keybit.net>
-
-	* server/parser/video_stream_def.{h,cpp}: drop the m_width and m_height
-	  public members, substitute them with a private m_bound (renamed
-	  from m_unused_bound since it is now used). This fixes get_bound
-	  to return a meaningful value.
-	* server/video_stream_instance.{cpp,h}: stop using m_width and m_height
-	  of the definition, rather use the get_bound() method.
-	  Fixes bug #20177 (Youtube: half the video hidden)
-
-2007-07-09 Sandro Santilli <strk@keybit.net>
-
-	* server/as_value.cpp (to_debug_string): include object type name.
-	* libbase/utility.h: add a templated typeName() function for
-	  demangling.
-	* server/character.cpp (width_getset,height_getset): include
-	  character's type name in aserror.
-
-2007-07-09 Martin Guy <martinwguy@yahoo.it>
-
-	* gui/gtk_cairo.h: FIx compiler warning about unused params
-	* libbase/curl_adapter.cpp: Workarounds for older versions of curl
-
-2007-07-08 Sandro Santilli <strk@keybit.net>
-
-	* server/as_value.{cpp,h} (equals): don't always force string
-	  comparison if the first argument is a string (matches ECMA spec,
-	  fixes bug #20403).
-	* testsuite/actionscript.all/Number.as: add test for string:00 ==
-	  number:0
-
-2007-07-08 Sandro Santilli <strk@keybit.net>
-
-	* server/asobj/Global.h: include extension.h when needed.
-	* server/swf.h: link to info about ActionNewAdd
-	* testsuite/actionscript.all/Number.as: Add a quick testcases
-	  for using ActionNewAdd with a string and a number parameters
-	  (see bug #20403).
-
-2007-07-08 Sandro Santilli <strk@keybit.net>
-
-	* doc/C/usermanual/installation/feature_configuration.xml:
-	  the debugger is now off by default, so document --enable-debugger
-	  rather then --disable-debugger; Document --enable-write and
-	  --enable-fps-debug.
-
-2007-07-08 Martin Guy <martinwguy@yahoo.it>
-
-	* configure.ac: Say where to get gtkglext source
-	* C/usermanual/installation/feature_configuration.xml:
-	  Add missing <variablelist> </variablelist> round GUI choices item
-	  and remove configure --enable-dom (it has gone)
-	  Remove doc for configure --enable-xmlreader and --enable-testing
-	  (they have gone too)
-	  Remove mention of old --enable-sound, fix default as --enable-plugin
-	  and talk about MAD / GST-FFMPEG differences.
-	* gui/gtk_glue_cairo.h: Drop unused variable compiler warnings
-	* backend/sound_handler.h libbase/FLVParser.h:
-	  Document extra NELLYMOSER format code (mentioned in libavcodec/flv.h)
-	* macros/ffmpeg.m4: Don't zero ffmpeg_version if too early; it is used
-	  in the final error report and is always checked against "ok" to see
-	  if there is an acceptable version.
-	* macros/ffmpeg.m4: Add commentary preparing for better version checking
-
-2007-07-07 Markus Gothe <nietzsche@lysator.liu.se>
-
-	* testsuite/misc-ming.all/ming_utils.h: Added defintion of
-	  SWFMove_wrteExports().
-
-2007-07-07 Martin Guy <martinwguy@yahoo.it>
-
-	* libbase/network.h,server/shm.{h,cpp}: Remove last remnants of
-	  ENABLE_TESTING ifdef
-	* configure.ac: Remove bogus "Web server support disabled" report,
-	  switched on nonexistent $http variable
-
-2007-07-06 Sandro Santilli <strk@keybit.net>
-
-	* libbase/ref_counted.h: use boost's atomic_count
-	  for the reference counter. Should be safer.
-	  Fixed bug #20194.
-
-2007-07-06 Sandro Santilli <strk@keybit.net>
-
-	* server/vm/ASHandlers.cpp (CommonGetUrl): use
-	  sprite_instance::loadMovie for target loads.
-	  Fixes bug #20001
-	* server/vm/action.{cpp,h}: obsolete attach_extern_movie
-	  in favor of sprite_instance::loadMovie, known to work
-	  better in at least one case (bug #20001).
-
-2007-07-06 Martin Guy <martinwguy@yahoo.it>
-
-	* backend/Makefile.am: Move a GUI test to its logical place
-	* testsuite/libamf.all/test_number.cpp: Remove uused variables and
-	  commented-out debugging printfs
-	* gui/gnash.cpp: Reformat crazy indentation and simplify redundant
-	  local variables (no functional change)
-	* configure.ac: Fix typo "handlign" in message
-	* configure.ac: Fix formatting of missing BOOST date_time message
-	* configure.ac: Fix error message for missing docbook2x tools
-	* configure.ac: Add xsltproc to list of docbook required packages
-	* server/asobj/SoundFfmpeg.cpp: Fix signed/unsigned compiler warning
-
-2007-07-05 Martin Guy <martinwguy@yahoo.it>
-
-	* server/parser/movie_def_impl.cpp: Report internal sample ID too in
-	  verbose parse log message
-
-2007-07-05 Sandro Santilli <strk@keybit.net>
-
-	* server/parser/sprite_definition.h (add_sound_sample): don't
-	  complain about sound sampes definitions found in a sprite definition
-	  context. That's completely legal.
-	* server/array.cpp (array_concat): fix typo in function argument
-	  access. Fixes bug #20355.
-	* testsuite/actionscript.all/array.as: add more tests for Array.concat()
-
-2007-07-04 Udo Giacomozzi <udo.gnu@nova-sys.net>
-
-	* gui/NullGui.cpp: use tu_timer instead of gettimeofday()
-
-2007-07-03 Sandro Santilli <strk@keybit.net>
-
-	* configure.ac: disable debugger by default. Use --enable-debugger
-	  to enable.
-
-2007-07-03 Sandro Santilli <strk@keybit.net>
-
-	* server/asobj/Global.{cpp,h}: Don't use a module-static
-	  for the Extension instance, when enabled.
-	  Seems to fix bug #20272 when debugger id disabled
-	  (sounds voodoo, but these are the effects of initialization
-	  and deinitialization order for statics...)
-
-2007-07-03 Sandro Santilli <strk@keybit.net>
-
-	* gui/gnash.cpp (parseCommandLine): -g doesn't take an argument.
-	* libbase/GC.{cpp,h}: define 3 verbosity levels for the GC
-
-2007-07-03 Udo Giacomozzi <udo.gnu@nova-sys.net>
-
-	* gui/NullGui.cpp: implement correct timing
-
-2007-07-03 Udo Giacomozzi <udo.gnu@nova-sys.net>
-
-	* gui/gui.{cpp,h}: add min/avg/max fps printing and total play time
-	* libbase/GC.h: include assert.h
-
-2007-07-03 Sandro Santilli <strk@keybit.net>
-
-	* backend/render_handler_tri.{cpp,h}: (tri_cache_manager): dont leak
-	  mesh sets.
-	* server/parser/character_def.{cpp,h}: don't leak
-	  render cache managers.
-
-2007-07-02 Sandro Santilli <strk@keybit.net>
-
-	* backend/sound_handler_sdl.{cpp,h}: fix leak of sound_data instances;
-	  added a few TODO items.
-
-2007-07-02 Sandro Santilli <strk@keybit.net>
-
-	* server/parser/edit_text_character_def.h: add an htmlAllowed()
-	  public inspector.
-	* server/edit_text_character.h: add an htmlAllowed() private
-	  inspector.
-	* server/edit_text_character.cpp (format_text): if HTML is allowed
-	  and found in the textfield text, just skip the tags and show the 
-	  content, logging a debugging info about the fact (only once).
-
-2007-07-02 Sandro Santilli <strk@keybit.net>
-
-	* server/FreetypeGlyphsProvider.cpp: protect debugging calls
-	  by a GNASH_DEBUG_DEVICEFONTS, defaulting to undefined.
-	* libbase/GC.{cpp,h}: Implement an heuristic to reduce
-	  the number of collector runs. It is based on the number
-	  of newly registered collectables since last run.
-	  The threshold is set to 10 with a static const member
-	  of the GC class. See http://gnashdev.org/wiki/index.php/ProfilingGC
-	  for more informations.
-	* gui/gui.cpp (fpsCounterTick): don't report an initial FPS of 0.
-
-2007-07-02 Sandro Santilli <strk@keybit.net>
-
-	* gui/NullGui.{h,cpp}: implement quit(), for clean shutdown.
-	* gui/gui.cpp (advance_movie): use quit() to exit
-
-2007-07-02 Sandro Santilli <strk@keybit.net>
-
-	* gui/gnash.cpp (parseCommandLine): support floating point argument
-	  to -f switch.
-
-2007-07-02 Sandro Santilli <strk@keybit.net>
-
-	* gui/gui.{cpp,h}: add setFpsTimerInterval() public method,
-	  change fpsCounterTick() interface to take no arg. Print total
-	  number of frame advances on destruction. All available ifdef
-	  GNASH_FPS_DEBUG.
-	* gui/Player.{cpp,h}: add a setFpsPrintTime() public method.
-	  Only available ifdef GNASH_FPS_DEBUG.
-	* gui/gnash.cpp: Add -f switch for fps debugging prints
-	  (long option was not trivial so didn't add it).
-	  Note that if GNASH_FPS_DEBUG is not defined the -f switch
-	  triggers an error.
-
-2007-07-02 Udo Giacomozzi <udo.gnu@nova-sys.net>
-
-	* gui/gui.{cpp,h}: add fpsCounterTick() for FPS profiling
-
-2007-07-02 Sandro Santilli <strk@keybit.net>
-
-	* configure.ac: add --enable-fps-debug switch to define
-	  GNASH_FPS_DEBUG macro, to use for fuzy speed profiling.
-
-2007-07-02 Tomas Groth Christensen <tomasgroth@yahoo.dk>
-
-	* server/parser/sprite_definition.h: Allow soundsamples to be added
-	  from sprites. Should the malformed-swf warning be removed?
-	* backend/sound_handler_gst.cpp: Moved creation of a tempoary
-	  variable to avoid an assertion failure.
-	* backend/sound_handler_sdl.cpp: Improved error handling.
-
-2007-07-02 Udo Giacomozzi <udo.gnu@nova-sys.net>
-
-	* gui/gtk_glue_agg.cpp: Disable MIT-SHM when pixel format is not recognized 
-
-2007-07-01 Sandro Santilli <strk@keybit.net>
-
-	* libbase/GC.h: don't be verbose about GC by default.
-	* server/movie_root.{cpp,h}: (add_interval_timer): take the Timer by
-	  auto_ptr, add an optional second argument marking the timer as
-	  internal (for use by xmlsocket/LoadVars and whichever other gnash
-	  internal class in need for a timer). Internal timers will get a
-	  negative identifier so to not introduce unexpected gaps in the
-	  user-defined interval timers sequences. Fix bugs introduced in last
-	  commit related to timer expiration and iterators invalidation.
-	* server/timers.{cpp,h}: add some inspector functions, use VM::getTime
-	  for timers (milliseconds).
-	* server/asobj/: LoadVars.cpp, xmlsocket.cpp: update calls to
-	  movie_root::add_interval_timer to mark these timers as internal.
-
-2007-07-01 Sandro Santilli <strk@keybit.net>
-
-	* testsuite/simple.exp: increment timeout from 4 to 5 minutes.
-	* server/movie_root.{cpp,h}: store Timers into a map rather then
-	  a vector, to allow for removal w/out loosing the timer identifier.
-	  Scan a *copy* of the container so that clearing or adding new
-	  intervals don't invalidate iterators.
-
-2007-07-01 Sandro Santilli <strk@keybit.net>
-
-	* libbase/ref_counted.h: use 'long' for the ref count,
-	  cleanup header inclusion, prepare for using an atomic
-	  counter for thread safety (not enabled yet).
-	* server/parser/movie_def_impl.{cpp,h}: have MovieLoader
-	  keep the boost::thread by auto_ptr for proper destruction.
-
-2007-07-01 Markus Gothe <nietzsche@lysator.liu.se>
-
-	* README: Added note on IRC.
-	* gui/gnash.cpp: Added -V as shor for --version. Clean-up.
-
-2007-07-01 Sandro Santilli <strk@keybit.net>
-
-	* COPYING: update to GPL version 3
-
-2007-07-01 Bastiaan Jacques <bastiaan@bjacques.org>
-
-	* all over the place: Update to GPL version 3.
-
-2007-07-01 Sandro Santilli <strk@keybit.net>
-
-	* libbase/GC.h: assert that only the main thread registers collectable
-	  objects with the GC, or runs the collector.
-
-2007-06-30 Sandro Santilli <strk@keybit.net>
-
-	* server/impl.cpp (clear): don't exit, try the proper cleanup way;
-	  movie_def_impl loader should be ready, other threads likely aren't,
-	  this patch would expose all places in need for proper implementation
-	  of threads termination.
-	* server/parser/movie_def_impl.{cpp,h}: implement
-	  loader thread cancelation request, wait for the thread
-	  to terminate in MovieLoader destructor.
-
-2007-06-30 Sandro Santilli <strk@keybit.net>
-
-	* libbase/ref_counted.h: remove inheritance of ref_counted
-	  from GcResource, provide temporary isReachable/setReachable
-	  to allow not reverting all GC-related additions to character
-	  definitions and other possibly GcResource objects.
-	* libbase/smart_ptr.h: have two versions of the intrusive_ptr
-	  free functions: one for GcResource (do nothing) and one 
-	  for ref_counted (add/drop ref). Enable GC by default, where
-	  current version uses both RC and GC (GC only used for as_object)
-
-2007-06-29 Sandro Santilli <strk@keybit.net>
-
-	* server/parser/button_character_def.cpp: ok, let action_buffer leak,
-	  as it seems deleting them in button_action dtor introduces a
-	  segfault in our testusuite. Sorry for not running 'make check'
-	  before committing.
-
-2007-06-29 Udo Giacomozzi <udo.gnu@nova-sys.net>
-
-	* gui/gtk_glue_agg.cpp: properly initialize new SHM variables
-	* server/array.{h,cpp}: classes with virtual methods need a destructor,
-	  don't they?   	
-	
-2007-06-28 Sandro Santilli <strk@keybit.net>
-
-	* server/parser/button_character_def.{cpp,h}: don't let
-	  gnash::button_action leak action_buffer objects.
-	* server/FreetypeGlyphsProvider.cpp (getFontFilename): don't leak
-	  the FcFontSet when finding a match.
-	* server/edit_text_character.{cpp,h}:
-	  Do not call on_event(KILL_FOCUS) in the destructor, do
-	  it on ::unload(). The less things destructors do, the better
-	  (think GC..)
-
-2007-06-27 Petr Pisar <petr.pisar@atlas.cz>
-
-	* po/: Makefile.am, cs.po: Initial Czech translation.
-
-2007-06-27 Udo Giacomozzi <udo.gnu@nova-sys.net>
-
-	* gui/fb.cpp, gui/fltk_glue_agg.cpp, gui/gtk.cpp, gui/gui.cpp: set
-	  correct _validbounds 	
-	* gui/gtk_glue_agg.{cpp,h}: implemented shared memory image blitting
-
-2007-06-26 Udo Giacomozzi <udo.gnu@nova-sys.net>
-
-	* backend/render_handler_agg_style.h: always premultiply image accessors
-	  with alpha channel (partial fix for bug #20257)
-	* backend/render_handler_agg.{cpp,h}, gui/fb.cpp: moved pixel format
-	  detection code to AGG backend files (so it can be used by any GUI)   
-	* gui/gtk_glue_agg.{cpp,h}: initial work for MIT-SHM support (not 
-	  compiled in by default because there is much left to do)
-
-2007-06-26 Zou Lunkai <zoulunkai@gmail.com>
-
-	* testsuite/misc-ming.all/callFunction_test.c: testcase for ActionCallFunction,
-	  Gnash fails.
-
-2007-06-25 Antti Ajaki <antti.ajanki@iki.fi>
-
-	* gui/kde_glue_agg.cpp: See http://savannah.gnu.org/patch/?6022
-
-2007-06-25 Zou Lunkai <zoulunkai@gmail.com>
-
-	* testsuite/misc-ming.all/morph_test1.c: minor update, reduce a frame for testing.
-	* testsuite/misc-ming.all/morph_test1runner.cpp, Makefile.am: add a testrunner for
-	  morph_test1.swf.
-	  
-2007-06-24 Sandro Santilli <strk@keybit.net>
-
-	* server/: edit_text_character.cpp, sprite_instance.cpp,
-	  video_stream_instance.cpp, asobj/System.cpp:
-	  Don't initialize the "constructor" member explicitly as that's
-	  done by the builtin_function class instead. This patch fixes
-	  the useless construction of 7 to 11 objects (otherwise 
-	  deleted by first GC run).
-
-2007-06-24 Zou Lunkai <zoulunkai@gmail.com>
-
-	* testsuite/misc-ming.all/morph_test1.c: first testcase for morphs,
-	  need a testrunner for checking the renderer, but might be enough for
-	  testing GC at the moment.
-	
-2007-06-23 Sandro Santilli <strk@keybit.net>
-
-	* server/as_value.h: include <iostream> for proper definition
-	  of output operator.
-
-2007-06-23 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
-
-	* gui/gtk.cpp: Use stock icons for some more menu options. Also,
-	limit several lines to 80 characters.
-
-2007-06-23 Sandro Santilli <strk@keybit.net>
-
-	* server/as_object.cpp (get_prototype): don't return the Object
-	  interface when prototype is NULL with SWF version < 5.
-	  Fixes the empty swf3 case with GC.
-
-2007-06-23 Bastiaan Jacques <bastiaan@bjacques.org>
-
-	* libbase/container.h: Remove home-made container classes in
-	favour of standard containers.
-	* server/{fontlib, impl}.cpp: Switch hash to std::map.
-	* libbase/container.cpp: Remove unused container tests.
-	* libbase/Makefile.am: Disable building of unused container.cpp.
-
-2007-06-22 Bastiaan Jacques <bastiaan@bjacques.org>
-
-	* macros/kde.m4: look for libkdeui, not kdeui. Also first check
-	in the QTDIR/bin directory for moc, in case the first moc in PATH
-	is not the qt3 one.
-
-2007-06-22 Zou Lunkai <zoulunkai@gmail.com>
-
-	* testsuite/actionscript.all/enumerate.as: more tests.
-	
-2007-06-22 Zou Lunkai <zoulunkai@gmail.com>
-
-	* testsuite/actionscript.all/enumerate.as: cleanups, tests are not
-	  dependent on enumeration order now.
-	* server/movie_root.h: document KeyListener class and related stuff.
-	
-2007-06-22 Markus Gothe <nietzsche@lysator.liu.se>
-
-	* libgeometry/Makefile.am: Fixed building issue on Darwin.
-	* ltmain.sh.darwin: We use this one from Darwinports since it works.
-	* utilities/{parser,processor}.cpp: use 'libbase/gettext.h' for conditianal
-	  use of libintl.
-
-2007-06-21 Tomas Groth Christensen <tomasgroth@yahoo.dk>
-
-	* backend/sound_handler_gst.{cpp,h}: Made it threadsafe, fixes 
-	  bug #20186. Made the internal variables private.
-	* backend/sound_handler_sdl.{cpp,h}: Made the internal
-	  variables private.
-
-2007-06-21 Zou Lunkai <zoulunkai@gmail.com>
-
-	* testsuite/actionscript.all/enumerate.as: more tests.
-	
-2007-06-21 Zou Lunkai <zoulunkai@gmail.com>
-
-	* testsuite/misc-ming.all/key_event_test4.c, key_event_test4runner.cpp, Makefile.am:
-	  new testcase for "this" context in a user defined key event handler.
-	* server/movie_root.cpp: correctly set the context.
-	
-2007-06-21 Zou Lunkai <zoulunkai@gmail.com>
-
-	* testsuite/actionscript.all/enumerate.as: new testcase, Gnash fails.
-
-2007-06-20 Sandro Santilli <strk@keybit.net>
-
-	* libbase/GC.{cpp,h}: moved destructor and cleanUnreachable methods
-	  from header to implementation file.
-	* server/fill_style.{cpp,h}: add an markReachableResources()
-	  function to keep alive eventual bitmap and character fills.
-	* server/parser/shape_character_def.{cpp,h}: implement resource
-	  marking function, marking fill styles.
-
-2007-06-19 Sandro Santilli <strk@keybit.net>
-
-	* server/StreamProvider.cpp (getStream): transfer ownerhip of 
-	  the opened FILE to the tu_file, to plug a memory leak.
-	* server/sprite_instance.{cpp,h}: (markReachableResources):
-	  Mark textfield variables and relative root.
-	  Fixes segfault in movie reported in bug #19883, and also
-	  shows that the GC model does it's job in this case.
-
-2007-06-19 Sandro Santilli <strk@keybit.net>
-
-	* gui/NullGui.{cpp,h}: implement setTimeout
-	  call. fixes bug #20118.
-
-2007-06-19 Sandro Santilli <strk@keybit.net>
-
-	* server/sprite_instance.h: document another
-	  reachable resource (was marked already, just not documented
-	  as such).
-	* server/parser/: button_character_def.{cpp,h},
-	  edit_text_character_def.{cpp,h}:
-	  Implement reachable resources marker.
-
-2007-06-19 Sandro Santilli <strk@keybit.net>
-
-	* server/parser/bitmap_character_def.h: implement reachable resources
-	  marker.
-	* gui/Makefile.am: add .configline to CLEANFILES and remove all in
-	  CLEANFILES on make clean (needed for distcheck to complete).
-	* server/generic_character.{cpp,h}: generic character
-	  are not mouse entities by default, so make get_topmost_mouse_entity
-	  return NULL and can_handle_mouse_events return false. Fixes
-	  bug #20102.
-
-2007-06-19 Sandro Santilli <strk@keybit.net>
-
-	* server/video_stream_instance.{cpp,h}: implement
-	  reachable resources marker.
-
-2007-06-19 Sandro Santilli <strk@keybit.net>
-
-	* server/array.{cpp,h}: implement resource marker
-	  for arrays.
-
-2007-06-18 Alexander Sack <asac@jwsdot.com>
-
-	* configure.ac: detect usable pbutils for automatic installation of
-	  missing codecs.
-	* server/asobj/NetStreamGst.cpp: try installing missing codecs
-	  as needed.
-
-2007-06-18 Sandro Santilli <strk@keybit.net>
-
-	* server/parser/: movie_def_impl.h, movie_definition.h,
-	  sprite_definition.h: document add_execute_tag ownership
-	  transfer.
-
-2007-06-18 Zou Lunkai <zoulunkai@gmail.com>
-
-	* testsuite/misc-ming.all/shape_test.c: more tests, make the deduction easier.
-	  surprisingly, all succeeded.
-	
-2007-06-18 Zou Lunkai <zoulunkai@gmail.com>
-
-	* testsuite/misc-ming.all/key_event_test3.c,
-	  testsuite/misc-ming.all/key_event_test3runner.cpp: the testrunner was
-	  bogus, fix the testrunner itself.
-	
-2007-06-18 Zou Lunkai <zoulunkai@gmail.com>
-
-	* libbase/GC.h: add missing head file.
-	
-2007-06-18 Zou Lunkai <zoulunkai@gmail.com>
-
-	* testsuite/misc-ming.all/loop_test7: review and comments
-	* testsuite/misc-ming.all/loop_test6: review and comments
-	
-2007-06-18 Sandro Santilli <strk@keybit.net>
-
-	* server/vm/ASHandlers.cpp (ActionTrace): don't use the string value
-	  as a format string !
-	* testsuite/swfdec/PASSING: 31 new tests found in the 'as' branch
-	  of swfdec succeed.
-
-2007-06-18 Sandro Santilli <strk@keybit.net>
-
-	* server/sprite_instance.{cpp,h}: (markReachableResources):
-	  mark _frame0_chars as reachable. make check completes
-	  successfully now.
-
-2007-06-17 Zou Lunkai <zoulunkai@gmail.com>
-
-	* testsuite/misc-ming.all/loop_test8.c: comments
-	
-2007-06-17 Zou Lunkai <zoulunkai@gmail.com>
-
-	* server/parser/movie_definition.h, 
-	  server/parser/movie_def_impl.h,
-	  server/parser/sprite_definition.h,
-	  server/parser/Timeline.h,
-	  server/swf/PlaceObject2Tag.h,
-	  server/swf/PlaceObject2Tag.cpp,
-	  server/dlist.cpp, 
-	  server/sprite_instance.h, server/sprite_instance.cpp:
-	  enable and improve the 3rd attempt of timeline-control design, take 
-	  ratio into consideration, which is not only used for morphs but also
-	  for general characters in lots of swf files. Got 20 more successes, 
-	  still need more tests and cleanups. see wiki.
-	* testsuite/misc-ming.all/displaylist_depths_test11.c,
-	  testsuite/misc-ming.all/loop_test2.c, 
-	  testsuite/misc-ming.all/loop_test2runner.cpp,
-	  testsuite/misc-ming.all/loop_test3.c,
-	  testsuite/misc-ming.all/loop_test5.c,
-	  testsuite/misc-ming.all/loop_test8.c:
-	  xchecks to checks.
-	  
-2007-06-17 Sandro Santilli <strk@keybit.net>
-
-	* libbase/GC.h: fixed a misleading delete count for
-	  the debugging mode. You can now see that in the UdoG
-	  leaking case (empty function in first frame, empty second
-	  frame) every GC collect run deletes 2 resources (most
-	  likely an isolated chain of references in the RC case).
-
-2007-06-17 Ann Barcomb <kudra@domaintje.com>
-
-	* plugin/Makefile.am: Removed an incorrect comment.
-	* doc/C/usermanual/install.xml: Added some information
-	  inspired by the comments made in patch #5772.
-	* INSTALL: Applied a modified version of patch #5772 by
-	  Anders Juel Jensen.  
-
-2007-06-16  Rob Savoye  <rob@bertha.welcomehome.org>
-
-	* gui/gnash.cpp: Add the version of FFMPEG or GST to
-	--version. Add the config options too.
-	* gui/Makefile.am: Extract the config options so we can pass them
-	to GCC, wo they become part of the output from --version.
-	* libbase/image.cpp: Include memory so auto_ptr is defined.
-	* macros/ffmpeg.m4: Define HAVE_FFMPEG_AVCODEC_H eben when not
-	using AC_CHECK_HEADER.
-
-2007-06-16 Sandro Santilli <strk@keybit.net>
-
-	* libbase/: image.{cpp,h}, LoadThread.{cpp,h},
-	  image_filters.cpp, noseek_fd_adapter.cpp,
-	  reduce number of explicit deletes by using scoped pointers
-	* server/asobj/Global.cpp: reduce explicit deletes...
-	* server/asobj/: Sound.{cpp,h}, SoundFfmpeg.{cpp,h}, SoundGst.{cpp,h},
-	  SoundMad.{cpp,h}: Use a smart pointer for the NetConnection 
-	  reference, and implement markReachableResources to mark it.
-	* server/asobj/xmlsocket.cpp (anydata): don't use a module-static
-	  to keep track of leftovers !!
-
-2007-06-16 Sandro Santilli <strk@keybit.net>
-
-	* server/vm/ExecutableCode.h: implement markReachableResources
-	  for executable code.
-	* server/movie_root.{cpp,h}: mark resources reachable by 
-	  the executable code in the global action queue.
-
-2007-06-16 Sandro Santilli <strk@keybit.net>
-
-	* server/parser/morph2_character_def.{cpp,h}: do not explicitly
-	  delete the shape_character_defs, rather keep by intrusive_ptr
-	  (which means leave ownership to the GC in the GC case).
-
-2007-06-16 Sandro Santilli <strk@keybit.net>
-
-	* server/asobj/NetStream.{h,cpp}: implement markReachableResources.
-	* server/asobj/gen-asclass.sh: updated template to include
-	  a sample of a markReachableResources implementation.
-	* server/asobj/LoadVars.cpp: implement markReachableResources
-	  to properly mark event handlers and environment resources.
-	* libbase/GC.h: don't be verbose about objects being marked,
-	  classes not overriding markReachableResources, collectables
-	  registered and deleted unless GNASH_GC_DEBUG > 1
-	* server/timers.{cpp,h}: provide a markReachableResources to mark
-	  function, target objet and args.
-	* server/movie_root.{cpp,h} (markReachableResources): mark Timers
-	  resources as being reachable; document what's marked in the function
-	  declaration documentation.
-
-2007-06-16 Sandro Santilli <strk@keybit.net>
-
-	* testsuite/server/: DisplayListTest.cpp, GetterSetterTest.cpp,
-	  PropertyListTest.cpp: initialize gnash lib.
-
-2007-06-16 Sandro Santilli <strk@keybit.net>
-
-	* server/parser/movie_def_impl.{cpp,h} (markReachableResources):
-	  Set CharacterDictionary items as reachable !
-	  (BTW, why are character defs managed pointers ?!)
-	* testsuite/MovieTester.cpp: initialize gnash code lib so
-	  to work with GC on.
-
-2007-06-16 Sandro Santilli <strk@keybit.net>
-
-	* server/button_character_instance.{cpp,h}: implement
-	  markReachableResources to properly mark the state characters
-	  and the character definition.
-	* server/font.{cpp,h}: make texture_glyph a concrete class, no
-	  more managed.
-	* server/generic_character.h: implement markReachableResources to
-	  properly mark the character definition.
-
-2007-06-14 Sandro Santilli <strk@keybit.net>
-
-	* server/sprite_instance.{cpp,h} (markReachableResources):
-	  Mark the drawable canvas as reachable !
-	  This fixes the empty movie case (no segfault) and also
-	  the 2-frames simple leaking case reported by UdoG a long
-	  time ago (first frame contains an empty function definition,
-	  second frame is empty).
-
-2007-06-14 Sandro Santilli <strk@keybit.net>
-
-	* server/BitmapMovieInstance.cpp, server/asobj/NetStream.cpp:
-	  More warnings fixes.
-
-2007-06-14 Kris Jurka <jurka@ejurka.com>
-
-	* gui/Player.cpp, gui/gnash.cpp, server/as_environment.cpp,
-	  server/as_function.cpp, server/as_value.cpp,
-	  server/asobj/NetStream.cpp, server/asobj/xml.cpp,
-	  server/parser/shape_character_def.cpp, server/vm/ActionExec.cpp:
-	  Fix some compiler warnings. Applied patch #5927.
-
-2007-06-14 Sandro Santilli <strk@keybit.net>
-
-	* libbase/triangulate_impl.h (poly_env<>::init): don't use
-	  backslash to break strings (unneeded). See bug #20138.
-	  
-2007-06-14 Sandro Santilli <strk@keybit.net>
-
-	* gui/Player.cpp, libbase/GC.{h,cpp}, libbase/Makefile.am,
-	  libbase/ref_counted.h, libbase/smart_ptr.h,
-	  plugin/klash/klash.cpp, plugin/win32/plugin.cpp,
-	  server/GetterSetter.cpp, server/GetterSetter.h,
-	  server/Property.h, server/PropertyList.cpp,
-	  server/PropertyList.h, server/as_environment.cpp,
-	  server/as_environment.h, server/as_function.cpp,
-	  server/as_function.h, server/as_object.cpp,
-	  server/as_object.h, server/as_value.cpp,
-	  server/as_value.h, server/character.cpp, server/character.h,
-	  server/debugger.cpp, server/debugger.h, server/dlist.cpp,
-	  server/dlist.h, server/edit_text_character.cpp,
-	  server/edit_text_character.h, server/font.cpp, server/font.h,
-	  server/fontlib.cpp, server/gnash.h, server/impl.cpp,
-	  server/impl.h, server/mouse_button_state.h,
-	  server/movie_root.cpp, server/movie_root.h,
-	  server/sprite_instance.cpp, server/sprite_instance.h,
-	  server/swf_function.cpp, server/swf_function.h,
-	  server/asobj/Key.h, server/asobj/Mouse.cpp,
-	  server/asobj/Stage.cpp, server/asobj/xmlnode.cpp,
-	  server/parser/BitmapMovieDefinition.cpp,
-	  server/parser/BitmapMovieDefinition.h,
-	  server/parser/movie_def_impl.cpp,
-	  server/parser/movie_def_impl.h,
-	  server/parser/sprite_definition.cpp,
-	  server/parser/sprite_definition.h, server/vm/ASHandlers.cpp,
-	  server/vm/VM.cpp, server/vm/VM.h, utilities/processor.cpp:
-	First big pass on Garbage Collection. We can now use a compile-time
-	define (GNASH_USE_GC) to select wheter GC or RF (ref-counting) is
-	used. By default RC is used as GC is still bogus. Next step would
-	be improving the GC mark functions to ensure needed resources aren't
-	prematurely deleted by the GC. See in GC.h the GcResource class
-	documentation for informations about how to do taht.
-
-2007-06-14 Sandro Santilli <strk@keybit.net>
-
-	* libbase/: Makefile.am, GC.h: First draft at a garbage collector class.
-	* cygnal/http.h: fix gnash::Network referencing, drop
-	  'using namespace std'
-
-2007-06-14 Sandro Santilli <strk@keybit.net>
-
-	* gui/gnash.cpp: add using namespace gnash here, since we're
-	  out of the gnash namespace.
-	* backend/render_handler_agg_bitmap.h,
-	  backend/render_handler_agg_style.h,
-	  libgeometry/snappingrange.h,
-	  cygnal/http.h: don't use 'using namespace'
-	  directive in headers !
-
-2007-06-14 Sandro Santilli <strk@keybit.net>
-
-	* testsuite/actionscript.all/Function.as: test local vars scope of
-	  outer function to be kept alive by inner functions.
-	* libbase/ref_counted.h: made destructor protected, to ensure no 
-	  user is explicitly deleting a ref_counted object (propedeutic
-	  to GC)
-	* configure.ac: FREETYPE_{CFLAGS,LIBS} => FREETYPE2_{CFLAGS,LIBS)
-	  in final reports/checks.
-	* testsuite/misc-mtasc.all/Makefile.am: skip all tests if
-	  prebuilt clip are not supported by the detected ming version.
-	* po/: Makefile.am, it.po: initial work on an italian
-	  translation (funny for a few minutes, but too boring
-	  after a while ;)
-
-2007-06-14 Zou Lunkai <zoulunkai@gmail.com>
-
-	* server/parser/morph2_character_def.h: implement a get_bound() for
-	  morphs, should fix an old displaying problem of morphs.
-	  
-2007-06-14 Hubert Figuiere <hfiguiere@novell.com>
-
-	* Makefile.am, configure.ac: look for freetype2, not freetype
-	  (for pkg-config to be effective). Rename _CFLAGS and _LIBS
-	  to be FREETYPE2, not FREETYPE
-	* server/Makefile.am, server/parser/Makefile.am: 
-	  Use FREETYPE2_{CFLAGS,LIBS}
-	* server/FreetypeGlyphsProvider.cpp: use an FT_CONST macro
-	  to switch between constness of Outline walker func between
-	  freetype 2.1 (wants non-const) and 2.2 (wants const).
-
-2007-06-14 Zou Lunkai <zoulunkai@gmail.com>
-
-	* server/character.h, 
-	  server/dlist.h,
-	  server/dlist.cpp, 
-	  server/sprite_instance.h,
-	  server/sprite_instance.cpp,
-	  server/parser/morph2_character_def.cpp,
-	  server/swf/PlaceObject2Tag.h,
-	  server/swf/PlaceObject2Tag.cpp,
-	  server/vm/action.cpp,
-	  testsuite/server/DisplayListTest.cpp,
-	  change type of "ratio" from float to integer, don't re-interpret the definition.
-	  
-2007-06-13 Petr Pisar <petr.pisar@atlas.cz>
-
-	* gui/gtk.cpp: internationalize menus. (patch #6006).
-
-2007-06-13 Andrew Guertin <bugzilla@dolphinling.net>
-
-	* configure.ac: removes the duplicate "Checking" and adds the missing
-	  newline while checking for archiver type.
-	* macros/agg.m4: print the missing "checking for AGG headers" line.
-	  (patch #5933)
-
-2007-06-13 Sandro Santilli <strk@keybit.net>
-
-	* testsuite/misc-ming.all/DefineEditTextTest.c: put reduced margins
-	  back, to verify no word wrap works.
-	* server/edit_text_character.cpp (format_text): implement no word wra
-	* server/FreetypeGlyphsProvider.{cpp,h}: document coordinate space of
-	  getGlyph output values and implement proper scaling between freetype
-	  glyph EM units and our 1024 EM square.
-
-2007-06-13 Sandro Santilli <strk@keybit.net>
-
-	* server/: font.{cpp,h}, Makefile.am, FreetypeRasterizer.{cpp,h},
-	  FreetypeGlyphsProvider.{cpp,h}: renamed file and class since
-	  we won't serve rendered glyphs anymore. Rendered glyphs can
-	  always be obtained by rendering the shape_character_def,
-	  the code should be buried somewhere in fontlib.cpp.
-
-2007-06-13 Sandro Santilli <strk@keybit.net>
-
-	* server/font.cpp (add_os_font): use the advance value
-	  computed by getGlyph, not getRenderedGlyph (the latter
-	  is bogus).
-
-2007-06-13 Sandro Santilli <strk@keybit.net>
-
-	* testsuite/misc-ming.all/loop_test8.c: xchec -> check.
-
-2007-06-13 Sandro Santilli <strk@keybit.net>
-
-	* server/font.{cpp,h}: always maintain m_advance_table of the 
-	  same size of the other two glyph info containers (should really
-	  make a structure keeping all of them..). Fixes an testInvariant
-	  failure with the device font selector (see DeviceFonts page
-	  on wiki).
-
-2007-06-13 Sandro Santilli <strk@keybit.net>
-
-	* configure.ac: look for libfontconfig
-	* Makefile.am: print fontconfig info on 'dumpconfig'
-	* server/FreetypeRasterizer.{cpp,h}: implement font name
-	  to filename matching using fontconfig, when available;
-	  updated copyright info (enough hacking on it now..)
-	* server/Makefile.am: add FONTCONFIG cflags and libs.
-	* testsuite/misc-ming.all/DefineEditTextTest.c: add another
-	  text field using 'times' font.
-
-2007-06-13 Zou Lunkai <zoulunkai@gmail.com>
-
-	* testsuite/misc-ming.all/Makefile.am:
-	  fix a typo(thank strk).
-	  
-2007-06-13 Sandro Santilli <strk@keybit.net>
-
-	* configure.ac: newlines are tokens with bourne shell !
-
-2007-06-13 Sandro Santilli <strk@keybit.net>
-
-	* server/FreetypeRasterizer.cpp: fix build w/out libfreetype.
-
-2007-06-13 Sandro Santilli <strk@keybit.net>
-
-	* testsuite/misc-ming.all/DefineEditTextTest.c:
-	  Apply transformation to text characters.
-
-2007-06-13 Sandro Santilli <strk@keybit.net>
-
-	* gui/gtk.cpp, server/FreetypeRasterizer.cpp,
-	  server/fontlib.cpp, server/movie_root.cpp,
-	  server/text.cpp: Reduced verbosity.
-
-2007-06-13 Sandro Santilli <strk@keybit.net>
-
-	* 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).
-	* server/font.cpp (add_os_glyph): update call to ::getGlyph.
-
-2007-06-13 Sandro Santilli <strk@keybit.net>
-
-	* server/FreetypeRasterizer.{cpp,h}: added interface
-	  to fetch vectorial glyph (just a stub).
-	* server/font.cpp (add_os_glyph): fetch both rasterized
-	  and vectorial glyphs, survive to texture glyphs with a null
-	  bound (space is one such glyph).
-	* server/fontlib.cpp (draw_glyph): skip rendering of textured
-	  glyphs with null bounds.
-	* server/text.cpp (display_glyph_records): enable debugging by
-	  default.
-
-2007-06-12 Sandro Santilli <strk@keybit.net>
-
-	* server/FreetypeRasterizer.cpp (getRenderedGlyph): don't assume
-	  "suspeded_image" is not-null after creation of the bitmap_info_alpha
-	  instance (those bitmap interfaces needs a big cleanup really...).
-	* testsuite/misc-ming.all/DefineEditTextTest.c:
-	  Test both embedded and device fonts.
-
-2007-06-12 Sandro Santilli <strk@keybit.net>
-
-	* configure.ac: Look for libfreetype using GNASH_PKG_FIND
-	* server/FreetypeRasterizer.{cpp,h}: use HAVE_FREETYPE_H,
-	  use intrusive_ptr for bitmap_info, not auto_ptr; add missing
-	  includes, make it actually buildable.
-	* server/Makefile.am: Build FreetypeRasterizer
-	* server/parser/Makefile.am: add FREETYPE_CFLAGS
-	* server/edit_text_character.cpp (format_text): stop relying
-	  on font::get_glyph_count, as for device fonts count of glyph
-	  is not known in advance (grows as needed).
-	* server/font.{cpp,h}: Add private methods for initialization
-	  and use of a freetype rasterizer; get_glyph_index() will now
-	  try to create a missing glyph.
-	* server/parser/bitmap_character_def.h: add forward declaration
-	  for image::rgb
-
-2007-06-12 Zou Lunkai <zoulunkai@gmail.com>
-
-	* testsuite/misc-ming.all/loop_test8.c:
-	  correctly set ratio, forgot in last commit.
-	  
-2007-06-12 Zou Lunkai <zoulunkai@gmail.com>
-
-	* testsuite/misc-ming.all/loop_test8.c, Makefile.am:
-	  new testcase for timeline control, focus on ratio.
-	  
-2007-06-11 Sandro Santilli <strk@keybit.net>
-
-	* server/FreetypeRasterizer.{cpp,h}: 
-	  Add missing stub for font filename finder method.
-
-2007-06-11 Zou Lunkai <zoulunkai@gmail.com>
-
-	* gui/sdl_agg_glue.cpp: initialize member variables at construction, 
-	  fix an abortion when loading nonexistent swf files.
-	
-2007-06-10 Bastiaan Jacques <bastiaan@bjacques.org>
-
-	* gui/kde{sup.h, .cpp}: Comment out debugging statements. Make
-	setTimeout work. Quit KdeGui gracefully rather than calling
-	exit(0). Avoid conversion compiler warnings. Switch class
-	pointers to auto_ptr. Small code cleanups.
-	* gui/kde_glue_agg{.cpp, .h}: Contain the rendering buffer in
-	a scoped_array.
-
-2007-06-10 Sandro Santilli <strk@keybit.net>
-
-	* gui/Makefile.am: klash.moc is a source file for the kde
-	  gui.
-
-2007-06-09 Bastiaan Jacques <bastiaan@bjacques.org>
-
-	* configure.ac: Allow the KDE GUI to be compiled against AGG.
-	* gui/Makefile.am: Compile KDE/AGG files when requested.
-	* gui/kde.cpp: Make the KDE GUI compatible with AGG by moving
-	OpenGL-specific code into its respective glue. Also fix mouse
-	movement in combination with scaling.
-	* gui/kde_glue.h: Add stubs for AGG compatibility.
-	* gui/kde_glue_opengl.cpp: run makeCurrent in the glue.
-	* gui/kdesup.h: Allow the AGG glue to be used.
-	* gui/kde_glue_agg{.cpp, .h}: Initial implementation of AGG
-	glue for QT/KDE.
-
-2007-06-09 Sandro Santilli <strk@keybit.net>
-
-	* libbase/embedVideoDecoderFfmpeg.cpp (decodeFrame): do not
-	  access a null decodedFrame (tgc: please check).
-
-2007-06-08 Tomas Groth Christensen <tomasgroth@yahoo.dk>
-
-	* libbase/embedVideoDecoderFfmpeg.{cpp,h}: Store decodedFrame
-	  in an auto_ptr to avoid possible leaks.
-
-2007-06-08 Sandro Santilli <strk@keybit.net>
-
-	* server/FreetypeRasterizer.{cpp,h}: Ported truetype
-	  rasterizer from gameswf, cleaned up and documented
-	  (as far as understood).
-
-2007-06-08 Sandro Santilli <strk@keybit.net>
-
-	* libbase/embedVideoDecoderGst.{cpp,h}: Store decodedFrame
-	  in an auto_ptr to avoid leaks. Fix the case in which
-	  there's NO decoded frame (ie: no gst-ffmpeg installed)
-	  previously segfaulting by simply running
-	  Video-EmbedSquareTestRunner.
-
-2007-06-08 Tomas Groth Christensen <tomasgroth@yahoo.dk>
-
-	* server/asobj/NetStreamFfmpeg.cpp: Don't leave the decoding
-	  loop/thread until the queues are empty, or the media left
-	  in the queues wont get played.
-	* server/movie_root.cpp: Include action.h, not Action.h.
-	* libbase/embedVideoDecoderFfmpeg.cpp: Changed the image copying,
-	  and check if the decoded videoframe is bigger than expected.
-
-
-2007-06-08 Zou Lunkai <zoulunkai@gmail.com>
-
-	* server/as_object.{h,cpp}: add a virtual on_event() for event handler. 
-	* movie_root.{h,cpp}: add a new KeyListener class.
-	* server/asobj/Key.{h ,cpp}, sprite_instance.cpp, edit_text_character.cpp,
-	  button_character_instance.cpp: adopt new KeyListener interface.
-	* server/character.h: change getUserDefinedEventHandler() from private to public.
-	  all in all, merged two listener lists into one.
-	  
-2007-06-08 Tomas Groth Christensen <tomasgroth@yahoo.dk>
-
-	* backend/sound_handler_sdl.cpp: Fixed an assertion fault
-	  when non-mp3 audio was looping.
-
-2007-06-07 Tomas Groth Christensen <tomasgroth@yahoo.dk>
-
-	* libbase/embedVideoDecoderFfmpeg.cpp: Free the av_frame after use.
-	* server/swf/tag_loaders.cpp: Adjust size of audio after decoding.
-
-2007-06-07 Sandro Santilli <strk@keybit.net>
-
-	* macros/ffmpeg.m4: check for libgsm and add to FFMPEG_LIBS if
-	  available.
-	* testsuite/anaylse-results.sh: don't forget to initialize
-	  total_untested.
-
-2007-06-07 Sandro Santilli <strk@keybit.net>
-
-	* doc/C/Makefile.am: distribute all XML files.
-	* macros/docbook.m4: advertise --enable-docbook, not
-	  --disable-docbook since it's disabled by default.
-
-2007-06-07 Sandro Santilli <strk@keybit.net>
-
-	* configure.ac: disable klash if QT lib aren't found.
-	* gui/Makefile.am: add kde_glue.h  in KDE_SRCS (hopefully this adds
-	  to distribution).
-
-2007-06-07 Sandro Santilli <strk@keybit.net>
-
-	* configure.ac: hint user about using AGG if framebuffer gui is
-	  requested.
-	* server/Makefile.am, utilities/Makefile.am:
-	  Moved the libgnashbackend dependency out of libgnashserver
-	  and into the utilities/ dir. This is to avoid a circular
-	  dependency I erroneously introduced with my last 
-	  commit aimed at fixing bug #20110. This should be a better
-	  fix.
-
-2007-06-07 Sandro Santilli <strk@keybit.net>
-
-	* testsuite/MovieTester.{cpp,h}: add a canTestVideo() method.
-	* testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp: don't
-	  wait for Play.Stop event to be sent if video can't be tested
-	  (ie: not supported by mad).
-
-2007-06-07 Ann Barcomb <kudra@domaintje.com>
-
-	* doc/C/usermanual/installation/building.xml: mention that
-	  GNOME help is a possible documentation make target.  Completed
-	  instructions for building documentation; added instructions for 
-	  testing from old manual.
-	* doc/C/usermanual/installation/feature_configuration.xml: The
-	  default renderer isn't AGG. FLTK works. Spelling fixes.
-	  Comment out TODO/FIXME sections, so that they are not visible 
-	  to users, but can still be searched.
-	* doc/C/usermanual/installation.xml: Changed the title of this
-	  section.
-	* doc/C/usermanual/installation/install.xml: Added information on
-	   where Gnash installs.
-	* doc/C/usermanual/installation/custompath_configuration.xml,
-	   doc/C/usermanual/usage.xml: Comment out TODO/FIXME sections, 
-	  so that they are not visible to users, but can still be searched.
-	* doc/C/usermanual/installation/testing_dependencies.xml,
-	   doc/C/usermanual/installation/documentation_dependencies.xml,
-	   doc/C/usermanual/installation/code_dependencies.xml: Resolved
-	   TODO items in the dependency tables (package names).
-	* doc/C/usermanual/bugreport.xml: Described how to make a bug
-	  report.
-	* doc/C/usermanual/glossary.xml: Created the glossary.
-	* doc/C/sources.xml: Removed file; the replacement is
-	   doc/C/usermanual/installation/sources.xml.
-	* doc/C/gnashrc.xml: Removed file; it has been moved to
-	  doc/C/usermanual/usage/gnashrc.xml.
-	* doc/C/gnash.xml: Replace the old usermanual + developer
-	  information with the new usermanual.
-
-2007-06-07 Sandro Santilli <strk@keybit.net>
-
-	* server/Makefile.am: add libgnashbackend to libserver LDADD.
-	  Fixes bug #20110.
-
-2007-06-07 Sandro Santilli <strk@keybit.net>
-
-	* testsuite/MovieTester.cpp (checkPixel): print an UNTESTED
-	  message if no renderers were initialized. This gives you
-	  a feel about how many tests are we failign to run when building
-	  with a renderer that doesn't provide testing facilities.
-	* testsuite/anaylse-results.sh: print untested in report.
-	* testsuite/MovieTester.h: add a canTestRendering() method.
-	* testsuite/misc-ming.all/Video-EmbedSquareTestRunner.cpp: 
-	  Don't run the pixel checking part if MovieTester can't test
-	  rendering. Raise an UNTESTED label instead, so it's reported.
-
-2007-06-07 Sandro Santilli <strk@keybit.net>
-
-	* libgeometry/snappingrange.h: initialize all members in the
-	  templated copy ctor.
-
-2007-06-07 Tomas Groth Christensen <tomasgroth@yahoo.dk>
-
-	* backend/sound_handler.cpp: Fixed a warning.
-	* backend/sound_handler_gst.cpp: Small cleanup.
-	* libbase/embedVideoDecoder{Ffmpeg, Gst}.cpp: Made more robust, can
-	  now handle if render image format is NONE. Should fix bug #20111.
-
-2007-06-07 Udo Giacomozzi <udo.gnu@nova-sys.net>
-
-	* server/edit_text_character.cpp: better version of previous patch;
-	  gets rid of WIDTH_FUDGE too 	
-
-2007-06-07 Udo Giacomozzi <udo.gnu@nova-sys.net>
-
-	* server/edit_text_character.cpp: shift text by 2 pixels, 
-	  fixes bug #17954
-
-2007-06-07 Zou Lunkai <zoulunkai@gmail.com>
-
-	* server/sprite_instance.cpp: improved call_frame_actions(), 
-	  avoid using possibly invalidated interators.
-	
-2007-06-06 Sandro Santilli <strk@keybit.net>
-
-	* server/swf/tag_loader.cpp (fixme_loader): warn only once for each
-	  unimplemented tag found in SWF streams during a run.
-
-2007-06-06 Udo Giacomozzi <udo.gnu@nova-sys.net>
-
-	* backend/render_handler_agg.cpp: add checks for known scale 	
-	  and preset scale to 1:1 so that "make check" succeeds again
-
-2007-06-06 Tomas Groth Christensen <tomasgroth@yahoo.dk>
-
-	* libbase/embedVideoDecoder.h: Added docs and made decodeFrame 
-	  return a auto_ptr.
-	* libbase/embedVideoDecoderFfmpeg.{cpp,h}: Made decodeFrame 
-	  return a auto_ptr.
-	* libbase/embedVideoDecoderGst.{cpp,h}: Made decodeFrame 
-	  return a auto_ptr, and fixed a deadlock.
-	* server/video_stream_instance.cpp: embedVideoDecoder::decodeFrame 
-	  now returns a auto_ptr, adjust to that.
-
-2007-06-06 Udo Giacomozzi <udo.gnu@nova-sys.net>
-
-	* backend/render_handler_agg.cpp: dynamic cast check 	
-
-2007-06-06 Sandro Santilli <strk@keybit.net>
-
-	* testsuite/misc-ming.all/eventSoundTest1-Runner.cpp: don't test sound
-	  if sound is not supported.
-
-2007-06-06 Udo Giacomozzi <udo.gnu@nova-sys.net>
-
-	* backend/render_handler_agg.cpp: apply stage scaling to matrix,
-	  don't multiply each coordinate (should improve rendering performance) 	
-
-2007-06-06 Sandro Santilli <strk@keybit.net>
-
-	* testsuite/MovieTester.{cpp,h}: Don't abort if sound support wasn't
-	  compiled in. Add a canTestSound() method to query that capability.
-
-2007-06-06 Sandro Santilli <strk@keybit.net>
-
-	* configure.ac: If no --enable-media was specified, use the first
-	  detected one in this order: ffmpeg/gst/mad. This is to allow
-	  ./configure with no args to be more failsafe (useful on 'make
-	  distcheck'). If you guys like this patch I'd backport to 0.8 branch.
-
-2007-06-06 Sandro Santilli <strk@keybit.net>
-
-	* testsuite/samples/Makefile.am: distribute subshapes.swf, as we're
-	  now using it for testing purposes.
-	* testsuite/misc-ming.all/Makefile.am: VideoEmbed-SquareTest.swf
-	  depends on testsuite/media/square.flv ! Fixes bug #20090.
-	* testsuite/misc-ming.all/NetStream-SquareTest.c: Fixed test for
-	  bytesTotal since the .flv was actually updated... Fixes bug #20096.
-	* configure.ac: don't set CXXFLAGS as a side-effect of the SIZET_FMT
-	  tests if not already set by user.
-	* Makefile.am: Add print of CXXFLAGS at 'make dumpconfig' time.
-
-2007-06-05 Tomas Groth Christensen <tomasgroth@yahoo.dk>
-
-	* testsuite/media/square.flv: Changed the movements in the movie to
-	  be more fluent so that testing is easier.
-	* testsuite/misc-ming.all/Video-EmbedSquareTestRunner.cpp: Check if
-	  the video really does play.
-
-2007-06-04 Sandro Santilli <strk@keybit.net>
-
-	* configure.ac: support --without-extensions.
-	* testsuite/samples/: Makefile.am, subshapes-TestRunner.cpp:
-	  Test runner for subshapes.swf (see bug #20084).
-	* testsuite/MovieTester.cpp (addTestingRenderer): register the first
-	  and only tested renderer immediately, to be more tolerant about
-	  limitations in the core lib preveing hot-swap of renderers.
-
-2007-06-05 Ann Barcomb <kudra@domaintje.com>
-
-	* doc/C/usermanual/usage/gnashrc.xml: Copy Sandro's commit
-	  1.3435 of doc/C/gnashrc.xml to the new gnashrc.xml
-	* many files: Changed my email address
-
-2007-06-05 Udo Giacomozzi <udo.gnu@nova-sys.net>
-
-	* backend/render_handler_agg.cpp: correct matrix transformation
-	  for rotated video; switch to /cloning/ image accessor to
-	  make edges smooth for rotated video	
-	
-2007-06-05 Zou Lunkai <zoulunkai@gmail.com>
-
-	* server/as_object.h: change operator "==" to "=", should fix a typo.
-	  
-2007-06-04 Sandro Santilli <strk@keybit.net>
-
-	* README: some opcode and classes are actually implemented now.
-
-2007-06-04 Sandro Santilli <strk@keybit.net>
-
-	* server/video_stream_instance.{cpp,h}: register Video AS class
-	  interface and provide class initialization.
-	* server/asobj/: Global.cpp, Makefile.am, Video.{cpp,h}: Drop Video file, video
-	  class is now implemented in video_stream_instance.cpp
-	* testsuite/misc-ming.all/NetStream-SquareTest.c: don't expect
-	  failures due to video stream character NOT being a real Video
-	  object.
-
-2007-06-04 Sandro Santilli <strk@keybit.net>
-
-	* testsuite/misc-ming.all/NetStream-SquareTest.c: set SWF rate back to
-	  an high value to allow for testing pixel color and also testing with
-	  eyes what's hard to test when nothing is shown due to Gnash not
-	  supporting sub-SWF rate videos; Scale video by 120% and rotate 45
-	  degrees clockwise to verify video transform
-	  bugs (not automated yet); documented expected behaviour; add 
-	  tests for matrix transforming properties.

Index: ChangeLog-0.8.1
===================================================================
RCS file: ChangeLog-0.8.1
diff -N ChangeLog-0.8.1
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ChangeLog-0.8.1	29 Aug 2007 00:56:38 -0000	1.1
@@ -0,0 +1,2983 @@
+2007-08-28 Deanna Phillips <deanna>
+
+	* libbase/utility.h: define exp2 and log2 if not available
+	  based on HAVE_LOG2 and HAVE_EXP2
+	* configure.ac: detect availability of log2 and exp2
+
+2007-08-27 Sandro Santilli <strk@keybit.net>
+
+	* libbase/utility.h: don't define exp2(), it's going to clash
+	  with existing symbol on most systems (except some BSDen)...
+	  Please provide a better patch for BSD.
+
+2007-08-27 Deanna Phillips <deanna>
+
+        * testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp: include
+	  <unistd.h>
+
+2007-08-27 Deanna Philips <deanna>
+
+        * libbase/utility.h: defined exp2() as it's missing on some BSDen.
+
+2007-08-24 Miriam Ruiz <little_miry@yahoo.es>
+
+	* plugin/klash/klash_part.cpp: Patch for GNASHEXE.
+
+2007-08-23 Sandro Santilli <strk@keybit.net>
+
+	* libamf/amf.{cpp,h}: fixed a bunch of memory errors, added
+	  some dox, first pass to interface clean ups.
+	* testsuite/libamf.all/Makefile.am: add testsuite/ to the 
+	  include dir, to allow for using our check_equals functions.
+	* testsuite/libamf.all/: test_object.cpp, test_string.cpp,
+	  test_variable.cpp: fixed new[]/delete mismatches.
+
+2007-08-23 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac: move BOOST macro detector invocation after
+	  PTHREAD one, as the former requires the latter.
+
+2007-08-23 Deanna Phillips <deanna>
+
+	* macros/pthreads.m4: set pthread flags to -pthread for openbsd.
+	* libbase/rc.cpp: include unistd.h for getuid()
+
+2007-08-23 Markus Gothe <nietzsche@lysator.liu.se>
+
+	* libamf/amf.cpp: memcpy -> strncpy, since it does a memory 
+	access violation on Darwin (and porbably other OSes).
+	
+
+2007-08-22 Sandro Santilli <strk@keybit.net>
+
+	* NEWS: add note about the 'debugLog' gnashrc fix and set
+	  release date to Aug 23 (tomorrow).
+	* Makefile.am: distribute autogen.sh.
+
+2007-08-22 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/misc-ming.all/DrawingApiTestRunner.cpp:
+	  Try another work-around to gcc-4.1.2 bug, commented
+	  this time.
+	* testsuite/actionscript.all/MovieClip.as:
+	  Modify syntax used to test for functions availability
+	  to cope with a bug in Ming < 00040005.
+	  Should fix bug #20867.
+
+2007-08-22 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac: bail out if kde gui or kparts plugin are
+	  requested but kde/qt deps are not met. Should fix bug
+	  #20848; bail out if boost_thread is not set to yes.
+	* macros/boost.m4: check for boost/thread.hpp. Should fix
+	  bug #20847.
+
+2007-08-21 Sandro Santilli <strk@keybit.net>
+
+	* libbase/embedVideoDecoderGst.cpp (createDecoder): don't
+	  abort if outputFormat is NONE (renderer missing).
+	  Fixes bug bug #20852.
+
+2007-08-21 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
+
+	* configure.ac: look for getpwnam
+	* libbase/rc.cpp (expandPath): don't try to use getpwnam
+	  if not provided by OS.
+
+2007-08-21 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* backend/render_handler_tri.cpp: fix world_to_pixel() so that OpenGL
+	  works again 	
+
+2007-08-20 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
+
+	* configure.ac: look for the pwd.h header
+	* doc/C/usermanual/usage/gnashrc.xml: add info about tilde expansion.
+	* libbase/rc.{cpp,h}: add support for tilde expansion in debugLog
+	  value.
+
+2007-08-20 Sandro Santilli <strk@keybit.net>
+
+	* libbase/log.{cpp,h}: print an error on stderr of the debug log file
+	  can not be opened for writing. Minor cleanups (including dox).
+
+2007-08-20 Sandro Santilli <strk@keybit.net>
+
+	* server/vm/ExecutableCode.h (FunctionCode::markReachableResources):
+	  Don't mark the function twice, and most importantly don't forget
+	  to mark the target character !!
+
+2007-08-20 Asger Ottar Alstrup <asger@area9.dk>
+
+	* testsuite/misc-mtasc.all/: Makefile.am, exception.as:
+	  Test for try/catch (gnash fails).
+
+2007-08-20 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/libbase/: TCXXRc.cpp, gnashrc.in:
+	  Test 'set debuglog' directive.
+
+2007-08-20 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
+
+	* libbase/log.cpp: fix 'set debuglog' directive.
+
+2007-08-19 Sandro Santilli <strk@keybit.net>
+
+	* server/vm/ASHandlers.cpp (ActionGetVariables): simplify debugging
+	  output.
+
+2007-08-19 Sandro Santilli <strk@keybit.net>
+
+	* server/vm/ASHandlers.cpp (CommonGetUrl): backport a copy from
+	  head.
+
+2007-08-19 Markus Gothe <nietzsche@lysator.liu.se>
+
+	* testsuite/libbase/Makefile.am,
+	testsuite/libamf.all/Makefile.am: Added DEJAGNU_CFLAGS.
+
+2007-08-19 Sandro Santilli <strk@keybit.net>
+
+	* server/FreetypeGlyphsProvider.cpp: remove compiler warnings.
+	* doc/C/usermanual/usage/gnashrc.xml: document
+	  flashVersionString variable.
+
+2007-08-19 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
+
+	* libbase/rc.{cpp,h}: Avoid string copies in inspectors;
+	  add getFlashVersionString (support for
+	  "set flashVersionString Bla bla bla" in gnashrc).
+	* server/vm/VM.cpp (getPlayerVersion): Query RcInit for version
+	  string
+	* testsuite/libbase/: TCXXRc.cpp, gnashrc.in:
+	  Add test for 
+
+2007-08-18 Sandro Santilli <strk@keybit.net>
+
+	* server/swf/tag_loaders.cpp (define_bits_lossless_2_loader):
+	  ensure bytes, not bits!
+	* server/vm/ASHandlers.cpp (CommonGetUrl): always check
+	  for URL (security). Give precedence to loadVariable
+	  calls even if target is _level#. Fixes load of
+	  uptoten.com.
+	* plugin/plugin.cpp: Use the environmental variable
+	  GNASH_PLUGIN_DESCRIPTION for the plugin description
+	  (when set).
+
+2007-08-18 Sandro Santilli <strk@keybit.net>
+
+	* server/video_stream_instance.cpp: mark characters created
+	  using new Video as dynamic.
+	* server/character.h (isDynamic): remove bogus assertion
+	  failing for dynamically-loaded movies.
+
+2007-08-18 Sandro Santilli <strk@keybit.net>
+
+	* server/text.cpp (resolve_font): fix missing return.
+	* server/parser/text_character_def.cpp: fix compiler warnings.
+
+2007-08-18 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
+
+	* configure.ac: define flash player version macros
+	  for compatibility detectors.
+	* plugin/plugin.cpp: build the flash player version
+	  using provided macros.
+	* server/vm/VM.cpp: buil flash player version using
+	  provided macros.
+
+2007-08-18 Sandro Santilli <strk@keybit.net>
+
+	* server/as_object.h (ensureType): fix printing of *source* type
+	  name.
+	* macros/firefox.m4: don't substitute GNASHEXE at all, it's not
+	  used anymore.
+
+2007-08-18 Sandro Santilli <strk@keybit.net>
+
+	* server/text.{cpp,h}: make text_style class store only the font
+	  pointer, w/out the font_id, provide setFont and getFont
+	  methods, the former always performing a lookup.
+	* server/parser/text_character_def.cpp (read): use
+	  text_style::setFont() to set the font this properly updates
+	  the actual font pointer in the text_format, fixing bug #20812.
+	* server/edit_text_character.cpp: use text_style::setFont() to
+	  set font by pointer.
+	* server/parser/: movie_definition.h, movie_def_impl.{h,cpp},
+	  sprite_definition.h: const-correct get_font() method.
+	* server/parser/movie_def_impl.{h,cpp}: const-corrected
+	  in_import_table(), made private and re-activated assertion
+	  checking temporarly removed during to GC layout changes.
+
+2007-08-18 Sandro Santilli <strk@keybit.net>
+
+	* server/parser/text_character_def.cpp: use symbolic names for
+	  tag types, more verbose parsing.
+
+2007-08-18 Sandro Santilli <strk@keybit.net>
+
+	* libbase/jpeg.cpp (jpeg_error_exit): only print SWF errors if
+	  configured to do so; (input_impl): throw an exception if
+	  jpeg_read_header detected errors.
+	* server/swf/tag_loaders.cpp (jpeg_tables_loader,
+	  define_bits_jpeg_loader): early exception checking to avoid
+	  parser interruption on malformed embedded jpeg.
+
+2007-08-18 Felix Eckhofer <felix@tribut.de>
+
+	* plugin/klash/klash_part.cpp: use the -u switch when invoking
+	  the standalone gnash. Fixes youtube playback for konqueror.
+	  Still missing -U and -P switches.
+
+2007-08-18 Sandro Santilli <strk@keybit.net>
+
+	* macros/firefox.m4: drop --with-gnashexe and GNASHEXE macro
+	* plugin/Makefile.am: define GNASHBINDIR based on ${bindir}
+	* plugin/klash/Makefile.am: define GNASHBINDIR based on ${bindir}
+
+2007-08-17 Sandro Santilli <strk@keybit.net>
+
+	* server/sprite_instance.cpp (setVariables):
+	  Convert variable names to lowercase when needed.
+	* testsuite/misc-ming.all/: Makefile.am, FlashVarsTest.{as,html}:
+	  Test that parameter names are converted to lowercase when target
+	  SWF is < 7.
+
+2007-08-17 Sandro Santilli <strk@keybit.net>
+
+	* NEWS: Better support for flash player detection
+
+2007-08-17 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
+
+	* server/vm/VM.cpp (getPlayerVersion): define FLASH_VERSION as
+	  a compatibility version for use by $version or
+	  System.capabilities.version based version detection kits.
+	  (TODO items added for a cleaner handling of this).
+	* plugin/plugin.cpp: define FLASH_VERSION as a compatibility version
+	  for use by javascript-based flash version detection kits.
+
+2007-08-13  Alfred M. Szmidt  <ams@gnu.org>
+
+	* configure.ac: State that a <= 2.4 version of AGG is an error.
+
+2007-08-16 Takashi Iwai <tiwai@suse.de>
+
+	* libbase/network.cpp (Network::createServer): fix a bug making
+	  the test for DEFAULTPROTO == "udp" always fail.
+
+2007-08-15 Tomas Groth Christensen <tomasgroth@yahoo.dk>
+
+	* backend/sound_handler_{sdl,gst}.cpp: Removed primitive
+	  sync'ing code since it resulted in bad audio.
+
+2007-08-10 Sandro Santilli <strk@keybit.net>
+
+	* gui/Makefile.am: fix build of sdl/cairo
+	* configure.ac: abort if a requested renderer/gui combination
+	  isn't supported (checked for gtk/kde/sdl/fb/fltk)
+
+2007-08-10 Sandro Santilli <strk@keybit.net>
+
+	* gui/Makefile.am: typo preventing gtk/cairo combination from building
+	* server/FreetypeGlyphsProvider.{cpp,h}: add a destructor getting
+	  rid of the resources associated with a face.
+	* configure.ac: FLTK/OGL isn't supported, while SDL/OGL is !
+
+2007-08-09 David Rorex  <drorex@gmail.com>
+
+	* server/FreetypeGlyphsProvider.cpp: minor change to print the
+	  freetype glyph format in human readable form. patch #6148.
+
+2007-08-10 Sandro Santilli <strk@keybit.net>
+
+	* server/vm/ActionExec.{cpp,h}: refactor the check for call stack
+	  depth at end of execution to take depth at *start* of execution
+	  into account.
+
+2007-08-10 Sandro Santilli <strk@keybit.net>
+
+	* server/vm/ActionExec.cpp (cleanupAfterRun): don't assume the call
+	  stack should be empty at the end of global code execution. Still
+	  print an error as we need further investigation about it. Fixes
+	  bug #20740.
+
+2007-08-10 Zou Lunkai <zoulunkai@gmail.com>
+	
+	* server/dlist.cpp: revert mask related code, fix bug#20655, which is
+	  a blocker.
+	
+2007-08-10 Alexander Sack <asac@jwsdot.com>
+
+	* backend/Makefile.am, libamf/Makefile.am, libbase/Makefile.am,
+	  libgeometry/Makefile.am, plugin/mozilla-sdk/Makefile.am,
+	  server/Makefile.am: use $pkglibdir for unversioned libs.
+
+2007-08-09 Sandro Santilli <strk@keybit.net>
+
+	* server/swf/tag_loaders.cpp (sound_stream_block_loader): don't
+	  discard the first 4 bytes if not reading an MP3. Makes ADPCM
+	  sound better for the feed.swf case (but ADPCM decoder needs
+	  lot more work to be correct)
+
+2007-08-09 Sandro Santilli <strk@keybit.net>
+
+	* server/FreetypeGlyphsProvider.cpp (getGlyph): don't abort if
+	  FT_Load_Char doesn't return an outline glyph, rather print
+	  an UNIMPLEMENTED message and the type of glyph you got.
+	* server/swf/tag_loaders.cpp (ADPCMDecoder::adpcm_expand):
+	  Rather then throwing a ParseException, just print an error
+	  as it's much likely the error is in Gnash parser, rather
+	  then in a malformed SWF, and tests show we do a better
+	  job like that then by stopping the parser.
+	  Also, print an error if the bytesNeeded computation doesn't
+	  match the actual number of bytes read.
+
+2007-08-09 Sandro Santilli <strk@keybit.net>
+
+	* server/swf/tag_loaders.cpp: move all ADPCM-related code in an
+	  ADPCMDecoder class.
+	* server/button_character_instance.cpp (construct): properly construct
+	  all button child characters. Fixes bug #20729.
+	* server/swf/tag_loaders.cpp (adpcm_expand): another try at fixing the
+	  needed bytes count for compressed adpcm samples. Also, remove call
+	  to ceil.
+
+2007-08-09 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac: set version to 0.8.1
+
+2007-08-09 Sandro Santilli <strk@keybit.net>
+
+	* server/stream.h (ensureBytes): be more verbose about the lack of
+	  data. Fix signed/unsigned comparison.
+	* server/swf/tag_loaders.cpp (adpcm_expand): fix count of needed
+	  bytes. Fixes bug #20725.
+
+2007-08-08 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
+
+	* plugin/plugin.cpp: replicate compatibility version to the end, to
+	  make UFO flash version detector happy. Fixes bug #20696.
+
+2007-08-08 Sandro Santilli <strk@keybit.net>
+
+	* server/sprite_instance.cpp: drop set_variable() methods.
+	  Have setVariables() call set_member directly (might change in the
+	  future to call as_environment's set_variable, if we find out
+	  variables in query string, FlashParams and loadVariable loaded text
+	  files can contain path elements).
+
+2007-08-08 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/actionscript.all/LoadVars.as: enabled tests erroneously
+	  committed disabled.
+	* server/sprite_instance.cpp (processCompletedLoadVariableRequests):
+	  use set_member, not set_variable - the latter is only meant to be
+	  called on the root movie.
+	* server/impl.cpp, server/swf/tag_loaders.{cpp,h}: stub parsing
+	  of REFLEX tag.
+	* server/asobj/Mouse.cpp: make the global Mouse symbol point
+	  to an object, not a constructor.
+	* testsuite/actionscript.all/Mouse.as: xcheck -> check.
+
+2007-08-08 Tomas Groth Christensen <tomasgroth@yahoo.dk>
+
+	* backend/sound_handler_{sdl,gst}.cpp: Detect and fix if a soundstream
+	  is out of sync (after position-jump or general out of sync issue),
+	  fixes bug #20681.
+
+2007-08-08 Tomas Groth Christensen <tomasgroth@yahoo.dk>
+
+	* backend/sound_handler_sdl.cpp: Fix counting of samples played,
+	  and use the output samplerate to calculate the playhead position
+	  in time, fixes/improves bug #20684.
+
+2007-08-07 Sandro Santilli <strk@keybit.net>
+
+	* gui/Makefile.am: clean the 'gnash' script on make clean. 
+	* server/sprite_instance.cpp (processCompletedLoadVariableRequest):
+	  fix attempt to increment past-the-end iterator.
+	* libbase/zlib_adaptar.cpp: don't hang on corrupted input.
+	* libbase/jpeg.{cpp,h}: don't segfault on corrupted input.
+	* server/matrix.cpp (read): add TODO item (check input)
+	* server/rect.cpp (read): add TODO item (check input)
+	* server/movie_instance.cpp (advance): warn only once about movie
+	  containing no frames.
+	* server/parser/morph2_character_def.{cpp,h} (read): document,
+	  don't read past end of tag.
+	* server/stream.h (read_variable_count): document and add
+	  integrity checks. Add a GNASH_TRUST_SWF macro to turn ensureBytes
+	  to a no-op.
+	* server/parser/shape_character_def.cpp (read_fill_styles,
+	  read_line_styles, read): don't read past end of tag. Don't try to
+	  recover if an exception is thrown by fill style parser.
+	* server/styles.{cpp,h} (line_style::read): don't read past end of tag.
+	* server/fill_style.{cpp,h} (read): don't read past end of tag.
+	* server/types.{cpp,h} (rgba::read_rgba, rgbe::read): don't read past end
+	  of tag.
+	* server/parser/action_buffer.cpp (read): don't read past end of tag.
+	* Makefile.am: don't list 'doc' twice in subdirs. Fixes 'distclean'
+	  rule.
+
+2007-08-07 Sergio Costas <raster (at) rastersoft.com>
+
+	* backend/sound_handler_gst.cpp: Fix returns from getPosition
+	  (patch #6140), and fix a segfault when asking for position
+	  before sound has been started (patch #6138).
+	* backend/sound_handler_sdl.cpp: Fix returns from getPosition
+	  (patch #6140).
+
+2007-08-06 Sandro Santilli <strk@keybit.net>
+
+	* doc/xmldocs.make: fix uninstall rule to properly remove images
+	  of the manual.
+	* doc/C/Makefile.am, doc/C/asspec/Makefile.am: don't list entities
+	  twice for distribution (fixed make uninstall for the most part,
+	  needs some other tweak for png files)
+	* testsuite/actionscript.all/toString_valueOf.as: fix some
+	  of the tests, disable a test depending on timezone. Please
+	  further tests on Date go to the Date.as file.
+	* server/as_value.{cpp,h}: add a to_int() method taking
+	  care of compatible integer conversion. Add note about
+	  deprecation of templated to_number<>.
+	* server/vm/ASHandlers.cpp: explicitly use to_int() in bitwise
+	  ops. Fixes ops.as testcases built with newer Ming. Add TODO
+	  lines about possible other uses.
+	* testsuite/swfdec/PASSING: bitwise-{5,6,7}.swf now pass.
+
+2007-08-06 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/actionscript.all/ops.as: add test for 0xffffffff
+	  conversion to integer needing to be -1 (gnash fails, need Ming head
+	  to reproduce)
+	* server/video_stream_instance.cpp (markReachableResources): don't
+	  forget to call the character's version of resource marking !!
+	  Fixes bug #20657.
+
+2007-08-06 Zou Lunkai <zoulunkai@gmail.com>
+	
+	* testsuite/actionscript.all/ops.as: xcheck to check, it passed here.
+	  
+2007-08-05 Sandro Santilli <strk@keybit.net>
+
+	* server/parser/character_def.h: provide a protected copy constructor
+	  resetting the render_cache_manager to NULL in the copy, to avoid
+	  multiple destruction of the same object. Add private and aborting
+	  assignment operator. Fixes bug #20694.
+	* server/parser/shape_character_def.{cpp,h}: implement copy
+	  constructor. Add private and aborting assignment operator.
+	  Deprecate input/output cache methods and data.
+	* server/DynamicShape.cpp: update after deprecation of cache
+	  data for input/output stuff.
+
+2007-08-05 Sandro Santilli <strk@keybit.net>
+
+	* server/vm/VM.h: make gnash buildable with GC unused.
+
+2007-08-05 Zou Lunkai <zoulunkai@gmail.com>
+	
+	* testsuite/actionscript.all/toString_valueOf.as, Makefile.am: focused tests, 
+	  hopefully helps the model("String" object is not bogus, and "trace" is also sane).
+	
+2007-08-04 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/actionscript.all/array.as: fixed testcase.
+
+2007-08-04 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/generic-testrunner.sh: it seems 'read' w/out arg
+	  starts being a problem with some shells.
+
+2007-08-04 Sandro Santilli <strk@keybit.net>
+
+	* gui/gnash.in: add missing she bang.
+
+2007-08-04 Ivor Blockley <meteoryte@yahoo.com.au>
+
+	* server/array.cpp:
+	  Pointers to the as_environment object in the as_value comparison
+	  functors are now references.
+	  Fix a bug caused by a missing return statement in the get_basic_eq
+	  function.
+	* testsuite/actionscript.all/array.as:
+	  UNIQUE -> UNIQUESORT flag.
+	  add some tests to see how AS objects implementing the valueOf method
+	  interact with array class methods.
+
+2007-08-04 Sandro Santilli <strk@keybit.net>
+
+	* server/asobj/xmlnode.{cpp,h}: mark reachable resources
+	  (childs and parent).
+
+2007-08-03 Sandro Santilli <strk@keybit.net>
+
+	* server/asobj/Stage.cpp (notifyResize): use PROPNAME()
+	  for proper case of notification event. Finish the dangling
+	  referneces drop thing.
+
+2007-08-03 Sandro Santilli <strk@keybit.net>
+
+	* server/asobj/Stage.{cpp,h}: Mark all listeners as reachable,
+	  drop the unused dropDanglingListeners (since it's verified
+	  the Stage doesn't store *weak* pointers).
+
+2007-08-03 Sandro Santilli <strk@keybit.net>
+
+	* server/movie_root.cpp (getStage): properly convert case when
+	  fetching the "Stage" object from SWF6 or lower.
+	* server/asobj/Stage.cpp (onResize): properly convert case
+	  when fetching the "scaleMode" property from SWF6 or lower.
+
+2007-08-03 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/actionscript.all/Stage.as: test deleting an object
+	  which is also a listener (Gnash segfaults).
+
+2007-08-03 Ivor Blockley <meteoryte@yahoo.com.au>
+
+	* server/array.{cpp,h}: fixes previously identified issues with
+	  array.cpp involving functions that needed to be environment and
+	  SWF-version aware (mainly functions involved in sorting). 
+	* testsuite/actionscript.all/array.as: xcheck->check, few more
+	  tests.
+
+2007-08-03 Sandro Santilli <strk@keybit.net>
+
+	* server/asobj/NetStream.{cpp,h}: mark associated as_environment
+	  as reachable (but I think there are ownership problem there,
+	  the as_environment might be deleted before the NetStream object
+	  is, in which case we'd access random memory).
+
+2007-08-03 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac: make sure PKG_CONFIG is defined before calling 
+	  GNAH_PATH_XXX. Made the notice clearer about GNASH_PATH_XX
+	  need to be put after it.
+
+2007-08-03 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac: move GTK detection code *after* the cross-compiling
+	  section, so that $incllist is properly set. Add notice about
+	  the fact that any GNASH_PATH_XX must be invoked after that one.
+
+2007-08-03 Sandro Santilli <strk@keybit.net>
+
+	* Makefile.am: only descend in doc/ subdir if DOCBOOK is enabled.
+
+2007-08-03 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac: check GTK dependencies only if $build_gtk=yes.
+	  print a WARNING and set $build_gtk=no if deps are not met.
+	  All of this is done *before* NSAPI is checked, so it would
+	  correctly be built or not depending on $build_gtk only.
+
+2007-08-03 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac: fix automatic kparts/nsapi plugin build
+	  based on gui availability.
+
+2007-08-03 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac: fix misleading warning about KDE/GTK gui 
+	  not being built while KPARTS/NSAPI plugin is when instead
+	  the guis are actually being built.
+
+2007-08-03 Ivor Blockley <meteoryte@yahoo.com.au>
+
+	* server/array.cpp: fix iterators invalidation (bug #20667).
+
+2007-08-03  Rob Savoye  <rob@deal.welcomehome.org>
+
+	* configure.ac: Fix typo so --disable-nsapi works. Cleanup the
+	logic of what gets built when. Add a few warnings.
+
+2007-08-02 Sandro Santilli <strk@keybit.net>
+
+	* Makefile.am: add plugins info to 'dumpconfig' output,
+	  simplify the SUBDIR construction (side-effect is we always
+	  descend to most subdirs, even if there's nothing to do in them)
+	* plugin/Makefile.am: don't build libgnashplugin if NSAPI
+	  conditional is false; always descend to klash/ subdir
+	  and let the inner Makefile.am handle conditionals for KPARTS.
+	* plugin/klash/Makefile.am: don't override the 'all' target.
+
+2007-08-02  Rob Savoye  <rob@deal.welcomehome.org>
+
+	* plugin/Makefile.am: Use BUILD_KDE_GUI instead of KLASH. Use
+	NSAPI instead of PLUGIN, KPARTS instead of KLASH.
+	* Makefile.am: Change from PLUGIN to NSAPI and KPARTS for conditionals. 
+	* configure.ac: Change --disable-klash to --disable-kparts, add
+	--disable-nsapi to replace the older --disable-plugin
+	setting. Make building the plugins conditional on the gui being
+	selected and if the development libraries exist.
+	* gui/Makefile.am: Comment out the dyna,ic vs static support, it's
+	uneeded for now.
+	* macros/firefox.m4: Use nsapi instead of plugin as the
+	conditional.
+	* macros/kde.m4: set has_kde to yes by default. It can get
+	disabled later.
+	* plugin/klash/Makefile.am: Use KPARTS instead of KLASH.
+
+2007-08-02 Sandro Santilli <strk@keybit.net>
+
+	* server/asobj/gen-asclass.sh: add the addStatic call to statics.
+	* server/movie_root.{cpp,h}: use a member (and a getter) for the global
+	  key object, and properly mark it as alive.
+
+2007-08-02 Sandro Santilli <strk@keybit.net>
+
+	* server/edit_text_character.cpp: register statics.
+	* server/sprite_instance.cpp: register statics.
+	* server/video_stream_instance.cpp: register statics.
+	* server/array.cpp: register static constructor and prototype,
+	  since arrays are used by the core independentely of their
+	  availability as global classes (function arguments are arrays).
+	* server/as_function.cpp: register static constructor and prototype,
+	  since functions are used by the core independently of their
+	  availability as global classes (each function uses the Function
+	  prototype).
+
+2007-08-02 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/actionscript.all/ops.as: more tests for 'string' == NaN.
+	* server/as_value.cpp (equals): yet another pass at
+	  abstract equality operator. We're still not there, but
+	  getting closer.
+	* testsuite/actionscript.all/ops.as: xcheck -> check.
+
+2007-08-02 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/actionscript.all/: Function.as, ops.as:
+	  Moved tests for equality operator against MovieClip where
+	  it belongs.
+
+2007-08-02 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/actionscript.all/MovieClip.as: test MovieClip.valueOf().
+	* server/as_value.{cpp,h}: as_environment parameter made mandatory
+	  for the equals() method.
+	* server/vm/ASHandlers.cpp (ActionEquals): update calls to
+	  as_value::equals().
+
+2007-08-02 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/actionscript.all/array.as: add test for Array.valueOf().
+	* server/as_value.cpp (equals) : fix true==1 and true!=2
+	  (was failing).
+	* server/vm/ASHandlers.cpp: shift right/left : take undefined
+	  values as zeroes.
+	* testsuite/actionscript.all/ops.as: minor additions, xcheck to
+	  check.
+
+2007-08-02 Sandro Santilli <strk@keybit.net>
+
+	* server/PropertyList.cpp: add compile-time macro for debugging
+	  property allocations.
+
+2007-08-02 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* gui/gtk_glue_agg.cpp: Warn when compiling for OLPC, change compile-time
+	  error to runtime error to be multi-GUI friendly.
+
+2007-08-02 Sandro Santilli <strk@keybit.net>
+
+	* server/asobj/NetConnection.h: remove the unused _owner method.
+
+2007-08-02 Zou Lunkai <zoulunkai@gmail.com>
+	
+	* testsuite/actionscript.all/ops.as: more tests, checks to xchecks.
+	  
+2007-08-02 Sandro Santilli <strk@keybit.net>
+
+	* gui/Makefile.am: comment out the _DEPENDENCIES lines. Properly
+	  rebuilds the binaries when needed (might be breaking another kind
+	  of dependency, but this one was pretty disturbing for me in that
+	  it didn't trigger rebuil when _LIBS changed)
+	* server/asobj/MovieClipLoader.cpp: implement reachable resources
+	  marker (listeners).
+	* server/movie_root.cpp: set background to white by default.
+	  Should fix bug #20655.
+
+2007-08-02 Zou Lunkai <zoulunkai@gmail.com>
+	
+	* testsuite/actionscript.all/ops.as: more tests and more failures. still
+	  need more, we don't want fail on those basic logical operations.
+	  
+2007-08-01 Sandro Santilli <strk@keybit.net>
+
+	* server/swf/tag_loaders.cpp (define_sound_loader): fix a bug
+	  introduced by last commit (sorry)
+
+2007-08-01 Sandro Santilli <strk@keybit.net>
+
+	* server/swf/tag_loaders.cpp: completely remove the bogus assertion
+	  about the required input bytes in relation to the number of samples.
+	  Rather, add more ensureBytes() uses, closer to where the data is
+	  actually read from the stream.
+
+2007-08-01 Sandro Santilli <strk@keybit.net>
+
+	* server/swf/tag_loaders.cpp (sound_expand): fix assertion
+	  checking; added some uses of the new stream::ensureBytes() method;
+	  add more scoped_array uses.
+
+2007-08-01 Sandro Santilli <strk@keybit.net>
+
+	* server/stream.h: add ensureBytes() method to verify
+	  SWF integrity.
+
+2007-08-01 Sandro Santilli <strk@keybit.net>
+
+	* server/swf/tag_loaders.cpp: (define_sound_loader) check if number of
+	  samples exceed available bytes in the tag. (sound_expand) assertion
+	  checking. (u8_expand) use a scoped_array in the easy case (we'll
+	  need more smart pointers in general).
+	* backend/sound_handler.h (create_sound, fill_stream_data): document ownership
+	  of the 'data' argument, and add a TODO item about changing
+	  the interface.
+
+2007-08-01 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* gui/gtk_glue_agg.cpp: Support the OLPC again
+
+2007-08-01 Sandro Santilli <strk@keybit.net>
+
+	* server/asobj/: Boolean.cpp, Number.cpp, string.cpp:
+	  register static constructors and prototypes with the VM.
+	* server/vm/VM.{cpp,h}: Add support for registering
+	  arbitrary as_object for reachability. Intended to
+	  be used whenever a static as_object pointer is allocated.
+
+2007-08-01 Sandro Santilli <strk@keybit.net>
+
+	* gui/gnash.in: don't loose parameters layout. Fixes bug #20651.
+	* gui/Makefile.am: distribute gnash.in
+
+2007-08-01 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* gui/gtk_glue_agg.{cpp,h}: stubbed pixel format detection. Will
+	  break OLPC support but fix bug #20649 for all others.
+
+2007-08-01 Tomas Groth Christensen <tomasgroth@yahoo.dk>
+
+	* backend/sound_handler_gst.{h,cpp}: Switch to try_mutex, and in 
+	  callback_handoff only try to lock, and return if unsuccesfull
+	  to avoid a potential deadlock, fixes bug #20596. Warning fixes.
+
+2007-08-01 Sandro Santilli <strk@keybit.net>
+
+	* plugin/plugin.cpp: run 'gtk-gnash' by default.
+
+2007-07-31 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac, gui/Makefile.am: comment out --enable-dynamic-gui
+	  and related conditionals use.
+
+2007-07-31 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/actionscript.all/array.as: more tests for Array.sort()
+	  and Array.sortOn(). These tests are mainly to explore the behavior
+	  of sorting arrays of objects that override the toString() method and
+	  sortOn using properties specified by such objects. 
+	  Tests provided by Ivor Blockley and cleaned up/fixed by me.
+
+2007-07-31 Sandro Santilli <strk@keybit.net>
+
+	* plugin/klash/klash_part.cpp: run 'kde-gnash' by default
+	  (not 'klash')
+	* gui/gnash.in: don't pass -G over to the actual executable;
+	  translate gui name to lowercase.
+
+2007-07-31 Sandro Santilli <strk@keybit.net>
+
+	* gui/: Makefile.am, gnash.in:
+	  Initial draft of a 'gnash' wrapper.
+
+2007-07-31 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac: rename GUI_CONFIG to SUPPORTED_GUIS to
+	  avoid confusion with the define later set by gui/Makefile.am
+	* gui/Makefile.am: build an executable for each supported
+	  GUI, named <gui>-gnash
+	* gui/Player.{cpp,h}: drop runtime parsing of gui name, just
+	  use whatever gui is specified by the GUI_CONFIG macro set
+	  by the Makefile.
+	* gui/gnash.cpp: drop runtime GUI selection  (and -G switch).
+
+2007-07-31 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/misc-ming.all/ming_utils.c: add word wrapping
+	  to the xtrace window.
+
+2007-07-31 Sandro Santilli <strk@keybit.net>
+
+	* doc/C/usermanual/installation/feature_configuration.xml:
+	  Document --enable-mit-shm
+	* configure.ac: add --enable-mit-shm
+	* gui/gtk_glue_agg.h: don't redefine ENABLE_MIT_SHM, use definition
+	  from config.h
+
+2007-07-31 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* gui/gtk_glue_agg.h: disable MIT-SHM by default (see bug #20301)
+
+2007-07-31 Sandro Santilli <strk@keybit.net>
+
+	* server/vm/ASHandlers.cpp (ActionBitwiseAnd):
+	  take nan operands as zero.
+	* testsuite/actionscript.all/: Makefile.am, ops.as:
+	  new testcase for primitive operations (to complete)
+
+2007-07-31 Sandro Santilli <strk@keybit.net>
+
+	* server/vm/ASHandlers.cpp (ActionBitwiseXor, ActionBitwiseOr): 
+	  take nan operands as zero.
+	* testsuite/actionscript.all/array.as: expect less failures.
+
+2007-07-31 Zou Lunkai <zoulunkai@gmail.com>
+	
+	* testsuite/misc-ming.all/place_object_test2.c, Makefile.am
+	  activate the testcase, fix setting the ratio value(0~1.0 in Ming).
+	  
+2007-07-31 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/actionscript.all/array.as: expect a failure
+	  in the case-insensitive descending sort tested for SWF>6
+
+2007-07-31 Sandro Santilli <strk@keybit.net>
+
+	* server/array.cpp (join): use the SWF-version aware version
+	  of as_value to string conversion. Add TODO items.
+	* testsuite/actionscript.all/array.as: don't expect a failure
+	  in the descending numeric sort
+
+2007-07-31 Zou Lunkai <zoulunkai@gmail.com>
+	
+	* testsuite/misc-ming.all/duplicate_movie_clip_test.c, place_object_test.c,
+	  place_object_test2.c: trivial comments cleanups.
+	  
+2007-07-30 Sandro Santilli <strk@keybit.net>
+
+	* libamf/Makefile.am: add BOOST libs
+	* testsuite/samples/Makefile.am: link in
+	  libgnashserver.la, libgnashbase.la and
+	  libgnashamf.la.
+
+2007-07-29 Sandro Santilli <strk@keybit.net>
+
+	* backend/render_handler_tri.cpp: implemented world_to_pixel and
+	  pixel_to_world (to check, UdoG, can you ?)
+	* gui/gtksup.h: remove any use of RENDERER_XXY defines, use 
+	  the GtkGlue interface only (keep by auto_ptr)
+	* gui/gtk_glue.h: header guard (no code was including this :/)
+	* gui/gtk.cpp: updated use of the glue, remove as much as possible
+	  uses of RENDERER_XXY, the only left are for glue initialization
+	  (headers and constructions) and for the call to prepDrawingArea
+	  which needs to be ordered differently for OGL and for other
+	  renderers.
+
+2007-07-29 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac: Change --enable-renderer to accept a *single* renderer
+	  as the gui code / build scripts are not ready to handle multiple ones
+	  currently (temp hack for 0.8.1). By default, renderer is AGG now.
+
+2007-07-29 Sandro Santilli <strk@keybit.net>
+
+	* server/asobj/SoundGst.cpp (getPosition): fix typo (len=>pos).
+	* server/parser/edit_text_character_def.h: use device fonts
+	  by default (matches the comment near it, was just a typo).
+	  Fixes dynamic textfields using device fonts.
+	* testsuite/actionscript.all/TextField.as: expect one failure
+	  less.
+
+2007-07-30 Sergio Costas <raster (at) rastersoft.com>
+
+	* backend/sound_handler_gst.cpp: Use the audioconverter element
+	  to get the current position, to avoid delay.
+	* server/asobj/SoundGst.cpp: Fixed some faulty conversions to
+	  milliseconds.
+
+2007-07-30 Alexander Sack <asac@jwsdot.com>
+
+	* server/asobj/NetStreamGst.cpp: Fix plugin loading
+	  for non-modern Gstreamer versions.
+
+2007-07-30 Markus Gothe <nietzsche@lysator.liu.se>
+
+	* gui/Info.plist.in: Tidy up the version info, fixed icon.
+	* gui/Makefile.am: Build OS X bundle if GUI == AQUA.
+	* gui/aqua.cpp: Implemented OS-version checking and setCursor.
+	  Added 'About' and 'Preferences...' menus.
+
+2007-07-29  Rob Savoye  <rob@deal.welcomehome.org>
+
+	* macros/firefox.m4: Always install the plugin in ~/.mozilla/plugins.
+
+2007-07-29 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac: drop add_gui variable again, use another way to
+	  handle a missing --enable-gui.
+
+2007-07-29 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac: don't force KDE gui everytime plugin is disabled (sic).
+
+2007-07-29 Nick Warne <nick@ukfsn.org>
+
+	* configure.ac: don't rely on has_kde *before* it is attempted to be
+	  set.
+
+2007-07-29 Ivor Blockley <meteoryte@yahoo.com.au>
+
+	* server/array.{cpp,h}: implement remaining array.sort(..) functionality
+	  (flags UNIQUE and RETURNINDEXEDARRAY) all of array.sortOn(...)
+	* testsuite/actionscript.all/array.as: test for Array.sort and
+	  Array.sortOn
+
+2007-07-29 Ivor Blockley <meteoryte@yahoo.com.au>
+
+	* server/array.cpp: Fix bug in the array.splice(index) method to
+	  prevent an incorrect number of elements being spliced; fix bug
+	  in the array.slice(startindex, endindex) method for certain
+	  negative endindexes; elements in a newly created array with
+	  non-zero size are now assigned a value of 'undefined' rather
+	  than 'null'; trivial optimizations/clean-ups.
+	* testsuite/actionscript.all/array.as: more tests.
+
+2007-07-28  Rob Savoye  <rob@deal.welcomehome.org>
+
+	* macros/ffmpeg.m4: Add test for libswscale, which is needed if
+	ffmpeg is configured with --enable-gpl --enable-swscale. bug #20002.
+
+2007-07-28 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac: re-introduce the $add_gui variable, so that a vanilla
+	  configuration still tries to build gtk and kde guis; don't make fb
+	  renderer and cairo gui incompatible (other guis might be requested,
+	  we'd need a better test to check that at least one compatible with
+	  cairo is there)
+
+2007-07-28 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac: don't miss to set add_renderer when no
+	  --enable-renderer is given, and only abort complaining if NO
+	  GUI supporting opengl is built while also requesting to build opengl
+	  renderer.
+
+2007-07-28 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac: proper quote args given to test (in the code
+	  snippet handling --enable-gui)
+
+2007-07-28 Sandro Santilli <strk@keybit.net>
+
+	* po/Makefile.am: use GMSGFMT, rather then verbatim 'msgfmt'.
+	* configure.ac: simplify gui selection code, fix bug listing
+	  same gui twice.
+	* gui/gui_fb.cpp: typo fix (FbGui => FBGui).
+	* testsuite/misc-mtasc.all/Makefile.am: distribute
+	  mtasc related files even if mtasc is not detected.
+
+2007-07-28 Markus Gothe <nietzsche@lysator.liu.se>
+	
+	* configure.ac: Don't try building KDE/Klash if we'vent got the libs...
+	* gui/aqua*, gui/Info.pist, gui/images/GnashG.icns, gui/Makefile.am: 
+	  Now we can build a bundle by running 'make bundle', albeit I must
+	  fix the linkage.
+
+2007-07-27 Nick Warne <nick@ukfsn.org>
+
+	* plugin/klash/klash_part.cpp: typo (0l => 0L)
+
+2007-07-27 Tomas Groth Christensen <tomasgroth@yahoo.dk>
+
+	* backend/sound_handler.h, backend/sound_handler_gst.{cpp,h},
+	backend/sound_handler_sdl.{cpp,h}, server/asobj/SoundFfmpeg.{h,cpp},
+	server/asobj/SoundGst.{h,cpp}, server/asobj/SoundMad.{h,cpp}:
+	Implement duration and position properties when using Sound objects
+	to control an eventsound, patch partly by Sergio Costas.
+	* server/swf/tag_loaders.cpp: Fix warnings.
+
+2007-07-27 Sandro Santilli <strk@keybit.net>
+
+	* gui/Makefile.am: distribute kde_glue_opengl.h.
+
+2007-07-27 Markus Gothe <nietzsche@lysator.liu.se>
+
+	* gui/DESIGN: Added some docmentation on the GUI-API.
+	* gui/Player.cpp: define DEAFULT_GUI as a string instead of enum.
+
+2007-07-26 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac: Don't threat static linking specially, multiple
+	  GUIs can still be supported by that.
+
+2007-07-26 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac: don't assume that if GTK gui is used only the
+	  GTK-pixelformat is needed (other GUIs might be built).
+	  Fixes bug #20586.
+	* gui/Player.{cpp,h}: Be more verbose on gui initialization error.
+	* gui/kde.cpp (createWindow): return false if renderer creation
+	  failed.
+	* gui/kde_glue_agg.cpp (createRenderHandler): throw an exception if
+	  render handler could not be created.
+	
+2007-07-26 Sandro Santilli <strk@keybit.net>
+
+	* gui/gnash.cpp: scan argv[0] and select KDE gui if it contains
+	  the string 'klash'.
+	* Makefile.am, configure.ac, gui/Makefile.am:
+	  Don't miss to list 'kde' as a gui when built as a side-effect
+	  of enabling klash: fixes proper report of which GUI have been
+	  compiled-in; Take first gui given to --enable-gui as the default
+	  one.
+	* gui/Player.cpp: don't force a default gui, take the one defined
+	  by build line (or default to nullGui).
+	* gui/gnash.cpp: print default gui from --version.
+
+2007-07-26 Alexander Sack <asac@jwsdot.com>
+
+	* server/asobj/NetStreamGst.cpp: Don't use a variable before it 
+	  has been initialized.
+
+2007-07-25 Sandro Santilli <strk@keybit.net>
+
+	* gui/Makefile.am: build libgnashplayer again,
+	  linked against libgnashgui, which is linked
+	  against any gui/renderer specific lib that was
+	  built
+	* gui/Player.{cpp,h}: use named constructors to create
+	  guis, so to avoid the need of including GUI-specific
+	  headers (which do conflict).
+	* gui/gui.h: make constructors protected, provide named
+	  (free functions) constructors for the different guis.
+	* gui/: gui_aqua.cpp, gui_fb.cpp, gui_fltk.cpp, gui_gtk.cpp,
+	  gui_kde.cpp, gui_riscos.cpp, gui_sdl.cpp: modules implementing
+	  the GUI named constructors.
+
+2007-07-25 Sandro Santilli <strk@keybit.net>
+
+	* gui/Player.{cpp,h}: add support for multiple GUI libs.
+	  They can be statically or dynamically linked (not loaded as plugins
+	  yet).
+	* gui/gnash.cpp: add a -G switch to select GUI. If the gui wasn't
+	  compiled in an exception will be thrown (and dunno why not propery
+	  cought..).
+
+2007-07-25 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac: set the BUILD_<gui> conditionals *after* giving kde
+	  gui a chance to be picked back as a dependency of 'klash'.
+	  This fixes a buil bug when klash is enabled by only gtk gui is
+	  selected.
+	* lots of files : fixed Copyright info (delete spurious empty line,
+	  add year 2007).
+
+2007-07-25 Sandro Santilli <strk@keybit.net>
+
+	* server/as_value.h: remove unneeded "container.h" include.
+	* server/as_value.cpp (equalsSameType): fixed nan comparison.
+	* testsuite/actionscript.all/Number.as: fixed NaN != NaN test
+	  (should return false). Add NaN == NaN test (should return true);
+	  Add (0/2) == (0/5) (shoudl return true).
+
+2007-07-25 Sandro Santilli <strk@keybit.net>
+
+	* server/as_value.cpp: drop lowercase_if_needed, substitute with
+	  the PROPNAME macro.
+	* server/as_value.h: add a PROPNAME macro to perform the lowercase
+	  conversion of property names when needed (copies arg)
+	* server/as_environment.h: added some notes about variable name
+	  case conversion.
+	* server/edit_text_character.cpp: removed unused lowercase_if_needed
+	  function.
+	* gui/Makefile.am: build klash when conditinally enabled
+	* gui/gnash.cpp: add missing newline after Gstreamer version
+	  (--version).
+
+2007-07-24 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/actionscript.all/MovieClip.as: minor test for
+	  proper properties 'loadMovie' and 'loadMovieNum'.
+	* server/edit_text_character.cpp: make the
+	  PP_COMPATIBLE_DEVICE_FONT_HANDLING back to undefined
+	  by default. It's incomplete and premature to attempt
+	  limitation-level compatibility.
+	* configure.ac: don't take absence of libAGG as if an
+	  old version was found. Fixes bug #20011.
+
+2007-07-24 Tomas Groth Christensen <tomasgroth@yahoo.dk>
+
+	* server/parser/video_stream_def.cpp: Free the video frames
+	  when deleting the video_stream_def object. Make the buffer
+	  containing the video data 4 bytes bigger than needed to avoid
+	  illegal reads from ffmpeg. Fixes bug #20440.
+
+2007-07-24 Sandro Santilli <strk@keybit.net>
+
+	* Makefile.am: define PHONY rules.
+
+2007-07-24 Sandro Santilli <strk@keybit.net>
+
+	* server/edit_text_character.cpp: add a
+	  PP_COMPATIBLE_DEVICE_FONT_HANDLING macro to mimic
+	  limitation of proprietary player in handling textfields
+	  using device fonts. See DeviceFonts wiki page for more
+	  information. (The macro defaults to being defined)
+
+2007-07-24 Sandro Santilli <strk@keybit.net>
+
+	* server/asobj/SoundFfmpeg.h: Provide a constructor
+	  for proper initialization of members.
+	  YOU CAN NOT ASSUME POINTERS WILL BE INITIALIZED TO NULL.
+	  Fixes bug #20578.
+
+2007-07-24 Sandro Santilli <strk@keybit.net>
+
+	* server/text.cpp (display_glyph_records): don't render invalid glyphs
+	  as empty boxes, unless a DRAW_INVALID_GLYPHS_AS_EMPTY_BOXES macro
+	  is defined.
+	* server/edit_text_character.cpp (setEmbedFonts):
+	  Set _embedFonts *before* calling format_text, or
+	  glyph indexes will be messed up.
+
+2007-07-24 Sandro Santilli <strk@keybit.net>
+
+	* server/font.{cpp,h}: Refactor class definition
+	  to maintain two separate glyph information sets:
+	  one for device and one for embedded glyphs. Added
+	  a parameter to glyph-related accessors and mutators
+	  to specify which set to use.
+	* server/edit_text_character.{cpp,h}: update gnash::font
+	  services call to select embedded or device fonts.
+	* server/fontlib.cpp: updated calls to gnash::font so
+	  to always use embedded ones (mostly caching stuff, which
+	  is currently disabled)
+	* server/text.{cpp,h}: add a boolean parameter to
+	  display_glyph_records to specify wheter to use embedded
+	  or device glyphs when fetching them from the font.
+	* server/parser/text_character_def.cpp: use embedded glyphs.
+
+2007-07-24 Sandro Santilli <strk@keybit.net>
+
+	* server/parser/edit_text_character_def.h:
+	  initialize m_use_outlines to true (so dynamically-created
+	  textfields will use device fonts by default), provide
+	  a getUseEmbeddedGlyphs() public method.
+	* server/edit_text_character.{cpp,h}: add an _embedFonts member
+	  initialized using edit_text_character_def::getUseEmbeddedGlyphs(),
+	  provide the "embedFonts" getter-setter for it.
+	* testsuite/: actionscript.all/TextField.as,
+	  misc-ming.all/DefineEditTextTest.c: less failures.
+
+2007-07-24 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/misc-ming.all/: DefineEditTextTest.c,
+	  DefineEditTextTest-Runner.cpp: a small additional
+	  test for runtime-changing the .embedFont member of a TextField.
+	* testsuite/actionscript.all/TextField.as: more tests
+	  for embedFont member.
+
+2007-07-24 Sandro Santilli <strk@keybit.net>
+
+	* server/font.cpp: more parser verbosity.
+	* server/movie_root.cpp (notify_global_key): Key object
+	  existed since SWF5, not SWF6. Fixes pacman-flash.swf.
+	* server/gnash.h: fix PGDN and PGUP key constants
+	* server/asobj/Global.cpp: initialize the "Key" class
+	  even in SWF5.
+	* server/asobj/Key.cpp: use init_member rather then set_member
+	  when initializing constants, reduce complexity of compile-time
+	  switches for NEW_KEY_LISTENER_LIST_DESIGN, general cleanups.
+	* testsuite/actionscript.all/: Makefile.am, Key.as: new testcase
+	  for Key object
+
+2007-07-24 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* server/dlist.cpp: handle masks of certain malformed(?) movies correctly
+	  (see bug #20527)	
+
+2007-07-24 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/actionscript.all/: case.as, enumerate.as: add rcsid.
+	* server/as_object.{cpp,h}: Add a virtual enumerateNonProperties,
+	  called by enumerateProperties, to allow for enumeration of non-proper
+	  properties (in particular sprite childs).
+	* server/sprite_instance.{cpp,h}: Implement enumerateNonProperties to
+	  enumerate child characters.
+	* testsuite/actionscript.all/enumerate.as: don't expect failures while
+	  enumerating childs.
+
+2007-07-24 Tomas Groth Christensen <tomasgroth@yahoo.dk>
+
+	* server/parser/video_stream_def.cpp: Convert width and height to
+	  the correct format before using them. Fixes bug #20526 and #20440.
+
+2007-07-23 Sandro Santilli <strk@keybit.net>
+
+	* backend/: sound_handler_gst.{cpp,h},
+	  sound_handler_sdl.{cpp,h}:
+	  Define sound handlers inside the gnash namespace.
+
+2007-07-23 Sandro Santilli <strk@keybit.net>
+
+	* plugin/klash/Makefile.am: fix uninstall rule.
+	  Make distcheck works fine on gnashdev now.
+
+2007-07-23 Sandro Santilli <strk@keybit.net>
+
+	* libbase/embedVideoDecoderGst.cpp (createDecoder): fix use of
+	  possibly undefined variable warning, added a couple of assertions
+	  and comments about the why.
+
+2007-07-23 Sandro Santilli <strk@keybit.net>
+
+	* backend/: sound_handler.{cpp,h}, Makefile.am,
+	  sound_handler_gst.cpp, sound_handler_sdl.cpp,
+	  libbase/: utility.{cpp,h}, server/asobj/SoundMad.cpp:
+	  Moved convert_raw_data from libgnashbackend
+	  to libgnashbase. Should fix bug #20110.
+
+2007-07-23 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac: still create Makefile under cygnal
+	  subdirs, or 'dist' rule will fail.
+
+2007-07-23 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac: make sure $add_renderer contain
+	  well-defined values (not arbitrary ones). This is
+	  to make sure RENDERER_LIBS is always meaningful.
+
+2007-07-23 Sandro Santilli <strk@keybit.net>
+
+	* plugin/klash/Makefile.am: define GNASHBINDIR.
+        * configure.ac: don't define RENDERER_AGG *before* the build_agg
+	  variable it is based on has a chance to change value.
+	  Fixes bug #20563
+
+2007-07-23 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac: Fix help strings: --with-{gui,renderer} => --enable-{gui,renderer}
+	* plugin/klash/klash_part.cpp: invoke "klash", not "gnash".
+	  Allow KLASH_PLAYER environment variable to change what's
+	  invoked. The plan is that "klash" would be an alias for
+	  "gnash --gui=kde".
+
+2007-07-23 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* server/edit_text_character.cpp: make get_world_cxform() again
+	  Windows-compatible (relevant code is still disabled, so no
+	  visible difference until we have finished discussing this)
+
+2007-07-23 Sandro Santilli <strk@keybit.net>
+
+	* gui/Makefile.am, testsuite/misc-mtasc.all/Makefile.am:
+	  Fix 'dist' rule.
+	* testsuite/misc-ming.all/: DefineEditTextTest-Runner.cpp,
+	  Makefile.am: skeleton for a MovieTester based runner.
+	* testsuite/misc-ming.all/DefineEditTextTest.c: fixed expected
+	  results.
+	* autogen.sh: libtoolize is in the 'libtool' package.
+	* plugin/plugin.h: remove unneeded include.
+
+2007-07-22 Sandro Santilli <strk@keybit.net>
+
+	* server/edit_text_character.cpp: (get_world_cxform):
+	  return the identity transform in the (disabled) 
+	  "device font" section.
+
+2007-07-22 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* testsuite/samples/input-fields.swf: sample movie
+	  for textfields.
+
+2007-07-22 Sandro Santilli <strk@keybit.net>
+
+	* server/edit_text_character.{cpp,h} (setTextColor): 
+	  update text glyph records color.
+
+2007-07-21 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/actionscript.all/TextField.as: update expected
+	  results for 'textColor' member.
+	* server/types.h (rgba::toRGB): const-corrected.
+	* server/edit_text_character.{cpp,h}: Add a member for text color,
+	  make 'textColor' a proper property.
+
+2007-07-21 Markus Gothe <nietzsche@lysator.liu.se>
+
+	* gui/Makefile.am: Added BUILD_GUI_AQUA.
+
+2007-07-20 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* server/edit_text_character.cpp: fix background and cxform for
+	  text fields
+	* server/edit_text_character.{h,cpp}: special get_world_cxform() 
+	  handler to make input fields opaque for device fonts (currently
+    no effect, since it can't be detected yet)
+
+2007-07-20 Sandro Santilli <strk@keybit.net>
+
+	* server/edit_text_character.cpp (display): make the default
+	  background color solid white (but still background is only drawn
+	  if either 'background' or 'border' are set to true).
+	* testsuite/misc-ming.all/DefineEditTextTest.c: don't include gnash
+	  headers from SWF *generators* !
+	* configure.ac: provide a RENDERER_LIBS listing all built renderer
+	  libraries
+	* testsuite/Makefile.am: link libgnashtestsuite against all built 
+	  renderer libraries.
+
+2007-07-20 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac: rename the gui/renderer selection switch
+	  back to --enable-{gui,renderer} so we don't need to update
+	  our existing configuration wrapper scripts; dynamic loading
+	  of gui/renderer is disabled by default, so advertise the switch
+	  to enable.
+
+2007-07-20 Zou Lunkai <zoulunkai@gmail.com>
+	
+	* testsuite/misc-ming.all/unload_movieclip_test1.c: comments
+	* testsuite/misc-ming.all/DefineEditTextTest.c: removed some incorrect
+	  tests.
+	  
+2007-07-19  Rob Savoye  <rob@deal.welcomehome.org>
+
+	* gui/Makefile.am: Use *_CONFIG variables instead of *_OPT
+	ones. Use BUILD_* conditionals instead of USE_GUI.
+	* backend/Makefile.am: Build seperate libraries for each backend.
+	* configure.ac: Don't pass the data to AM_INIT_AUTOMAKE. Don't
+	disable static libs. Add option for dynamically loading
+	guis. (disabled by default for now). Don't build cygnal by
+	default. Remove --enable-gui and --enable-renderer with new
+	options, --with-gui and --with-renderer to list multiple options
+	for guis and renderers. Don't configure cygnal sub directories yet.
+	* Makefile.am: Use *_CONFIG variables instead of *_OPT ones.
+	* extensions/Makefile.am: Use BUILD_* conditionals instead of
+	USE_GUI.
+	* libbase/Makefile.am: Use HAVE_SDL instead of HAS_SDL.
+	* macros/gtkglext.m4: Use --libs-only-l insted of --libs.
+	* testsuite/misc-ming.all/DefineEditTextTest.c: Include fontlib.h.
+	* macros/libltdl.m4: Move the serial numbers to the top to keep
+	automate 1.19 happy.  
+	* macros/x11.m4: Don't put a conditional in an if block.
+
+2007-07-15  Rob Savoye  <rob@deal.welcomehome.org>
+
+	* po/Makefile.am: Add -Wno-portability to AUTOMAKE_OPTIONS to
+	stop complaints we don't care about. 
+	* gui/Makefile.am: Add -Wno-portability to AUTOMAKE_OPTIONS to
+	stop complaints we don't care about. 
+	* testsuite/misc-ming.all/Makefile.am: Add -Wno-portability to
+	AUTOMAKE_OPTIONS to stop complaints we don't care about.
+	* testsuite/misc-swfmill.all/Makefile.am: Add -Wno-portability to
+	AUTOMAKE_OPTIONS to stop complaints we don't care about.
+	* testsuite/swfdec/Makefile.am: Add -Wno-portability to
+	AUTOMAKE_OPTIONS to stop complaints we don't care about.
+
+2007-07-14  Rob Savoye  <rob@bertha.welcomehome.org>
+
+	* configure.ac: Add new Cygnal directories.
+
+2007-07-19 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/actionscript.all/TextField.as: more successes.
+	* server/edit_text_character.cpp (attachTextFieldInterface): 
+	  fix a bug swapping .border and .borderColor semantic (!).
+	* configure.ac: test(1) string equality operator is "=",
+	  not "==". Other attempt at fixing bug #20525.
+
+2007-07-18 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac: quote `backticked commands` when assigning to
+	  variables. Should fix bug #20525.
+
+2007-07-18 Sandro Santilli <strk@keybit.net>
+
+	* backend/render_handler_agg_style.h: fixed initialization order
+	  warnings.
+	* backend/render_handler_agg.cpp: signedness and initialization list
+	  order warnings fix. This code is a jungle, would be *really* useful
+	  to split class declarations and definition.
+
+2007-07-18 Sandro Santilli <strk@keybit.net>
+
+	* server/impl.cpp (clear): don't attempt to cleanup the
+	  GC if no GC is being used.
+	* cygnal/Makefile.am : Don't build the cygnal stuff,
+	  it's alpha after all... But still include in distribution.
+
+2007-07-18 Sandro Santilli <strk@keybit.net>
+
+	* cygnal/ACT/ACT.{cpp,hpp}: throw runtime_error if in need for a
+	  message string (std::exception ctor doesn't accept a string arg)
+	* cygnal/ACT/Handle.hpp: fix *a few* build errors, more available.
+	* cygnal/Makefile.am: Add all subdirs to SUBDIRS. Fixes bug #20509.
+
+2007-07-18 Sandro Santilli <strk@keybit.net>
+
+	* gui/gtksup.h: Fix extra qualification 'gnash::GtkGui::' on member 'rerenderPixels'
+
+2007-07-18 Udo Giacomozzi <udo.gnu@nova-sys.net>
+	
+	* gui/gtk.cpp: Make the drawing area resize also vertically with the window,
+	  fixes bug #18871
+	* backend/render_handler.h, backend/render_handler_agg.cpp, 
+	  backend/render_handler_tri.{cpp,h}: new methods "pixel_to_world"
+	* gui/gtk.cpp, gui/gtksup.h: Fix re-rendering on expose for scaled movies
+
+2007-07-18 Zou Lunkai <zoulunkai@gmail.com>
+	
+	* testsuite/misc-ming.all/unload_movieclip_test1.c, DefineEditTextTest.c:
+	  more tests.
+	  
+2007-07-18 Zou Lunkai <zoulunkai@gmail.com>
+	
+	* testsuite/misc-ming.all/Makefile.am, unload_movieclip_test1.c: add
+	  a testcase for unloaded movieclips, Gnash fails.
+	
+2007-07-18 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/actionscript.all/TextField.as: Updated test results.
+	* testsuite/misc-ming.all/DefineEditTextTest.c: Updated test results.
+	* server/types.h: Add rgba::toRGB for serializing back to a number.
+	* server/edit_text_character.{cpp,h}: use instance members and
+	  getter-setters to keep info about background and border.
+	  This should fix invalidated bounds computation.
+
+2007-07-18 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/misc-ming.all/DefineEditTextTest.c: xchecks to checks, more
+	  passed.
+	
+2007-07-17 Sandro Santilli <strk@keybit.net>
+
+	* server/edit_text_character.{cpp,h}: Initial support for background,
+	  backgroundColor, border and borderColor. Lacks proper management
+	  of invalidated bounds and class properties. 
+	* server/types.h: Add rgba::parseRGB() for converting an integer
+	  to an rgb value.
+	* server/as_object.h: fix comments about case sensitiveness of
+	  get_member* and set_member*.
+	* gui/Makefile.am: add gtk_cairo_create.h in GTK_CAIRO_SRCS.
+
+2007-07-18 Markus Gothe <nietzsche@lysator.liu.se>
+
+	* macros/opengl.m4: Typo fix on Darwin.
+
+2007-07-17 Nick Warne <nickw>
+
+	* backend/sound_handler_sdl.h, libbase/embedVideoDecoderFfmpeg.{cpp,h},
+	  server/asobj/{Sound, Netstream}Ffmpeg.h, gui/gnash.cpp: Fix for
+	 linking.
+
+2007-07-17 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/actionscript.all/MovieClip.as: more tests, all passed.
+	  
+2007-07-17 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/misc-ming.all/key_event_test5.c: make tests not dependent
+	  on the time of a key press, better self-contained.
+	* testsuite/actionscript.all/MovieClip.as: fix unsafe floating number
+	  comparison, better self-contained.
+	
+2007-07-17 Zou Lunkai <zoulunkai@gmail.com>
+
+	* server/asobj/Key.h, server/asobj/Key.cpp, 
+	  server/button_character_instance.cpp
+	  server/edit_text_character.cpp, server/movie_root.h, 
+	  sever/movie_root.cpp, server/sprite_instance.cpp: key listener
+	  handling cleanups, for better management of key listeners. change
+	  key listeners container from std::vector to std::set. Correct indent.
+	
+2007-07-14  Rob Savoye  <rob@bertha.welcomehome.org>
+
+	* configure.ac: Add new Cygnal directories.
+
+2007-07-13 Sandro Santilli <strk@keybit.net>
+
+	* server/sprite_instance.cpp (sprite_droptarget_getset): 
+	  Always return a string.
+	* testsuite/actionscript.all/MovieClip.as: fixed expected results.
+
+2007-07-13 Sandro Santilli <strk@keybit.net>
+
+	* server/sprite_instance.cpp (sprite_create_text_field): when
+	  targetting SWF8, return the newly created TextField.
+	* testsuite/actionscript.all/MovieClip.as: more successes.
+	* testsuite/actionscript.all/TextField.as: more successes; other fixes
+	  to expected results.
+
+2007-07-13 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/actionscript.all/MovieClip.as: add notes about where we
+	  have been reported differences between proprietary player versions; 
+	  fix check for return code of createTextField for SWF8.
+	* testsuite/actionscript.all/TextField.as:
+	  fix check for return code of createTextField for SWF8;
+	  fix expected failures.
+
+2007-07-13 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/actionscript.all/CustomActions.as: add a note about why
+	  no tests are run.
+	* server/asobj/Mouse.cpp: fix case of addListener and removeListener
+	  methods, add TODO for fixing all.
+	* testsuite/actionscript.all/Mouse.as: fix the test (case issue, and
+	  poor comparisons).
+
+2007-07-13 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/actionscript.all/TextField.as: an hopefully complete
+	  testcase for the TextField class. Reveals a pattern in the
+	  TextField.prototype properties being created on first call to 
+	  createTextField() which looks interesting. Gnash fails about
+	  half of the over 250 tests.
+
+2007-07-13 Sandro Santilli <strk@keybit.net>
+
+	* backend/render_handler.h, backend/render_handler_agg.cpp,
+	  backend/render_handler_cairo.cpp,
+	  backend/render_handler_ogl.cpp, backend/render_handler_tri.cpp,
+	  backend/render_handler_tri.h, server/fontlib.cpp,
+	  server/fontlib.h, server/render.cpp, server/render.h:
+	  Updated renderer interface to always take gnash::rgba by const ref
+	  rather then by value. Should improve performance (removes double
+	  copy of 4 float values for each glyph, bitmap, line strip!).
+
+2007-07-13 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/actionscript.all/TextField.as:
+	  Add test for TextField.prototype.hasOwnProperty('background')
+	  returning false (weird, returns true in
+	  misc.ming-all/DefineEditTestTest.c!)
+	* testsuite/misc-ming.all/DefineEditTextTest.c:
+	  Add test for TextField.prototype.hasOwnProperty('background')
+	  returning true (weird, returns false in actionscript.all/TextField.as!)
+
+2007-07-13 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/actionscript.all/Microphone.as: test cleanup
+	  (see bug #20472).
+	* testsuite/misc-ming.all/Makefile.am: Fix linking
+	  for DefineEditTextTest, add rule to build the corresponding
+	  SWF file.
+
+2007-07-13 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/misc-ming.all/DefineEditTextTest.c: more tests.
+	  	  
+2007-07-13 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/misc-ming.all/DefineEditTextTest.c:
+	  include dejagnuclip, make it to be a self-contained one.
+	  
+2007-07-12 Ivor Blockley <meteoryte@yahoo.com.au>
+
+	Applied patch #6081
+	* server/array.{cpp,h}: fix user-defined comparator for sort()
+	  operation. There's a minor failure with definition of 'this'
+	  inside the comparator.
+	* testsuite/actionscript.all/array.as: add test for sort based
+	  on custom function.
+
+2007-07-12 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/libbase/Makefile.am: gnash libs must be in LDADD, not
+	  AM_LDFLAGS, for dependencies to work fine.
+	* server/font.cpp (get_advance): fix passing non-POD type to
+	  printf-like function.
+	* libbase/rc.{cpp,h}: make the constructor and destructor private.
+	* testsuite/libbase/TCXXRc.cpp: use the default instance.
+
+2007-07-12 David Rorex <drorex@gmail.com>
+
+	* testsuite/misc-mtasc.all/: Dejagnu.as, Makefile.am,
+	  README, TestClass.as, check.as, enum.as, function.as, hello.as,
+	  inheritance.as, level5.as, level99.as, levels.as:
+	  Reorganized MTASC framework to avoid hackish use of Ming, and using
+	  the new dynamic textfield support. Added test for _level loading.
+
+2007-07-12 Martin Guy <martinwguy@yahoo.it>
+
+	* configure.ac,macros/docbook.m4,:
+	  Document "make pdf and "make html" commands near --enable-docbook
+	* doc/C/usermanual/installation/feature_configuration.xml:
+	  document --enable-docbook configuration flag.
+	* fb/gui.cpp: Add newline to end of fatal messages.
+	* server/stream.cpp: Remove silly assert to remove compiler warning
+	  about signed/unsigned
+
+2007-07-12 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/actionscript.all/case.as: add tests for _name and _target,
+	  they are not converted to lower case with swf6.
+
+2007-07-12 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/actionscript.all/case.as: add macros for version dependent
+	  tests.
+	* testsuite/actionscript.all/Makefile.am: activate enumerate.as and
+	  case.as.
+
+2007-07-11 Sandro Santilli <strk@keybit.net>
+
+	* server/edit_text_character.cpp (remove the "default" font logic,
+	  leave that to edit_text_character_def instead).
+	* server/sprite_instance.cpp (add_textfield): finish implementation,
+	  use an hard-coded 10 pixel of font height.
+	* server/text.cpp: more debugging (when activated)
+	* server/parser/edit_text_character_def.{cpp,h}: add set_bounds
+	  and set_font_height for dynamic textfields, use a default font
+	  when none is specified or the one specified is not found.
+
+2007-07-11 Sandro Santilli <strk@keybit.net>
+
+	* server/font.{cpp,h}: Store name by std::string
+	  rather then by char*, Provide a constructor for
+	  device-only font.
+	* server/fontlib.{cpp,h}: Add a get_default_font.
+	* server/edit_text_character.cpp: Use the default
+	  font if no font is specified in the definition.
+	* server/parser/edit_text_character_def.cpp: not having
+	  a font in the definition isn't an error, turn it into
+	  a debugging message instead.
+
+2007-07-11 Timothy Lee <timothy.lee@siriushk.com>
+
+	* backend/render_handler_cairo.cpp: correct scaling and offset
+	  in video rendering. Optimize RGB data conversion as suggested
+	  by John Gilmore. Fix a bug in rgba_to_cairo_argb32(), which
+	  incremented only 3 instead of 4 bytes per pixel.
+
+2007-07-11 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* gui/fb.cpp: print fatal error messages to stdout (workaround),
+	  fixes bug #20012
+
+2007-07-11 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/actionscript.all/case.as: add a testcase for testing 
+	  case senstivity for SWF < 7.
+	  
+2007-07-11 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/misc-ming.all/key_event_test4.c, key_event_test5.c: call totals()
+	  instead of total() to give a final report, the later one is an undefined function.
+	* testsuite/misc-ming.all/key_event_test5runner.c: add comments why Gnash fails, 
+	  it forgets to do the case conversion, a big bug!
+	  
+2007-07-10 Sandro Santilli <strk@keybit.net>
+
+	* server/: fontlib.h, gnash.h: move fontlib namespace
+	  declaration where it belong.
+
+2007-07-10 Sandro Santilli <strk@keybit.net>
+
+	* server/movie_root.cpp (display): fix calls to
+	  begin_display/end_display. Fixes playback of multi-level movies.
+	* testsuite/swfdec/PASSING: three more tests succeed (name
+	  of loaded instances).
+	* server/character.cpp (getTarget): remove the hard-coded
+	  _level0 lead, substitute with a correct level number.
+	* server/: as_environment.cpp, character.cpp,
+	  sprite_instance.cpp: properly evaluate _level#
+	  path components.
+
+2007-07-10 Sandro Santilli <strk@keybit.net>
+
+	* server/vm/ASHandlers.cpp (CommonGetUrl): implement _level loading.
+	  Fixes bug #19968.
+	* server/movie_root.{cpp,h}: add loadLevel() method, store levels in
+	  a map rather then a vector.
+
+2007-07-10 Sandro Santilli <strk@keybit.net>
+
+	* server/: movie_instance.h, character.h: make get_root() a const
+	  method.
+	* server/movie_root.{cpp,h}: support multiple levels. Untested.
+
+2007-07-10 Sandro Santilli <strk@keybit.net>
+
+	* server/parser/movie_def_impl.cpp (add_sound_sample): fix verbosity
+	  to use log_parse and depend on IF_VERBOSE_PARSE.
+	* server/button_character_instance.cpp (on_event): don't require a
+	  button's parent to be a sprite. Fixes bug #20436.
+	* server/parser/button_character_def.cpp: verbose button_record
+	  parsing.
+	* libbase/utility.h (typeName): arg by *const* ref.
+
+2007-07-10 Timothy Lee <timothy.lee@siriushk.com>
+
+	* backend/render_handler_cairo.cpp: initial pass at video rendering for cairo.
+	  (scale and offset don't work consistently yet).
+
+2007-07-10 Zou Lunkai <zoulunkai@gmail.com>
+
+	* server/movie_root.cpp: remove the key listener from the listener container, 
+	  not just unregister it.
+	* server/movie_root.h: add a public getKeyListeners() to return the key listener set.
+	* server/asobj/key.cpp: unregister the key listener. Hopefully fix bug #20317, will
+	  do more tests later.
+	  
+2007-07-10 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/misc-ming.all/key_event_test5.c: more tests.
+	* testsuite/misc-ming.all/key_event_test5runner.c: add a testrunner.
+	* testsuite/misc-ming.all/Makefile.am: enable key_event_test4runner,
+	  enable key_event_test5runner
+	  
+2007-07-10 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/misc-ming.all/Makefile.am: add rules for building
+	  key_event_test4.swf and key_event_test5.swf - test *runners* still
+	  missing.
+	* server/movie_root.{cpp,h}: mark key listeners as reachable.
+	* server/asobj/Key.{cpp,h}: mark key listeners as reachable.
+
+2007-07-10 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/misc-ming.all/key_event_test5.c: new testcase for key listeners,
+	  would cause a segfault when any key pressed, so not enabled.
+	  
+2007-07-09 Sandro Santilli <strk@keybit.net>
+
+	* server/swf.h: add defines and links to alexis for SCRIPTLIMITS (SWF8),
+	  DOABCDEFINE and SYMBOLCLASS (SWF9).
+
+2007-07-09 Bernhard Rosenkraenzer <bero@arklinux.org>
+
+	* macros/ffmpeg.m4: don't assume FFMPEG CFLAGS only contain a single
+	  -I switch.
+
+2007-07-09 Sandro Santilli <strk@keybit.net>
+
+	* server/parser/video_stream_def.{h,cpp}: drop the m_width and m_height
+	  public members, substitute them with a private m_bound (renamed
+	  from m_unused_bound since it is now used). This fixes get_bound
+	  to return a meaningful value.
+	* server/video_stream_instance.{cpp,h}: stop using m_width and m_height
+	  of the definition, rather use the get_bound() method.
+	  Fixes bug #20177 (Youtube: half the video hidden)
+
+2007-07-09 Sandro Santilli <strk@keybit.net>
+
+	* server/as_value.cpp (to_debug_string): include object type name.
+	* libbase/utility.h: add a templated typeName() function for
+	  demangling.
+	* server/character.cpp (width_getset,height_getset): include
+	  character's type name in aserror.
+
+2007-07-09 Martin Guy <martinwguy@yahoo.it>
+
+	* gui/gtk_cairo.h: FIx compiler warning about unused params
+	* libbase/curl_adapter.cpp: Workarounds for older versions of curl
+
+2007-07-08 Sandro Santilli <strk@keybit.net>
+
+	* server/as_value.{cpp,h} (equals): don't always force string
+	  comparison if the first argument is a string (matches ECMA spec,
+	  fixes bug #20403).
+	* testsuite/actionscript.all/Number.as: add test for string:00 ==
+	  number:0
+
+2007-07-08 Sandro Santilli <strk@keybit.net>
+
+	* server/asobj/Global.h: include extension.h when needed.
+	* server/swf.h: link to info about ActionNewAdd
+	* testsuite/actionscript.all/Number.as: Add a quick testcases
+	  for using ActionNewAdd with a string and a number parameters
+	  (see bug #20403).
+
+2007-07-08 Sandro Santilli <strk@keybit.net>
+
+	* doc/C/usermanual/installation/feature_configuration.xml:
+	  the debugger is now off by default, so document --enable-debugger
+	  rather then --disable-debugger; Document --enable-write and
+	  --enable-fps-debug.
+
+2007-07-08 Martin Guy <martinwguy@yahoo.it>
+
+	* configure.ac: Say where to get gtkglext source
+	* C/usermanual/installation/feature_configuration.xml:
+	  Add missing <variablelist> </variablelist> round GUI choices item
+	  and remove configure --enable-dom (it has gone)
+	  Remove doc for configure --enable-xmlreader and --enable-testing
+	  (they have gone too)
+	  Remove mention of old --enable-sound, fix default as --enable-plugin
+	  and talk about MAD / GST-FFMPEG differences.
+	* gui/gtk_glue_cairo.h: Drop unused variable compiler warnings
+	* backend/sound_handler.h libbase/FLVParser.h:
+	  Document extra NELLYMOSER format code (mentioned in libavcodec/flv.h)
+	* macros/ffmpeg.m4: Don't zero ffmpeg_version if too early; it is used
+	  in the final error report and is always checked against "ok" to see
+	  if there is an acceptable version.
+	* macros/ffmpeg.m4: Add commentary preparing for better version checking
+
+2007-07-07 Markus Gothe <nietzsche@lysator.liu.se>
+
+	* testsuite/misc-ming.all/ming_utils.h: Added defintion of
+	  SWFMove_wrteExports().
+
+2007-07-07 Martin Guy <martinwguy@yahoo.it>
+
+	* libbase/network.h,server/shm.{h,cpp}: Remove last remnants of
+	  ENABLE_TESTING ifdef
+	* configure.ac: Remove bogus "Web server support disabled" report,
+	  switched on nonexistent $http variable
+
+2007-07-06 Sandro Santilli <strk@keybit.net>
+
+	* libbase/ref_counted.h: use boost's atomic_count
+	  for the reference counter. Should be safer.
+	  Fixed bug #20194.
+
+2007-07-06 Sandro Santilli <strk@keybit.net>
+
+	* server/vm/ASHandlers.cpp (CommonGetUrl): use
+	  sprite_instance::loadMovie for target loads.
+	  Fixes bug #20001
+	* server/vm/action.{cpp,h}: obsolete attach_extern_movie
+	  in favor of sprite_instance::loadMovie, known to work
+	  better in at least one case (bug #20001).
+
+2007-07-06 Martin Guy <martinwguy@yahoo.it>
+
+	* backend/Makefile.am: Move a GUI test to its logical place
+	* testsuite/libamf.all/test_number.cpp: Remove uused variables and
+	  commented-out debugging printfs
+	* gui/gnash.cpp: Reformat crazy indentation and simplify redundant
+	  local variables (no functional change)
+	* configure.ac: Fix typo "handlign" in message
+	* configure.ac: Fix formatting of missing BOOST date_time message
+	* configure.ac: Fix error message for missing docbook2x tools
+	* configure.ac: Add xsltproc to list of docbook required packages
+	* server/asobj/SoundFfmpeg.cpp: Fix signed/unsigned compiler warning
+
+2007-07-05 Martin Guy <martinwguy@yahoo.it>
+
+	* server/parser/movie_def_impl.cpp: Report internal sample ID too in
+	  verbose parse log message
+
+2007-07-05 Sandro Santilli <strk@keybit.net>
+
+	* server/parser/sprite_definition.h (add_sound_sample): don't
+	  complain about sound sampes definitions found in a sprite definition
+	  context. That's completely legal.
+	* server/array.cpp (array_concat): fix typo in function argument
+	  access. Fixes bug #20355.
+	* testsuite/actionscript.all/array.as: add more tests for Array.concat()
+
+2007-07-04 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* gui/NullGui.cpp: use tu_timer instead of gettimeofday()
+
+2007-07-03 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac: disable debugger by default. Use --enable-debugger
+	  to enable.
+
+2007-07-03 Sandro Santilli <strk@keybit.net>
+
+	* server/asobj/Global.{cpp,h}: Don't use a module-static
+	  for the Extension instance, when enabled.
+	  Seems to fix bug #20272 when debugger id disabled
+	  (sounds voodoo, but these are the effects of initialization
+	  and deinitialization order for statics...)
+
+2007-07-03 Sandro Santilli <strk@keybit.net>
+
+	* gui/gnash.cpp (parseCommandLine): -g doesn't take an argument.
+	* libbase/GC.{cpp,h}: define 3 verbosity levels for the GC
+
+2007-07-03 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* gui/NullGui.cpp: implement correct timing
+
+2007-07-03 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* gui/gui.{cpp,h}: add min/avg/max fps printing and total play time
+	* libbase/GC.h: include assert.h
+
+2007-07-03 Sandro Santilli <strk@keybit.net>
+
+	* backend/render_handler_tri.{cpp,h}: (tri_cache_manager): dont leak
+	  mesh sets.
+	* server/parser/character_def.{cpp,h}: don't leak
+	  render cache managers.
+
+2007-07-02 Sandro Santilli <strk@keybit.net>
+
+	* backend/sound_handler_sdl.{cpp,h}: fix leak of sound_data instances;
+	  added a few TODO items.
+
+2007-07-02 Sandro Santilli <strk@keybit.net>
+
+	* server/parser/edit_text_character_def.h: add an htmlAllowed()
+	  public inspector.
+	* server/edit_text_character.h: add an htmlAllowed() private
+	  inspector.
+	* server/edit_text_character.cpp (format_text): if HTML is allowed
+	  and found in the textfield text, just skip the tags and show the 
+	  content, logging a debugging info about the fact (only once).
+
+2007-07-02 Sandro Santilli <strk@keybit.net>
+
+	* server/FreetypeGlyphsProvider.cpp: protect debugging calls
+	  by a GNASH_DEBUG_DEVICEFONTS, defaulting to undefined.
+	* libbase/GC.{cpp,h}: Implement an heuristic to reduce
+	  the number of collector runs. It is based on the number
+	  of newly registered collectables since last run.
+	  The threshold is set to 10 with a static const member
+	  of the GC class. See http://gnashdev.org/wiki/index.php/ProfilingGC
+	  for more informations.
+	* gui/gui.cpp (fpsCounterTick): don't report an initial FPS of 0.
+
+2007-07-02 Sandro Santilli <strk@keybit.net>
+
+	* gui/NullGui.{h,cpp}: implement quit(), for clean shutdown.
+	* gui/gui.cpp (advance_movie): use quit() to exit
+
+2007-07-02 Sandro Santilli <strk@keybit.net>
+
+	* gui/gnash.cpp (parseCommandLine): support floating point argument
+	  to -f switch.
+
+2007-07-02 Sandro Santilli <strk@keybit.net>
+
+	* gui/gui.{cpp,h}: add setFpsTimerInterval() public method,
+	  change fpsCounterTick() interface to take no arg. Print total
+	  number of frame advances on destruction. All available ifdef
+	  GNASH_FPS_DEBUG.
+	* gui/Player.{cpp,h}: add a setFpsPrintTime() public method.
+	  Only available ifdef GNASH_FPS_DEBUG.
+	* gui/gnash.cpp: Add -f switch for fps debugging prints
+	  (long option was not trivial so didn't add it).
+	  Note that if GNASH_FPS_DEBUG is not defined the -f switch
+	  triggers an error.
+
+2007-07-02 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* gui/gui.{cpp,h}: add fpsCounterTick() for FPS profiling
+
+2007-07-02 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac: add --enable-fps-debug switch to define
+	  GNASH_FPS_DEBUG macro, to use for fuzy speed profiling.
+
+2007-07-02 Tomas Groth Christensen <tomasgroth@yahoo.dk>
+
+	* server/parser/sprite_definition.h: Allow soundsamples to be added
+	  from sprites. Should the malformed-swf warning be removed?
+	* backend/sound_handler_gst.cpp: Moved creation of a tempoary
+	  variable to avoid an assertion failure.
+	* backend/sound_handler_sdl.cpp: Improved error handling.
+
+2007-07-02 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* gui/gtk_glue_agg.cpp: Disable MIT-SHM when pixel format is not recognized 
+
+2007-07-01 Sandro Santilli <strk@keybit.net>
+
+	* libbase/GC.h: don't be verbose about GC by default.
+	* server/movie_root.{cpp,h}: (add_interval_timer): take the Timer by
+	  auto_ptr, add an optional second argument marking the timer as
+	  internal (for use by xmlsocket/LoadVars and whichever other gnash
+	  internal class in need for a timer). Internal timers will get a
+	  negative identifier so to not introduce unexpected gaps in the
+	  user-defined interval timers sequences. Fix bugs introduced in last
+	  commit related to timer expiration and iterators invalidation.
+	* server/timers.{cpp,h}: add some inspector functions, use VM::getTime
+	  for timers (milliseconds).
+	* server/asobj/: LoadVars.cpp, xmlsocket.cpp: update calls to
+	  movie_root::add_interval_timer to mark these timers as internal.
+
+2007-07-01 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/simple.exp: increment timeout from 4 to 5 minutes.
+	* server/movie_root.{cpp,h}: store Timers into a map rather then
+	  a vector, to allow for removal w/out loosing the timer identifier.
+	  Scan a *copy* of the container so that clearing or adding new
+	  intervals don't invalidate iterators.
+
+2007-07-01 Sandro Santilli <strk@keybit.net>
+
+	* libbase/ref_counted.h: use 'long' for the ref count,
+	  cleanup header inclusion, prepare for using an atomic
+	  counter for thread safety (not enabled yet).
+	* server/parser/movie_def_impl.{cpp,h}: have MovieLoader
+	  keep the boost::thread by auto_ptr for proper destruction.
+
+2007-07-01 Markus Gothe <nietzsche@lysator.liu.se>
+
+	* README: Added note on IRC.
+	* gui/gnash.cpp: Added -V as shor for --version. Clean-up.
+
+2007-07-01 Sandro Santilli <strk@keybit.net>
+
+	* COPYING: update to GPL version 3
+
+2007-07-01 Bastiaan Jacques <bastiaan@bjacques.org>
+
+	* all over the place: Update to GPL version 3.
+
+2007-07-01 Sandro Santilli <strk@keybit.net>
+
+	* libbase/GC.h: assert that only the main thread registers collectable
+	  objects with the GC, or runs the collector.
+
+2007-06-30 Sandro Santilli <strk@keybit.net>
+
+	* server/impl.cpp (clear): don't exit, try the proper cleanup way;
+	  movie_def_impl loader should be ready, other threads likely aren't,
+	  this patch would expose all places in need for proper implementation
+	  of threads termination.
+	* server/parser/movie_def_impl.{cpp,h}: implement
+	  loader thread cancelation request, wait for the thread
+	  to terminate in MovieLoader destructor.
+
+2007-06-30 Sandro Santilli <strk@keybit.net>
+
+	* libbase/ref_counted.h: remove inheritance of ref_counted
+	  from GcResource, provide temporary isReachable/setReachable
+	  to allow not reverting all GC-related additions to character
+	  definitions and other possibly GcResource objects.
+	* libbase/smart_ptr.h: have two versions of the intrusive_ptr
+	  free functions: one for GcResource (do nothing) and one 
+	  for ref_counted (add/drop ref). Enable GC by default, where
+	  current version uses both RC and GC (GC only used for as_object)
+
+2007-06-29 Sandro Santilli <strk@keybit.net>
+
+	* server/parser/button_character_def.cpp: ok, let action_buffer leak,
+	  as it seems deleting them in button_action dtor introduces a
+	  segfault in our testusuite. Sorry for not running 'make check'
+	  before committing.
+
+2007-06-29 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* gui/gtk_glue_agg.cpp: properly initialize new SHM variables
+	* server/array.{h,cpp}: classes with virtual methods need a destructor,
+	  don't they?   	
+	
+2007-06-28 Sandro Santilli <strk@keybit.net>
+
+	* server/parser/button_character_def.{cpp,h}: don't let
+	  gnash::button_action leak action_buffer objects.
+	* server/FreetypeGlyphsProvider.cpp (getFontFilename): don't leak
+	  the FcFontSet when finding a match.
+	* server/edit_text_character.{cpp,h}:
+	  Do not call on_event(KILL_FOCUS) in the destructor, do
+	  it on ::unload(). The less things destructors do, the better
+	  (think GC..)
+
+2007-06-27 Petr Pisar <petr.pisar@atlas.cz>
+
+	* po/: Makefile.am, cs.po: Initial Czech translation.
+
+2007-06-27 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* gui/fb.cpp, gui/fltk_glue_agg.cpp, gui/gtk.cpp, gui/gui.cpp: set
+	  correct _validbounds 	
+	* gui/gtk_glue_agg.{cpp,h}: implemented shared memory image blitting
+
+2007-06-26 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* backend/render_handler_agg_style.h: always premultiply image accessors
+	  with alpha channel (partial fix for bug #20257)
+	* backend/render_handler_agg.{cpp,h}, gui/fb.cpp: moved pixel format
+	  detection code to AGG backend files (so it can be used by any GUI)   
+	* gui/gtk_glue_agg.{cpp,h}: initial work for MIT-SHM support (not 
+	  compiled in by default because there is much left to do)
+
+2007-06-26 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/misc-ming.all/callFunction_test.c: testcase for ActionCallFunction,
+	  Gnash fails.
+
+2007-06-25 Antti Ajaki <antti.ajanki@iki.fi>
+
+	* gui/kde_glue_agg.cpp: See http://savannah.gnu.org/patch/?6022
+
+2007-06-25 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/misc-ming.all/morph_test1.c: minor update, reduce a frame for testing.
+	* testsuite/misc-ming.all/morph_test1runner.cpp, Makefile.am: add a testrunner for
+	  morph_test1.swf.
+	  
+2007-06-24 Sandro Santilli <strk@keybit.net>
+
+	* server/: edit_text_character.cpp, sprite_instance.cpp,
+	  video_stream_instance.cpp, asobj/System.cpp:
+	  Don't initialize the "constructor" member explicitly as that's
+	  done by the builtin_function class instead. This patch fixes
+	  the useless construction of 7 to 11 objects (otherwise 
+	  deleted by first GC run).
+
+2007-06-24 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/misc-ming.all/morph_test1.c: first testcase for morphs,
+	  need a testrunner for checking the renderer, but might be enough for
+	  testing GC at the moment.
+	
+2007-06-23 Sandro Santilli <strk@keybit.net>
+
+	* server/as_value.h: include <iostream> for proper definition
+	  of output operator.
+
+2007-06-23 Benjamin Wolsey <benjamin_pelican@yahoo.co.uk>
+
+	* gui/gtk.cpp: Use stock icons for some more menu options. Also,
+	limit several lines to 80 characters.
+
+2007-06-23 Sandro Santilli <strk@keybit.net>
+
+	* server/as_object.cpp (get_prototype): don't return the Object
+	  interface when prototype is NULL with SWF version < 5.
+	  Fixes the empty swf3 case with GC.
+
+2007-06-23 Bastiaan Jacques <bastiaan@bjacques.org>
+
+	* libbase/container.h: Remove home-made container classes in
+	favour of standard containers.
+	* server/{fontlib, impl}.cpp: Switch hash to std::map.
+	* libbase/container.cpp: Remove unused container tests.
+	* libbase/Makefile.am: Disable building of unused container.cpp.
+
+2007-06-22 Bastiaan Jacques <bastiaan@bjacques.org>
+
+	* macros/kde.m4: look for libkdeui, not kdeui. Also first check
+	in the QTDIR/bin directory for moc, in case the first moc in PATH
+	is not the qt3 one.
+
+2007-06-22 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/actionscript.all/enumerate.as: more tests.
+	
+2007-06-22 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/actionscript.all/enumerate.as: cleanups, tests are not
+	  dependent on enumeration order now.
+	* server/movie_root.h: document KeyListener class and related stuff.
+	
+2007-06-22 Markus Gothe <nietzsche@lysator.liu.se>
+
+	* libgeometry/Makefile.am: Fixed building issue on Darwin.
+	* ltmain.sh.darwin: We use this one from Darwinports since it works.
+	* utilities/{parser,processor}.cpp: use 'libbase/gettext.h' for conditianal
+	  use of libintl.
+
+2007-06-21 Tomas Groth Christensen <tomasgroth@yahoo.dk>
+
+	* backend/sound_handler_gst.{cpp,h}: Made it threadsafe, fixes 
+	  bug #20186. Made the internal variables private.
+	* backend/sound_handler_sdl.{cpp,h}: Made the internal
+	  variables private.
+
+2007-06-21 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/actionscript.all/enumerate.as: more tests.
+	
+2007-06-21 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/misc-ming.all/key_event_test4.c, key_event_test4runner.cpp, Makefile.am:
+	  new testcase for "this" context in a user defined key event handler.
+	* server/movie_root.cpp: correctly set the context.
+	
+2007-06-21 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/actionscript.all/enumerate.as: new testcase, Gnash fails.
+
+2007-06-20 Sandro Santilli <strk@keybit.net>
+
+	* libbase/GC.{cpp,h}: moved destructor and cleanUnreachable methods
+	  from header to implementation file.
+	* server/fill_style.{cpp,h}: add an markReachableResources()
+	  function to keep alive eventual bitmap and character fills.
+	* server/parser/shape_character_def.{cpp,h}: implement resource
+	  marking function, marking fill styles.
+
+2007-06-19 Sandro Santilli <strk@keybit.net>
+
+	* server/StreamProvider.cpp (getStream): transfer ownerhip of 
+	  the opened FILE to the tu_file, to plug a memory leak.
+	* server/sprite_instance.{cpp,h}: (markReachableResources):
+	  Mark textfield variables and relative root.
+	  Fixes segfault in movie reported in bug #19883, and also
+	  shows that the GC model does it's job in this case.
+
+2007-06-19 Sandro Santilli <strk@keybit.net>
+
+	* gui/NullGui.{cpp,h}: implement setTimeout
+	  call. fixes bug #20118.
+
+2007-06-19 Sandro Santilli <strk@keybit.net>
+
+	* server/sprite_instance.h: document another
+	  reachable resource (was marked already, just not documented
+	  as such).
+	* server/parser/: button_character_def.{cpp,h},
+	  edit_text_character_def.{cpp,h}:
+	  Implement reachable resources marker.
+
+2007-06-19 Sandro Santilli <strk@keybit.net>
+
+	* server/parser/bitmap_character_def.h: implement reachable resources
+	  marker.
+	* gui/Makefile.am: add .configline to CLEANFILES and remove all in
+	  CLEANFILES on make clean (needed for distcheck to complete).
+	* server/generic_character.{cpp,h}: generic character
+	  are not mouse entities by default, so make get_topmost_mouse_entity
+	  return NULL and can_handle_mouse_events return false. Fixes
+	  bug #20102.
+
+2007-06-19 Sandro Santilli <strk@keybit.net>
+
+	* server/video_stream_instance.{cpp,h}: implement
+	  reachable resources marker.
+
+2007-06-19 Sandro Santilli <strk@keybit.net>
+
+	* server/array.{cpp,h}: implement resource marker
+	  for arrays.
+
+2007-06-18 Alexander Sack <asac@jwsdot.com>
+
+	* configure.ac: detect usable pbutils for automatic installation of
+	  missing codecs.
+	* server/asobj/NetStreamGst.cpp: try installing missing codecs
+	  as needed.
+
+2007-06-18 Sandro Santilli <strk@keybit.net>
+
+	* server/parser/: movie_def_impl.h, movie_definition.h,
+	  sprite_definition.h: document add_execute_tag ownership
+	  transfer.
+
+2007-06-18 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/misc-ming.all/shape_test.c: more tests, make the deduction easier.
+	  surprisingly, all succeeded.
+	
+2007-06-18 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/misc-ming.all/key_event_test3.c,
+	  testsuite/misc-ming.all/key_event_test3runner.cpp: the testrunner was
+	  bogus, fix the testrunner itself.
+	
+2007-06-18 Zou Lunkai <zoulunkai@gmail.com>
+
+	* libbase/GC.h: add missing head file.
+	
+2007-06-18 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/misc-ming.all/loop_test7: review and comments
+	* testsuite/misc-ming.all/loop_test6: review and comments
+	
+2007-06-18 Sandro Santilli <strk@keybit.net>
+
+	* server/vm/ASHandlers.cpp (ActionTrace): don't use the string value
+	  as a format string !
+	* testsuite/swfdec/PASSING: 31 new tests found in the 'as' branch
+	  of swfdec succeed.
+
+2007-06-18 Sandro Santilli <strk@keybit.net>
+
+	* server/sprite_instance.{cpp,h}: (markReachableResources):
+	  mark _frame0_chars as reachable. make check completes
+	  successfully now.
+
+2007-06-17 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/misc-ming.all/loop_test8.c: comments
+	
+2007-06-17 Zou Lunkai <zoulunkai@gmail.com>
+
+	* server/parser/movie_definition.h, 
+	  server/parser/movie_def_impl.h,
+	  server/parser/sprite_definition.h,
+	  server/parser/Timeline.h,
+	  server/swf/PlaceObject2Tag.h,
+	  server/swf/PlaceObject2Tag.cpp,
+	  server/dlist.cpp, 
+	  server/sprite_instance.h, server/sprite_instance.cpp:
+	  enable and improve the 3rd attempt of timeline-control design, take 
+	  ratio into consideration, which is not only used for morphs but also
+	  for general characters in lots of swf files. Got 20 more successes, 
+	  still need more tests and cleanups. see wiki.
+	* testsuite/misc-ming.all/displaylist_depths_test11.c,
+	  testsuite/misc-ming.all/loop_test2.c, 
+	  testsuite/misc-ming.all/loop_test2runner.cpp,
+	  testsuite/misc-ming.all/loop_test3.c,
+	  testsuite/misc-ming.all/loop_test5.c,
+	  testsuite/misc-ming.all/loop_test8.c:
+	  xchecks to checks.
+	  
+2007-06-17 Sandro Santilli <strk@keybit.net>
+
+	* libbase/GC.h: fixed a misleading delete count for
+	  the debugging mode. You can now see that in the UdoG
+	  leaking case (empty function in first frame, empty second
+	  frame) every GC collect run deletes 2 resources (most
+	  likely an isolated chain of references in the RC case).
+
+2007-06-17 Ann Barcomb <kudra@domaintje.com>
+
+	* plugin/Makefile.am: Removed an incorrect comment.
+	* doc/C/usermanual/install.xml: Added some information
+	  inspired by the comments made in patch #5772.
+	* INSTALL: Applied a modified version of patch #5772 by
+	  Anders Juel Jensen.  
+
+2007-06-16  Rob Savoye  <rob@bertha.welcomehome.org>
+
+	* gui/gnash.cpp: Add the version of FFMPEG or GST to
+	--version. Add the config options too.
+	* gui/Makefile.am: Extract the config options so we can pass them
+	to GCC, wo they become part of the output from --version.
+	* libbase/image.cpp: Include memory so auto_ptr is defined.
+	* macros/ffmpeg.m4: Define HAVE_FFMPEG_AVCODEC_H eben when not
+	using AC_CHECK_HEADER.
+
+2007-06-16 Sandro Santilli <strk@keybit.net>
+
+	* libbase/: image.{cpp,h}, LoadThread.{cpp,h},
+	  image_filters.cpp, noseek_fd_adapter.cpp,
+	  reduce number of explicit deletes by using scoped pointers
+	* server/asobj/Global.cpp: reduce explicit deletes...
+	* server/asobj/: Sound.{cpp,h}, SoundFfmpeg.{cpp,h}, SoundGst.{cpp,h},
+	  SoundMad.{cpp,h}: Use a smart pointer for the NetConnection 
+	  reference, and implement markReachableResources to mark it.
+	* server/asobj/xmlsocket.cpp (anydata): don't use a module-static
+	  to keep track of leftovers !!
+
+2007-06-16 Sandro Santilli <strk@keybit.net>
+
+	* server/vm/ExecutableCode.h: implement markReachableResources
+	  for executable code.
+	* server/movie_root.{cpp,h}: mark resources reachable by 
+	  the executable code in the global action queue.
+
+2007-06-16 Sandro Santilli <strk@keybit.net>
+
+	* server/parser/morph2_character_def.{cpp,h}: do not explicitly
+	  delete the shape_character_defs, rather keep by intrusive_ptr
+	  (which means leave ownership to the GC in the GC case).
+
+2007-06-16 Sandro Santilli <strk@keybit.net>
+
+	* server/asobj/NetStream.{h,cpp}: implement markReachableResources.
+	* server/asobj/gen-asclass.sh: updated template to include
+	  a sample of a markReachableResources implementation.
+	* server/asobj/LoadVars.cpp: implement markReachableResources
+	  to properly mark event handlers and environment resources.
+	* libbase/GC.h: don't be verbose about objects being marked,
+	  classes not overriding markReachableResources, collectables
+	  registered and deleted unless GNASH_GC_DEBUG > 1
+	* server/timers.{cpp,h}: provide a markReachableResources to mark
+	  function, target objet and args.
+	* server/movie_root.{cpp,h} (markReachableResources): mark Timers
+	  resources as being reachable; document what's marked in the function
+	  declaration documentation.
+
+2007-06-16 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/server/: DisplayListTest.cpp, GetterSetterTest.cpp,
+	  PropertyListTest.cpp: initialize gnash lib.
+
+2007-06-16 Sandro Santilli <strk@keybit.net>
+
+	* server/parser/movie_def_impl.{cpp,h} (markReachableResources):
+	  Set CharacterDictionary items as reachable !
+	  (BTW, why are character defs managed pointers ?!)
+	* testsuite/MovieTester.cpp: initialize gnash code lib so
+	  to work with GC on.
+
+2007-06-16 Sandro Santilli <strk@keybit.net>
+
+	* server/button_character_instance.{cpp,h}: implement
+	  markReachableResources to properly mark the state characters
+	  and the character definition.
+	* server/font.{cpp,h}: make texture_glyph a concrete class, no
+	  more managed.
+	* server/generic_character.h: implement markReachableResources to
+	  properly mark the character definition.
+
+2007-06-14 Sandro Santilli <strk@keybit.net>
+
+	* server/sprite_instance.{cpp,h} (markReachableResources):
+	  Mark the drawable canvas as reachable !
+	  This fixes the empty movie case (no segfault) and also
+	  the 2-frames simple leaking case reported by UdoG a long
+	  time ago (first frame contains an empty function definition,
+	  second frame is empty).
+
+2007-06-14 Sandro Santilli <strk@keybit.net>
+
+	* server/BitmapMovieInstance.cpp, server/asobj/NetStream.cpp:
+	  More warnings fixes.
+
+2007-06-14 Kris Jurka <jurka@ejurka.com>
+
+	* gui/Player.cpp, gui/gnash.cpp, server/as_environment.cpp,
+	  server/as_function.cpp, server/as_value.cpp,
+	  server/asobj/NetStream.cpp, server/asobj/xml.cpp,
+	  server/parser/shape_character_def.cpp, server/vm/ActionExec.cpp:
+	  Fix some compiler warnings. Applied patch #5927.
+
+2007-06-14 Sandro Santilli <strk@keybit.net>
+
+	* libbase/triangulate_impl.h (poly_env<>::init): don't use
+	  backslash to break strings (unneeded). See bug #20138.
+	  
+2007-06-14 Sandro Santilli <strk@keybit.net>
+
+	* gui/Player.cpp, libbase/GC.{h,cpp}, libbase/Makefile.am,
+	  libbase/ref_counted.h, libbase/smart_ptr.h,
+	  plugin/klash/klash.cpp, plugin/win32/plugin.cpp,
+	  server/GetterSetter.cpp, server/GetterSetter.h,
+	  server/Property.h, server/PropertyList.cpp,
+	  server/PropertyList.h, server/as_environment.cpp,
+	  server/as_environment.h, server/as_function.cpp,
+	  server/as_function.h, server/as_object.cpp,
+	  server/as_object.h, server/as_value.cpp,
+	  server/as_value.h, server/character.cpp, server/character.h,
+	  server/debugger.cpp, server/debugger.h, server/dlist.cpp,
+	  server/dlist.h, server/edit_text_character.cpp,
+	  server/edit_text_character.h, server/font.cpp, server/font.h,
+	  server/fontlib.cpp, server/gnash.h, server/impl.cpp,
+	  server/impl.h, server/mouse_button_state.h,
+	  server/movie_root.cpp, server/movie_root.h,
+	  server/sprite_instance.cpp, server/sprite_instance.h,
+	  server/swf_function.cpp, server/swf_function.h,
+	  server/asobj/Key.h, server/asobj/Mouse.cpp,
+	  server/asobj/Stage.cpp, server/asobj/xmlnode.cpp,
+	  server/parser/BitmapMovieDefinition.cpp,
+	  server/parser/BitmapMovieDefinition.h,
+	  server/parser/movie_def_impl.cpp,
+	  server/parser/movie_def_impl.h,
+	  server/parser/sprite_definition.cpp,
+	  server/parser/sprite_definition.h, server/vm/ASHandlers.cpp,
+	  server/vm/VM.cpp, server/vm/VM.h, utilities/processor.cpp:
+	First big pass on Garbage Collection. We can now use a compile-time
+	define (GNASH_USE_GC) to select wheter GC or RF (ref-counting) is
+	used. By default RC is used as GC is still bogus. Next step would
+	be improving the GC mark functions to ensure needed resources aren't
+	prematurely deleted by the GC. See in GC.h the GcResource class
+	documentation for informations about how to do taht.
+
+2007-06-14 Sandro Santilli <strk@keybit.net>
+
+	* libbase/: Makefile.am, GC.h: First draft at a garbage collector class.
+	* cygnal/http.h: fix gnash::Network referencing, drop
+	  'using namespace std'
+
+2007-06-14 Sandro Santilli <strk@keybit.net>
+
+	* gui/gnash.cpp: add using namespace gnash here, since we're
+	  out of the gnash namespace.
+	* backend/render_handler_agg_bitmap.h,
+	  backend/render_handler_agg_style.h,
+	  libgeometry/snappingrange.h,
+	  cygnal/http.h: don't use 'using namespace'
+	  directive in headers !
+
+2007-06-14 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/actionscript.all/Function.as: test local vars scope of
+	  outer function to be kept alive by inner functions.
+	* libbase/ref_counted.h: made destructor protected, to ensure no 
+	  user is explicitly deleting a ref_counted object (propedeutic
+	  to GC)
+	* configure.ac: FREETYPE_{CFLAGS,LIBS} => FREETYPE2_{CFLAGS,LIBS)
+	  in final reports/checks.
+	* testsuite/misc-mtasc.all/Makefile.am: skip all tests if
+	  prebuilt clip are not supported by the detected ming version.
+	* po/: Makefile.am, it.po: initial work on an italian
+	  translation (funny for a few minutes, but too boring
+	  after a while ;)
+
+2007-06-14 Zou Lunkai <zoulunkai@gmail.com>
+
+	* server/parser/morph2_character_def.h: implement a get_bound() for
+	  morphs, should fix an old displaying problem of morphs.
+	  
+2007-06-14 Hubert Figuiere <hfiguiere@novell.com>
+
+	* Makefile.am, configure.ac: look for freetype2, not freetype
+	  (for pkg-config to be effective). Rename _CFLAGS and _LIBS
+	  to be FREETYPE2, not FREETYPE
+	* server/Makefile.am, server/parser/Makefile.am: 
+	  Use FREETYPE2_{CFLAGS,LIBS}
+	* server/FreetypeGlyphsProvider.cpp: use an FT_CONST macro
+	  to switch between constness of Outline walker func between
+	  freetype 2.1 (wants non-const) and 2.2 (wants const).
+
+2007-06-14 Zou Lunkai <zoulunkai@gmail.com>
+
+	* server/character.h, 
+	  server/dlist.h,
+	  server/dlist.cpp, 
+	  server/sprite_instance.h,
+	  server/sprite_instance.cpp,
+	  server/parser/morph2_character_def.cpp,
+	  server/swf/PlaceObject2Tag.h,
+	  server/swf/PlaceObject2Tag.cpp,
+	  server/vm/action.cpp,
+	  testsuite/server/DisplayListTest.cpp,
+	  change type of "ratio" from float to integer, don't re-interpret the definition.
+	  
+2007-06-13 Petr Pisar <petr.pisar@atlas.cz>
+
+	* gui/gtk.cpp: internationalize menus. (patch #6006).
+
+2007-06-13 Andrew Guertin <bugzilla@dolphinling.net>
+
+	* configure.ac: removes the duplicate "Checking" and adds the missing
+	  newline while checking for archiver type.
+	* macros/agg.m4: print the missing "checking for AGG headers" line.
+	  (patch #5933)
+
+2007-06-13 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/misc-ming.all/DefineEditTextTest.c: put reduced margins
+	  back, to verify no word wrap works.
+	* server/edit_text_character.cpp (format_text): implement no word wra
+	* server/FreetypeGlyphsProvider.{cpp,h}: document coordinate space of
+	  getGlyph output values and implement proper scaling between freetype
+	  glyph EM units and our 1024 EM square.
+
+2007-06-13 Sandro Santilli <strk@keybit.net>
+
+	* server/: font.{cpp,h}, Makefile.am, FreetypeRasterizer.{cpp,h},
+	  FreetypeGlyphsProvider.{cpp,h}: renamed file and class since
+	  we won't serve rendered glyphs anymore. Rendered glyphs can
+	  always be obtained by rendering the shape_character_def,
+	  the code should be buried somewhere in fontlib.cpp.
+
+2007-06-13 Sandro Santilli <strk@keybit.net>
+
+	* server/font.cpp (add_os_font): use the advance value
+	  computed by getGlyph, not getRenderedGlyph (the latter
+	  is bogus).
+
+2007-06-13 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/misc-ming.all/loop_test8.c: xchec -> check.
+
+2007-06-13 Sandro Santilli <strk@keybit.net>
+
+	* server/font.{cpp,h}: always maintain m_advance_table of the 
+	  same size of the other two glyph info containers (should really
+	  make a structure keeping all of them..). Fixes an testInvariant
+	  failure with the device font selector (see DeviceFonts page
+	  on wiki).
+
+2007-06-13 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac: look for libfontconfig
+	* Makefile.am: print fontconfig info on 'dumpconfig'
+	* server/FreetypeRasterizer.{cpp,h}: implement font name
+	  to filename matching using fontconfig, when available;
+	  updated copyright info (enough hacking on it now..)
+	* server/Makefile.am: add FONTCONFIG cflags and libs.
+	* testsuite/misc-ming.all/DefineEditTextTest.c: add another
+	  text field using 'times' font.
+
+2007-06-13 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/misc-ming.all/Makefile.am:
+	  fix a typo(thank strk).
+	  
+2007-06-13 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac: newlines are tokens with bourne shell !
+
+2007-06-13 Sandro Santilli <strk@keybit.net>
+
+	* server/FreetypeRasterizer.cpp: fix build w/out libfreetype.
+
+2007-06-13 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/misc-ming.all/DefineEditTextTest.c:
+	  Apply transformation to text characters.
+
+2007-06-13 Sandro Santilli <strk@keybit.net>
+
+	* gui/gtk.cpp, server/FreetypeRasterizer.cpp,
+	  server/fontlib.cpp, server/movie_root.cpp,
+	  server/text.cpp: Reduced verbosity.
+
+2007-06-13 Sandro Santilli <strk@keybit.net>
+
+	* 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).
+	* server/font.cpp (add_os_glyph): update call to ::getGlyph.
+
+2007-06-13 Sandro Santilli <strk@keybit.net>
+
+	* server/FreetypeRasterizer.{cpp,h}: added interface
+	  to fetch vectorial glyph (just a stub).
+	* server/font.cpp (add_os_glyph): fetch both rasterized
+	  and vectorial glyphs, survive to texture glyphs with a null
+	  bound (space is one such glyph).
+	* server/fontlib.cpp (draw_glyph): skip rendering of textured
+	  glyphs with null bounds.
+	* server/text.cpp (display_glyph_records): enable debugging by
+	  default.
+
+2007-06-12 Sandro Santilli <strk@keybit.net>
+
+	* server/FreetypeRasterizer.cpp (getRenderedGlyph): don't assume
+	  "suspeded_image" is not-null after creation of the bitmap_info_alpha
+	  instance (those bitmap interfaces needs a big cleanup really...).
+	* testsuite/misc-ming.all/DefineEditTextTest.c:
+	  Test both embedded and device fonts.
+
+2007-06-12 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac: Look for libfreetype using GNASH_PKG_FIND
+	* server/FreetypeRasterizer.{cpp,h}: use HAVE_FREETYPE_H,
+	  use intrusive_ptr for bitmap_info, not auto_ptr; add missing
+	  includes, make it actually buildable.
+	* server/Makefile.am: Build FreetypeRasterizer
+	* server/parser/Makefile.am: add FREETYPE_CFLAGS
+	* server/edit_text_character.cpp (format_text): stop relying
+	  on font::get_glyph_count, as for device fonts count of glyph
+	  is not known in advance (grows as needed).
+	* server/font.{cpp,h}: Add private methods for initialization
+	  and use of a freetype rasterizer; get_glyph_index() will now
+	  try to create a missing glyph.
+	* server/parser/bitmap_character_def.h: add forward declaration
+	  for image::rgb
+
+2007-06-12 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/misc-ming.all/loop_test8.c:
+	  correctly set ratio, forgot in last commit.
+	  
+2007-06-12 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/misc-ming.all/loop_test8.c, Makefile.am:
+	  new testcase for timeline control, focus on ratio.
+	  
+2007-06-11 Sandro Santilli <strk@keybit.net>
+
+	* server/FreetypeRasterizer.{cpp,h}: 
+	  Add missing stub for font filename finder method.
+
+2007-06-11 Zou Lunkai <zoulunkai@gmail.com>
+
+	* gui/sdl_agg_glue.cpp: initialize member variables at construction, 
+	  fix an abortion when loading nonexistent swf files.
+	
+2007-06-10 Bastiaan Jacques <bastiaan@bjacques.org>
+
+	* gui/kde{sup.h, .cpp}: Comment out debugging statements. Make
+	setTimeout work. Quit KdeGui gracefully rather than calling
+	exit(0). Avoid conversion compiler warnings. Switch class
+	pointers to auto_ptr. Small code cleanups.
+	* gui/kde_glue_agg{.cpp, .h}: Contain the rendering buffer in
+	a scoped_array.
+
+2007-06-10 Sandro Santilli <strk@keybit.net>
+
+	* gui/Makefile.am: klash.moc is a source file for the kde
+	  gui.
+
+2007-06-09 Bastiaan Jacques <bastiaan@bjacques.org>
+
+	* configure.ac: Allow the KDE GUI to be compiled against AGG.
+	* gui/Makefile.am: Compile KDE/AGG files when requested.
+	* gui/kde.cpp: Make the KDE GUI compatible with AGG by moving
+	OpenGL-specific code into its respective glue. Also fix mouse
+	movement in combination with scaling.
+	* gui/kde_glue.h: Add stubs for AGG compatibility.
+	* gui/kde_glue_opengl.cpp: run makeCurrent in the glue.
+	* gui/kdesup.h: Allow the AGG glue to be used.
+	* gui/kde_glue_agg{.cpp, .h}: Initial implementation of AGG
+	glue for QT/KDE.
+
+2007-06-09 Sandro Santilli <strk@keybit.net>
+
+	* libbase/embedVideoDecoderFfmpeg.cpp (decodeFrame): do not
+	  access a null decodedFrame (tgc: please check).
+
+2007-06-08 Tomas Groth Christensen <tomasgroth@yahoo.dk>
+
+	* libbase/embedVideoDecoderFfmpeg.{cpp,h}: Store decodedFrame
+	  in an auto_ptr to avoid possible leaks.
+
+2007-06-08 Sandro Santilli <strk@keybit.net>
+
+	* server/FreetypeRasterizer.{cpp,h}: Ported truetype
+	  rasterizer from gameswf, cleaned up and documented
+	  (as far as understood).
+
+2007-06-08 Sandro Santilli <strk@keybit.net>
+
+	* libbase/embedVideoDecoderGst.{cpp,h}: Store decodedFrame
+	  in an auto_ptr to avoid leaks. Fix the case in which
+	  there's NO decoded frame (ie: no gst-ffmpeg installed)
+	  previously segfaulting by simply running
+	  Video-EmbedSquareTestRunner.
+
+2007-06-08 Tomas Groth Christensen <tomasgroth@yahoo.dk>
+
+	* server/asobj/NetStreamFfmpeg.cpp: Don't leave the decoding
+	  loop/thread until the queues are empty, or the media left
+	  in the queues wont get played.
+	* server/movie_root.cpp: Include action.h, not Action.h.
+	* libbase/embedVideoDecoderFfmpeg.cpp: Changed the image copying,
+	  and check if the decoded videoframe is bigger than expected.
+
+
+2007-06-08 Zou Lunkai <zoulunkai@gmail.com>
+
+	* server/as_object.{h,cpp}: add a virtual on_event() for event handler. 
+	* movie_root.{h,cpp}: add a new KeyListener class.
+	* server/asobj/Key.{h ,cpp}, sprite_instance.cpp, edit_text_character.cpp,
+	  button_character_instance.cpp: adopt new KeyListener interface.
+	* server/character.h: change getUserDefinedEventHandler() from private to public.
+	  all in all, merged two listener lists into one.
+	  
+2007-06-08 Tomas Groth Christensen <tomasgroth@yahoo.dk>
+
+	* backend/sound_handler_sdl.cpp: Fixed an assertion fault
+	  when non-mp3 audio was looping.
+
+2007-06-07 Tomas Groth Christensen <tomasgroth@yahoo.dk>
+
+	* libbase/embedVideoDecoderFfmpeg.cpp: Free the av_frame after use.
+	* server/swf/tag_loaders.cpp: Adjust size of audio after decoding.
+
+2007-06-07 Sandro Santilli <strk@keybit.net>
+
+	* macros/ffmpeg.m4: check for libgsm and add to FFMPEG_LIBS if
+	  available.
+	* testsuite/anaylse-results.sh: don't forget to initialize
+	  total_untested.
+
+2007-06-07 Sandro Santilli <strk@keybit.net>
+
+	* doc/C/Makefile.am: distribute all XML files.
+	* macros/docbook.m4: advertise --enable-docbook, not
+	  --disable-docbook since it's disabled by default.
+
+2007-06-07 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac: disable klash if QT lib aren't found.
+	* gui/Makefile.am: add kde_glue.h  in KDE_SRCS (hopefully this adds
+	  to distribution).
+
+2007-06-07 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac: hint user about using AGG if framebuffer gui is
+	  requested.
+	* server/Makefile.am, utilities/Makefile.am:
+	  Moved the libgnashbackend dependency out of libgnashserver
+	  and into the utilities/ dir. This is to avoid a circular
+	  dependency I erroneously introduced with my last 
+	  commit aimed at fixing bug #20110. This should be a better
+	  fix.
+
+2007-06-07 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/MovieTester.{cpp,h}: add a canTestVideo() method.
+	* testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp: don't
+	  wait for Play.Stop event to be sent if video can't be tested
+	  (ie: not supported by mad).
+
+2007-06-07 Ann Barcomb <kudra@domaintje.com>
+
+	* doc/C/usermanual/installation/building.xml: mention that
+	  GNOME help is a possible documentation make target.  Completed
+	  instructions for building documentation; added instructions for 
+	  testing from old manual.
+	* doc/C/usermanual/installation/feature_configuration.xml: The
+	  default renderer isn't AGG. FLTK works. Spelling fixes.
+	  Comment out TODO/FIXME sections, so that they are not visible 
+	  to users, but can still be searched.
+	* doc/C/usermanual/installation.xml: Changed the title of this
+	  section.
+	* doc/C/usermanual/installation/install.xml: Added information on
+	   where Gnash installs.
+	* doc/C/usermanual/installation/custompath_configuration.xml,
+	   doc/C/usermanual/usage.xml: Comment out TODO/FIXME sections, 
+	  so that they are not visible to users, but can still be searched.
+	* doc/C/usermanual/installation/testing_dependencies.xml,
+	   doc/C/usermanual/installation/documentation_dependencies.xml,
+	   doc/C/usermanual/installation/code_dependencies.xml: Resolved
+	   TODO items in the dependency tables (package names).
+	* doc/C/usermanual/bugreport.xml: Described how to make a bug
+	  report.
+	* doc/C/usermanual/glossary.xml: Created the glossary.
+	* doc/C/sources.xml: Removed file; the replacement is
+	   doc/C/usermanual/installation/sources.xml.
+	* doc/C/gnashrc.xml: Removed file; it has been moved to
+	  doc/C/usermanual/usage/gnashrc.xml.
+	* doc/C/gnash.xml: Replace the old usermanual + developer
+	  information with the new usermanual.
+
+2007-06-07 Sandro Santilli <strk@keybit.net>
+
+	* server/Makefile.am: add libgnashbackend to libserver LDADD.
+	  Fixes bug #20110.
+
+2007-06-07 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/MovieTester.cpp (checkPixel): print an UNTESTED
+	  message if no renderers were initialized. This gives you
+	  a feel about how many tests are we failign to run when building
+	  with a renderer that doesn't provide testing facilities.
+	* testsuite/anaylse-results.sh: print untested in report.
+	* testsuite/MovieTester.h: add a canTestRendering() method.
+	* testsuite/misc-ming.all/Video-EmbedSquareTestRunner.cpp: 
+	  Don't run the pixel checking part if MovieTester can't test
+	  rendering. Raise an UNTESTED label instead, so it's reported.
+
+2007-06-07 Sandro Santilli <strk@keybit.net>
+
+	* libgeometry/snappingrange.h: initialize all members in the
+	  templated copy ctor.
+
+2007-06-07 Tomas Groth Christensen <tomasgroth@yahoo.dk>
+
+	* backend/sound_handler.cpp: Fixed a warning.
+	* backend/sound_handler_gst.cpp: Small cleanup.
+	* libbase/embedVideoDecoder{Ffmpeg, Gst}.cpp: Made more robust, can
+	  now handle if render image format is NONE. Should fix bug #20111.
+
+2007-06-07 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* server/edit_text_character.cpp: better version of previous patch;
+	  gets rid of WIDTH_FUDGE too 	
+
+2007-06-07 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* server/edit_text_character.cpp: shift text by 2 pixels, 
+	  fixes bug #17954
+
+2007-06-07 Zou Lunkai <zoulunkai@gmail.com>
+
+	* server/sprite_instance.cpp: improved call_frame_actions(), 
+	  avoid using possibly invalidated interators.
+	
+2007-06-06 Sandro Santilli <strk@keybit.net>
+
+	* server/swf/tag_loader.cpp (fixme_loader): warn only once for each
+	  unimplemented tag found in SWF streams during a run.
+
+2007-06-06 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* backend/render_handler_agg.cpp: add checks for known scale 	
+	  and preset scale to 1:1 so that "make check" succeeds again
+
+2007-06-06 Tomas Groth Christensen <tomasgroth@yahoo.dk>
+
+	* libbase/embedVideoDecoder.h: Added docs and made decodeFrame 
+	  return a auto_ptr.
+	* libbase/embedVideoDecoderFfmpeg.{cpp,h}: Made decodeFrame 
+	  return a auto_ptr.
+	* libbase/embedVideoDecoderGst.{cpp,h}: Made decodeFrame 
+	  return a auto_ptr, and fixed a deadlock.
+	* server/video_stream_instance.cpp: embedVideoDecoder::decodeFrame 
+	  now returns a auto_ptr, adjust to that.
+
+2007-06-06 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* backend/render_handler_agg.cpp: dynamic cast check 	
+
+2007-06-06 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/misc-ming.all/eventSoundTest1-Runner.cpp: don't test sound
+	  if sound is not supported.
+
+2007-06-06 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* backend/render_handler_agg.cpp: apply stage scaling to matrix,
+	  don't multiply each coordinate (should improve rendering performance) 	
+
+2007-06-06 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/MovieTester.{cpp,h}: Don't abort if sound support wasn't
+	  compiled in. Add a canTestSound() method to query that capability.
+
+2007-06-06 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac: If no --enable-media was specified, use the first
+	  detected one in this order: ffmpeg/gst/mad. This is to allow
+	  ./configure with no args to be more failsafe (useful on 'make
+	  distcheck'). If you guys like this patch I'd backport to 0.8 branch.
+
+2007-06-06 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/samples/Makefile.am: distribute subshapes.swf, as we're
+	  now using it for testing purposes.
+	* testsuite/misc-ming.all/Makefile.am: VideoEmbed-SquareTest.swf
+	  depends on testsuite/media/square.flv ! Fixes bug #20090.
+	* testsuite/misc-ming.all/NetStream-SquareTest.c: Fixed test for
+	  bytesTotal since the .flv was actually updated... Fixes bug #20096.
+	* configure.ac: don't set CXXFLAGS as a side-effect of the SIZET_FMT
+	  tests if not already set by user.
+	* Makefile.am: Add print of CXXFLAGS at 'make dumpconfig' time.
+
+2007-06-05 Tomas Groth Christensen <tomasgroth@yahoo.dk>
+
+	* testsuite/media/square.flv: Changed the movements in the movie to
+	  be more fluent so that testing is easier.
+	* testsuite/misc-ming.all/Video-EmbedSquareTestRunner.cpp: Check if
+	  the video really does play.
+
+2007-06-04 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac: support --without-extensions.
+	* testsuite/samples/: Makefile.am, subshapes-TestRunner.cpp:
+	  Test runner for subshapes.swf (see bug #20084).
+	* testsuite/MovieTester.cpp (addTestingRenderer): register the first
+	  and only tested renderer immediately, to be more tolerant about
+	  limitations in the core lib preveing hot-swap of renderers.
+
+2007-06-05 Ann Barcomb <kudra@domaintje.com>
+
+	* doc/C/usermanual/usage/gnashrc.xml: Copy Sandro's commit
+	  1.3435 of doc/C/gnashrc.xml to the new gnashrc.xml
+	* many files: Changed my email address
+
+2007-06-05 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* backend/render_handler_agg.cpp: correct matrix transformation
+	  for rotated video; switch to /cloning/ image accessor to
+	  make edges smooth for rotated video	
+	
+2007-06-05 Zou Lunkai <zoulunkai@gmail.com>
+
+	* server/as_object.h: change operator "==" to "=", should fix a typo.
+	  
+2007-06-04 Sandro Santilli <strk@keybit.net>
+
+	* README: some opcode and classes are actually implemented now.
+
+2007-06-04 Sandro Santilli <strk@keybit.net>
+
+	* server/video_stream_instance.{cpp,h}: register Video AS class
+	  interface and provide class initialization.
+	* server/asobj/: Global.cpp, Makefile.am, Video.{cpp,h}: Drop Video file, video
+	  class is now implemented in video_stream_instance.cpp
+	* testsuite/misc-ming.all/NetStream-SquareTest.c: don't expect
+	  failures due to video stream character NOT being a real Video
+	  object.
+
+2007-06-04 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/misc-ming.all/NetStream-SquareTest.c: set SWF rate back to
+	  an high value to allow for testing pixel color and also testing with
+	  eyes what's hard to test when nothing is shown due to Gnash not
+	  supporting sub-SWF rate videos; Scale video by 120% and rotate 45
+	  degrees clockwise to verify video transform
+	  bugs (not automated yet); documented expected behaviour; add 
+	  tests for matrix transforming properties.



From MAILER-DAEMON Tue Aug 28 20:58:07 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQBsl-0005Ly-Oj
	for mharc-gnash-commit@gnu.org; Tue, 28 Aug 2007 20:58:07 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQBsk-0005Kc-6g
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 20:58:06 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQBsj-0005KA-Ak
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 20:58:05 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQBsi-0005Jz-RG
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 20:58:04 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IQBsi-000401-Ao
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 20:58:04 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IQBsh-0001fp-9u
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 00:58:03 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IQBsh-0001fm-5z
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 00:58:03 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQBsh-0001fm-5z@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 29 Aug 2007 00:58:03 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog Makefile.am
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Aug 2007 00:58:07 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/29 00:58:03

Modified files:
	.              : ChangeLog Makefile.am 

Log message:
	        * Makefile.am: distribute old ChangeLog files.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4139&r2=1.4140
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.88&r2=1.89

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4139
retrieving revision 1.4140
diff -u -b -r1.4139 -r1.4140
--- ChangeLog	29 Aug 2007 00:56:38 -0000	1.4139
+++ ChangeLog	29 Aug 2007 00:58:02 -0000	1.4140
@@ -1,5 +1,9 @@
 2007-08-29 Sandro Santilli <strk@keybit.net>
 
+	* Makefile.am: distribute old ChangeLog files.
+
+2007-08-29 Sandro Santilli <strk@keybit.net>
+
 	* server/text.h: fix signature of setFont(font*):
 	  return void.
 

Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -b -r1.88 -r1.89
--- Makefile.am	10 Aug 2007 18:31:01 -0000	1.88
+++ Makefile.am	29 Aug 2007 00:58:02 -0000	1.89
@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # 
 
-# $Id: Makefile.am,v 1.88 2007/08/10 18:31:01 strk Exp $
+# $Id: Makefile.am,v 1.89 2007/08/29 00:58:02 strk Exp $
 
 ## Process this file with automake to produce Makefile.in
 AUTOMAKE_OPTIONS = 1.6.0
@@ -50,7 +50,7 @@
 
 DIST_SUBDIRS = $(STD_DIRS) cygnal doc
 
-EXTRA_DIST = config.rpath $(man_MANS) macros/incllist macros/libslist 
+EXTRA_DIST = config.rpath $(man_MANS) macros/incllist macros/libslist ChangeLog-0.8.0 ChangeLog-0.8.1
 
 noinst_HEADERS = compatibility_include.h
 



From MAILER-DAEMON Tue Aug 28 21:08:24 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQC2i-0005FY-2M
	for mharc-gnash-commit@gnu.org; Tue, 28 Aug 2007 21:08:24 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQC2g-0005Df-LC
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 21:08:22 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQC2e-0005B6-Td
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 21:08:21 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQC2e-0005Ax-LL
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 21:08:20 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1IQC2d-0005J7-V6
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 21:08:20 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <markus@unixrus.se>) id 1IQC2b-00020I-6B
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 01:08:17 +0000
Received: from nihilus by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <nihilus@savannah.gnu.org>) id 1IQC2b-00020F-2X
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 01:08:17 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQC2b-00020F-2X@cvs.savannah.gnu.org>
From: Markus Gothe <markus@unixrus.se>
Date: Wed, 29 Aug 2007 01:08:17 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog libbase/component_hackery.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Aug 2007 01:08:23 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Markus Gothe <nihilus>	07/08/29 01:08:17

Modified files:
	.              : ChangeLog 
Removed files:
	libbase        : component_hackery.cpp 

Log message:
	Removed crufty file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4140&r2=1.4141
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/component_hackery.cpp?cvsroot=gnash&r1=1.2&r2=0

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4140
retrieving revision 1.4141
diff -u -b -r1.4140 -r1.4141
--- ChangeLog	29 Aug 2007 00:58:02 -0000	1.4140
+++ ChangeLog	29 Aug 2007 01:08:16 -0000	1.4141
@@ -1,3 +1,7 @@
+2007-08-29 Markus Gothe <nietzsche@lysator.liu.se>
+
+	* libbase/component_hackery.cpp: Removed crufty file.
+
 2007-08-29 Sandro Santilli <strk@keybit.net>
 
 	* Makefile.am: distribute old ChangeLog files.

Index: libbase/component_hackery.cpp
===================================================================
RCS file: libbase/component_hackery.cpp
diff -N libbase/component_hackery.cpp
--- libbase/component_hackery.cpp	26 Feb 2006 15:49:29 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,47 +0,0 @@
-// Thatcher Ulrich <tu@tulrich.com> 2003 -*- coding: utf-8;-*-
-
-// This source code has been donated to the Public Domain.  Do
-// whatever you want with it.
-
-
-#include <vector>
-
-
-class Component {
-//	typedef vector<Component>::iterator;
-
-	template< class interface >
-	class iterator {
-
-
-		operator++()
-		{
-		}
-	};
-};
-
-
-class SpecialInterface : public Component {
-	void	DoStuff()
-	{
-		printf( "doing stuff.\n" );
-	}
-};
-
-
-class Actor {
-	
-};
-
-
-#define foreach( _decl, _p, _actor )	\
-	for ( _decl _p, Component::iterator _i( _p ) = _actor.components.get_first( _p ); _i != _actor.components.end(); ++ _i, _p = *_i )
-
-
-
-foreach(SpecialInterface*, p, actors)
-{
-	p->DoStuff();
-	some_list.push_back( p );
-}
-



From MAILER-DAEMON Tue Aug 28 22:27:44 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQDHU-0006QX-33
	for mharc-gnash-commit@gnu.org; Tue, 28 Aug 2007 22:27:44 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQDHT-0006OW-4j
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 22:27:43 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQDHR-0006LF-FA
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 22:27:41 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQDHR-0006L7-3r
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 22:27:41 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1IQDHQ-0007u7-D7
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 22:27:40 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l7T2RZX12744;
	Wed, 29 Aug 2007 04:27:35 +0200 (CEST)
	(envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Wed, 29 Aug 2007 04:27:35 +0200
To: Markus Gothe <markus@unixrus.se>
Subject: Re: [Gnash-commit] gnash/libbase utility.h
Message-ID: <20070829022735.GB4169@keybit.net>
Mail-Followup-To: Markus Gothe <markus@unixrus.se>, gnash-commit@gnu.org
References: <E1IPnND-0006fV-1f@cvs.savannah.gnu.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1IPnND-0006fV-1f@cvs.savannah.gnu.org>
X-Detected-Kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Aug 2007 02:27:43 -0000

On Mon, Aug 27, 2007 at 10:47:55PM +0000, Markus Gothe wrote:
> CVSROOT:	/sources/gnash
> Module name:	gnash
> Changes by:	Markus Gothe <nihilus>	07/08/27 22:47:55
> 
> Modified files:
> 	libbase        : utility.h 
> 
> Log message:
> 	Clean up.

This "cleanup" introduced a regression.
See https://savannah.gnu.org/bugs/index.php?20920

> +++ utility.h	27 Aug 2007 22:47:54 -0000	1.30
> @@ -92,11 +92,8 @@
>  //
>  
>  inline float infinite_to_fzero(float x) {	return isfinite(x) ? x : 0.0f; }
> -inline int	iabs(int i) { if (i < 0) return -i; else return i; }
>  inline int	imax(int a, int b) { if (a < b) return b; else return a; }
> -inline float	fmax(float a, float b) { if (a < b) return b; else return a; }
>  inline int	imin(int a, int b) { if (a < b) return a; else return b; }
> -inline float	fmin(float a, float b) { if (a < b) return a; else return b; }
>  
>  inline int	iclamp(int i, int min, int max) {
>  	assert( min <= max );
> @@ -114,14 +111,13 @@
>  const float LN_2 = 0.693147180559945f;
>  // the overridden log(f) will use logf IFF f is a float
>  #ifndef HAVE_LOG2
> -inline float	log2(float f) { return std::log(f) / LN_2; }
> +inline double	log2(double f) { return std::log(f) / LN_2; }
>  #endif
>  //exp2 might be missing on Net-/OpenBSD.
>  #ifndef HAVE_EXP2
> -inline float	exp2(double x) { return std::pow((double)2, double(x)); }
> +inline double	exp2(double x) { return std::pow((double)2, double(x)); }
>  #endif
> -inline int	fchop( float f ) { return (int) f; }	// replace w/ inline asm if desired
> -inline int	frnd(float f) { return fchop(f + 0.5f); }	// replace with inline asm if desired
> +inline int	frnd(float f) { return (int)rint(f + 0.5f); }	// replace with inline asm if desired

--strk;



From MAILER-DAEMON Tue Aug 28 22:49:23 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQDcR-0004Ij-6X
	for mharc-gnash-commit@gnu.org; Tue, 28 Aug 2007 22:49:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQDcP-0004IN-JP
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 22:49:21 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQDcN-0004IB-AO
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 22:49:20 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQDcN-0004I8-6R
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 22:49:19 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IQDcM-0002IT-Ss
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 22:49:18 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IQDcL-00012z-QT
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 02:49:17 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IQDcL-00012v-K8
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 02:49:17 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQDcL-00012v-K8@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 29 Aug 2007 02:49:17 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog libbase/utility.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Aug 2007 02:49:21 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/29 02:49:17

Modified files:
	.              : ChangeLog 
	libbase        : utility.h 

Log message:
	        * libbase/utility.h: fix the frnd() function to behave as
	          intended by original author. Fixed bug #20920.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4141&r2=1.4142
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/utility.h?cvsroot=gnash&r1=1.30&r2=1.31

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4141
retrieving revision 1.4142
diff -u -b -r1.4141 -r1.4142
--- ChangeLog	29 Aug 2007 01:08:16 -0000	1.4141
+++ ChangeLog	29 Aug 2007 02:49:17 -0000	1.4142
@@ -1,3 +1,8 @@
+2007-08-29 Sandro Santilli <strk@keybit.net>
+
+	* libbase/utility.h: fix the frnd() function to behave as
+	  intended by original author. Fixed bug #20920.
+
 2007-08-29 Markus Gothe <nietzsche@lysator.liu.se>
 
 	* libbase/component_hackery.cpp: Removed crufty file.

Index: libbase/utility.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/utility.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- libbase/utility.h	27 Aug 2007 22:47:54 -0000	1.30
+++ libbase/utility.h	29 Aug 2007 02:49:17 -0000	1.31
@@ -117,7 +117,7 @@
 #ifndef HAVE_EXP2
 inline double	exp2(double x) { return std::pow((double)2, double(x)); }
 #endif
-inline int	frnd(float f) { return (int)rint(f + 0.5f); }	// replace with inline asm if desired
+inline int	frnd(float f) { return (int)(f + 0.5f); }	// replace with inline asm if desired
 
 
 // Handy macro to quiet compiler warnings about unused parameters/variables.



From MAILER-DAEMON Tue Aug 28 23:33:09 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQEIn-0000tw-K9
	for mharc-gnash-commit@gnu.org; Tue, 28 Aug 2007 23:33:09 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQEIl-0000te-3W
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 23:33:07 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQEIi-0000tR-L5
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 23:33:05 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQEIi-0000tM-CU
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 23:33:04 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <chadmusick@msbx.net>) id 1IQEIh-00008v-JH
	for gnash-commit@gnu.org; Tue, 28 Aug 2007 23:33:04 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <chadmusick@msbx.net>) id 1IQEId-0003EU-MZ
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 03:32:59 +0000
Received: from cmusick by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <cmusick@savannah.gnu.org>) id 1IQEId-0003ER-FT
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 03:32:59 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQEId-0003ER-FT@cvs.savannah.gnu.org>
From: Chad Musick <chadmusick@msbx.net>
Date: Wed, 29 Aug 2007 03:32:59 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/BevelFilter.cpp server/B...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Aug 2007 03:33:07 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Chad Musick <cmusick>	07/08/29 03:32:59

Modified files:
	.              : ChangeLog 
	server         : BevelFilter.cpp BevelFilter.h BitmapFilter.h 
	                 BlurFilter.cpp BlurFilter.h 
	                 ColorMatrixFilter.cpp ColorMatrixFilter.h 
	                 ConvolutionFilter.cpp ConvolutionFilter.h 
	                 DropShadowFilter.cpp DropShadowFilter.h 
	                 GlowFilter.cpp GlowFilter.h 
	                 GradientBevelFilter.cpp GradientBevelFilter.h 
	                 GradientGlowFilter.cpp GradientGlowFilter.h 
	server/asobj   : BevelFilter_as.cpp BitmapFilter_as.cpp 
	                 BitmapFilter_as.h BlurFilter_as.cpp 
	                 ColorMatrixFilter_as.cpp 
	                 ConvolutionFilter_as.cpp 
	                 DropShadowFilter_as.cpp GlowFilter_as.cpp 
	                 GradientBevelFilter_as.cpp 
	                 GradientGlowFilter_as.cpp prophelper.h 
	server/parser  : filter_factory.cpp 

Log message:
	Separate as_object from filters, use multiple inheritance instead fo exposing 
	functionality to AS.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4142&r2=1.4143
http://cvs.savannah.gnu.org/viewcvs/gnash/server/BevelFilter.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/BevelFilter.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/BitmapFilter.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/BlurFilter.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/BlurFilter.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/ColorMatrixFilter.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/ColorMatrixFilter.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/ConvolutionFilter.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/ConvolutionFilter.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/DropShadowFilter.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/DropShadowFilter.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/GlowFilter.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/GlowFilter.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/GradientBevelFilter.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/GradientBevelFilter.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/GradientGlowFilter.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/GradientGlowFilter.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/BevelFilter_as.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/BitmapFilter_as.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/BitmapFilter_as.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/BlurFilter_as.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/ColorMatrixFilter_as.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/ConvolutionFilter_as.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/DropShadowFilter_as.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/GlowFilter_as.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/GradientBevelFilter_as.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/GradientGlowFilter_as.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/prophelper.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/filter_factory.cpp?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4142
retrieving revision 1.4143
diff -u -b -r1.4142 -r1.4143
--- ChangeLog	29 Aug 2007 02:49:17 -0000	1.4142
+++ ChangeLog	29 Aug 2007 03:32:57 -0000	1.4143
@@ -1,3 +1,28 @@
+2007-08-29 Chad Musick <chadmusick@msbx.net>
+
+	* server/asobj/BlurFilter_as.cpp,.h
+	* server/asobj/ColorMatrixFilter_as.cpp,.h
+	* server/asobj/ConvolutionFilter_as.cpp,.h
+	* server/asobj/DropShadowFilter_as.cpp,.h
+	* server/asobj/GlowFilter_as.cpp,.h
+	* server/asobj/GradientBevelFilter_as.cpp,.h
+	* server/asobj/GradientGlowFilter_as.cpp,.h
+	* server/asobj/BevelFilter_as.cpp,.h
+	* server/asobj/BitmapFilter_as.cpp,.h
+	  Change to use multiple inheritance for adaptation
+	* server/BevelFilter.h,.cpp
+	* server/BlurFilter.h,.cpp
+	* server/ColorMatrixFilter.h,.cpp
+	* server/ConvolutionFilter.h,.cpp
+	* server/DropShadowFilter.h,.cpp
+	* server/GlowFilter.h,.cpp
+	* server/GradientBevelFilter.h,.cpp
+	* server/GradientGlowFilter.h,.cpp
+	  Changing to use multiple inheritance for adaptation
+	* server/asobj/prophelper.h Update for using multiple inheritance
+	* server/parser/filter_factory.cpp
+	  Change to use correct type of operator for array pushes.
+
 2007-08-29 Sandro Santilli <strk@keybit.net>
 
 	* libbase/utility.h: fix the frnd() function to behave as

Index: server/BevelFilter.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/BevelFilter.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/BevelFilter.cpp	27 Aug 2007 03:06:41 -0000	1.2
+++ server/BevelFilter.cpp	29 Aug 2007 03:32:57 -0000	1.3
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: BevelFilter.cpp,v 1.2 2007/08/27 03:06:41 cmusick Exp $ */
+/* $Id: BevelFilter.cpp,v 1.3 2007/08/29 03:32:57 cmusick Exp $ */
 
 #include "BevelFilter.h"
 
@@ -24,17 +24,5 @@
 // See parser/filter_factory.cpp for the implementation. Purposefully not here.
 //bool BevelFilter::read(stream* in);
 
-Filter const
-BevelFilter::clone()
-{
-    Filter p(new BevelFilter(m_distance, m_angle, m_highlightColor,
-        m_highlightAlpha, m_shadowColor, m_shadowAlpha,
-        m_blurX, m_blurY, m_strength, m_quality, m_type, m_knockout));
-    p->set_prototype(get_prototype());
-    p->copyProperties(*this);
-
-    return p;
-}
-
 } // Namespace gnash
 

Index: server/BevelFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/BevelFilter.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/BevelFilter.h	27 Aug 2007 18:13:39 -0000	1.3
+++ server/BevelFilter.h	29 Aug 2007 03:32:57 -0000	1.4
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: BevelFilter.h,v 1.3 2007/08/27 18:13:39 cmusick Exp $ */
+/* $Id: BevelFilter.h,v 1.4 2007/08/29 03:32:57 cmusick Exp $ */
 
 #ifndef GNASH_BEVELFILTER_H
 #define GNASH_BEVELFILTER_H
@@ -28,14 +28,10 @@
 
 namespace gnash {
 
-class BevelFilter_as; // Adapter class for AS use.
-
 // A bevel effect filter.
 class BevelFilter : public BitmapFilter
 {
 public:
-    friend class BevelFilter_as;
-
     typedef enum
     {
         OUTER_BEVEL = 1,
@@ -48,17 +44,6 @@
 
     virtual ~BevelFilter() { return; }
 
-    // Clone this object and return a copy of it. (AS accessible function.)
-    // Guaranteed to return an object which can be cast to BevelFilter
-    Filter const clone();
-
-    BevelFilter(as_object* o) : BitmapFilter(o),
-        m_distance(0.0f), m_angle(0.0f), m_highlightColor(0),
-        m_highlightAlpha(0), m_shadowColor(0), m_shadowAlpha(0),
-        m_blurX(0.0f), m_blurY(0.0f),  m_strength(0.0f), m_quality(0),
-        m_type(FULL_BEVEL), m_knockout(false)
-    { return; }
-
     BevelFilter() : 
         m_distance(0.0f), m_angle(0.0f), m_highlightColor(0),
         m_highlightAlpha(0), m_shadowColor(0), m_shadowAlpha(0),
@@ -76,7 +61,7 @@
         m_quality(quality), m_type(type), m_knockout(knockout)
     { return; }
 
-private:
+protected:
     float m_distance; // Distance of the filter in pixels.
     float m_angle; // Angle of the filter.
     uint32_t m_highlightColor; // Color of the highlight.

Index: server/BitmapFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/BitmapFilter.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/BitmapFilter.h	27 Aug 2007 03:06:41 -0000	1.2
+++ server/BitmapFilter.h	29 Aug 2007 03:32:57 -0000	1.3
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: BitmapFilter.h,v 1.2 2007/08/27 03:06:41 cmusick Exp $ */
+/* $Id: BitmapFilter.h,v 1.3 2007/08/29 03:32:57 cmusick Exp $ */
 
 #ifndef GNASH_BITMAPFILTER_H
 #define GNASH_BITMAPFILTER_H
@@ -24,32 +24,23 @@
 #include "config.h"
 #endif
 
-#include "as_object.h"
+#include <boost/shared_ptr.hpp>
 
 namespace gnash {
 
 class stream;
 class BitmapFilter;
-class BitmapFilter_as; // Adapter pattern to ActionScript
-typedef boost::intrusive_ptr<BitmapFilter> Filter;
+typedef boost::shared_ptr<BitmapFilter> Filter;
 
 // The common base class for AS display filters.
-class BitmapFilter : public as_object
+class BitmapFilter
 {
 public:
-    friend class BitmapFilter_as;
-
     // Fill from a stream. See parser/filter_factory.cpp for the implementations.
     virtual bool read(stream* /*in*/) { return true; }
 
-    // Pass the interface up the chain.
-    BitmapFilter(as_object *interface) : as_object(interface) { return; }
-    // For non-ActionScript use.
     BitmapFilter() { return; }
     virtual ~BitmapFilter() { return; }
-
-    // Clone this object and return a copy of it. (AS accessible function.)
-    virtual Filter const clone() { return NULL; }
 };
 
 } // Namespace gnash

Index: server/BlurFilter.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/BlurFilter.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/BlurFilter.cpp	27 Aug 2007 18:13:39 -0000	1.2
+++ server/BlurFilter.cpp	29 Aug 2007 03:32:57 -0000	1.3
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: BlurFilter.cpp,v 1.2 2007/08/27 18:13:39 cmusick Exp $ */
+/* $Id: BlurFilter.cpp,v 1.3 2007/08/29 03:32:57 cmusick Exp $ */
 
 #include "BlurFilter.h"
 
@@ -24,15 +24,5 @@
 // See parser/filter_factory.cpp for the implementation. Purposefully not here.
 //bool BlurFilter::read(stream* in);
 
-Filter const
-BlurFilter::clone()
-{
-    Filter p(new BlurFilter(m_blurX, m_blurY, m_quality));
-    p->set_prototype(get_prototype());
-    p->copyProperties(*this);
-
-    return p;
-}
-
 } // Namespace gnash
 

Index: server/BlurFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/BlurFilter.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/BlurFilter.h	27 Aug 2007 18:13:39 -0000	1.2
+++ server/BlurFilter.h	29 Aug 2007 03:32:57 -0000	1.3
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: BlurFilter.h,v 1.2 2007/08/27 18:13:39 cmusick Exp $ */
+/* $Id: BlurFilter.h,v 1.3 2007/08/29 03:32:57 cmusick Exp $ */
 
 #ifndef GNASH_BLURFILTER_H
 #define GNASH_BLURFILTER_H
@@ -28,27 +28,15 @@
 
 namespace gnash {
 
-class BlurFilter_as; // Adapater for ActionScript
-
 // A blur effect filter.
 class BlurFilter : public BitmapFilter
 {
 public:
-    friend class BlurFilter_as;
-
     // Fill from a stream. See parser/filter_factory.cpp for the implementations.
     virtual bool read(stream* in);
 
     virtual ~BlurFilter() { return; }
 
-    // Clone this object and return a copy of it. (AS accessible function.)
-    // Guaranteed to return an object which can be cast to BlurFilter
-    Filter const clone();
-
-    BlurFilter(as_object* obj) : BitmapFilter(obj),
-        m_blurX(0.0f), m_blurY(0.0f), m_quality(0)
-    { return; }
-
     BlurFilter() : 
         m_blurX(0.0f), m_blurY(0.0f), m_quality(0)
     { return; }
@@ -57,7 +45,7 @@
         m_blurX(blurX), m_blurY(blurY), m_quality(quality)
     { return; }
 
-private:
+protected:
     float m_blurX; // How much horizontal blur.
     float m_blurY; // How much vertical blur.
     uint8_t m_quality; // How many passes to take.

Index: server/ColorMatrixFilter.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/ColorMatrixFilter.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/ColorMatrixFilter.cpp	27 Aug 2007 18:13:39 -0000	1.2
+++ server/ColorMatrixFilter.cpp	29 Aug 2007 03:32:57 -0000	1.3
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: ColorMatrixFilter.cpp,v 1.2 2007/08/27 18:13:39 cmusick Exp $ */
+/* $Id: ColorMatrixFilter.cpp,v 1.3 2007/08/29 03:32:57 cmusick Exp $ */
 
 #include "ColorMatrixFilter.h"
 
@@ -24,15 +24,5 @@
 // See parser/filter_factory.cpp for the implementation. Purposefully not here.
 //bool ConvolutionFilter::read(stream* in);
 
-Filter const
-ColorMatrixFilter::clone()
-{
-    Filter p(new ColorMatrixFilter(m_matrix));
-    p->set_prototype(get_prototype());
-    p->copyProperties(*this);
-
-    return p;
-}
-
 } // Namespace gnash
 

Index: server/ColorMatrixFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/ColorMatrixFilter.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/ColorMatrixFilter.h	27 Aug 2007 18:13:39 -0000	1.2
+++ server/ColorMatrixFilter.h	29 Aug 2007 03:32:58 -0000	1.3
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: ColorMatrixFilter.h,v 1.2 2007/08/27 18:13:39 cmusick Exp $ */
+/* $Id: ColorMatrixFilter.h,v 1.3 2007/08/29 03:32:58 cmusick Exp $ */
 
 #ifndef GNASH_COLORMATRIXFILTER_H
 #define GNASH_COLORMATRIXFILTER_H
@@ -24,42 +24,30 @@
 #include "config.h"
 #endif
 
-#include "array.h"
 #include "BitmapFilter.h"
+#include <vector>
 
 namespace gnash {
 
-class ColorMatrixFilter_as; // Adapter for ActionScript
-
 // A color matrix effect filter.
 class ColorMatrixFilter : public BitmapFilter
 {
 public:
-    friend class ColorMatrixFilter_as;
-
     // Fill from a stream. See parser/filter_factory.cpp for the implementations.
     virtual bool read(stream* in);
 
     virtual ~ColorMatrixFilter() { return; }
 
-    // Clone this object and return a copy of it. (AS accessible function.)
-    // Guaranteed to return an object which can be cast to ColorMatrixFilter
-    Filter const clone();
-
-    ColorMatrixFilter(as_object* obj) : BitmapFilter(obj),
-        m_matrix()
-    { return; }
-
     ColorMatrixFilter() : 
         m_matrix()
     { return; }
 
-    ColorMatrixFilter(boost::intrusive_ptr<as_array_object> a_matrix) :
+    ColorMatrixFilter(std::vector<float> a_matrix) :
         m_matrix(a_matrix)
     { return; }
 
-private:
-    boost::intrusive_ptr<as_array_object> m_matrix; // The color matrix
+protected:
+    std::vector<float> m_matrix; // The color matrix
 };
 
 } // Namespace gnash

Index: server/ConvolutionFilter.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/ConvolutionFilter.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/ConvolutionFilter.cpp	27 Aug 2007 18:13:39 -0000	1.2
+++ server/ConvolutionFilter.cpp	29 Aug 2007 03:32:58 -0000	1.3
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: ConvolutionFilter.cpp,v 1.2 2007/08/27 18:13:39 cmusick Exp $ */
+/* $Id: ConvolutionFilter.cpp,v 1.3 2007/08/29 03:32:58 cmusick Exp $ */
 
 #include "ConvolutionFilter.h"
 
@@ -24,16 +24,5 @@
 // See parser/filter_factory.cpp for the implementation. Purposefully not here.
 //bool ConvolutionFilter::read(stream* in);
 
-Filter const
-ConvolutionFilter::clone()
-{
-    Filter p(new ConvolutionFilter(m_matrixX, m_matrixY, m_matrix,
-        m_divisor, m_bias, m_preserveAlpha, m_clamp, m_color, m_alpha));
-    p->set_prototype(get_prototype());
-    p->copyProperties(*this);
-
-    return p;
-}
-
 } // Namespace gnash
 

Index: server/ConvolutionFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/ConvolutionFilter.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/ConvolutionFilter.h	27 Aug 2007 18:13:39 -0000	1.2
+++ server/ConvolutionFilter.h	29 Aug 2007 03:32:58 -0000	1.3
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: ConvolutionFilter.h,v 1.2 2007/08/27 18:13:39 cmusick Exp $ */
+/* $Id: ConvolutionFilter.h,v 1.3 2007/08/29 03:32:58 cmusick Exp $ */
 
 #ifndef GNASH_CONVOLUTIONFILTER_H
 #define GNASH_CONVOLUTIONFILTER_H
@@ -24,40 +24,27 @@
 #include "config.h"
 #endif
 
-#include "array.h"
 #include "BitmapFilter.h"
+#include <vector>
 
 namespace gnash {
 
-class ConvolutionFilter_as; // Adapter to ActionScript
-
 // A convolution effect filter.
 class ConvolutionFilter : public BitmapFilter
 {
 public:
-    friend class ConvolutionFilter_as;
-
     // Fill from a stream. See parser/filter_factory.cpp for the implementations.
     virtual bool read(stream* in);
 
     virtual ~ConvolutionFilter() { return; }
 
-    // Clone this object and return a copy of it. (AS accessible function.)
-    // Guaranteed to return an object which can be cast to ConvolutionFilter
-    Filter const clone();
-
-    ConvolutionFilter(as_object* obj) : BitmapFilter(obj),
-        m_matrixX(), m_matrixY(), m_matrix(), m_divisor(), m_bias(),
-        m_preserveAlpha(false), m_clamp(false), m_color(), m_alpha()
-    { return; }
-
     ConvolutionFilter() : 
         m_matrixX(), m_matrixY(), m_matrix(), m_divisor(), m_bias(),
         m_preserveAlpha(false), m_clamp(false), m_color(), m_alpha()
     { return; }
 
     ConvolutionFilter(uint8_t matrixX, uint8_t matrixY, 
-        boost::intrusive_ptr<as_array_object> a_matrix,
+        std::vector<float> a_matrix,
         float divisor, float bias, bool preserveAlpha, bool clamp, uint32_t color,
         uint8_t alpha) :
         m_matrixX(matrixX), m_matrixY(matrixY), m_matrix(a_matrix),
@@ -65,10 +52,10 @@
         m_clamp(clamp), m_color(color), m_alpha(alpha)
     { return; }
 
-private:
+protected:
     uint8_t m_matrixX; // Number of columns
     uint8_t m_matrixY; // Number of rows
-    boost::intrusive_ptr<as_array_object> m_matrix; // The convolution matrix
+    std::vector<float> m_matrix; // The convolution matrix
     float m_divisor;
     float m_bias;
     bool m_preserveAlpha; // If true, don't convolute the alpha channel

Index: server/DropShadowFilter.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/DropShadowFilter.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/DropShadowFilter.cpp	27 Aug 2007 18:13:39 -0000	1.2
+++ server/DropShadowFilter.cpp	29 Aug 2007 03:32:58 -0000	1.3
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: DropShadowFilter.cpp,v 1.2 2007/08/27 18:13:39 cmusick Exp $ */
+/* $Id: DropShadowFilter.cpp,v 1.3 2007/08/29 03:32:58 cmusick Exp $ */
 
 #include "DropShadowFilter.h"
 
@@ -24,16 +24,5 @@
 // See parser/filter_factory.cpp for the implementation. Purposefully not here.
 //bool DropShadowFilter::read(stream* in);
 
-Filter const
-DropShadowFilter::clone()
-{
-    Filter p(new DropShadowFilter(m_distance, m_angle, m_color, m_alpha,
-        m_blurX, m_blurY, m_strength, m_quality, m_inner, m_knockout,
-        m_hideObject));
-    p->set_prototype(get_prototype());
-    p->copyProperties(*this);
-    return p;
-}
-
 } // Namespace gnash
 

Index: server/DropShadowFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/DropShadowFilter.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/DropShadowFilter.h	27 Aug 2007 18:13:40 -0000	1.2
+++ server/DropShadowFilter.h	29 Aug 2007 03:32:58 -0000	1.3
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: DropShadowFilter.h,v 1.2 2007/08/27 18:13:40 cmusick Exp $ */
+/* $Id: DropShadowFilter.h,v 1.3 2007/08/29 03:32:58 cmusick Exp $ */
 
 #ifndef GNASH_DROPSHADOWFILTER_H
 #define GNASH_DROPSHADOWFILTER_H
@@ -28,29 +28,15 @@
 
 namespace gnash {
 
-class DropShadowFilter_as;
-
 // A drop shadow effect filter.
 class DropShadowFilter : public BitmapFilter
 {
 public:
-    friend class DropShadowFilter_as;
-
     // Fill from a stream. See parser/filter_factory.cpp for the implementations.
     virtual bool read(stream* in);
 
     virtual ~DropShadowFilter() { return; }
 
-    // Clone this object and return a copy of it. (AS accessible function.)
-    // Guaranteed to return an object which can be cast to BlurFilter
-    Filter const clone();
-
-    DropShadowFilter(as_object* obj) : BitmapFilter(obj),
-        m_distance(0.0f), m_angle(0.0f), m_color(0), m_alpha(0),
-        m_blurX(0.0f), m_blurY(0.0f),  m_strength(0.0f), m_quality(0),
-        m_inner(false), m_knockout(false), m_hideObject(false)
-    { return; }
-
     DropShadowFilter() : 
         m_distance(0.0f), m_angle(0.0f), m_color(0), m_alpha(0),
         m_blurX(0.0f), m_blurY(0.0f),  m_strength(0.0f), m_quality(0),
@@ -66,7 +52,7 @@
         m_hideObject(hideObject)
     { return; }
 
-private:
+protected:
     float m_distance; // Distance of the filter in pixels.
     float m_angle; // Angle of the filter.
     uint32_t m_color; // RGB color.

Index: server/GlowFilter.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/GlowFilter.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/GlowFilter.cpp	27 Aug 2007 18:13:40 -0000	1.2
+++ server/GlowFilter.cpp	29 Aug 2007 03:32:58 -0000	1.3
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: GlowFilter.cpp,v 1.2 2007/08/27 18:13:40 cmusick Exp $ */
+/* $Id: GlowFilter.cpp,v 1.3 2007/08/29 03:32:58 cmusick Exp $ */
 
 #include "GlowFilter.h"
 
@@ -24,15 +24,5 @@
 // See parser/filter_factory.cpp for the implementation. Purposefully not here.
 //bool DropShadowFilter::read(stream* in);
 
-Filter const
-GlowFilter::clone()
-{
-    Filter p(new GlowFilter(m_color, m_alpha,
-        m_blurX, m_blurY, m_strength, m_quality, m_inner, m_knockout));
-    p->set_prototype(get_prototype());
-    p->copyProperties(*this);
-    return p;
-}
-
 } // Namespace gnash
 

Index: server/GlowFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/GlowFilter.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/GlowFilter.h	27 Aug 2007 18:13:40 -0000	1.2
+++ server/GlowFilter.h	29 Aug 2007 03:32:58 -0000	1.3
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: GlowFilter.h,v 1.2 2007/08/27 18:13:40 cmusick Exp $ */
+/* $Id: GlowFilter.h,v 1.3 2007/08/29 03:32:58 cmusick Exp $ */
 
 #ifndef GNASH_GLOWFILTER_H
 #define GNASH_GLOWFILTER_H
@@ -28,29 +28,15 @@
 
 namespace gnash {
 
-class GlowFilter_as;
-
 // A glow effect filter.
 class GlowFilter : public BitmapFilter
 {
 public:
-    friend class GlowFilter_as;
-
     // Fill from a stream. See parser/filter_factory.cpp for the implementations.
     virtual bool read(stream* in);
 
     virtual ~GlowFilter() { return; }
 
-    // Clone this object and return a copy of it. (AS accessible function.)
-    // Guaranteed to return an object which can be cast to BlurFilter
-    Filter const clone();
-
-    GlowFilter(as_object* obj) : BitmapFilter(obj),
-        m_color(0), m_alpha(0),
-        m_blurX(0.0f), m_blurY(0.0f),  m_strength(0.0f), m_quality(0),
-        m_inner(false), m_knockout(false)
-    { return; }
-
     GlowFilter() : 
         m_color(0), m_alpha(0),
         m_blurX(0.0f), m_blurY(0.0f),  m_strength(0.0f), m_quality(0),
@@ -65,7 +51,7 @@
         m_quality(quality), m_inner(inner), m_knockout(knockout)
     { return; }
 
-private:
+protected:
     uint32_t m_color; // RGB color.
     uint8_t m_alpha; // Alpha strength, as a percentage(?)
     float m_blurX; // horizontal blur

Index: server/GradientBevelFilter.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/GradientBevelFilter.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/GradientBevelFilter.cpp	27 Aug 2007 18:13:40 -0000	1.2
+++ server/GradientBevelFilter.cpp	29 Aug 2007 03:32:58 -0000	1.3
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: GradientBevelFilter.cpp,v 1.2 2007/08/27 18:13:40 cmusick Exp $ */
+/* $Id: GradientBevelFilter.cpp,v 1.3 2007/08/29 03:32:58 cmusick Exp $ */
 
 #include "GradientBevelFilter.h"
 
@@ -24,15 +24,5 @@
 // See parser/filter_factory.cpp for the implementation. Purposefully not here.
 //bool GradientBevelFilter::read(stream* in);
 
-Filter const
-GradientBevelFilter::clone()
-{
-    Filter p(new GradientBevelFilter(m_distance, m_angle, m_colors, m_alphas,
-        m_ratios, m_blurX, m_blurY, m_strength, m_quality, m_type, m_knockout));
-    p->set_prototype(get_prototype());
-    p->copyProperties(*this);
-    return p;
-}
-
 } // Namespace gnash
 

Index: server/GradientBevelFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/GradientBevelFilter.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/GradientBevelFilter.h	27 Aug 2007 18:13:40 -0000	1.2
+++ server/GradientBevelFilter.h	29 Aug 2007 03:32:58 -0000	1.3
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: GradientBevelFilter.h,v 1.2 2007/08/27 18:13:40 cmusick Exp $ */
+/* $Id: GradientBevelFilter.h,v 1.3 2007/08/29 03:32:58 cmusick Exp $ */
 
 #ifndef GNASH_GRADIENTBEVELFILTER_H
 #define GNASH_GRADIENTBEVELFILTER_H
@@ -24,19 +24,16 @@
 #include "config.h"
 #endif
 
-#include "array.h"
+#include <vector>
+
 #include "BitmapFilter.h"
 
 namespace gnash {
 
-class GradientBevelFilter_as;
-
 // A gradient bevel effect filter.
 class GradientBevelFilter : public BitmapFilter
 {
 public:
-    friend class GradientBevelFilter_as;
-
     typedef enum
     {
         INNER_BEVEL = 2,
@@ -49,16 +46,6 @@
 
     virtual ~GradientBevelFilter() { return; }
 
-    // Clone this object and return a copy of it. (AS accessible function.)
-    // Guaranteed to return an object which can be cast to BlurFilter
-    Filter const clone();
-
-    GradientBevelFilter(as_object *obj) : BitmapFilter(obj),
-        m_distance(0.0f), m_angle(0.0f), m_colors(), m_alphas(), m_ratios(),
-        m_blurX(0.0f), m_blurY(0.0f),  m_strength(0.0f), m_quality(0),
-        m_type(INNER_BEVEL), m_knockout(false)
-    { return; }
-
     GradientBevelFilter() : 
         m_distance(0.0f), m_angle(0.0f), m_colors(), m_alphas(), m_ratios(),
         m_blurX(0.0f), m_blurY(0.0f),  m_strength(0.0f), m_quality(0),
@@ -66,9 +53,9 @@
     { return; }
 
     GradientBevelFilter(float distance, float angle,
-        boost::intrusive_ptr<as_array_object> colors,
-        boost::intrusive_ptr<as_array_object> alphas,
-        boost::intrusive_ptr<as_array_object> ratios,
+        std::vector<uint32_t> colors,
+        std::vector<uint8_t> alphas,
+        std::vector<uint8_t> ratios,
         float blurX, float blurY, float strength,
         uint8_t quality, glow_types type, bool knockout) :
         m_distance(distance), m_angle(angle),
@@ -77,12 +64,12 @@
         m_quality(quality), m_type(type), m_knockout(knockout)
     { return; }
 
-private:
+protected:
     float m_distance; // Distance of the filter in pixels.
     float m_angle; // Angle of the filter.
-    boost::intrusive_ptr<as_array_object> m_colors; // Colors of the gradients.
-    boost::intrusive_ptr<as_array_object> m_alphas; // Alphas of the gradients.
-    boost::intrusive_ptr<as_array_object> m_ratios; // Ratios of the gradients.
+    std::vector<uint32_t> m_colors; // Colors of the gradients.
+    std::vector<uint8_t> m_alphas; // Alphas of the gradients.
+    std::vector<uint8_t> m_ratios; // Ratios of the gradients.
     float m_blurX; // horizontal blur
     float m_blurY; // vertical blur
     float m_strength; // How strong is the filter.

Index: server/GradientGlowFilter.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/GradientGlowFilter.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/GradientGlowFilter.cpp	27 Aug 2007 18:13:40 -0000	1.2
+++ server/GradientGlowFilter.cpp	29 Aug 2007 03:32:58 -0000	1.3
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: GradientGlowFilter.cpp,v 1.2 2007/08/27 18:13:40 cmusick Exp $ */
+/* $Id: GradientGlowFilter.cpp,v 1.3 2007/08/29 03:32:58 cmusick Exp $ */
 
 #include "GradientGlowFilter.h"
 
@@ -24,15 +24,5 @@
 // See parser/filter_factory.cpp for the implementation. Purposefully not here.
 //bool GradientGlowFilter::read(stream* in);
 
-Filter const
-GradientGlowFilter::clone()
-{
-    Filter p(new GradientGlowFilter(m_distance, m_angle, m_colors, m_alphas,
-        m_ratios, m_blurX, m_blurY, m_strength, m_quality, m_type, m_knockout));
-    p->set_prototype(get_prototype());
-    p->copyProperties(*this);
-    return p;
-}
-
 } // Namespace gnash
 

Index: server/GradientGlowFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/GradientGlowFilter.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/GradientGlowFilter.h	27 Aug 2007 18:13:40 -0000	1.2
+++ server/GradientGlowFilter.h	29 Aug 2007 03:32:58 -0000	1.3
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: GradientGlowFilter.h,v 1.2 2007/08/27 18:13:40 cmusick Exp $ */
+/* $Id: GradientGlowFilter.h,v 1.3 2007/08/29 03:32:58 cmusick Exp $ */
 
 #ifndef GNASH_GRADIENTGLOWFILTER_H
 #define GNASH_GRADIENTGLOWFILTER_H
@@ -24,19 +24,16 @@
 #include "config.h"
 #endif
 
-#include "array.h"
+#include <vector>
+
 #include "BitmapFilter.h"
 
 namespace gnash {
 
-class GradientGlowFilter_as;
-
 // A gradient glow effect filter.
 class GradientGlowFilter : public BitmapFilter
 {
 public:
-    friend class GradientGlowFilter_as;
-
     typedef enum
     {
         INNER_GLOW = 2,
@@ -49,16 +46,6 @@
 
     virtual ~GradientGlowFilter() { return; }
 
-    // Clone this object and return a copy of it. (AS accessible function.)
-    // Guaranteed to return an object which can be cast to BlurFilter
-    Filter const clone();
-
-    GradientGlowFilter(as_object* obj) : BitmapFilter(obj),
-        m_distance(0.0f), m_angle(0.0f), m_colors(), m_alphas(), m_ratios(),
-        m_blurX(0.0f), m_blurY(0.0f),  m_strength(0.0f), m_quality(0),
-        m_type(INNER_GLOW), m_knockout(false)
-    { return; }
-
     GradientGlowFilter() : 
         m_distance(0.0f), m_angle(0.0f), m_colors(), m_alphas(), m_ratios(),
         m_blurX(0.0f), m_blurY(0.0f),  m_strength(0.0f), m_quality(0),
@@ -66,9 +53,9 @@
     { return; }
 
     GradientGlowFilter(float distance, float angle,
-        boost::intrusive_ptr<as_array_object> colors,
-        boost::intrusive_ptr<as_array_object> alphas,
-        boost::intrusive_ptr<as_array_object> ratios,
+        std::vector<uint32_t> colors,
+        std::vector<uint8_t> alphas,
+        std::vector<uint8_t> ratios,
         float blurX, float blurY, float strength,
         uint8_t quality, glow_types type, bool knockout) :
         m_distance(distance), m_angle(angle), m_colors(colors), m_alphas(alphas),
@@ -76,12 +63,12 @@
         m_quality(quality), m_type(type), m_knockout(knockout)
     { return; }
 
-private:
+protected:
     float m_distance; // Distance of the filter in pixels.
     float m_angle; // Angle of the filter.
-    boost::intrusive_ptr<as_array_object> m_colors; // Colors of the gradients.
-    boost::intrusive_ptr<as_array_object> m_alphas; // Alphas of the gradients.
-    boost::intrusive_ptr<as_array_object> m_ratios; // Ratios of the gradients.
+    std::vector<uint32_t> m_colors; // Colors of the gradients.
+    std::vector<uint8_t> m_alphas; // Alphas of the gradients.
+    std::vector<uint8_t> m_ratios; // Ratios of the gradients.
     float m_blurX; // horizontal blur
     float m_blurY; // vertical blur
     float m_strength; // How strong is the filter.

Index: server/asobj/BevelFilter_as.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/BevelFilter_as.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/asobj/BevelFilter_as.cpp	27 Aug 2007 18:13:40 -0000	1.2
+++ server/asobj/BevelFilter_as.cpp	29 Aug 2007 03:32:58 -0000	1.3
@@ -15,9 +15,9 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: BevelFilter_as.cpp,v 1.2 2007/08/27 18:13:40 cmusick Exp $ */
+/* $Id: BevelFilter_as.cpp,v 1.3 2007/08/29 03:32:58 cmusick Exp $ */
 
-#include "BitmapFilter_as.h"
+#include "as_object.h"
 #include "BevelFilter.h"
 #include "VM.h"
 #include "builtin_function.h"
@@ -25,12 +25,12 @@
 // These _must_ be defined for prophelpers to work correctly.
 // This is enforced by the file itself.
 #define phelp_helper BevelFilter_as
-#define phelp_class BevelFilter
 #include "prophelper.h"
+#include "BitmapFilter_as.h"
 
 namespace gnash {
 
-class BevelFilter_as
+class BevelFilter_as : public as_object, public BevelFilter
 {
     phelp_base_def;
 public:
@@ -46,12 +46,16 @@
     phelp_gs(quality);
     phelp_gs(type);
     phelp_gs(knockout);
+
+    phelp_i(bitmap_clone);
 };
 
 phelp_base_imp((bitmapFilter_interface()), BevelFilter);
 
-// Filters are purely property based.
-phelp_i_attach_empty
+// Replace BitmapFilter clone.
+phelp_i_attach_begin
+phelp_i_replace(clone, bitmap_clone);
+phelp_i_attach_end
 
 // Begin attaching properties, then attach them, then end.
 phelp_gs_attach_begin
@@ -81,10 +85,12 @@
 phelp_property(uint8_t, number<uint8_t>, quality)
 phelp_property(bool, bool, knockout)
 
+easy_clone(BevelFilter_as)
+
 as_value
 BevelFilter_as::type_gs(const fn_call& fn)
 {
-    boost::intrusive_ptr<BevelFilter> ptr = ensureType<BevelFilter>(fn.this_ptr);
+    boost::intrusive_ptr<BevelFilter_as> ptr = ensureType<BevelFilter_as>(fn.this_ptr);
 
     if (fn.nargs == 0) // getter
     {
@@ -117,7 +123,7 @@
 as_value
 BevelFilter_as::ctor(const fn_call& /*fn*/)
 {
-    boost::intrusive_ptr<as_object> obj = new BevelFilter(BevelFilter_as::Interface());
+    boost::intrusive_ptr<as_object> obj = new BevelFilter_as(BevelFilter_as::Interface());
     BevelFilter_as::attachProperties(*obj);
 
     return as_value(obj.get());

Index: server/asobj/BitmapFilter_as.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/BitmapFilter_as.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/asobj/BitmapFilter_as.cpp	27 Aug 2007 18:13:40 -0000	1.2
+++ server/asobj/BitmapFilter_as.cpp	29 Aug 2007 03:32:58 -0000	1.3
@@ -15,8 +15,9 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: BitmapFilter_as.cpp,v 1.2 2007/08/27 18:13:40 cmusick Exp $ */
+/* $Id: BitmapFilter_as.cpp,v 1.3 2007/08/29 03:32:58 cmusick Exp $ */
 
+#include "as_object.h"
 #include "BitmapFilter.h"
 #include "VM.h"
 #include "builtin_function.h"
@@ -27,11 +28,13 @@
 
 namespace gnash {
 
-class BitmapFilter_as
+class BitmapFilter_as : public as_object, public BitmapFilter
 {
     phelp_base_def;
 public:
     phelp_i(bitmap_clone);
+
+    virtual boost::intrusive_ptr<as_object> clone();
 };
 
 phelp_base_imp( , BitmapFilter);
@@ -40,20 +43,29 @@
 phelp_i_attach(clone, bitmap_clone);
 phelp_i_attach_end
 
+// Clone this object.
+boost::intrusive_ptr<as_object> BitmapFilter_as::clone()
+{
+    boost::intrusive_ptr<as_object> o = new BitmapFilter_as(BitmapFilter_as::Interface());
+    return o;
+}
+
 as_value
 BitmapFilter_as::ctor(const fn_call& /*fn*/)
 {
-    boost::intrusive_ptr<as_object> obj = new BitmapFilter(BitmapFilter_as::Interface());
-    return as_value(obj.get());
+    boost::intrusive_ptr<as_object> obj = new BitmapFilter_as(BitmapFilter_as::Interface());
+    return as_value(obj);
 }
 
 as_value BitmapFilter_as::bitmap_clone(const fn_call& fn)
 {
-    boost::intrusive_ptr<BitmapFilter> filter = ensureType<BitmapFilter> (fn.this_ptr);
-    boost::intrusive_ptr<as_object> retval = filter->clone();
-    retval->set_prototype(filter->get_prototype());
+    boost::intrusive_ptr<BitmapFilter_as> to_copy = ensureType<BitmapFilter_as> (fn.this_ptr);
+    boost::intrusive_ptr<BitmapFilter_as> filter = new BitmapFilter_as(*to_copy);
+    filter->set_prototype(filter->get_prototype());
+    filter->copyProperties(*filter);
+    boost::intrusive_ptr<as_object> r = filter;
 
-    return as_value(retval);
+    return as_value(r);
 }
 
 as_object*

Index: server/asobj/BitmapFilter_as.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/BitmapFilter_as.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/asobj/BitmapFilter_as.h	27 Aug 2007 18:13:41 -0000	1.2
+++ server/asobj/BitmapFilter_as.h	29 Aug 2007 03:32:58 -0000	1.3
@@ -38,3 +38,19 @@
 // __GNASH_ASOBJ_BITMAPFILTER_H__
 #endif
 
+#ifdef phelp_helper
+#ifndef easy_clone
+#define easy_clone(sp_name) \
+as_value \
+sp_name::bitmap_clone(const fn_call& fn) \
+{ \
+    boost::intrusive_ptr<sp_name> ptr = ensureType<sp_name>(fn.this_ptr); \
+    boost::intrusive_ptr<sp_name> obj = new sp_name(*ptr); \
+    boost::intrusive_ptr<as_object> r = obj; \
+    r->set_prototype(ptr->get_prototype()); \
+    r->copyProperties(*ptr); \
+\
+    return as_value(r); \
+}
+#endif /* easy_clone */
+#endif /* phelp_helper */

Index: server/asobj/BlurFilter_as.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/BlurFilter_as.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/asobj/BlurFilter_as.cpp	27 Aug 2007 18:13:41 -0000	1.1
+++ server/asobj/BlurFilter_as.cpp	29 Aug 2007 03:32:58 -0000	1.2
@@ -15,33 +15,37 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: BlurFilter_as.cpp,v 1.1 2007/08/27 18:13:41 cmusick Exp $ */
+/* $Id: BlurFilter_as.cpp,v 1.2 2007/08/29 03:32:58 cmusick Exp $ */
 
-#include "BitmapFilter_as.h"
+#include "as_object.h"
 #include "BlurFilter.h"
 #include "VM.h"
 #include "builtin_function.h"
 
 // These _must_ be defined.
 #define phelp_helper BlurFilter_as
-#define phelp_class BlurFilter
 #include "prophelper.h"
+#include "BitmapFilter_as.h"
 
 namespace gnash {
 
-class BlurFilter_as
+class BlurFilter_as : public as_object, public BlurFilter
 {
     phelp_base_def;
 public:
     phelp_gs(blurX);
     phelp_gs(blurY);
     phelp_gs(quality);
+
+    phelp_i(bitmap_clone);
 };
 
 phelp_base_imp((bitmapFilter_interface()), BlurFilter);
 
 // Filters are property based.
-phelp_i_attach_empty
+phelp_i_attach_begin
+phelp_i_replace(clone, bitmap_clone);
+phelp_i_attach_end
 
 phelp_gs_attach_begin
 phelp_gs_attach(blurX);
@@ -53,13 +57,15 @@
 phelp_property(float, number<float>, blurY)
 phelp_property(uint8_t, number<uint8_t>, quality)
 
+easy_clone(BlurFilter_as)
+
 as_value
 BlurFilter_as::ctor(const fn_call& /*fn*/)
 {
-    boost::intrusive_ptr<as_object> obj = new BlurFilter(BlurFilter_as::Interface());
+    boost::intrusive_ptr<as_object> obj = new BlurFilter_as(BlurFilter_as::Interface());
     BlurFilter_as::attachProperties(*obj);
 
-    return as_value(obj.get());
+    return as_value(obj);
 }
 
 } // Namespace gnash

Index: server/asobj/ColorMatrixFilter_as.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/ColorMatrixFilter_as.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/asobj/ColorMatrixFilter_as.cpp	27 Aug 2007 18:13:41 -0000	1.1
+++ server/asobj/ColorMatrixFilter_as.cpp	29 Aug 2007 03:32:58 -0000	1.2
@@ -15,41 +15,47 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: ColorMatrixFilter_as.cpp,v 1.1 2007/08/27 18:13:41 cmusick Exp $ */
+/* $Id: ColorMatrixFilter_as.cpp,v 1.2 2007/08/29 03:32:58 cmusick Exp $ */
 
-#include "BitmapFilter_as.h"
+#include "as_object.h"
 #include "ColorMatrixFilter.h"
 #include "VM.h"
 #include "builtin_function.h"
 
 #define phelp_helper ColorMatrixFilter_as
-#define phelp_class ColorMatrixFilter
 #include "prophelper.h"
+#include "BitmapFilter_as.h"
 
 namespace gnash {
 
-class ColorMatrixFilter_as
+class ColorMatrixFilter_as : public as_object, public ColorMatrixFilter
 {
     phelp_base_def;
 public:
     phelp_gs(matrix);
+
+    phelp_i(bitmap_clone);
 };
 
 phelp_base_imp((bitmapFilter_interface()), ColorMatrixFilter);
 
 // Filters are purely property based.
-phelp_i_attach_empty
+phelp_i_attach_begin
+phelp_i_replace(clone, bitmap_clone);
+phelp_i_attach_end
 
 phelp_gs_attach_begin
 phelp_gs_attach(matrix);
 phelp_gs_attach_end
 
-phelp_array_property(matrix);
+phelp_array_property(matrix)
+
+easy_clone(ColorMatrixFilter_as)
 
 as_value
 ColorMatrixFilter_as::ctor(const fn_call& /*fn*/)
 {
-    boost::intrusive_ptr<as_object> obj = new ColorMatrixFilter(ColorMatrixFilter_as::Interface());
+    boost::intrusive_ptr<as_object> obj = new ColorMatrixFilter_as(ColorMatrixFilter_as::Interface());
     ColorMatrixFilter_as::attachProperties(*obj);
 
     return as_value(obj.get());

Index: server/asobj/ConvolutionFilter_as.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/ConvolutionFilter_as.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/asobj/ConvolutionFilter_as.cpp	27 Aug 2007 18:13:41 -0000	1.1
+++ server/asobj/ConvolutionFilter_as.cpp	29 Aug 2007 03:32:58 -0000	1.2
@@ -15,9 +15,9 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: ConvolutionFilter_as.cpp,v 1.1 2007/08/27 18:13:41 cmusick Exp $ */
+/* $Id: ConvolutionFilter_as.cpp,v 1.2 2007/08/29 03:32:58 cmusick Exp $ */
 
-#include "BitmapFilter_as.h"
+#include "as_object.h"
 #include "ConvolutionFilter.h"
 #include "VM.h"
 #include "builtin_function.h"
@@ -25,10 +25,11 @@
 #define phelp_helper ConvolutionFilter_as
 #define phelp_class ConvolutionFilter
 #include "prophelper.h"
+#include "BitmapFilter_as.h"
 
 namespace gnash {
 
-class ConvolutionFilter_as
+class ConvolutionFilter_as : public as_object, public ConvolutionFilter
 {
     phelp_base_def;
 public:
@@ -41,11 +42,15 @@
     phelp_gs(clamp);
     phelp_gs(color);
     phelp_gs(alpha);
+
+    phelp_i(bitmap_clone);
 };
 
 phelp_base_imp((bitmapFilter_interface()), ConvolutionFilter);
 
-phelp_i_attach_empty
+phelp_i_attach_begin
+phelp_i_replace(clone, bitmap_clone);
+phelp_i_attach_end
 
 phelp_gs_attach_begin
 phelp_gs_attach(matrixX);
@@ -69,10 +74,12 @@
 phelp_property(uint8_t, number<uint8_t>, alpha)
 phelp_array_property(matrix)
 
+easy_clone(ConvolutionFilter_as)
+
 as_value
 ConvolutionFilter_as::ctor(const fn_call& /*fn*/)
 {
-    boost::intrusive_ptr<as_object> obj = new ConvolutionFilter(ConvolutionFilter_as::Interface());
+    boost::intrusive_ptr<as_object> obj = new ConvolutionFilter_as(ConvolutionFilter_as::Interface());
     ConvolutionFilter_as::attachProperties(*obj);
 
     return as_value(obj.get());

Index: server/asobj/DropShadowFilter_as.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/DropShadowFilter_as.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/asobj/DropShadowFilter_as.cpp	27 Aug 2007 18:13:42 -0000	1.1
+++ server/asobj/DropShadowFilter_as.cpp	29 Aug 2007 03:32:58 -0000	1.2
@@ -15,9 +15,9 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: DropShadowFilter_as.cpp,v 1.1 2007/08/27 18:13:42 cmusick Exp $ */
+/* $Id: DropShadowFilter_as.cpp,v 1.2 2007/08/29 03:32:58 cmusick Exp $ */
 
-#include "BitmapFilter_as.h"
+#include "as_object.h"
 #include "DropShadowFilter.h"
 #include "VM.h"
 #include "builtin_function.h"
@@ -26,10 +26,11 @@
 #define phelp_helper DropShadowFilter_as
 #define phelp_class DropShadowFilter
 #include "prophelper.h"
+#include "BitmapFilter_as.h"
 
 namespace gnash {
 
-class DropShadowFilter_as
+class DropShadowFilter_as : public as_object, public DropShadowFilter
 {
     phelp_base_def;
 public:
@@ -44,12 +45,16 @@
     phelp_gs(inner); 
     phelp_gs(knockout);
     phelp_gs(hideObject);
+
+    phelp_i(bitmap_clone);
 };
 
 phelp_base_imp((bitmapFilter_interface()), DropShadowFilter);
 
 // Filters are property based.
-phelp_i_attach_empty
+phelp_i_attach_begin
+phelp_i_replace(clone, bitmap_clone);
+phelp_i_attach_end
 
 phelp_gs_attach_begin
 phelp_gs_attach(distance);
@@ -77,10 +82,12 @@
 phelp_property(bool, bool, knockout)
 phelp_property(bool, bool, hideObject)
 
+easy_clone(DropShadowFilter_as)
+
 as_value
 DropShadowFilter_as::ctor(const fn_call& /*fn*/)
 {
-    boost::intrusive_ptr<as_object> obj = new DropShadowFilter(DropShadowFilter_as::Interface());
+    boost::intrusive_ptr<as_object> obj = new DropShadowFilter_as(DropShadowFilter_as::Interface());
     DropShadowFilter_as::attachProperties(*obj);
 
     return as_value(obj.get());

Index: server/asobj/GlowFilter_as.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/GlowFilter_as.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/asobj/GlowFilter_as.cpp	27 Aug 2007 18:13:42 -0000	1.1
+++ server/asobj/GlowFilter_as.cpp	29 Aug 2007 03:32:58 -0000	1.2
@@ -15,9 +15,9 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: GlowFilter_as.cpp,v 1.1 2007/08/27 18:13:42 cmusick Exp $ */
+/* $Id: GlowFilter_as.cpp,v 1.2 2007/08/29 03:32:58 cmusick Exp $ */
 
-#include "BitmapFilter_as.h"
+#include "as_object.h"
 #include "GlowFilter.h"
 #include "VM.h"
 #include "builtin_function.h"
@@ -26,10 +26,11 @@
 #define phelp_helper GlowFilter_as
 #define phelp_class GlowFilter
 #include "prophelper.h"
+#include "BitmapFilter_as.h"
 
 namespace gnash {
 
-class GlowFilter_as
+class GlowFilter_as : public as_object, public GlowFilter
 {
     phelp_base_def;
 public:
@@ -41,12 +42,16 @@
     phelp_gs(quality);
     phelp_gs(inner); 
     phelp_gs(knockout);
+
+    phelp_i(bitmap_clone);
 };
 
 phelp_base_imp((bitmapFilter_interface()), GlowFilter);
 
 // Filters are property based.
-phelp_i_attach_empty
+phelp_i_attach_begin
+phelp_i_replace(clone, bitmap_clone);
+phelp_i_attach_end
 
 phelp_gs_attach_begin
 phelp_gs_attach(color);
@@ -68,10 +73,12 @@
 phelp_property(bool, bool, inner)
 phelp_property(bool, bool, knockout)
 
+easy_clone(GlowFilter_as)
+
 as_value
 GlowFilter_as::ctor(const fn_call& /*fn*/)
 {
-    boost::intrusive_ptr<as_object> obj = new GlowFilter(GlowFilter_as::Interface());
+    boost::intrusive_ptr<as_object> obj = new GlowFilter_as(GlowFilter_as::Interface());
     GlowFilter_as::attachProperties(*obj);
 
     return as_value(obj.get());

Index: server/asobj/GradientBevelFilter_as.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/GradientBevelFilter_as.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/asobj/GradientBevelFilter_as.cpp	27 Aug 2007 18:13:43 -0000	1.1
+++ server/asobj/GradientBevelFilter_as.cpp	29 Aug 2007 03:32:58 -0000	1.2
@@ -15,9 +15,9 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: GradientBevelFilter_as.cpp,v 1.1 2007/08/27 18:13:43 cmusick Exp $ */
+/* $Id: GradientBevelFilter_as.cpp,v 1.2 2007/08/29 03:32:58 cmusick Exp $ */
 
-#include "BitmapFilter_as.h"
+#include "as_object.h"
 #include "GradientBevelFilter.h"
 #include "VM.h"
 #include "builtin_function.h"
@@ -27,10 +27,11 @@
 #define phelp_helper GradientBevelFilter_as
 #define phelp_class GradientBevelFilter
 #include "prophelper.h"
+#include "BitmapFilter_as.h"
 
 namespace gnash {
 
-class GradientBevelFilter_as
+class GradientBevelFilter_as : public as_object, public GradientBevelFilter
 {
     phelp_base_def;
 public:
@@ -45,12 +46,16 @@
     phelp_gs(quality);
     phelp_gs(type); // No automation
     phelp_gs(knockout);
+
+    phelp_i(bitmap_clone);
 };
 
 phelp_base_imp((bitmapFilter_interface()), GradientBevelFilter);
 
 // Filters are purely property based.
-phelp_i_attach_empty
+phelp_i_attach_begin
+phelp_i_replace(clone, bitmap_clone);
+phelp_i_attach_end
 
 // Begin attaching properties, then attach them, then end.
 phelp_gs_attach_begin
@@ -79,10 +84,12 @@
 // Type is not automatable.
 phelp_property(bool, bool, knockout)
 
+easy_clone(GradientBevelFilter_as)
+
 as_value
 GradientBevelFilter_as::type_gs(const fn_call& fn)
 {
-    boost::intrusive_ptr<GradientBevelFilter> ptr = ensureType<GradientBevelFilter>(fn.this_ptr);
+    boost::intrusive_ptr<GradientBevelFilter_as> ptr = ensureType<GradientBevelFilter_as>(fn.this_ptr);
 
     if (fn.nargs == 0) // getter
     {
@@ -115,7 +122,7 @@
 as_value
 GradientBevelFilter_as::ctor(const fn_call& /*fn*/)
 {
-    boost::intrusive_ptr<as_object> obj = new GradientBevelFilter(GradientBevelFilter_as::Interface());
+    boost::intrusive_ptr<as_object> obj = new GradientBevelFilter_as(GradientBevelFilter_as::Interface());
     GradientBevelFilter_as::attachProperties(*obj);
 
     return as_value(obj.get());

Index: server/asobj/GradientGlowFilter_as.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/GradientGlowFilter_as.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/asobj/GradientGlowFilter_as.cpp	27 Aug 2007 18:13:43 -0000	1.1
+++ server/asobj/GradientGlowFilter_as.cpp	29 Aug 2007 03:32:58 -0000	1.2
@@ -15,9 +15,9 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: GradientGlowFilter_as.cpp,v 1.1 2007/08/27 18:13:43 cmusick Exp $ */
+/* $Id: GradientGlowFilter_as.cpp,v 1.2 2007/08/29 03:32:58 cmusick Exp $ */
 
-#include "BitmapFilter_as.h"
+#include "as_object.h"
 #include "GradientGlowFilter.h"
 #include "VM.h"
 #include "builtin_function.h"
@@ -27,10 +27,11 @@
 #define phelp_helper GradientGlowFilter_as
 #define phelp_class GradientGlowFilter
 #include "prophelper.h"
+#include "BitmapFilter_as.h"
 
 namespace gnash {
 
-class GradientGlowFilter_as
+class GradientGlowFilter_as : public as_object, public GradientGlowFilter
 {
     phelp_base_def;
 public:
@@ -45,12 +46,16 @@
     phelp_gs(quality);
     phelp_gs(type); // No automation
     phelp_gs(knockout);
+
+    phelp_i(bitmap_clone);
 };
 
 phelp_base_imp((bitmapFilter_interface()), GradientGlowFilter);
 
 // Filters are purely property based.
-phelp_i_attach_empty
+phelp_i_attach_begin
+phelp_i_replace(clone, bitmap_clone);
+phelp_i_attach_end
 
 // Begin attaching properties, then attach them, then end.
 phelp_gs_attach_begin
@@ -79,10 +84,12 @@
 // Type is not automatable.
 phelp_property(bool, bool, knockout)
 
+easy_clone(GradientGlowFilter_as)
+
 as_value
 GradientGlowFilter_as::type_gs(const fn_call& fn)
 {
-    boost::intrusive_ptr<GradientGlowFilter> ptr = ensureType<GradientGlowFilter>(fn.this_ptr);
+    boost::intrusive_ptr<GradientGlowFilter_as> ptr = ensureType<GradientGlowFilter_as>(fn.this_ptr);
 
     if (fn.nargs == 0) // getter
     {
@@ -115,7 +122,7 @@
 as_value
 GradientGlowFilter_as::ctor(const fn_call& /*fn*/)
 {
-    boost::intrusive_ptr<as_object> obj = new GradientGlowFilter(GradientGlowFilter_as::Interface());
+    boost::intrusive_ptr<as_object> obj = new GradientGlowFilter_as(GradientGlowFilter_as::Interface());
     GradientGlowFilter_as::attachProperties(*obj);
 
     return as_value(obj.get());

Index: server/asobj/prophelper.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/prophelper.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/asobj/prophelper.h	27 Aug 2007 18:13:43 -0000	1.1
+++ server/asobj/prophelper.h	29 Aug 2007 03:32:58 -0000	1.2
@@ -30,7 +30,6 @@
 //
 #ifdef phelp_done
 #undef phelp_helper
-#undef phelp_class
 #undef phelp_property
 #undef phelp_array_property
 #undef phelp_base_def
@@ -47,13 +46,12 @@
 #undef phelp_i_attach_empty
 #else /* phelp_done */
 #ifdef phelp_helper
-#ifdef phelp_class
 
 #define phelp_property(sp_type, sp_convert, sp_name) \
 as_value \
 phelp_helper::sp_name##_gs(const fn_call& fn) \
 { \
-    boost::intrusive_ptr<phelp_class> ptr = ensureType<phelp_class>(fn.this_ptr); \
+    boost::intrusive_ptr<phelp_helper> ptr = ensureType<phelp_helper>(fn.this_ptr); \
 \
     if (fn.nargs == 0) /* getter */ \
     { \
@@ -70,7 +68,11 @@
 as_value \
 phelp_helper::sp_name##_gs(const fn_call& fn) \
 { \
-    boost::intrusive_ptr<phelp_class> ptr = ensureType<phelp_class>(fn.this_ptr); \
+    boost::intrusive_ptr<phelp_helper> ptr = ensureType<phelp_helper>(fn.this_ptr); \
+    return as_value(); \
+}
+#if 0
+    boost::intrusive_ptr<phelp_helper> ptr = ensureType<phelp_helper>(fn.this_ptr); \
 \
     if (fn.nargs == 0) /* getter */ \
     { \
@@ -84,9 +86,11 @@
 \
     return as_value(); \
 }
+#endif /* 0 */
 
 #define phelp_base_def \
 public: \
+    phelp_helper(as_object *obj) : as_object(obj) { return; } \
     static as_object* Interface(); \
     static void attachInterface(as_object& o); \
     static void attachProperties(as_object& o); \
@@ -181,9 +185,9 @@
 #define phelp_i_attach(sp_name, sp_code_name) \
     o.init_member(#sp_name , new builtin_function(sp_code_name))
 
-#else /* phelp_class */
-#error phelp_class must be defined.
-#endif /* phelp_class */
+#define phelp_i_replace(sp_name, sp_code_name) \
+    o.set_member(#sp_name , new builtin_function(sp_code_name))
+
 #else /* phelp_helper */
 #error phelp_helper must be defined.
 #endif /* phelp_helper */

Index: server/parser/filter_factory.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/filter_factory.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/parser/filter_factory.cpp	27 Aug 2007 18:13:43 -0000	1.4
+++ server/parser/filter_factory.cpp	29 Aug 2007 03:32:59 -0000	1.5
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: filter_factory.cpp,v 1.4 2007/08/27 18:13:43 cmusick Exp $ */
+/* $Id: filter_factory.cpp,v 1.5 2007/08/29 03:32:59 cmusick Exp $ */
 
 #include "filter_factory.h"
 #include "BitmapFilter.h"
@@ -198,15 +198,18 @@
 {
     uint8_t count = in->read_u8(); // How many colorings.
 
+    m_colors.reserve(count);
+    m_alphas.reserve(count);
+    m_ratios.reserve(count);
     for (int i = 0; i < count; ++i)
     {
-        m_colors->push(as_value(in->read_u8() << 16 + in->read_u8() << 8 + in->read_u8()));
-        m_alphas->push(as_value(in->read_u8()));
+        m_colors.push_back(in->read_u8() << 16 + in->read_u8() << 8 + in->read_u8());
+        m_alphas.push_back(in->read_u8());
     }
 
     for (int i = 0; i < count; ++i)
     {
-        m_ratios->push(as_value(in->read_u8()));
+        m_ratios.push_back(in->read_u8());
     }
 
     m_blurX = in->read_fixed();
@@ -237,14 +240,10 @@
     m_divisor = in->read_float();
     m_bias = in->read_float();
 
-    if (m_matrix == NULL)
-    {
-        m_matrix = new as_array_object;
-    }
-
+    m_matrix.reserve(m_matrixX * m_matrixY);
     for (int i = 0; i < m_matrixX * m_matrixY; ++i)
     {
-        m_matrix->push(as_value(in->read_float()));
+        m_matrix.push_back(in->read_float());
     }
 
     m_color = in->read_u8() << 16 + in->read_u8() << 8 + in->read_u8();
@@ -260,12 +259,10 @@
 
 bool ColorMatrixFilter::read(stream* in)
 {
-    if (m_matrix == NULL)
-        m_matrix = new as_array_object;
-
+    m_matrix.reserve(20);
     for (int i = 0; i < 20; ++i)
     {
-        m_matrix->push(in->read_float());
+        m_matrix.push_back(in->read_float());
     }
 
     return true;
@@ -275,15 +272,18 @@
 {
     uint8_t count = in->read_u8(); // How many colorings.
 
+    m_colors.reserve(count);
+    m_alphas.reserve(count);
+    m_ratios.reserve(count);
     for (int i = 0; i < count; ++i)
     {
-        m_colors->push(as_value(in->read_u8() << 16 + in->read_u8() << 8 + in->read_u8()));
-        m_alphas->push(as_value(in->read_u8()));
+        m_colors.push_back(in->read_u8() << 16 + in->read_u8() << 8 + in->read_u8());
+        m_alphas.push_back(in->read_u8());
     }
 
     for (int i = 0; i < count; ++i)
     {
-        m_ratios->push(as_value(in->read_u8()));
+        m_ratios.push_back(in->read_u8());
     }
 
     m_blurX = in->read_fixed();



From MAILER-DAEMON Wed Aug 29 00:30:42 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQFCT-0002Ss-Vz
	for mharc-gnash-commit@gnu.org; Wed, 29 Aug 2007 00:30:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQFCS-0002Sa-OO
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 00:30:40 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQFCR-0002RR-Qu
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 00:30:40 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQFCR-0002RG-MA
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 00:30:39 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1IQFCR-00010G-Ci
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 00:30:39 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <markus@unixrus.se>) id 1IQFCQ-0000Vy-3L
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 04:30:38 +0000
Received: from nihilus by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <nihilus@savannah.gnu.org>) id 1IQFCP-0000Vv-TG
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 04:30:37 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQFCP-0000Vv-TG@cvs.savannah.gnu.org>
From: Markus Gothe <markus@unixrus.se>
Date: Wed, 29 Aug 2007 04:30:37 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog backend/render_handler_agg.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Aug 2007 04:30:40 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Markus Gothe <nihilus>	07/08/29 04:30:37

Modified files:
	.              : ChangeLog 
	backend        : render_handler_agg.cpp 

Log message:
	Made trunc() uniform with the one in Date.cpp.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4143&r2=1.4144
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.cpp?cvsroot=gnash&r1=1.101&r2=1.102

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4143
retrieving revision 1.4144
diff -u -b -r1.4143 -r1.4144
--- ChangeLog	29 Aug 2007 03:32:57 -0000	1.4143
+++ ChangeLog	29 Aug 2007 04:30:37 -0000	1.4144
@@ -31,6 +31,8 @@
 2007-08-29 Markus Gothe <nietzsche@lysator.liu.se>
 
 	* libbase/component_hackery.cpp: Removed crufty file.
+	* backend/render_handler_agg.cpp: Made trunc() uniform with the
+	  one in Date.cpp.
 
 2007-08-29 Sandro Santilli <strk@keybit.net>
 

Index: backend/render_handler_agg.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_agg.cpp,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -b -r1.101 -r1.102
--- backend/render_handler_agg.cpp	23 Aug 2007 15:27:59 -0000	1.101
+++ backend/render_handler_agg.cpp	29 Aug 2007 04:30:37 -0000	1.102
@@ -17,7 +17,7 @@
 
  
 
-/* $Id: render_handler_agg.cpp,v 1.101 2007/08/23 15:27:59 udog Exp $ */
+/* $Id: render_handler_agg.cpp,v 1.102 2007/08/29 04:30:37 nihilus Exp $ */
 
 // Original version by Udo Giacomozzi and Hannes Mayr, 
 // INDUNET GmbH (www.indunet.it)
@@ -175,7 +175,7 @@
 #include "render_handler_agg_style.h"
 
 #ifndef trunc
-#define trunc(x) ( x < 0 ?  -floor(-x) : floor(x) )
+#define trunc(x) ( x < 0 ?  -(std::floor(-x)) : std::floor(x) )
 #endif
 
 #ifndef round



From MAILER-DAEMON Wed Aug 29 03:41:41 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQIBI-0001zj-V8
	for mharc-gnash-commit@gnu.org; Wed, 29 Aug 2007 03:41:40 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQIBH-0001ze-Dw
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 03:41:39 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQIBG-0001zS-Qh
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 03:41:39 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQIBG-0001zP-O5
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 03:41:38 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IQIBG-0006EI-Cg
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 03:41:38 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IQIBF-0002Tk-No
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 07:41:37 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IQIBF-0002Te-K5
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 07:41:37 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQIBF-0002Te-K5@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Wed, 29 Aug 2007 07:41:37 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-swfc.all/Makefil...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Aug 2007 07:41:39 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/29 07:41:37

Modified files:
	.              : ChangeLog 
	testsuite/misc-swfc.all: Makefile.am 
Added files:
	testsuite/misc-swfc.all: soft_reference_test1.sc 

Log message:
	* testsuite/misc-swfc.all/soft_reference_test1.sc: new focused testcase about soft reference, still got an xcheck.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4144&r2=1.4145
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/Makefile.am?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/soft_reference_test1.sc?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4144
retrieving revision 1.4145
diff -u -b -r1.4144 -r1.4145
--- ChangeLog	29 Aug 2007 04:30:37 -0000	1.4144
+++ ChangeLog	29 Aug 2007 07:41:36 -0000	1.4145
@@ -1,3 +1,9 @@
+2007-08-29 Zou Lunkai <zoulunkai@gmail.com>
+	
+	* testsuite/misc-swfc.all/soft_reference_test1.sc: new focused
+	  testcase about soft reference, still got an xcheck.
+	* testsuite/misc-swfc.all/Makefile.am: enable testcase.
+	  
 2007-08-29 Chad Musick <chadmusick@msbx.net>
 
 	* server/asobj/BlurFilter_as.cpp,.h

Index: testsuite/misc-swfc.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- testsuite/misc-swfc.all/Makefile.am	20 Aug 2007 23:36:16 -0000	1.4
+++ testsuite/misc-swfc.all/Makefile.am	29 Aug 2007 07:41:37 -0000	1.5
@@ -22,6 +22,7 @@
 SCTESTS = \
 	hello.sc \
 	sound.sc \
+	soft_reference_test1.sc \
 	$(NULL)
 
 # These will get compiled to SWFs just as above, but will not be executed as a test

Index: testsuite/misc-swfc.all/soft_reference_test1.sc
===================================================================
RCS file: testsuite/misc-swfc.all/soft_reference_test1.sc
diff -N testsuite/misc-swfc.all/soft_reference_test1.sc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-swfc.all/soft_reference_test1.sc	29 Aug 2007 07:41:37 -0000	1.1
@@ -0,0 +1,77 @@
+/*
+ *   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */ 
+
+/*
+ * Zou Lunkai, zoulunkai@gmail.com
+ * 
+ * Tests about soft reference to sprites.
+ *
+ * Description:
+ *  frame1: create an movieclip and rename it;
+ *  frame2: remove the movieclip;
+ *  frame3: re-create an movieclip with the original name.
+ */
+
+
+.flash  bbox=200x200 filename="soft_reference_test1.swf" version=6 fps=12
+
+.frame 1
+  .action:
+  #include "Dejagnu.sc"
+
+    //create a movieclip
+    mcRef = this.createEmptyMovieClip("mc", 10);
+    check(typeof(mc)=='movieclip');  
+    check(typeof(mcRef)=='movieclip'); 
+    check(mc == _level0.mc);    
+    check(mcRef == _level0.mc); 
+  
+    //change the "_name" property
+    mc._name = 'changed';
+  .end
+
+.frame 3
+  .action:
+    check(typeof(mc)=='undefined');   
+    check(typeof(mcRef)=='movieclip');
+    check(mc == undefined);           
+    check(mcRef == _level0.changed); 
+     
+    // remove the created moiveclip in frame1
+    changed.removeMovieClip();
+  .end
+
+.frame 5
+  .action:
+    check(typeof(mc) == 'undefined');    
+    check(typeof(mcRef) == 'movieclip'); 
+    check(mc == undefined);  
+    check(mcRef.valueOf() == null); 
+    
+    //re-create a movieclip again, mcRef connects to the newly created movieclip
+    this.createEmptyMovieClip("mc", 20);
+    check(typeof(mc)=='movieclip');  
+    check(typeof(mcRef)=='movieclip'); 
+    check(mc == _level0.mc);    
+    xcheck(mcRef == _level0.mc);
+    totals();
+    stop();
+  .end
+  
+.end
+



From MAILER-DAEMON Wed Aug 29 03:52:46 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQIM2-0006OY-Sd
	for mharc-gnash-commit@gnu.org; Wed, 29 Aug 2007 03:52:46 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQIM1-0006OT-EJ
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 03:52:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQIM0-0006OG-9G
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 03:52:44 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQIM0-0006OD-3x
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 03:52:44 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IQILz-00009A-PA
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 03:52:43 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IQILy-0003zq-FU
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 07:52:42 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IQILy-0003zn-BF
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 07:52:42 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQILy-0003zn-BF@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Wed, 29 Aug 2007 07:52:42 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/testsuite/misc-swfc.all soft_reference_te...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Aug 2007 07:52:45 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/29 07:52:42

Modified files:
	testsuite/misc-swfc.all: soft_reference_test1.sc 

Log message:
	minor comments update.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/soft_reference_test1.sc?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: soft_reference_test1.sc
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/soft_reference_test1.sc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- soft_reference_test1.sc	29 Aug 2007 07:41:37 -0000	1.1
+++ soft_reference_test1.sc	29 Aug 2007 07:52:42 -0000	1.2
@@ -23,8 +23,8 @@
  *
  * Description:
  *  frame1: create an movieclip and rename it;
- *  frame2: remove the movieclip;
- *  frame3: re-create an movieclip with the original name.
+ *  frame3: remove the movieclip;
+ *  frame5: re-create an movieclip with the original name.
  */
 
 



From MAILER-DAEMON Wed Aug 29 04:55:50 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQJL4-00026X-NR
	for mharc-gnash-commit@gnu.org; Wed, 29 Aug 2007 04:55:50 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQJL1-00023D-VX
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 04:55:48 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQJL0-00021b-5k
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 04:55:47 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQJKz-00021K-Tn
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 04:55:45 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1IQJKz-0003qd-5r
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 04:55:45 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l7T8tC418581;
	Wed, 29 Aug 2007 10:55:12 +0200 (CEST)
	(envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Wed, 29 Aug 2007 10:55:12 +0200
To: Markus Gothe <markus@unixrus.se>
Subject: Re: [Gnash-commit] gnash ChangeLog backend/render_handler_agg.cpp
Message-ID: <20070829085512.GA18202@keybit.net>
Mail-Followup-To: Markus Gothe <markus@unixrus.se>, gnash-commit@gnu.org
References: <E1IQFCP-0000Vv-TG@cvs.savannah.gnu.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1IQFCP-0000Vv-TG@cvs.savannah.gnu.org>
X-Detected-Kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Aug 2007 08:55:48 -0000

On Wed, Aug 29, 2007 at 04:30:37AM +0000, Markus Gothe wrote:
> CVSROOT:	/sources/gnash
> Module name:	gnash
> Changes by:	Markus Gothe <nihilus>	07/08/29 04:30:37
> 
> Modified files:
> 	.              : ChangeLog 
> 	backend        : render_handler_agg.cpp 
> 
> Log message:
> 	Made trunc() uniform with the one in Date.cpp.

What about moving the definition in utility.h since you're at it ?
--strk;



From MAILER-DAEMON Wed Aug 29 05:38:12 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQK03-0004dH-U1
	for mharc-gnash-commit@gnu.org; Wed, 29 Aug 2007 05:38:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQK01-0004a5-He
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 05:38:09 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQJzz-0004Xf-L7
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 05:38:07 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQJzz-0004XP-HS
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 05:38:07 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IQJzz-0004KM-7o
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 05:38:07 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IQJzy-0002Wj-M9
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 09:38:06 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IQJzy-0002Wg-HO
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 09:38:06 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQJzy-0002Wg-HO@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Wed, 29 Aug 2007 09:38:06 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/testsuite/misc-swfc.all soft_reference_te...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Aug 2007 09:38:10 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/29 09:38:06

Modified files:
	testsuite/misc-swfc.all: soft_reference_test1.sc 

Log message:
	more tests

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/soft_reference_test1.sc?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: soft_reference_test1.sc
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/soft_reference_test1.sc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- soft_reference_test1.sc	29 Aug 2007 07:52:42 -0000	1.2
+++ soft_reference_test1.sc	29 Aug 2007 09:38:06 -0000	1.3
@@ -69,6 +69,27 @@
     check(typeof(mcRef)=='movieclip'); 
     check(mc == _level0.mc);    
     xcheck(mcRef == _level0.mc);
+  .end
+
+.frame 7
+  .action:
+    // change the instance name again
+    mc._name = "changed_again";
+    
+    check(typeof(changed_again)=='movieclip'); 
+    
+    check(mc == undefined); 
+    check(typeof(mcRef)=='movieclip'); 
+    check(mcRef.valueOf() == null);
+    
+    // change the instance name back
+    mc._name = "mc";
+    check(typeof(mc)=='undefined'); 
+    check(mc == undefined); 
+
+    check(typeof(mcRef)=='movieclip'); 
+    check(mcRef.valueOf() == null); 
+    
     totals();
     stop();
   .end



From MAILER-DAEMON Wed Aug 29 05:45:28 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQK76-0004kY-0E
	for mharc-gnash-commit@gnu.org; Wed, 29 Aug 2007 05:45:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQK73-0004iz-5C
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 05:45:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQK72-0004iT-Bh
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 05:45:24 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQK72-0004iJ-3x
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 05:45:24 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IQK71-0005tB-PN
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 05:45:23 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IQK71-0003Uf-2O
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 09:45:23 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IQK70-0003UX-OG
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 09:45:22 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQK70-0003UX-OG@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Wed, 29 Aug 2007 09:45:22 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/testsuite/misc-swfc.all soft_reference_te...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Aug 2007 09:45:25 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/29 09:45:22

Modified files:
	testsuite/misc-swfc.all: soft_reference_test1.sc 

Log message:
	one more check

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/soft_reference_test1.sc?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: soft_reference_test1.sc
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/soft_reference_test1.sc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- soft_reference_test1.sc	29 Aug 2007 09:38:06 -0000	1.3
+++ soft_reference_test1.sc	29 Aug 2007 09:45:22 -0000	1.4
@@ -77,6 +77,7 @@
     mc._name = "changed_again";
     
     check(typeof(changed_again)=='movieclip'); 
+    check(mcRef != _level0.changed_again);
     
     check(mc == undefined); 
     check(typeof(mcRef)=='movieclip'); 



From MAILER-DAEMON Wed Aug 29 06:43:53 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQL1d-0004nb-52
	for mharc-gnash-commit@gnu.org; Wed, 29 Aug 2007 06:43:53 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQL1c-0004li-8z
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 06:43:52 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQL1b-0004jW-Bo
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 06:43:51 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQL1b-0004jC-7n
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 06:43:51 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IQL1a-0001Xh-Rm
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 06:43:50 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IQL1a-0007ED-8P
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 10:43:50 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IQL1a-0007E9-2X
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 10:43:50 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQL1a-0007E9-2X@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Wed, 29 Aug 2007 10:43:50 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/testsuite/misc-swfc.all soft_reference_te...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Aug 2007 10:43:52 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/29 10:43:50

Modified files:
	testsuite/misc-swfc.all: soft_reference_test1.sc 

Log message:
	more tests, need review later, seems lots of confict testing results.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/soft_reference_test1.sc?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: soft_reference_test1.sc
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/soft_reference_test1.sc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- soft_reference_test1.sc	29 Aug 2007 09:45:22 -0000	1.4
+++ soft_reference_test1.sc	29 Aug 2007 10:43:49 -0000	1.5
@@ -28,7 +28,7 @@
  */
 
 
-.flash  bbox=200x200 filename="soft_reference_test1.swf" version=6 fps=12
+.flash  bbox=800x600 filename="soft_reference_test1.swf" background=white version=6 fps=12
 
 .frame 1
   .action:
@@ -91,7 +91,65 @@
     check(typeof(mcRef)=='movieclip'); 
     check(mcRef.valueOf() == null); 
     
-    totals();
+    // Release resources after testing
+    delete mc;
+    delete mcRef;
+    changed_again.removeMovieClip();
+  .end
+
+
+// seperate tests in frame9
+.frame 9
+  .action:
+    _root.createEmptyMovieClip("mc1", 30);
+    mc1._name = "mc2";
+    mcRef = mc2;
+    
+    check(typeof(mcRef)=='movieclip');
+    check_equals(mcRef.getDepth(), 30);
+    check(mcRef == _level0.mc2);
+    
+    mc2.removeMovieClip();
+    _root.createEmptyMovieClip("mc2", 40);
+
+    check(typeof(mcRef)=='movieclip');
+    xcheck(mcRef.valueOf() == null) 
+    
+    // release resources after testing
+    delete mcRef;
+    mc2.removeMovieClip();
+  .end
+
+// seperate tests in frame11
+.frame 11
+  .action:
+    mcContainer = new Array(10);
+    i = 0;
+    MovieClip.prototype.onConstruct = function ()
+    {
+      mcContainer[i++] = this;
+      note("Constructed "+this+" in depth "+this.getDepth()+" and assigned to mcContainer["+(i-1)+"]");
+    };
+    _root.createEmptyMovieClip("mc1", 50);
+    _root.createEmptyMovieClip("mc1", 51);
+    check_equals(mcContainer[0].getDepth(), 50);
+    check_equals(mcContainer[1].getDepth(), 51);
+    check_equals(mc1.getDepth(), 50);
+    
+    mc1._name = "mc2";
+    mcRef = mc2;
+    
+    check(typeof(mcRef)=='movieclip');
+    check_equals(mcRef.getDepth(), 50);
+    check(mcRef == _level0.mc2);
+    
+    mc2.removeMovieClip();
+    _root.createEmptyMovieClip("mc2", 60);
+
+    check(typeof(mcRef)=='movieclip');
+    xcheck(mcRef == _level0.mc1);
+    
+    _root.totals();
     stop();
   .end
   



From MAILER-DAEMON Wed Aug 29 06:54:22 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQLBm-0000oF-MW
	for mharc-gnash-commit@gnu.org; Wed, 29 Aug 2007 06:54:22 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQLBl-0000m1-1L
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 06:54:21 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQLBj-0000kD-VG
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 06:54:20 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQLBj-0000k5-Rz
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 06:54:19 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IQLBj-0003gZ-EB
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 06:54:19 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IQLBi-00008p-2j
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 10:54:18 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IQLBh-00008m-VA
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 10:54:18 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQLBh-00008m-VA@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 29 Aug 2007 10:54:17 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-swfc.all/soft_re...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Aug 2007 10:54:21 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/29 10:54:17

Modified files:
	.              : ChangeLog 
	testsuite/misc-swfc.all: soft_reference_test1.sc 

Log message:
	        * testsuite/misc-swfc.all/soft_reference_test1.sc: add some
	          comments as to why Gnash fails.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4145&r2=1.4146
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/soft_reference_test1.sc?cvsroot=gnash&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4145
retrieving revision 1.4146
diff -u -b -r1.4145 -r1.4146
--- ChangeLog	29 Aug 2007 07:41:36 -0000	1.4145
+++ ChangeLog	29 Aug 2007 10:54:17 -0000	1.4146
@@ -1,3 +1,8 @@
+2007-08-29 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/misc-swfc.all/soft_reference_test1.sc: add some
+	  comments as to why Gnash fails.
+
 2007-08-29 Zou Lunkai <zoulunkai@gmail.com>
 	
 	* testsuite/misc-swfc.all/soft_reference_test1.sc: new focused

Index: testsuite/misc-swfc.all/soft_reference_test1.sc
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/soft_reference_test1.sc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- testsuite/misc-swfc.all/soft_reference_test1.sc	29 Aug 2007 10:43:49 -0000	1.5
+++ testsuite/misc-swfc.all/soft_reference_test1.sc	29 Aug 2007 10:54:17 -0000	1.6
@@ -68,6 +68,9 @@
     check(typeof(mc)=='movieclip');  
     check(typeof(mcRef)=='movieclip'); 
     check(mc == _level0.mc);    
+    // Gnash bug:
+    //   Target of the sprite mcRef points to changed, so seeking
+    //   for the new target fails (_level0.changed doesn't exist)
     xcheck(mcRef == _level0.mc);
   .end
 
@@ -113,6 +116,13 @@
     _root.createEmptyMovieClip("mc2", 40);
 
     check(typeof(mcRef)=='movieclip');
+    // Gnash bug:
+    //   Target of the sprite pointed to by mcRef is
+    //   not the one used on creation (_level0.mc1) but the one
+    //   subsequently changed to by effect of _name assignment: _level0.mc2.
+    //   Thus, when finding a *new* character (the old one was unloaded)
+    //   we find the *new* _level0.mc2.
+    //   Should be fixed in the same way as for the bug exposed in frame 5
     xcheck(mcRef.valueOf() == null) 
     
     // release resources after testing
@@ -136,8 +146,8 @@
     check_equals(mcContainer[1].getDepth(), 51);
     check_equals(mc1.getDepth(), 50);
     
-    mc1._name = "mc2";
-    mcRef = mc2;
+    mc1._name = "mc2"; // char at depth 50 changes name
+    mcRef = mc2; // mcRef now points to char at depth 50, and target _level0.mc2
     
     check(typeof(mcRef)=='movieclip');
     check_equals(mcRef.getDepth(), 50);
@@ -147,6 +157,10 @@
     _root.createEmptyMovieClip("mc2", 60);
 
     check(typeof(mcRef)=='movieclip');
+
+    // Gnash bug:
+    //   Still the same bug: the ref uses *current* target instead of the one
+    //   as of creation time.
     xcheck(mcRef == _level0.mc1);
     
     _root.totals();



From MAILER-DAEMON Wed Aug 29 08:31:16 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQMhY-0007WK-7I
	for mharc-gnash-commit@gnu.org; Wed, 29 Aug 2007 08:31:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQMhV-0007UK-UV
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 08:31:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQMhU-0007T3-3x
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 08:31:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQMhT-0007St-T6
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 08:31:11 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IQMhT-0007qE-G5
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 08:31:11 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IQMhS-0007XD-24
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 12:31:10 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IQMhR-0007XA-S8
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 12:31:09 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQMhR-0007XA-S8@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 29 Aug 2007 12:31:09 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/as_value.cpp server/spri...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Aug 2007 12:31:14 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/29 12:31:09

Modified files:
	.              : ChangeLog 
	server         : as_value.cpp sprite_instance.cpp 
	                 sprite_instance.h 
	testsuite/misc-swfc.all: soft_reference_test1.sc 

Log message:
	        * server/as_value.cpp (to_sprite): use original target, not current
	          one, for dereferencing danglign MOVIECLIP refs; add TODO item about
	          the onUnload problem.
	        * server/sprite_instance.{h,cpp}: add a getOrigTarget() to return original
	          target of a sprite (the target it got when first constructed, immune
	          from _name changes).
	        * testsuite/misc-swfc.all/soft_reference_test1.sc: xcheck => check

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4146&r2=1.4147
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.67&r2=1.68
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.313&r2=1.314
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.130&r2=1.131
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/soft_reference_test1.sc?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4146
retrieving revision 1.4147
diff -u -b -r1.4146 -r1.4147
--- ChangeLog	29 Aug 2007 10:54:17 -0000	1.4146
+++ ChangeLog	29 Aug 2007 12:31:08 -0000	1.4147
@@ -1,5 +1,15 @@
 2007-08-29 Sandro Santilli <strk@keybit.net>
 
+	* server/as_value.cpp (to_sprite): use original target, not current
+	  one, for dereferencing danglign MOVIECLIP refs; add TODO item about
+	  the onUnload problem.
+	* server/sprite_instance.{h,cpp}: add a getOrigTarget() to return original
+	  target of a sprite (the target it got when first constructed, immune
+	  from _name changes).
+	* testsuite/misc-swfc.all/soft_reference_test1.sc: xcheck => check
+
+2007-08-29 Sandro Santilli <strk@keybit.net>
+
 	* testsuite/misc-swfc.all/soft_reference_test1.sc: add some
 	  comments as to why Gnash fails.
 

Index: server/as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- server/as_value.cpp	25 Aug 2007 14:15:50 -0000	1.67
+++ server/as_value.cpp	29 Aug 2007 12:31:09 -0000	1.68
@@ -513,12 +513,14 @@
 #ifndef MOVIECLIP_AS_SOFTREF
 	sprite_instance* sp = m_object_value->to_movie();
 	if ( ! sp ) return NULL; // shoudl we assert(sp) instead ?
+
 	if ( sp->isUnloaded() )
+	// TODO: we should also check if the unload event handlers have been invoked or not, or references to 'this' in unload handlers will be bogus !
 	{
 		log_error(_("MovieClip value is a dangling reference: "
 				"target %s was unloaded (looking for a substitute on the same target))"),
 				sp->getTarget().c_str());
-		sp = find_sprite_by_target(sp->getTarget());
+		sp = find_sprite_by_target(sp->getOrigTarget());
 		return sp;
 		//return NULL;
 	}

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -b -r1.313 -r1.314
--- server/sprite_instance.cpp	28 Aug 2007 11:32:44 -0000	1.313
+++ server/sprite_instance.cpp	29 Aug 2007 12:31:09 -0000	1.314
@@ -3359,8 +3359,10 @@
 void
 sprite_instance::construct()
 {
+	_origTarget = getTarget();
+
 #ifdef GNASH_DEBUG
-	log_msg(_("Constructing sprite '%s'"), getTargetPath().c_str());
+	log_msg(_("Constructing sprite '%s'"), _origTarget.c_str());
 #endif
 
 	// We *might* avoid this, but better safe then sorry

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -b -r1.130 -r1.131
--- server/sprite_instance.h	13 Aug 2007 07:20:09 -0000	1.130
+++ server/sprite_instance.h	29 Aug 2007 12:31:09 -0000	1.131
@@ -745,6 +745,17 @@
 	///
 	virtual void enumerateNonProperties(as_environment&) const;
 
+	/// Return original target path to this object, in dot notation
+	/// as of at construction time.
+	//
+	/// This is needed to properly dereference dangling soft-references
+	/// See testcase misc-swfc.all/soft_reference_test1.sc
+	///
+	const std::string& getOrigTarget() const
+	{
+		return _origTarget;
+	}
+
 private:
 
 	/// \brief
@@ -930,6 +941,8 @@
 	///
 	DisplayList _frame0_chars;
 
+	std::string _origTarget;
+
 protected:
 
 	void place_character(character* ch, int depth,

Index: testsuite/misc-swfc.all/soft_reference_test1.sc
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/soft_reference_test1.sc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- testsuite/misc-swfc.all/soft_reference_test1.sc	29 Aug 2007 10:54:17 -0000	1.6
+++ testsuite/misc-swfc.all/soft_reference_test1.sc	29 Aug 2007 12:31:09 -0000	1.7
@@ -71,7 +71,7 @@
     // Gnash bug:
     //   Target of the sprite mcRef points to changed, so seeking
     //   for the new target fails (_level0.changed doesn't exist)
-    xcheck(mcRef == _level0.mc);
+    check(mcRef == _level0.mc);
   .end
 
 .frame 7
@@ -123,7 +123,7 @@
     //   Thus, when finding a *new* character (the old one was unloaded)
     //   we find the *new* _level0.mc2.
     //   Should be fixed in the same way as for the bug exposed in frame 5
-    xcheck(mcRef.valueOf() == null) 
+    check(mcRef.valueOf() == null) 
     
     // release resources after testing
     delete mcRef;
@@ -161,7 +161,7 @@
     // Gnash bug:
     //   Still the same bug: the ref uses *current* target instead of the one
     //   as of creation time.
-    xcheck(mcRef == _level0.mc1);
+    check(mcRef == _level0.mc1);
     
     _root.totals();
     stop(); 



From MAILER-DAEMON Wed Aug 29 09:50:15 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQNvz-0001lL-7x
	for mharc-gnash-commit@gnu.org; Wed, 29 Aug 2007 09:50:15 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQNvx-0001l6-N8
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 09:50:13 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQNvw-0001kC-GI
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 09:50:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQNvw-0001k0-1L
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 09:50:12 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IQNvv-0006FQ-Fa
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 09:50:11 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IQNvu-0004uz-Ab
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 13:50:10 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IQNvu-0004uw-6Y
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 13:50:10 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQNvu-0004uw-6Y@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 29 Aug 2007 13:50:10 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/server as_environment.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Aug 2007 13:50:14 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/29 13:50:10

Modified files:
	server         : as_environment.cpp 

Log message:
	        * server/as_environment.cpp (get_variable): more verbosity in
	          debugging messages.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.84&r2=1.85

Patches:
Index: as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- as_environment.cpp	24 Aug 2007 10:37:56 -0000	1.84
+++ as_environment.cpp	29 Aug 2007 13:50:09 -0000	1.85
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: as_environment.cpp,v 1.84 2007/08/24 10:37:56 strk Exp $ */
+/* $Id: as_environment.cpp,v 1.85 2007/08/29 13:50:09 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -80,7 +80,7 @@
 	    if ( ! tmp.is_undefined() )
 	    {
 	    IF_VERBOSE_ASCODING_ERRORS(
-		    log_aserror(_("...but get_variable_raw(%s, <scopeStack>) succeeded!"), path.c_str());
+		    log_aserror(_("...but get_variable_raw(%s, <scopeStack>) succeeded (%s)!"), path.c_str(), tmp.to_debug_string().c_str());
 	    )
 	    }
 	    return as_value();



From MAILER-DAEMON Wed Aug 29 13:29:44 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQRMO-0001vc-00
	for mharc-gnash-commit@gnu.org; Wed, 29 Aug 2007 13:29:44 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQRMM-0001tM-LQ
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 13:29:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQRML-0001q8-E3
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 13:29:41 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQRML-0001pt-3H
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 13:29:41 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IQRMK-0008LS-S3
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 13:29:40 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IQRMJ-0002Tg-Sh
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 17:29:39 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IQRMJ-0002Td-Nu
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 17:29:39 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQRMJ-0002Td-Nu@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 29 Aug 2007 17:29:39 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Aug 2007 17:29:43 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/29 17:29:39

Modified files:
	.              : ChangeLog 

Log message:
	forgot this

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4147&r2=1.4148

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4147
retrieving revision 1.4148
diff -u -b -r1.4147 -r1.4148
--- ChangeLog	29 Aug 2007 12:31:08 -0000	1.4147
+++ ChangeLog	29 Aug 2007 17:29:39 -0000	1.4148
@@ -1,5 +1,10 @@
 2007-08-29 Sandro Santilli <strk@keybit.net>
 
+        * server/as_environment.cpp (get_variable): more verbosity in
+	  debugging messages.
+
+2007-08-29 Sandro Santilli <strk@keybit.net>
+
 	* server/as_value.cpp (to_sprite): use original target, not current
 	  one, for dereferencing danglign MOVIECLIP refs; add TODO item about
 	  the onUnload problem.



From MAILER-DAEMON Wed Aug 29 13:34:13 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQRQj-0008OG-5b
	for mharc-gnash-commit@gnu.org; Wed, 29 Aug 2007 13:34:13 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQRQg-0008Jr-No
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 13:34:10 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQRQg-0008Hn-15
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 13:34:10 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQRQf-0008Hd-GX
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 13:34:09 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1IQRQf-000175-3y
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 13:34:09 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <udo.gnu@nova-sys.net>) id 1IQRQd-0002Zy-IW
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 17:34:07 +0000
Received: from udog by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <udog@savannah.gnu.org>) id 1IQRQd-0002Zv-CN
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 17:34:07 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQRQd-0002Zv-CN@cvs.savannah.gnu.org>
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
Date: Wed, 29 Aug 2007 17:34:07 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog configure.ac backend/render_han...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Aug 2007 17:34:11 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Udo Giacomozzi <udog>	07/08/29 17:34:07

Modified files:
	.              : ChangeLog configure.ac 
	backend        : render_handler_agg.cpp render_handler_agg.h 
	gui            : fb.cpp 

Log message:
	fixes for PPC pixel formats

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4148&r2=1.4149
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.408&r2=1.409
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.cpp?cvsroot=gnash&r1=1.102&r2=1.103
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.h?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/fb.cpp?cvsroot=gnash&r1=1.37&r2=1.38

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.4148
retrieving revision 1.4149
diff -u -b -r1.4148 -r1.4149
--- ChangeLog	29 Aug 2007 17:29:39 -0000	1.4148
+++ ChangeLog	29 Aug 2007 17:34:06 -0000	1.4149
@@ -1,3 +1,12 @@
+2007-08-29 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* configure.ac: added pixel formats ARGB32 and ABGR32; allow "all" value for
+	  --with-pixelformat
+	* backend/render_handler_agg.cpp: implement the two new pixel formats and
+	  check for the host endianess; some initial changes in AGG cache class which
+    currently is not used, however
+	* backend/render_handler_agg.h, gui/fb.cpp: updated comments
+	
 2007-08-29 Sandro Santilli <strk@keybit.net>
 
         * server/as_environment.cpp (get_variable): more verbosity in

Index: configure.ac
===================================================================
RCS file: /cvsroot/gnash/gnash/configure.ac,v
retrieving revision 1.408
retrieving revision 1.409
diff -u -b -r1.408 -r1.409
--- configure.ac	27 Aug 2007 21:15:10 -0000	1.408
+++ configure.ac	29 Aug 2007 17:34:06 -0000	1.409
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.408 2007/08/27 21:15:10 nihilus Exp $
+dnl $Id: configure.ac,v 1.409 2007/08/29 17:34:06 udog Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -358,12 +358,21 @@
   while test -n "${withval}" ; do
     val=`echo ${withval} | cut -d ' ' -f 1`
     [case "${val}" in
+      all)
+        # allow special value "all" set by user (handled below)
+        ;; 
       rgba32|RGBA32)
         AC_DEFINE(PIXELFORMAT_RGBA32, [1], [RGBA32])
         ;;
       bgra32|BGRA32)
         AC_DEFINE(PIXELFORMAT_BGRA32, [1], [BGRA32])
         ;;
+      argb32|ARGB32)
+        AC_DEFINE(PIXELFORMAT_ARGB32, [1], [ARGB32])
+        ;;
+      abgr32|ABGR32)
+        AC_DEFINE(PIXELFORMAT_ABGR32, [1], [ABGR32])
+        ;;
       rgb24|RGB24)
         AC_DEFINE(PIXELFORMAT_RGB24, [1], [RGB24])
         ;;
@@ -376,8 +385,7 @@
       rgb565|RGB565)
         AC_DEFINE(PIXELFORMAT_RGB565, [1], [RGB565])
         ;;
-      *) AC_MSG_ERROR([invalid pixel format ${withval} given (accept: RGB555|RG
-B565|RGB24|BGR24|BGRA32|RGBA32)])
+      *) AC_MSG_ERROR([invalid pixel format ${withval} given (accept: all|RGB555|RGB565|RGB24|BGR24|BGRA32|RGBA32|ARGB32|ABGR32)])
          ;;
       esac]
     withval=`echo ${withval} | cut -d ' ' -f 2-6`
@@ -401,6 +409,8 @@
       AC_DEFINE(PIXELFORMAT_BGR24,  [1], [BGR24 pixel format])
       AC_DEFINE(PIXELFORMAT_RGBA32, [1], [RGBA32 pixel format])
       AC_DEFINE(PIXELFORMAT_BGRA32, [1], [BGRA32 pixel format])
+      AC_DEFINE(PIXELFORMAT_ARGB32, [1], [ARGB32 pixel format])
+      AC_DEFINE(PIXELFORMAT_ABGR32, [1], [ABGR32 pixel format])
     #fi
   fi
 fi

Index: backend/render_handler_agg.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/backend/render_handler_agg.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- backend/render_handler_agg.cpp	29 Aug 2007 04:30:37 -0000	1.102
+++ backend/render_handler_agg.cpp	29 Aug 2007 17:34:06 -0000	1.103
@@ -17,7 +17,7 @@
 
  
 
-/* $Id: render_handler_agg.cpp,v 1.102 2007/08/29 04:30:37 nihilus Exp $ */
+/* $Id: render_handler_agg.cpp,v 1.103 2007/08/29 17:34:06 udog Exp $ */
 
 // Original version by Udo Giacomozzi and Hannes Mayr, 
 // INDUNET GmbH (www.indunet.it)
@@ -189,6 +189,7 @@
 
 namespace gnash {
 
+
 // --- CACHE -------------------------------------------------------------------
 /// This class holds a completely transformed path (fixed position). Speeds
 /// up characters that stay fixed on a certain position on the stage. 
@@ -196,21 +197,48 @@
 
 class agg_transformed_path 
 {
+public:
   /// Original transformation matrix 
   matrix m_mat;  
   
-  /// Number of cache hits 
-  int hits;
+  /// Normal or rounded coordinates?
+  bool m_rounded;
   
-  /// Number of cache misses
-  int misses;
+  /// Number of cache hits 
+  int m_hits;
   
-  /// Contents of this cache item. First dimension is fill style 
-  std::vector <std::vector <agg::path_storage> > data;
+  /// Contents of this cache item (AGG path).  
+  std::vector <agg::path_storage> m_data;
 };
 
 class agg_cache_manager : private render_cache_manager
 {
+
+  std::vector <agg_transformed_path> m_items;
+
+  /// Looks for a matching pre-computed path in the cache list
+  /// Returns NULL if no cache item matches 
+  std::vector <agg::path_storage>* search(const matrix& mat, bool rounded) {
+  
+    size_t ccount = m_items.size();
+    
+    for (size_t cno=0; cno<ccount; cno++) {    
+      agg_transformed_path& item = m_items[cno];
+          
+      if ((item.m_mat == mat) && (item.m_rounded == rounded)) {
+      
+        // Found it!
+        return &item.m_data;
+      
+      }    
+    }
+    
+    // could not find a matching item
+    return NULL;
+  
+  }
+  
+
 };
 
 
@@ -661,19 +689,12 @@
     assert(m_pixf != NULL);
     
     assert(scale_set);
-
     // clear the stage using the background color
     for (unsigned int i=0; i<_clipbounds.size(); i++) 
       clear_framebuffer(_clipbounds[i], agg::rgba8_pre(background_color.m_r,
         background_color.m_g, background_color.m_b,
         background_color.m_a));
         
-    // calculate final pixel scale
-    /*double scaleX, scaleY;
-    scaleX = (double)xres / (double)viewport_width / 20.0;  // 20=TWIPS
-    scaleY = (double)yres / (double)viewport_height / 20.0;
-    scale = scaleX<scaleY ? scaleX : scaleY;*/
-    
     // reset status variables
     m_drawing_mask = false;
   }
@@ -2149,15 +2170,35 @@
 
 
 
+// detect the endianess of the host (would prefer to NOT have this function
+// here)
+bool is_little_endian_host() {
+
+  union {
+    uint16_t word;
+    struct {
+      uint8_t b1;
+      uint8_t b2;
+    };
+  } u;
+    
+  u.b1 = 1;
+  u.b2 = 2;
+  
+  return u.word == 0x0201;
+
+}
 
-// TODO: Replace "pixelformat" with a enum!
 
 DSOEXPORT render_handler_agg_base*  create_render_handler_agg(const char *pixelformat)
 {
 
   if (!pixelformat) return NULL;
 
-  log_msg("framebuffer pixel format is %s", pixelformat);
+  if (is_little_endian_host())
+    log_msg("framebuffer pixel format is %s (little-endian host)", pixelformat);
+  else
+    log_msg("framebuffer pixel format is %s (big-endian host)", pixelformat);
   
 #ifdef PIXELFORMAT_RGB555  
   if (!strcmp(pixelformat, "RGB555"))
@@ -2188,6 +2229,15 @@
 #ifdef PIXELFORMAT_BGRA32  
   if (!strcmp(pixelformat, "BGRA32"))
     return new render_handler_agg<agg::pixfmt_bgra32_pre> (32);
+#endif   
+#ifdef PIXELFORMAT_RGBA32 
+  if (!strcmp(pixelformat, "ARGB32"))
+    return new render_handler_agg<agg::pixfmt_argb32_pre> (32);
+  else 
+#endif   
+#ifdef PIXELFORMAT_BGRA32  
+  if (!strcmp(pixelformat, "ABGR32"))
+    return new render_handler_agg<agg::pixfmt_abgr32_pre> (32);
         
   else 
 #endif
@@ -2200,11 +2250,23 @@
   return NULL; // avoid compiler warning
 }
 
+
 DSOEXPORT char *agg_detect_pixel_format(unsigned int rofs, unsigned int rsize,
   unsigned int gofs, unsigned int gsize,
   unsigned int bofs, unsigned int bsize,
   unsigned int bpp) {
   
+  if (!is_little_endian_host()) {
+  
+    // Swap bits for big endian hosts, because the following tests assume
+    // little endians. The pixel format string matches the bytes in memory.
+    
+    rofs = bpp - rofs - rsize;
+    gofs = bpp - gofs - gsize;
+    bofs = bpp - bofs - bsize; 
+  
+  }
+  
   // 15 bits RGB (hicolor)
   if ((rofs==10) && (rsize==5)
    && (gofs==5) && (gsize==5)
@@ -2243,6 +2305,22 @@
     else
       return "RGBA32";
       
+  } else
+  // special 32 bits (mostly on big endian hosts)
+  if ((rofs==8) && (rsize==8)
+   && (gofs==16) && (gsize==8)
+   && (bofs==24) && (bsize==8)) {
+   
+   return "ARGB32";
+   
+  } else
+  // special 32 bits (mostly on big endian hosts)
+  if ((rofs==24) && (rsize==8)
+   && (gofs==16) && (gsize==8)
+   && (bofs==8) && (bsize==8)) {
+   
+   return "ABGR32";
+   
   }  
   
   return NULL; // unknown format

Index: backend/render_handler_agg.h
===================================================================
RCS file: /cvsroot/gnash/gnash/backend/render_handler_agg.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- backend/render_handler_agg.h	1 Jul 2007 10:53:47 -0000	1.19
+++ backend/render_handler_agg.h	29 Aug 2007 17:34:07 -0000	1.20
@@ -71,6 +71,7 @@
 /// Detect pixel format based on bit mask. If the pixel format is unknown,
 /// NULL is returned. Note that a successfully detected pixel format does
 /// not necessarily mean that the pixel format is available (compiled in).
+/// The bit offsets are assumed to be in host byte order!
 DSOEXPORT char* agg_detect_pixel_format(unsigned int rofs, unsigned int rsize,
   unsigned int gofs, unsigned int gsize,
   unsigned int bofs, unsigned int bsize,

Index: gui/fb.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/gui/fb.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- gui/fb.cpp	12 Jul 2007 13:34:20 -0000	1.37
+++ gui/fb.cpp	29 Aug 2007 17:34:07 -0000	1.38
@@ -271,6 +271,11 @@
     var_screeninfo.blue.length);
   log_msg("Total bits per pixel: %d", var_screeninfo.bits_per_pixel);
   
+  /* NOTE: agg_detect_pixel_format() assumes bit positions in host byte order.
+  I don't know if this matches the information provided by var_screeninfo, so
+  you know what to do when colors look wrong (or pixel format can't be detected)
+  on big-endian machines! - Udo */   
+  
   char* pixelformat = agg_detect_pixel_format(
     var_screeninfo.red.offset, var_screeninfo.red.length,
     var_screeninfo.green.offset, var_screeninfo.green.length,



From MAILER-DAEMON Wed Aug 29 13:54:13 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQRk5-00063L-G6
	for mharc-gnash-commit@gnu.org; Wed, 29 Aug 2007 13:54:13 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQRk4-000635-Ps
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 13:54:12 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQRk4-00062j-3f
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 13:54:12 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQRk3-00062g-VV
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 13:54:11 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IQRk3-0005LA-K7
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 13:54:11 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IQRk2-0004Yr-IV
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 17:54:10 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IQRk2-0004Yo-EQ
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 17:54:10 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQRk2-0004Yo-EQ@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 29 Aug 2007 17:54:10 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/MovieTester.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Aug 2007 17:54:13 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/29 17:54:10

Modified files:
	.              : ChangeLog 
	testsuite      : MovieTester.cpp 

Log message:
	        * testsuite/MovieTester.cpp (initTestingRenderers): add ARGB32 and
	          ABGR32 renderers.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4149&r2=1.4150
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/MovieTester.cpp?cvsroot=gnash&r1=1.45&r2=1.46

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4149
retrieving revision 1.4150
diff -u -b -r1.4149 -r1.4150
--- ChangeLog	29 Aug 2007 17:34:06 -0000	1.4149
+++ ChangeLog	29 Aug 2007 17:54:09 -0000	1.4150
@@ -1,3 +1,8 @@
+2007-08-29 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/MovieTester.cpp (initTestingRenderers): add ARGB32 and
+	  ABGR32 renderers.
+
 2007-08-29 Udo Giacomozzi <udo.gnu@nova-sys.net>
 
 	* configure.ac: added pixel formats ARGB32 and ABGR32; allow "all" value for

Index: testsuite/MovieTester.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/MovieTester.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- testsuite/MovieTester.cpp	1 Jul 2007 10:54:37 -0000	1.45
+++ testsuite/MovieTester.cpp	29 Aug 2007 17:54:10 -0000	1.46
@@ -391,7 +391,8 @@
 	// Initialize AGG
 	static const char* aggPixelFormats[] = {
 		"RGB555", "RGB565", "RGBA16",
-		"RGB24", "BGR24", "RGBA32", "BGRA32"
+		"RGB24", "BGR24", "RGBA32", "BGRA32",
+		"ARGB32", "ABGR32"
 	};
 
 	for (unsigned i=0; i<sizeof(aggPixelFormats)/sizeof(*aggPixelFormats); ++i)



From MAILER-DAEMON Wed Aug 29 14:38:39 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQSR5-00049z-Ok
	for mharc-gnash-commit@gnu.org; Wed, 29 Aug 2007 14:38:39 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQSR4-00048c-Lm
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 14:38:38 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQSR3-00047X-Px
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 14:38:38 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQSR3-00047L-BF
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 14:38:37 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IQSR2-0006Oq-TM
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 14:38:37 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IQSR1-0007ca-Q2
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 18:38:35 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IQSR1-0007cX-KT
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 18:38:35 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQSR1-0007cX-KT@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 29 Aug 2007 18:38:35 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/Key....
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Aug 2007 18:38:39 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/29 18:38:35

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: Key.as Mouse.as Selection.as 
	                            Stage.as TextField.as 

Log message:
	        * testsuite/actionscript.all/: Key.as, Mouse.as, Selection.as,
	          Stage.as, TextField.as: check elements supposedly created
	          by implicit call to ASBroadcaster.initialize().
	          See bug #20832.
	          NOTE: for TextField.as also fixed a wrong expected result for
	          targets SWF8+

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4150&r2=1.4151
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Key.as?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Mouse.as?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Selection.as?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Stage.as?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/TextField.as?cvsroot=gnash&r1=1.18&r2=1.19

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4150
retrieving revision 1.4151
diff -u -b -r1.4150 -r1.4151
--- ChangeLog	29 Aug 2007 17:54:09 -0000	1.4150
+++ ChangeLog	29 Aug 2007 18:38:34 -0000	1.4151
@@ -1,5 +1,14 @@
 2007-08-29 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/actionscript.all/: Key.as, Mouse.as, Selection.as,
+	  Stage.as, TextField.as: check elements supposedly created
+	  by implicit call to ASBroadcaster.initialize().
+	  See bug #20832.
+	  NOTE: for TextField.as also fixed a wrong expected result for
+	  targets SWF8+
+
+2007-08-29 Sandro Santilli <strk@keybit.net>
+
 	* testsuite/MovieTester.cpp (initTestingRenderers): add ARGB32 and
 	  ABGR32 renderers.
 

Index: testsuite/actionscript.all/Key.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Key.as,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/actionscript.all/Key.as	24 Jul 2007 14:19:32 -0000	1.1
+++ testsuite/actionscript.all/Key.as	29 Aug 2007 18:38:35 -0000	1.2
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Key.as,v 1.1 2007/07/24 14:19:32 strk Exp $";
+rcsid="$Id: Key.as,v 1.2 2007/08/29 18:38:35 strk Exp $";
 
 #include "check.as"
 
@@ -33,12 +33,23 @@
 
 // Methods
 #if OUTPUT_VERSION > 5
-check_equals(typeof(Key.addListener), 'function');
-check_equals(typeof(Key.removeListener), 'function');
+
+ check_equals(typeof(Key.addListener), 'function');
+ check_equals(typeof(Key.removeListener), 'function');
+
+ // Key was implicitly initialized by ASBroadcaster.initialize !
+ // See http://www.senocular.com/flash/tutorials/listenersasbroadcaster/?page=2
+ xcheck(Key.hasOwnProperty("_listeners"));
+ xcheck_equals(typeof(Key._listeners), 'object');
+ xcheck(Key._listeners instanceof Array);
+
 #else // OUTPUT_VERSION <= 5
-check_equals(typeof(Key.addListener), 'undefined');
-check_equals(typeof(Key.removeListener), 'undefined');
+
+ check_equals(typeof(Key.addListener), 'undefined');
+ check_equals(typeof(Key.removeListener), 'undefined');
+
 #endif // OUTPUT_VERSION <= 5
+
 check_equals(typeof(Key.getAscii), 'function');
 check_equals(typeof(Key.getCode), 'function');
 check_equals(typeof(Key.isDown), 'function');

Index: testsuite/actionscript.all/Mouse.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Mouse.as,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- testsuite/actionscript.all/Mouse.as	8 Aug 2007 16:26:45 -0000	1.11
+++ testsuite/actionscript.all/Mouse.as	29 Aug 2007 18:38:35 -0000	1.12
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Mouse.as,v 1.11 2007/08/08 16:26:45 strk Exp $";
+rcsid="$Id: Mouse.as,v 1.12 2007/08/29 18:38:35 strk Exp $";
 
 #include "check.as"
 
@@ -34,9 +34,17 @@
 check_equals ( typeof(Mouse.hide), 'function' );
 
 #if OUTPUT_VERSION > 5
+
 // test addListner/removeListener, added in SWF6
 check_equals ( typeof(Mouse.removeListener), 'function' );
 check_equals ( typeof(Mouse.addListener), 'function' );
+
+ // Mouse was implicitly initialized by ASBroadcaster.initialize !
+ // See http://www.senocular.com/flash/tutorials/listenersasbroadcaster/?page=2
+ xcheck(Mouse.hasOwnProperty("_listeners"));
+ xcheck_equals(typeof(Mouse._listeners), 'object');
+ xcheck(Mouse._listeners instanceof Array);
+
 #endif // OUTPUT_VERSION > 5
 
 

Index: testsuite/actionscript.all/Selection.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Selection.as,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- testsuite/actionscript.all/Selection.as	26 Jul 2007 03:41:19 -0000	1.10
+++ testsuite/actionscript.all/Selection.as	29 Aug 2007 18:38:35 -0000	1.11
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Selection.as,v 1.10 2007/07/26 03:41:19 strk Exp $";
+rcsid="$Id: Selection.as,v 1.11 2007/08/29 18:38:35 strk Exp $";
 
 #include "check.as"
 
@@ -61,5 +61,11 @@
 // test the Selection::removeListener method
 check_equals (typeof(Selection.removeListener), 'function'); 
 
+ // Selection was implicitly initialized by ASBroadcaster.initialize !
+ // See http://www.senocular.com/flash/tutorials/listenersasbroadcaster/?page=2
+ xcheck(Selection.hasOwnProperty("_listeners"));
+ xcheck_equals(typeof(Selection._listeners), 'object');
+ xcheck(Selection._listeners instanceof Array);
+
 #endif // OUTPUT_VERSION >= 6
 

Index: testsuite/actionscript.all/Stage.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Stage.as,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- testsuite/actionscript.all/Stage.as	3 Aug 2007 21:26:12 -0000	1.13
+++ testsuite/actionscript.all/Stage.as	29 Aug 2007 18:38:35 -0000	1.14
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Stage.as,v 1.13 2007/08/03 21:26:12 strk Exp $";
+rcsid="$Id: Stage.as,v 1.14 2007/08/29 18:38:35 strk Exp $";
 
 #include "check.as"
 
@@ -38,6 +38,12 @@
 // test the Stage::removelistener method
 check_equals (typeof(Stage.removeListener), 'function');
 
+// Stage was implicitly initialized by ASBroadcaster.initialize !
+// See http://www.senocular.com/flash/tutorials/listenersasbroadcaster/?page=2
+xcheck(Stage.hasOwnProperty("_listeners"));
+xcheck_equals(typeof(Stage._listeners), 'object');
+xcheck(Stage._listeners instanceof Array);
+
 listener = new Object;
 listener.onResize = function() {
 	_root.note("Resize event received, args to handler: "+arguments.length+" Stage.width="+Stage.width+", Stage.height="+Stage.height);

Index: testsuite/actionscript.all/TextField.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/TextField.as,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- testsuite/actionscript.all/TextField.as	21 Aug 2007 14:42:12 -0000	1.18
+++ testsuite/actionscript.all/TextField.as	29 Aug 2007 18:38:35 -0000	1.19
@@ -19,7 +19,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: TextField.as,v 1.18 2007/08/21 14:42:12 strk Exp $";
+rcsid="$Id: TextField.as,v 1.19 2007/08/29 18:38:35 strk Exp $";
 
 #include "check.as"
 
@@ -37,6 +37,12 @@
 check_equals(typeof(TextField.prototype.removeTextField), 'function');
 check_equals(typeof(TextField.prototype.replaceSel), 'function');
 
+ // TextField.prototype was implicitly initialized by ASBroadcaster.initialize !
+ // See http://www.senocular.com/flash/tutorials/listenersasbroadcaster/?page=2
+ xcheck(TextField.prototype.hasOwnProperty("_listeners"));
+ xcheck_equals(typeof(TextField.prototype._listeners), 'object');
+ xcheck(TextField.prototype._listeners instanceof Array);
+
 // NOTE: the following will be true after a call to createTextField ! Seek forward to see..
 xcheck( !TextField.prototype.hasOwnProperty('background'));
 xcheck( !TextField.prototype.hasOwnProperty('backgroundColor'));
@@ -631,6 +637,11 @@
 check_equals(origTextWidth, tf.textWidth); 
 tf._width = 10;
 check_equals(tf._width, 10);
-xcheck_equals(origTextWidth, tf.textWidth); // textWidth isn't influenced by wordWrap
+
+#if OUTPUT_VERSION < 8
+ xcheck_equals(origTextWidth, tf.textWidth); // textWidth isn't influenced by wordWrap
+#else
+ check(origTextWidth > tf.textWidth); 
+#endif
 
 #endif // OUTPUT_VERSION > 5



From MAILER-DAEMON Wed Aug 29 14:50:26 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQScT-00068N-V2
	for mharc-gnash-commit@gnu.org; Wed, 29 Aug 2007 14:50:25 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQScS-00068I-3l
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 14:50:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQScQ-00067y-CO
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 14:50:22 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQScQ-00067g-3z
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 14:50:22 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IQScP-0000Za-Ou
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 14:50:21 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IQScO-0000qz-Ht
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 18:50:20 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IQScO-0000qw-DN
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 18:50:20 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQScO-0000qw-DN@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 29 Aug 2007 18:50:20 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/testsuite/actionscript.all Key.as Mouse.a...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Aug 2007 18:50:24 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/29 18:50:20

Modified files:
	testsuite/actionscript.all: Key.as Mouse.as Selection.as 
	                            Stage.as TextField.as 

Log message:
	Add broadcastMessage to the checks for of ASBroadcaster-created functions

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Key.as?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Mouse.as?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Selection.as?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Stage.as?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/TextField.as?cvsroot=gnash&r1=1.19&r2=1.20

Patches:
Index: Key.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Key.as,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- Key.as	29 Aug 2007 18:38:35 -0000	1.2
+++ Key.as	29 Aug 2007 18:50:19 -0000	1.3
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Key.as,v 1.2 2007/08/29 18:38:35 strk Exp $";
+rcsid="$Id: Key.as,v 1.3 2007/08/29 18:50:19 strk Exp $";
 
 #include "check.as"
 
@@ -34,11 +34,11 @@
 // Methods
 #if OUTPUT_VERSION > 5
 
- check_equals(typeof(Key.addListener), 'function');
- check_equals(typeof(Key.removeListener), 'function');
-
  // Key was implicitly initialized by ASBroadcaster.initialize !
  // See http://www.senocular.com/flash/tutorials/listenersasbroadcaster/?page=2
+ check_equals(typeof(Key.addListener), 'function');
+ check_equals(typeof(Key.removeListener), 'function');
+ xcheck_equals(typeof(Key.broadcastMessage), 'function');
  xcheck(Key.hasOwnProperty("_listeners"));
  xcheck_equals(typeof(Key._listeners), 'object');
  xcheck(Key._listeners instanceof Array);

Index: Mouse.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Mouse.as,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- Mouse.as	29 Aug 2007 18:38:35 -0000	1.12
+++ Mouse.as	29 Aug 2007 18:50:20 -0000	1.13
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Mouse.as,v 1.12 2007/08/29 18:38:35 strk Exp $";
+rcsid="$Id: Mouse.as,v 1.13 2007/08/29 18:50:20 strk Exp $";
 
 #include "check.as"
 
@@ -35,12 +35,11 @@
 
 #if OUTPUT_VERSION > 5
 
-// test addListner/removeListener, added in SWF6
-check_equals ( typeof(Mouse.removeListener), 'function' );
-check_equals ( typeof(Mouse.addListener), 'function' );
-
  // Mouse was implicitly initialized by ASBroadcaster.initialize !
  // See http://www.senocular.com/flash/tutorials/listenersasbroadcaster/?page=2
+ check_equals ( typeof(Mouse.removeListener), 'function' );
+ check_equals ( typeof(Mouse.addListener), 'function' );
+ xcheck_equals( typeof(Mouse.broadcastMessage), 'function' );
  xcheck(Mouse.hasOwnProperty("_listeners"));
  xcheck_equals(typeof(Mouse._listeners), 'object');
  xcheck(Mouse._listeners instanceof Array);

Index: Selection.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Selection.as,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- Selection.as	29 Aug 2007 18:38:35 -0000	1.11
+++ Selection.as	29 Aug 2007 18:50:20 -0000	1.12
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Selection.as,v 1.11 2007/08/29 18:38:35 strk Exp $";
+rcsid="$Id: Selection.as,v 1.12 2007/08/29 18:50:20 strk Exp $";
 
 #include "check.as"
 
@@ -55,14 +55,11 @@
 // Methods added in version 6
 #if OUTPUT_VERSION >= 6
 
-// test the Selection::addListener method
-check_equals (typeof(Selection.addListener), 'function');
-
-// test the Selection::removeListener method
-check_equals (typeof(Selection.removeListener), 'function'); 
-
  // Selection was implicitly initialized by ASBroadcaster.initialize !
  // See http://www.senocular.com/flash/tutorials/listenersasbroadcaster/?page=2
+ check_equals (typeof(Selection.addListener), 'function');
+ check_equals (typeof(Selection.removeListener), 'function'); 
+ xcheck_equals(typeof(Selection.broadcastMessage), 'function');
  xcheck(Selection.hasOwnProperty("_listeners"));
  xcheck_equals(typeof(Selection._listeners), 'object');
  xcheck(Selection._listeners instanceof Array);

Index: Stage.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Stage.as,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- Stage.as	29 Aug 2007 18:38:35 -0000	1.14
+++ Stage.as	29 Aug 2007 18:50:20 -0000	1.15
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Stage.as,v 1.14 2007/08/29 18:38:35 strk Exp $";
+rcsid="$Id: Stage.as,v 1.15 2007/08/29 18:50:20 strk Exp $";
 
 #include "check.as"
 
@@ -33,13 +33,12 @@
 
 #if OUTPUT_VERSION > 5
 
-// test the Stage::addlistener method
+// Stage was implicitly initialized by ASBroadcaster.initialize !
+// See http://www.senocular.com/flash/tutorials/listenersasbroadcaster/?page=2
 check_equals (typeof(Stage.addListener), 'function');
-// test the Stage::removelistener method
 check_equals (typeof(Stage.removeListener), 'function');
+xcheck_equals(typeof(Stage.broadcastMessage), 'function');
 
-// Stage was implicitly initialized by ASBroadcaster.initialize !
-// See http://www.senocular.com/flash/tutorials/listenersasbroadcaster/?page=2
 xcheck(Stage.hasOwnProperty("_listeners"));
 xcheck_equals(typeof(Stage._listeners), 'object');
 xcheck(Stage._listeners instanceof Array);

Index: TextField.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/TextField.as,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- TextField.as	29 Aug 2007 18:38:35 -0000	1.19
+++ TextField.as	29 Aug 2007 18:50:20 -0000	1.20
@@ -19,7 +19,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: TextField.as,v 1.19 2007/08/29 18:38:35 strk Exp $";
+rcsid="$Id: TextField.as,v 1.20 2007/08/29 18:50:20 strk Exp $";
 
 #include "check.as"
 
@@ -31,14 +31,15 @@
 check_equals(typeof(TextField.prototype.getTextFormat), 'function');
 check_equals(typeof(TextField.prototype.setNewTextFormat), 'function');
 check_equals(typeof(TextField.prototype.getNewTextFormat), 'function');
-check_equals(typeof(TextField.prototype.addListener), 'function');
-check_equals(typeof(TextField.prototype.removeListener), 'function');
 check_equals(typeof(TextField.prototype.getDepth), 'function');
 check_equals(typeof(TextField.prototype.removeTextField), 'function');
 check_equals(typeof(TextField.prototype.replaceSel), 'function');
 
  // TextField.prototype was implicitly initialized by ASBroadcaster.initialize !
  // See http://www.senocular.com/flash/tutorials/listenersasbroadcaster/?page=2
+ check_equals(typeof(TextField.prototype.addListener), 'function');
+ check_equals(typeof(TextField.prototype.removeListener), 'function');
+ xcheck_equals(typeof(TextField.prototype.broadcastMessage), 'function');
  xcheck(TextField.prototype.hasOwnProperty("_listeners"));
  xcheck_equals(typeof(TextField.prototype._listeners), 'object');
  xcheck(TextField.prototype._listeners instanceof Array);



From MAILER-DAEMON Wed Aug 29 18:20:17 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQVtZ-0007An-3M
	for mharc-gnash-commit@gnu.org; Wed, 29 Aug 2007 18:20:17 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQVtW-0007AN-M5
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 18:20:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQVtU-00079H-Sv
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 18:20:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQVtU-000797-PC
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 18:20:12 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1IQVtU-0002lX-GX
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 18:20:12 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <markus@unixrus.se>) id 1IQVtT-0007tY-3l
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 22:20:11 +0000
Received: from nihilus by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <nihilus@savannah.gnu.org>) id 1IQVtS-0007tV-Vl
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 22:20:11 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQVtS-0007tV-Vl@cvs.savannah.gnu.org>
From: Markus Gothe <markus@unixrus.se>
Date: Wed, 29 Aug 2007 22:20:10 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash configure.ac libbase/utility.h server/aso...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Aug 2007 22:20:14 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Markus Gothe <nihilus>	07/08/29 22:20:10

Modified files:
	.              : configure.ac 
	libbase        : utility.h 
	server/asobj   : Date.cpp 
	backend        : render_handler_agg.cpp 

Log message:
	Uniforming trunc() and check in libm if it already exists.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.409&r2=1.410
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/utility.h?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Date.cpp?cvsroot=gnash&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.cpp?cvsroot=gnash&r1=1.103&r2=1.104

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.409
retrieving revision 1.410
diff -u -b -r1.409 -r1.410
--- configure.ac	29 Aug 2007 17:34:06 -0000	1.409
+++ configure.ac	29 Aug 2007 22:20:10 -0000	1.410
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.409 2007/08/29 17:34:06 udog Exp $
+dnl $Id: configure.ac,v 1.410 2007/08/29 22:20:10 nihilus Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -789,6 +789,7 @@
 
 AC_CHECK_LIB(m, exp2, AC_DEFINE(HAVE_EXP2, 1, [Has exp2()]))
 AC_CHECK_LIB(m, log2, AC_DEFINE(HAVE_LOG2, 1, [Has log2()]))
+AC_CHECK_LIB(m, trunc, AC_DEFINE(HAVE_TRUNC, 1, [Has trunc()]))
 
 dnl don't look for X11 when using a raw framebuffer for the GUI
 if test x$build_gtk = xyes -o x$build_kde = xyes -o x$build_fltk = xyes -o x$build_sdl = xyes; then

Index: libbase/utility.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/utility.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- libbase/utility.h	29 Aug 2007 02:49:17 -0000	1.31
+++ libbase/utility.h	29 Aug 2007 22:20:10 -0000	1.32
@@ -118,7 +118,9 @@
 inline double	exp2(double x) { return std::pow((double)2, double(x)); }
 #endif
 inline int	frnd(float f) { return (int)(f + 0.5f); }	// replace with inline asm if desired
-
+#ifndef HAVE_TRUNC
+inline double trunc(x) ( x < 0 ?  -(std::floor(-x)) : std::floor(x) )
+#endif
 
 // Handy macro to quiet compiler warnings about unused parameters/variables.
 #define UNUSED(x) (x) = (x)

Index: server/asobj/Date.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Date.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- server/asobj/Date.cpp	1 Jul 2007 10:54:27 -0000	1.47
+++ server/asobj/Date.cpp	29 Aug 2007 22:20:10 -0000	1.48
@@ -79,6 +79,7 @@
 #endif
 
 #include "log.h"
+#include "utility.h"
 #include "Date.h"
 #include "fn_call.h"
 #include "GnashException.h"
@@ -94,10 +95,6 @@
 # include <sys/time.h>
 #endif
 
-#ifndef trunc
-#define trunc(x) ( x < 0 ?  -(std::floor(-x)) : std::floor(x) )
-#endif
-
 
 // Declaration for replacement timezone functions
 // In the absence of gettimeofday() we use ftime() to get milliseconds,

Index: backend/render_handler_agg.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_agg.cpp,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -b -r1.103 -r1.104
--- backend/render_handler_agg.cpp	29 Aug 2007 17:34:06 -0000	1.103
+++ backend/render_handler_agg.cpp	29 Aug 2007 22:20:10 -0000	1.104
@@ -17,7 +17,7 @@
 
  
 
-/* $Id: render_handler_agg.cpp,v 1.103 2007/08/29 17:34:06 udog Exp $ */
+/* $Id: render_handler_agg.cpp,v 1.104 2007/08/29 22:20:10 nihilus Exp $ */
 
 // Original version by Udo Giacomozzi and Hannes Mayr, 
 // INDUNET GmbH (www.indunet.it)
@@ -174,10 +174,6 @@
 #include "render_handler_agg_bitmap.h"
 #include "render_handler_agg_style.h"
 
-#ifndef trunc
-#define trunc(x) ( x < 0 ?  -(std::floor(-x)) : std::floor(x) )
-#endif
-
 #ifndef round
 #define round(x) rint(x)
 #endif



From MAILER-DAEMON Wed Aug 29 18:23:39 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQVwp-0008H8-DL
	for mharc-gnash-commit@gnu.org; Wed, 29 Aug 2007 18:23:39 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQVwn-0008H3-UU
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 18:23:37 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQVwn-0008Go-9g
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 18:23:37 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQVwn-0008Gl-63
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 18:23:37 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1IQVwm-0003Ae-Ko
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 18:23:36 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <markus@unixrus.se>) id 1IQVwl-00084R-Dp
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 22:23:35 +0000
Received: from nihilus by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <nihilus@savannah.gnu.org>) id 1IQVwk-00084M-Tk
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 22:23:35 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQVwk-00084M-Tk@cvs.savannah.gnu.org>
From: Markus Gothe <markus@unixrus.se>
Date: Wed, 29 Aug 2007 22:23:34 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Aug 2007 22:23:38 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Markus Gothe <nihilus>	07/08/29 22:23:34

Modified files:
	.              : ChangeLog 

Log message:
	Forgot the ChangeLog - Unified trunc() and added checking.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4151&r2=1.4152

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4151
retrieving revision 1.4152
diff -u -b -r1.4151 -r1.4152
--- ChangeLog	29 Aug 2007 18:38:34 -0000	1.4151
+++ ChangeLog	29 Aug 2007 22:23:34 -0000	1.4152
@@ -1,3 +1,9 @@
+2007-08-30 Markus Gothe <nietzsche@lysator.liu.se>
+
+	* configure.ac, libbase/utility.h, server/asobj/Date.cpp,
+	backend/render_handler_agg.cpp: Unified trunc() and added
+	checking.
+
 2007-08-29 Sandro Santilli <strk@keybit.net>
 
 	* testsuite/actionscript.all/: Key.as, Mouse.as, Selection.as,



From MAILER-DAEMON Wed Aug 29 18:29:44 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQW2i-0000Yy-6d
	for mharc-gnash-commit@gnu.org; Wed, 29 Aug 2007 18:29:44 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQW2h-0000YG-5r
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 18:29:43 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQW2g-0000Xv-OI
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 18:29:42 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQW2g-0000Xs-EQ
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 18:29:42 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1IQW2g-000407-8o
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 18:29:42 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <markus@unixrus.se>) id 1IQW2f-0008Mb-7u
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 22:29:41 +0000
Received: from nihilus by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <nihilus@savannah.gnu.org>) id 1IQW2f-0008MX-3q
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 22:29:41 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQW2f-0008MX-3q@cvs.savannah.gnu.org>
From: Markus Gothe <markus@unixrus.se>
Date: Wed, 29 Aug 2007 22:29:41 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog configure.ac
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Aug 2007 22:29:43 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Markus Gothe <nihilus>	07/08/29 22:29:41

Modified files:
	.              : ChangeLog configure.ac 

Log message:
	keep bourn-sh, /bin/h, happy.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4152&r2=1.4153
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.410&r2=1.411

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4152
retrieving revision 1.4153
diff -u -b -r1.4152 -r1.4153
--- ChangeLog	29 Aug 2007 22:23:34 -0000	1.4152
+++ ChangeLog	29 Aug 2007 22:29:40 -0000	1.4153
@@ -3,6 +3,7 @@
 	* configure.ac, libbase/utility.h, server/asobj/Date.cpp,
 	backend/render_handler_agg.cpp: Unified trunc() and added
 	checking.
+	* configure.ac: keep bourn-sh, /bin/h, happy.
 
 2007-08-29 Sandro Santilli <strk@keybit.net>
 

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -b -r1.410 -r1.411
--- configure.ac	29 Aug 2007 22:20:10 -0000	1.410
+++ configure.ac	29 Aug 2007 22:29:40 -0000	1.411
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.410 2007/08/29 22:20:10 nihilus Exp $
+dnl $Id: configure.ac,v 1.411 2007/08/29 22:29:40 nihilus Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -1879,7 +1879,7 @@
     echo "               Install it from http://www.libsdl.org/download-1.2.php"
     echo "               or .deb users: apt-get install libsdl1.2-dev"
     echo "               or .rpm users: yum install SDL-devel"
-    [ x$build_sdl == xyes ] &&
+    [ x$build_sdl = xyes ] &&
 	echo "               or select a different GUI with --enable-gui= "
     [ x"$media_handler" = x"ffmpeg" -o x"$media_handler" = x"mad" ] &&
 	echo "               or use --enable-media=gst"



From MAILER-DAEMON Wed Aug 29 18:30:12 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQW3A-0000oH-K1
	for mharc-gnash-commit@gnu.org; Wed, 29 Aug 2007 18:30:12 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQW38-0000me-P8
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 18:30:10 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQW37-0000m9-Uy
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 18:30:10 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQW37-0000m4-O2
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 18:30:09 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1IQW37-00047V-4V
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 18:30:09 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <markus@unixrus.se>) id 1IQW36-0008Oq-67
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 22:30:08 +0000
Received: from nihilus by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <nihilus@savannah.gnu.org>) id 1IQW35-0008Om-Ns
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 22:30:07 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQW35-0008Om-Ns@cvs.savannah.gnu.org>
From: Markus Gothe <markus@unixrus.se>
Date: Wed, 29 Aug 2007 22:30:07 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Aug 2007 22:30:11 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Markus Gothe <nihilus>	07/08/29 22:30:07

Modified files:
	.              : ChangeLog 

Log message:
	/bin/Sh

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4153&r2=1.4154

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4153
retrieving revision 1.4154
diff -u -b -r1.4153 -r1.4154
--- ChangeLog	29 Aug 2007 22:29:40 -0000	1.4153
+++ ChangeLog	29 Aug 2007 22:30:07 -0000	1.4154
@@ -3,7 +3,7 @@
 	* configure.ac, libbase/utility.h, server/asobj/Date.cpp,
 	backend/render_handler_agg.cpp: Unified trunc() and added
 	checking.
-	* configure.ac: keep bourn-sh, /bin/h, happy.
+	* configure.ac: keep bourn-sh, /bin/sh, happy.
 
 2007-08-29 Sandro Santilli <strk@keybit.net>
 



From MAILER-DAEMON Wed Aug 29 18:32:16 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQW5A-00022f-FA
	for mharc-gnash-commit@gnu.org; Wed, 29 Aug 2007 18:32:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQW59-00022S-Ny
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 18:32:15 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQW59-00022G-8x
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 18:32:15 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQW59-00022D-6J
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 18:32:15 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1IQW58-0004ix-Uc
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 18:32:15 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <markus@unixrus.se>) id 1IQW58-0008UA-HS
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 22:32:14 +0000
Received: from nihilus by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <nihilus@savannah.gnu.org>) id 1IQW58-0008U7-DR
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 22:32:14 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQW58-0008U7-DR@cvs.savannah.gnu.org>
From: Markus Gothe <markus@unixrus.se>
Date: Wed, 29 Aug 2007 22:32:14 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog macros/libexe.m4
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Aug 2007 22:32:15 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Markus Gothe <nihilus>	07/08/29 22:32:14

Modified files:
	.              : ChangeLog 
	macros         : libexe.m4 

Log message:
	Another bashism fixed

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4154&r2=1.4155
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/libexe.m4?cvsroot=gnash&r1=1.8&r2=1.9

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4154
retrieving revision 1.4155
diff -u -b -r1.4154 -r1.4155
--- ChangeLog	29 Aug 2007 22:30:07 -0000	1.4154
+++ ChangeLog	29 Aug 2007 22:32:13 -0000	1.4155
@@ -3,7 +3,7 @@
 	* configure.ac, libbase/utility.h, server/asobj/Date.cpp,
 	backend/render_handler_agg.cpp: Unified trunc() and added
 	checking.
-	* configure.ac: keep bourn-sh, /bin/sh, happy.
+	* configure.ac, macros/libexe.m4: keep bourne-sh, /bin/sh, happy.
 
 2007-08-29 Sandro Santilli <strk@keybit.net>
 

Index: macros/libexe.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/libexe.m4,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- macros/libexe.m4	1 Jul 2007 10:54:13 -0000	1.8
+++ macros/libexe.m4	29 Aug 2007 22:32:14 -0000	1.9
@@ -27,13 +27,13 @@
   LIBPRE="lib"
 
   if test "x$LIBPRE" != "x" ; then
-    if test x"$EXEEXT"	== "exe"; then
+    if test x"$EXEEXT"	= "exe"; then
       LIBPRE="lib"
     fi
   fi
 
   if test "x$LIBEXT" != "x" ; then
-    if test x"$EXEEXT"	== "exe"; then
+    if test x"$EXEEXT"	= "exe"; then
       LIBEXT="dll"
     fi
   fi



From MAILER-DAEMON Wed Aug 29 18:34:43 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQW7X-00030r-PB
	for mharc-gnash-commit@gnu.org; Wed, 29 Aug 2007 18:34:43 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQW7V-00030J-1A
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 18:34:41 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQW7U-0002zz-AP
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 18:34:40 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQW7U-0002zw-5d
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 18:34:40 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1IQW7T-00052n-Kk
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 18:34:39 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <markus@unixrus.se>) id 1IQW7T-00006c-6y
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 22:34:39 +0000
Received: from nihilus by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <nihilus@savannah.gnu.org>) id 1IQW7T-00006W-2j
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 22:34:39 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQW7T-00006W-2j@cvs.savannah.gnu.org>
From: Markus Gothe <markus@unixrus.se>
Date: Wed, 29 Aug 2007 22:34:39 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog macros/kde.m4
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Aug 2007 22:34:41 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Markus Gothe <nihilus>	07/08/29 22:34:39

Modified files:
	.              : ChangeLog 
	macros         : kde.m4 

Log message:
	Another bashism found, no wonder why I top the ci-list at work ;)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4155&r2=1.4156
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/kde.m4?cvsroot=gnash&r1=1.35&r2=1.36

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4155
retrieving revision 1.4156
diff -u -b -r1.4155 -r1.4156
--- ChangeLog	29 Aug 2007 22:32:13 -0000	1.4155
+++ ChangeLog	29 Aug 2007 22:34:38 -0000	1.4156
@@ -3,7 +3,8 @@
 	* configure.ac, libbase/utility.h, server/asobj/Date.cpp,
 	backend/render_handler_agg.cpp: Unified trunc() and added
 	checking.
-	* configure.ac, macros/libexe.m4: keep bourne-sh, /bin/sh, happy.
+	* configure.ac, macros/libexe.m4, macros/kde.m4: 
+	keep bourne-sh, /bin/sh, happy.
 
 2007-08-29 Sandro Santilli <strk@keybit.net>
 

Index: macros/kde.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/kde.m4,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- macros/kde.m4	3 Aug 2007 03:01:16 -0000	1.35
+++ macros/kde.m4	29 Aug 2007 22:34:38 -0000	1.36
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: kde.m4,v 1.35 2007/08/03 03:01:16 rsavoye Exp $
+dnl $Id: kde.m4,v 1.36 2007/08/29 22:34:38 nihilus Exp $
 
 AC_DEFUN([GNASH_PATH_KDE],
 [
@@ -192,7 +192,7 @@
 dnl so we set topdir to /usr so that $topdir/lib/libqt-mt.* works below,
 dnl and version to 3 or whatever.
 dnl incllist is inherited from configure.ac.
-  if test "x$gnash_qt_version" == x; then
+  if test "x$gnash_qt_version" = x; then
     for i in $incllist; do
       for j in `ls -dr $i/qt[[0-9]] 2>/dev/null`; do
         if test -f $j/qobject.h; then



From MAILER-DAEMON Wed Aug 29 19:18:04 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQWnU-0005Xd-M7
	for mharc-gnash-commit@gnu.org; Wed, 29 Aug 2007 19:18:04 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQWnT-0005Uy-DT
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 19:18:03 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQWnR-0005Tn-Vd
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 19:18:02 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQWnR-0005Tc-Qe
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 19:18:01 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1IQWnR-0002bX-IW
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 19:18:01 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <markus@unixrus.se>) id 1IQWnQ-0004sc-9c
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 23:18:00 +0000
Received: from nihilus by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <nihilus@savannah.gnu.org>) id 1IQWnP-0004sY-UY
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 23:18:00 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQWnP-0004sY-UY@cvs.savannah.gnu.org>
From: Markus Gothe <markus@unixrus.se>
Date: Wed, 29 Aug 2007 23:17:59 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/libbase utility.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Aug 2007 23:18:03 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Markus Gothe <nihilus>	07/08/29 23:17:59

Modified files:
	libbase        : utility.h 

Log message:
	Forgot to declare 'x'x as a double

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/utility.h?cvsroot=gnash&r1=1.32&r2=1.33

Patches:
Index: utility.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/utility.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- utility.h	29 Aug 2007 22:20:10 -0000	1.32
+++ utility.h	29 Aug 2007 23:17:59 -0000	1.33
@@ -119,7 +119,7 @@
 #endif
 inline int	frnd(float f) { return (int)(f + 0.5f); }	// replace with inline asm if desired
 #ifndef HAVE_TRUNC
-inline double trunc(x) ( x < 0 ?  -(std::floor(-x)) : std::floor(x) )
+inline double trunc(double x) ( x < 0 ?  -(std::floor(-x)) : std::floor(x) )
 #endif
 
 // Handy macro to quiet compiler warnings about unused parameters/variables.



From MAILER-DAEMON Wed Aug 29 19:19:49 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQWpB-0006Uj-4V
	for mharc-gnash-commit@gnu.org; Wed, 29 Aug 2007 19:19:49 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQWp9-0006TR-3Z
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 19:19:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQWp8-0006SO-Bv
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 19:19:46 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQWp7-0006SB-U0
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 19:19:45 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1IQWp7-0002sD-NN
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 19:19:45 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <markus@unixrus.se>) id 1IQWp7-0004uz-9l
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 23:19:45 +0000
Received: from nihilus by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <nihilus@savannah.gnu.org>) id 1IQWp7-0004uw-5b
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 23:19:45 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQWp7-0004uw-5b@cvs.savannah.gnu.org>
From: Markus Gothe <markus@unixrus.se>
Date: Wed, 29 Aug 2007 23:19:45 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/libbase utility.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Aug 2007 23:19:47 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Markus Gothe <nihilus>	07/08/29 23:19:45

Modified files:
	libbase        : utility.h 

Log message:
	More fixes on trunc()

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/utility.h?cvsroot=gnash&r1=1.33&r2=1.34

Patches:
Index: utility.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/utility.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- utility.h	29 Aug 2007 23:17:59 -0000	1.33
+++ utility.h	29 Aug 2007 23:19:45 -0000	1.34
@@ -119,7 +119,7 @@
 #endif
 inline int	frnd(float f) { return (int)(f + 0.5f); }	// replace with inline asm if desired
 #ifndef HAVE_TRUNC
-inline double trunc(double x) ( x < 0 ?  -(std::floor(-x)) : std::floor(x) )
+inline double trunc(double x) { return (x < 0 ?  -(std::floor(-x)) : std::floor(x)); }
 #endif
 
 // Handy macro to quiet compiler warnings about unused parameters/variables.



From MAILER-DAEMON Wed Aug 29 19:29:59 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQWz1-0005jA-CB
	for mharc-gnash-commit@gnu.org; Wed, 29 Aug 2007 19:29:59 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQWyz-0005fj-3U
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 19:29:57 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQWyy-0005dz-Bx
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 19:29:56 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQWyy-0005dj-2f
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 19:29:56 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1IQWyx-0004T5-Pf
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 19:29:55 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <markus@unixrus.se>) id 1IQWyw-00055U-Pd
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 23:29:54 +0000
Received: from nihilus by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <nihilus@savannah.gnu.org>) id 1IQWyw-00055R-LP
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 23:29:54 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQWyw-00055R-LP@cvs.savannah.gnu.org>
From: Markus Gothe <markus@unixrus.se>
Date: Wed, 29 Aug 2007 23:29:54 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog macros/boost.m4
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Aug 2007 23:29:57 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Markus Gothe <nihilus>	07/08/29 23:29:54

Modified files:
	.              : ChangeLog 
	macros         : boost.m4 

Log message:
	Fixed an issue with using CFLAGS in a C++-context.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4156&r2=1.4157
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/boost.m4?cvsroot=gnash&r1=1.48&r2=1.49

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4156
retrieving revision 1.4157
diff -u -b -r1.4156 -r1.4157
--- ChangeLog	29 Aug 2007 22:34:38 -0000	1.4156
+++ ChangeLog	29 Aug 2007 23:29:53 -0000	1.4157
@@ -5,6 +5,7 @@
 	checking.
 	* configure.ac, macros/libexe.m4, macros/kde.m4: 
 	keep bourne-sh, /bin/sh, happy.
+	* macros/boost.m4: Fixed issue with lib-checking.
 
 2007-08-29 Sandro Santilli <strk@keybit.net>
 

Index: macros/boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- macros/boost.m4	22 Aug 2007 10:52:52 -0000	1.48
+++ macros/boost.m4	29 Aug 2007 23:29:54 -0000	1.49
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: boost.m4,v 1.48 2007/08/22 10:52:52 strk Exp $
+dnl $Id: boost.m4,v 1.49 2007/08/29 23:29:54 nihilus Exp $
 
 dnl Boost modules are:
 dnl date-time, filesystem. graph. iostreams, program options, python,
@@ -90,7 +90,7 @@
   boost_thread="no"
   AC_MSG_CHECKING([for Boost libraries])
   for i in $libslist; do
-    if test x${boost_date_time} = xyes && test x${boost_thread} = xyes; then
+    if test x${boost_date_time} = xyes -a x${boost_thread} = xyes; then
       break;
     fi
     dirs=`ls -dr $i/libboost_date_time*.${shlibext} $i/libboost_date_time*.${shlibext}.* $i/libboost_date_time*.a 2>/dev/null`
@@ -120,7 +120,7 @@
         lfile=`basename ${libname} | eval sed -e 's:^lib::'  -e 's:.a$::' -e 's:\.${shlibext}.*::'`
         ldir=`dirname ${libname}`
         if test -f ${ldir}/lib${lfile}-mt.${shlibext}; then
-          lfile=${lfile}-mt
+          lfile="${lfile}-mt"
         fi
         boost_thread=yes
         ac_cv_path_boost_lib="${ac_cv_path_boost_lib} -l${lfile}"
@@ -142,10 +142,8 @@
 
   if test x${cross_compiling} = xno; then
     AC_LANG_PUSH(C++)  
-    save_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS $BOOST_CFLAGS"
+    CXXFLAGS="$CFLAGS $BOOST_CFLAGS"
     AC_CHECK_HEADERS([boost/thread.hpp], [], [boost_thread=no]) 
-    CFLAGS="$save_CFLAGS"
     AC_LANG_POP(C++)  
   fi # if not cross-compiling
 



From MAILER-DAEMON Wed Aug 29 20:12:22 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQXe1-0003Kr-WA
	for mharc-gnash-commit@gnu.org; Wed, 29 Aug 2007 20:12:22 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQXe1-0003J2-3L
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 20:12:21 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQXe0-0003HJ-EP
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 20:12:20 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQXe0-0003HC-9H
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 20:12:20 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1IQXe0-0001wF-3N
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 20:12:20 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <markus@unixrus.se>) id 1IQXdz-0007eD-8x
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 00:12:19 +0000
Received: from nihilus by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <nihilus@savannah.gnu.org>) id 1IQXdz-0007e7-3a
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 00:12:19 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQXdz-0007e7-3a@cvs.savannah.gnu.org>
From: Markus Gothe <markus@unixrus.se>
Date: Thu, 30 Aug 2007 00:12:19 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash configure.ac
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Aug 2007 00:12:21 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Markus Gothe <nihilus>	07/08/30 00:12:19

Modified files:
	.              : configure.ac 

Log message:
	bourne-sh fix

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.411&r2=1.412

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.411
retrieving revision 1.412
diff -u -b -r1.411 -r1.412
--- configure.ac	29 Aug 2007 22:29:40 -0000	1.411
+++ configure.ac	30 Aug 2007 00:12:18 -0000	1.412
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.411 2007/08/29 22:29:40 nihilus Exp $
+dnl $Id: configure.ac,v 1.412 2007/08/30 00:12:18 nihilus Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)



From MAILER-DAEMON Wed Aug 29 20:18:39 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQXk7-0004sR-Qr
	for mharc-gnash-commit@gnu.org; Wed, 29 Aug 2007 20:18:39 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQXk6-0004rQ-Lg
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 20:18:38 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQXk6-0004qP-0d
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 20:18:38 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQXk5-0004qB-SD
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 20:18:37 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1IQXk5-0002g1-83
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 20:18:37 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l7U0IVW34775;
	Thu, 30 Aug 2007 02:18:31 +0200 (CEST)
	(envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Thu, 30 Aug 2007 02:18:31 +0200
To: Markus Gothe <markus@unixrus.se>
Subject: Re: [Gnash-commit] gnash/libbase utility.h
Message-ID: <20070830001831.GA27170@keybit.net>
Mail-Followup-To: Markus Gothe <markus@unixrus.se>, gnash-commit@gnu.org
References: <E1IQWnP-0004sY-UY@cvs.savannah.gnu.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1IQWnP-0004sY-UY@cvs.savannah.gnu.org>
X-Detected-Kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Aug 2007 00:18:38 -0000

On Wed, Aug 29, 2007 at 11:17:59PM +0000, Markus Gothe wrote:

> -inline double trunc(x) ( x < 0 ?  -(std::floor(-x)) : std::floor(x) )
> +inline double trunc(double x) ( x < 0 ?  -(std::floor(-x)) : std::floor(x) )

There's also a truncf function for floats, I bet we're indeed using floats usually, so these
functions will trigger unneeded conversion of the floats to doubles.

Worth a review of the callers...

--strk;




From MAILER-DAEMON Wed Aug 29 21:02:55 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQYQx-0003KM-1i
	for mharc-gnash-commit@gnu.org; Wed, 29 Aug 2007 21:02:55 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQYQu-0003FO-WC
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 21:02:53 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQYQt-0003CQ-Nq
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 21:02:52 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQYQt-0003C8-KM
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 21:02:51 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IQYQt-0008L0-5y
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 21:02:51 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IQYQs-0002Zq-6o
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 01:02:50 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IQYQs-0002Zn-2T
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 01:02:50 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQYQs-0002Zn-2T@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 30 Aug 2007 01:02:50 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/array.h server/vm/fn_call.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Aug 2007 01:02:53 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/30 01:02:50

Modified files:
	.              : ChangeLog 
	server         : array.h 
	server/vm      : fn_call.h 

Log message:
	        * server/array.h: document the push method, use some typedefs for
	          semplicity (iterators).
	        * server/vm/fn_call.h: add string-returning dump_args().

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4157&r2=1.4158
http://cvs.savannah.gnu.org/viewcvs/gnash/server/array.h?cvsroot=gnash&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/fn_call.h?cvsroot=gnash&r1=1.10&r2=1.11

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4157
retrieving revision 1.4158
diff -u -b -r1.4157 -r1.4158
--- ChangeLog	29 Aug 2007 23:29:53 -0000	1.4157
+++ ChangeLog	30 Aug 2007 01:02:49 -0000	1.4158
@@ -1,3 +1,9 @@
+2007-08-30 Sandro Santilli <strk@keybit.net>
+
+	* server/array.h: document the push method, use some typedefs for
+	  semplicity (iterators).
+	* server/vm/fn_call.h: add string-returning dump_args().
+
 2007-08-30 Markus Gothe <nietzsche@lysator.liu.se>
 
 	* configure.ac, libbase/utility.h, server/asobj/Date.cpp,

Index: server/array.h
===================================================================
RCS file: /sources/gnash/gnash/server/array.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- server/array.h	3 Aug 2007 21:10:19 -0000	1.32
+++ server/array.h	30 Aug 2007 01:02:49 -0000	1.33
@@ -55,6 +55,12 @@
 
 public:
 
+	typedef std::deque<as_value> container;
+
+	typedef container::const_iterator const_iterator;
+	typedef container::iterator iterator;
+
+
 	/// Sort flags
 	enum SortFlags {
 
@@ -87,10 +93,15 @@
 
 	std::deque<indexed_as_value> get_indexed_elements();
 
-	std::deque<as_value>::const_iterator begin();
+	const_iterator begin();
 
-	std::deque<as_value>::const_iterator end();
+	const_iterator end();
 
+	/// Push an element to the end of the array
+	//
+	/// @param val
+	/// 	The element to add 
+	///
 	void push(const as_value& val);
 
 	void unshift(const as_value& val);
@@ -276,8 +287,6 @@
 
 private:
 
-	typedef std::deque<as_value> container;
-
 	container elements;
 
 	// this function is used internally by set_member and get_member

Index: server/vm/fn_call.h
===================================================================
RCS file: /sources/gnash/gnash/server/vm/fn_call.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/vm/fn_call.h	1 Jul 2007 10:54:37 -0000	1.10
+++ server/vm/fn_call.h	30 Aug 2007 01:02:49 -0000	1.11
@@ -32,6 +32,7 @@
 
 #include <cassert> // for inlines (arg)
 #include <ostream> // for inlines (dump_args)
+#include <sstream> // for inlines (dump_args)
 
 namespace gnash {
 
@@ -108,6 +109,14 @@
 		}
 	}
 
+	/// Return arguments as a string (for debugging)
+	std::string dump_args() const
+	{
+		std::stringstream ss;
+		dump_args(ss);
+		return ss.str();
+	}
+
 private:
 	/// The ActionScript environment in which the function call is taking
 	/// place. This contains, among other things, the function arguments.



From MAILER-DAEMON Wed Aug 29 21:07:51 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQYVj-0006Z2-Ik
	for mharc-gnash-commit@gnu.org; Wed, 29 Aug 2007 21:07:51 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQYVi-0006YQ-Uq
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 21:07:50 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQYVh-0006Wc-D4
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 21:07:49 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQYVh-0006WZ-72
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 21:07:49 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1IQYVg-0000SS-Rd
	for gnash-commit@gnu.org; Wed, 29 Aug 2007 21:07:48 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <markus@unixrus.se>) id 1IQYVf-0002nf-Tb
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 01:07:48 +0000
Received: from nihilus by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <nihilus@savannah.gnu.org>) id 1IQYVf-0002nc-P6
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 01:07:47 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQYVf-0002nc-P6@cvs.savannah.gnu.org>
From: Markus Gothe <markus@unixrus.se>
Date: Thu, 30 Aug 2007 01:07:47 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/po sv.po
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Aug 2007 01:07:51 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Markus Gothe <nihilus>	07/08/30 01:07:47

Modified files:
	po             : sv.po 

Log message:
	some minor updates

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/po/sv.po?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: sv.po
===================================================================
RCS file: /sources/gnash/gnash/po/sv.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- sv.po	10 Jun 2007 20:13:23 -0000	1.2
+++ sv.po	30 Aug 2007 01:07:47 -0000	1.3
@@ -59,24 +59,24 @@
 #: backend/sound_handler_sdl.cpp:304
 #, c-format
 msgid "Unable to start SDL sound: %s"
-msgstr "Kann SDL-Audioausgabe nicht starten: %s"
+msgstr "Kan inte spela ljud via SDL: %s"
 
 #: backend/sound_handler_sdl.cpp:496
 #, c-format
 msgid "Unable to start aux SDL sound: %s"
-msgstr "Kann Aux-SDL-Audioausgabe nicht starten: %s"
+msgstr "Kan inte spela ljud via aux: %s"
 
 #: backend/sound_handler_sdl.cpp:717
 #, c-format
 msgid "Negative buffer length in sdl_audio_callback (%d)"
-msgstr "Negative PufferlÃ¤nge in sdl_audio_callback (%d)"
+msgstr "Negativ bufferlängd i sdl_audio_callback (%d)"
 
 #: backend/sound_handler_sdl.cpp:834
 msgid ""
 "Error while decoding MP3-stream.  Upgrading ffmpeg/libavcodec might fix this "
 "issue."
-msgstr "Fehler beim Dekodieren des MP3-Streams. Eine Aktualisierung von "
-"ffmpeg/libavcodec kÃ¶nnte dieses Problem beheben."
+msgstr "Fel uppstod under avkodandet av MP3-ström. En uppgradering av"
+"ffmpeg/libavcodec kan åtgärda problemet."
 
 #: backend/sound_handler_sdl.cpp:864
 #, c-format
@@ -90,7 +90,7 @@
 
 #: backend/sound_handler_sdl.cpp:929
 msgid "Error in sound sample conversion"
-msgstr "Fehler bei Audio-Sample-Umwandlung"
+msgstr "Fel i sampling av ljudet"
 
 #: extensions/mysql/mysql_db.cpp:186
 msgid "Couldn't initialize database"
@@ -119,7 +119,7 @@
 #: extensions/mysql/mysql_db.cpp:265
 #, c-format
 msgid "Field name is: %s: "
-msgstr "Feldname ist: %s: "
+msgstr "Fältnamnet är: %s: "
 
 #: gui/gnash.cpp:73
 msgid ""
@@ -255,7 +255,7 @@
 
 #: gui/gnash.cpp:194
 msgid "Logging to disk enabled"
-msgstr "Logging auf Festplatte aktiviert"
+msgstr "Logging till disk aktiverat"
 
 #: gui/gnash.cpp:200
 msgid "No verbose actions; disabled at compile time"
@@ -268,7 +268,7 @@
 #: gui/gnash.cpp:218
 #, c-format
 msgid "Setting root URL to %s"
-msgstr "Setze Root-URL auf %s"
+msgstr "Sätter root-URL till %s"
 
 #: gui/gnash.cpp:224
 #, c-format
@@ -310,7 +310,7 @@
 #: gui/gui.cpp:460
 #, c-format
 msgid "Frame %d"
-msgstr "Bild %d"
+msgstr "Ruta %d"
 
 #: gui/Player.cpp:187
 msgid "Sound requested but no sound support compiled in"
@@ -333,12 +333,12 @@
 #: libamf/amf.cpp:189
 #, c-format
 msgid "Boolean is %d"
-msgstr "Boolean ist %d"
+msgstr "Boolean är %d"
 
 #: libamf/amf.cpp:202 libamf/amf.cpp:241
 #, c-format
 msgid "String is %s"
-msgstr "String ist %s"
+msgstr "String är %s"
 
 #: libamf/amf.cpp:218
 msgid "Undefined element"
@@ -346,11 +346,11 @@
 
 #: libamf/amf.cpp:234
 msgid "Date is "
-msgstr "Datum ist "
+msgstr "Datum är "
 
 #: libamf/amf.cpp:234
 msgid " nanoseconds"
-msgstr " Nanosekunden"
+msgstr " nanosekunder"
 
 #: libamf/amf.cpp:884
 #, c-format
@@ -524,7 +524,7 @@
 
 #: libbase/log.cpp:344
 msgid "ACTIONSCRIPT ERROR: "
-msgstr "ACTIONSCRIPT FEHLER: "
+msgstr "ACTIONSCRIPT FEL: "
 
 #: libbase/network.cpp:85
 msgid "Could not find a usable WinSock DLL"
@@ -675,23 +675,23 @@
 
 #: plugin/klash/klash.cpp:105
 msgid "Step Forward"
-msgstr "Vorspulen"
+msgstr "Spela framåt"
 
 #: plugin/klash/klash.cpp:106
 msgid "Step Backward"
-msgstr "ZurÃ¼ckspulen"
+msgstr "Spela bakåt"
 
 #: plugin/klash/klash.cpp:107
 msgid "Jump Forward"
-msgstr "VorwÃ¤rts springen"
+msgstr "Hoppa framåt"
 
 #: plugin/klash/klash.cpp:108
 msgid "Jump Backward"
-msgstr "ZurÃ¼ck springen"
+msgstr "Hoppa bakåt"
 
 #: plugin/klash/klash.cpp:109
 msgid "Quit Gnash"
-msgstr "Gnash beenden"
+msgstr "Avsluta Gnash"
 
 #: plugin/klash/klash.cpp:147
 msgid "Klash"
@@ -1870,7 +1870,7 @@
 #: server/asobj/xml.cpp:97 server/asobj/xml.cpp:115
 #, c-format
 msgid "Creating XML data at %p"
-msgstr ""
+msgstr "Skapar XML-data på %p"
 
 #: server/asobj/xml.cpp:130
 #, c-format
@@ -2290,7 +2290,7 @@
 #: server/edit_text_character.cpp:1254
 #, c-format
 msgid "VariableName: %s"
-msgstr ""
+msgstr "Variabelnamn: %s"
 
 #: server/edit_text_character.cpp:1269
 #, c-format



From MAILER-DAEMON Thu Aug 30 01:03:43 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQcBz-0003Be-1w
	for mharc-gnash-commit@gnu.org; Thu, 30 Aug 2007 01:03:43 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQcBv-00038H-TB
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 01:03:39 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQcBv-000385-82
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 01:03:39 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQcBv-000382-1H
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 01:03:39 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IQcBu-0004e1-JC
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 01:03:38 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IQcBu-0008DB-2Y
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 05:03:38 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IQcBt-0008CV-Qi
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 05:03:37 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQcBt-0008CV-Qi@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Thu, 30 Aug 2007 05:03:37 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-swfc.all/Makefil...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Aug 2007 05:03:40 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/30 05:03:37

Modified files:
	.              : ChangeLog 
	testsuite/misc-swfc.all: Makefile.am 
Added files:
	testsuite/misc-swfc.all: movieclip_destruction_test1.sc 

Log message:
	* testsuite/misc-swfc.all/movieclip_destruction_test1.sc: testcase about
	  movieclip destruction, also action execution order related.
	* testsuite/misc-swfc.all/Makefile.am: enable testcase.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4158&r2=1.4159
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/Makefile.am?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/movieclip_destruction_test1.sc?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4158
retrieving revision 1.4159
diff -u -b -r1.4158 -r1.4159
--- ChangeLog	30 Aug 2007 01:02:49 -0000	1.4158
+++ ChangeLog	30 Aug 2007 05:03:36 -0000	1.4159
@@ -1,3 +1,9 @@
+2007-08-30 Zou Lunkai <zoulunkai@gmail.com>
+	
+	* testsuite/misc-swfc.all/movieclip_destruction_test1.sc: testcase about
+	  movieclip destruction, also action execution order related.
+	* testsuite/misc-swfc.all/Makefile.am: enable testcase.
+	  
 2007-08-30 Sandro Santilli <strk@keybit.net>
 
 	* server/array.h: document the push method, use some typedefs for

Index: testsuite/misc-swfc.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- testsuite/misc-swfc.all/Makefile.am	29 Aug 2007 07:41:37 -0000	1.5
+++ testsuite/misc-swfc.all/Makefile.am	30 Aug 2007 05:03:37 -0000	1.6
@@ -23,6 +23,7 @@
 	hello.sc \
 	sound.sc \
 	soft_reference_test1.sc \
+	movieclip_destruction_test1.sc \
 	$(NULL)
 
 # These will get compiled to SWFs just as above, but will not be executed as a test

Index: testsuite/misc-swfc.all/movieclip_destruction_test1.sc
===================================================================
RCS file: testsuite/misc-swfc.all/movieclip_destruction_test1.sc
diff -N testsuite/misc-swfc.all/movieclip_destruction_test1.sc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-swfc.all/movieclip_destruction_test1.sc	30 Aug 2007 05:03:37 -0000	1.1
@@ -0,0 +1,123 @@
+/*
+ *   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */ 
+
+/*
+ * Zou Lunkai, zoulunkai@gmail.com
+ * 
+ * Test the exact destruction time about movieclips
+ *
+ * Timeline:
+ * 
+ *   Frame  | 1 | 2 | 3 | 4 | 5 | 6 | 7 |
+ *  --------+---+---+---+---+---+---+---+
+ *   Event  |   |P J|   | R |   | * |   |
+ * 
+ *  P = place (by PlaceObject2)
+ *  R = Remove (by RemoveObject2 tag)
+ *  J = jump
+ *  * = jump target
+ * 
+ * Description:
+ * 
+ *  frame2: character mc1 placed at depth -16381.
+ *          mc1 has two frams, _root.gotoAndStop(6) get executed in it's 2nd frame.
+ *  frame3: 
+ *  frame4: remove character -16381 
+ *  frame6: 
+ * 
+ * Expected behaviour:
+ *    (1) only part of the AS in a single action_buffer get executed;
+ *    (2) character get destroied at frame 4.
+ * 
+ */
+
+
+.flash  bbox=800x600 filename="movieclip_destruction_test1.swf" background=white version=6 fps=12
+
+.frame 1
+  .action:
+   #include "Dejagnu.sc"
+  .end
+  
+  // Define 3 shapes(b1, b2, b3)
+  .box b1 fill=green width=100 height=100
+  .box b2 fill=red width=100 height=100
+  .box b3 fill=yellow width=100 height=100
+
+
+.frame 2
+  
+  .sprite mc1 // Define a sprite named as mc1
+    .frame 1
+      .put b1 x = 300 y = 300
+    .frame 2    
+      .action:
+        _root.x = 0;
+        _root.gotoAndStop(6);
+        // AS below have no chance to be executed.
+        // Since mc1 will get removed during gotoFrame above.
+        _root.x = 100; 
+        _root.note("If you see this message, your player is bogus with action execution order");
+      .end
+  .end //end of sprite
+  
+  .put mc1 // Place mc1
+  
+  .action:
+    check_equals(typeof(mc1), 'movieclip');
+    check_equals(mc1.getDepth(), -16383);
+    mc.onLoad = function () {};
+    mc.onUnload = function () {trace('haha');};
+  .end
+
+
+.frame 3
+  .sprite mc2 // Define mc2 and add init_actions for it
+    .frame 1
+      .put b2 x = 300 y = 300
+  .end
+  
+	.initaction mc2: // Add initactions for mc2(mc2 is not placed)
+    check_equals(typeof(mc1), 'movieclip');
+    check_equals(mc1.getDepth(), -16383);
+  .end
+
+
+.frame 4
+
+  .sprite mc3 // Define mc2 and add initactions for it
+    .frame 1
+      .put b3 x = 300 y = 300
+  .end
+  
+  .initaction mc3: // Add initactions for mc3(mc3 is not placed)
+    _root.check_equals(mc1, null);
+    _root.check_equals(typeof(mc1), 'undefined');
+  .end
+
+  .del mc1  // Remove sprite mc1  
+
+
+.frame 6 // target frame
+  .action:
+    check_equals(_root.x, 0);
+    stop();
+  .end
+  
+.end
+



From MAILER-DAEMON Thu Aug 30 01:31:38 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQcd0-0001O9-7E
	for mharc-gnash-commit@gnu.org; Thu, 30 Aug 2007 01:31:38 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQccx-0001K9-0N
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 01:31:35 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQccw-0001Il-4i
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 01:31:34 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQccv-0001IV-R6
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 01:31:33 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IQccv-0008GF-Gc
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 01:31:33 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IQccu-0002dq-JV
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 05:31:32 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IQccu-0002dm-CM
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 05:31:32 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQccu-0002dm-CM@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Thu, 30 Aug 2007 05:31:32 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/testsuite/misc-swfc.all movieclip_destruc...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Aug 2007 05:31:35 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/30 05:31:32

Modified files:
	testsuite/misc-swfc.all: movieclip_destruction_test1.sc 

Log message:
	comments update

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/movieclip_destruction_test1.sc?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: movieclip_destruction_test1.sc
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/movieclip_destruction_test1.sc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- movieclip_destruction_test1.sc	30 Aug 2007 05:03:37 -0000	1.1
+++ movieclip_destruction_test1.sc	30 Aug 2007 05:31:32 -0000	1.2
@@ -41,8 +41,9 @@
  *  frame6: 
  * 
  * Expected behaviour:
- *    (1) only part of the AS in a single action_buffer get executed;
- *    (2) character get destroied at frame 4.
+ *    (1) only part of the AS in a single action_buffer(in the 2nd frame of mc1) 
+ *        get executed;
+ *    (2) character mc1 get destroied at frame 4.
  * 
  */
 
@@ -81,8 +82,6 @@
   .action:
     check_equals(typeof(mc1), 'movieclip');
     check_equals(mc1.getDepth(), -16383);
-    mc.onLoad = function () {};
-    mc.onUnload = function () {trace('haha');};
   .end
 
 



From MAILER-DAEMON Thu Aug 30 05:47:48 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQgcu-0007Ff-2i
	for mharc-gnash-commit@gnu.org; Thu, 30 Aug 2007 05:47:48 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQgcs-0007F2-IF
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 05:47:46 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQgcr-0007EY-Qq
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 05:47:45 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQgcr-0007EN-BB
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 05:47:45 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IQgcq-0006BC-QO
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 05:47:45 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IQgcj-0005PG-1z
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 09:47:37 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IQgci-0005P9-QS
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 09:47:36 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQgci-0005P9-QS@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 30 Aug 2007 09:47:36 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/Make...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Aug 2007 09:47:47 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/30 09:47:36

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: Makefile.am 
Added files:
	testsuite/actionscript.all: AsBroadcaster.as 

Log message:
	        * testsuite/actionscript.all/: Makefile.am, AsBroadcaster.as:
	          new test for AsBroadcaster.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4159&r2=1.4160
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Makefile.am?cvsroot=gnash&r1=1.77&r2=1.78
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/AsBroadcaster.as?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4159
retrieving revision 1.4160
diff -u -b -r1.4159 -r1.4160
--- ChangeLog	30 Aug 2007 05:03:36 -0000	1.4159
+++ ChangeLog	30 Aug 2007 09:47:35 -0000	1.4160
@@ -1,3 +1,8 @@
+2007-08-30 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/actionscript.all/: Makefile.am, AsBroadcaster.as:
+	  new test for AsBroadcaster.
+
 2007-08-30 Zou Lunkai <zoulunkai@gmail.com>
 	
 	* testsuite/misc-swfc.all/movieclip_destruction_test1.sc: testcase about

Index: testsuite/actionscript.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Makefile.am,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- testsuite/actionscript.all/Makefile.am	5 Aug 2007 06:04:58 -0000	1.77
+++ testsuite/actionscript.all/Makefile.am	30 Aug 2007 09:47:36 -0000	1.78
@@ -16,7 +16,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.77 2007/08/05 06:04:58 zoulunkai Exp $
+# $Id: Makefile.am,v 1.78 2007/08/30 09:47:36 strk Exp $
 
 AUTOMAKE_OPTIONS = dejagnu
 
@@ -68,6 +68,7 @@
 
 ## These are needed to properly set dependencies
 ASTESTS =			\
+	AsBroadcaster.as	\
 	array.as		\
 	delete.as		\
 	getvariable.as		\

Index: testsuite/actionscript.all/AsBroadcaster.as
===================================================================
RCS file: testsuite/actionscript.all/AsBroadcaster.as
diff -N testsuite/actionscript.all/AsBroadcaster.as
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/actionscript.all/AsBroadcaster.as	30 Aug 2007 09:47:36 -0000	1.1
@@ -0,0 +1,228 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// Test case for TextField ActionScript class
+// compile this test case with Ming makeswf, and then
+// execute it like this gnash -1 -r 0 -v out.swf
+
+rcsid="$Id: AsBroadcaster.as,v 1.1 2007/08/30 09:47:36 strk Exp $";
+
+#include "check.as"
+
+#if OUTPUT_VERSION < 6
+
+note();
+note("AsBroadcaster exists but doesn't provide any 'prototype' or 'initialize' for SWF < 6");
+
+xcheck_equals(typeof(AsBroadcaster), 'function'); // ???
+check_equals(typeof(AsBroadcaster.prototype), 'undefined'); 
+check_equals(typeof(AsBroadcaster.initialize), 'undefined');
+
+#else // OUTPUT_VERSION >= 6
+
+xcheck_equals(typeof(AsBroadcaster), 'function'); // ???
+xcheck_equals(typeof(AsBroadcaster.prototype), 'object'); 
+xcheck_equals(typeof(AsBroadcaster.initialize), 'function');
+
+bc = new AsBroadcaster;
+xcheck_equals(typeof(bc), 'object');
+xcheck(bc instanceof AsBroadcaster);
+check_equals(typeof(bc.addListener), 'undefined');
+check_equals(typeof(bc.removeListener), 'undefined');
+check_equals(typeof(bc.broadcastMessage), 'undefined');
+check_equals(typeof(bc.initialize), 'undefined');
+
+bcast = new Object;
+
+check_equals(typeof(bcast._listeners), 'undefined');
+check_equals(typeof(bcast.addListener), 'undefined');
+check_equals(typeof(bcast.removeListener), 'undefined');
+check_equals(typeof(bcast.broadcastMessage), 'undefined');
+
+AsBroadcaster.initialize(bcast);
+
+xcheck_equals(typeof(bcast._listeners), 'object');
+xcheck(bcast._listeners instanceof Array);
+xcheck_equals(bcast._listeners.length, 0);
+xcheck_equals(typeof(bcast.addListener), 'function');
+xcheck_equals(typeof(bcast.removeListener), 'function');
+xcheck_equals(typeof(bcast.broadcastMessage), 'function');
+
+//--------------------------------
+// Some insane calls...
+//--------------------------------
+
+ret = bcast.addListener();
+xcheck_equals(typeof(ret), 'boolean');
+xcheck_equals(ret, true);
+xcheck_equals(bcast._listeners.length, 1); // !!
+
+ret = bcast.addListener();
+xcheck_equals(bcast._listeners.length, 1); // undefined was already there as an element...
+
+ret = bcast.addListener(2);
+xcheck_equals(typeof(ret), 'boolean');
+xcheck_equals(ret, true);
+xcheck_equals(bcast._listeners.length, 2); // !!
+
+ret = bcast.addListener(2);
+xcheck_equals(bcast._listeners.length, 2); // 2 was already there as an element ...
+ret = bcast.addListener(3);
+xcheck_equals(bcast._listeners.length, 3); // 3 is a new element
+
+ret = bcast.removeListener(); // will remove the undefined value !
+xcheck_equals(typeof(ret), 'boolean');
+xcheck_equals(ret, true);
+xcheck_equals(bcast._listeners.length, 2); // element 'undefined' was removed
+
+ret = bcast.removeListener(2); // will remove the element number:2 !
+xcheck_equals(typeof(ret), 'boolean');
+xcheck_equals(ret, true);
+xcheck_equals(bcast._listeners.length, 1); // element '2' was removed
+
+ret = bcast.removeListener(3); // will remove the element number:3 !
+xcheck_equals(typeof(ret), 'boolean');
+xcheck_equals(ret, true);
+xcheck_equals(bcast._listeners.length, 0); // element '3' was removed
+
+ret = bcast.removeListener(); // no such element ?
+xcheck_equals(typeof(ret), 'boolean');
+xcheck_equals(ret, false);
+
+o = new Object; o.valueOf = function() { return 'yes I am'; };
+bcast.addListener(o);
+xcheck_equals(bcast._listeners.length, 1); 
+ret = bcast.removeListener('yes I am'); // valueOf invoked
+xcheck_equals(typeof(ret), 'boolean');
+xcheck_equals(ret, true);
+xcheck_equals(bcast._listeners.length, 0); // element '3' was removed
+
+o.addListener = bcast.addListener;
+check_equals(typeof(o._listeners), 'undefined');
+check_equals(typeof(o.removeListenerCalled), 'undefined');
+ret = o.addListener(); // automatically attempts to call o.removeListener()
+xcheck_equals(typeof(ret), 'boolean');
+xcheck_equals(ret, true);
+check_equals(typeof(o._listeners), 'undefined');
+
+o.removeListener = function() { this.removeListenerCalled = true; };
+ret = o.addListener(); // automatically calls o.removeListener()
+xcheck_equals(typeof(ret), 'boolean');
+xcheck_equals(ret, true);
+check_equals(typeof(o._listeners), 'undefined');
+xcheck_equals(typeof(o.removeListenerCalled), 'boolean');
+xcheck_equals(o.removeListenerCalled, true);
+
+o.removeListener = bcast.removeListener;
+o._listeners = new Object();
+o._listeners.push = function() { this.pushCalled = true; this.length++; };
+o._listeners.splice = function() { this.spliceCalled = true; };
+o._listeners.length = 1;
+o._listeners['0'] = 5;
+ret = o.addListener(5); // automatically calls o._listeners.splice and o._listeners.push
+xcheck_equals(o._listeners.pushCalled, true);
+xcheck_equals(o._listeners.length, 2);
+xcheck_equals(o._listeners.spliceCalled, true);
+
+
+//--------------------------------
+// A bit more sane calls...
+//--------------------------------
+
+counter = 0;
+
+onTest = function()
+{
+	//note(" Called "+this.name+".onTest (order "+this.order+"->"+(counter+1)+")");
+	this.order = ++counter;
+};
+
+a = new Object; a.name = 'a'; a.onTest = onTest;
+b = new Object; b.name = 'b'; b.onTest = onTest;
+
+ret = bcast.addListener(a);
+xcheck_equals(typeof(ret), 'boolean');
+xcheck_equals(ret, true);
+ret = bcast.addListener(b);
+xcheck_equals(typeof(ret), 'boolean');
+xcheck_equals(ret, true);
+//note("Broadcasting");
+ret = bcast.broadcastMessage('onTest');
+xcheck_equals(typeof(ret), 'boolean');
+xcheck_equals(ret, true);
+xcheck_equals(a.order, 1);
+xcheck_equals(b.order, 2);
+
+ret = bcast.addListener(b); // b is not added again
+xcheck_equals(typeof(ret), 'boolean');
+xcheck_equals(ret, true);
+//note("Broadcasting");
+bcast.broadcastMessage('onTest');
+xcheck_equals(a.order, 3);
+xcheck_equals(b.order, 4);
+
+ret = bcast.addListener(a); // listener a is moved from first to last position to _listeners
+xcheck_equals(typeof(ret), 'boolean');
+xcheck_equals(ret, true);
+//note("Broadcasting");
+bcast.broadcastMessage('onTest');
+xcheck_equals(b.order, 5);
+xcheck_equals(a.order, 6);
+
+bcast._listeners.push(a); // force double a listener
+//note("Broadcasting");
+bcast.broadcastMessage('onTest');
+xcheck_equals(b.order, 7);
+xcheck_equals(a.order, 9); // a.order was set twice
+
+bcast.addListener(a); // first a is moved from first to last position to _listeners
+//note("Broadcasting");
+ret = bcast.broadcastMessage('onTest');
+xcheck_equals(typeof(ret), 'boolean');
+xcheck_equals(ret, true);
+xcheck_equals(b.order, 10);
+xcheck_equals(a.order, 12); // a is still set twice
+
+bcast._listeners.push(b); // force double b, order should now be: b,a,a,b
+//note("Broadcasting");
+bcast.broadcastMessage('onTest');
+xcheck_equals(b.order, 16); 
+xcheck_equals(a.order, 15); 
+
+ret = bcast.addListener(b); // *first* b is removed, another one added, new order is a,a,b,b
+xcheck_equals(typeof(ret), 'boolean');
+xcheck_equals(ret, true);
+//note("Broadcasting");
+bcast.broadcastMessage('onTest');
+xcheck_equals(a.order, 18); 
+xcheck_equals(b.order, 20);
+
+ret = bcast.removeListener(b); // only first is removed
+xcheck_equals(typeof(ret), 'boolean');
+xcheck_equals(ret, true);
+xcheck_equals(bcast._listeners.length, 3); // expect: a,a,b
+bcast.broadcastMessage('onTest');
+xcheck_equals(a.order, 22); 
+xcheck_equals(b.order, 23);
+
+// TODO: test broadcastMessage with additional arguments
+//       and effects of overriding Function.apply
+//	 (should have no effects, being broadcastMessage
+//        a native functioN)
+
+#endif // OUTPUT_VERSION >= 6
+



From MAILER-DAEMON Thu Aug 30 08:58:34 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQjbW-0007lW-2b
	for mharc-gnash-commit@gnu.org; Thu, 30 Aug 2007 08:58:34 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQjbU-0007iV-E3
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 08:58:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQjbT-0007gI-4E
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 08:58:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQjbT-0007g5-1M
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 08:58:31 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IQjbS-0003rT-Jp
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 08:58:30 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IQjbR-0002IW-W9
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 12:58:30 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IQjbR-0002IT-Pa
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 12:58:29 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQjbR-0002IT-Pa@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 30 Aug 2007 12:58:29 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-swfc.all/moviecl...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Aug 2007 12:58:32 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/30 12:58:29

Modified files:
	.              : ChangeLog 
	testsuite/misc-swfc.all: movieclip_destruction_test1.sc 

Log message:
	        * testsuite/misc-swfc.all/movieclip_destruction_test1.sc: expect
	          gnash failures.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4160&r2=1.4161
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/movieclip_destruction_test1.sc?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4160
retrieving revision 1.4161
diff -u -b -r1.4160 -r1.4161
--- ChangeLog	30 Aug 2007 09:47:35 -0000	1.4160
+++ ChangeLog	30 Aug 2007 12:58:28 -0000	1.4161
@@ -1,5 +1,7 @@
 2007-08-30 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/misc-swfc.all/movieclip_destruction_test1.sc: expect
+	  gnash failures.
 	* testsuite/actionscript.all/: Makefile.am, AsBroadcaster.as:
 	  new test for AsBroadcaster.
 

Index: testsuite/misc-swfc.all/movieclip_destruction_test1.sc
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/movieclip_destruction_test1.sc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/misc-swfc.all/movieclip_destruction_test1.sc	30 Aug 2007 05:31:32 -0000	1.2
+++ testsuite/misc-swfc.all/movieclip_destruction_test1.sc	30 Aug 2007 12:58:29 -0000	1.3
@@ -105,8 +105,8 @@
   .end
   
   .initaction mc3: // Add initactions for mc3(mc3 is not placed)
-    _root.check_equals(mc1, null);
-    _root.check_equals(typeof(mc1), 'undefined');
+    _root.xcheck_equals(mc1, null);
+    _root.xcheck_equals(typeof(mc1), 'undefined');
   .end
 
   .del mc1  // Remove sprite mc1  
@@ -114,7 +114,7 @@
 
 .frame 6 // target frame
   .action:
-    check_equals(_root.x, 0);
+    xcheck_equals(_root.x, 0);
     stop();
   .end
   



From MAILER-DAEMON Thu Aug 30 09:32:11 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQk83-0008RG-Cr
	for mharc-gnash-commit@gnu.org; Thu, 30 Aug 2007 09:32:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQk81-0008PU-OE
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 09:32:09 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQk80-0008OP-1q
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 09:32:08 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQk7z-0008OC-Rg
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 09:32:07 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IQk7z-0002ML-IK
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 09:32:07 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IQk7y-0004Sa-A6
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 13:32:06 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IQk7y-0004SX-6O
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 13:32:06 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQk7y-0004SX-6O@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 30 Aug 2007 13:32:06 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/character.h testsuite/ac...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Aug 2007 13:32:09 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/30 13:32:06

Modified files:
	.              : ChangeLog 
	server         : character.h 
	testsuite/actionscript.all: MovieClip.as 

Log message:
	        * server/character.h: add const for removed clips depth offset.
	        * testsuite/actionscript.all/MovieClip.as: test for depth shift when
	          onUnload method is defined and a clip is removed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4161&r2=1.4162
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.89&r2=1.90
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.84&r2=1.85

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4161
retrieving revision 1.4162
diff -u -b -r1.4161 -r1.4162
--- ChangeLog	30 Aug 2007 12:58:28 -0000	1.4161
+++ ChangeLog	30 Aug 2007 13:32:05 -0000	1.4162
@@ -1,5 +1,8 @@
 2007-08-30 Sandro Santilli <strk@keybit.net>
 
+	* server/character.h: add const for removed clips depth offset.
+	* testsuite/actionscript.all/MovieClip.as: test for depth shift when
+	  onUnload method is defined and a clip is removed.
 	* testsuite/misc-swfc.all/movieclip_destruction_test1.sc: expect
 	  gnash failures.
 	* testsuite/actionscript.all/: Makefile.am, AsBroadcaster.as:

Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- server/character.h	23 Aug 2007 16:50:56 -0000	1.89
+++ server/character.h	30 Aug 2007 13:32:05 -0000	1.90
@@ -19,7 +19,7 @@
 //
 //
 
-/* $Id: character.h,v 1.89 2007/08/23 16:50:56 strk Exp $ */
+/* $Id: character.h,v 1.90 2007/08/30 13:32:05 strk Exp $ */
 
 #ifndef GNASH_CHARACTER_H
 #define GNASH_CHARACTER_H
@@ -342,6 +342,16 @@
     ///
     static const int staticDepthOffset = -16384;
     
+    /// This is the offset at which character's depth is
+    /// shifted when a character is removed from stage but
+    /// an onUnload event handler is defined.
+    ///
+    /// Example: a character at depth 60 gets moved to
+    ///          depth -32829 (-32769-60) when unloaded and
+    ///          an onUnload event handler is defined for it.
+    ///
+    static const int removedDepthOffset = -32769; // -32769;
+    
     /// This value is used for m_clip_depth when the value has no meaning, ie.
     /// the character is not a mask. Depths below -16384 are illegal, so this
     /// value should not collide with real depths.  

Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- testsuite/actionscript.all/MovieClip.as	24 Aug 2007 16:07:27 -0000	1.84
+++ testsuite/actionscript.all/MovieClip.as	30 Aug 2007 13:32:05 -0000	1.85
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.84 2007/08/24 16:07:27 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.85 2007/08/30 13:32:05 strk Exp $";
 
 #include "check.as"
 
@@ -418,25 +418,45 @@
 #if OUTPUT_VERSION >= 6
 
 softref = _root.createEmptyMovieClip("hardref", 60);
+softref2 = _root.createEmptyMovieClip("hardref2", 70);
+hardref2.onUnload = function() { /*note(this+".onUnload called");*/ };
 check_equals(typeof(hardref), 'movieclip');
 check_equals(typeof(softref), 'movieclip');
+check_equals(typeof(hardref2), 'movieclip');
+check_equals(typeof(softref2), 'movieclip');
 softref.member = 1;
+softref2.member = 2;
 check_equals(typeof(softref.member), 'number');
+check_equals(typeof(softref2.member), 'number');
 check_equals(softref.member, 1);
+check_equals(softref2.member, 2);
 check_equals(softref._target, "/hardref");
+check_equals(softref2._target, "/hardref2");
 #if OUTPUT_VERSION > 6
-check_equals(getInstanceAtDepth(60), hardref);
-removeMovieClip(hardref); // using ActionRemoveClip (0x25)
-check_equals(getInstanceAtDepth(60), undefined);
+ check_equals(getInstanceAtDepth(60), hardref);
+ check_equals(getInstanceAtDepth(70), hardref2);
+ check_equals(hardref.getDepth(), 60);
+ check_equals(hardref2.getDepth(), 70);
+ removeMovieClip(hardref); // using ActionRemoveClip (0x25)
+ removeMovieClip(hardref2); // using ActionRemoveClip (0x25)
+ check_equals(getInstanceAtDepth(60), undefined);
+ check_equals(getInstanceAtDepth(-32839), hardref2);
 #else
-// just to test another way, ActionRemoveClip in SWF6 will work as well
-hardref.removeMovieClip(); // using the sprite's removeMovieClip 
-//softref.removeMovieClip(); // use the softref's removeMovieClip 
+ // just to test another way, ActionRemoveClip in SWF6 will work as well
+ hardref.removeMovieClip(); // using the sprite's removeMovieClip 
+ hardref2.removeMovieClip(); // using the sprite's removeMovieClip
+ //softref.removeMovieClip(); // use the softref's removeMovieClip 
 #endif
+
 check_equals(typeof(hardref), 'undefined');
+xcheck_equals(typeof(hardref2), 'movieclip');
+xcheck_equals(hardref2.getDepth(), -32839);
 check_equals(typeof(softref), 'movieclip');
+check_equals(typeof(softref2), 'movieclip');
 check_equals(typeof(softref.member), 'undefined');
 check_equals(typeof(softref._target), 'undefined');
+xcheck_equals(softref2.member, 2);
+xcheck_equals(softref2._target, '/hardref2');
 hardref = 4;
 check_equals(typeof(softref), 'movieclip'); // hardref doesn't hide this
 // Delete is needed, or further inspection functions will hit the variable before the character



From MAILER-DAEMON Thu Aug 30 09:50:02 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQkPK-0005bQ-IZ
	for mharc-gnash-commit@gnu.org; Thu, 30 Aug 2007 09:50:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQkPI-0005Xn-FN
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 09:50:00 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQkPH-0005Vd-8Z
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 09:49:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQkPG-0005VB-Vf
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 09:49:59 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IQkPG-0005mB-Go
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 09:49:58 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IQkPF-0006BX-Dy
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 13:49:57 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IQkPF-0006BU-90
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 13:49:57 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQkPF-0006BU-90@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 30 Aug 2007 13:49:57 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/testsuite/actionscript.all MovieClip.as
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Aug 2007 13:50:00 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/30 13:49:57

Modified files:
	testsuite/actionscript.all: MovieClip.as 

Log message:
	more tests for unload events and soft refs

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.85&r2=1.86

Patches:
Index: MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- MovieClip.as	30 Aug 2007 13:32:05 -0000	1.85
+++ MovieClip.as	30 Aug 2007 13:49:57 -0000	1.86
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.85 2007/08/30 13:32:05 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.86 2007/08/30 13:49:57 strk Exp $";
 
 #include "check.as"
 
@@ -417,48 +417,86 @@
 
 #if OUTPUT_VERSION >= 6
 
+// Here we create 3 clips
+//	- hardref has no onUnload
+//	- hardref2 has an onUnload
+//	- hardref3 has no onUnload but a child with onUnload
+// We'll see that when the three clips are removed from the stage
+// those with any onUnload handler (either theirs or in their childrens)
+// will still be on the stage, only with their depth shifted at -32769-depth
+// (see character::removedRepthOffset)
+
 softref = _root.createEmptyMovieClip("hardref", 60);
 softref2 = _root.createEmptyMovieClip("hardref2", 70);
+softref3 = _root.createEmptyMovieClip("hardref3", 80);
+softref3child = softref3.createEmptyMovieClip("hardref3child", 1);
+softref3child.onUnload = function() { /* note(this+".onUnload called");*/ };
 hardref2.onUnload = function() { /*note(this+".onUnload called");*/ };
 check_equals(typeof(hardref), 'movieclip');
 check_equals(typeof(softref), 'movieclip');
 check_equals(typeof(hardref2), 'movieclip');
 check_equals(typeof(softref2), 'movieclip');
+check_equals(typeof(hardref3), 'movieclip');
+check_equals(typeof(softref3), 'movieclip');
+check_equals(typeof(hardref3.hardref3child), 'movieclip');
+check_equals(typeof(softref3child), 'movieclip');
 softref.member = 1;
 softref2.member = 2;
+softref3.member = 3;
+softref3child.member = '3child';
 check_equals(typeof(softref.member), 'number');
 check_equals(typeof(softref2.member), 'number');
+check_equals(typeof(softref3.member), 'number');
+check_equals(typeof(softref3child.member), 'string');
 check_equals(softref.member, 1);
 check_equals(softref2.member, 2);
+check_equals(softref3.member, 3);
+check_equals(softref3child.member, '3child');
 check_equals(softref._target, "/hardref");
 check_equals(softref2._target, "/hardref2");
+check_equals(softref3._target, "/hardref3");
+check_equals(softref3child._target, "/hardref3/hardref3child");
+check_equals(hardref.getDepth(), 60);
+check_equals(hardref2.getDepth(), 70);
+check_equals(hardref3.getDepth(), 80);
+check_equals(softref3child.getDepth(), 1);
 #if OUTPUT_VERSION > 6
  check_equals(getInstanceAtDepth(60), hardref);
  check_equals(getInstanceAtDepth(70), hardref2);
- check_equals(hardref.getDepth(), 60);
- check_equals(hardref2.getDepth(), 70);
+ check_equals(getInstanceAtDepth(80), hardref3);
+ check_equals(hardref3.getInstanceAtDepth(1), hardref3.hardref3child);
  removeMovieClip(hardref); // using ActionRemoveClip (0x25)
  removeMovieClip(hardref2); // using ActionRemoveClip (0x25)
+ removeMovieClip(hardref3); // using ActionRemoveClip (0x25)
  check_equals(getInstanceAtDepth(60), undefined);
  check_equals(getInstanceAtDepth(-32839), hardref2);
 #else
  // just to test another way, ActionRemoveClip in SWF6 will work as well
  hardref.removeMovieClip(); // using the sprite's removeMovieClip 
  hardref2.removeMovieClip(); // using the sprite's removeMovieClip
+ hardref3.removeMovieClip(); // using the sprite's removeMovieClip
  //softref.removeMovieClip(); // use the softref's removeMovieClip 
 #endif
 
 check_equals(typeof(hardref), 'undefined');
 xcheck_equals(typeof(hardref2), 'movieclip');
+xcheck_equals(typeof(hardref3), 'movieclip'); // still accessible due to onUnload defined for its child
 xcheck_equals(hardref2.getDepth(), -32839);
+xcheck_equals(hardref3.getDepth(), -32849);
+xcheck_equals(hardref3.hardref3child.getDepth(), 1);
 check_equals(typeof(softref), 'movieclip');
 check_equals(typeof(softref2), 'movieclip');
+check_equals(typeof(softref3), 'movieclip');
+check_equals(typeof(softref3child), 'movieclip');
 check_equals(typeof(softref.member), 'undefined');
 check_equals(typeof(softref._target), 'undefined');
 xcheck_equals(softref2.member, 2);
 xcheck_equals(softref2._target, '/hardref2');
+xcheck_equals(softref3.member, 3);
+xcheck_equals(softref3._target, '/hardref3');
+xcheck_equals(softref3child.member, '3child');
+xcheck_equals(softref3child._target, '/hardref3/hardref3child');
 hardref = 4;
-check_equals(typeof(softref), 'movieclip'); // hardref doesn't hide this
 // Delete is needed, or further inspection functions will hit the variable before the character
 delete hardref;
 sr61 = _root.createEmptyMovieClip("hardref", 61);



From MAILER-DAEMON Thu Aug 30 10:13:11 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQklj-0005Ja-Ca
	for mharc-gnash-commit@gnu.org; Thu, 30 Aug 2007 10:13:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQkli-0005JG-9F
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 10:13:10 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQklh-0005J4-GA
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 10:13:10 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQklh-0005J1-DX
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 10:13:09 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IQklh-0001hc-6S
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 10:13:09 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IQklg-0007MG-7W
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 14:13:08 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IQklg-0007MA-2y
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 14:13:08 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQklg-0007MA-2y@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 30 Aug 2007 14:13:08 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/character.cpp server/cha...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Aug 2007 14:13:10 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/30 14:13:07

Modified files:
	.              : ChangeLog 
	server         : character.cpp character.h 
	                 edit_text_character.cpp edit_text_character.h 
	                 sprite_instance.cpp sprite_instance.h 

Log message:
	        * server/: character.{cpp,h}, edit_text_character.{cpp,h},
	          sprite_instance.{cpp,h}: change signature of character::unload()
	          to return a boolean value stating wheter any onUnload event was
	          queued due to removal.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4162&r2=1.4163
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.cpp?cvsroot=gnash&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.90&r2=1.91
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.104&r2=1.105
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.h?cvsroot=gnash&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.314&r2=1.315
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.131&r2=1.132

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4162
retrieving revision 1.4163
diff -u -b -r1.4162 -r1.4163
--- ChangeLog	30 Aug 2007 13:32:05 -0000	1.4162
+++ ChangeLog	30 Aug 2007 14:13:06 -0000	1.4163
@@ -1,5 +1,12 @@
 2007-08-30 Sandro Santilli <strk@keybit.net>
 
+	* server/: character.{cpp,h}, edit_text_character.{cpp,h},
+	  sprite_instance.{cpp,h}: change signature of character::unload()
+	  to return a boolean value stating wheter any onUnload event was
+	  queued due to removal.
+
+2007-08-30 Sandro Santilli <strk@keybit.net>
+
 	* server/character.h: add const for removed clips depth offset.
 	* testsuite/actionscript.all/MovieClip.as: test for depth shift when
 	  onUnload method is defined and a clip is removed.

Index: server/character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/character.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- server/character.cpp	23 Aug 2007 16:50:56 -0000	1.48
+++ server/character.cpp	30 Aug 2007 14:13:07 -0000	1.49
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 
-/* $Id: character.cpp,v 1.48 2007/08/23 16:50:56 strk Exp $ */
+/* $Id: character.cpp,v 1.49 2007/08/30 14:13:07 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -673,16 +673,16 @@
 {
 }
 
-void
+bool
 character::unload()
 {
 	_unloaded = true;
 	//log_msg(_("Queuing unload event for character %p"), this);
-	queueEventHandler(event_id::UNLOAD);
+	return queueEventHandler(event_id::UNLOAD);
 	//on_event(event_id::UNLOAD);
 }
 
-void
+bool
 character::queueEventHandler(const event_id& id)
 {
 	bool called=false;
@@ -708,8 +708,11 @@
 	if ( method )
 	{
 		root.pushAction(method, boost::intrusive_ptr<character>(this));
+		called = true;
 	}
 
+	return called;
+
 }
 
 boost::intrusive_ptr<as_function>

Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -b -r1.90 -r1.91
--- server/character.h	30 Aug 2007 13:32:05 -0000	1.90
+++ server/character.h	30 Aug 2007 14:13:07 -0000	1.91
@@ -19,7 +19,7 @@
 //
 //
 
-/* $Id: character.h,v 1.90 2007/08/30 13:32:05 strk Exp $ */
+/* $Id: character.h,v 1.91 2007/08/30 14:13:07 strk Exp $ */
 
 #ifndef GNASH_CHARACTER_H
 #define GNASH_CHARACTER_H
@@ -848,7 +848,10 @@
 	}
 
 	/// Queue event handler(s), if any.
-	void queueEventHandler(const event_id& id);
+	//
+	/// @return true if any event handler was queued, false otherwise.
+	///
+	bool queueEventHandler(const event_id& id);
 
 	virtual void on_button_event(const event_id& id)
 	{
@@ -988,11 +991,15 @@
 	//
 	/// This function must be called when the character is removed
 	/// from the stage.
-	/// stage for the first time. It will take care of properly
-	/// unloading any child characters and queuing the 'UNLOAD'
-	/// event handler.
+	/// It will take care of properly calling
+	/// unload against any child characters and queuing the
+	/// 'UNLOAD' event handler.
+	///
+	/// @return true if any onUnload event handler was defined
+	///         by either this or any child characters, false
+	///         otherwise.
 	///
-	virtual void unload();
+	virtual bool unload();
 
 	bool isUnloaded() { return _unloaded; }
 	

Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -b -r1.104 -r1.105
--- server/edit_text_character.cpp	23 Aug 2007 09:53:03 -0000	1.104
+++ server/edit_text_character.cpp	30 Aug 2007 14:13:07 -0000	1.105
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: edit_text_character.cpp,v 1.104 2007/08/23 09:53:03 udog Exp $ */
+/* $Id: edit_text_character.cpp,v 1.105 2007/08/30 14:13:07 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -425,11 +425,13 @@
 {
 }
 
-void
+bool
 edit_text_character::unload()
 {
 	// TODO: unregisterTextVariable() ?
 	on_event(event_id::KILLFOCUS);
+
+	return false;  // assuming TextField never has onUnload ...
 }
 
 void

Index: server/edit_text_character.h
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- server/edit_text_character.h	21 Aug 2007 14:42:12 -0000	1.47
+++ server/edit_text_character.h	30 Aug 2007 14:13:07 -0000	1.48
@@ -118,8 +118,13 @@
 	// See dox in character.h
 	bool pointInShape(float x, float y) const;
 
-	// See dox in character.h
-	void unload();
+	/// See dox in character::unload (character.h)
+	//
+	/// NOTE: edit_text_character (TextField) never has
+	///       an onUnload event, so we always return false
+	///	  here. (TODO: verify this)
+	///
+	bool unload();
 
 	/// Return true if the 'background' should be drawn
 	bool getDrawBackground() const;

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -b -r1.314 -r1.315
--- server/sprite_instance.cpp	29 Aug 2007 12:31:09 -0000	1.314
+++ server/sprite_instance.cpp	30 Aug 2007 14:13:07 -0000	1.315
@@ -1690,12 +1690,25 @@
 };
 
 /// A DisplayList visitor used to unload all characters
-struct UnloaderVisitor {
+class UnloaderVisitor {
+	int unloadEvents;
+
+public:
+	UnloaderVisitor()
+		:
+		unloadEvents(0)
+	{}
+
 	bool operator() (character* ch)
 	{
-		ch->unload();
+		if ( ch->unload() ) ++unloadEvents;
 		return true;
 	}
+
+	bool foundUnloadEvents() const 
+	{
+		return unloadEvents != 0;
+	}
 };
 
 
@@ -3409,7 +3422,7 @@
 	}
 }
 
-void
+bool
 sprite_instance::unload()
 {
 #ifdef GNASH_DEBUG
@@ -3418,7 +3431,8 @@
 
 	UnloaderVisitor visitor;
 	m_display_list.visitForward(visitor);
-	character::unload();
+
+	return character::unload() || visitor.foundUnloadEvents();
 
 }
 

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -b -r1.131 -r1.132
--- server/sprite_instance.h	29 Aug 2007 12:31:09 -0000	1.131
+++ server/sprite_instance.h	30 Aug 2007 14:13:07 -0000	1.132
@@ -407,7 +407,7 @@
 
 	/// Unload all contents in the displaylist and this instance
 	/// See character::unload for more info
-	void unload();
+	bool unload();
 
 	/// See DisplayList::move_display_object, this method is just a proxy to that...
 	//



From MAILER-DAEMON Thu Aug 30 10:14:41 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQknB-0005zd-Nx
	for mharc-gnash-commit@gnu.org; Thu, 30 Aug 2007 10:14:41 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQknA-0005zM-P2
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 10:14:40 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQknA-0005z9-Bh
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 10:14:40 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQknA-0005z6-9L
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 10:14:40 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IQknA-0001w5-3R
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 10:14:40 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IQkn9-0007jj-FE
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 14:14:39 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IQkn9-0007ja-9W
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 14:14:39 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQkn9-0007ja-9W@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 30 Aug 2007 14:14:39 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/Makefil...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Aug 2007 14:14:40 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/30 14:14:39

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: Makefile.am 

Log message:
	        * testsuite/misc-ming.all/Makefile.am: don't try to build
	          DefineEditTextVariableNameTest2-Runner from an non-existent .c
	          file (fixes 'make dist').

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4163&r2=1.4164
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.149&r2=1.150

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4163
retrieving revision 1.4164
diff -u -b -r1.4163 -r1.4164
--- ChangeLog	30 Aug 2007 14:13:06 -0000	1.4163
+++ ChangeLog	30 Aug 2007 14:14:38 -0000	1.4164
@@ -1,5 +1,8 @@
 2007-08-30 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/misc-ming.all/Makefile.am: don't try to build
+	  DefineEditTextVariableNameTest2-Runner from an non-existent .c
+	  file (fixes 'make dist').
 	* server/: character.{cpp,h}, edit_text_character.{cpp,h},
 	  sprite_instance.{cpp,h}: change signature of character::unload()
 	  to return a boolean value stating wheter any onUnload event was

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -b -r1.149 -r1.150
--- testsuite/misc-ming.all/Makefile.am	27 Aug 2007 09:56:01 -0000	1.149
+++ testsuite/misc-ming.all/Makefile.am	30 Aug 2007 14:14:38 -0000	1.150
@@ -62,7 +62,6 @@
 	DefineEditTextVariableNameTest \
 	DefineEditTextVariableNameTest-Runner \
 	DefineEditTextVariableNameTest2 \
-	DefineEditTextVariableNameTest2-Runner \
 	Dejagnu \
 	Dejagnu.swf \
 	PlaceObject2Test \
@@ -239,6 +238,7 @@
 	shape_testrunner \
 	registerClassTest2runner \
 	DefineEditTextVariableNameTest-Runner \
+	DefineEditTextVariableNameTest2-Runner \
 	$(NULL)
 
 if MAKESWF_SUPPORTS_PREBUILT_CLIPS



From MAILER-DAEMON Thu Aug 30 10:21:58 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQkuD-0003SR-MB
	for mharc-gnash-commit@gnu.org; Thu, 30 Aug 2007 10:21:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQkuB-0003QN-CM
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 10:21:55 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQku9-0003N1-CB
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 10:21:54 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQku8-0003MO-FG
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 10:21:52 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1IQku7-0003FL-N1
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 10:21:52 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l7UELTS48680;
	Thu, 30 Aug 2007 16:21:29 +0200 (CEST)
	(envelope-from strk@keybit.net)
Date: Thu, 30 Aug 2007 16:21:29 +0200
From: Sandro Santilli <strk@keybit.net>
To: Udo Giacomozzi <udo.gnu@nova-sys.net>
Subject: Re: [Gnash-commit] gnash ChangeLog server/parser/shape_character_d...
Message-ID: <20070830142129.GA48469@keybit.net>
Mail-Followup-To: Udo Giacomozzi <udo.gnu@nova-sys.net>,
	zou lunkai <zoulunkai@gmail.com>,
	Udo Giacomozzi <udo.gnash@nova-sys.net>, gnash-commit@gnu.org
References: <E1IPjUe-0004v4-BW@cvs.savannah.gnu.org>
	<ca4b43ff0708271759qc5295d0v8dcdb0c8ec78949b@mail.gmail.com>
	<20070828072550.GC78446@keybit.net>
	<ca4b43ff0708280054v558952e7s90ec7cee656dc3b8@mail.gmail.com>
	<1083592545.20070828100319@nova-sys.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1083592545.20070828100319@nova-sys.net>
X-Detected-Kernel: FreeBSD 2.0-4.2
Cc: Udo Giacomozzi <udo.gnash@nova-sys.net>, gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Aug 2007 14:21:56 -0000

On Tue, Aug 28, 2007 at 10:03:19AM +0200, Udo Giacomozzi wrote:

> Edges could be stored in integer TWIPS or perhaps it should be even so
> by definition (ie. align any edge to TWIPS).
> 
> FYI, don't confuse the shape TWIPS scale with the TWIPS scale of the
> stage: a shape may be scaled down much and thus has very precise PIXEL
> coordinates - it's just the *definition* that has a limited accuracy.
> 
> AGG (and most probably tri. renderers as well) have no problems with
> integer edges.
> 
> A different question is if is CPU-expensive to convert integer to
> floats (ie. if it adds additional processor cycles when multiplicating
> an integer with a float)...?

It surely does so, but the same overhead would be in converting int values
to floats when parsing, wouldn't it ? Seems another case of instance vs. defs
rendering (defs are in integer space, instances might be in float, considering
matrix transforms). Also, if no invalidated bounds, no multiple transforms
required..

--strk;




From MAILER-DAEMON Thu Aug 30 10:59:58 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQlV0-0006eB-FO
	for mharc-gnash-commit@gnu.org; Thu, 30 Aug 2007 10:59:58 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQlUy-0006bf-13
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 10:59:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQlUw-0006b2-J0
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 10:59:55 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQlUw-0006aw-Ed
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 10:59:54 -0400
Received: from server2.indunet.it ([217.70.144.109])
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <udo.gnu@nova-sys.net>) id 1IQlUv-0002Ta-MF
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 10:59:54 -0400
Received: from UDO-LAPTOP (sadsl-246098.rol.raiffeisen.net [195.254.246.98])
	(authenticated bits=0)
	by server2.indunet.it (8.12.8/8.12.5) with ESMTP id l7UExhU4019527;
	Thu, 30 Aug 2007 16:59:47 +0200
Date: Thu, 30 Aug 2007 16:59:40 +0200
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
X-Mailer: The Bat! (v3.99.3) Professional
Organization: NOVASYS
X-Priority: 3 (Normal)
Message-ID: <197022572.20070830165940@nova-sys.net>
To: Sandro Santilli <strk@keybit.net>
Subject: Re[2]: [Gnash-commit] gnash ChangeLog
	server/parser/shape_character_d...
In-Reply-To: <20070830142129.GA48469@keybit.net>
References: <E1IPjUe-0004v4-BW@cvs.savannah.gnu.org>
	<ca4b43ff0708271759qc5295d0v8dcdb0c8ec78949b@mail.gmail.com>
	<20070828072550.GC78446@keybit.net>
	<ca4b43ff0708280054v558952e7s90ec7cee656dc3b8@mail.gmail.com>
	<1083592545.20070828100319@nova-sys.net>
	<20070830142129.GA48469@keybit.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
X-Detected-Kernel: Linux 2.4-2.6
Cc: Udo Giacomozzi <udo.gnash@nova-sys.net>, gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Udo Giacomozzi <udo.gnu@nova-sys.net>
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Aug 2007 14:59:57 -0000

Hello Sandro,

Thursday, August 30, 2007, 4:21:29 PM, you wrote:
SS> It surely does so, but the same overhead would be in converting int values
SS> to floats when parsing, wouldn't it ?

Parsing is done once, rendering is is done lots of times and affects
user experience.

SS> Seems another case of instance vs. defs
SS> rendering (defs are in integer space, instances might be in float, considering
SS> matrix transforms). Also, if no invalidated bounds, no multiple transforms
SS> required..

No, the transformation is done once per frame (and instance), then the
precomputed vertexes are rendered for each clipping window.


Udo




From MAILER-DAEMON Thu Aug 30 14:19:21 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQobx-0003kq-2d
	for mharc-gnash-commit@gnu.org; Thu, 30 Aug 2007 14:19:21 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQobv-0003kY-Lz
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 14:19:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQobu-0003kF-Pg
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 14:19:19 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQobu-0003kB-IV
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 14:19:18 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IQobu-0007Vo-6i
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 14:19:18 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IQobs-0001dr-OA
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 18:19:16 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IQobs-0001do-H9
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 18:19:16 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQobs-0001do-H9@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 30 Aug 2007 18:19:16 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/sprite_instance.cpp serv...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Aug 2007 18:19:20 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/30 18:19:16

Modified files:
	.              : ChangeLog 
	server         : sprite_instance.cpp sprite_instance.h 
	server/swf     : PlaceObject2Tag.cpp 

Log message:
	        * server/sprite_instance.{cpp,h}: cleanups:
	          drop resetDisplayList, _frame0 and replace_if_depth_is_occupied
	          parameter of add_display_object.
	        * server/swf/PlaceObject2Tag.cpp: update call to add_display_object

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4164&r2=1.4165
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.315&r2=1.316
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.132&r2=1.133
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/PlaceObject2Tag.cpp?cvsroot=gnash&r1=1.21&r2=1.22

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4164
retrieving revision 1.4165
diff -u -b -r1.4164 -r1.4165
--- ChangeLog	30 Aug 2007 14:14:38 -0000	1.4164
+++ ChangeLog	30 Aug 2007 18:19:15 -0000	1.4165
@@ -1,5 +1,12 @@
 2007-08-30 Sandro Santilli <strk@keybit.net>
 
+	* server/sprite_instance.{cpp,h}: cleanups: 
+	  drop resetDisplayList, _frame0 and replace_if_depth_is_occupied
+	  parameter of add_display_object.
+	* server/swf/PlaceObject2Tag.cpp: update call to add_display_object
+
+2007-08-30 Sandro Santilli <strk@keybit.net>
+
 	* testsuite/misc-ming.all/Makefile.am: don't try to build
 	  DefineEditTextVariableNameTest2-Runner from an non-existent .c
 	  file (fixes 'make dist').

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -b -r1.315 -r1.316
--- server/sprite_instance.cpp	30 Aug 2007 14:13:07 -0000	1.315
+++ server/sprite_instance.cpp	30 Aug 2007 18:19:15 -0000	1.316
@@ -2119,7 +2119,6 @@
 		newname.c_str(),
 		dummy_event_handlers,
 		depth,
-		true, // replace if depth is occupied (to drop)
 		ch->get_cxform(),
 		ch->get_matrix(),
 		ch->get_ratio(),
@@ -2311,7 +2310,6 @@
 				// TODO: check why this would be any different
 				//       then calling restoreDisplayList(0) instead..
 				//       Ah! I think I know..
-				//resetDisplayList();
 				restoreDisplayList(0); // seems OK to me.
 			}
 
@@ -2356,8 +2354,8 @@
 	do_actions();
 
 	// Call UNLOAD event of just removed chars !
-	DisplayList justRemoved = oldDisplayList;
-	justRemoved.clear_except(m_display_list, false); // true;
+	//DisplayList justRemoved = oldDisplayList;
+	//justRemoved.clear_except(m_display_list, false); // true;
 	// No, dont' call UNLOAD event, as it should be called by remove_display_object!
 
 	// Finally, execute actions in newly added childs
@@ -2437,43 +2435,6 @@
 	//env.set_local_frame_top(local_stack_top);
 }
 
-void
-sprite_instance::resetDisplayList()
-{
-	// TODO: see if/how this can be merged with restoreDisplayList !
-
-	assert(m_current_frame == 0);
-
-	// Add script objects in current DisplayList
-	std::vector<character*> charsToAdd; 
-	std::vector<character*> charsToKeep; 
-	ScriptObjectsFinder scriptObjFinder(charsToAdd, charsToKeep);
-	m_display_list.visitAll(scriptObjFinder);
-
-	// Resort frame0 DisplayList as depth of
-	// characters in it might have been
-	// externally changed.
-	_frame0_chars.sort();
-
-	// Remove characters which have been removed
-	_frame0_chars.clear_except(charsToKeep);
-
-	// NOTE: script objects are *not* allowed to replace depths
-	//       of static objects (change second argument to switch)
-	_frame0_chars.addAll(charsToAdd, false);
-	
-	if ( ! (m_display_list == _frame0_chars) )
-	{
-
-		// Set this character as invalidated *before*
-		// actually updating the displaylist !
-		set_invalidated(); 
-
-		//m_display_list = _frame0_chars;	
-		m_display_list.clear_except(_frame0_chars, true); // call unload
-	};
-}
-
 /*private*/
 void
 sprite_instance::restoreDisplayList(size_t tgtFrame)
@@ -2577,14 +2538,6 @@
 		if ( typeflags & TAG_ACTION ) tag->execute_action(this);
 	}
 
-	// TODO: do _frame0_chars still make sense ?
-	//       Should we use the same algorithm in restoreDisplayList instead ?
-	if ( frame == 0 && ! has_looped() )
-	{
-		// Save DisplayList state
-		_frame0_chars = m_display_list;
-	}
-
 	testInvariant();
 }
 
@@ -2666,7 +2619,7 @@
        // redraw. Consider a static graphic that stays at it's position all
        // the time. When looping betwen two frames 
        // gotoAndPlay(_currentframe-1);
-       // then resetDisplayList() will remove that character and 
+       // then restoreDisplayList() will remove that character and 
        // execute_frame_tags() will insert it again. So the next 
        // set_invalidated() call (which currently *is* correct) will cause
        // redraw of the whole sprite even if it doesn't change visually
@@ -2806,7 +2759,6 @@
     const char* name,
     const std::vector<swf_event*>& event_handlers,
     int depth, 
-    bool /*replace_if_depth_is_occupied*/,
     const cxform& color_transform, const matrix& mat,
     int ratio, int clip_depth)
 {
@@ -3713,8 +3665,6 @@
 
 	oldDisplayList.visitAll(marker);
 
-	_frame0_chars.visitAll(marker);
-
 	_drawable->setReachable();
 
 	_drawable_inst->setReachable();

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -b -r1.132 -r1.133
--- server/sprite_instance.h	30 Aug 2007 14:13:07 -0000	1.132
+++ server/sprite_instance.h	30 Aug 2007 18:19:16 -0000	1.133
@@ -314,10 +314,10 @@
 	///
 	/// If the specified depth is already occupied by an instance of a different
 	/// character (including any dynamically-created instance), the behaviour is
-	/// controlled by the replace_if_depth_is_occupied parameter. If false, this
+	/// controlled by the is_jumping_back flag. If false, this
 	/// call will result in a no-op. If true, the previously existing character
 	/// will be replaced by the new one, with unload() method invoked on the
-	/// removed character.
+	/// removed character. (zou: correct?)
 	///
 	/// Any successful new placement triggers invokation of the newly created
 	/// instance's LOAD event.
@@ -338,12 +338,6 @@
 	/// @param depth
 	///	The depth to assign to the newly created instance.
 	///
-	/// @param replace_if_depth_is_occupied
-	///	This parameter control behaviour in case an existing instance is found at
-	///	the given depth but is NOT an instance of the given character_id.
-	///	In this case: if this paremeter is true, the old instance will be replaced by
-	///	the new one, otherwise nothing happens and this function returns NULL.
-	///
 	/// @param color_transform
 	///	The color transform to apply to the newly created instance.
 	///
@@ -361,15 +355,14 @@
 	/// @return 
 	///	A pointer to the character being added or NULL
 	///	if this call results in a move of an existing character 
-	///	or in a no-op due to replace_if_depth_is_occupied being
-	///	false.
+	///	or in a no-op due to is_jumping_back being
+	///	false. (zou: correct?)
 	///       
 	character* add_display_object(
 		uint16_t character_id,
 		const char* name,
 		const SWFEventsVector& event_handlers,
 		int depth,
-		bool replace_if_depth_is_occupied,
 		const cxform& color_transform,
 		const matrix& matrix,
 		int ratio,
@@ -797,11 +790,6 @@
 	void clone_display_object(const std::string& name,
 		const std::string& newname, int depth);
 #endif
-	/// Reset the DisplayList for proper loop-back or goto_frame
-	//
-	/// The DisplayList is cleared by all but dynamic characters
-	///
-	void resetDisplayList();
 
 	/// Reconstruct the DisplayList for proper loop-back operations
 	//
@@ -933,14 +921,6 @@
 	/// soundid for current playing stream. If no stream set to -1
 	int m_sound_stream_id;
 
-
-	/// The DisplayList resulting by execution of tags in first frame.
-	//
-	/// It will be used to reinitialized actual DisplayList on restart.
-	/// See execute_frame_tags.
-	///
-	DisplayList _frame0_chars;
-
 	std::string _origTarget;
 
 protected:
@@ -953,14 +933,6 @@
 	}
 
 	/// Execute the tags associated with the specified frame.
-	//
-	/// Execution of 1st frame tags is specially handled:
-	///
-	/// - After executing them for the first time
-	///   the DisplayList state is saved into the _frame0_chars
-	///   member, which is used by resetDisplayList() on loop-back
-	///   TODO: drop this _frame0_chars thing ? See comments in
-	///   resetDisplayList()
 	///
 	/// @param frame
 	///	Frame number. 0-based
@@ -969,7 +941,7 @@
 	///     Which kind of control tags we want to execute. 
 	///	See control_tag_type enum.
 	///
-	void execute_frame_tags(size_t frame, int typeflags=TAG_DLIST|TAG_ACTION); // bool state_only = false;
+	void execute_frame_tags(size_t frame, int typeflags=TAG_DLIST|TAG_ACTION); 
 
 	/// \brief
 	/// This is either sprite_definition (for sprites defined by

Index: server/swf/PlaceObject2Tag.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/PlaceObject2Tag.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- server/swf/PlaceObject2Tag.cpp	27 Aug 2007 12:44:29 -0000	1.21
+++ server/swf/PlaceObject2Tag.cpp	30 Aug 2007 18:19:16 -0000	1.22
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: PlaceObject2Tag.cpp,v 1.21 2007/08/27 12:44:29 strk Exp $ */
+/* $Id: PlaceObject2Tag.cpp,v 1.22 2007/08/30 18:19:16 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -359,7 +359,6 @@
 	      m_name,
 	      m_event_handlers,
 	      m_depth,
-	      false, // don't replace characters at target depth (TODO: check if a general rule!)
 	      m_color_transform,
 	      m_matrix,
 	      m_ratio,



From MAILER-DAEMON Thu Aug 30 17:22:08 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQrSp-0000N9-Vd
	for mharc-gnash-commit@gnu.org; Thu, 30 Aug 2007 17:22:08 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQrSo-0000Mh-CH
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 17:22:06 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQrSl-0000KM-Qa
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 17:22:06 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQrSl-0000K8-Jg
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 17:22:03 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IQrSl-0005Na-BT
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 17:22:03 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IQrSh-0006eg-Er
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 21:21:59 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IQrSh-0006eb-1Y
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 21:21:59 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQrSh-0006eb-1Y@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 30 Aug 2007 21:21:59 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/dlist.cpp server/dlist.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Aug 2007 21:22:06 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/30 21:21:58

Modified files:
	.              : ChangeLog 
	server         : dlist.cpp dlist.h 

Log message:
	        * server/dlist.{cpp,h}: drop unused methods and optional args.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4165&r2=1.4166
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.cpp?cvsroot=gnash&r1=1.78&r2=1.79
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.h?cvsroot=gnash&r1=1.46&r2=1.47

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4165
retrieving revision 1.4166
diff -u -b -r1.4165 -r1.4166
--- ChangeLog	30 Aug 2007 18:19:15 -0000	1.4165
+++ ChangeLog	30 Aug 2007 21:21:57 -0000	1.4166
@@ -1,5 +1,9 @@
 2007-08-30 Sandro Santilli <strk@keybit.net>
 
+	* server/dlist.{cpp,h}: drop unused methods and optional args.
+
+2007-08-30 Sandro Santilli <strk@keybit.net>
+
 	* server/sprite_instance.{cpp,h}: cleanups: 
 	  drop resetDisplayList, _frame0 and replace_if_depth_is_occupied
 	  parameter of add_display_object.

Index: server/dlist.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- server/dlist.cpp	24 Aug 2007 16:07:27 -0000	1.78
+++ server/dlist.cpp	30 Aug 2007 21:21:58 -0000	1.79
@@ -415,29 +415,6 @@
 	//dump();
 }
 	
-	
-// clear the display list.
-void
-DisplayList::clear(bool call_unload)
-{
-	//GNASH_REPORT_FUNCTION;
-
-	// This might eventually become obsoleted
-	if ( call_unload )
-	{
-		for (iterator it = _characters.begin(),
-				itEnd = _characters.end();
-			it != itEnd; ++it)
-		{
-			DisplayItem& di = *it;
-			if ( ! it->get() ) continue;
-			di->unload(); // if call_unload
-		}
-	}
-		
-	_characters.clear();
-}
-
 void
 DisplayList::swapDepths(character* ch1, int newdepth)
 {
@@ -585,34 +562,6 @@
 	}
 }
 
-void
-DisplayList::clear_except(std::vector<character*>& exclude, bool call_unload)
-{
-	//GNASH_REPORT_FUNCTION;
-
-	for (iterator it = _characters.begin(),	itEnd = _characters.end(); it != itEnd; )
-	{
-		DisplayItem& di = *it;
-
-		bool is_affected = false;
-		for (size_t i=0, n=exclude.size(); i<n; ++i)
-		{
-			if (exclude[i] == di.get())
-			{
-				is_affected = true;
-				break;
-			}
-		}
-
-		if (is_affected == false)
-		{
-			if ( call_unload ) di->unload();
-			it = _characters.erase(it);
-			continue;
-		}
-		it++;
-	}
-}
 
 void
 DisplayList::clear_except(const DisplayList& exclude, bool call_unload)
@@ -647,35 +596,6 @@
 }
 
 void
-DisplayList::clear(std::vector<character*>& which, bool call_unload)
-{
-	//GNASH_REPORT_FUNCTION;
-
-	for (iterator it = _characters.begin(),	itEnd = _characters.end(); it != itEnd; )
-	{
-		DisplayItem& di = *it;
-
-		bool is_affected = false;
-		for (size_t i=0, n=which.size(); i<n; ++i)
-		{
-			if (which[i] == di.get())
-			{
-				is_affected = true;
-				break;
-			}
-		}
-
-		if (is_affected)
-		{
-			if ( call_unload ) di->unload();
-			it = _characters.erase(it);
-			continue;
-		}
-		it++;
-	}
-}
-
-void
 DisplayList::clear(const DisplayList& from, bool call_unload)
 {
 	//GNASH_REPORT_FUNCTION;

Index: server/dlist.h
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- server/dlist.h	24 Aug 2007 16:07:27 -0000	1.46
+++ server/dlist.h	30 Aug 2007 21:21:58 -0000	1.47
@@ -173,12 +173,10 @@
 	void	remove_display_object(int depth);
 
 	/// Clear the display list.
-	//
-	/// @param call_unload
-	///	If true, UNLOAD event will be invoked on the characters being
-	///	removed. False by default.
-	///
-	void clear(bool call_unload=false);
+	void clear()
+	{
+		_characters.clear();
+	}
 
 	/// \brief
 	/// Clear all characters in this DisplayList that are also found
@@ -195,35 +193,6 @@
 	void clear(const DisplayList& from, bool call_unload=false);
 
 	/// \brief
-	/// Clear all characters in the display list also found in the given vector.
-	//
-	/// @param which
-	///	A vector containing character instances to remove.
-	///	Any instance found in the vector will be removed
-	///	from this DisplayList.
-	///
-	/// @param call_unload
-	///	If true, UNLOAD event will be invoked on the characters being
-	///	removed. False by default.
-	///
-	void clear(std::vector<character*>& which, bool call_unload=false);
-
-	/// \brief
-	/// Clear all characters in the display list except the ones
-	/// contained in the given vector.
-	//
-	/// @param exclude
-	///	A vector containing character instances to keep.
-	///	Any instance not found in the vector will be removed
-	///	from this DisplayList.
-	///
-	/// @param call_unload
-	///	If true, UNLOAD event will be invoked on the characters being
-	///	removed. False by default.
-	///
-	void clear_except(std::vector<character*>& exclude, bool call_unload=false);
-
-	/// \brief
 	/// Clear all characters in this DisplayList except the ones
 	/// contained in the given DisplayList
 	//



From MAILER-DAEMON Thu Aug 30 20:49:20 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQuhM-00020D-Cx
	for mharc-gnash-commit@gnu.org; Thu, 30 Aug 2007 20:49:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQuhK-0001z4-R7
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 20:49:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQuhK-0001yp-FI
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 20:49:18 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQuhK-0001ym-9m
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 20:49:18 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IQuhK-0006gb-0S
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 20:49:18 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IQuhI-0004iX-NO
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 00:49:16 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IQuhI-0004iU-GA
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 00:49:16 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQuhI-0004iU-GA@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Fri, 31 Aug 2007 00:49:16 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog libbase/image.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Aug 2007 00:49:19 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/31 00:49:16

Modified files:
	.              : ChangeLog 
	libbase        : image.cpp 

Log message:
	* libbase/image.cpp: don't ommit the default parameter, should fix 
	  the building, please check

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4166&r2=1.4167
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/image.cpp?cvsroot=gnash&r1=1.22&r2=1.23

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4166
retrieving revision 1.4167
diff -u -b -r1.4166 -r1.4167
--- ChangeLog	30 Aug 2007 21:21:57 -0000	1.4166
+++ ChangeLog	31 Aug 2007 00:49:15 -0000	1.4167
@@ -1,3 +1,8 @@
+2007-08-31 Zou Lunkai <zoulunkai@gmail.com>
+	
+	* libbase/image.cpp: don't ommit the default parameter, should fix 
+	  the building, please check.
+	
 2007-08-30 Sandro Santilli <strk@keybit.net>
 
 	* server/dlist.{cpp,h}: drop unused methods and optional args.

Index: libbase/image.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/image.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- libbase/image.cpp	16 Jun 2007 19:03:00 -0000	1.22
+++ libbase/image.cpp	31 Aug 2007 00:49:16 -0000	1.23
@@ -373,7 +373,7 @@
 	//
 	rgba*	read_swf_jpeg3(tu_file* in)
 	{
-		std::auto_ptr<jpeg::input> j_in ( jpeg::input::create_swf_jpeg2_header_only(in) );
+		std::auto_ptr<jpeg::input> j_in ( jpeg::input::create_swf_jpeg2_header_only(in, false) );
 		if ( ! j_in.get() ) return 0;
 		
 		j_in->start_image();



From MAILER-DAEMON Thu Aug 30 20:58:52 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQuqa-0003T4-EW
	for mharc-gnash-commit@gnu.org; Thu, 30 Aug 2007 20:58:52 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQuqY-0003Sv-Mu
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 20:58:50 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQuqW-0003Si-9x
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 20:58:49 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQuqW-0003Sf-5S
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 20:58:48 -0400
Received: from wa-out-1112.google.com ([209.85.146.180])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1IQuqV-00083R-K7
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 20:58:47 -0400
Received: by wa-out-1112.google.com with SMTP id k34so744451wah
	for <gnash-commit@gnu.org>; Thu, 30 Aug 2007 17:58:46 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=Gn/n1Hnp+23iQ2yfQ49K7B3dat+luwbh8Qhl6G7G+FEvhNbjmMHrSBizKy4OJx1pwxQ6rk7Q9S7TGcH+N0RQ4fZPt8N37hi3stESYOCjbttMLJK8ZSurQ7lpv1GAe12FX4o+5Gff9U3PzpLq3MQpIyTyKetfEar+Dz+3Z8VlpJE=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=g1dn1tf2urT3LPZqSr9I7i+auQmNJvZCb5gdE56FGKiqODmSmo/nMa/OnaHzN8v18377KN1C//TILl0jIg6N5KYMooyIhQA0F5+vLnXH/eR85UerTnl4wcgZyl7kC9BWMB5WlBy9nHYdjq261EYIjm3XlqmyjDw2WLHr59GxHFY=
Received: by 10.114.67.2 with SMTP id p2mr317500waa.1188521925798;
	Thu, 30 Aug 2007 17:58:45 -0700 (PDT)
Received: by 10.114.12.7 with HTTP; Thu, 30 Aug 2007 17:58:45 -0700 (PDT)
Message-ID: <ca4b43ff0708301758o4ea4f95ard78bf80020c02abf@mail.gmail.com>
Date: Fri, 31 Aug 2007 08:58:45 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "Sandro Santilli" <strk@keybit.net>
Subject: Re: [Gnash-commit] gnash ChangeLog testsuite/misc-swfc.all/moviecl...
In-Reply-To: <E1IQjbR-0002IT-Pa@cvs.savannah.gnu.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1IQjbR-0002IT-Pa@cvs.savannah.gnu.org>
X-Detected-Kernel: Linux 2.6 (newer, 2)
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Aug 2007 00:58:51 -0000

Ah, I forgot to change them to xchecks yestoday. yes, expected xchecks.

On 8/30/07, Sandro Santilli <strk@keybit.net> wrote:
> CVSROOT:        /sources/gnash
> Module name:    gnash
> Changes by:     Sandro Santilli <strk>  07/08/30 12:58:29
>
> Modified files:
>        .              : ChangeLog
>        testsuite/misc-swfc.all: movieclip_destruction_test1.sc
>
> Log message:
>                * testsuite/misc-swfc.all/movieclip_destruction_test1.sc: expect
>                  gnash failures.
>
> CVSWeb URLs:
> http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4160&r2=1.4161
> http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/movieclip_destruction_test1.sc?cvsroot=gnash&r1=1.2&r2=1.3
>
> Patches:
> Index: ChangeLog
> ===================================================================
> RCS file: /sources/gnash/gnash/ChangeLog,v
> retrieving revision 1.4160
> retrieving revision 1.4161
> diff -u -b -r1.4160 -r1.4161
> --- ChangeLog   30 Aug 2007 09:47:35 -0000      1.4160
> +++ ChangeLog   30 Aug 2007 12:58:28 -0000      1.4161
> @@ -1,5 +1,7 @@
>  2007-08-30 Sandro Santilli <strk@keybit.net>
>
> +       * testsuite/misc-swfc.all/movieclip_destruction_test1.sc: expect
> +         gnash failures.
>        * testsuite/actionscript.all/: Makefile.am, AsBroadcaster.as:
>          new test for AsBroadcaster.
>
>
> Index: testsuite/misc-swfc.all/movieclip_destruction_test1.sc
> ===================================================================
> RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/movieclip_destruction_test1.sc,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -b -r1.2 -r1.3
> --- testsuite/misc-swfc.all/movieclip_destruction_test1.sc      30 Aug 2007 05:31:32 -0000      1.2
> +++ testsuite/misc-swfc.all/movieclip_destruction_test1.sc      30 Aug 2007 12:58:29 -0000      1.3
> @@ -105,8 +105,8 @@
>   .end
>
>   .initaction mc3: // Add initactions for mc3(mc3 is not placed)
> -    _root.check_equals(mc1, null);
> -    _root.check_equals(typeof(mc1), 'undefined');
> +    _root.xcheck_equals(mc1, null);
> +    _root.xcheck_equals(typeof(mc1), 'undefined');
>   .end
>
>   .del mc1  // Remove sprite mc1
> @@ -114,7 +114,7 @@
>
>  .frame 6 // target frame
>   .action:
> -    check_equals(_root.x, 0);
> +    xcheck_equals(_root.x, 0);
>     stop();
>   .end
>
>
>
> _______________________________________________
> Gnash-commit mailing list
> Gnash-commit@gnu.org
> http://lists.gnu.org/mailman/listinfo/gnash-commit
>



From MAILER-DAEMON Thu Aug 30 21:18:57 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQvA1-0001bv-Sb
	for mharc-gnash-commit@gnu.org; Thu, 30 Aug 2007 21:18:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQvA0-0001ab-Ka
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 21:18:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQvA0-0001Zp-1Y
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 21:18:56 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQv9z-0001ZZ-RZ
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 21:18:55 -0400
Received: from rv-out-0910.google.com ([209.85.198.189])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1IQv9z-0002J9-Cw
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 21:18:55 -0400
Received: by rv-out-0910.google.com with SMTP id c27so303982rvf
	for <gnash-commit@gnu.org>; Thu, 30 Aug 2007 18:18:53 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=lfn8hbpbTgvzQciEKCjQijha4dMEAP1uh/9xwYNvAh1RIxOqMEbutMfy2ybSwn0DF0YyOZ8p7kp1uztEt5RWczphoR2s72sTU3mBgVxH7QKVhPVA+aHcuxAFhaEbCnuDhFlpv9KLK7N1JA3/TxbNYkLuwl0oI8UN+j8K9FvzXyk=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=RYVsijNpVHzdqqp/p+8rq8m3ixAA/aP7QaFYfNSEb3GbCVbDzomf1F7bRVDhp30ANPuU3jxA5R/94+EboM0rKGtFo4vxNjkCndHmkETNd4Ic/g68+SF48vBXXsZs/blc1GNZvAOtz3rknwIT9Smi4go3A3mmoYN9JltrgN7v+qI=
Received: by 10.114.158.1 with SMTP id g1mr477876wae.1188523133758;
	Thu, 30 Aug 2007 18:18:53 -0700 (PDT)
Received: by 10.114.12.7 with HTTP; Thu, 30 Aug 2007 18:18:53 -0700 (PDT)
Message-ID: <ca4b43ff0708301818y99c6d16ua1ee121c0c728161@mail.gmail.com>
Date: Fri, 31 Aug 2007 09:18:53 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "Sandro Santilli" <strk@keybit.net>
Subject: Re: [Gnash-commit] gnash/testsuite/actionscript.all MovieClip.as
In-Reply-To: <E1IQkPF-0006BU-90@cvs.savannah.gnu.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1IQkPF-0006BU-90@cvs.savannah.gnu.org>
X-Detected-Kernel: Linux 2.6 (newer, 2)
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Aug 2007 01:18:56 -0000

> +// Here we create 3 clips
> +//     - hardref has no onUnload
> +//     - hardref2 has an onUnload
> +//     - hardref3 has no onUnload but a child with onUnload
> +// We'll see that when the three clips are removed from the stage
> +// those with any onUnload handler (either theirs or in their childrens)
> +// will still be on the stage, only with their depth shifted at -32769-depth
> +// (see character::removedRepthOffset)
> +
Characters with no onUnload won't be pushed to the global list at the
frame being removed, thus get destroyed before GC works. Characters
with onUnload are pushed to the global list, thus need to be removed
at the end of the frame by GC. Just some deduction:)  I'll do more
tests today.

On 8/30/07, Sandro Santilli <strk@keybit.net> wrote:
> CVSROOT:        /sources/gnash
> Module name:    gnash
> Changes by:     Sandro Santilli <strk>  07/08/30 13:49:57
>
> Modified files:
>        testsuite/actionscript.all: MovieClip.as
>
> Log message:
>        more tests for unload events and soft refs
>
> CVSWeb URLs:
> http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.85&r2=1.86
>
> Patches:
> Index: MovieClip.as
> ===================================================================
> RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
> retrieving revision 1.85
> retrieving revision 1.86
> diff -u -b -r1.85 -r1.86
> --- MovieClip.as        30 Aug 2007 13:32:05 -0000      1.85
> +++ MovieClip.as        30 Aug 2007 13:49:57 -0000      1.86
> @@ -20,7 +20,7 @@
>  // compile this test case with Ming makeswf, and then
>  // execute it like this gnash -1 -r 0 -v out.swf
>
> -rcsid="$Id: MovieClip.as,v 1.85 2007/08/30 13:32:05 strk Exp $";
> +rcsid="$Id: MovieClip.as,v 1.86 2007/08/30 13:49:57 strk Exp $";
>
>  #include "check.as"
>
> @@ -417,48 +417,86 @@
>
>  #if OUTPUT_VERSION >= 6
>
> +// Here we create 3 clips
> +//     - hardref has no onUnload
> +//     - hardref2 has an onUnload
> +//     - hardref3 has no onUnload but a child with onUnload
> +// We'll see that when the three clips are removed from the stage
> +// those with any onUnload handler (either theirs or in their childrens)
> +// will still be on the stage, only with their depth shifted at -32769-depth
> +// (see character::removedRepthOffset)
> +
>  softref = _root.createEmptyMovieClip("hardref", 60);
>  softref2 = _root.createEmptyMovieClip("hardref2", 70);
> +softref3 = _root.createEmptyMovieClip("hardref3", 80);
> +softref3child = softref3.createEmptyMovieClip("hardref3child", 1);
> +softref3child.onUnload = function() { /* note(this+".onUnload called");*/ };
>  hardref2.onUnload = function() { /*note(this+".onUnload called");*/ };
>  check_equals(typeof(hardref), 'movieclip');
>  check_equals(typeof(softref), 'movieclip');
>  check_equals(typeof(hardref2), 'movieclip');
>  check_equals(typeof(softref2), 'movieclip');
> +check_equals(typeof(hardref3), 'movieclip');
> +check_equals(typeof(softref3), 'movieclip');
> +check_equals(typeof(hardref3.hardref3child), 'movieclip');
> +check_equals(typeof(softref3child), 'movieclip');
>  softref.member = 1;
>  softref2.member = 2;
> +softref3.member = 3;
> +softref3child.member = '3child';
>  check_equals(typeof(softref.member), 'number');
>  check_equals(typeof(softref2.member), 'number');
> +check_equals(typeof(softref3.member), 'number');
> +check_equals(typeof(softref3child.member), 'string');
>  check_equals(softref.member, 1);
>  check_equals(softref2.member, 2);
> +check_equals(softref3.member, 3);
> +check_equals(softref3child.member, '3child');
>  check_equals(softref._target, "/hardref");
>  check_equals(softref2._target, "/hardref2");
> +check_equals(softref3._target, "/hardref3");
> +check_equals(softref3child._target, "/hardref3/hardref3child");
> +check_equals(hardref.getDepth(), 60);
> +check_equals(hardref2.getDepth(), 70);
> +check_equals(hardref3.getDepth(), 80);
> +check_equals(softref3child.getDepth(), 1);
>  #if OUTPUT_VERSION > 6
>  check_equals(getInstanceAtDepth(60), hardref);
>  check_equals(getInstanceAtDepth(70), hardref2);
> - check_equals(hardref.getDepth(), 60);
> - check_equals(hardref2.getDepth(), 70);
> + check_equals(getInstanceAtDepth(80), hardref3);
> + check_equals(hardref3.getInstanceAtDepth(1), hardref3.hardref3child);
>  removeMovieClip(hardref); // using ActionRemoveClip (0x25)
>  removeMovieClip(hardref2); // using ActionRemoveClip (0x25)
> + removeMovieClip(hardref3); // using ActionRemoveClip (0x25)
>  check_equals(getInstanceAtDepth(60), undefined);
>  check_equals(getInstanceAtDepth(-32839), hardref2);
>  #else
>  // just to test another way, ActionRemoveClip in SWF6 will work as well
>  hardref.removeMovieClip(); // using the sprite's removeMovieClip
>  hardref2.removeMovieClip(); // using the sprite's removeMovieClip
> + hardref3.removeMovieClip(); // using the sprite's removeMovieClip
>  //softref.removeMovieClip(); // use the softref's removeMovieClip
>  #endif
>
>  check_equals(typeof(hardref), 'undefined');
>  xcheck_equals(typeof(hardref2), 'movieclip');
> +xcheck_equals(typeof(hardref3), 'movieclip'); // still accessible due to onUnload defined for its child
>  xcheck_equals(hardref2.getDepth(), -32839);
> +xcheck_equals(hardref3.getDepth(), -32849);
> +xcheck_equals(hardref3.hardref3child.getDepth(), 1);
>  check_equals(typeof(softref), 'movieclip');
>  check_equals(typeof(softref2), 'movieclip');
> +check_equals(typeof(softref3), 'movieclip');
> +check_equals(typeof(softref3child), 'movieclip');
>  check_equals(typeof(softref.member), 'undefined');
>  check_equals(typeof(softref._target), 'undefined');
>  xcheck_equals(softref2.member, 2);
>  xcheck_equals(softref2._target, '/hardref2');
> +xcheck_equals(softref3.member, 3);
> +xcheck_equals(softref3._target, '/hardref3');
> +xcheck_equals(softref3child.member, '3child');
> +xcheck_equals(softref3child._target, '/hardref3/hardref3child');
>  hardref = 4;
> -check_equals(typeof(softref), 'movieclip'); // hardref doesn't hide this
>  // Delete is needed, or further inspection functions will hit the variable before the character
>  delete hardref;
>  sr61 = _root.createEmptyMovieClip("hardref", 61);
>
>
> _______________________________________________
> Gnash-commit mailing list
> Gnash-commit@gnu.org
> http://lists.gnu.org/mailman/listinfo/gnash-commit
>



From MAILER-DAEMON Thu Aug 30 21:29:38 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQvKM-0004Ed-HA
	for mharc-gnash-commit@gnu.org; Thu, 30 Aug 2007 21:29:38 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQvKK-0004Dz-Pu
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 21:29:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQvKJ-0004Dm-0n
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 21:29:36 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQvKI-0004Dj-SA
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 21:29:34 -0400
Received: from rv-out-0910.google.com ([209.85.198.184])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1IQvKI-0003av-Hg
	for gnash-commit@gnu.org; Thu, 30 Aug 2007 21:29:34 -0400
Received: by rv-out-0910.google.com with SMTP id c27so306082rvf
	for <gnash-commit@gnu.org>; Thu, 30 Aug 2007 18:29:33 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=uGI2rjvy+hdLTF4OiNOXoYUKLaMzpQuD2///V5Upn+DFpwXi5YxwYkMw6IVz8uKvwYa94qaqwuMW66f/u3MlvmRUXLF399IgwHp8zsQeY3+2CWoXbh1yVGfS785gm9f3D6ay2VjY9Cr6uxX5srVhiRNe7WIUNM0bcx4czDLAiF4=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=YFZ4SwFI42hL/rOL8lDG1toznIr8ap23JpKAt23zw+Pvp+cR96Z4YrkDfsmjE+iVCGrrvFXtigOVY951QfB0d18lBz+T/3/HD2/dhKsq6bCDn+r+riacVyX6BwZfQX7cdtU8P71n2WNT6jlRwi2YYm8WhAlKet7gPIS+F0iXkNA=
Received: by 10.114.157.1 with SMTP id f1mr1023803wae.1188523772835;
	Thu, 30 Aug 2007 18:29:32 -0700 (PDT)
Received: by 10.114.12.7 with HTTP; Thu, 30 Aug 2007 18:29:32 -0700 (PDT)
Message-ID: <ca4b43ff0708301829p2a5ae7b4j8fa950c3b3bfa89e@mail.gmail.com>
Date: Fri, 31 Aug 2007 09:29:32 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash ChangeLog libbase/image.cpp
In-Reply-To: <E1IQuhI-0004iU-GA@cvs.savannah.gnu.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1IQuhI-0004iU-GA@cvs.savannah.gnu.org>
X-Detected-Kernel: Linux 2.6 (newer, 2)
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Aug 2007 01:29:37 -0000

Ops, seems I cann't reproduce the building problem without this
commit. still under testing...

On 8/31/07, Zou Lunkai <zoulunkai@gmail.com> wrote:
> CVSROOT:        /sources/gnash
> Module name:    gnash
> Changes by:     Zou Lunkai <zoulunkai>  07/08/31 00:49:16
>
> Modified files:
>        .              : ChangeLog
>        libbase        : image.cpp
>
> Log message:
>        * libbase/image.cpp: don't ommit the default parameter, should fix
>          the building, please check
>
> CVSWeb URLs:
> http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4166&r2=1.4167
> http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/image.cpp?cvsroot=gnash&r1=1.22&r2=1.23
>
> Patches:
> Index: ChangeLog
> ===================================================================
> RCS file: /sources/gnash/gnash/ChangeLog,v
> retrieving revision 1.4166
> retrieving revision 1.4167
> diff -u -b -r1.4166 -r1.4167
> --- ChangeLog   30 Aug 2007 21:21:57 -0000      1.4166
> +++ ChangeLog   31 Aug 2007 00:49:15 -0000      1.4167
> @@ -1,3 +1,8 @@
> +2007-08-31 Zou Lunkai <zoulunkai@gmail.com>
> +
> +       * libbase/image.cpp: don't ommit the default parameter, should fix
> +         the building, please check.
> +
>  2007-08-30 Sandro Santilli <strk@keybit.net>
>
>        * server/dlist.{cpp,h}: drop unused methods and optional args.
>
> Index: libbase/image.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/libbase/image.cpp,v
> retrieving revision 1.22
> retrieving revision 1.23
> diff -u -b -r1.22 -r1.23
> --- libbase/image.cpp   16 Jun 2007 19:03:00 -0000      1.22
> +++ libbase/image.cpp   31 Aug 2007 00:49:16 -0000      1.23
> @@ -373,7 +373,7 @@
>        //
>        rgba*   read_swf_jpeg3(tu_file* in)
>        {
> -               std::auto_ptr<jpeg::input> j_in ( jpeg::input::create_swf_jpeg2_header_only(in) );
> +               std::auto_ptr<jpeg::input> j_in ( jpeg::input::create_swf_jpeg2_header_only(in, false) );
>                if ( ! j_in.get() ) return 0;
>
>                j_in->start_image();
>
>
> _______________________________________________
> Gnash-commit mailing list
> Gnash-commit@gnu.org
> http://lists.gnu.org/mailman/listinfo/gnash-commit
>



From MAILER-DAEMON Fri Aug 31 01:50:28 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQzOm-0008KF-Qt
	for mharc-gnash-commit@gnu.org; Fri, 31 Aug 2007 01:50:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQzOk-0008Je-Pi
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 01:50:26 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQzOk-0008JS-5j
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 01:50:26 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQzOk-0008JP-1E
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 01:50:26 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IQzOj-0002pz-LT
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 01:50:25 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IQzOj-0006Dy-46
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 05:50:25 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IQzOj-0006Dv-0E
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 05:50:25 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQzOj-0006Dv-0E@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Fri, 31 Aug 2007 05:50:25 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-swfc.all/Makefil...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Aug 2007 05:50:26 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/31 05:50:24

Modified files:
	.              : ChangeLog 
	testsuite/misc-swfc.all: Makefile.am 
Added files:
	testsuite/misc-swfc.all: movieclip_destruction_test2.sc 

Log message:
	* testsuite/misc-swfc.all/movieclip_destruction_test2.sc: testcase about
	  movieclip destruction and soft references, more failures.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4167&r2=1.4168
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/Makefile.am?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/movieclip_destruction_test2.sc?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4167
retrieving revision 1.4168
diff -u -b -r1.4167 -r1.4168
--- ChangeLog	31 Aug 2007 00:49:15 -0000	1.4167
+++ ChangeLog	31 Aug 2007 05:50:24 -0000	1.4168
@@ -1,5 +1,11 @@
 2007-08-31 Zou Lunkai <zoulunkai@gmail.com>
 	
+	* testsuite/misc-swfc.all/movieclip_destruction_test2.sc: testcase about
+	  movieclip destruction and soft references, more failures.
+	* testsuite/misc-swfc.all/Makefile.am: enable testcase.
+	  
+2007-08-31 Zou Lunkai <zoulunkai@gmail.com>
+	
 	* libbase/image.cpp: don't ommit the default parameter, should fix 
 	  the building, please check.
 	

Index: testsuite/misc-swfc.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- testsuite/misc-swfc.all/Makefile.am	30 Aug 2007 05:03:37 -0000	1.6
+++ testsuite/misc-swfc.all/Makefile.am	31 Aug 2007 05:50:24 -0000	1.7
@@ -24,6 +24,7 @@
 	sound.sc \
 	soft_reference_test1.sc \
 	movieclip_destruction_test1.sc \
+	movieclip_destruction_test2.sc \
 	$(NULL)
 
 # These will get compiled to SWFs just as above, but will not be executed as a test

Index: testsuite/misc-swfc.all/movieclip_destruction_test2.sc
===================================================================
RCS file: testsuite/misc-swfc.all/movieclip_destruction_test2.sc
diff -N testsuite/misc-swfc.all/movieclip_destruction_test2.sc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-swfc.all/movieclip_destruction_test2.sc	31 Aug 2007 05:50:24 -0000	1.1
@@ -0,0 +1,179 @@
+/*
+ *   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */ 
+
+/*
+ * Zou Lunkai, zoulunkai@gmail.com
+ * 
+ * Test destruction of static movieclips and soft references
+ *
+ * Description:
+ * 
+ *  frame2: Place mc1, mc2, mc3 by PlaceObject2 tag.
+ *          Create a soft reference mc1Ref for mc1, mc2Ref for mc2, mc3Ref for mc3.
+ *          Define onUnload for mc2, define onUnload for mc3.
+ *          Define mc2.testvar = 100, define mc3.testvar = new Number(100);
+ *
+ *  frame3: Remove mc1, mc2, mc3 by RemovieObject2 tag
+ * 
+ *
+ * Expected behaviour:
+ *    (1) mc1Ref in frame3 is dangling.
+ *    (2) mc2Ref, mc3Ref, mc2 and mc3 are still accessible in frame3.
+ *    (3) Movieclip.swapDepths() does not work for mc2 and mc3 in frame3.
+ *    (4) mc2.testvar keeps alive after onUnload, mc3.testvar gets destroyed before entering onUnload handler.
+ *    (5) mc2Ref, mc3Ref are dangling at frame4.
+ * 
+ */
+
+
+.flash  bbox=800x600 filename="movieclip_destruction_test2.swf" background=white version=7 fps=1
+
+.frame 1
+  .action:
+   #include "Dejagnu.sc"
+  .end
+  
+  // Define 3 shapes(b1, b2, b3)
+  .box b1 fill=green width=100 height=100
+  .box b2 fill=red width=100 height=100
+  .box b3 fill=yellow width=100 height=100
+
+.frame 2
+  
+  .sprite mc1 // Define a sprite mc1
+    .frame 1
+      .put b1 x = 0 y = 0
+  .end //end of sprite
+  
+  .sprite mc2 // Define a sprite mc2
+    .frame 1
+      .put b2 x = 0 y = 0
+  .end
+  
+  .sprite mc3 // Define a sprite mc3
+    .frame 1
+      .put b2 x = 0 y = 0
+  .end
+  
+  .put mc1 x = 100 y = 300 // Place mc1
+  .put mc2 x = 200 y = 300 // Place mc2
+  .put mc3 x = 300 y = 300 // Place mc3
+  
+  .action:
+  
+    _root.mc2UnlaodedCount = 0;
+    _root.mc3UnlaodedCount = 0;
+    check_equals(typeof(mc1), 'movieclip');
+    check_equals(mc1.getDepth(), -16383);
+    check_equals(mc2.getDepth(), -16382);
+    check_equals(mc3.getDepth(), -16381);
+    // Define a onUnload for mc2 and mc3
+    mc2.onUnload = function ()  
+    { 
+       _root.mc2UnlaodedCount++;     
+       // mc2.testvar keeps alive as long as mc2 is alive
+       _root.xcheck_equals(mc2.testvar, 100); 
+    };
+    mc3.onUnload = function ()  
+    { 
+       _root.mc3UnlaodedCount++; 
+       // mc3.testvar get destroyed before entering onUnload
+       _root.check_equals(mc3.testvar, undefined);
+    };
+    
+    mc2.testvar = 100;
+    mc2.testvar = new Number(100);
+    
+    // Create soft references for mc1 and mc2 and mc3
+    mc1Ref = mc1;
+    mc2Ref = mc2;
+    mc3Ref = mc3;
+  .end
+
+
+.frame 3
+  .del mc1 // Remove mc1
+  .del mc2 // Remove mc1
+  .del mc3 // Remove mc1
+
+  .action: 
+    xcheck_equals(mc2UnlaodedCount, 1); //mc2.onUnload triggered
+    xcheck_equals(mc2UnlaodedCount, 1); //mc3.onUnload triggered
+    check_equals(mc1Ref.valueOf(), null);
+    xcheck_equals(mc2Ref, mc2);
+    xcheck_equals(mc3Ref, mc3);
+    
+    check_equals(typeof(mc1), 'undefined'); //cann't access the hard reference
+    xcheck_equals(typeof(mc2), 'movieclip'); // mc2 is still accessable
+    xcheck_equals(typeof(mc3), 'movieclip'); // mc3 is still accessable
+    xcheck_equals(mc2.getDepth(), -16387);   // mc2's depths changed
+    xcheck_equals(mc3.getDepth(), -16388);   // mc3's depths changed
+    
+    mc2.swapDepths(mc3);      
+    xcheck_equals(mc2.getDepth(), -16387);  // Depths not change after swapDepths
+    xcheck_equals(mc3.getDepth(), -16388);  // Depths not change after swapDepths
+    
+    mc2.swapDephts(-10);
+    mc2.swapDephts(10);
+    xcheck_equals(mc2.getDepth(), -16387);  // Depths not change after swapDepths
+    xcheck_equals(mc3.getDepth(), -16388);  // Depths not change after swapDepths
+    
+    xcheck_equals(mc2.testvar, 100);       
+    check_equals(mc3.testvar, undefined); 
+    check_equals(typeof(mc3.testvar), 'undefined'); 
+    mc2.removMovieClip();
+    mc3.removMovieClip();
+    xcheck_equals(mc2UnlaodedCount, 1); //mc2.onUnload not triggered again
+    xcheck_equals(mc2UnlaodedCount, 1); //mc3.onUnload not triggered again
+    xcheck_equals(typeof(mc2), 'movieclip'); // mc2 is still accessible
+    xcheck_equals(typeof(mc3), 'movieclip'); // mc3 is still accessible
+    xcheck_equals(mc2.getDepth(), -16387); 
+    xcheck_equals(mc3.getDepth(), -16388);  
+    xcheck_equals(mc2._x, 200); 
+    xcheck_equals(mc3._y, 300);  
+    xcheck_equals(mc2.testvar, 100); 
+    check_equals(mc3.testvar, undefined); 
+    check_equals(typeof(mc3.testvar), 'undefined'); 
+    
+    mc2.onUnload();
+    mc3.onUnload();
+    xcheck_equals(mc2UnlaodedCount, 2);  // we can still invoke onUnload
+    xcheck_equals(mc2UnlaodedCount, 2);  // we can still invoke onUnload
+  .end
+
+
+.frame 4
+  .action:
+    check_equals(typeof(mc1), 'undefined');
+    check_equals(typeof(mc2), 'undefined');
+    check_equals(typeof(mc3), 'undefined');
+    check_equals(mc1Ref.valueOf(), null);
+    check_equals(mc2Ref.valueOf(), null);
+    check_equals(mc3Ref.valueOf(), null);
+  .end
+  
+
+.frame 5
+  .action:
+    totals();
+    stop();
+  .end
+
+  
+.end // end of the file
+



From MAILER-DAEMON Fri Aug 31 01:58:17 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IQzWL-0001Mu-PL
	for mharc-gnash-commit@gnu.org; Fri, 31 Aug 2007 01:58:17 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQzWJ-0001MI-Hk
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 01:58:15 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQzWI-0001M5-6l
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 01:58:14 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQzWI-0001M2-13
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 01:58:14 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IQzWH-0003vT-MG
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 01:58:13 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IQzWE-0006LW-VL
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 05:58:11 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IQzWE-0006LT-Pi
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 05:58:10 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IQzWE-0006LT-Pi@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Fri, 31 Aug 2007 05:58:10 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/testsuite/misc-swfc.all movieclip_destruc...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Aug 2007 05:58:15 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/31 05:58:10

Modified files:
	testsuite/misc-swfc.all: movieclip_destruction_test2.sc 

Log message:
	minor comments correct

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/movieclip_destruction_test2.sc?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: movieclip_destruction_test2.sc
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/movieclip_destruction_test2.sc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- movieclip_destruction_test2.sc	31 Aug 2007 05:50:24 -0000	1.1
+++ movieclip_destruction_test2.sc	31 Aug 2007 05:58:10 -0000	1.2
@@ -107,9 +107,9 @@
 
 
 .frame 3
-  .del mc1 // Remove mc1
-  .del mc2 // Remove mc1
-  .del mc3 // Remove mc1
+  .del mc1 // Remove mc1 by RemoveObject2
+  .del mc2 // Remove mc2 by RemoveObject2
+  .del mc3 // Remove mc3 by RemoveObject2
 
   .action: 
     xcheck_equals(mc2UnlaodedCount, 1); //mc2.onUnload triggered
@@ -121,17 +121,17 @@
     check_equals(typeof(mc1), 'undefined'); //cann't access the hard reference
     xcheck_equals(typeof(mc2), 'movieclip'); // mc2 is still accessable
     xcheck_equals(typeof(mc3), 'movieclip'); // mc3 is still accessable
-    xcheck_equals(mc2.getDepth(), -16387);   // mc2's depths changed
-    xcheck_equals(mc3.getDepth(), -16388);   // mc3's depths changed
+    xcheck_equals(mc2.getDepth(), -16387);   // depth of mc2 changed after onUnload
+    xcheck_equals(mc3.getDepth(), -16388);   // depth of mc3 changed after onUnload
     
     mc2.swapDepths(mc3);      
-    xcheck_equals(mc2.getDepth(), -16387);  // Depths not change after swapDepths
-    xcheck_equals(mc3.getDepth(), -16388);  // Depths not change after swapDepths
+    xcheck_equals(mc2.getDepth(), -16387);  // depth not change after swapDepths
+    xcheck_equals(mc3.getDepth(), -16388);  // depth not change after swapDepths
     
     mc2.swapDephts(-10);
     mc2.swapDephts(10);
-    xcheck_equals(mc2.getDepth(), -16387);  // Depths not change after swapDepths
-    xcheck_equals(mc3.getDepth(), -16388);  // Depths not change after swapDepths
+    xcheck_equals(mc2.getDepth(), -16387);  // depth not change after swapDepths
+    xcheck_equals(mc3.getDepth(), -16388);  // depth not change after swapDepths
     
     xcheck_equals(mc2.testvar, 100);       
     check_equals(mc3.testvar, undefined); 



From MAILER-DAEMON Fri Aug 31 02:46:57 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IR0HR-0005jT-R4
	for mharc-gnash-commit@gnu.org; Fri, 31 Aug 2007 02:46:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IR0HP-0005jL-OW
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 02:46:55 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IR0HO-0005j9-Co
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 02:46:54 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IR0HO-0005j6-7H
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 02:46:54 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IR0HN-0001l8-OT
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 02:46:53 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IR0HN-0001jO-0r
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 06:46:53 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IR0HM-0001jI-QP
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 06:46:52 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IR0HM-0001jI-QP@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Fri, 31 Aug 2007 06:46:52 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/testsuite/misc-swfc.all movieclip_destruc...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Aug 2007 06:46:55 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/31 06:46:52

Modified files:
	testsuite/misc-swfc.all: movieclip_destruction_test2.sc 

Log message:
	add tests for MovieClip.swapDepths

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/movieclip_destruction_test2.sc?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: movieclip_destruction_test2.sc
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/movieclip_destruction_test2.sc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- movieclip_destruction_test2.sc	31 Aug 2007 05:58:10 -0000	1.2
+++ movieclip_destruction_test2.sc	31 Aug 2007 06:46:52 -0000	1.3
@@ -67,7 +67,7 @@
   
   .sprite mc3 // Define a sprite mc3
     .frame 1
-      .put b2 x = 0 y = 0
+      .put b3 x = 0 y = 0
   .end
   
   .put mc1 x = 100 y = 300 // Place mc1
@@ -167,8 +167,16 @@
     check_equals(mc3Ref.valueOf(), null);
   .end
   
-
+// Seperate tests for Movieclip.swapDepths
 .frame 5
+    .put mc1 x = 100 y = 300 // Place mc1
+    .action:
+      check_equals(mc1.getDepth(), -16380);
+      mc1.swapDepths(-16400); // doesn't work, can't swap mc1 to a depth below -16384
+      check_equals(mc1.getDepth(), -16380);
+    .end
+
+.frame 6
   .action:
     totals();
     stop();



From MAILER-DAEMON Fri Aug 31 03:16:58 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IR0kU-0003md-Sh
	for mharc-gnash-commit@gnu.org; Fri, 31 Aug 2007 03:16:58 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IR0kT-0003m2-QM
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 03:16:57 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IR0kR-0003ik-7j
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 03:16:56 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IR0kR-0003ig-5v
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 03:16:55 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IR0kR-00076e-0Z
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 03:16:55 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IR0kP-0003jv-NI
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 07:16:54 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IR0kP-0003jm-0B
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 07:16:53 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IR0kP-0003jm-0B@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Fri, 31 Aug 2007 07:16:53 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/testsuite/misc-swfc.all movieclip_destruc...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Aug 2007 07:16:58 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/31 07:16:52

Modified files:
	testsuite/misc-swfc.all: movieclip_destruction_test2.sc 

Log message:
	cleanups, the original tests and comments were bogus, forget it.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/movieclip_destruction_test2.sc?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: movieclip_destruction_test2.sc
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/movieclip_destruction_test2.sc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- movieclip_destruction_test2.sc	31 Aug 2007 06:46:52 -0000	1.3
+++ movieclip_destruction_test2.sc	31 Aug 2007 07:16:52 -0000	1.4
@@ -35,7 +35,7 @@
  *    (1) mc1Ref in frame3 is dangling.
  *    (2) mc2Ref, mc3Ref, mc2 and mc3 are still accessible in frame3.
  *    (3) Movieclip.swapDepths() does not work for mc2 and mc3 in frame3.
- *    (4) mc2.testvar keeps alive after onUnload, mc3.testvar gets destroyed before entering onUnload handler.
+ *    (4) 'testvar' of mc2 and mc3 keep alive after onUnload called.
  *    (5) mc2Ref, mc3Ref are dangling at frame4.
  * 
  */
@@ -92,12 +92,11 @@
     mc3.onUnload = function ()  
     { 
        _root.mc3UnlaodedCount++; 
-       // mc3.testvar get destroyed before entering onUnload
-       _root.check_equals(mc3.testvar, undefined);
+       _root.xcheck_equals(mc3.testvar, 100);
     };
     
     mc2.testvar = 100;
-    mc2.testvar = new Number(100);
+    mc3.testvar = new Number(100);
     
     // Create soft references for mc1 and mc2 and mc3
     mc1Ref = mc1;
@@ -134,8 +133,7 @@
     xcheck_equals(mc3.getDepth(), -16388);  // depth not change after swapDepths
     
     xcheck_equals(mc2.testvar, 100);       
-    check_equals(mc3.testvar, undefined); 
-    check_equals(typeof(mc3.testvar), 'undefined'); 
+    xcheck_equals(mc3.testvar, 100); 
     mc2.removMovieClip();
     mc3.removMovieClip();
     xcheck_equals(mc2UnlaodedCount, 1); //mc2.onUnload not triggered again
@@ -147,8 +145,7 @@
     xcheck_equals(mc2._x, 200); 
     xcheck_equals(mc3._y, 300);  
     xcheck_equals(mc2.testvar, 100); 
-    check_equals(mc3.testvar, undefined); 
-    check_equals(typeof(mc3.testvar), 'undefined'); 
+    xcheck_equals(mc3.testvar, 100); 
     
     mc2.onUnload();
     mc3.onUnload();
@@ -173,7 +170,7 @@
     .action:
       check_equals(mc1.getDepth(), -16380);
       mc1.swapDepths(-16400); // doesn't work, can't swap mc1 to a depth below -16384
-      check_equals(mc1.getDepth(), -16380);
+      xcheck_equals(mc1.getDepth(), -16380);
     .end
 
 .frame 6



From MAILER-DAEMON Fri Aug 31 03:40:04 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IR16q-0002lx-Ca
	for mharc-gnash-commit@gnu.org; Fri, 31 Aug 2007 03:40:04 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IR16p-0002la-0w
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 03:40:03 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IR16n-0002lH-PW
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 03:40:02 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IR16n-0002l8-FC
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 03:40:01 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IR16n-0002QO-8d
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 03:40:01 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IR16m-0004WI-Ib
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 07:40:00 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IR16m-0004WF-Er
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 07:40:00 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IR16m-0004WF-Er@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Fri, 31 Aug 2007 07:40:00 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-swfc.all/moviecl...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Aug 2007 07:40:03 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/31 07:40:00

Modified files:
	.              : ChangeLog 
	testsuite/misc-swfc.all: movieclip_destruction_test1.sc 

Log message:
	* testsuite/misc-swfc.all/movieclip_destruction_test1.sc: few more tests.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4168&r2=1.4169
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/movieclip_destruction_test1.sc?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4168
retrieving revision 1.4169
diff -u -b -r1.4168 -r1.4169
--- ChangeLog	31 Aug 2007 05:50:24 -0000	1.4168
+++ ChangeLog	31 Aug 2007 07:39:59 -0000	1.4169
@@ -1,5 +1,9 @@
 2007-08-31 Zou Lunkai <zoulunkai@gmail.com>
 	
+	* testsuite/misc-swfc.all/movieclip_destruction_test1.sc: few more tests.
+	
+2007-08-31 Zou Lunkai <zoulunkai@gmail.com>
+	
 	* testsuite/misc-swfc.all/movieclip_destruction_test2.sc: testcase about
 	  movieclip destruction and soft references, more failures.
 	* testsuite/misc-swfc.all/Makefile.am: enable testcase.

Index: testsuite/misc-swfc.all/movieclip_destruction_test1.sc
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/movieclip_destruction_test1.sc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- testsuite/misc-swfc.all/movieclip_destruction_test1.sc	30 Aug 2007 12:58:29 -0000	1.3
+++ testsuite/misc-swfc.all/movieclip_destruction_test1.sc	31 Aug 2007 07:40:00 -0000	1.4
@@ -48,7 +48,7 @@
  */
 
 
-.flash  bbox=800x600 filename="movieclip_destruction_test1.swf" background=white version=6 fps=12
+.flash  bbox=800x600 filename="movieclip_destruction_test1.swf" background=white version=7 fps=12
 
 .frame 1
   .action:
@@ -68,6 +68,7 @@
       .put b1 x = 300 y = 300
     .frame 2    
       .action:
+        check_equals(mc1.getDepth(), -16383);
         _root.x = 0;
         _root.gotoAndStop(6);
         // AS below have no chance to be executed.
@@ -92,6 +93,8 @@
   .end
   
   .initaction mc2: // Add initactions for mc2(mc2 is not placed)
+    // mc1 is still alive here, _root.gotoAndStop(6) hasn't been executed yet.
+    // Note mc1 has 2 frames.
     check_equals(typeof(mc1), 'movieclip');
     check_equals(mc1.getDepth(), -16383);
   .end
@@ -107,6 +110,7 @@
   .initaction mc3: // Add initactions for mc3(mc3 is not placed)
     _root.xcheck_equals(mc1, null);
     _root.xcheck_equals(typeof(mc1), 'undefined');
+    _root.check_equals(typeof(_root.getInstanceAtDepth(-16386)), 'undefined');
   .end
 
   .del mc1  // Remove sprite mc1  



From MAILER-DAEMON Fri Aug 31 03:56:14 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IR1MU-0004uW-CE
	for mharc-gnash-commit@gnu.org; Fri, 31 Aug 2007 03:56:14 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IR1MT-0004uR-5A
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 03:56:13 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IR1MS-0004uF-H3
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 03:56:12 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IR1MS-0004uC-8p
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 03:56:12 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1IR1MR-0004MM-WF
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 03:56:12 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <zoulunkai@gmail.com>) id 1IR1MR-0006Dk-BG
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 07:56:11 +0000
Received: from zoulunkai by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <zoulunkai@savannah.gnu.org>) id 1IR1MR-0006Dh-7Q
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 07:56:11 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IR1MR-0006Dh-7Q@cvs.savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Fri, 31 Aug 2007 07:56:11 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/server sprite_instance.cpp sprite_instance.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Aug 2007 07:56:13 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/08/31 07:56:11

Modified files:
	server         : sprite_instance.cpp sprite_instance.h 

Log message:
	comments update.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.316&r2=1.317
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.133&r2=1.134

Patches:
Index: sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -b -r1.316 -r1.317
--- sprite_instance.cpp	30 Aug 2007 18:19:15 -0000	1.316
+++ sprite_instance.cpp	31 Aug 2007 07:56:10 -0000	1.317
@@ -2784,6 +2784,12 @@
     //  (2) we are in jump-back-mode
     if(!existing_char || is_jumping_back)
     {
+        // TODO: Optimize this.
+        // Create_character_instance() is too expensive for some characters.
+        // All I need to do here might be just syntetize a new instance name,
+        // the real character is not needed.
+        // To decide whether a new instance name is needed for static characters, 
+        // a single character_id should be enough. 
         ch = cdef->create_character_instance(this, character_id);
         ch->setTimelineInfo(depth, m_current_frame, false);
 
@@ -2835,6 +2841,8 @@
     {
         // remove the created character from the key listener list,
         // it might be there(eg. button_character).
+		// TODO: optimize this.  This is not necessary if we don't create
+		// instances blindly above.
         _vm.getRoot().remove_key_listener(ch.get());
 
         move_display_object(depth, &color_transform, &mat, ratio, clip_depth);

Index: sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -b -r1.133 -r1.134
--- sprite_instance.h	30 Aug 2007 18:19:16 -0000	1.133
+++ sprite_instance.h	31 Aug 2007 07:56:11 -0000	1.134
@@ -317,7 +317,7 @@
 	/// controlled by the is_jumping_back flag. If false, this
 	/// call will result in a no-op. If true, the previously existing character
 	/// will be replaced by the new one, with unload() method invoked on the
-	/// removed character. (zou: correct?)
+	/// removed character. 
 	///
 	/// Any successful new placement triggers invokation of the newly created
 	/// instance's LOAD event.
@@ -355,8 +355,7 @@
 	/// @return 
 	///	A pointer to the character being added or NULL
 	///	if this call results in a move of an existing character 
-	///	or in a no-op due to is_jumping_back being
-	///	false. (zou: correct?)
+	///	or in a no-op due to is_jumping_back being false. 
 	///       
 	character* add_display_object(
 		uint16_t character_id,



From MAILER-DAEMON Fri Aug 31 09:54:37 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IR6xJ-0005z8-4i
	for mharc-gnash-commit@gnu.org; Fri, 31 Aug 2007 09:54:37 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IR6xH-0005xv-Vl
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 09:54:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IR6xG-0005wV-P9
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 09:54:35 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IR6xG-0005wE-HK
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 09:54:34 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1IR6xF-0000xA-MC
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 09:54:34 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l7VDsIq70913;
	Fri, 31 Aug 2007 15:54:18 +0200 (CEST)
	(envelope-from strk@keybit.net)
Date: Fri, 31 Aug 2007 15:54:18 +0200
From: Sandro Santilli <strk@keybit.net>
To: zou lunkai <zoulunkai@gmail.com>
Subject: Re: [Gnash-commit] gnash/testsuite/actionscript.all MovieClip.as
Message-ID: <20070831135418.GC54883@keybit.net>
Mail-Followup-To: zou lunkai <zoulunkai@gmail.com>, gnash-commit@gnu.org
References: <E1IQkPF-0006BU-90@cvs.savannah.gnu.org>
	<ca4b43ff0708301818y99c6d16ua1ee121c0c728161@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <ca4b43ff0708301818y99c6d16ua1ee121c0c728161@mail.gmail.com>
X-Detected-Kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Aug 2007 13:54:36 -0000

On Fri, Aug 31, 2007 at 09:18:53AM +0800, zou lunkai wrote:
> > +// Here we create 3 clips
> > +//     - hardref has no onUnload
> > +//     - hardref2 has an onUnload
> > +//     - hardref3 has no onUnload but a child with onUnload
> > +// We'll see that when the three clips are removed from the stage
> > +// those with any onUnload handler (either theirs or in their childrens)
> > +// will still be on the stage, only with their depth shifted at -32769-depth
> > +// (see character::removedRepthOffset)
> > +
> Characters with no onUnload won't be pushed to the global list at the
> frame being removed, thus get destroyed before GC works. Characters
> with onUnload are pushed to the global list, thus need to be removed
> at the end of the frame by GC. Just some deduction:)  I'll do more
> tests today.

I'm working on a patch that passes all the new tests.
Still not using a global list though, just the existing
DisplayList. Not committed as it triggers few more failures I'm inspecting.
BTW, important to tet what happens whtn the target depth (-32769-depth)
is already occupied and when the just-moved character gets back by effect
of swapDepth.

--strk;



From MAILER-DAEMON Fri Aug 31 09:55:33 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IR6yD-0006Sa-G1
	for mharc-gnash-commit@gnu.org; Fri, 31 Aug 2007 09:55:33 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IR6yB-0006S1-4S
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 09:55:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IR6yA-0006Rn-EN
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 09:55:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IR6yA-0006Rk-8C
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 09:55:30 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1IR6y8-00019y-OV
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 09:55:29 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l7VDt5S70959;
	Fri, 31 Aug 2007 15:55:05 +0200 (CEST)
	(envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Fri, 31 Aug 2007 15:55:05 +0200
To: Zou Lunkai <zoulunkai@gmail.com>
Subject: Re: [Gnash-commit] gnash ChangeLog libbase/image.cpp
Message-ID: <20070831135504.GD54883@keybit.net>
Mail-Followup-To: Zou Lunkai <zoulunkai@gmail.com>, gnash-commit@gnu.org
References: <E1IQuhI-0004iU-GA@cvs.savannah.gnu.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1IQuhI-0004iU-GA@cvs.savannah.gnu.org>
X-Detected-Kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Aug 2007 13:55:31 -0000

On Fri, Aug 31, 2007 at 12:49:16AM +0000, Zou Lunkai wrote:
> CVSROOT:	/sources/gnash
> Module name:	gnash
> Changes by:	Zou Lunkai <zoulunkai>	07/08/31 00:49:16
> 
> Modified files:
> 	.              : ChangeLog 
> 	libbase        : image.cpp 
> 
> Log message:
> 	* libbase/image.cpp: don't ommit the default parameter, should fix 
> 	  the building, please check

Shouldn't be needed. It *has* to work with a default parameter.
You probably missed to run ./autogen.sh and force rebuild of image.o

--strk;



From MAILER-DAEMON Fri Aug 31 09:58:19 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IR70s-0006zL-Va
	for mharc-gnash-commit@gnu.org; Fri, 31 Aug 2007 09:58:18 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IR70s-0006z8-21
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 09:58:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IR70q-0006y1-B3
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 09:58:17 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IR70q-0006xo-6I
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 09:58:16 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1IR70o-0001s6-LX
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 09:58:15 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l7VDvma71014;
	Fri, 31 Aug 2007 15:57:48 +0200 (CEST)
	(envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Fri, 31 Aug 2007 15:57:48 +0200
To: Zou Lunkai <zoulunkai@gmail.com>
Subject: Re: [Gnash-commit] gnash ChangeLog testsuite/misc-swfc.all/Makefil...
Message-ID: <20070831135748.GE54883@keybit.net>
Mail-Followup-To: Zou Lunkai <zoulunkai@gmail.com>, gnash-commit@gnu.org
References: <E1IQzOj-0006Dv-0E@cvs.savannah.gnu.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1IQzOj-0006Dv-0E@cvs.savannah.gnu.org>
X-Detected-Kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Aug 2007 13:58:18 -0000

On Fri, Aug 31, 2007 at 05:50:25AM +0000, Zou Lunkai wrote:

> + * Description:
> + * 
> + *  frame2: Place mc1, mc2, mc3 by PlaceObject2 tag.
> + *          Create a soft reference mc1Ref for mc1, mc2Ref for mc2, mc3Ref for mc3.
> + *          Define onUnload for mc2, define onUnload for mc3.
> + *          Define mc2.testvar = 100, define mc3.testvar = new Number(100);
> + *
> + *  frame3: Remove mc1, mc2, mc3 by RemovieObject2 tag
> + * 
> + *
> + * Expected behaviour:
> + *    (1) mc1Ref in frame3 is dangling.
> + *    (2) mc2Ref, mc3Ref, mc2 and mc3 are still accessible in frame3.
> + *    (3) Movieclip.swapDepths() does not work for mc2 and mc3 in frame3.
> + *    (4) mc2.testvar keeps alive after onUnload, mc3.testvar gets destroyed before entering onUnload handler.
> + *    (5) mc2Ref, mc3Ref are dangling at frame4.
> + * 
> + */

Excellent !! Thank you !!
Btw, why mc3.testvar gets destroyed and mc2.testvar doesn't ?

--strk;



From MAILER-DAEMON Fri Aug 31 10:02:11 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IR74d-00082b-FO
	for mharc-gnash-commit@gnu.org; Fri, 31 Aug 2007 10:02:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IR74c-00082G-5E
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 10:02:10 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IR74Z-00081a-S3
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 10:02:09 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IR74Z-00081X-Ms
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 10:02:07 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1IR74Y-0002TB-1r
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 10:02:07 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l7VE1XV71099;
	Fri, 31 Aug 2007 16:01:33 +0200 (CEST)
	(envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Fri, 31 Aug 2007 16:01:33 +0200
To: Zou Lunkai <zoulunkai@gmail.com>
Subject: Re: [Gnash-commit] gnash/testsuite/misc-swfc.all movieclip_destruc...
Message-ID: <20070831140133.GF54883@keybit.net>
Mail-Followup-To: Zou Lunkai <zoulunkai@gmail.com>, gnash-commit@gnu.org
References: <E1IR0kP-0003jm-0B@cvs.savannah.gnu.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1IR0kP-0003jm-0B@cvs.savannah.gnu.org>
X-Detected-Kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Aug 2007 14:02:10 -0000

On Fri, Aug 31, 2007 at 07:16:53AM +0000, Zou Lunkai wrote:

> - *    (4) mc2.testvar keeps alive after onUnload, mc3.testvar gets destroyed before entering onUnload handler.
> + *    (4) 'testvar' of mc2 and mc3 keep alive after onUnload called.

Now it makes sense :)
--strk;



From MAILER-DAEMON Fri Aug 31 10:23:25 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IR7PB-0007ov-Mw
	for mharc-gnash-commit@gnu.org; Fri, 31 Aug 2007 10:23:25 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IR7PA-0007mM-Mz
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 10:23:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IR7P9-0007jb-OU
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 10:23:23 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IR7P9-0007j9-CU
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 10:23:23 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IR7P9-0005td-5E
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 10:23:23 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IR7P7-0000GY-HM
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 14:23:21 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IR7P7-0000GV-Af
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 14:23:21 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IR7P7-0000GV-Af@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 31 Aug 2007 14:23:21 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-swfc.all/check.sc
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Aug 2007 14:23:25 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/31 14:23:21

Modified files:
	.              : ChangeLog 
	testsuite/misc-swfc.all: check.sc 

Log message:
	        * testsuite/misc-swfc.all/check.sc: define totals().

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4169&r2=1.4170
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/check.sc?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4169
retrieving revision 1.4170
diff -u -b -r1.4169 -r1.4170
--- ChangeLog	31 Aug 2007 07:39:59 -0000	1.4169
+++ ChangeLog	31 Aug 2007 14:23:19 -0000	1.4170
@@ -1,3 +1,7 @@
+2007-08-31 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/misc-swfc.all/check.sc: define totals().
+
 2007-08-31 Zou Lunkai <zoulunkai@gmail.com>
 	
 	* testsuite/misc-swfc.all/movieclip_destruction_test1.sc: few more tests.

Index: testsuite/misc-swfc.all/check.sc
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/check.sc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/misc-swfc.all/check.sc	10 Aug 2007 18:59:34 -0000	1.2
+++ testsuite/misc-swfc.all/check.sc	31 Aug 2007 14:23:21 -0000	1.3
@@ -44,6 +44,8 @@
 
 #define note(text) Dejagnu.note(text + _INFO_);
 
+#define totals Dejagnu.totals
+
 #define MEDIA(x) MEDIADIR/x
 
 #endif



From MAILER-DAEMON Fri Aug 31 10:49:53 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IR7om-0004y0-TE
	for mharc-gnash-commit@gnu.org; Fri, 31 Aug 2007 10:49:52 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IR7ol-0004wF-12
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 10:49:51 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IR7oj-0004vK-UW
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 10:49:50 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IR7oj-0004vG-Oh
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 10:49:49 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IR7oj-0001zL-Es
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 10:49:49 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IR7oi-0002Ci-Bm
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 14:49:48 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IR7oi-0002Cf-79
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 14:49:48 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IR7oi-0002Cf-79@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 31 Aug 2007 14:49:48 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/dlist.cpp testsuite/misc...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Aug 2007 14:49:51 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/31 14:49:48

Modified files:
	.              : ChangeLog 
	server         : dlist.cpp 
	testsuite/misc-swfc.all: Dejagnu.sc 
	                         movieclip_destruction_test2.sc 

Log message:
	        * server/dlist.cpp (swapDeptsh): don't swap to depths in the
	          deleted characters zone.
	        * testsuite/misc-swfc.all/movieclip_destruction_test2.sc:
	          less failures, few more tests.
	        * testsuite/misc-swfc.all/Dejagnu.sc: include file:line info
	          in xpass too...

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4170&r2=1.4171
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.cpp?cvsroot=gnash&r1=1.79&r2=1.80
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/Dejagnu.sc?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/movieclip_destruction_test2.sc?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4170
retrieving revision 1.4171
diff -u -b -r1.4170 -r1.4171
--- ChangeLog	31 Aug 2007 14:23:19 -0000	1.4170
+++ ChangeLog	31 Aug 2007 14:49:47 -0000	1.4171
@@ -1,5 +1,11 @@
 2007-08-31 Sandro Santilli <strk@keybit.net>
 
+	* server/dlist.cpp (swapDeptsh): don't swap to depths in the
+	  deleted characters zone.
+	* testsuite/misc-swfc.all/movieclip_destruction_test2.sc:
+	  less failures, few more tests.
+	* testsuite/misc-swfc.all/Dejagnu.sc: include file:line info
+	  in xpass too...
 	* testsuite/misc-swfc.all/check.sc: define totals().
 
 2007-08-31 Zou Lunkai <zoulunkai@gmail.com>

Index: server/dlist.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- server/dlist.cpp	30 Aug 2007 21:21:58 -0000	1.79
+++ server/dlist.cpp	31 Aug 2007 14:49:47 -0000	1.80
@@ -415,10 +415,20 @@
 	//dump();
 }
 
+// TODO: take character by ref ?
 void
 DisplayList::swapDepths(character* ch1, int newdepth)
 {
 
+	if ( newdepth < character::staticDepthOffset )
+	{
+		IF_VERBOSE_ASCODING_ERRORS(
+		log_aserror("%s.swapDepth(%d) : ignored call with target depth less then %d",
+			ch1->getTarget().c_str(), newdepth, character::staticDepthOffset);
+		);
+		return;
+	}
+
 	assert(ch1->get_depth() != newdepth);
 
 	container_type::iterator it1 = find(_characters.begin(), _characters.end(), ch1);

Index: testsuite/misc-swfc.all/Dejagnu.sc
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/Dejagnu.sc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/misc-swfc.all/Dejagnu.sc	9 Aug 2007 06:38:15 -0000	1.1
+++ testsuite/misc-swfc.all/Dejagnu.sc	31 Aug 2007 14:49:48 -0000	1.2
@@ -76,7 +76,7 @@
             xcheck_equals: function (obt, exp, msg) {
                 if(msg == null) msg = "";
                 if ( obt == exp ) 
-                    this.xpass(obt+' == '+exp);
+                    this.xpass(obt+' == '+exp+" "+msg);
                 else 
                     this.xfail('expected: '+exp+' , obtained: '+obt+" "+msg);
             },

Index: testsuite/misc-swfc.all/movieclip_destruction_test2.sc
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/movieclip_destruction_test2.sc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- testsuite/misc-swfc.all/movieclip_destruction_test2.sc	31 Aug 2007 07:16:52 -0000	1.4
+++ testsuite/misc-swfc.all/movieclip_destruction_test2.sc	31 Aug 2007 14:49:48 -0000	1.5
@@ -41,7 +41,7 @@
  */
 
 
-.flash  bbox=800x600 filename="movieclip_destruction_test2.swf" background=white version=7 fps=1
+.flash  bbox=800x600 filename="movieclip_destruction_test2.swf" background=white version=7 fps=12
 
 .frame 1
   .action:
@@ -169,8 +169,14 @@
     .put mc1 x = 100 y = 300 // Place mc1
     .action:
       check_equals(mc1.getDepth(), -16380);
-      mc1.swapDepths(-16400); // doesn't work, can't swap mc1 to a depth below -16384
-      xcheck_equals(mc1.getDepth(), -16380);
+      mc1.swapDepths(-16385); // doesn't work, can't swap mc1 to a depth below -16384
+      check_equals(mc1.getDepth(), -16380);
+      mc1.swapDepths(-16384); // works
+      check_equals(mc1.getDepth(), -16384);
+      mc1.swapDepths(-32769); // doesn't work, can't swap mc1 to a depth below -16384 
+      check_equals(mc1.getDepth(), -16384);
+      mc1.swapDepths(-402770); // doesn't work, can't swap mc1 to a depth below -16384 
+      check_equals(mc1.getDepth(), -16384);
     .end
 
 .frame 6



From MAILER-DAEMON Fri Aug 31 11:18:04 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IR8G4-0006h5-71
	for mharc-gnash-commit@gnu.org; Fri, 31 Aug 2007 11:18:04 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IR8G1-0006gC-Ox
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 11:18:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IR8G0-0006fz-IQ
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 11:18:00 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IR8G0-0006fu-CI
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 11:18:00 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IR8G0-0006lM-2L
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 11:18:00 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IR8Fx-000461-N2
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 15:17:58 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IR8Fx-00045x-CB
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 15:17:57 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IR8Fx-00045x-CB@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 31 Aug 2007 15:17:57 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/sprite_instance.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Aug 2007 15:18:01 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/31 15:17:57

Modified files:
	.              : ChangeLog 
	server         : sprite_instance.cpp 

Log message:
	        * server/sprite_instance.cpp: removed more dead code.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4171&r2=1.4172
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.317&r2=1.318

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4171
retrieving revision 1.4172
diff -u -b -r1.4171 -r1.4172
--- ChangeLog	31 Aug 2007 14:49:47 -0000	1.4171
+++ ChangeLog	31 Aug 2007 15:17:56 -0000	1.4172
@@ -1,5 +1,6 @@
 2007-08-31 Sandro Santilli <strk@keybit.net>
 
+	* server/sprite_instance.cpp: removed more dead code.
 	* server/dlist.cpp (swapDeptsh): don't swap to depths in the
 	  deleted characters zone.
 	* testsuite/misc-swfc.all/movieclip_destruction_test2.sc:

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -b -r1.317 -r1.318
--- server/sprite_instance.cpp	31 Aug 2007 07:56:10 -0000	1.317
+++ server/sprite_instance.cpp	31 Aug 2007 15:17:57 -0000	1.318
@@ -1670,25 +1670,6 @@
 	}
 };
 
-/// A DisplayList visitor used to extract all characters
-//
-/// Script characters are characters created or transformed
-/// by ActionScript
-///
-class CharactersExtractor {
-	std::vector<character*>& _chars;
-public:
-	CharactersExtractor(std::vector<character*>& chars)
-		:
-		_chars(chars)
-	{}
-
-	void operator() (character* ch) 
-	{
-		_chars.push_back(ch);
-	}
-};
-
 /// A DisplayList visitor used to unload all characters
 class UnloaderVisitor {
 	int unloadEvents;



From MAILER-DAEMON Fri Aug 31 11:23:33 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IR8LM-0008TI-Vu
	for mharc-gnash-commit@gnu.org; Fri, 31 Aug 2007 11:23:33 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IR8LL-0008ST-1F
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 11:23:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IR8LK-0008Rr-CW
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 11:23:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IR8LK-0008Rk-73
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 11:23:30 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IR8LJ-0007ep-Vm
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 11:23:30 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IR8LJ-0004Et-G2
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 15:23:29 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IR8LJ-0004Eq-Bh
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 15:23:29 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IR8LJ-0004Eq-Bh@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 31 Aug 2007 15:23:29 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-swfc.all/check.sc
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Aug 2007 15:23:31 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/31 15:23:29

Modified files:
	.              : ChangeLog 
	testsuite/misc-swfc.all: check.sc 

Log message:
	        * testsuite/misc-swfc.all/check.sc: ops, last totals() define
	          was buggy, this one is good.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4172&r2=1.4173
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/check.sc?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4172
retrieving revision 1.4173
diff -u -b -r1.4172 -r1.4173
--- ChangeLog	31 Aug 2007 15:17:56 -0000	1.4172
+++ ChangeLog	31 Aug 2007 15:23:28 -0000	1.4173
@@ -1,5 +1,10 @@
 2007-08-31 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/misc-swfc.all/check.sc: ops, last totals() define
+	  was buggy, this one is good.
+
+2007-08-31 Sandro Santilli <strk@keybit.net>
+
 	* server/sprite_instance.cpp: removed more dead code.
 	* server/dlist.cpp (swapDeptsh): don't swap to depths in the
 	  deleted characters zone.

Index: testsuite/misc-swfc.all/check.sc
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/check.sc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- testsuite/misc-swfc.all/check.sc	31 Aug 2007 14:23:21 -0000	1.3
+++ testsuite/misc-swfc.all/check.sc	31 Aug 2007 15:23:29 -0000	1.4
@@ -44,7 +44,7 @@
 
 #define note(text) Dejagnu.note(text + _INFO_);
 
-#define totals Dejagnu.totals
+#define totals() Dejagnu.totals()
 
 #define MEDIA(x) MEDIADIR/x
 



From MAILER-DAEMON Fri Aug 31 11:38:45 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IR8a5-0001TM-9O
	for mharc-gnash-commit@gnu.org; Fri, 31 Aug 2007 11:38:45 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IR8a4-0001SF-1f
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 11:38:44 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IR8a3-0001RX-Bx
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 11:38:43 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IR8a3-0001RN-4h
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 11:38:43 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IR8a2-0001yO-Nf
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 11:38:42 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IR8a1-0004Qb-Kc
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 15:38:41 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IR8a1-0004QY-GA
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 15:38:41 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IR8a1-0004QY-GA@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 31 Aug 2007 15:38:41 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog macros/boost.m4
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Aug 2007 15:38:44 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/31 15:38:41

Modified files:
	.              : ChangeLog 
	macros         : boost.m4 

Log message:
	        * macros/boost.m4: don't trash user-defined CXXFLAGS, and don't
	          provide one if not user-specified initially.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4173&r2=1.4174
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/boost.m4?cvsroot=gnash&r1=1.49&r2=1.50

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4173
retrieving revision 1.4174
diff -u -b -r1.4173 -r1.4174
--- ChangeLog	31 Aug 2007 15:23:28 -0000	1.4173
+++ ChangeLog	31 Aug 2007 15:38:40 -0000	1.4174
@@ -1,5 +1,7 @@
 2007-08-31 Sandro Santilli <strk@keybit.net>
 
+	* macros/boost.m4: don't trash user-defined CXXFLAGS, and don't
+	  provide one if not user-specified initially.
 	* testsuite/misc-swfc.all/check.sc: ops, last totals() define
 	  was buggy, this one is good.
 

Index: macros/boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- macros/boost.m4	29 Aug 2007 23:29:54 -0000	1.49
+++ macros/boost.m4	31 Aug 2007 15:38:41 -0000	1.50
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: boost.m4,v 1.49 2007/08/29 23:29:54 nihilus Exp $
+dnl $Id: boost.m4,v 1.50 2007/08/31 15:38:41 strk Exp $
 
 dnl Boost modules are:
 dnl date-time, filesystem. graph. iostreams, program options, python,
@@ -142,8 +142,16 @@
 
   if test x${cross_compiling} = xno; then
     AC_LANG_PUSH(C++)  
-    CXXFLAGS="$CFLAGS $BOOST_CFLAGS"
+    dnl # Save value of current CXXFLAGS
+    save_CXXFLAGS="$CXXFLAGS"
+    CXXFLAGS="$CFLAGS $BOOST_CFLAGS" dnl # SHOULDN'T WE INCLUDE $CXXFLAGS TOO THEN ?
     AC_CHECK_HEADERS([boost/thread.hpp], [], [boost_thread=no]) 
+    dnl # Do not force setting CXXFLAGS if it wasn't set before
+    if test x"$ac_env_CXXFLAGS_set" = "xset"; then
+      CXXFLAGS="$save_CXXFLAGS"
+    else
+      unset CXXFLAGS; 
+    fi
     AC_LANG_POP(C++)  
   fi # if not cross-compiling
 



From MAILER-DAEMON Fri Aug 31 11:40:09 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IR8bQ-0002QI-S5
	for mharc-gnash-commit@gnu.org; Fri, 31 Aug 2007 11:40:08 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IR8bP-0002PZ-Rr
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 11:40:07 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IR8bP-0002Ow-5Z
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 11:40:07 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IR8bP-0002Oj-1I
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 11:40:07 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IR8bO-0002EO-Fe
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 11:40:06 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IR8bN-0004UO-GP
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 15:40:05 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IR8bN-0004UI-AX
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 15:40:05 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IR8bN-0004UI-AX@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 31 Aug 2007 15:40:05 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/character.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Aug 2007 15:40:08 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/31 15:40:05

Modified files:
	.              : ChangeLog 
	server         : character.cpp 

Log message:
	        * server/character.cpp (unload): assert the character wasn't already
	          unloaded.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4174&r2=1.4175
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.cpp?cvsroot=gnash&r1=1.49&r2=1.50

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4174
retrieving revision 1.4175
diff -u -b -r1.4174 -r1.4175
--- ChangeLog	31 Aug 2007 15:38:40 -0000	1.4174
+++ ChangeLog	31 Aug 2007 15:40:04 -0000	1.4175
@@ -1,5 +1,7 @@
 2007-08-31 Sandro Santilli <strk@keybit.net>
 
+	* server/character.cpp (unload): assert the character wasn't already
+	  unloaded.
 	* macros/boost.m4: don't trash user-defined CXXFLAGS, and don't
 	  provide one if not user-specified initially.
 	* testsuite/misc-swfc.all/check.sc: ops, last totals() define

Index: server/character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/character.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- server/character.cpp	30 Aug 2007 14:13:07 -0000	1.49
+++ server/character.cpp	31 Aug 2007 15:40:05 -0000	1.50
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 
-/* $Id: character.cpp,v 1.49 2007/08/30 14:13:07 strk Exp $ */
+/* $Id: character.cpp,v 1.50 2007/08/31 15:40:05 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -676,6 +676,7 @@
 bool
 character::unload()
 {
+	assert(!_unloaded);
 	_unloaded = true;
 	//log_msg(_("Queuing unload event for character %p"), this);
 	return queueEventHandler(event_id::UNLOAD);



From MAILER-DAEMON Fri Aug 31 11:41:56 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IR8dA-0003XJ-63
	for mharc-gnash-commit@gnu.org; Fri, 31 Aug 2007 11:41:56 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IR8d8-0003Wf-84
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 11:41:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IR8d6-0003Vb-Hw
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 11:41:53 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IR8d6-0003VU-9c
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 11:41:52 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1IR8d4-0002X1-D3
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 11:41:51 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l7VFfkp73166;
	Fri, 31 Aug 2007 17:41:46 +0200 (CEST)
	(envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Fri, 31 Aug 2007 17:41:45 +0200
To: Markus Gothe <markus@unixrus.se>
Subject: Re: [Gnash-commit] gnash ChangeLog macros/boost.m4
Message-ID: <20070831154145.GH54883@keybit.net>
Mail-Followup-To: Markus Gothe <markus@unixrus.se>, gnash-commit@gnu.org
References: <E1IQWyw-00055R-LP@cvs.savannah.gnu.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1IQWyw-00055R-LP@cvs.savannah.gnu.org>
X-Detected-Kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Aug 2007 15:41:54 -0000

On Wed, Aug 29, 2007 at 11:29:54PM +0000, Markus Gothe wrote:
> -    CFLAGS="$CFLAGS $BOOST_CFLAGS"
> +    CXXFLAGS="$CFLAGS $BOOST_CFLAGS"

Shouldn't we include any existing $CXXFLAGS too here ?
NOTE: I committed a fix to avoid overriding user-defined CXXFLAGS.
      Please backup any previous value and set it back when finished.
      Also, do NOT set CXXFLAGS back, but rather unset it in case
      user did not specify any (to properly get the defaults)
      See how this is done in boost.m4 after my patch *and* 
      in configure.ac (SIZET_FMT test).

--strk;




From MAILER-DAEMON Fri Aug 31 11:59:48 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IR8uR-0001ok-QM
	for mharc-gnash-commit@gnu.org; Fri, 31 Aug 2007 11:59:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IR8uQ-0001ne-MZ
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 11:59:46 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IR8uO-0001iA-14
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 11:59:46 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IR8uN-0001hy-Um
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 11:59:43 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1IR8uN-0005Ss-5u
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 11:59:43 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l7VFxbs73587;
	Fri, 31 Aug 2007 17:59:37 +0200 (CEST)
	(envelope-from strk@keybit.net)
Date: Fri, 31 Aug 2007 17:59:37 +0200
From: Sandro Santilli <strk@keybit.net>
To: zou lunkai <zoulunkai@gmail.com>
Subject: Re: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/ops.as
Message-ID: <20070831155937.GJ54883@keybit.net>
Mail-Followup-To: zou lunkai <zoulunkai@gmail.com>, gnash-commit@gnu.org
References: <E1IP0z4-0000yB-AZ@cvs.savannah.gnu.org>
	<ca4b43ff0708262050l45a49bc0iabfe06abe2bf75d0@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <ca4b43ff0708262050l45a49bc0iabfe06abe2bf75d0@mail.gmail.com>
X-Detected-Kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Aug 2007 15:59:46 -0000

On Mon, Aug 27, 2007 at 11:50:03AM +0800, zou lunkai wrote:
> >  x = new String("a");
> >  y = --x;
> > +check_equals(typeof(y), 'number');
> > +xcheck(y!=NaN); // uh ? is it a different NaN ?
> > +check(! (NaN!=NaN));
> > check(isNaN(y));
> > +check(isNaN(NaN));
> 
> Tests confirmed.
> 
> yes, y might be a differnt NaN(y is an object).
> 
> see added tests below:
> 
> +x = new Number(NaN);
> +y = NaN;
> +check(isNaN(x));
> +check(isNaN(y));
> +xcheck(x != y);      ----->[1]
> 
> As we see,  [1] should return true.  All I can think about is that x
> is an Number object, and y is a primitive number.  Doesn't mean much,
> but might help the valueOf model...

ECMA states that if one of the operand in an equality operation is a number,
and the other is an object, then the object is converted to a primitive
type (in this case, a number) and that value is used in comparison.

Try:

	five = new Number(5);
	check(five == 5);
	check(five != 6);

NaN seems a special case...

--strk;



From MAILER-DAEMON Fri Aug 31 13:07:41 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IR9y9-0004R0-PG
	for mharc-gnash-commit@gnu.org; Fri, 31 Aug 2007 13:07:41 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IR9y7-0004Qd-K5
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 13:07:39 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IR9y6-0004Q9-CU
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 13:07:39 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IR9y6-0004Q4-88
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 13:07:38 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IR9y5-00089e-L1
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 13:07:37 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IR9y4-00022j-Jz
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 17:07:36 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IR9y4-00022g-CA
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 17:07:36 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IR9y4-00022g-CA@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 31 Aug 2007 17:07:36 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/array.cpp testsuite/acti...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Aug 2007 17:07:39 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/31 17:07:36

Modified files:
	.              : ChangeLog 
	server         : array.cpp 
	testsuite/actionscript.all: array.as 

Log message:
	        * server/array.cpp (array_length): handle attempts to set a negative
	          length as if length=0 was set, and log an AS error.
	          Still not correct, but saves a memory fill with swfdec testsuite.
	        * testsuite/actionscript.all/array.as: add test for setting a negative
	          length.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4175&r2=1.4176
http://cvs.savannah.gnu.org/viewcvs/gnash/server/array.cpp?cvsroot=gnash&r1=1.73&r2=1.74
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/array.as?cvsroot=gnash&r1=1.30&r2=1.31

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4175
retrieving revision 1.4176
diff -u -b -r1.4175 -r1.4176
--- ChangeLog	31 Aug 2007 15:40:04 -0000	1.4175
+++ ChangeLog	31 Aug 2007 17:07:35 -0000	1.4176
@@ -1,5 +1,13 @@
 2007-08-31 Sandro Santilli <strk@keybit.net>
 
+	* server/array.cpp (array_length): handle attempts to set a negative
+	  length as if length=0 was set, and log an AS error.
+	  Still not correct, but saves a memory fill with swfdec testsuite.
+	* testsuite/actionscript.all/array.as: add test for setting a negative
+	  length.
+
+2007-08-31 Sandro Santilli <strk@keybit.net>
+
 	* server/character.cpp (unload): assert the character wasn't already
 	  unloaded.
 	* macros/boost.m4: don't trash user-defined CXXFLAGS, and don't

Index: server/array.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/array.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- server/array.cpp	14 Aug 2007 06:07:03 -0000	1.73
+++ server/array.cpp	31 Aug 2007 17:07:36 -0000	1.74
@@ -1316,7 +1316,16 @@
 
 	if ( fn.nargs ) // setter
 	{
-		array->resize(unsigned(fn.arg(0).to_number(&(fn.env()))));
+		int length = fn.arg(0).to_int(fn.env());
+		if ( length < 0 ) // TODO: set a max limit too ?
+		{
+			IF_VERBOSE_ASCODING_ERRORS(
+			log_aserror("Attempt to set Array.length to a negative value %d", length);
+			)
+			length = 0;
+		}
+
+		array->resize(length);
 		return as_value();
 	}
 	else // getter

Index: testsuite/actionscript.all/array.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/array.as,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- testsuite/actionscript.all/array.as	4 Aug 2007 21:34:14 -0000	1.30
+++ testsuite/actionscript.all/array.as	31 Aug 2007 17:07:36 -0000	1.31
@@ -5,7 +5,7 @@
 // Updated with sort functions, and to use check() macro
 // by Mike Carlson Feb. 14th, 2006
 
-rcsid="$Id: array.as,v 1.30 2007/08/04 21:34:14 strk Exp $";
+rcsid="$Id: array.as,v 1.31 2007/08/31 17:07:36 strk Exp $";
 
 #include "check.as"
 
@@ -362,10 +362,16 @@
 
 // Test that the 'length' property is overridable
 c[8] = 'eight';
+c[0] = 'zero';
 check_equals(c[8], 'eight');
 c.length = 2;
 check_equals(c.length, 2);
 check_equals(c[8], undefined);
+check_equals(c[0], 'zero');
+c.length = -1;
+// it seems Gnash needs to store the 'length' property as a normal property
+xcheck_equals(c.length, -1);
+check_equals(c[0], undefined);
 
 //-------------------------------
 // Test deleting an array element



From MAILER-DAEMON Fri Aug 31 14:11:00 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IRAxQ-0007Uz-Bn
	for mharc-gnash-commit@gnu.org; Fri, 31 Aug 2007 14:11:00 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IRAxO-0007Tf-HQ
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 14:10:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IRAxN-0007TE-DO
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 14:10:58 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IRAxN-0007TB-8L
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 14:10:57 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IRAxM-00020K-24
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 14:10:56 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IRAxK-0006iB-Gq
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 18:10:54 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IRAxK-0006i4-B2
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 18:10:54 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IRAxK-0006i4-B2@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 31 Aug 2007 18:10:54 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/Obje...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Aug 2007 18:10:58 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/31 18:10:54

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: Object.as 

Log message:
	        * testsuite/actionscript.all/Object.as: add test for
	          Object.prototype.__proto__ expected to be undefined (bad bug
	          in Gnash!).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4176&r2=1.4177
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Object.as?cvsroot=gnash&r1=1.28&r2=1.29

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4176
retrieving revision 1.4177
diff -u -b -r1.4176 -r1.4177
--- ChangeLog	31 Aug 2007 17:07:35 -0000	1.4176
+++ ChangeLog	31 Aug 2007 18:10:53 -0000	1.4177
@@ -1,5 +1,8 @@
 2007-08-31 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/actionscript.all/Object.as: add test for
+	  Object.prototype.__proto__ expected to be undefined (bad bug
+	  in Gnash!).
 	* server/array.cpp (array_length): handle attempts to set a negative
 	  length as if length=0 was set, and log an AS error.
 	  Still not correct, but saves a memory fill with swfdec testsuite.

Index: testsuite/actionscript.all/Object.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Object.as,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- testsuite/actionscript.all/Object.as	16 Aug 2007 06:09:14 -0000	1.28
+++ testsuite/actionscript.all/Object.as	31 Aug 2007 18:10:54 -0000	1.29
@@ -20,13 +20,20 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Object.as,v 1.28 2007/08/16 06:09:14 zoulunkai Exp $";
+rcsid="$Id: Object.as,v 1.29 2007/08/31 18:10:54 strk Exp $";
 
 #include "check.as"
 
 // Test existance of methods
 check_equals(typeof(Object), 'function');
 check_equals(typeof(Object.prototype), 'object');
+
+// The bug below (no end in the inheritance chain) triggers endless
+// recursions during run of the trace_properties() function defined
+// in trace_properties.as from swfdec testsuite.
+// WE WANT THIS FIXED !!
+xcheck_equals(typeof(Object.prototype.__proto__), 'undefined');
+
 // registerClass is a public static function of Object
 check_equals(typeof(Object.registerClass), 'function');
 check_equals(typeof(Object.prototype.toString), 'function');



From MAILER-DAEMON Fri Aug 31 14:20:34 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IRB6g-0003UF-5Z
	for mharc-gnash-commit@gnu.org; Fri, 31 Aug 2007 14:20:34 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IRB6f-0003Tk-I9
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 14:20:33 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IRB6e-0003SS-L4
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 14:20:32 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IRB6e-0003SE-0v
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 14:20:32 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IRB6d-0003Mm-QJ
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 14:20:31 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IRB6c-0008RE-Uq
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 18:20:31 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IRB6c-0008R9-Fo
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 18:20:30 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IRB6c-0008R9-Fo@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 31 Aug 2007 18:20:30 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/testsuite/actionscript.all Object.as
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Aug 2007 18:20:33 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/31 18:20:30

Modified files:
	testsuite/actionscript.all: Object.as 

Log message:
	Other tests for __proto__ also being undefined for instantiated objects

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Object.as?cvsroot=gnash&r1=1.29&r2=1.30

Patches:
Index: Object.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Object.as,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- Object.as	31 Aug 2007 18:10:54 -0000	1.29
+++ Object.as	31 Aug 2007 18:20:30 -0000	1.30
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Object.as,v 1.29 2007/08/31 18:10:54 strk Exp $";
+rcsid="$Id: Object.as,v 1.30 2007/08/31 18:20:30 strk Exp $";
 
 #include "check.as"
 
@@ -28,19 +28,19 @@
 check_equals(typeof(Object), 'function');
 check_equals(typeof(Object.prototype), 'object');
 
-// The bug below (no end in the inheritance chain) triggers endless
-// recursions during run of the trace_properties() function defined
-// in trace_properties.as from swfdec testsuite.
-// WE WANT THIS FIXED !!
-xcheck_equals(typeof(Object.prototype.__proto__), 'undefined');
-
 // registerClass is a public static function of Object
 check_equals(typeof(Object.registerClass), 'function');
 check_equals(typeof(Object.prototype.toString), 'function');
 check_equals(typeof(Object.prototype.valueOf), 'function');
 check_equals(typeof(Object.prototype.constructor), 'function'); 
 check_equals(Object.prototype.prototype, undefined);
+
+// The bug below (no end in the inheritance chain) triggers endless
+// recursions during run of the trace_properties() function defined
+// in trace_properties.as from swfdec testsuite.
+// WE WANT THIS FIXED !!
 xcheck_equals(Object.prototype.__proto__, undefined);
+
 xcheck_equals(Object.prototype.registerClass, undefined);
 
 #if OUTPUT_VERSION > 5
@@ -107,11 +107,11 @@
 // Test Object creation using 'new'
 var obj = new Object; // uses SWFACTION_NEWOBJECT
 check (obj != undefined);
-check (typeof(obj) == "object");
+check_equals (typeof(obj), "object");
 
-check(obj.__proto__ == Object.prototype);
-check(obj.prototype == undefined);
-check(obj.__proto__.prototype == undefined);
+check_equals(obj.__proto__, Object.prototype);
+check_equals(typeof(obj.prototype), 'undefined');
+xcheck_equals(typeof(obj.__proto__), 'undefined');
 
 #if OUTPUT_VERSION == 5
 // Gnash fails on swf5 but succeeds on swf6,7,8



From MAILER-DAEMON Fri Aug 31 14:37:51 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IRBNP-0004J7-Ik
	for mharc-gnash-commit@gnu.org; Fri, 31 Aug 2007 14:37:51 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IRBNN-0004Hr-FG
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 14:37:49 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IRBNL-0004HP-PH
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 14:37:48 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IRBNL-0004HM-HC
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 14:37:47 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1IRBNK-0006dc-Pd
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 14:37:47 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l7VIbQd76380;
	Fri, 31 Aug 2007 20:37:26 +0200 (CEST)
	(envelope-from strk@keybit.net)
Date: Fri, 31 Aug 2007 20:37:26 +0200
From: Sandro Santilli <strk@keybit.net>
To: zou lunkai <zoulunkai@gmail.com>
Subject: Re: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/toSt...
Message-ID: <20070831183726.GA73616@keybit.net>
Mail-Followup-To: zou lunkai <zoulunkai@gmail.com>, gnash-commit@gnu.org
References: <E1IP3LF-0002f9-GY@cvs.savannah.gnu.org>
	<ca4b43ff0708262345v4ffb500er6569ea9e39161a7c@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <ca4b43ff0708262345v4ffb500er6569ea9e39161a7c@mail.gmail.com>
X-Detected-Kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Aug 2007 18:37:49 -0000

On Mon, Aug 27, 2007 at 02:45:54PM +0800, zou lunkai wrote:
> > +  // this is true only in swf5 (any function is equal to any other in SWF5)
> >  xcheck(obj.toString == Object.prototype.toString);
> >  xcheck(obj.valueOf == Object.prototype.valueOf);
> > +  xcheck(obj.toString == obj.valueOf);
> 
> see added tests in toString_valueOf.as.  This is due to functions in
> SWF5 do not support valueOf and toString. And there is no Function
> object in SWF5(need a double check).

Actually, I belive comparison of functions is different in SWF5.

--strk;



From MAILER-DAEMON Fri Aug 31 15:05:53 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IRBoX-0001ZW-81
	for mharc-gnash-commit@gnu.org; Fri, 31 Aug 2007 15:05:53 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IRBoV-0001Y5-CY
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 15:05:51 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IRBoU-0001X0-Bo
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 15:05:51 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IRBoU-0001WY-2y
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 15:05:50 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IRBoT-000365-Ng
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 15:05:49 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IRBoS-0002BM-Lh
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 19:05:48 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IRBoS-0002BJ-GH
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 19:05:48 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IRBoS-0002BJ-GH@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 31 Aug 2007 19:05:48 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash/testsuite/actionscript.all Object.as
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Aug 2007 19:05:51 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/31 19:05:48

Modified files:
	testsuite/actionscript.all: Object.as 

Log message:
	more tests

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Object.as?cvsroot=gnash&r1=1.30&r2=1.31

Patches:
Index: Object.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Object.as,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- Object.as	31 Aug 2007 18:20:30 -0000	1.30
+++ Object.as	31 Aug 2007 19:05:48 -0000	1.31
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Object.as,v 1.30 2007/08/31 18:20:30 strk Exp $";
+rcsid="$Id: Object.as,v 1.31 2007/08/31 19:05:48 strk Exp $";
 
 #include "check.as"
 
@@ -40,6 +40,9 @@
 // in trace_properties.as from swfdec testsuite.
 // WE WANT THIS FIXED !!
 xcheck_equals(Object.prototype.__proto__, undefined);
+#if OUTPUT_VERSION > 5
+ check(!Object.prototype.hasOwnProperty("__proto__"));
+#endif 
 
 xcheck_equals(Object.prototype.registerClass, undefined);
 
@@ -111,7 +114,7 @@
 
 check_equals(obj.__proto__, Object.prototype);
 check_equals(typeof(obj.prototype), 'undefined');
-xcheck_equals(typeof(obj.__proto__), 'undefined');
+check_equals(typeof(obj.__proto__), 'object');
 
 #if OUTPUT_VERSION == 5
 // Gnash fails on swf5 but succeeds on swf6,7,8
@@ -152,9 +155,12 @@
 
 // Test Object creation using literal initialization
 var obj2 = { member:1 }; // uses SWFACTION_INITOBJECT
-check (obj2 != undefined );
-check (typeof(obj2) == "object");
-check (obj2.__proto__.constructor == Object);
+check_equals(typeof(obj2), "object");
+check_equals(typeof(obj2.__proto__), 'object');
+check_equals(obj2.__proto__, Object.prototype);
+check_equals(obj2.__proto__.constructor, Object);
+check_equals(typeof(obj2.prototype), 'undefined');
+
 
 // Test initialized object members
 check ( obj2.member == 1 )



From MAILER-DAEMON Fri Aug 31 17:53:40 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IREQu-0003jF-OC
	for mharc-gnash-commit@gnu.org; Fri, 31 Aug 2007 17:53:40 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IREQs-0003hh-Lg
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 17:53:38 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IREQq-0003fZ-F3
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 17:53:38 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IREQq-0003fF-8K
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 17:53:36 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IREQp-0003iP-Jc
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 17:53:36 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IREQo-0005Zn-60
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 21:53:34 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IREQn-0005Zk-Uq
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 21:53:34 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IREQn-0005Zk-Uq@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 31 Aug 2007 21:53:33 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/array.cpp server/as_func...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Aug 2007 21:53:39 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/31 21:53:33

Modified files:
	.              : ChangeLog 
	server         : array.cpp as_function.cpp as_object.cpp 
	                 as_object.h edit_text_character.cpp 
	                 sprite_instance.cpp video_stream_instance.cpp 
	server/asobj   : Boolean.cpp Camera.cpp Color.cpp 
	                 ContextMenu.cpp CustomActions.cpp Date.cpp 
	                 Error.cpp Key.cpp LoadVars.cpp Microphone.cpp 
	                 Mouse.cpp MovieClipLoader.cpp NetConnection.cpp 
	                 NetStream.cpp Number.cpp Object.cpp 
	                 Selection.cpp SharedObject.cpp Sound.cpp 
	                 Stage.cpp System.cpp TextSnapshot.cpp 
	                 string.cpp xmlnode.cpp xmlsocket.cpp 
	testsuite/actionscript.all: Function.as Global.as MovieClip.as 
	                            TextField.as Video.as array.as 
	testsuite/swfdec: PASSING 

Log message:
	        * server/as_object.{cpp,h}: changed get_prototype to always return
	          the actual prototype (rather then returning the Object prototype
	          if unset).
	        * server/: array.cpp, as_function.cpp, edit_text_character.cpp,
	          sprite_instance.cpp, video_stream_instance.cpp:
	          Initialize AS class interfaces (prototype) as being subclasses of
	          the Object class.
	        * server/asobj/: Boolean.cpp, Camera.cpp, Color.cpp,
	          ContextMenu.cpp, CustomActions.cpp, Date.cpp, Error.cpp, Key.cpp,
	          LoadVars.cpp, Microphone.cpp, Mouse.cpp, MovieClipLoader.cpp,
	          NetConnection.cpp, NetStream.cpp, Number.cpp, Object.cpp,
	          Selection.cpp, SharedObject.cpp, Sound.cpp, Stage.cpp, System.cpp,
	          TextSnapshot.cpp, string.cpp, xmlnode.cpp, xmlsocket.cpp
	          Initialize AS class interfaces (prototype) as being subclasses of
	          the Object class.
	        * testsuite/actionscript.all/Global.as: more successes.
	        * testsuite/actionscript.all/Function.as: one more test for
	          Function.prototype.__proto__
	        * testsuite/actionscript.all/MovieClip.as: more tests for
	          MovieClip.prototype.__proto__
	        * testsuite/actionscript.all/TextField.as: more tests for
	          TextField.prototype.__proto__
	        * testsuite/actionscript.all/Video.as: more tests for
	          Video.prototype.__proto__
	        * testsuite/actionscript.all/array.as: more tests for
	          Array.prototype.__proto__
	        * testsuite/swfdec/PASSING: successes from latest swfdec
	          testsuite.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4177&r2=1.4178
http://cvs.savannah.gnu.org/viewcvs/gnash/server/array.cpp?cvsroot=gnash&r1=1.74&r2=1.75
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_function.cpp?cvsroot=gnash&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_object.cpp?cvsroot=gnash&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_object.h?cvsroot=gnash&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.105&r2=1.106
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.318&r2=1.319
http://cvs.savannah.gnu.org/viewcvs/gnash/server/video_stream_instance.cpp?cvsroot=gnash&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Boolean.cpp?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Camera.cpp?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Color.cpp?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/ContextMenu.cpp?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/CustomActions.cpp?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Date.cpp?cvsroot=gnash&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Error.cpp?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Key.cpp?cvsroot=gnash&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/LoadVars.cpp?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Microphone.cpp?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Mouse.cpp?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/MovieClipLoader.cpp?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetConnection.cpp?cvsroot=gnash&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.cpp?cvsroot=gnash&r1=1.69&r2=1.70
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Number.cpp?cvsroot=gnash&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Object.cpp?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Selection.cpp?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SharedObject.cpp?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Sound.cpp?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Stage.cpp?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/System.cpp?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/TextSnapshot.cpp?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/string.cpp?cvsroot=gnash&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlnode.cpp?cvsroot=gnash&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlsocket.cpp?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Function.as?cvsroot=gnash&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Global.as?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.86&r2=1.87
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/TextField.as?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Video.as?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/array.as?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/PASSING?cvsroot=gnash&r1=1.26&r2=1.27

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4177
retrieving revision 1.4178
diff -u -b -r1.4177 -r1.4178
--- ChangeLog	31 Aug 2007 18:10:53 -0000	1.4177
+++ ChangeLog	31 Aug 2007 21:53:30 -0000	1.4178
@@ -1,5 +1,36 @@
 2007-08-31 Sandro Santilli <strk@keybit.net>
 
+	* server/as_object.{cpp,h}: changed get_prototype to always return
+	  the actual prototype (rather then returning the Object prototype
+	  if unset).
+	* server/: array.cpp, as_function.cpp, edit_text_character.cpp,
+	  sprite_instance.cpp, video_stream_instance.cpp:
+	  Initialize AS class interfaces (prototype) as being subclasses of
+	  the Object class.
+	* server/asobj/: Boolean.cpp, Camera.cpp, Color.cpp,
+	  ContextMenu.cpp, CustomActions.cpp, Date.cpp, Error.cpp, Key.cpp,
+	  LoadVars.cpp, Microphone.cpp, Mouse.cpp, MovieClipLoader.cpp,
+	  NetConnection.cpp, NetStream.cpp, Number.cpp, Object.cpp,
+	  Selection.cpp, SharedObject.cpp, Sound.cpp, Stage.cpp, System.cpp,
+	  TextSnapshot.cpp, string.cpp, xmlnode.cpp, xmlsocket.cpp
+	  Initialize AS class interfaces (prototype) as being subclasses of
+	  the Object class.
+	* testsuite/actionscript.all/Global.as: more successes.
+	* testsuite/actionscript.all/Function.as: one more test for
+	  Function.prototype.__proto__
+	* testsuite/actionscript.all/MovieClip.as: more tests for
+	  MovieClip.prototype.__proto__
+	* testsuite/actionscript.all/TextField.as: more tests for
+	  TextField.prototype.__proto__
+	* testsuite/actionscript.all/Video.as: more tests for
+	  Video.prototype.__proto__
+	* testsuite/actionscript.all/array.as: more tests for
+	  Array.prototype.__proto__
+	* testsuite/swfdec/PASSING: successes from latest swfdec
+	  testsuite.
+
+2007-08-31 Sandro Santilli <strk@keybit.net>
+
 	* testsuite/actionscript.all/Object.as: add test for
 	  Object.prototype.__proto__ expected to be undefined (bad bug
 	  in Gnash!).

Index: server/array.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/array.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- server/array.cpp	31 Aug 2007 17:07:36 -0000	1.74
+++ server/array.cpp	31 Aug 2007 21:53:31 -0000	1.75
@@ -30,6 +30,7 @@
 #include "GnashException.h"
 #include "action.h" // for call_method
 #include "VM.h" // for PROPNAME macro to work
+#include "Object.h" // for getObjectInterface()
 
 #include <string>
 #include <algorithm>
@@ -1420,7 +1421,7 @@
 	static boost::intrusive_ptr<as_object> proto = NULL;
 	if ( proto == NULL )
 	{
-		proto = new as_object();
+		proto = new as_object(getObjectInterface());
 		VM::get().addStatic(proto.get());
 
 		attachArrayInterface(*proto);

Index: server/as_function.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_function.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- server/as_function.cpp	17 Aug 2007 03:21:47 -0000	1.37
+++ server/as_function.cpp	31 Aug 2007 21:53:31 -0000	1.38
@@ -30,6 +30,7 @@
 #include "fn_call.h"
 #include "GnashException.h"
 #include "VM.h"
+#include "Object.h" // for getObjectInterface
 
 #include <typeinfo>
 #include <iostream>
@@ -73,7 +74,7 @@
 	if ( proto.get() == NULL ) {
 
 		// Initialize Function prototype
-		proto = new as_object();
+		proto = new as_object(getObjectInterface());
 		VM::get().addStatic(proto.get());
 
 		if ( VM::get().getSWFVersion() >= 6 )
@@ -107,7 +108,7 @@
 	/// TODO: create properties lazily, on getPrototype() call
 	if ( ! _properties )
 	{
-		_properties = new as_object();
+		_properties = new as_object(getObjectInterface());
 	}
 	_properties->init_member("constructor", this); 
 	init_member("prototype", as_value(_properties.get()));

Index: server/as_object.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_object.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- server/as_object.cpp	24 Jul 2007 13:08:55 -0000	1.56
+++ server/as_object.cpp	31 Aug 2007 21:53:31 -0000	1.57
@@ -106,9 +106,12 @@
 	if (name == "__proto__")
 	{
 		as_object* p = get_prototype();
-		assert(p);
-		val->set_as_object(get_prototype());
+		if ( p ) {
+			val->set_as_object(p);
 		return true;
+		} else {
+			return false;
+		}
 	}
 
 	Property* prop = findProperty(name);
@@ -622,8 +625,14 @@
 	if ( m_prototype ) return m_prototype.get();
 	//log_msg(_("as_object::get_prototype(): Hit top of inheritance chain"));
 
+#if 0 // the inheritance chain MUST end somewhere, handle the SWF4 thing in some other way
 	// if SWF version < 5 the Object interface won't keep alive !
-	if ( _vm.getSWFVersion() > 4 ) return getObjectInterface();
+	if ( _vm.getSWFVersion() > 4 )
+	{
+		return getObjectInterface();
+	}
+#endif
+
 	return NULL;
 }
 

Index: server/as_object.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_object.h,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- server/as_object.h	18 Aug 2007 11:58:07 -0000	1.63
+++ server/as_object.h	31 Aug 2007 21:53:31 -0000	1.64
@@ -440,6 +440,8 @@
 	/// The __proto__ member is the exported interface ('prototype')
 	/// of the class this object is an instance of.
 	///
+	/// NOTE: can return NULL (and it is expected to do for Object.prototype)
+	///
 	as_object* get_prototype();
 
 	const as_object* get_prototype() const {

Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -b -r1.105 -r1.106
--- server/edit_text_character.cpp	30 Aug 2007 14:13:07 -0000	1.105
+++ server/edit_text_character.cpp	31 Aug 2007 21:53:31 -0000	1.106
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: edit_text_character.cpp,v 1.105 2007/08/30 14:13:07 strk Exp $ */
+/* $Id: edit_text_character.cpp,v 1.106 2007/08/31 21:53:31 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -36,6 +36,7 @@
 #include "VM.h"
 #include "builtin_function.h" // for getter/setter properties
 #include "font.h" // for using the _font member
+#include "Object.h" // for getObjectInterface
 
 #include <algorithm>
 #include <string>
@@ -365,7 +366,7 @@
 	static boost::intrusive_ptr<as_object> proto;
 	if ( proto == NULL )
 	{
-		proto = new as_object();
+		proto = new as_object(getObjectInterface());
 		VM::get().addStatic(proto.get());
 
 		attachTextFieldInterface(*proto);

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -b -r1.318 -r1.319
--- server/sprite_instance.cpp	31 Aug 2007 15:17:57 -0000	1.318
+++ server/sprite_instance.cpp	31 Aug 2007 21:53:31 -0000	1.319
@@ -51,6 +51,7 @@
 #include "ExecutableCode.h"
 #include "gnash.h" // for point class !
 #include "Timeline.h" // for restoreDisplayList
+#include "Object.h" // for getObjectInterface
 
 #include <vector>
 #include <string>
@@ -1583,7 +1584,7 @@
 	static boost::intrusive_ptr<as_object> proto;
 	if ( proto == NULL )
 	{
-		proto = new as_object();
+		proto = new as_object(getObjectInterface());
 		VM::get().addStatic(proto.get());
 
 		attachMovieClipInterface(*proto);

Index: server/video_stream_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/video_stream_instance.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- server/video_stream_instance.cpp	18 Aug 2007 16:12:38 -0000	1.35
+++ server/video_stream_instance.cpp	31 Aug 2007 21:53:31 -0000	1.36
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 
-// $Id: video_stream_instance.cpp,v 1.35 2007/08/18 16:12:38 strk Exp $
+// $Id: video_stream_instance.cpp,v 1.36 2007/08/31 21:53:31 strk Exp $
 
 #include "sprite_instance.h"
 #include "video_stream_instance.h"
@@ -29,6 +29,7 @@
 #include "Range2d.h"
 #include "builtin_function.h" // for getter/setter properties
 #include "VM.h"
+#include "Object.h"
 
 namespace gnash {
 
@@ -44,7 +45,7 @@
 	static boost::intrusive_ptr<as_object> proto;
 	if ( proto == NULL )
 	{
-		proto = new as_object();
+		proto = new as_object(getObjectInterface());
 		VM::get().addStatic(proto.get());
 
 		attachVideoInterface(*proto);

Index: server/asobj/Boolean.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Boolean.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/asobj/Boolean.cpp	1 Aug 2007 15:56:54 -0000	1.16
+++ server/asobj/Boolean.cpp	31 Aug 2007 21:53:31 -0000	1.17
@@ -28,6 +28,7 @@
 #include "builtin_function.h" // need builtin_function
 #include "GnashException.h"
 #include "VM.h" // for registering static GcResources (constructor and prototype)
+#include "Object.h" // for getObjectInterface
 
 namespace gnash {
 
@@ -48,7 +49,7 @@
 	static boost::intrusive_ptr<as_object> o;
 	if ( ! o )
 	{
-		o = new as_object();
+		o = new as_object(getObjectInterface());
 		VM::get().addStatic(o.get());
 
 		attachBooleanInterface(*o);

Index: server/asobj/Camera.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Camera.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/asobj/Camera.cpp	1 Jul 2007 10:54:26 -0000	1.8
+++ server/asobj/Camera.cpp	31 Aug 2007 21:53:31 -0000	1.9
@@ -27,6 +27,7 @@
 #include "fn_call.h"
 #include "smart_ptr.h" // for boost intrusive_ptr
 #include "builtin_function.h" // need builtin_function
+#include "Object.h" // for getObjectInterface
 
 namespace gnash {
 
@@ -51,7 +52,7 @@
 	static boost::intrusive_ptr<as_object> o;
 	if ( ! o )
 	{
-		o = new as_object();
+		o = new as_object(getObjectInterface());
 		attachCameraInterface(*o);
 	}
 	return o.get();

Index: server/asobj/Color.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Color.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/asobj/Color.cpp	1 Jul 2007 10:54:26 -0000	1.11
+++ server/asobj/Color.cpp	31 Aug 2007 21:53:31 -0000	1.12
@@ -27,6 +27,7 @@
 #include "fn_call.h"
 #include "smart_ptr.h" // for boost intrusive_ptr
 #include "builtin_function.h" // need builtin_function
+#include "Object.h" // for getObjectInterface
 
 namespace gnash {
 
@@ -51,7 +52,7 @@
 	static boost::intrusive_ptr<as_object> o;
 	if ( ! o )
 	{
-		o = new as_object();
+		o = new as_object(getObjectInterface());
 		attachColorInterface(*o);
 	}
 	return o.get();

Index: server/asobj/ContextMenu.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/ContextMenu.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- server/asobj/ContextMenu.cpp	1 Jul 2007 10:54:26 -0000	1.14
+++ server/asobj/ContextMenu.cpp	31 Aug 2007 21:53:31 -0000	1.15
@@ -28,6 +28,7 @@
 #include "smart_ptr.h" // for boost intrusive_ptr
 #include "builtin_function.h" // need builtin_function
 #include "GnashException.h"
+#include "Object.h" // for getObjectInterface
 
 namespace gnash {
 
@@ -117,7 +118,7 @@
 	static boost::intrusive_ptr<as_object> o;
 	if ( ! o )
 	{
-		o = new as_object();
+		o = new as_object(getObjectInterface());
 		attachExportedInterface(*o);
 	}
 	return o.get();

Index: server/asobj/CustomActions.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/CustomActions.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/asobj/CustomActions.cpp	1 Jul 2007 10:54:27 -0000	1.9
+++ server/asobj/CustomActions.cpp	31 Aug 2007 21:53:31 -0000	1.10
@@ -27,6 +27,7 @@
 #include "fn_call.h"
 #include "smart_ptr.h" // for boost intrusive_ptr
 #include "builtin_function.h" // need builtin_function
+#include "Object.h" // for getObjectInterface
 
 namespace gnash {
 
@@ -51,7 +52,7 @@
 	static boost::intrusive_ptr<as_object> o;
 	if ( ! o )
 	{
-		o = new as_object();
+		o = new as_object(getObjectInterface());
 		attachCustomActionsInterface(*o);
 	}
 	return o.get();

Index: server/asobj/Date.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Date.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- server/asobj/Date.cpp	29 Aug 2007 22:20:10 -0000	1.48
+++ server/asobj/Date.cpp	31 Aug 2007 21:53:31 -0000	1.49
@@ -84,6 +84,7 @@
 #include "fn_call.h"
 #include "GnashException.h"
 #include "builtin_function.h"
+#include "Object.h" // for getObjectInterface
 
 #include <ctime>
 #include <cmath>
@@ -319,7 +320,7 @@
 	static boost::intrusive_ptr<as_object> o;
 	if ( o == NULL )
 	{
-		o = new as_object();
+		o = new as_object(getObjectInterface());
 		attachDateInterface(*o);
 	}
 	return o.get();

Index: server/asobj/Error.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Error.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/asobj/Error.cpp	1 Jul 2007 10:54:27 -0000	1.10
+++ server/asobj/Error.cpp	31 Aug 2007 21:53:31 -0000	1.11
@@ -27,6 +27,7 @@
 #include "fn_call.h"
 #include "smart_ptr.h" // for boost intrusive_ptr
 #include "builtin_function.h" // need builtin_function
+#include "Object.h" // for getObjectInterface
 
 namespace gnash {
 
@@ -47,7 +48,7 @@
 	static boost::intrusive_ptr<as_object> o;
 	if ( ! o )
 	{
-		o = new as_object();
+		o = new as_object(getObjectInterface());
 		attachErrorInterface(*o);
 	}
 	return o.get();

Index: server/asobj/Key.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Key.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- server/asobj/Key.cpp	24 Jul 2007 14:19:31 -0000	1.30
+++ server/asobj/Key.cpp	31 Aug 2007 21:53:32 -0000	1.31
@@ -29,6 +29,7 @@
 #include "action.h" // for call_method
 #include "VM.h"
 #include "builtin_function.h"
+#include "Object.h" // for getObjectInterface()
 
 #include <boost/algorithm/string/case_conv.hpp>
 
@@ -43,6 +44,7 @@
 
 key_as_object::key_as_object()
     :
+    as_object(getObjectInterface()),
     m_last_key_pressed(0)
 {
     memset(m_unreleased_keys, 0, sizeof(m_unreleased_keys));

Index: server/asobj/LoadVars.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/LoadVars.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/asobj/LoadVars.cpp	2 Jul 2007 03:20:34 -0000	1.27
+++ server/asobj/LoadVars.cpp	31 Aug 2007 21:53:32 -0000	1.28
@@ -37,6 +37,7 @@
 #include "timers.h"
 #include "VM.h"
 #include "LoadVariablesThread.h"
+#include "Object.h" // for getObjectInterface
 
 #include <list>
 
@@ -336,7 +337,7 @@
 	static boost::intrusive_ptr<as_object> o;
 	if ( ! o )
 	{
-		o = new as_object();
+		o = new as_object(getObjectInterface());
 		attachLoadVarsInterface(*o);
 	}
 	return o.get();

Index: server/asobj/Microphone.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Microphone.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/asobj/Microphone.cpp	1 Jul 2007 10:54:28 -0000	1.9
+++ server/asobj/Microphone.cpp	31 Aug 2007 21:53:32 -0000	1.10
@@ -27,6 +27,7 @@
 #include "fn_call.h"
 #include "smart_ptr.h" // for boost intrusive_ptr
 #include "builtin_function.h" // need builtin_function
+#include "Object.h" // for getObjectInterface
 
 namespace gnash {
 
@@ -53,7 +54,7 @@
 	static boost::intrusive_ptr<as_object> o;
 	if ( ! o )
 	{
-		o = new as_object();
+		o = new as_object(getObjectInterface());
 		attachMicrophoneInterface(*o);
 	}
 	return o.get();

Index: server/asobj/Mouse.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Mouse.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/asobj/Mouse.cpp	8 Aug 2007 16:26:45 -0000	1.13
+++ server/asobj/Mouse.cpp	31 Aug 2007 21:53:32 -0000	1.14
@@ -28,6 +28,7 @@
 #include "smart_ptr.h" // for boost intrusive_ptr
 #include "builtin_function.h" // need builtin_function
 //#include "VM.h" // for registering static
+#include "Object.h" // for getObjectInterface
 
 namespace gnash {
 
@@ -54,7 +55,7 @@
 	static boost::intrusive_ptr<as_object> o;
 	if ( ! o )
 	{
-		o = new as_object();
+		o = new as_object(getObjectInterface());
 		attachMouseInterface(*o);
 	}
 	return o.get();

Index: server/asobj/MovieClipLoader.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/MovieClipLoader.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/asobj/MovieClipLoader.cpp	2 Aug 2007 05:06:41 -0000	1.27
+++ server/asobj/MovieClipLoader.cpp	31 Aug 2007 21:53:32 -0000	1.28
@@ -34,6 +34,7 @@
 #include "log.h"
 #include "URL.h" // for url parsing
 #include "builtin_function.h"
+#include "Object.h" // for getObjectInterface
 
 #include <typeinfo> 
 #include <string>
@@ -78,7 +79,7 @@
 	static boost::intrusive_ptr<as_object> o;
 	if ( o == NULL )
 	{
-		o = new as_object();
+		o = new as_object(getObjectInterface());
 		//log_msg(_("MovieClipLoader interface @ %p"), o.get());
 		attachMovieClipLoaderInterface(*o);
 	}

Index: server/asobj/NetConnection.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetConnection.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- server/asobj/NetConnection.cpp	1 Jul 2007 10:54:29 -0000	1.49
+++ server/asobj/NetConnection.cpp	31 Aug 2007 21:53:32 -0000	1.50
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: NetConnection.cpp,v 1.49 2007/07/01 10:54:29 bjacques Exp $ */
+/* $Id: NetConnection.cpp,v 1.50 2007/08/31 21:53:32 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -31,6 +31,7 @@
 #include "GnashException.h"
 #include "builtin_function.h"
 #include "movie_root.h"
+#include "Object.h" // for getObjectInterface
 
 #include "StreamProvider.h"
 #include "URLAccessManager.h"
@@ -347,7 +348,7 @@
 	static boost::intrusive_ptr<as_object> o;
 	if ( o == NULL )
 	{
-		o = new as_object();
+		o = new as_object(getObjectInterface());
 		NetConnection::attachNetConnectionInterface(*o);
 	}
 

Index: server/asobj/NetStream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- server/asobj/NetStream.cpp	3 Aug 2007 20:54:47 -0000	1.69
+++ server/asobj/NetStream.cpp	31 Aug 2007 21:53:32 -0000	1.70
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: NetStream.cpp,v 1.69 2007/08/03 20:54:47 strk Exp $ */
+/* $Id: NetStream.cpp,v 1.70 2007/08/31 21:53:32 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -37,6 +37,7 @@
 #include "NetConnection.h"
 #include "action.h" // for call_method
 #include "render.h"	// for gnash::render::videoFrameFormat()
+#include "Object.h" // for getObjectInterface
 
 #include "movie_root.h"
 
@@ -422,7 +423,7 @@
 	static boost::intrusive_ptr<as_object> o;
 	if ( o == NULL )
 	{
-		o = new as_object();
+		o = new as_object(getObjectInterface());
 		attachNetStreamInterface(*o);
 	}
 
@@ -612,7 +613,7 @@
 	// code, level
 	std::pair<const char*, const char*> info = getStatusCodeInfo(code);
 
-	boost::intrusive_ptr<as_object> o = new as_object();
+	boost::intrusive_ptr<as_object> o = new as_object(getObjectInterface());
 	o->init_member("code",  info.first,  1);
 	o->init_member("level", info.second, as_prop_flags::dontDelete|as_prop_flags::dontEnum);
 

Index: server/asobj/Number.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Number.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- server/asobj/Number.cpp	1 Aug 2007 15:56:54 -0000	1.32
+++ server/asobj/Number.cpp	31 Aug 2007 21:53:32 -0000	1.33
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: Number.cpp,v 1.32 2007/08/01 15:56:54 strk Exp $ */
+/* $Id: Number.cpp,v 1.33 2007/08/31 21:53:32 strk Exp $ */
 
 #include "log.h"
 #include "tu_config.h"
@@ -28,6 +28,7 @@
 #include "as_value.h" // for doubleToString
 #include "builtin_function.h" // need builtin_function
 #include "VM.h" // for registering static GcResources (constructor and prototype)
+#include "Object.h" // for getObjectInterface
 
 #include <sstream>
 #include <cmath>
@@ -80,7 +81,7 @@
 	static boost::intrusive_ptr<as_object> o=NULL;
 	if ( o == NULL )
 	{
-		o = new as_object();
+		o = new as_object(getObjectInterface());
 		VM::get().addStatic(o.get());
 
 		attachNumberInterface(*o);

Index: server/asobj/Object.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Object.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- server/asobj/Object.cpp	8 Aug 2007 20:17:28 -0000	1.26
+++ server/asobj/Object.cpp	31 Aug 2007 21:53:32 -0000	1.27
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: Object.cpp,v 1.26 2007/08/08 20:17:28 strk Exp $ */
+/* $Id: Object.cpp,v 1.27 2007/08/31 21:53:32 strk Exp $ */
 
 #include "tu_config.h"
 #include "Object.h"
@@ -79,7 +79,7 @@
 	static boost::intrusive_ptr<as_object> o;
 	if ( o == NULL )
 	{
-		o = new as_object();
+		o = new as_object(); // end of the inheritance chain
 		attachObjectInterface(*o);
 		o->set_prototype(o.get());
 	}

Index: server/asobj/Selection.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Selection.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/asobj/Selection.cpp	1 Jul 2007 10:54:30 -0000	1.10
+++ server/asobj/Selection.cpp	31 Aug 2007 21:53:32 -0000	1.11
@@ -27,6 +27,7 @@
 #include "fn_call.h"
 #include "smart_ptr.h" // for boost intrusive_ptr
 #include "builtin_function.h" // need builtin_function
+#include "Object.h" // for getObjectInterface
 
 namespace gnash {
 
@@ -59,7 +60,7 @@
 	static boost::intrusive_ptr<as_object> o;
 	if ( ! o )
 	{
-		o = new as_object();
+		o = new as_object(getObjectInterface());
 		attachSelectionInterface(*o);
 	}
 	return o.get();
@@ -129,7 +130,7 @@
 {
 	// Selection is NOT a class, but a simple object, see Selection.as
 
-	static boost::intrusive_ptr<as_object> obj = new as_object();
+	static boost::intrusive_ptr<as_object> obj = new as_object(getObjectInterface());
 	attachSelectionInterface(*obj);
 	global.init_member("Selection", obj.get());
 

Index: server/asobj/SharedObject.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SharedObject.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/asobj/SharedObject.cpp	1 Jul 2007 10:54:30 -0000	1.11
+++ server/asobj/SharedObject.cpp	31 Aug 2007 21:53:32 -0000	1.12
@@ -27,6 +27,7 @@
 #include "fn_call.h"
 #include "smart_ptr.h" // for boost intrusive_ptr
 #include "builtin_function.h" // need builtin_function
+#include "Object.h" // for getObjectInterface
 
 namespace gnash {
 
@@ -58,7 +59,7 @@
 	static boost::intrusive_ptr<as_object> o;
 	if ( ! o )
 	{
-		o = new as_object();
+		o = new as_object(getObjectInterface());
 		attachSharedObjectInterface(*o);
 	}
 	return o.get();

Index: server/asobj/Sound.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Sound.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/asobj/Sound.cpp	1 Jul 2007 10:54:30 -0000	1.19
+++ server/asobj/Sound.cpp	31 Aug 2007 21:53:32 -0000	1.20
@@ -29,6 +29,7 @@
 #include "fn_call.h"
 #include "GnashException.h"
 #include "builtin_function.h"
+#include "Object.h" // for getObjectInterface
 
 #ifdef SOUND_GST
 #include "SoundGst.h"
@@ -556,7 +557,7 @@
 	static boost::intrusive_ptr<as_object> o;
 	if ( o == NULL )
 	{
-		o = new as_object();
+		o = new as_object(getObjectInterface());
 		attachSoundInterface(*o);
 	}
 

Index: server/asobj/Stage.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Stage.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/asobj/Stage.cpp	3 Aug 2007 22:04:25 -0000	1.19
+++ server/asobj/Stage.cpp	31 Aug 2007 21:53:32 -0000	1.20
@@ -28,6 +28,7 @@
 #include "smart_ptr.h" // for boost intrusive_ptr
 #include "builtin_function.h" // need builtin_function
 #include "VM.h"
+#include "Object.h" // for getObjectInterface()
 
 #include <string>
 #include <boost/algorithm/string/case_conv.hpp> // for using PROPNAME
@@ -60,6 +61,7 @@
 
 Stage::Stage()
 	:
+	as_object(getObjectInterface()),
 	_scaleMode(showAll)
 {
 	attachStageInterface(*this);

Index: server/asobj/System.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/System.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- server/asobj/System.cpp	1 Jul 2007 10:54:31 -0000	1.14
+++ server/asobj/System.cpp	31 Aug 2007 21:53:32 -0000	1.15
@@ -26,6 +26,7 @@
 #include "fn_call.h"
 #include "builtin_function.h"
 #include "VM.h" // for getPlayerVersion() 
+#include "Object.h" // for getObjectInterface
 
 namespace gnash {
 
@@ -75,7 +76,7 @@
 	static boost::intrusive_ptr<as_object> proto;
 	if ( proto == NULL )
 	{
-		proto = new as_object();
+		proto = new as_object(getObjectInterface());
 		proto->init_member("allowDomain", new builtin_function(system_security_allowdomain));
 
 		// TODO: only available when SWF >= 7 
@@ -92,7 +93,7 @@
 	static boost::intrusive_ptr<as_object> proto;
 	if ( proto == NULL )
 	{
-		proto = new as_object();
+		proto = new as_object(getObjectInterface());
 		proto->init_member("version", VM::get().getPlayerVersion() );
 	}
 	return proto.get();
@@ -114,7 +115,7 @@
 	static boost::intrusive_ptr<as_object> proto;
 	if ( proto == NULL )
 	{
-		proto = new as_object();
+		proto = new as_object(getObjectInterface());
 		attachSystemInterface(*proto);
 		//proto->init_member("constructor", new builtin_function(system_new)); 
 	}
@@ -165,7 +166,7 @@
 {
 	// _global.System is NOT a class, but a simple object, see System.as
 
-	static boost::intrusive_ptr<as_object> obj = new as_object();
+	static boost::intrusive_ptr<as_object> obj = new as_object(getObjectInterface());
 	attachSystemInterface(*obj);
 	global.init_member("System", obj.get());
 }

Index: server/asobj/TextSnapshot.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/TextSnapshot.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/asobj/TextSnapshot.cpp	1 Jul 2007 10:54:31 -0000	1.10
+++ server/asobj/TextSnapshot.cpp	31 Aug 2007 21:53:32 -0000	1.11
@@ -27,6 +27,7 @@
 #include "fn_call.h"
 #include "smart_ptr.h" // for boost intrusive_ptr
 #include "builtin_function.h" // need builtin_function
+#include "Object.h" // for getObjectInterface
 
 namespace gnash {
 
@@ -62,7 +63,7 @@
 	static boost::intrusive_ptr<as_object> o;
 	if ( ! o )
 	{
-		o = new as_object();
+		o = new as_object(getObjectInterface());
 		attachTextSnapshotInterface(*o);
 	}
 	return o.get();

Index: server/asobj/string.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/string.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- server/asobj/string.cpp	25 Aug 2007 23:11:00 -0000	1.35
+++ server/asobj/string.cpp	31 Aug 2007 21:53:32 -0000	1.36
@@ -16,7 +16,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: string.cpp,v 1.35 2007/08/25 23:11:00 strk Exp $ */
+/* $Id: string.cpp,v 1.36 2007/08/31 21:53:32 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -31,8 +31,10 @@
 #include "array.h"
 #include "as_value.h"
 #include "GnashException.h"
-#include <boost/algorithm/string/case_conv.hpp>
 #include "VM.h" // for registering static GcResources (constructor and prototype)
+#include "Object.h" // for getObjectInterface
+
+#include <boost/algorithm/string/case_conv.hpp>
 
 #define ENSURE_FN_ARGS(min, max, rv)                                    \
     if (fn.nargs < min) {                                               \
@@ -100,7 +102,7 @@
 
     if ( o == NULL )
     {
-        o = new as_object();
+        o = new as_object(getObjectInterface());
 	VM::get().addStatic(o.get());
 
         attachStringInterface(*o);

Index: server/asobj/xmlnode.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlnode.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- server/asobj/xmlnode.cpp	4 Aug 2007 04:19:29 -0000	1.38
+++ server/asobj/xmlnode.cpp	31 Aug 2007 21:53:32 -0000	1.39
@@ -16,7 +16,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: xmlnode.cpp,v 1.38 2007/08/04 04:19:29 strk Exp $ */
+/* $Id: xmlnode.cpp,v 1.39 2007/08/31 21:53:32 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -29,6 +29,9 @@
 #include "array.h" // for childNodes
 #include "xmlnode.h"
 #include "log.h"
+#include "Object.h" // for getObjectInterface
+
+#include <boost/algorithm/string/case_conv.hpp>
 
 #include <string>
 #include <sstream>
@@ -422,7 +425,7 @@
 {
     static boost::intrusive_ptr<as_object> o;
     if ( o == NULL ) {
-        o = new as_object();
+        o = new as_object(getObjectInterface());
         attachXMLNodeInterface(*o);
     }
     return o.get();
@@ -632,7 +635,7 @@
     boost::intrusive_ptr<XMLNode> ptr = ensureType<XMLNode>(fn.this_ptr);
 
     XMLNode::AttribList& attrs = ptr->attributes();
-    boost::intrusive_ptr<as_object> ret = new as_object();
+    boost::intrusive_ptr<as_object> ret = new as_object(getObjectInterface());
     for (XMLNode::AttribList::const_iterator it=attrs.begin(),
          itEnd=attrs.end(); it != itEnd; ++it) {
 

Index: server/asobj/xmlsocket.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlsocket.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- server/asobj/xmlsocket.cpp	2 Jul 2007 03:20:34 -0000	1.31
+++ server/asobj/xmlsocket.cpp	31 Aug 2007 21:53:32 -0000	1.32
@@ -31,6 +31,7 @@
 #include "VM.h"
 #include "builtin_function.h" // for setting timer, should likely avoid that..
 #include "URLAccessManager.h"
+#include "Object.h" // for getObjectInterface
 
 #include "log.h"
 
@@ -592,7 +593,7 @@
     static boost::intrusive_ptr<as_object> o;
     if ( o == NULL )
     {
-        o = new as_object();
+        o = new as_object(getObjectInterface());
         attachXMLSocketInterface(*o);
     }
     return o.get();

Index: testsuite/actionscript.all/Function.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Function.as,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- testsuite/actionscript.all/Function.as	2 Aug 2007 19:10:51 -0000	1.53
+++ testsuite/actionscript.all/Function.as	31 Aug 2007 21:53:33 -0000	1.54
@@ -21,10 +21,14 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Function.as,v 1.53 2007/08/02 19:10:51 strk Exp $";
+rcsid="$Id: Function.as,v 1.54 2007/08/31 21:53:33 strk Exp $";
 
 #include "check.as"
 
+#if OUTPUT_VERSION > 6
+check_equals(Function.prototype.__proto__, Object.prototype);
+#endif
+
 // Define a function returning 'this'.name and the given args
 function getThisName(a,b,c) { return this.name+a+b+c; }
 

Index: testsuite/actionscript.all/Global.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Global.as,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- testsuite/actionscript.all/Global.as	26 Jul 2007 03:41:18 -0000	1.26
+++ testsuite/actionscript.all/Global.as	31 Aug 2007 21:53:33 -0000	1.27
@@ -21,7 +21,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Global.as,v 1.26 2007/07/26 03:41:18 strk Exp $";
+rcsid="$Id: Global.as,v 1.27 2007/08/31 21:53:33 strk Exp $";
 
 #include "check.as"
 
@@ -37,9 +37,9 @@
 // odd stuff.. not every value of type 'object' is an instance of Object :!!
 check_equals(typeof(_global), 'object');
 check_equals(typeof(_global._global), 'undefined');
-xcheck( ! _global instanceof Object );
-xcheck_equals( typeof(_global.__proto__), 'undefined' );
-xcheck_equals(typeof(_global.toString), 'undefined');
+check( ! _global instanceof Object );
+check_equals( typeof(_global.__proto__), 'undefined' );
+check_equals(typeof(_global.toString), 'undefined');
 
 #else
 check_equals ( typeof(_global.parseInt), 'undefined' );
@@ -47,7 +47,7 @@
 
 check_equals(typeof(isNaN), 'function');
 #if OUTPUT_VERSION > 5
-xcheck(!_global.hasOwnProperty('isNaN'));
+check(!_global.hasOwnProperty('isNaN'));
 #endif
 
 // Test parseInt

Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- testsuite/actionscript.all/MovieClip.as	30 Aug 2007 13:49:57 -0000	1.86
+++ testsuite/actionscript.all/MovieClip.as	31 Aug 2007 21:53:33 -0000	1.87
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.86 2007/08/30 13:49:57 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.87 2007/08/31 21:53:33 strk Exp $";
 
 #include "check.as"
 
@@ -49,6 +49,8 @@
 check_equals(mc.__proto__, MovieClip.prototype);
 check_equals(typeof(MovieClip.prototype._width), "undefined");
 check_equals(typeof(MovieClip.prototype.attachMovie), "function");
+check_equals(typeof(MovieClip.prototype.__proto__), "object");
+check_equals(MovieClip.prototype.__proto__, Object.prototype);
 check_equals(typeof(mc._width), "number");
 
 // Check methods existance

Index: testsuite/actionscript.all/TextField.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/TextField.as,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- testsuite/actionscript.all/TextField.as	29 Aug 2007 18:50:20 -0000	1.20
+++ testsuite/actionscript.all/TextField.as	31 Aug 2007 21:53:33 -0000	1.21
@@ -19,7 +19,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: TextField.as,v 1.20 2007/08/29 18:50:20 strk Exp $";
+rcsid="$Id: TextField.as,v 1.21 2007/08/31 21:53:33 strk Exp $";
 
 #include "check.as"
 
@@ -27,6 +27,8 @@
 
 check_equals(typeof(TextField), 'function');
 check_equals(typeof(TextField.prototype), 'object');
+check_equals(typeof(TextField.prototype.__proto__), 'object');
+check_equals(TextField.prototype.__proto__, Object.prototype);
 check_equals(typeof(TextField.prototype.setTextFormat), 'function');
 check_equals(typeof(TextField.prototype.getTextFormat), 'function');
 check_equals(typeof(TextField.prototype.setNewTextFormat), 'function');

Index: testsuite/actionscript.all/Video.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Video.as,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- testsuite/actionscript.all/Video.as	26 Jul 2007 03:41:20 -0000	1.11
+++ testsuite/actionscript.all/Video.as	31 Aug 2007 21:53:33 -0000	1.12
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Video.as,v 1.11 2007/07/26 03:41:20 strk Exp $";
+rcsid="$Id: Video.as,v 1.12 2007/08/31 21:53:33 strk Exp $";
 
 #include "check.as"
 
@@ -33,6 +33,8 @@
 // test Video class an interface availability
 check_equals(typeof(Video), 'function');
 check_equals(typeof(Video.prototype), 'object');
+check_equals(typeof(Video.prototype.__proto__), 'object');
+check_equals(Video.prototype.__proto__, Object.prototype);
 check_equals(typeof(Video.prototype.attachVideo), 'function');
 check_equals(typeof(Video.prototype.clear), 'function');
 

Index: testsuite/actionscript.all/array.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/array.as,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- testsuite/actionscript.all/array.as	31 Aug 2007 17:07:36 -0000	1.31
+++ testsuite/actionscript.all/array.as	31 Aug 2007 21:53:33 -0000	1.32
@@ -1,16 +1,31 @@
-// Mike Carlson's test program for actionscript arrays
-// (initialization, 
-// Jan. 17th, 2006
+// 
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
 
-// Updated with sort functions, and to use check() macro
-// by Mike Carlson Feb. 14th, 2006
+// Initial test written by Mike Carlson
 
-rcsid="$Id: array.as,v 1.31 2007/08/31 17:07:36 strk Exp $";
+rcsid="$Id: array.as,v 1.32 2007/08/31 21:53:33 strk Exp $";
 
 #include "check.as"
 
 check_equals(typeof(Array), 'function');
 check_equals(typeof(Array.prototype), 'object');
+check_equals(typeof(Array.prototype.__proto__), 'object');
+check_equals(Array.prototype.__proto__, Object.prototype);
 check_equals(typeof(Array.prototype.concat), 'function');
 check_equals(typeof(Array.prototype.join), 'function');
 check_equals(typeof(Array.prototype.pop), 'function');

Index: testsuite/swfdec/PASSING
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/PASSING,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- testsuite/swfdec/PASSING	25 Aug 2007 23:11:01 -0000	1.26
+++ testsuite/swfdec/PASSING	31 Aug 2007 21:53:33 -0000	1.27
@@ -99,3 +99,97 @@
 string-split-empty-5.swf
 string-split-empty-6.swf
 string-split-empty-7.swf
+ASSetPropFlags-ignore-8.swf
+abort-really-aborts-5.swf
+addProperty-5.swf
+addProperty-delete-5.swf
+addProperty-flags-5.swf
+addProperty-get-prototypes-5.swf
+addProperty-set-prototypes-5.swf
+asbroadcaster-broadcastMessage-retval-5.swf
+asbroadcaster-listeners-5.swf
+asbroadcaster-listeners-6.swf
+asbroadcaster-listeners-7.swf
+asbroadcaster-listeners-8.swf
+asbroadcaster-override-5.swf
+clonesprite-depths-5.swf
+clonesprite-depths-6.swf
+clonesprite-depths-7.swf
+clonesprite-depths-8.swf
+construct-constructors-5.swf
+construct-constructors-6.swf
+construct-constructors-7.swf
+construct-constructors-8.swf
+crash-0.5.2-startdrag.swf
+definelocal-function-target-5.swf
+definelocal-function-target-6.swf
+definelocal-function-target-7.swf
+definelocal-target-5.swf
+definelocal-target-6.swf
+definelocal-target-7.swf
+duplicate-names-5.swf
+duplicate-names-6.swf
+duplicate-names-7.swf
+extends-constructors-6.swf
+extends-constructors-7.swf
+extends-constructors-8.swf
+forin-delete-5.swf
+forin-delete-6.swf
+forin-delete-7.swf
+loadvars-5.swf
+math-constants-5.swf
+math-constants-6.swf
+math-constants-7.swf
+mouse-scaled-5.swf
+object-math-6.swf
+object-valueof-5.swf
+onresize-5.swf
+onresize-6.swf
+onresize-7.swf
+onresize-8.swf
+property-native-5.swf
+remove-depths-5.swf
+removesprite-depths-5.swf
+removesprite-depths-6.swf
+removesprite-depths-7.swf
+rotation2-5.swf
+round-direction-5.swf
+round-direction-6.swf
+round-direction-7.swf
+round-direction-8.swf
+setvariable-function-5.swf
+setvariable-function-6.swf
+setvariable-function-7.swf
+setvariable-function-target-5.swf
+setvariable-function-target-6.swf
+setvariable-function-target-7.swf
+stack-segment-5.swf
+stack-segment-6.swf
+stack-segment-7.swf
+stack-segment-8.swf
+stack-segments2-5.swf
+stack-segments2-6.swf
+stack-segments2-7.swf
+stack-segments2-8.swf
+stage-size-6.swf
+stage-size-7.swf
+stage-size-8.swf
+stringlength-5.swf
+super-calls-5.swf
+super-different-5.swf
+super-equals-this-5.swf
+super-equals-this-6.swf
+super-equals-this-7.swf
+super-equals-this-8.swf
+super-missing-5.swf
+targetpath-5.swf
+targetpath-6.swf
+targetpath-7.swf
+this-localfunction-5.swf
+this-localfunction-6.swf
+this-localfunction-7.swf
+this-localfunction-8.swf
+with-outobject-5.swf
+with-outobject-6.swf
+with-outobject-7.swf
+with-outobject-8.swf



From MAILER-DAEMON Fri Aug 31 18:16:57 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IREnQ-00043D-Um
	for mharc-gnash-commit@gnu.org; Fri, 31 Aug 2007 18:16:56 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IREnP-0003zj-1I
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 18:16:55 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IREnN-0003xJ-Os
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 18:16:54 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IREnN-0003x7-Ld
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 18:16:53 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IREnN-0006tP-HR
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 18:16:53 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IREnL-0007Ta-Ap
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 22:16:51 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IREnK-0007TS-Iw
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 22:16:50 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IREnK-0007TS-Iw@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 31 Aug 2007 22:16:50 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/asobj/gen-asclass.sh
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Aug 2007 22:16:55 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/08/31 22:16:50

Modified files:
	.              : ChangeLog 
	server/asobj   : gen-asclass.sh 

Log message:
	        * server/asobj/gen-asclass.sh: add the getObjectInterface call.
	          (btw, gen-asclass.pl is being left behind).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4178&r2=1.4179
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/gen-asclass.sh?cvsroot=gnash&r1=1.16&r2=1.17

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4178
retrieving revision 1.4179
diff -u -b -r1.4178 -r1.4179
--- ChangeLog	31 Aug 2007 21:53:30 -0000	1.4178
+++ ChangeLog	31 Aug 2007 22:16:49 -0000	1.4179
@@ -1,5 +1,10 @@
 2007-08-31 Sandro Santilli <strk@keybit.net>
 
+	* server/asobj/gen-asclass.sh: add the getObjectInterface call.
+	  (btw, gen-asclass.pl is being left behind).
+
+2007-08-31 Sandro Santilli <strk@keybit.net>
+
 	* server/as_object.{cpp,h}: changed get_prototype to always return
 	  the actual prototype (rather then returning the Object prototype
 	  if unset).

Index: server/asobj/gen-asclass.sh
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/gen-asclass.sh,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/asobj/gen-asclass.sh	2 Aug 2007 23:08:08 -0000	1.16
+++ server/asobj/gen-asclass.sh	31 Aug 2007 22:16:50 -0000	1.17
@@ -144,6 +144,8 @@
 #include "smart_ptr.h" // for boost intrusive_ptr
 #include "builtin_function.h" // need builtin_function
 #include "GnashException.h" // for ActionException
+#include "Object.h" // for getObjectInterface,
+                    // change if you don't need to inherit from Object
 
 namespace gnash {
 
@@ -179,7 +181,11 @@
 	static boost::intrusive_ptr<as_object> o;
 	if ( ! o )
 	{
-		o = new as_object();
+		// properly setup inheritance chain
+		// (this one is to inherit from Object class)
+		as_object* superClassInterface = getObjectInterface();
+
+		o = new as_object(superClassInterface);
 		VM::get().addStatic(o.get());
 
 		attach${asname}Interface(*o);



From MAILER-DAEMON Fri Aug 31 21:20:54 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IRHfS-00051N-8m
	for mharc-gnash-commit@gnu.org; Fri, 31 Aug 2007 21:20:54 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IRHfQ-0004xl-Cv
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 21:20:52 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IRHfO-0004v7-Rm
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 21:20:51 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IRHfO-0004uq-7w
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 21:20:50 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IRHfN-0004LK-KE
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 21:20:50 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IRHfM-0002mX-55
	for gnash-commit@gnu.org; Sat, 01 Sep 2007 01:20:48 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IRHfL-0002mT-T9
	for gnash-commit@gnu.org; Sat, 01 Sep 2007 01:20:48 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IRHfL-0002mT-T9@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 01 Sep 2007 01:20:47 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/character.cpp server/cha...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Sep 2007 01:20:52 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/09/01 01:20:47

Modified files:
	.              : ChangeLog 
	server         : character.cpp character.h dlist.cpp dlist.h 
	                 movie_root.cpp movie_root.h sprite_instance.cpp 
	                 sprite_instance.h 
	testsuite/actionscript.all: MovieClip.as 
	testsuite/misc-ming.all: loop_test7.c loop_test8.c 
	                         unload_movieclip_test1.c 
	testsuite/misc-swfc.all: movieclip_destruction_test2.sc 
	testsuite/swfdec: PASSING 

Log message:
	        * server/dlist.{cpp,h}: when unloaded character's unload() method
	          returns true (character or any of its childs has onUnload methods to
	          be run) don't really remove it from the list, but just shift it
	          down to the "removed" zone. Advance and display only non-removed
	          characters (depth-zone based for now, possibly too weak).
	          Add lots of paranoid invariant testing (not enough, missing the
	          one for no unloaded characters out of "removed" depth zone).
	        * server/character.{cpp,h}: more info about removedDepthOffset,
	          assertion preveing double unload of a character (this can be
	          probably easily broken by a focused testcase using removeMovieClip
	          on a removed but still-reachable character).
	        * server/movie_root.{cpp,h}: added cleanupDisplayList() method, and
	          call it at the end of actions execution to properly cleanup removed
	          but still-reachable characters.
	        * server/sprite_instance.{cpp,h}: implement a cleanupDisplayList, to
	          be called by movie_root, make sure to not include unloaded
	          characters when visiting the DisplayList for bounds extractions and
	          similar.
	        * testsuite/actionscript.all/MovieClip.as: soft-references successes
	        * testsuite/misc-ming.all/: loop_test7.c, loop_test8.c:
	          keep-alive-for-onUnload successes
	        * testsuite/misc-ming.all/unload_movieclip_test1.c: successes
	        * testsuite/misc-swfc.all/movieclip_destruction_test2.sc: successes
	        * testsuite/swfdec/PASSING: remove-depths-*.swf successes

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4179&r2=1.4180
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.cpp?cvsroot=gnash&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.91&r2=1.92
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.cpp?cvsroot=gnash&r1=1.80&r2=1.81
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.h?cvsroot=gnash&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.82&r2=1.83
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.h?cvsroot=gnash&r1=1.70&r2=1.71
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.319&r2=1.320
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.134&r2=1.135
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.87&r2=1.88
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/loop_test7.c?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/loop_test8.c?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/unload_movieclip_test1.c?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/movieclip_destruction_test2.sc?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/PASSING?cvsroot=gnash&r1=1.27&r2=1.28

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4179
retrieving revision 1.4180
diff -u -b -r1.4179 -r1.4180
--- ChangeLog	31 Aug 2007 22:16:49 -0000	1.4179
+++ ChangeLog	1 Sep 2007 01:20:45 -0000	1.4180
@@ -1,3 +1,30 @@
+2007-09-01 Sandro Santilli <strk@keybit.net>
+
+	* server/dlist.{cpp,h}: when unloaded character's unload() method
+	  returns true (character or any of its childs has onUnload methods to
+	  be run) don't really remove it from the list, but just shift it
+	  down to the "removed" zone. Advance and display only non-removed
+	  characters (depth-zone based for now, possibly too weak).
+	  Add lots of paranoid invariant testing (not enough, missing the
+	  one for no unloaded characters out of "removed" depth zone).
+	* server/character.{cpp,h}: more info about removedDepthOffset,
+	  assertion preveing double unload of a character (this can be 
+	  probably easily broken by a focused testcase using removeMovieClip
+	  on a removed but still-reachable character).
+	* server/movie_root.{cpp,h}: added cleanupDisplayList() method, and
+	  call it at the end of actions execution to properly cleanup removed
+	  but still-reachable characters.
+	* server/sprite_instance.{cpp,h}: implement a cleanupDisplayList, to
+	  be called by movie_root, make sure to not include unloaded
+	  characters when visiting the DisplayList for bounds extractions and
+	  similar.
+	* testsuite/actionscript.all/MovieClip.as: soft-references successes
+	* testsuite/misc-ming.all/: loop_test7.c, loop_test8.c:
+	  keep-alive-for-onUnload successes
+	* testsuite/misc-ming.all/unload_movieclip_test1.c: successes
+	* testsuite/misc-swfc.all/movieclip_destruction_test2.sc: successes
+	* testsuite/swfdec/PASSING: remove-depths-*.swf successes
+
 2007-08-31 Sandro Santilli <strk@keybit.net>
 
 	* server/asobj/gen-asclass.sh: add the getObjectInterface call.

Index: server/character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/character.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- server/character.cpp	31 Aug 2007 15:40:05 -0000	1.50
+++ server/character.cpp	1 Sep 2007 01:20:46 -0000	1.51
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 
-/* $Id: character.cpp,v 1.50 2007/08/31 15:40:05 strk Exp $ */
+/* $Id: character.cpp,v 1.51 2007/09/01 01:20:46 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -676,8 +676,9 @@
 bool
 character::unload()
 {
-	assert(!_unloaded);
+	assert(!_unloaded); // don't unload characters twice !
 	_unloaded = true;
+
 	//log_msg(_("Queuing unload event for character %p"), this);
 	return queueEventHandler(event_id::UNLOAD);
 	//on_event(event_id::UNLOAD);

Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- server/character.h	30 Aug 2007 14:13:07 -0000	1.91
+++ server/character.h	1 Sep 2007 01:20:46 -0000	1.92
@@ -19,7 +19,7 @@
 //
 //
 
-/* $Id: character.h,v 1.91 2007/08/30 14:13:07 strk Exp $ */
+/* $Id: character.h,v 1.92 2007/09/01 01:20:46 strk Exp $ */
 
 #ifndef GNASH_CHARACTER_H
 #define GNASH_CHARACTER_H
@@ -350,6 +350,13 @@
     ///          depth -32829 (-32769-60) when unloaded and
     ///          an onUnload event handler is defined for it.
     ///
+    /// So, to recap:
+    ///		1:  -32769 to -16385 are removed
+    ///		2:  -16384 to      0 are statics
+    ///		3:  Max depth for a PlaceoObject call is 16384 (which becomes 0 in the statics)
+    ///	(all of the above correct?)
+    ///
+    ///
     static const int removedDepthOffset = -32769; // -32769;
     
     /// This value is used for m_clip_depth when the value has no meaning, ie.

Index: server/dlist.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- server/dlist.cpp	31 Aug 2007 14:49:47 -0000	1.80
+++ server/dlist.cpp	1 Sep 2007 01:20:46 -0000	1.81
@@ -28,6 +28,7 @@
 #include <iostream>
 #include <algorithm>
 #include <stack>
+#include <boost/bind.hpp>
 
 namespace gnash {
 
@@ -98,6 +99,8 @@
 int
 DisplayList::getNextHighestDepth() const
 {
+	testInvariant();
+
 	int nexthighestdepth=0;
 	for (const_iterator it = _characters.begin(),
 			itEnd = _characters.end();
@@ -118,6 +121,8 @@
 character*
 DisplayList::get_character_at_depth(int depth)
 {
+	testInvariant();
+
 	//GNASH_REPORT_FUNCTION;
 	//dump();
 
@@ -143,6 +148,8 @@
 character*
 DisplayList::get_character_by_name(const std::string& name)
 {
+	testInvariant();
+
 	container_type::iterator it = find_if(
 			_characters.begin(),
 			_characters.end(),
@@ -156,6 +163,8 @@
 character*
 DisplayList::get_character_by_name_i(const std::string& name)
 {
+	testInvariant();
+
 	container_type::iterator it = find_if(
 			_characters.begin(),
 			_characters.end(),
@@ -182,6 +191,7 @@
 	//dump();
 
 	assert(ch);
+	assert(!ch->isUnloaded());
 	ch->set_invalidated();
 	ch->set_depth(depth);
 	ch->set_cxform(color_xform);
@@ -208,16 +218,23 @@
 		InvalidatedRanges old_ranges;	
 		(*it)->add_invalidated_bounds(old_ranges, true);	
 	
-		(*it)->unload();
+		boost::intrusive_ptr<character> oldCh = *it;
+		bool hasUnloadEvent = oldCh->unload();
+
 		// replace existing char
 		*it = DisplayItem(ch);
 		
+		// reinsert removed character if needed
+		if ( hasUnloadEvent ) reinsertRemovedCharacter(oldCh);
+		
 		// extend invalidated bounds
 		ch->extend_invalidated_bounds(old_ranges); 				
 	}
 
 	// Give life to this instance
 	ch->construct();
+
+	testInvariant();
 }
 
 void
@@ -236,17 +253,23 @@
 	{
 		*it = DisplayItem(ch);
 	}
+
+	testInvariant();
 }
 
 void
 DisplayList::addAll(std::vector<character*>& chars, bool replace)
 {
+	testInvariant();
+
 	for (std::vector<character*>::iterator it=chars.begin(),
 			itEnd=chars.end();
 			it != itEnd; ++it)
 	{
 		add(*it, replace);
 	}
+
+	testInvariant();
 }
 
 void
@@ -258,7 +281,11 @@
 	int ratio,
 	int clip_depth)
 {
+	testInvariant();
+
 	//GNASH_REPORT_FUNCTION;
+	assert(ch);
+	assert(!ch->isUnloaded());
 
 	ch->set_invalidated();
 	ch->set_depth(depth);
@@ -292,7 +319,7 @@
 	}
 	else
 	{
-		character* oldch = it->get();
+		boost::intrusive_ptr<character> oldch = *it;
 
 		InvalidatedRanges old_ranges;
 	
@@ -312,11 +339,14 @@
 		oldch->add_invalidated_bounds(old_ranges, true);		
 
 		// Unload old char
-		(*it)->unload();
+		bool hasUnloadEvent = oldch->unload();
 
 		// replace existing char		
 		*it = di;
 		
+		// reinsert removed character if needed
+		if ( hasUnloadEvent ) reinsertRemovedCharacter(oldch);
+		
 		// extend invalidated bounds
 		// WARNING: when a new Button character is added,
 		//          the invalidated bounds computation will likely
@@ -330,6 +360,8 @@
 
 	// Give life to this instance
 	ch->construct();
+
+	testInvariant();
 }
 	
 	
@@ -343,6 +375,8 @@
 	int ratio,
 	int /* clip_depth */)
 {
+	testInvariant();
+
 	//GNASH_REPORT_FUNCTION;
 	//IF_VERBOSE_DEBUG(log_msg(_("dl::move(%d)"), depth));
 
@@ -358,6 +392,12 @@
 		return;
 	}
 
+	if ( ch->isUnloaded() )
+	{
+		log_error("Request to move an unloaded character");
+		assert(!ch->isUnloaded());
+	}
+
 	// TODO: is sign of depth related to accepting anim moves ?
 	if (ch->get_accept_anim_moves() == false)
 	{
@@ -378,6 +418,8 @@
 	{
 		ch->set_ratio(ratio);
 	}
+
+	testInvariant();
 }
 	
 	
@@ -387,6 +429,8 @@
 {
 	//GNASH_REPORT_FUNCTION;
 
+	testInvariant();
+
 	//log_msg(_("Before removing, list is:"));
 	//dump();
 
@@ -394,6 +438,8 @@
 	container_type::size_type size = _characters.size();
 #endif
 
+	// TODO: would it be legal to call remove_display_object with a depth
+	//       in the "removed" zone ?
 	// TODO: optimize to take by-depth order into account
 	container_type::iterator it = find_if(
 			_characters.begin(),
@@ -402,15 +448,25 @@
 
 	if ( it != _characters.end() )
 	{
-		(*it)->unload();
+		boost::intrusive_ptr<character> oldCh = *it;
+		bool hasUnloadEvent = oldCh->unload();
+
 		_characters.erase(it);
 
+		// reinsert removed character if needed
+		// NOTE: could be optimized if we knew exactly how
+		//       to handle the case in which the target depth
+		//       (after the shift) is occupied already
+		//
+		if ( hasUnloadEvent ) reinsertRemovedCharacter(oldCh);
 	}
 
 #ifndef NDEBUG
 	assert(size >= _characters.size());
 #endif
 
+	testInvariant();
+
 	//log_msg(_("Done removing, list is:"));
 	//dump();
 }
@@ -419,6 +475,7 @@
 void
 DisplayList::swapDepths(character* ch1, int newdepth)
 {
+	testInvariant();
 
 	if ( newdepth < character::staticDepthOffset )
 	{
@@ -429,8 +486,14 @@
 		return;
 	}
 
-	assert(ch1->get_depth() != newdepth);
+	int srcdepth = ch1->get_depth();
+
+	// what if source char is at a lower depth ?
+	assert(srcdepth >= character::staticDepthOffset);
 
+	assert(srcdepth != newdepth);
+
+	// TODO: optimize this scan by taking ch1 depth into account ?
 	container_type::iterator it1 = find(_characters.begin(), _characters.end(), ch1);
 
 	// upper bound ...
@@ -448,8 +511,6 @@
 	{
 		DisplayItem ch2 = *it2;
 
-		int srcdepth = ch1->get_depth();
-
 		ch2->set_depth(srcdepth);
 
 		// TODO: we're not actually invalidated ourselves, rather our parent is...
@@ -485,17 +546,14 @@
 	// See displaylist_depths_test6.swf for more info.
 	ch1->transformedByScript();
 
-#ifndef NDEBUG
-	// TODO: make this a testInvariant() method for DisplayList
-	DisplayList sorted = *this;
-	sorted.sort();
-	assert(*this == sorted); // check we didn't screw up ordering
-#endif
+	testInvariant();
 
 }
 	
 void DisplayList::reset(movie_definition& movieDef, size_t tgtFrame, bool call_unload)
 {
+	testInvariant();
+
 	//GNASH_REPORT_FUNCTION;
 
 	// 1. Find all "timeline depth" for the target frame, querying the
@@ -513,20 +571,24 @@
 	cout << "Current DisplayList: " << *this << endl;
 #endif
 
-
 	typedef std::vector<int>::iterator SeekIter;
 
 	SeekIter startSeek = save.begin();
     SeekIter endSeek = save.end();
 
-	for (iterator it = _characters.begin(),	itEnd = _characters.end(); it != itEnd; )
+	std::vector<DisplayItem> toReinsert;
+
+	iterator it = beginNonRemoved(_characters);
+	for (iterator itEnd = _characters.end(); it != itEnd; )
 	{
+		testInvariant();
+
 		DisplayItem& di = *it;
 
 		int di_depth = di->get_depth();
 
 		/// We won't scan chars in the dynamic depth zone
-		if ( di_depth >= 0 ) return;
+		if ( di_depth >= 0 ) break;
 
 		/// Always remove non-timeline instances ?
 		/// Seems so, at least for duplicateMovieClip
@@ -536,7 +598,13 @@
 		if ( ! info )
 		{
 			// Not to be saved, killing
-			if ( call_unload ) di->unload();
+			if ( call_unload )
+			{
+				if ( di->unload() )
+				{
+					toReinsert.push_back(di);
+				}
+			}
 			it = _characters.erase(it);
 			continue;
 		}
@@ -546,6 +614,10 @@
 		// we need to do this in some corner cases. 
 		if(!di->isActionScriptReferenceable())
 		{
+			// TODO: no unload() call needed here ? would help GC ?
+			// (I guess there can't be any as_value pointing at this
+			// if it's not ActionScriptReferenceable after all...)
+			//
 			it = _characters.erase(it);
 			continue;
 		}
@@ -555,7 +627,13 @@
 		if( match == save.end())
 		{
 			// Not to be saved, killing
-			if ( call_unload ) di->unload();
+			if ( call_unload )
+			{
+				if ( di->unload() )
+				{
+					toReinsert.push_back(di);
+				}
+			}
 			it = _characters.erase(it);
 			continue;
 		}
@@ -570,23 +648,44 @@
 
 		++it;
 	}
-}
 
+	testInvariant();
+
+	std::for_each(toReinsert.begin(), toReinsert.end(),
+		boost::bind(&DisplayList::reinsertRemovedCharacter, this, _1));
+
+	testInvariant();
+}
 
 void
 DisplayList::clear_except(const DisplayList& exclude, bool call_unload)
 {
+	//log_debug("clear_except(DislpayList, %d) called", call_unload);
 	//GNASH_REPORT_FUNCTION;
 
+	testInvariant();
+	//log_debug("First invariant test worked");
+
+
 	assert(&exclude != this);
 	const container_type& keepchars = exclude._characters;
 
+	std::vector<DisplayItem> toReinsert;
+
+	const_iterator keepStart = beginNonRemoved(keepchars);
+	const_iterator keepEnd = keepchars.end();
+
+	//int called=0;
 	for (iterator it = _characters.begin(),	itEnd = _characters.end(); it != itEnd; )
 	{
+		
+		testInvariant(); // TODO: expensive
+		//log_debug("Invariant test in iteration %d worked", called++);
+
 		DisplayItem& di = *it;
 
 		bool is_affected = false;
-		for (const_iterator kit = keepchars.begin(), kitEnd = keepchars.end(); kit != kitEnd; ++kit)
+		for (const_iterator kit = keepStart; kit != keepEnd; ++kit)
 		{
 			if ( *kit == di )
 			{
@@ -597,12 +696,27 @@
 
 		if (is_affected == false)
 		{
-			if ( call_unload ) di->unload();
+			if ( call_unload )
+			{
+				if ( di->unload() )
+				{
+					toReinsert.push_back(di);
+				}
+			}
 			it = _characters.erase(it);
 			continue;
 		}
 		it++;
 	}
+
+	testInvariant();
+	//log_debug("Invariant test after cleanup worked");
+
+	std::for_each(toReinsert.begin(), toReinsert.end(),
+		boost::bind(&DisplayList::reinsertRemovedCharacter, this, _1));
+
+	testInvariant();
+	//log_debug("Invariant test after reinsertion worked");
 }
 
 void
@@ -610,8 +724,12 @@
 {
 	//GNASH_REPORT_FUNCTION;
 
+	testInvariant();
+
 	const container_type dropchars = from._characters;
 
+	std::vector<DisplayItem> toReinsert;
+
 	for (iterator it = _characters.begin(),	itEnd = _characters.end(); it != itEnd; )
 	{
 		DisplayItem& di = *it;
@@ -628,12 +746,25 @@
 
 		if (is_affected)
 		{
-			if ( call_unload ) di->unload();
+			if ( call_unload )
+			{
+				if ( di->unload() )
+				{
+					toReinsert.push_back(di);
+				}
+			}
 			it = _characters.erase(it);
 			continue;
 		}
 		it++;
 	}
+
+	testInvariant();
+
+	std::for_each(toReinsert.begin(), toReinsert.end(),
+		boost::bind(&DisplayList::reinsertRemovedCharacter, this, _1));
+
+	testInvariant();
 }
 	
 void
@@ -642,14 +773,22 @@
 {
 	//GNASH_REPORT_FUNCTION;
 
+	testInvariant(); 
+
 //	container_type::size_type size = _characters.size();
 
 	// That there was no crash gnash we iterate through the copy
 	std::list<DisplayItem> tmp_list = _characters;
 
-	for (iterator it = tmp_list.begin(), itEnd = tmp_list.end();
-		it != itEnd; ++it)
+        // We only advance characters which are out of the "removed" zone (or should we check isUnloaded?)
+        // TODO: remove when copying _character to tmp_list directly ?
+	iterator it = beginNonRemoved(tmp_list);
+	//if ( it != tmp_list.end() ) log_debug("First non-removed char at depth %d", (*it)->get_depth());
+	//iterator it = tmp_list.begin();
+	for (iterator itEnd = tmp_list.end(); it != itEnd; ++it)
 	{
+		testInvariant(); // expensive !!
+
 		// @@@@ TODO FIX: If array changes size due to
 		// character actions, the iteration may not be
 		// correct!
@@ -684,9 +823,18 @@
 		boost::intrusive_ptr<character> ch = *it;
 		assert(ch!=NULL);
 
+		if ( ch->isUnloaded() ) // debugging
+		{
+			log_error("character at depth %d is unloaded", ch->get_depth());
+			abort();
+		}
+		assert(! ch->isUnloaded() ); // we don't advance unloaded chars
+
+
 		ch->advance(delta_time);
 	}
 
+	testInvariant();
 }
 	
 	
@@ -695,15 +843,27 @@
 void
 DisplayList::display()
 {
+	testInvariant();
+
     //GNASH_REPORT_FUNCTION;
     std::stack<int> clipDepthStack;
     
-    for( iterator it = _characters.begin(), endIt = _characters.end();
-                  it != endIt; ++it)
+    // We only advance characters which are out of the "removed" zone (or should we check isUnloaded?)
+    iterator it = beginNonRemoved(_characters);
+    //iterator it = _characters.begin();
+    for(iterator endIt = _characters.end(); it != endIt; ++it)
     {
         character* ch = it->get();
         assert(ch);
 
+	if ( ch->isUnloaded() ) // debugging
+	{
+		log_error("character at depth %d is unloaded", ch->get_depth());
+		abort();
+	}
+	assert(! ch->isUnloaded() ); // we don't advance unloaded chars
+
+
         // Check if this charater or any of its parents is a mask.
         // Characters act as masks should always be rendered to the
         // mask buffer despite their visibility.
@@ -761,26 +921,30 @@
 void
 DisplayList::dump() const
 {
+	//testInvariant();
+
 	int num=0;
 	for( const_iterator it = _characters.begin(),
 			endIt = _characters.end();
 		it != endIt; ++it)
 	{
 		const DisplayItem& dobj = *it;
-		log_msg(_("Item %d at depth %d (char id %d, name %s, type %s"),
+		log_msg(_("Item %d at depth %d (char id %d, name %s, type %s)"),
 			num, dobj->get_depth(), dobj->get_id(),
-			dobj->get_name().c_str(), typeid(*dobj).name());
+			dobj->get_name().c_str(), typeName(*dobj).c_str());
 		num++;
 	}
 }
 
 
 void 
-DisplayList::add_invalidated_bounds(InvalidatedRanges& ranges, bool force) {
+DisplayList::add_invalidated_bounds(InvalidatedRanges& ranges, bool force)
+{
     
-	for( iterator it = _characters.begin(),
-			endIt = _characters.end();
-		it != endIt; ++it)
+	testInvariant();
+
+	iterator it = beginNonRemoved(_characters);
+	for( iterator endIt = _characters.end(); it != endIt; ++it)
 	{
     DisplayItem& dobj = *it;
 #ifndef GNASH_USE_GC
@@ -825,6 +989,69 @@
 	return os;
 }
 
+void
+DisplayList::reinsertRemovedCharacter(boost::intrusive_ptr<character> ch)
+{
+	assert(ch->isUnloaded());
+
+	// TODO: have this done by character::unload() instead ?
+	int oldDepth = ch->get_depth();
+	int newDepth = character::removedDepthOffset - oldDepth;
+	ch->set_depth(newDepth);
+
+	testInvariant();
+
+	container_type::iterator it = find_if(
+			_characters.begin(), _characters.end(),
+			DepthGreaterOrEqual(newDepth));
+	if ( it == _characters.end() || (*it)->get_depth() != newDepth )
+	{
+		// add the new char
+		_characters.insert(it, DisplayItem(ch));
+	}
+	else
+	{
+		// the character should not be in the displaylist already !
+		assert(it->get() != ch.get());
+
+		log_error("DisplayList::insertCharacter: target depth (%d) is occupied, and we don't know what we're supposed to do - we'll avoid inserting the character for now", newDepth);
+	}
+
+	testInvariant();
+}
+
+/*private static*/
+DisplayList::iterator
+DisplayList::beginNonRemoved(container_type& c)
+{
+	return std::find_if(c.begin(), c.end(),
+			DepthGreaterOrEqual(character::removedDepthOffset - character::staticDepthOffset));
+}
+
+/*private static*/
+DisplayList::const_iterator
+DisplayList::beginNonRemoved(const container_type& c)
+{
+	return std::find_if(c.begin(), c.end(), DepthGreaterOrEqual(character::removedDepthOffset+1));
+}
+
+void
+DisplayList::removeUnloaded()
+{
+	// TODO: erase from begin() to beginNonRemoved()-1 ?
+	//log_debug("removeUnloaded called (dlist:%p)", (void*)this);
+	testInvariant();
+	//log_debug(" first invTest passed, _characters have %d entries", _characters.size());
+	//dump();
+	iterator last = std::remove_if(_characters.begin(), _characters.end(), boost::bind(&character::isUnloaded, _1));
+	_characters.erase(last, _characters.end());
+	//log_debug(" After remove_if, _characters have %d entries - dumping them", _characters.size());
+	//dump();
+	//log_debug(" Now testing invariant again");
+	testInvariant();
+	//log_debug(" second invTest passed");
+}
+
 } // namespace gnash
 
 

Index: server/dlist.h
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- server/dlist.h	30 Aug 2007 21:21:58 -0000	1.47
+++ server/dlist.h	1 Sep 2007 01:20:46 -0000	1.48
@@ -28,6 +28,10 @@
 
 #include <list>
 #include <iosfwd>
+#ifndef NDEBUG
+#include "log.h"
+#include <set>  // for testInvariant
+#endif
 
 namespace gnash {
 	class cxform;
@@ -49,6 +53,27 @@
 
 public:
 
+	void testInvariant() const
+	{
+#ifndef NDEBUG
+		DisplayList sorted = *this;
+		// check no duplicated depths in list
+		std::set<int> depths;
+		for (const_iterator it=_characters.begin(), itEnd=_characters.end(); it!=itEnd; ++it)
+		{
+			boost::intrusive_ptr<character> ch = *it;
+			int depth = ch->get_depth();
+			if ( ! depths.insert(depth).second )
+			{
+				log_debug("Depth %d is duplicated in DisplayList %p", depth, (void*)this);
+				abort();
+			}
+		}
+		sorted.sort();
+		assert(*this == sorted); // check we didn't screw up ordering
+#endif
+	}
+
 	/// Output operator
 	friend std::ostream& operator<< (std::ostream&, const DisplayList&);
 
@@ -172,6 +197,17 @@
 	///
 	void	remove_display_object(int depth);
 
+	/// Remove all unloaded character from the list
+	//
+	/// Removed characters still in the list are those
+	/// on which onUnload event handlers were defined..
+	///
+	/// NOTE: we don't call the function recursively in the 
+	///       contained elements, as that should not be needed
+	///	  (ie: any inned thing will not be accessible anyway)
+	///
+	void removeUnloaded();
+
 	/// Clear the display list.
 	void clear()
 	{
@@ -194,7 +230,7 @@
 
 	/// \brief
 	/// Clear all characters in this DisplayList except the ones
-	/// contained in the given DisplayList
+	/// contained in the given DisplayList and not unloaded
 	//
 	/// @param exclude
 	///	A DisplayList containing character instances to keep.
@@ -298,6 +334,11 @@
 	/// The visitor functor will 
 	/// receive a character pointer; must return true if
 	/// it wants next item or false to exit the loop.
+	///
+	/// NOTE: all elements in the list are visited, even
+	///       the removed ones (unloaded)
+	/// TODO: inspect if worth providing an arg to skip removed
+	///
 	template <class V>
 	inline void visitForward(V& visitor);
 
@@ -309,6 +350,11 @@
 	/// will receive a character pointer; must return true if
 	/// it wants next item or false
 	/// to exit the loop.
+	///
+	/// NOTE: all elements in the list are visited, even
+	///       the removed ones (unloaded)
+	/// TODO: inspect if worth providing an arg to skip removed
+	///
 	template <class V>
 	inline void visitBackward(V& visitor);
 
@@ -320,6 +366,11 @@
 	///
 	/// The visitor functor will receive a character pointer,
 	/// it's return value is not used so can return void.
+	///
+	/// NOTE: all elements in the list are visited, even
+	///       the removed ones (unloaded)
+	/// TODO: inspect if worth providing an arg to skip removed
+	///
 	template <class V>
 	inline void visitAll(V& visitor);
 
@@ -379,6 +430,24 @@
 	typedef container_type::reverse_iterator reverse_iterator;
 	typedef container_type::const_reverse_iterator const_reverse_iterator;
 
+	/// Return an iterator to the first element of the container NOT in the "removed" depth zone
+	static iterator beginNonRemoved(container_type& c);
+
+	/// Return an iterator to the first element of the container NOT in the "removed" depth zone
+	static const_iterator beginNonRemoved(const container_type& c);
+
+	/// Re-insert a removed-from-stage character after appropriately
+	/// shifting its depth based on the character::removedDepthOffset
+	/// value.
+	//
+	/// PRE-CONDITIONS 
+	///	- ch::isUnloaded() returns true (assertion fails otherwise)
+	///	- ch is not already in the list (assertion fails otherwise)
+	///
+	/// TODO: inspect what should happen if the target depth is already occupied
+	///
+	void reinsertRemovedCharacter(boost::intrusive_ptr<character> ch);
+
 	container_type _characters;
 
 

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- server/movie_root.cpp	3 Aug 2007 21:44:32 -0000	1.82
+++ server/movie_root.cpp	1 Sep 2007 01:20:46 -0000	1.83
@@ -670,6 +670,10 @@
 #endif
 	processActionQueue();
 
+	// Delete characters removed from the stage
+	// from the display lists
+	cleanupDisplayList();
+
 #ifdef GNASH_USE_GC
 	// Run the garbage collector (step back !!)
 	GC::get().collect();
@@ -1197,6 +1201,18 @@
 }
 
 void
+movie_root::cleanupDisplayList()
+{
+	// scan a backup copy of the levels, so that movies advancement won't
+	// invalidate iterators
+	Levels cached = _movies;
+	for (Levels::reverse_iterator i=cached.rbegin(), e=cached.rend(); i!=e; ++i)
+	{
+		i->second->cleanupDisplayList();
+	}
+}
+
+void
 movie_root::advanceMovie(boost::intrusive_ptr<sprite_instance> movie, float delta_time)
 {
 #ifdef GNASH_DEBUG

Index: server/movie_root.h
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.h,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- server/movie_root.h	2 Aug 2007 22:07:26 -0000	1.70
+++ server/movie_root.h	1 Sep 2007 01:20:46 -0000	1.71
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: movie_root.h,v 1.70 2007/08/02 22:07:26 strk Exp $ */
+/* $Id: movie_root.h,v 1.71 2007/09/01 01:20:46 strk Exp $ */
 
 /// \page events_handling Handling of user events
 ///
@@ -669,6 +669,10 @@
     // Advance all levels
     void advanceAllLevels(float delta_time);
 
+    /// Delete characters removed from the stage
+    /// from the display lists
+    void cleanupDisplayList();
+
     // Advance a given level
     void advanceMovie(boost::intrusive_ptr<sprite_instance> movie, float delta_time);
 

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -b -r1.319 -r1.320
--- server/sprite_instance.cpp	31 Aug 2007 21:53:31 -0000	1.319
+++ server/sprite_instance.cpp	1 Sep 2007 01:20:46 -0000	1.320
@@ -1630,6 +1630,8 @@
 	{}
 	void operator() (character* ch)
 	{
+		// don't include bounds of unloaded characters
+		if ( ch->isUnloaded() ) return;
 		geometry::Range2d<float> chb = ch->getBounds();
 		matrix m = ch->get_matrix();
 		m.transform(chb);
@@ -1655,6 +1657,9 @@
 
 	void operator() (character* ch) 
 	{
+		// don't include bounds of unloaded characters
+		if ( ch->isUnloaded() ) return;
+
 		// TODO: Are script-transformed object to be kept ?
 		//       Need a testcase for this
 		//if ( ! ch->get_accept_anim_moves() )
@@ -1681,10 +1686,12 @@
 		unloadEvents(0)
 	{}
 
-	bool operator() (character* ch)
+	void operator() (character* ch)
 	{
+		// don't unload already unloaded characters
+		if ( ch->isUnloaded() ) return;
+
 		if ( ch->unload() ) ++unloadEvents;
-		return true;
 	}
 
 	bool foundUnloadEvents() const 
@@ -2325,6 +2332,8 @@
 	// to need oldDisplayList again later, to extract the list of
 	// newly added characters
 	//
+	//oldDisplayList.removeUnloaded(); // TODO: clean oldDisplayList here instead than in cleanupDisplayList ?
+	oldDisplayList.sort(); // this is to avoid failing assertions, since we know characters might have changed depth...
 	DisplayList stillAlive = oldDisplayList;
 	stillAlive.clear_except(m_display_list, false);
 	//log_msg(_("Advancing %d pre-existing children of %s"), stillAlive.size(), getTargetPath().c_str());
@@ -2335,15 +2344,12 @@
 	//log_msg(_("Executing actions in %s timeline"), getTargetPath().c_str());
 	do_actions();
 
-	// Call UNLOAD event of just removed chars !
-	//DisplayList justRemoved = oldDisplayList;
-	//justRemoved.clear_except(m_display_list, false); // true;
-	// No, dont' call UNLOAD event, as it should be called by remove_display_object!
-
-	// Finally, execute actions in newly added childs
+	// Finally, execute actions in (we actually "advance") newly added
+	// (and not unloaded) childs
 	//
 	// These are elements in the current DisplayList, cleared
-	// by all elements in oldDisplayList.
+	// by all unloaded elements and by non-unloaded elements in
+	// oldDisplayList.
 	//
 	// Of course we do NOT call UNLOAD events here, as
 	// the chars we're clearing have *not* been removed:
@@ -2351,6 +2357,7 @@
 	//
 	DisplayList newlyAdded = m_display_list;
 	//log_msg(_("%s has %d current children and %d old children"), getTargetPath().c_str(), m_display_list.size(), oldDisplayList.size());
+	newlyAdded.removeUnloaded();
 	newlyAdded.clear(oldDisplayList, false);
 	//log_msg(_("Advancing %d newly-added (after clearing) children of %s"), newlyAdded.size(), getTargetPath().c_str());
 	newlyAdded.advance(delta_time);
@@ -3372,7 +3379,7 @@
 #endif
 
 	UnloaderVisitor visitor;
-	m_display_list.visitForward(visitor);
+	m_display_list.visitAll(visitor);
 
 	return character::unload() || visitor.foundUnloadEvents();
 
@@ -3628,6 +3635,9 @@
 
 	void operator() (character* ch)
 	{
+		// don't enumerate unloaded characters
+		if ( ch->isUnloaded() ) return;
+
 		_env.push(ch->get_name());
 	}
 };
@@ -3639,6 +3649,14 @@
 	m_display_list.visitAll(visitor);
 }
 
+void
+sprite_instance::cleanupDisplayList()
+{
+        //log_debug("%s.cleanDisplayList() called, current dlist is %p, old is %p", getTarget().c_str(), (void*)&m_display_list, (void*)&oldDisplayList);
+	m_display_list.removeUnloaded();
+	oldDisplayList.removeUnloaded(); // TODO: move unloaded-cleanup of oldDisplayList in advance_sprite ?
+}
+
 #ifdef GNASH_USE_GC
 struct ReachableMarker {
 	void operator() (character *ch)

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -b -r1.134 -r1.135
--- server/sprite_instance.h	31 Aug 2007 07:56:11 -0000	1.134
+++ server/sprite_instance.h	1 Sep 2007 01:20:47 -0000	1.135
@@ -748,6 +748,10 @@
 		return _origTarget;
 	}
 
+	/// Delete characters removed from the stage
+	/// from the display lists
+	void cleanupDisplayList();
+
 private:
 
 	/// \brief

Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- testsuite/actionscript.all/MovieClip.as	31 Aug 2007 21:53:33 -0000	1.87
+++ testsuite/actionscript.all/MovieClip.as	1 Sep 2007 01:20:47 -0000	1.88
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.87 2007/08/31 21:53:33 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.88 2007/09/01 01:20:47 strk Exp $";
 
 #include "check.as"
 
@@ -481,23 +481,23 @@
 #endif
 
 check_equals(typeof(hardref), 'undefined');
-xcheck_equals(typeof(hardref2), 'movieclip');
-xcheck_equals(typeof(hardref3), 'movieclip'); // still accessible due to onUnload defined for its child
-xcheck_equals(hardref2.getDepth(), -32839);
-xcheck_equals(hardref3.getDepth(), -32849);
-xcheck_equals(hardref3.hardref3child.getDepth(), 1);
+check_equals(typeof(hardref2), 'movieclip');
+check_equals(typeof(hardref3), 'movieclip'); // still accessible due to onUnload defined for its child
+check_equals(hardref2.getDepth(), -32839);
+check_equals(hardref3.getDepth(), -32849);
+check_equals(hardref3.hardref3child.getDepth(), 1);
 check_equals(typeof(softref), 'movieclip');
 check_equals(typeof(softref2), 'movieclip');
 check_equals(typeof(softref3), 'movieclip');
 check_equals(typeof(softref3child), 'movieclip');
 check_equals(typeof(softref.member), 'undefined');
 check_equals(typeof(softref._target), 'undefined');
-xcheck_equals(softref2.member, 2);
-xcheck_equals(softref2._target, '/hardref2');
-xcheck_equals(softref3.member, 3);
-xcheck_equals(softref3._target, '/hardref3');
-xcheck_equals(softref3child.member, '3child');
-xcheck_equals(softref3child._target, '/hardref3/hardref3child');
+check_equals(softref2.member, 2);
+check_equals(softref2._target, '/hardref2');
+check_equals(softref3.member, 3);
+check_equals(softref3._target, '/hardref3');
+check_equals(softref3child.member, '3child');
+check_equals(softref3child._target, '/hardref3/hardref3child');
 hardref = 4;
 // Delete is needed, or further inspection functions will hit the variable before the character
 delete hardref;

Index: testsuite/misc-ming.all/loop_test7.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/loop_test7.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- testsuite/misc-ming.all/loop_test7.c	1 Jul 2007 10:54:57 -0000	1.5
+++ testsuite/misc-ming.all/loop_test7.c	1 Sep 2007 01:20:47 -0000	1.6
@@ -122,7 +122,7 @@
   // RemoveObject2 is *before* the DoAction, then typeof(movieClip1) will reurn 'undefined'.
   // So Gnash fails here because of action execution order!
   // TODO: add testcase for this(RemoveObject2 placed *before* DoAction within the same frame).
-  xcheck_equals(mo, "typeof(movieClip1)", "'movieclip'"); // kept alive for calling onUnload!
+  check_equals(mo, "typeof(movieClip1)", "'movieclip'"); // kept alive for calling onUnload!
   check_equals(mo, "_root.mc1Constructed", "1");
   SWFMovie_nextFrame(mo);  
   
@@ -133,7 +133,7 @@
 
   check_equals(mo, "typeof(movieClip1)", "'undefined'");
   SWFMovie_add(mo, (SWFBlock)newSWFAction( "gotoAndStop(4);"));
-  xcheck_equals(mo, "typeof(movieClip1)", "'movieclip'");
+  check_equals(mo, "typeof(movieClip1)", "'movieclip'");
 
   // onConstruct is called twice
   check_equals(mo, "_root.mc1Constructed", "2");

Index: testsuite/misc-ming.all/loop_test8.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/loop_test8.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- testsuite/misc-ming.all/loop_test8.c	1 Jul 2007 10:54:57 -0000	1.6
+++ testsuite/misc-ming.all/loop_test8.c	1 Sep 2007 01:20:47 -0000	1.7
@@ -221,7 +221,7 @@
   check_equals(mo, "typeof(mc2)", "'undefined'"); 
   check_equals(mo, "typeof(mc3)", "'movieclip'"); 
   check_equals(mo, "typeof(mc4)", "'movieclip'"); 
-  xcheck_equals(mo, "typeof(mc5)", "'movieclip'"); // Gnash fails because of action execution order 
+  check_equals(mo, "typeof(mc5)", "'movieclip'"); // Gnash fails because of action execution order 
   check_equals(mo, "mc1Constructed", "1");
   check_equals(mo, "mc2Constructed", "1"); 
   check_equals(mo, "mc3Constructed", "2"); 

Index: testsuite/misc-ming.all/unload_movieclip_test1.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/unload_movieclip_test1.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- testsuite/misc-ming.all/unload_movieclip_test1.c	20 Jul 2007 02:02:08 -0000	1.3
+++ testsuite/misc-ming.all/unload_movieclip_test1.c	1 Sep 2007 01:20:47 -0000	1.4
@@ -88,7 +88,7 @@
   add_actions(mo, "mc.onUnload = function () { "
                   "    _root.x = this._currentframe; "
                   "    _root.check_equals(typeof(this),  'movieclip'); "
-                  "    _root.xcheck_equals(this, _root.mc); "
+                  "    _root.check_equals(this, _root.mc); "
                   "};");
   SWFMovie_nextFrame(mo);
   
@@ -99,7 +99,7 @@
   
   // Frame 4: checks
   
-  xcheck_equals(mo, "_root.x", "1");
+  check_equals(mo, "_root.x", "1");
   
   add_actions(mo, "_root.totals(); stop(); ");
   SWFMovie_nextFrame(mo);

Index: testsuite/misc-swfc.all/movieclip_destruction_test2.sc
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/movieclip_destruction_test2.sc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- testsuite/misc-swfc.all/movieclip_destruction_test2.sc	31 Aug 2007 14:49:48 -0000	1.5
+++ testsuite/misc-swfc.all/movieclip_destruction_test2.sc	1 Sep 2007 01:20:47 -0000	1.6
@@ -87,12 +87,12 @@
     { 
        _root.mc2UnlaodedCount++;     
        // mc2.testvar keeps alive as long as mc2 is alive
-       _root.xcheck_equals(mc2.testvar, 100); 
+       _root.check_equals(mc2.testvar, 100); 
     };
     mc3.onUnload = function ()  
     { 
        _root.mc3UnlaodedCount++; 
-       _root.xcheck_equals(mc3.testvar, 100);
+       _root.check_equals(mc3.testvar, 100);
     };
     
     mc2.testvar = 100;
@@ -114,38 +114,38 @@
     xcheck_equals(mc2UnlaodedCount, 1); //mc2.onUnload triggered
     xcheck_equals(mc2UnlaodedCount, 1); //mc3.onUnload triggered
     check_equals(mc1Ref.valueOf(), null);
-    xcheck_equals(mc2Ref, mc2);
-    xcheck_equals(mc3Ref, mc3);
+    check_equals(mc2Ref, mc2);
+    check_equals(mc3Ref, mc3);
     
     check_equals(typeof(mc1), 'undefined'); //cann't access the hard reference
-    xcheck_equals(typeof(mc2), 'movieclip'); // mc2 is still accessable
-    xcheck_equals(typeof(mc3), 'movieclip'); // mc3 is still accessable
-    xcheck_equals(mc2.getDepth(), -16387);   // depth of mc2 changed after onUnload
-    xcheck_equals(mc3.getDepth(), -16388);   // depth of mc3 changed after onUnload
+    check_equals(typeof(mc2), 'movieclip'); // mc2 is still accessable
+    check_equals(typeof(mc3), 'movieclip'); // mc3 is still accessable
+    check_equals(mc2.getDepth(), -16387);   // depth of mc2 changed after onUnload
+    check_equals(mc3.getDepth(), -16388);   // depth of mc3 changed after onUnload
     
     mc2.swapDepths(mc3);      
-    xcheck_equals(mc2.getDepth(), -16387);  // depth not change after swapDepths
-    xcheck_equals(mc3.getDepth(), -16388);  // depth not change after swapDepths
+    check_equals(mc2.getDepth(), -16387);  // depth not change after swapDepths
+    check_equals(mc3.getDepth(), -16388);  // depth not change after swapDepths
     
     mc2.swapDephts(-10);
     mc2.swapDephts(10);
-    xcheck_equals(mc2.getDepth(), -16387);  // depth not change after swapDepths
-    xcheck_equals(mc3.getDepth(), -16388);  // depth not change after swapDepths
+    check_equals(mc2.getDepth(), -16387);  // depth not change after swapDepths
+    check_equals(mc3.getDepth(), -16388);  // depth not change after swapDepths
     
-    xcheck_equals(mc2.testvar, 100);       
-    xcheck_equals(mc3.testvar, 100); 
+    check_equals(mc2.testvar, 100);       
+    check_equals(mc3.testvar, 100); 
     mc2.removMovieClip();
     mc3.removMovieClip();
     xcheck_equals(mc2UnlaodedCount, 1); //mc2.onUnload not triggered again
     xcheck_equals(mc2UnlaodedCount, 1); //mc3.onUnload not triggered again
-    xcheck_equals(typeof(mc2), 'movieclip'); // mc2 is still accessible
-    xcheck_equals(typeof(mc3), 'movieclip'); // mc3 is still accessible
-    xcheck_equals(mc2.getDepth(), -16387); 
-    xcheck_equals(mc3.getDepth(), -16388);  
-    xcheck_equals(mc2._x, 200); 
-    xcheck_equals(mc3._y, 300);  
-    xcheck_equals(mc2.testvar, 100); 
-    xcheck_equals(mc3.testvar, 100); 
+    check_equals(typeof(mc2), 'movieclip'); // mc2 is still accessible
+    check_equals(typeof(mc3), 'movieclip'); // mc3 is still accessible
+    check_equals(mc2.getDepth(), -16387); 
+    check_equals(mc3.getDepth(), -16388);  
+    check_equals(mc2._x, 200); 
+    check_equals(mc3._y, 300);  
+    check_equals(mc2.testvar, 100); 
+    check_equals(mc3.testvar, 100); 
     
     mc2.onUnload();
     mc3.onUnload();

Index: testsuite/swfdec/PASSING
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/PASSING,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- testsuite/swfdec/PASSING	31 Aug 2007 21:53:33 -0000	1.27
+++ testsuite/swfdec/PASSING	1 Sep 2007 01:20:47 -0000	1.28
@@ -193,3 +193,6 @@
 with-outobject-6.swf
 with-outobject-7.swf
 with-outobject-8.swf
+remove-depths-6.swf
+remove-depths-7.swf
+remove-depths-8.swf



From MAILER-DAEMON Fri Aug 31 21:31:35 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IRHpn-0000IF-5z
	for mharc-gnash-commit@gnu.org; Fri, 31 Aug 2007 21:31:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IRHpl-0000I9-Gs
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 21:31:33 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IRHpj-0000Hx-Pk
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 21:31:32 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IRHpj-0000Hu-Kz
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 21:31:31 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1IRHpi-0005bb-TR
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 21:31:31 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l811VRd83504;
	Sat, 1 Sep 2007 03:31:27 +0200 (CEST) (envelope-from strk@keybit.net)
Date: Sat, 1 Sep 2007 03:31:27 +0200
From: Sandro Santilli <strk@keybit.net>
To: gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash ChangeLog server/character.cpp server/cha...
Message-ID: <20070901013127.GA81531@keybit.net>
Mail-Followup-To: gnash-commit@gnu.org
References: <E1IRHfL-0002mT-T9@cvs.savannah.gnu.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1IRHfL-0002mT-T9@cvs.savannah.gnu.org>
X-Detected-Kernel: FreeBSD 2.0-4.2
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Sep 2007 01:31:34 -0000

On Sat, Sep 01, 2007 at 01:20:47AM +0000, Sandro Santilli wrote:

> Log message:
> 	        * server/dlist.{cpp,h}: when unloaded character's unload() method
> 	          returns true (character or any of its childs has onUnload methods to
> 	          be run) don't really remove it from the list, but just shift it
> 	          down to the "removed" zone. Advance and display only non-removed
> 	          characters (depth-zone based for now, possibly too weak).
> 	          Add lots of paranoid invariant testing (not enough, missing the
> 	          one for no unloaded characters out of "removed" depth zone).
> 	        * server/character.{cpp,h}: more info about removedDepthOffset,
> 	          assertion preveing double unload of a character (this can be
> 	          probably easily broken by a focused testcase using removeMovieClip
> 	          on a removed but still-reachable character).
> 	        * server/movie_root.{cpp,h}: added cleanupDisplayList() method, and
> 	          call it at the end of actions execution to properly cleanup removed
> 	          but still-reachable characters.
> 	        * server/sprite_instance.{cpp,h}: implement a cleanupDisplayList, to
> 	          be called by movie_root, make sure to not include unloaded
> 	          characters when visiting the DisplayList for bounds extractions and
> 	          similar.

This is a pretty big change. We don't always really remove characters from the DisplayList,
but we keep them alive if they (or their children) have any onUnload event handler to be
executed. In that case we only shift them down to a different depth (verified to be the
expected behaviour).

Things to test (important):

 1) what happens if the target depth after the shift is occupied.
    For example:
	- mc1 placed with onUnload event at depth 2, then removed (shifted down)
	- mc2 placed with onUnload event at depth 2, then removed (shifted down occupied)
	- both onUnload handlers will need to reference 'this' and verify they point
	  to the correct instance (mc1 or mc2) Better if they both have the same name!

 2) How is it possible for an unloaded character to be out of the unloaded depth zone
    I've seen this with bombgame.swf, for which line 2360 of sprite_instance.cpp currently
    cleans out unloaded characters from the newlyAdded DisplayList.
    Still, I don't know how was it possible for a character at depth -16381 (3) to be
    tagged as "unloaded" (it should have been moved down to -16388 when removed
    (-32769-(-16381))

 3) Implement pixel-checking for some of the available depth-based tests (IIRC displaylist_depths_test.c
    had some weird visual behaviour, which may now be explainable)

 4) Add a test for characters out of the "removed" zone not being marked as 'unloaded' in the
    DisplayList::testInvariant() and run as many SWF till gnash crashes :)

--strk;




From MAILER-DAEMON Fri Aug 31 21:59:39 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IRIGx-0006us-Ig
	for mharc-gnash-commit@gnu.org; Fri, 31 Aug 2007 21:59:39 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IRIGv-0006t7-Fh
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 21:59:37 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IRIGu-0006s7-Kc
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 21:59:37 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IRIGu-0006rw-7S
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 21:59:36 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1IRIGt-0000to-OF
	for gnash-commit@gnu.org; Fri, 31 Aug 2007 21:59:35 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <strk@keybit.net>) id 1IRIGs-0004jw-1c
	for gnash-commit@gnu.org; Sat, 01 Sep 2007 01:59:34 +0000
Received: from strk by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <strk@savannah.gnu.org>) id 1IRIGr-0004jt-Ry
	for gnash-commit@gnu.org; Sat, 01 Sep 2007 01:59:33 +0000
To: gnash-commit@gnu.org
Message-Id: <E1IRIGr-0004jt-Ry@cvs.savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 01 Sep 2007 01:59:33 +0000
X-Detected-Kernel: Linux 2.6 (newer, 3)
Subject: [Gnash-commit] gnash ChangeLog server/array.cpp testsuite/acti...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Sep 2007 01:59:37 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/09/01 01:59:33

Modified files:
	.              : ChangeLog 
	server         : array.cpp 
	testsuite/actionscript.all: array.as 

Log message:
	Patch #6176 by Ivor Blockley <meteoryte@yahoo.com.au>:
	
	        * server/array.cpp: make to_number calls environment-aware.
	        * testsuite/actionscript.all/array.as: success in invalid array.sort()
	          calls

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4180&r2=1.4181
http://cvs.savannah.gnu.org/viewcvs/gnash/server/array.cpp?cvsroot=gnash&r1=1.75&r2=1.76
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/array.as?cvsroot=gnash&r1=1.32&r2=1.33

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4180
retrieving revision 1.4181
diff -u -b -r1.4180 -r1.4181
--- ChangeLog	1 Sep 2007 01:20:45 -0000	1.4180
+++ ChangeLog	1 Sep 2007 01:59:32 -0000	1.4181
@@ -1,3 +1,9 @@
+2007-09-01 Ivor Blockley <meteoryte@yahoo.com.au>
+
+	* server/array.cpp: make to_number calls environment-aware.
+	* testsuite/actionscript.all/array.as: success in invalid array.sort()
+	  calls
+
 2007-09-01 Sandro Santilli <strk@keybit.net>
 
 	* server/dlist.{cpp,h}: when unloaded character's unload() method

Index: server/array.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/array.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- server/array.cpp	31 Aug 2007 21:53:31 -0000	1.75
+++ server/array.cpp	1 Sep 2007 01:59:33 -0000	1.76
@@ -75,7 +75,7 @@
 	inline int str_cmp(const as_value& a, const as_value& b)
 	{
 		std::string s = a.to_string_versioned(_sv, &_env);
-		return s.compare(b.to_string_versioned(_sv,& _env));
+		return s.compare(b.to_string_versioned(_sv, &_env));
 	}
 
 	inline int str_nocase_cmp(const as_value& a, const as_value& b)
@@ -345,12 +345,14 @@
 	as_function& _comp;
 	as_object* _object;
 	bool (*_zeroCmp)(const int);
+	as_environment& _env;
 
 	as_value_custom(as_function& comparator, bool (*zc)(const int), 
-		boost::intrusive_ptr<as_object> this_ptr)
+		boost::intrusive_ptr<as_object> this_ptr, as_environment& env)
 		:
 		_comp(comparator),
-		_zeroCmp(zc)
+		_zeroCmp(zc),
+		_env(env)
 	{
 		_object = this_ptr.get();
 	}
@@ -364,7 +366,7 @@
 		env.push(a);
 		env.push(b);
 		ret = call_method(cmp_method, &env, _object, 2, 1);
-		return (*_zeroCmp)((int)ret.to_number());
+		return (*_zeroCmp)((int)ret.to_number(&_env));
 	}
 };
 
@@ -919,7 +921,7 @@
 		else icmp = &int_gt;
 
 		as_value_custom avc = 
-			as_value_custom(*as_func, icmp, fn.this_ptr);
+			as_value_custom(*as_func, icmp, fn.this_ptr, env);
 
 		if ( (flags & as_array_object::fReturnIndexedArray) )
 			return as_value(array->sort_indexed(avc));
@@ -933,7 +935,8 @@
 		IF_VERBOSE_ASCODING_ERRORS(
 		log_aserror(_("Sort called with invalid arguments."));
 		)
-		return as_value();
+		if ( fn.arg(0).is_undefined() ) return as_value();
+		return as_value((boost::intrusive_ptr<as_object>)array);
 	}
 	bool do_unique, do_index;
 	flags = flag_preprocess(flags, &do_unique, &do_index);
@@ -969,7 +972,7 @@
 
 		if ( fn.nargs > 1 && fn.arg(1).is_number() )
 		{
-			flags = static_cast<uint8_t>(fn.arg(1).to_number());
+			flags = static_cast<uint8_t>(fn.arg(1).to_number(&env));
 			flags = flag_preprocess(flags, &do_unique, &do_index);
 		}
 		as_value_prop avc = as_value_prop(propField, 
@@ -1257,6 +1260,7 @@
 	// start and end index of the part we're slicing
 	int startindex, endindex;
 	unsigned int arraysize = array->size();
+	as_environment& env = fn.env();
 
 	if (fn.nargs > 2)
 	{
@@ -1276,7 +1280,7 @@
 	}
 
 
-	startindex = int(fn.arg(0).to_number());
+	startindex = int(fn.arg(0).to_number(&env));
 
 	// if the index is negative, it means "places from the end"
 	// where -1 is the last element
@@ -1285,7 +1289,7 @@
 	// if we sent at least two arguments, setup endindex
 	if (fn.nargs >= 2)
 	{
-		endindex = int(fn.arg(1).to_number());
+		endindex = int(fn.arg(1).to_number(&env));
 
 		// if the index is negative, it means
 		// "places from the end" where -1 is the last element

Index: testsuite/actionscript.all/array.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/array.as,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- testsuite/actionscript.all/array.as	31 Aug 2007 21:53:33 -0000	1.32
+++ testsuite/actionscript.all/array.as	1 Sep 2007 01:59:33 -0000	1.33
@@ -18,7 +18,7 @@
 
 // Initial test written by Mike Carlson
 
-rcsid="$Id: array.as,v 1.32 2007/08/31 21:53:33 strk Exp $";
+rcsid="$Id: array.as,v 1.33 2007/09/01 01:59:33 strk Exp $";
 
 #include "check.as"
 
@@ -261,7 +261,7 @@
 
 // using objects that implement valueOf as index positions
 portion = concatted.slice(zero, two);
-xcheck_equals ( portion.toString(), "0,1");
+check_equals ( portion.toString(), "0,1");
 
 //-------------------------------
 // Test splice
@@ -486,7 +486,7 @@
 check_equals( r.toString(), "8,5,3,1,0,-2,-7,-9" );
 check_equals( b.toString(), "8,5,3,1,0,-2,-7,-9" );
 r = b.sort( zero );
-xcheck_equals( r.toString(), "8,5,3,1,0,-2,-7,-9" );
+check_equals( r.toString(), "8,5,3,1,0,-2,-7,-9" );
 check_equals( b.toString(), "8,5,3,1,0,-2,-7,-9" );
 b.sort( numeric );
 check_equals( b.toString(), "8,5,3,1,0,-2,-7,-9" );
@@ -591,7 +591,7 @@
 check_equals( tolen(r), "[5, 5, 4, 2, 2, 0]" );
 check_equals( tolen(a), "[5, 5, 4, 2, 2, 0]" );
 a.sort( cmp_fn_obj, Array.CASEINSENSITIVE | Array.NUMERIC );
-xcheck_equals( tolen(a), "[0, 2, 2, 4, 5, 5]" );
+check_equals( tolen(a), "[0, 2, 2, 4, 5, 5]" );
 r = a.sort( cmp_fn_obj, Array.RETURNINDEXEDARRAY );
 check_equals( r.toString(), "0,1,2,3,4,5" );
 r = a.sort( cmp_fn_obj, Array.RETURNINDEXEDARRAY | Array.DESCENDING );



