You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by yi...@apache.org on 2016/08/30 11:27:17 UTC
[1/2] git commit: [flex-asjs] [refs/heads/refactor-sprite] - Update
length of BinaryData after writing bytes.
Repository: flex-asjs
Updated Branches:
refs/heads/refactor-sprite 76ae81dbe -> 38591297b
Update length of BinaryData after writing bytes.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/9e316fb6
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/9e316fb6
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/9e316fb6
Branch: refs/heads/refactor-sprite
Commit: 9e316fb61902fe869342adb20566903f8546b66c
Parents: 04c201f
Author: yishayw <yi...@hotmail.com>
Authored: Tue Aug 30 14:24:33 2016 +0300
Committer: yishayw <yi...@hotmail.com>
Committed: Tue Aug 30 14:24:33 2016 +0300
----------------------------------------------------------------------
.../Core/src/main/flex/org/apache/flex/utils/BinaryData.as | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9e316fb6/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/BinaryData.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/BinaryData.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/BinaryData.as
index 1b9cfda..2a16e0a 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/BinaryData.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/BinaryData.as
@@ -1059,17 +1059,19 @@ public class BinaryData implements IBinaryDataInput, IBinaryDataOutput
private function mergeInToArrayBuffer(offset:uint, newBytes:Uint8Array):uint {
var newContentLength:uint = newBytes.length;
var dest:Uint8Array;
- if (offset + newContentLength > _len) {
+ var mergeUpperBound:uint = offset + newContentLength
+ if (mergeUpperBound > _len) {
dest = new Uint8Array(offset + newContentLength);
dest.set(new Uint8Array(ba, 0, offset));
dest.set(newBytes, offset);
ba = dest.buffer;
_typedArray = dest;
+ _len = mergeUpperBound;
} else {
dest = new Uint8Array(ba, offset, newContentLength);
dest.set(newBytes);
}
- return offset + newContentLength;
+ return mergeUpperBound;
}
COMPILE::JS
[2/2] git commit: [flex-asjs] [refs/heads/refactor-sprite] - Merge
branch 'refactor-sprite' of https://git-wip-us.apache.org/repos/asf/flex-asjs
into refactor-sprite
Posted by yi...@apache.org.
Merge branch 'refactor-sprite' of https://git-wip-us.apache.org/repos/asf/flex-asjs into refactor-sprite
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/38591297
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/38591297
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/38591297
Branch: refs/heads/refactor-sprite
Commit: 38591297bcfc1ff13ef1edb9473791eb17b2a2fa
Parents: 9e316fb 76ae81d
Author: yishayw <yi...@hotmail.com>
Authored: Tue Aug 30 14:27:04 2016 +0300
Committer: yishayw <yi...@hotmail.com>
Committed: Tue Aug 30 14:27:04 2016 +0300
----------------------------------------------------------------------
frameworks/projects/XML/src/main/flex/XML.as | 15 +++++++++++++++
frameworks/projects/XML/src/main/flex/XMLList.as | 7 +++++--
2 files changed, 20 insertions(+), 2 deletions(-)
----------------------------------------------------------------------