am f9233e0b: Merge "Make readPtNode be called with the address from the beginning of the file."

* commit 'f9233e0b98469a7e9e9a863d491a33593dba4bff':
  Make readPtNode be called with the address from the beginning of the file.

1 files changed, 3 insertions, 4 deletions

diff --git a/java/src/com/android/inputmethod/latin/makedict/Ver3DictDecoder.java b/java/src/com/android/inputmethod/latin/makedict/Ver3DictDecoder.java
index 8373ae0bd..8d1b02713 100644
--- a/java/src/com/android/inputmethod/latin/makedict/Ver3DictDecoder.java
+++ b/java/src/com/android/inputmethod/latin/makedict/Ver3DictDecoder.java
@@ -214,9 +214,8 @@ public class Ver3DictDecoder implements DictDecoder {
     // TODO: Make this buffer multi thread safe.
     private final int[] mCharacterBuffer = new int[FormatSpec.MAX_WORD_LENGTH];
     @Override
-    public CharGroupInfo readPtNode(final int originalGroupAddress,
-            final FormatOptions options) {
-        int addressPointer = originalGroupAddress;
+    public CharGroupInfo readPtNode(final int ptNodePos, final FormatOptions options) {
+        int addressPointer = ptNodePos;
         final int flags = PtNodeReader.readPtNodeOptionFlags(mDictBuffer);
         ++addressPointer;
 
@@ -268,7 +267,7 @@ public class Ver3DictDecoder implements DictDecoder {
                 MakedictLog.d("too many bigrams in a group.");
             }
         }
-        return new CharGroupInfo(originalGroupAddress, addressPointer, flags, characters, frequency,
+        return new CharGroupInfo(ptNodePos, addressPointer, flags, characters, frequency,
                 parentAddress, childrenAddress, shortcutTargets, bigrams);
     }
 }