From a662234f252c660dcf4e30eff69058aff4f0040a Mon Sep 17 00:00:00 2001 From: bbowman Date: Mon, 28 Nov 2016 15:55:56 -0800 Subject: [PATCH 1/3] Fix issue with pointers in CAF decoder (#1468) --- Frameworks/AudioToolbox/CAFDecoder.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Frameworks/AudioToolbox/CAFDecoder.mm b/Frameworks/AudioToolbox/CAFDecoder.mm index dc5ce65323..5452a82d80 100644 --- a/Frameworks/AudioToolbox/CAFDecoder.mm +++ b/Frameworks/AudioToolbox/CAFDecoder.mm @@ -200,7 +200,7 @@ uint64_t int64Swap(uint64_t val) { if (isPcm) { NSInteger result = - [stream read:(uint8_t*)&outOutputData maxLength:(cafDesc.mBytesPerPacket * (ioOutputDataByteSize / cafDesc.mBytesPerPacket))]; + [stream read:(uint8_t*)outOutputData maxLength:(cafDesc.mBytesPerPacket * (ioOutputDataByteSize / cafDesc.mBytesPerPacket))]; ioNumberPackets = (result / cafDesc.mBytesPerPacket); ioOutputDataByteSize = result; return; From 39c014e253a445d5847789042119ef4115cf7001 Mon Sep 17 00:00:00 2001 From: bbowman Date: Mon, 28 Nov 2016 15:55:56 -0800 Subject: [PATCH 2/3] Fix issue with pointers in CAF decoder (#1468) --- build/winobjc.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/winobjc.version b/build/winobjc.version index eace59efda..0950e406d4 100644 --- a/build/winobjc.version +++ b/build/winobjc.version @@ -1,4 +1,4 @@ # MAJOR.MINOR.BUILD.REVISION # BUILD = YYMM # REVISION = DD -0.2.1612.21 +0.2.1612.30 From 4ade99446b84f73c48413d6faa2b361fcc5083ca Mon Sep 17 00:00:00 2001 From: yiyang-msft Date: Tue, 29 Nov 2016 19:36:43 -0800 Subject: [PATCH 3/3] Fix [GitHub Issue #1451] Canabalt [ARM-x86]: blocked at splash screen (#1471) * Fix [GitHub Issue #1451] Canabalt [ARM-x86]: blocked at splash screen * comments --- Frameworks/QuartzCore/CALayer.mm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Frameworks/QuartzCore/CALayer.mm b/Frameworks/QuartzCore/CALayer.mm index d5cb20d1ce..f1800392fb 100644 --- a/Frameworks/QuartzCore/CALayer.mm +++ b/Frameworks/QuartzCore/CALayer.mm @@ -802,13 +802,11 @@ - (void)removeFromSuperlayer { return; } - CALayer* oursuper = priv->superlayer; - // If our layer is visible, order all subviews out bool isVisible = false; CALayer* curLayer = self; - CALayer* pSuper = (CALayer*)priv->superlayer; + CALayer* superLayer = (CALayer*)priv->superlayer; CALayer* nextSuper = curLayer->priv->superlayer; priv->superlayer = 0; @@ -832,7 +830,9 @@ - (void)removeFromSuperlayer { [CATransaction _removeLayer:self]; - pSuper->priv->removeChild(self); + superLayer->priv->removeChild(self); + + [superLayer setNeedsLayout]; [self release]; }