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

Commit f144cc61 authored by Satoshi Kataoka's avatar Satoshi Kataoka Committed by Android (Google) Code Review
Browse files

Merge "Step 24-A remove setdict" into jb-mr1-dev

parents 2d0cd582 ddb12ea6

native/jni/src/dictionary.cpp

+0 −2
Original line number Diff line number Diff line
@@ -47,8 +47,6 @@ Dictionary::Dictionary(void *dict, int dictSize, int mmapFd, int dictBufAdjust, 
            fullWordMultiplier, maxWordLength, maxWords, options);

    mBigramDictionary = new BigramDictionary(mOffsetDict, maxWordLength, maxPredictions);

    mGestureDecoder = new GestureDecoderWrapper(maxWordLength, maxWords);

    mGestureDecoder->setDict(mUnigramDictionary, mBigramDictionary,

            mOffsetDict /* dict root */, 0 /* root pos */);

}



Dictionary::~Dictionary() {

native/jni/src/gesture/gesture_decoder_wrapper.h

+0 −8
Original line number Diff line number Diff line
@@ -48,14 +48,6 @@ class GestureDecoderWrapper : public IncrementalDecoderInterface { 
                inputSize, commitPoint, outWords, frequencies, outputIndices, outputTypes);

    }



    void setDict(const UnigramDictionary *dict, const BigramDictionary *bigram,

            const uint8_t *dictRoot, int rootPos) {

        if (!mIncrementalDecoderInterface) {

            return;

        }

        mIncrementalDecoderInterface->setDict(dict, bigram, dictRoot, rootPos);

    }



    static void setGestureDecoderFactoryMethod(

            IncrementalDecoderInterface *(*factoryMethod)(int, int)) {

        sGestureDecoderFactoryMethod = factoryMethod;

native/jni/src/gesture/incremental_decoder_interface.h

+0 −2
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ class IncrementalDecoderInterface { 
            int *inputXs, int *inputYs, int *times, int *pointerIds, int *codes,

            int inputSize, int commitPoint, unsigned short *outWords, int *frequencies,

            int *outputIndices, int *outputTypes) = 0;

    virtual void setDict(const UnigramDictionary *dict, const BigramDictionary *bigram,

            const uint8_t *dictRoot, int rootPos) = 0;

    IncrementalDecoderInterface() { };

    virtual ~IncrementalDecoderInterface() { };

 private:

native/jni/src/gesture/incremental_decoder_wrapper.h

+0 −8
Original line number Diff line number Diff line
@@ -48,14 +48,6 @@ class IncrementalDecoderWrapper : public IncrementalDecoderInterface { 
                inputSize, commitPoint, outWords, frequencies, outputIndices, outputTypes);

    }



    void setDict(const UnigramDictionary *dict, const BigramDictionary *bigram,

            const uint8_t *dictRoot, int rootPos) {

        if (!mIncrementalDecoderInterface) {

            return;

        }

        mIncrementalDecoderInterface->setDict(dict, bigram, dictRoot, rootPos);

    }



    static void setIncrementalDecoderFactoryMethod(

            IncrementalDecoderInterface *(*factoryMethod)(int, int)) {

        sIncrementalDecoderFactoryMethod = factoryMethod;