Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 3a18ee2

Browse files
authored
Merge pull request #1481 from tadam-msft/release_11_30
Release 11 30
2 parents 2e0afaf + 4ade994 commit 3a18ee2

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Frameworks/AudioToolbox/CAFDecoder.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ uint64_t int64Swap(uint64_t val) {
200200

201201
if (isPcm) {
202202
NSInteger result =
203-
[stream read:(uint8_t*)&outOutputData maxLength:(cafDesc.mBytesPerPacket * (ioOutputDataByteSize / cafDesc.mBytesPerPacket))];
203+
[stream read:(uint8_t*)outOutputData maxLength:(cafDesc.mBytesPerPacket * (ioOutputDataByteSize / cafDesc.mBytesPerPacket))];
204204
ioNumberPackets = (result / cafDesc.mBytesPerPacket);
205205
ioOutputDataByteSize = result;
206206
return;

Frameworks/QuartzCore/CALayer.mm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -802,13 +802,11 @@ - (void)removeFromSuperlayer {
802802
return;
803803
}
804804

805-
CALayer* oursuper = priv->superlayer;
806-
807805
// If our layer is visible, order all subviews out
808806
bool isVisible = false;
809807

810808
CALayer* curLayer = self;
811-
CALayer* pSuper = (CALayer*)priv->superlayer;
809+
CALayer* superLayer = (CALayer*)priv->superlayer;
812810
CALayer* nextSuper = curLayer->priv->superlayer;
813811
priv->superlayer = 0;
814812

@@ -832,7 +830,9 @@ - (void)removeFromSuperlayer {
832830

833831
[CATransaction _removeLayer:self];
834832

835-
pSuper->priv->removeChild(self);
833+
superLayer->priv->removeChild(self);
834+
835+
[superLayer setNeedsLayout];
836836
[self release];
837837
}
838838

build/winobjc.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# MAJOR.MINOR.BUILD.REVISION
22
# BUILD = YYMM
33
# REVISION = DD
4-
0.2.1612.21
4+
0.2.1612.30

0 commit comments

Comments
 (0)