diff options
| author |   satok <satok@google.com> | 2012-06-13 16:25:57 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2012-06-13 16:25:57 -0700 |
| commit | 9ada9f1bddc953453ca609610298ead9fe864e52 (patch) | |
| tree | fb782087dc97abc3cd36a7cb9e1b12bb1429a142 | |
| parent | 6fa7ee3d3ab6543dbe372ae9df092c2c5badd3e8 (diff) | |
| parent | 1035bc990d9d704d8cf1002548e5dddb3ba96797 (diff) | |
| download | latinime-9ada9f1bddc953453ca609610298ead9fe864e52.tar.gz latinime-9ada9f1bddc953453ca609610298ead9fe864e52.tar.xz latinime-9ada9f1bddc953453ca609610298ead9fe864e52.zip | |
Merge "Fix debug build"
| -rw-r--r-- | native/jni/Android.mk | 2 | ||||
| -rw-r--r-- | native/jni/src/correction.cpp | 2 | ||||
| -rw-r--r-- | native/jni/src/proximity_info.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/native/jni/Android.mk b/native/jni/Android.mk index edcc0677d..3bb7b58f1 100644 --- a/native/jni/Android.mk +++ b/native/jni/Android.mk @@ -18,7 +18,7 @@ LOCAL_PATH := $(call my-dir) # If you change any of those flags, you need to rebuild both libjni_latinime_static # and the shared library. #FLAG_DBG := true -#FLAG_DO_PROFILE := true +FLAG_DO_PROFILE ?= false ###################################### include $(CLEAR_VARS) diff --git a/native/jni/src/correction.cpp b/native/jni/src/correction.cpp index 3957b013a..6e7d2c807 100644 --- a/native/jni/src/correction.cpp +++ b/native/jni/src/correction.cpp @@ -908,7 +908,7 @@ int Correction::RankingAlgorithm::calculateFinalProbability(const int inputIndex if (DEBUG_CORRECTION_FREQ && (INPUTLENGTH_FOR_DEBUG <= 0 || INPUTLENGTH_FOR_DEBUG == inputLength)) { - DUMP_WORD(proximityInfo->getPrimaryInputWord(), inputLength); + DUMP_WORD(correction->getPrimaryInputWord(), inputLength); DUMP_WORD(correction->mWord, outputLength); AKLOGI("FinalFreq: [P%d, S%d, T%d, E%d, A%d] %d, %d, %d, %d, %d, %d", proximityMatchedCount, skippedCount, transposedCount, excessiveCount, additionalProximityCount, diff --git a/native/jni/src/proximity_info.cpp b/native/jni/src/proximity_info.cpp index d1aa66488..2ba244a7c 100644 --- a/native/jni/src/proximity_info.cpp +++ b/native/jni/src/proximity_info.cpp @@ -53,10 +53,10 @@ ProximityInfo::ProximityInfo(const std::string localeStr, const int maxProximity && keyWidths && keyHeights && keyCharCodes && sweetSpotCenterXs && sweetSpotCenterYs && sweetSpotRadii), mLocaleStr(localeStr) { + const int proximityGridLength = GRID_WIDTH * GRID_HEIGHT * MAX_PROXIMITY_CHARS_SIZE; if (DEBUG_PROXIMITY_INFO) { AKLOGI("Create proximity info array %d", proximityGridLength); } - const int proximityGridLength = GRID_WIDTH * GRID_HEIGHT * MAX_PROXIMITY_CHARS_SIZE; mProximityCharsArray = new int32_t[proximityGridLength]; memcpy(mProximityCharsArray, proximityCharsArray, proximityGridLength * sizeof(mProximityCharsArray[0])); |