From 1035bc990d9d704d8cf1002548e5dddb3ba96797 Mon Sep 17 00:00:00 2001
From: satok <satok@google.com>
Date: Wed, 13 Jun 2012 16:07:54 -0700
Subject: [PATCH] Fix debug build

Change-Id: I48a87967ac741455502ac1a18465ae6ed7ef0d12
---
 native/jni/Android.mk             | 2 +-
 native/jni/src/correction.cpp     | 2 +-
 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]));