Title: [199253] trunk/Source/WebCore
Revision
199253
Author
[email protected]
Date
2016-04-08 15:54:50 -0700 (Fri, 08 Apr 2016)

Log Message

Unreviewed 32-bit build fix; make type of std::min<> explicit.

* platform/audio/ios/AudioDestinationIOS.cpp:
(WebCore::AudioDestinationIOS::render):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (199252 => 199253)


--- trunk/Source/WebCore/ChangeLog	2016-04-08 22:41:46 UTC (rev 199252)
+++ trunk/Source/WebCore/ChangeLog	2016-04-08 22:54:50 UTC (rev 199253)
@@ -1,5 +1,12 @@
 2016-04-08  Jer Noble  <[email protected]>
 
+        Unreviewed 32-bit build fix; make type of std::min<> explicit.
+
+        * platform/audio/ios/AudioDestinationIOS.cpp:
+        (WebCore::AudioDestinationIOS::render):
+
+2016-04-08  Jer Noble  <[email protected]>
+
         CRASH in AudioDestinationNode::render()
         https://bugs.webkit.org/show_bug.cgi?id=156308
 

Modified: trunk/Source/WebCore/platform/audio/ios/AudioDestinationIOS.cpp (199252 => 199253)


--- trunk/Source/WebCore/platform/audio/ios/AudioDestinationIOS.cpp	2016-04-08 22:41:46 UTC (rev 199252)
+++ trunk/Source/WebCore/platform/audio/ios/AudioDestinationIOS.cpp	2016-04-08 22:54:50 UTC (rev 199253)
@@ -220,7 +220,7 @@
     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;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to