nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 082507e1: Header clean up 

* commit '082507e1da56c6cefe575ec3d6a334e9b717e3fa':
  Header clean up
main
Ken Wakasa 2012-12-10 06:46:12 -08:00 committed by Android Git Automerger
parent dcf3ac9179 082507e1da
commit 97e4b52380
7 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
native/jni/src/defines.h
View File

@ -17,8 +17,6 @@
#ifndef LATINIME_DEFINES_H #ifndef LATINIME_DEFINES_H
#define LATINIME_DEFINES_H #define LATINIME_DEFINES_H
#include <stdint.h>
#ifdef __GNUC__ #ifdef __GNUC__
#define AK_FORCE_INLINE __attribute__((always_inline)) __inline__ #define AK_FORCE_INLINE __attribute__((always_inline)) __inline__
#else // __GNUC__ #else // __GNUC__

2
native/jni/src/dic_traverse_wrapper.h
View File

@ -17,8 +17,6 @@
#ifndef LATINIME_DIC_TRAVERSE_WRAPPER_H #ifndef LATINIME_DIC_TRAVERSE_WRAPPER_H
#define LATINIME_DIC_TRAVERSE_WRAPPER_H #define LATINIME_DIC_TRAVERSE_WRAPPER_H
#include <stdint.h>
#include "defines.h" #include "defines.h"
#include "jni.h" #include "jni.h"

1
native/jni/src/gesture/gesture_decoder_wrapper.h
View File

@ -17,7 +17,6 @@
#ifndef LATINIME_GESTURE_DECODER_WRAPPER_H #ifndef LATINIME_GESTURE_DECODER_WRAPPER_H
#define LATINIME_GESTURE_DECODER_WRAPPER_H #define LATINIME_GESTURE_DECODER_WRAPPER_H
#include <stdint.h>
#include "defines.h" #include "defines.h"
#include "incremental_decoder_interface.h" #include "incremental_decoder_interface.h"

1
native/jni/src/gesture/incremental_decoder_interface.h
View File

@ -17,7 +17,6 @@
#ifndef LATINIME_INCREMENTAL_DECODER_INTERFACE_H #ifndef LATINIME_INCREMENTAL_DECODER_INTERFACE_H
#define LATINIME_INCREMENTAL_DECODER_INTERFACE_H #define LATINIME_INCREMENTAL_DECODER_INTERFACE_H
#include <stdint.h>
#include "defines.h" #include "defines.h"
namespace latinime { namespace latinime {

1
native/jni/src/gesture/incremental_decoder_wrapper.h
View File

@ -17,7 +17,6 @@
#ifndef LATINIME_INCREMENTAL_DECODER_WRAPPER_H #ifndef LATINIME_INCREMENTAL_DECODER_WRAPPER_H
#define LATINIME_INCREMENTAL_DECODER_WRAPPER_H #define LATINIME_INCREMENTAL_DECODER_WRAPPER_H
#include <stdint.h>
#include "defines.h" #include "defines.h"
#include "incremental_decoder_interface.h" #include "incremental_decoder_interface.h"

7
native/jni/src/proximity_info_state.cpp
View File

@ -16,7 +16,6 @@
#include <cstring> // for memset() #include <cstring> // for memset()
#include <sstream> // for debug prints #include <sstream> // for debug prints
#include <stdint.h>
#define LOG_TAG "LatinIME: proximity_info_state.cpp" #define LOG_TAG "LatinIME: proximity_info_state.cpp"
@ -758,8 +757,8 @@ float ProximityInfoState::calculateSquaredDistanceFromSweetSpotCenter(
} }
// Puts possible characters into filter and returns new filter size. // Puts possible characters into filter and returns new filter size.
int32_t ProximityInfoState::getAllPossibleChars( int ProximityInfoState::getAllPossibleChars(
const size_t index, int32_t *const filter, const int32_t filterSize) const { const size_t index, int *const filter, const int filterSize) const {
if (index >= mSampledInputXs.size()) { if (index >= mSampledInputXs.size()) {
return filterSize; return filterSize;
} }
@ -767,7 +766,7 @@ int32_t ProximityInfoState::getAllPossibleChars(
const int keyCount = mProximityInfo->getKeyCount(); const int keyCount = mProximityInfo->getKeyCount();
for (int j = 0; j < keyCount; ++j) { for (int j = 0; j < keyCount; ++j) {
if (mSearchKeysVector[index].test(j)) { if (mSearchKeysVector[index].test(j)) {
const int32_t keyCodePoint = mProximityInfo->getCodePointOf(j); const int keyCodePoint = mProximityInfo->getCodePointOf(j);
bool insert = true; bool insert = true;
// TODO: Avoid linear search // TODO: Avoid linear search
for (int k = 0; k < filterSize; ++k) { for (int k = 0; k < filterSize; ++k) {

4
native/jni/src/proximity_info_state.h
View File

@ -19,7 +19,6 @@
#include <bitset> #include <bitset>
#include <cstring> // for memset() #include <cstring> // for memset()
#include <stdint.h>
#include <string> #include <string>
#include <vector> #include <vector>
@ -164,8 +163,7 @@ class ProximityInfoState {
int getSpaceY() const; int getSpaceY() const;
int32_t getAllPossibleChars( int getAllPossibleChars(const size_t startIndex, int *const filter, const int filterSize) const;
const size_t startIndex, int32_t *const filter, const int32_t filterSize) const;
float getSpeedRate(const int index) const { float getSpeedRate(const int index) const {
return mSpeedRates[index]; return mSpeedRates[index];