diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-07-27 18:48:17 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-07-27 18:48:17 +0000 |
commit | 7111fd83f91cefa3b8db18bb2bb8fd3f7eaa7a13 (patch) | |
tree | 8b7f907f1d4556f9a75c1e612dc7b7335f37bb61 | |
parent | 409ae3271a77ab26a4f3038c8bb117870f84e36e (diff) | |
parent | 86a561f79f97baa38e240f6296fe1192fa4a5c9c (diff) | |
download | neven-pie-r2-release.tar.gz |
Merge cherrypicks of [4647037, 4647038, 4647883, 4647039, 4647933, 4648530, 4648550, 4648551, 4648552, 4648553, 4646931, 4646932, 4646933, 4646934, 4648391, 4647976, 4647977, 4647978, 4647526, 4646972, 4646935, 4646936, 4646937, 4646938, 4646939, 4646940, 4646941, 4648392, 4647509, 4648630, 4648631, 4647934] into pi-release-2android-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-9.0.0_r8android-9.0.0_r7android-9.0.0_r6android-9.0.0_r18android-9.0.0_r10pie-release-2pie-r2-s2-releasepie-r2-s1-releasepie-r2-release
Change-Id: Idbf101318613fdd4e050a9f3f9ea20b3e3b3cca6
-rw-r--r-- | Embedded/common/src/b_BitFeatureEm/Scanner.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Embedded/common/src/b_BitFeatureEm/Scanner.c b/Embedded/common/src/b_BitFeatureEm/Scanner.c index 327e714..1a0ae2a 100644 --- a/Embedded/common/src/b_BitFeatureEm/Scanner.c +++ b/Embedded/common/src/b_BitFeatureEm/Scanner.c @@ -1064,7 +1064,7 @@ void bbf_Scanner_addOutPos( struct bbs_Context* cpA, uint32 scaleA, int32 actA ) { - if( ( ptrA->outCountE * 4 ) < ptrA->outArrE.sizeE ) + if( ( ptrA->outCountE * 4 + 3 ) < ptrA->outArrE.sizeE ) { ptrA->outArrE.arrPtrE[ ptrA->outCountE * 4 + 0 ] = xA; ptrA->outArrE.arrPtrE[ ptrA->outCountE * 4 + 1 ] = yA; |