Unreviewed 32-bit build fix; make type of std::min<> explicit.
authorjer.noble@apple.com <jer.noble@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 8 Apr 2016 22:54:50 +0000 (22:54 +0000)
committerjer.noble@apple.com <jer.noble@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 8 Apr 2016 22:54:50 +0000 (22:54 +0000)
* platform/audio/ios/AudioDestinationIOS.cpp:
(WebCore::AudioDestinationIOS::render):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@199253 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/audio/ios/AudioDestinationIOS.cpp

index d47919b..794fced 100644 (file)
@@ -1,5 +1,12 @@
 2016-04-08  Jer Noble  <jer.noble@apple.com>
 
+        Unreviewed 32-bit build fix; make type of std::min<> explicit.
+
+        * platform/audio/ios/AudioDestinationIOS.cpp:
+        (WebCore::AudioDestinationIOS::render):
+
+2016-04-08  Jer Noble  <jer.noble@apple.com>
+
         CRASH in AudioDestinationNode::render()
         https://bugs.webkit.org/show_bug.cgi?id=156308
 
index 968098b..2aabc1a 100644 (file)
@@ -220,7 +220,7 @@ OSStatus AudioDestinationIOS::render(UInt32 numberOfFrames, AudioBufferList* ioD
     while (framesRemaining > 0) {
         if (m_startSpareFrame < m_endSpareFrame) {
             ASSERT(m_startSpareFrame < m_endSpareFrame);
-            UInt32 framesThisTime = std::min(m_endSpareFrame - m_startSpareFrame, numberOfFrames);
+            UInt32 framesThisTime = std::min<UInt32>(m_endSpareFrame - m_startSpareFrame, numberOfFrames);
             assignAudioBuffersToBus(buffers, *m_renderBus, numberOfBuffers, numberOfFrames, frameOffset, framesThisTime);
             m_renderBus->copyFromRange(*m_spareBus, m_startSpareFrame, m_endSpareFrame);
             frameOffset += framesThisTime;