[Gnash-commit] gnash libmedia/ffmpeg/AudioDecoderFfmpeg.cpp Ch...

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  08/06/13 21:47:22

Modified files:
        libmedia/ffmpeg: AudioDecoderFfmpeg.cpp 
        .              : ChangeLog 

Log message:
        Fixed typecasting for std::max

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6924&r2=1.6925

Patches:
Index: libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- libmedia/ffmpeg/AudioDecoderFfmpeg.cpp      11 Jun 2008 18:53:29 -0000      
1.11
+++ libmedia/ffmpeg/AudioDecoderFfmpeg.cpp      13 Jun 2008 21:47:21 -0000      
1.12
@@ -20,7 +20,7 @@
 
 #include "AudioDecoderFfmpeg.h"
 #include <cmath> // for std::ceil
-#include <algorithm> // for std::copy
+#include <algorithm> // for std::copy, std::max
 
 //#define GNASH_DEBUG_AUDIO_DECODING
 
@@ -268,7 +268,7 @@
                }
 
 #ifdef GNASH_DEBUG_AUDIO_DECODING
-               log_debug("   decoded frame is %d bytes, would grow return 
buffer size to %d bytes", outSize, retBufSize+(unsigned)outSize);
+               log_debug("   decoded frame is %d bytes, would grow return 
buffer size to %d bytes", outSize, retBufSize+static_cast<unsigned 
int>(outSize));
 #endif // GNASH_DEBUG_AUDIO_DECODING
 
                //
@@ -284,7 +284,7 @@
                                retBufSize+(unsigned)outSize, retCapacity);
 #endif // GNASH_DEBUG_AUDIO_DECODING
                        boost::uint8_t* tmp = retBuf;
-                       retCapacity = std::max(retBufSize+(unsigned)outSize, 
retCapacity*2);
+                       retCapacity = 
std::max(retBufSize+static_cast<size_t>(outSize), retCapacity*2);
 #ifdef GNASH_DEBUG_AUDIO_DECODING
                        log_debug("    reallocating it to hold up to %d bytes", 
retCapacity);
 #endif // GNASH_DEBUG_AUDIO_DECODING
@@ -293,7 +293,7 @@
                        delete [] tmp;
                }
                std::copy(outBuf, outBuf+outSize, retBuf+retBufSize);
-               retBufSize+=(unsigned)outSize;
+               retBufSize += static_cast<unsigned int>(outSize);
        }
 
        

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6924
retrieving revision 1.6925
diff -u -b -r1.6924 -r1.6925
--- ChangeLog   13 Jun 2008 20:06:47 -0000      1.6924
+++ ChangeLog   13 Jun 2008 21:47:22 -0000      1.6925
@@ -1,3 +1,8 @@
+2008-03-13 Markus Gothe <address@hidden>
+
+       * libmedia/ffmpeg/AudioDecoderFfmpeg.cpp: Fixed typecasting for 
+         std::max().
+ 
 2008-06-13 Benjamin Wolsey <address@hidden>
 
        * server/vm/ActionExec.h, server/vm/ASHandlers.cpp: drop stack depth