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

Commit 2834f522 authored by Ken Wakasa's avatar Ken Wakasa Committed by Android (Google) Code Review
Browse files

Merge "Prep for GCC 4.6 that will be used in unbundled branches"

parents de3e5fbf d74214d7

native/jni/src/proximity_info.h

+4 −3
Original line number Diff line number Diff line
@@ -70,15 +70,16 @@ class ProximityInfo { 
    int getKeyCenterYOfKeyIdG(int keyId) const;

    int getKeyKeyDistanceG(int keyId0, int keyId1) const;



    void initializeProximities(const int *const inputCodes, const int *const inputXCoordinates,

            const int *const inputYCoordinates, const int inputSize, int *allInputCodes) const {

    void AK_FORCE_INLINE initializeProximities(const int *const inputCodes,

            const int *const inputXCoordinates, const int *const inputYCoordinates,

            const int inputSize, int *allInputCodes) const {

        ProximityInfoUtils::initializeProximities(inputCodes, inputXCoordinates, inputYCoordinates,

                inputSize, mKeyXCoordinates, mKeyYCoordinates, mKeyWidths, mKeyHeights,

                mProximityCharsArray, CELL_HEIGHT, CELL_WIDTH, GRID_WIDTH, MOST_COMMON_KEY_WIDTH,

                KEY_COUNT, mLocaleStr, &mCodeToKeyMap, allInputCodes);

    }



    int getKeyIndexOf(const int c) const {

    int AK_FORCE_INLINE getKeyIndexOf(const int c) const {

        return ProximityInfoUtils::getKeyIndexOf(KEY_COUNT, c, &mCodeToKeyMap);

    }

native/jni/src/proximity_info_utils.h

+3 −3
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
namespace latinime {

class ProximityInfoUtils {

 public:

    static int getKeyIndexOf(const int keyCount, const int c,

    static AK_FORCE_INLINE int getKeyIndexOf(const int keyCount, const int c,

            const hash_map_compat<int, int> *const codeToKeyMap) {

        if (keyCount == 0) {

            // We do not have the coordinate data
@@ -45,7 +45,7 @@ class ProximityInfoUtils { 
        return NOT_AN_INDEX;

    }



    static void initializeProximities(const int *const inputCodes,

    static AK_FORCE_INLINE void initializeProximities(const int *const inputCodes,

            const int *const inputXCoordinates, const int *const inputYCoordinates,

            const int inputSize, const int *const keyXCoordinates,

            const int *const keyYCoordinates, const int *const keyWidths, const int *keyHeights,
@@ -151,7 +151,7 @@ class ProximityInfoUtils { 
        return left < right && top < bottom && x >= left && x < right && y >= top && y < bottom;

    }



    static void calculateProximities(const int *const keyXCoordinates,

    static AK_FORCE_INLINE void calculateProximities(const int *const keyXCoordinates,

            const int *const keyYCoordinates, const int *const keyWidths, const int *keyHeights,

            const int *const proximityCharsArray, const int cellHeight, const int cellWidth,

            const int gridWidth, const int mostCommonKeyWidth, const int keyCount,