[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1653-ga7500b4

[Bastiaan Jacques]

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  a7500b465168d9db68fdae74ea9cc596060687b5 (commit)
       via  ec799cee0d1a5cddf71013b1101bbfc9050de8a0 (commit)
      from  9c9fde8028519206d6f4f2e2f826863b916df8b2 (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=a7500b465168d9db68fdae74ea9cc596060687b5


commit a7500b465168d9db68fdae74ea9cc596060687b5
Author: Bastiaan Jacques <address@hidden>
Date:   Wed Jul 10 11:30:09 2013 +0200

    Savannah #33760 p2. Attempt at fixing the test to run it deterministically.

diff --git a/testsuite/actionscript.all/Sound.as 
b/testsuite/actionscript.all/Sound.as
index c51fe17..ed06e96 100644
--- a/testsuite/actionscript.all/Sound.as
+++ b/testsuite/actionscript.all/Sound.as
@@ -157,11 +157,6 @@ mp3.onID3 = function() {
 };
 mp3.loadSound(MEDIA(stereo8.mp3), false);
 
-// Test for #33760:
-// Try to load an mp3 sound (without any tags) that is longer than the
-// (at the time of writing) hard-coded single minute of buffer time.
-longsilence = new Sound();
-longsilence.loadSound(MEDIA(silence.mp3), true);
 
 #endif
 
@@ -306,14 +301,25 @@ s.onSoundComplete = function()
     check_equals(typeof(s.onLoadArg), 'boolean');
     check_equals(s.onLoadArg, true);
 
-    // Test for #33760, continued: Having this test here is a hack, but the
-    // delay in calling this function will ensure the sound has started.
-    check(longsilence.position > 0);
+    // Test for #33760:
+    // Try to load an mp3 sound (without any tags) that is longer than the
+    // (at the time of writing) hard-coded single minute of buffer time.
+    longsilence = new Sound();
+    longsilence.onLoad = function(success) {
+        // Test for #33760, continued: Having this test here is a hack, but the
+        // delay in calling this function will ensure the sound has started.
+        check(longsilence.position > 0);
+
+        endOfTest();
+    };
+
+    longsilence.loadSound(MEDIA(silence.mp3), true);
+
+    stop();
 
     // TODO: test non-streaming sound 
     // TODO: test loadSound on unexistent sound 
 
-    endOfTest();
 };
 
 s.onLoad = function(arg)

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


commit ec799cee0d1a5cddf71013b1101bbfc9050de8a0
Author: Bastiaan Jacques <address@hidden>
Date:   Wed Jul 10 01:15:02 2013 +0200

    Remove some useless casts.

diff --git a/libbase/GnashNumeric.h b/libbase/GnashNumeric.h
index f172789..43f7c0f 100644
--- a/libbase/GnashNumeric.h
+++ b/libbase/GnashNumeric.h
@@ -86,7 +86,7 @@ frnd(float f)
 inline double
 twipsToPixels(int i) 
 { 
-    return static_cast<double>(i / 20.0); 
+    return i / 20.0;
 }
 
 template<size_t Factor>
diff --git a/libbase/Range2d.h b/libbase/Range2d.h
index ed81b3f..c1cac0b 100644
--- a/libbase/Range2d.h
+++ b/libbase/Range2d.h
@@ -809,7 +809,7 @@ Range2d<int>::roundMax(float max) const
 template<> inline unsigned int
 Range2d<unsigned int>::roundMax(float max) const
 {
-       return static_cast<unsigned int>(std::ceil(static_cast<float>(max)));
+       return static_cast<unsigned int>(std::ceil(max));
 }
 
 /// Specialization of area value for int type.
diff --git a/libcore/asobj/flash/external/ExternalInterface_as.cpp 
b/libcore/asobj/flash/external/ExternalInterface_as.cpp
index dfb5769..f13993f 100644
--- a/libcore/asobj/flash/external/ExternalInterface_as.cpp
+++ b/libcore/asobj/flash/external/ExternalInterface_as.cpp
@@ -275,7 +275,7 @@ externalinterface_call(const fn_call& fn)
     if (mr.getControlFD() <= 0) {
         log_debug("ExternalInterface not accessible on call.");
         val.set_null();
-        return as_value(val);
+        return val;
     }
 
     if (fn.nargs > 1) {
diff --git a/libcore/parser/action_buffer.h b/libcore/parser/action_buffer.h
index 883d440..4cdd729 100644
--- a/libcore/parser/action_buffer.h
+++ b/libcore/parser/action_buffer.h
@@ -94,8 +94,8 @@ public:
     /// Get a pointer to the current instruction within the code
        const unsigned char* getFramePointer(size_t pc) const
        {
-           assert (pc < m_buffer.size());
-               return reinterpret_cast<const unsigned char*>(&m_buffer.at(pc));
+               assert (pc < m_buffer.size());
+               return &m_buffer.at(pc);
        }
 
        /// Get a signed integer value from given offset

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

Summary of changes:
 libbase/GnashNumeric.h                             |    2 +-
 libbase/Range2d.h                                  |    2 +-
 .../asobj/flash/external/ExternalInterface_as.cpp  |    2 +-
 libcore/parser/action_buffer.h                     |    4 +-
 testsuite/actionscript.all/Sound.as                |   24 ++++++++++++-------
 5 files changed, 20 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
Gnash