Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6af8936b authored by Keisuke Kuroyanagi's avatar Keisuke Kuroyanagi Committed by Android Git Automerger
Browse files

am ebe3b3e8: Merge "Fix bug related to dynamic patricia trie bigram adding." 

* commit 'ebe3b3e8':
  Fix bug related to dynamic patricia trie bigram adding.
parents dc2cc821 ebe3b3e8

native/jni/src/suggest/policyimpl/dictionary/dynamic_patricia_trie_node_reader.cpp

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ void DynamicPatriciaTrieNodeReader::fetchNodeInfoFromBufferAndProcessMovedNode(c 
        mChildrenPosFieldPos += mBuffer->getOriginalBufferSize();

    }

    mChildrenPos = DynamicPatriciaTrieReadingUtils::readChildrenPositionAndAdvancePosition(

            dictBuf, mFlags, &pos);

            dictBuf, &pos);

    if (usesAdditionalBuffer && mChildrenPos != NOT_A_DICT_POS) {

        mChildrenPos += mBuffer->getOriginalBufferSize();

    }

native/jni/src/suggest/policyimpl/dictionary/dynamic_patricia_trie_reading_utils.cpp

+7 −11
Original line number Diff line number Diff line
@@ -29,8 +29,7 @@ const DptReadingUtils::NodeFlags DptReadingUtils::FLAG_IS_MOVED = 0x40; 
const DptReadingUtils::NodeFlags DptReadingUtils::FLAG_IS_DELETED = 0x80;



/* static */ int DptReadingUtils::readChildrenPositionAndAdvancePosition(

        const uint8_t *const buffer, const NodeFlags flags, int *const pos) {

    if ((flags & MASK_MOVED) == FLAG_IS_NOT_MOVED) {

        const uint8_t *const buffer, int *const pos) {

    const int base = *pos;

    const int offset = ByteArrayUtils::readSint24AndAdvancePosition(buffer, pos);

    if (offset == 0) {
@@ -39,9 +38,6 @@ const DptReadingUtils::NodeFlags DptReadingUtils::FLAG_IS_DELETED = 0x80; 
    } else {

        return base + offset;

    }

    } else {

        return NOT_A_DICT_POS;

    }

}



} // namespace latinime

native/jni/src/suggest/policyimpl/dictionary/dynamic_patricia_trie_reading_utils.h

+1 −2
Original line number Diff line number Diff line
@@ -42,8 +42,7 @@ class DynamicPatriciaTrieReadingUtils { 
        return ByteArrayUtils::readSint24AndAdvancePosition(buffer, pos);

    }



    static int readChildrenPositionAndAdvancePosition(const uint8_t *const buffer,

            const NodeFlags flags, int *const pos);

    static int readChildrenPositionAndAdvancePosition(const uint8_t *const buffer, int *const pos);



    /**

     * Node Flags

native/jni/src/suggest/policyimpl/dictionary/utils/byte_array_utils.h

+1 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ class ByteArrayUtils { 
        int codePoint = readCodePointAndAdvancePosition(buffer, pos);

        while (NOT_A_CODE_POINT != codePoint && length < maxLength) {

            codePoint = readCodePointAndAdvancePosition(buffer, pos);

            length++;

        }

        return length;

    }