[Gnash-commit] [SCM] Gnash branch, master, updated. a6e1f2e64615749dea1d4682e60cf54c69f17f00

[Sandro Santilli]

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

The branch, master has been updated
       via  a6e1f2e64615749dea1d4682e60cf54c69f17f00 (commit)
       via  b3d5da01fbf3a4b3d3bc0fee14ddd87f994811d5 (commit)
       via  97dfba07637429be7ba87a04fc8753316de994da (commit)
       via  ac6a1d7229b61ecd3f5243453f5841514f27ab72 (commit)
       via  3bb50cb24d7eb4b4e492b752c098efe09d6a02e8 (commit)
       via  9cc0786b3e4c04dfedef47acd81f0815b1499306 (commit)
       via  d02534101979b89ff282ceda6e5174da86230665 (commit)
      from  2e57a690e316ef29cbabd44cce9021eb9d543a6e (commit)

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

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


commit a6e1f2e64615749dea1d4682e60cf54c69f17f00
Merge: b3d5da0 2e57a69
Author: Sandro Santilli <address@hidden>
Date:   Wed Sep 8 18:50:41 2010 +0200

    Merge branch 'master' of ssh://address@hidden/srv/git/gnash


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


commit b3d5da01fbf3a4b3d3bc0fee14ddd87f994811d5
Author: Sandro Santilli <address@hidden>
Date:   Wed Sep 8 18:49:51 2010 +0200

    Use exact-size integers for WAV header (see bug #30993)

diff --git a/libsound/sdl/sound_handler_sdl.cpp 
b/libsound/sdl/sound_handler_sdl.cpp
index 9242df3..81aefb3 100644
--- a/libsound/sdl/sound_handler_sdl.cpp
+++ b/libsound/sdl/sound_handler_sdl.cpp
@@ -31,6 +31,7 @@
 
 #include <vector>
 #include <boost/scoped_array.hpp>
+#include <boost/cstdint.hpp>
 #include <SDL.h>
 
 // Define this to get debugging call about pausing/unpausing audio
@@ -45,23 +46,23 @@ namespace { // anonymous
 // http://ftp.iptel.org/pub/sems/doc/full/current/wav__hdr_8c-source.html
 typedef struct{
      char rID[4];            // 'RIFF'
-     long int rLen;        
+     boost::uint32_t rLen;        
      char wID[4];            // 'WAVE'
      char fId[4];            // 'fmt '
-     long int pcm_header_len;   // varies...
-     short int wFormatTag;
-     short int nChannels;      // 1,2 for stereo data is (l,r) pairs
-     long int nSamplesPerSec;
-     long int nAvgBytesPerSec;
-     short int nBlockAlign;      
-     short int nBitsPerSample;
+     boost::uint32_t pcm_header_len;   // varies...
+     boost::int16_t wFormatTag;
+     boost::int16_t nChannels;      // 1,2 for stereo data is (l,r) pairs
+     boost::uint32_t nSamplesPerSec;
+     boost::uint32_t nAvgBytesPerSec;
+     boost::int16_t nBlockAlign;      
+     boost::int16_t nBitsPerSample;
 } WAV_HDR;
 
 // Chunk of wave file
 // http://ftp.iptel.org/pub/sems/doc/full/current/wav__hdr_8c-source.html
 typedef struct{
     char dId[4];            // 'data' or 'fact'
-    long int dLen;
+    boost::uint32_t dLen;
 } CHUNK_HDR;
 
 } // end of anonymous namespace

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


commit 97dfba07637429be7ba87a04fc8753316de994da
Merge: ac6a1d7 146c5d7
Author: Sandro Santilli <address@hidden>
Date:   Wed Sep 8 00:15:13 2010 +0200

    Merge branch 'master' of ssh://address@hidden/srv/git/gnash


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


commit ac6a1d7229b61ecd3f5243453f5841514f27ab72
Merge: 3bb50cb c1848f9
Author: Sandro Santilli <address@hidden>
Date:   Fri Aug 27 22:02:21 2010 +0200

    Merge branch 'master' of ssh://address@hidden/srv/git/gnash


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


commit 3bb50cb24d7eb4b4e492b752c098efe09d6a02e8
Merge: 9cc0786 e542b0e
Author: Sandro Santilli <address@hidden>
Date:   Thu Aug 26 19:05:00 2010 +0200

    Merge branch 'master' of ssh://address@hidden/srv/git/gnash


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


commit 9cc0786b3e4c04dfedef47acd81f0815b1499306
Author: Sandro Santilli <address@hidden>
Date:   Thu Aug 26 00:51:21 2010 +0200

    Hush a couple of compiler warnings

diff --git a/testsuite/misc-ming.all/RemoveObject2Test.c 
b/testsuite/misc-ming.all/RemoveObject2Test.c
index 97657d6..077349c 100644
--- a/testsuite/misc-ming.all/RemoveObject2Test.c
+++ b/testsuite/misc-ming.all/RemoveObject2Test.c
@@ -30,7 +30,7 @@
 #define OUTPUT_VERSION 6
 #define OUTPUT_FILENAME "RemoveObject2Test.swf"
 
-SWFShape
+static SWFShape
 make_square(int x, int y, int width, int height, byte r, byte g, byte b)
 {
        SWFShape sh = newSWFShape();
@@ -45,13 +45,15 @@ make_square(int x, int y, int width, int height, byte r, 
byte g, byte b)
 }
 
 int
-main(int argc, char **argv)
+main(int argc, char ** argv)
 {
        SWFMovie mo;
        SWFDisplayItem it1, it2, it3;
        SWFShape sh1, sh2, sh3;
        int framenum;
 
+       argc=argc; argv=argv; /* unused... */
+
        /*********************************************
         *
         * Initialization

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


commit d02534101979b89ff282ceda6e5174da86230665
Author: Sandro Santilli <address@hidden>
Date:   Thu Aug 26 00:44:19 2010 +0200

    Don't use abort when willing to exit with an error... (hushes a warning 
aout abort() not being defined)

diff --git a/testsuite/misc-ming.all/PlaceObject2Test.c 
b/testsuite/misc-ming.all/PlaceObject2Test.c
index 8e0e228..d03fc00 100644
--- a/testsuite/misc-ming.all/PlaceObject2Test.c
+++ b/testsuite/misc-ming.all/PlaceObject2Test.c
@@ -123,7 +123,7 @@ main(int argc, char** argv)
   // replace the shape with another one
   if ( SWFMovie_replace(mo, it1, (SWFBlock)sh2) )
   {
-    abort(); 
+    return 1;
   }
   SWFMovie_nextFrame(mo); // frame 6
   

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

Summary of changes:
 libsound/sdl/sound_handler_sdl.cpp          |   19 ++++++++++---------
 testsuite/misc-ming.all/PlaceObject2Test.c  |    2 +-
 testsuite/misc-ming.all/RemoveObject2Test.c |    6 ++++--
 3 files changed, 15 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
Gnash