aboutsummaryrefslogtreecommitdiffstats
path: root/native/src/binary_format.h
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2012-01-15 23:28:07 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-01-15 23:28:07 -0800
commit06f2692c78e3bda877143885180f8f9ddc541fee (patch)
tree7e5cfeda545a79d79cb7eb374cbd87ec9a9e9812 /native/src/binary_format.h
parent44cf7a12f685eec11232f2dd076e5ea83ee539e4 (diff)
parentfe9dca7ec3814956e6e545c383106156f568d047 (diff)
downloadlatinime-06f2692c78e3bda877143885180f8f9ddc541fee.tar.gz
latinime-06f2692c78e3bda877143885180f8f9ddc541fee.tar.xz
latinime-06f2692c78e3bda877143885180f8f9ddc541fee.zip
am fe9dca7e: Merge "Read multi-byte char group counts"
* commit 'fe9dca7ec3814956e6e545c383106156f568d047': Read multi-byte char group counts
Diffstat (limited to 'native/src/binary_format.h')
-rw-r--r--native/src/binary_format.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/native/src/binary_format.h b/native/src/binary_format.h
index 9944fa2bd..1d74998f6 100644
--- a/native/src/binary_format.h
+++ b/native/src/binary_format.h
@@ -61,7 +61,9 @@ inline int BinaryFormat::detectFormat(const uint8_t* const dict) {
}
inline int BinaryFormat::getGroupCountAndForwardPointer(const uint8_t* const dict, int* pos) {
- return dict[(*pos)++];
+ const int msb = dict[(*pos)++];
+ if (msb < 0x80) return msb;
+ return ((msb & 0x7F) << 8) | dict[(*pos)++];
}
inline uint8_t BinaryFormat::getFlagsAndForwardPointer(const uint8_t* const dict, int* pos) {