diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2012-08-16 21:18:58 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-08-16 21:18:58 -0700 |
| commit | aca6bef515dcbc6720884760b48c24c83ab25916 (patch) | |
| tree | 611669fcde3c5524761692306b1d16eb404f070d /native/jni/src/binary_format.h | |
| parent | 667108d71d42d599a06a2075c75bc514ee8e682c (diff) | |
| parent | 99927f865faff5a9f31de315620447fd963f3dff (diff) | |
| download | latinime-aca6bef515dcbc6720884760b48c24c83ab25916.tar.gz latinime-aca6bef515dcbc6720884760b48c24c83ab25916.tar.xz latinime-aca6bef515dcbc6720884760b48c24c83ab25916.zip | |
am 99927f86: am de8a9a82: Small cleanups
* commit '99927f865faff5a9f31de315620447fd963f3dff':
Small cleanups
Diffstat (limited to 'native/jni/src/binary_format.h')
| -rw-r--r-- | native/jni/src/binary_format.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/native/jni/src/binary_format.h b/native/jni/src/binary_format.h index 4cabc8404..d8f3e83dd 100644 --- a/native/jni/src/binary_format.h +++ b/native/jni/src/binary_format.h @@ -61,13 +61,6 @@ class BinaryFormat { static const int FLAG_ATTRIBUTE_ADDRESS_TYPE_TWOBYTES = 0x20; static const int FLAG_ATTRIBUTE_ADDRESS_TYPE_THREEBYTES = 0x30; - private: - DISALLOW_IMPLICIT_CONSTRUCTORS(BinaryFormat); - const static int32_t MINIMAL_ONE_BYTE_CHARACTER_VALUE = 0x20; - const static int32_t CHARACTER_ARRAY_TERMINATOR = 0x1F; - const static int MULTIPLE_BYTE_CHARACTER_ADDITIONAL_SIZE = 2; - - public: const static int UNKNOWN_FORMAT = -1; // Originally, format version 1 had a 16-bit magic number, then the version number `01' // then options that must be 0. Hence the first 32-bits of the format are always as follow @@ -94,7 +87,6 @@ class BinaryFormat { static int skipFrequency(const uint8_t flags, const int pos); static int skipShortcuts(const uint8_t *const dict, const uint8_t flags, const int pos); static int skipBigrams(const uint8_t *const dict, const uint8_t flags, const int pos); - static int skipAllAttributes(const uint8_t *const dict, const uint8_t flags, const int pos); static int skipChildrenPosAndAttributes(const uint8_t *const dict, const uint8_t flags, const int pos); static int readChildrenPosition(const uint8_t *const dict, const uint8_t flags, const int pos); @@ -118,6 +110,13 @@ class BinaryFormat { REQUIRES_FRENCH_LIGATURES_PROCESSING = 0x4 }; const static unsigned int NO_FLAGS = 0; + + private: + DISALLOW_IMPLICIT_CONSTRUCTORS(BinaryFormat); + const static int32_t MINIMAL_ONE_BYTE_CHARACTER_VALUE = 0x20; + const static int32_t CHARACTER_ARRAY_TERMINATOR = 0x1F; + const static int MULTIPLE_BYTE_CHARACTER_ADDITIONAL_SIZE = 2; + static int skipAllAttributes(const uint8_t *const dict, const uint8_t flags, const int pos); }; inline int BinaryFormat::detectFormat(const uint8_t *const dict) { |