[Gnash-commit] gnash libbase/image.h libbase/log.cpp server/as...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    07/12/10 17:45:34

Modified files:
        libbase        : image.h log.cpp 
        server/asobj   : Sound.cpp 
        testsuite      : Makefile.am 
        testsuite/actionscript.all: Makefile.am 
        testsuite/misc-swfc.all: Makefile.am 
        gui            : Makefile.am 
        .              : ChangeLog 

Log message:
                * libbase/image.h: Include boost/cstdint.hpp to get uint8_t in a
                portable fashion.
                * gui/Makefile.am: Add am-frag to EXTRA_DIST.   
                * libbase/log.cpp: Make hexify() handle CR/LF better. Cleanup 
the
                output to handle pure binary files.
                * asobj/Sound.cpp: Include sound_handler.h.
                * testsuite/Makefile.am: Cleanup non POSIX variable name
                warnings.
                * testsuite/actionscript.all/Makefile.am: Cleanup non POSIX
                variable name warnings. 
                * testsuite/misc-swfc.all/Makefile.am: Cleanup non POSIX 
variable
                name warnings.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/image.h?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.cpp?cvsroot=gnash&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Sound.cpp?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/Makefile.am?cvsroot=gnash&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Makefile.am?cvsroot=gnash&r1=1.80&r2=1.81
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/Makefile.am?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.114&r2=1.115
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5118&r2=1.5119

Patches:
Index: libbase/image.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/image.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- libbase/image.h     4 Dec 2007 11:45:23 -0000       1.17
+++ libbase/image.h     10 Dec 2007 17:45:32 -0000      1.18
@@ -10,6 +10,7 @@
 
 
 #include "tu_config.h"
+#include <boost/cstdint.hpp>
 
 #include <boost/scoped_array.hpp>
 #include <memory> // for auto_ptr
@@ -51,7 +52,7 @@
                
                        
                        
-               image_base(uint8_t* data, int width, int height, int pitch, 
id_image type);
+               image_base(uint8_t *data, int width, int height, int pitch, 
id_image type);
 
                /// Construct an image_base allocating data for height*pitch 
bytes
                image_base(int width, int height, int pitch, id_image type);

Index: libbase/log.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- libbase/log.cpp     20 Aug 2007 16:21:04 -0000      1.57
+++ libbase/log.cpp     10 Dec 2007 17:45:32 -0000      1.58
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: log.cpp,v 1.57 2007/08/20 16:21:04 strk Exp $ */
+/* $Id: log.cpp,v 1.58 2007/12/10 17:45:32 rsavoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -74,20 +74,56 @@
     // convert some characters so it'll look right in the log
     for (int i=0 ; i<length; i++) {
         // use the hex value
-       if (isprint(s[i]) && ascii) {
-           if (i>1) {
-               if (!isprint(s[i-1])) {
-                   *p++ = ' ';
-               }
-           }
+
+       if (ascii) {
+           if (isprint(s[i])) {
            *p++ = s[i];
-           if (!isprint(s[i+1])) {
-               *p++ = ' ';
-           }
+               continue;
        } else {
+               if ((s[i] == 0xd) || (s[i] == 0xa)) {
+                   *p++ = s[i];
+                   continue;
+               }
+               *p++ = '^';
+           }
+       } else {                // if not ascii outout requested
            *p++ = hexchars[s[i] >> 4];
            *p++ = hexchars[s[i] & 0xf];
+           *p++ = ' ';         // add a space between bytes
        }
+           
+//     if (isascii(s[i]) && ascii) {
+//         *p++ = hexchars[s[i] >> 4];
+//         *p++ = hexchars[s[i] & 0xf];
+// //              *p++ = ' ';
+//         *p++ = '%';
+//         continue;
+//     }
+//     *p++ = s[i];
+// //      if (!isprint(s[i+1])) {
+// //          *p++ = hexchars[s[i] >> 4];
+// //          *p++ = hexchars[s[i] & 0xf];
+// // //               *p++ = ' ';
+// //          *p++ = '$';
+// //      }
+
+//     } else {
+//         if (ascii) {
+//             if (s[i] == 0xd) {
+// //              *p++ = '\r';
+//                 *p++ = '@';
+//                 continue;
+//             }
+//             if (s[i] == 0xa) {              
+// //              *p++ = '\n';
+//                 *p++ = '#';
+//                 continue;
+//             }
+//         } else {
+//             *p++ = hexchars[s[i] >> 4];
+//             *p++ = hexchars[s[i] & 0xf];
+//         }
+//     }
     }
 
     *p = '\0';

Index: server/asobj/Sound.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Sound.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- server/asobj/Sound.cpp      24 Nov 2007 17:21:44 -0000      1.23
+++ server/asobj/Sound.cpp      10 Dec 2007 17:45:33 -0000      1.24
@@ -23,6 +23,7 @@
 
 #include "Sound.h"
 #include "log.h"
+#include "sound_handler.h"
 #include "sound_definition.h" // for sound_sample
 #include "movie_definition.h"
 #include "sprite_instance.h"
@@ -42,6 +43,7 @@
 
 #include <string>
 
+
 namespace gnash {
 
 static as_value sound_new(const fn_call& fn);

Index: testsuite/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/Makefile.am,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- testsuite/Makefile.am       8 Dec 2007 09:11:25 -0000       1.49
+++ testsuite/Makefile.am       10 Dec 2007 17:45:33 -0000      1.50
@@ -48,10 +48,10 @@
        $(CAIRO_CFLAGS) \
        $(NULL)
 
-abs_mediadir = $(shell cd $(srcdir)/media; pwd)
 
 gnashrc: gnashrc.in
-       sed -e 's#@@MEDIADIR@@#$(abs_mediadir)/#g' $< > $@
+       abs_mediadir="`cd $(srcdir)/media; pwd`"; \
+       sed -e 's#@@MEDIADIR@@#$${abs_mediadir}/#g' $< > $@
 
 if ENABLE_MING
 

Index: testsuite/actionscript.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Makefile.am,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- testsuite/actionscript.all/Makefile.am      20 Oct 2007 10:19:52 -0000      
1.80
+++ testsuite/actionscript.all/Makefile.am      10 Dec 2007 17:45:33 -0000      
1.81
@@ -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.80 2007/10/20 10:19:52 strk Exp $
+# $Id: Makefile.am,v 1.81 2007/12/10 17:45:33 rsavoye Exp $
 
 AUTOMAKE_OPTIONS = dejagnu
 
@@ -26,8 +26,8 @@
 # so I take responsibility of dropping that for the moment...
 if ENABLE_MING
 
-abs_mediadir = $(shell cd $(srcdir)/../media; pwd)
-DEF_MAKESWF_FLAGS=-DMING_VERSION_CODE=$(MING_VERSION_CODE) 
-DMEDIADIR='\"$(abs_mediadir)\"'
+#abs_mediadir = $(shell cd $(srcdir)/../media; pwd)
+DEF_MAKESWF_FLAGS=-DMING_VERSION_CODE=$(MING_VERSION_CODE) -DMEDIADIR="\"`cd 
$(srcdir)/../media; pwd`\""
 
 quickcheck_RUNNERS = \
        alltests-v5-Runner \

Index: testsuite/misc-swfc.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/Makefile.am,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- testsuite/misc-swfc.all/Makefile.am 7 Dec 2007 14:16:12 -0000       1.22
+++ testsuite/misc-swfc.all/Makefile.am 10 Dec 2007 17:45:33 -0000      1.23
@@ -49,11 +49,11 @@
            $(NULL)
 
 
-EXTRA_DIST = $(SCTESTS) $(AUXMOVIES) check.sc Dejagnu.sc
+EXTRA_DIST = $(SCTESTS) $(AUXMOVIES) check.sc Dejagnu.sc hello.sc
 
 if ENABLE_SWFC
 
-abs_mediadir = $(shell cd $(srcdir)/../media; pwd)
+abs_mediadir = `cd $(srcdir)/../media; pwd`
 
 #SWFC = swfc # this is set by ./configure
 SWFC_FLAGS = 

Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -b -r1.114 -r1.115
--- gui/Makefile.am     1 Dec 2007 23:21:46 -0000       1.114
+++ gui/Makefile.am     10 Dec 2007 17:45:33 -0000      1.115
@@ -174,7 +174,7 @@
 
 if BUILD_AQUA_GUI
 BUILT_SOURCES += bundle
-EXTRA_DIST += Gnash.app
+EXTRA_DIST += Gnash.app am-frag
 endif
 
 # Build the QTOPIA gui

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5118
retrieving revision 1.5119
diff -u -b -r1.5118 -r1.5119
--- ChangeLog   10 Dec 2007 16:18:24 -0000      1.5118
+++ ChangeLog   10 Dec 2007 17:45:34 -0000      1.5119
@@ -1,3 +1,18 @@
+2007-12-10  Rob Savoye  <address@hidden>
+
+       * libbase/image.h: Include boost/cstdint.hpp to get uint8_t in a
+       portable fashion.
+       * gui/Makefile.am: Add am-frag to EXTRA_DIST.   
+       * libbase/log.cpp: Make hexify() handle CR/LF better. Cleanup the
+       output to handle pure binary files.
+       * asobj/Sound.cpp: Include sound_handler.h.
+       * testsuite/Makefile.am: Cleanup non POSIX variable name
+       warnings.
+       * testsuite/actionscript.all/Makefile.am: Cleanup non POSIX
+       variable name warnings. 
+       * testsuite/misc-swfc.all/Makefile.am: Cleanup non POSIX variable
+       name warnings.
+
 2007-12-10 Sandro Santilli <address@hidden>
 
        * server/timers.h: _start must be a long.