From 9c2ca38f0b45f3d2937a7ccb05a7a119297107a3 Mon Sep 17 00:00:00 2001
From: Peng Wu <alexepico@gmail.com>
Date: Tue, 28 Jun 2016 12:33:33 +0800
Subject: update pinyin_get_character_offset function

---
 src/pinyin.cpp | 15 +++++++++------
 src/pinyin.h   | 10 +++++-----
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/pinyin.cpp b/src/pinyin.cpp
index 28d5be2..4dd19ed 100644
--- a/src/pinyin.cpp
+++ b/src/pinyin.cpp
@@ -2815,15 +2815,18 @@ bool pinyin_get_right_character_offset(pinyin_instance_t * instance,
 }
 
 bool pinyin_get_character_offset(pinyin_instance_t * instance,
-                                 size_t cursor,
-                                 size_t * poffset) {
+                                 size_t offset,
+                                 size_t * plength) {
     pinyin_context_t * context = instance->m_context;
     FacadePhraseIndex * phrase_index = context->m_phrase_index;
+
+    PhoneticKeyMatrix & matrix = instance->m_matrix;
     MatchResults results = instance->m_match_results;
+    _check_offset(matrix, offset);
 
-    size_t offset = 0;
+    size_t length = 0;
     PhraseItem item;
-    for (size_t i = 0; i < cursor; ++i) {
+    for (size_t i = 0; i < offset; ++i) {
         phrase_token_t token = g_array_index(results, phrase_token_t, i);
         if (null_token == token)
             continue;
@@ -2831,10 +2834,10 @@ bool pinyin_get_character_offset(pinyin_instance_t * instance,
         int retval = phrase_index->get_phrase_item(token, item);
         assert(ERROR_OK == retval);
         guint8 len = item.get_phrase_length();
-        offset += len;
+        length += len;
     }
 
-    *poffset = offset;
+    *plength = length;
     return true;
 }
 
diff --git a/src/pinyin.h b/src/pinyin.h
index 863e945..dc68ebe 100644
--- a/src/pinyin.h
+++ b/src/pinyin.h
@@ -901,16 +901,16 @@ bool pinyin_get_right_character_offset(pinyin_instance_t * instance,
 /**
  * pinyin_get_character_offset:
  * @instance: the pinyin instance.
- * @cursor: the lookup cursor.
- * @offset: the character offset.
+ * @offset: the lookup offset.
+ * @length: the character offset.
  * @returns: whether the get operation is successful.
  *
- * Get the character offset from the lookup cursor.
+ * Get the character offset from the lookup offset.
  *
  */
 bool pinyin_get_character_offset(pinyin_instance_t * instance,
-                                 size_t cursor,
-                                 size_t * offset);
+                                 size_t offset,
+                                 size_t * length);
 
 #if 0
 /**
-- 
cgit