Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Frameworks/AudioToolbox/CAFDecoder.mm
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions Frameworks/QuartzCore/CALayer.mm
Original file line number Diff line number Diff line change
Expand Up @@ -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;

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

[CATransaction _removeLayer:self];

pSuper->priv->removeChild(self);
superLayer->priv->removeChild(self);

[superLayer setNeedsLayout];
[self release];
}

Expand Down
2 changes: 1 addition & 1 deletion build/winobjc.version
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# MAJOR.MINOR.BUILD.REVISION
# BUILD = YYMM
# REVISION = DD
0.2.1612.21
0.2.1612.30