Merge with master branch

Change-Id: I5bf8bb7e376d5bf7635c23947edefe42efad7cef

diff --git a/configure.ac b/configure.ac
index d89334f..072a390 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 #-*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
-AC_INIT([sunpinyin],[0.0.1223], [mail@yongsun.me])
+AC_INIT([sunpinyin],[0.0.1321], [mail@yongsun.me])
 AC_PREREQ([2.59])
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_MACRO_DIR([m4])

diff --git a/debian/changelog b/debian/changelog
index 87b656d..fdf696a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ise-engine-sunpinyin (0.0.1321) unstable; urgency=low
+
+  * Fix out of bounds error.
+  * Git: 165.213.149.219:framework/uifw/ise-engine-sunpinyin
+  * Tag: ise-engine-sunpinyin_0.0.1321-1
+
+ -- Li Zhang <li2012.zhang@samsung.com>  Thu, 21 Feb 2013 16:20:00 +0800
+
 ise-engine-sunpinyin (0.0.1223) unstable; urgency=low
 
   * Showing candidate in reset.

diff --git a/packaging/sunpinyin.changes b/packaging/sunpinyin.changes
new file mode 100644 (file)
index 0000000..213a143
--- /dev/null
+++ b/packaging/sunpinyin.changes
@@ -0,0 +1,6 @@
+* Thu Jan 31 2013 Li Zhang <li2012.zhang@samsung.com> accepted/tizen_2.0/20130123.093018@a110cbf
+- Always show candidate
+- [N_SE-12903][N_SE-12802]flush to commit the first candidate.
+- Modifed to install LICENSE information
+- Initial Release
+

diff --git a/packaging/sunpinyin.spec b/packaging/sunpinyin.spec
index 97c5d38..6cdd98e 100755 (executable)
--- a/packaging/sunpinyin.spec
+++ b/packaging/sunpinyin.spec
@@ -1,6 +1,6 @@
 Name:       ise-engine-sunpinyin
 Summary:    Chinese Pinyin ISE
-Version:    0.0.1223
+Version:    0.0.1321
 Release:    1
 Group:      TO_BE/FILLED_IN
 License:    LGPLv2+

diff --git a/src/ime-core/imi_defines.h b/src/ime-core/imi_defines.h
index 168c6f1..d4151ae 100644 (file)
--- a/src/ime-core/imi_defines.h
+++ b/src/ime-core/imi_defines.h
@@ -39,7 +39,7 @@
 #ifndef SUNPY_IMI_CONFIG_H
 #define SUNPY_IMI_CONFIG_H
 
-#define MAX_LATTICE_LENGTH      512
+#define MAX_LATTICE_LENGTH      64
 #define MAX_LEXICON_TRIES       32
 #define UNKNOWN_WORD_ID         0
 #define NONE_WORD_ID            69

diff --git a/src/ime-core/imi_view_classic.cpp b/src/ime-core/imi_view_classic.cpp
index b4d374f..37034bb 100644 (file)
--- a/src/ime-core/imi_view_classic.cpp
+++ b/src/ime-core/imi_view_classic.cpp
@@ -461,7 +461,7 @@ CIMIClassicView::_insert(unsigned keyvalue, unsigned &changeMasks)
 {
     changeMasks |= KEYEVENT_USED;
 
-    if (m_pPySegmentor->getInputBuffer().size() >= MAX_LATTICE_LENGTH - 1)
+    if (m_pPySegmentor->getInputBuffer().size() >= MAX_LATTICE_LENGTH - 2)
         return;
 
     if (m_cursorFrIdx == m_pIC->getLastFrIdx())