From 54592349e88348b9a771f906a8013a49a15be020 Mon Sep 17 00:00:00 2001 From: Ji-hoon Lee Date: Wed, 10 Jul 2013 00:18:27 +0900 Subject: [PATCH] Fixed read/write errors reported by valgrind Change-Id: I769a4e45a69b2c9b7092aace20e8cb2825332f2f --- packaging/libscl-ui.spec | 2 +- scl/gwes/efl/sclgraphics-efl.cpp | 2 ++ scl/include/sclversion.h | 2 +- scl/sclcontext.cpp | 3 +++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packaging/libscl-ui.spec b/packaging/libscl-ui.spec index eb92596..97e6b80 100644 --- a/packaging/libscl-ui.spec +++ b/packaging/libscl-ui.spec @@ -3,7 +3,7 @@ Name: libscl-ui Summary: A library for developing XML-based software keyboards -Version: 0.3.6 +Version: 0.3.7 Release: 1 Group: TO BE / FILLED IN License: TO BE / FILLED IN diff --git a/scl/gwes/efl/sclgraphics-efl.cpp b/scl/gwes/efl/sclgraphics-efl.cpp index 1d5f970..91a3f48 100644 --- a/scl/gwes/efl/sclgraphics-efl.cpp +++ b/scl/gwes/efl/sclgraphics-efl.cpp @@ -506,6 +506,7 @@ CSCLGraphicsImplEfl::draw_text(sclwindow window, const scldrawctx draw_ctx, cons #endif EFLObject *object = new EFLObject; if (object) { + object->extracted = FALSE; Evas_Object *window_object = (Evas_Object*)window; if (winctx->is_virtual) { window_object = static_cast(windows->get_base_window()); @@ -762,6 +763,7 @@ CSCLGraphicsImplEfl::draw_rectangle(sclwindow window, const scldrawctx draw_ctx, // evas_object_raise(rectobj); evas_object_show(rectobj); + object->extracted = FALSE; object->object = rectobj; object->type = EFLOBJECT_RECTANGLE; object->position.x = pos_x; diff --git a/scl/include/sclversion.h b/scl/include/sclversion.h index 24b4d8a..0745469 100644 --- a/scl/include/sclversion.h +++ b/scl/include/sclversion.h @@ -18,7 +18,7 @@ #ifndef __SCL_VERSION_H__ #define __SCL_VERSION_H__ -#define SCL_VERSION "0.3.6-1" +#define SCL_VERSION "0.3.7-1" #endif //__SCL_VERSION_H diff --git a/scl/sclcontext.cpp b/scl/sclcontext.cpp index fabf982..5b5f4cf 100644 --- a/scl/sclcontext.cpp +++ b/scl/sclcontext.cpp @@ -78,6 +78,9 @@ CSCLContext::reset() m_multi_touch_context.clear(); m_last_touch_device_id = SCLTOUCHDEVICE_INVALID; + m_last_pressed_window = SCLWINDOW_INVALID; + m_last_pressed_key = NOT_USED; + memset(m_cur_sub_layout, 0x00, sizeof(m_cur_sub_layout)); } -- 2.7.4