Modify home screen wallpaper operation and remove memory leak

Change-Id: I11f858087130468d54c552809d6f4729222dd927
Signed-off-by: TaeHo Choi <thanks.choi@samsung.com>

diff --git a/src/StWallpaperAlbumListPresentationModel.cpp b/src/StWallpaperAlbumListPresentationModel.cpp
index 4a88452..d34125a 100644 (file)
--- a/src/StWallpaperAlbumListPresentationModel.cpp
+++ b/src/StWallpaperAlbumListPresentationModel.cpp
@@ -211,6 +211,7 @@ WallpaperAlbumListPresentationModel::DrawPartialImage(Canvas& canvas, AlbumInfo*
                                ICON_CAP * DOUBLE_NUMBER + ICON_SIZE * TRIPLE_NUMBER);
                r = canvas.DrawBitmap(rectFirst, *pBitmap1);
        }
+       delete pBitmap1;
        delete pContentInfo;
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }
@@ -324,6 +325,7 @@ WallpaperAlbumListPresentationModel::CreateDetailMergeBitmapN(int index)
        result r = pBitmapNew->Construct(size, BITMAP_PIXEL_FORMAT_ARGB8888);
        if (r != E_SUCCESS)
        {
+               delete pContentInfo;
                delete pBitmapNew;
                AppLogDebug("EXIT 2(%s)", GetErrorMessage(GetLastResult()));
                return null;
@@ -333,6 +335,7 @@ WallpaperAlbumListPresentationModel::CreateDetailMergeBitmapN(int index)
        r = canvas.Construct(bufferinfo);
        if (r != E_SUCCESS)
        {
+               delete pContentInfo;
                delete pBitmapNew;
                AppLogDebug("EXIT 3(%s)", GetErrorMessage(GetLastResult()));
                return null;
@@ -340,6 +343,7 @@ WallpaperAlbumListPresentationModel::CreateDetailMergeBitmapN(int index)
 
        if (pContentInfo == null)
        {
+               delete pContentInfo;
                AppLogDebug("pContentInfo is null");
                delete pBitmapNew;
                return null;
@@ -366,6 +370,7 @@ WallpaperAlbumListPresentationModel::CreateDetailMergeBitmapN(int index)
        }
        pBitmapNew->Unlock();
        delete pContentInfo;
+       delete pBitmap;
 
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
        return pBitmapNew;

diff --git a/src/StWallpaperImageSelectForm.cpp b/src/StWallpaperImageSelectForm.cpp
index 03ccc70..5dc0838 100644 (file)
--- a/src/StWallpaperImageSelectForm.cpp
+++ b/src/StWallpaperImageSelectForm.cpp
@@ -142,7 +142,8 @@ WallpaperImageSelectForm::OnActionPerformed(const Tizen::Ui::Control& source, in
 
                        ArrayList* aList = new (std::nothrow) ArrayList(SingleObjectDeleter);
                        aList->Construct();
-                       aList->Add(*(new (std::nothrow) String(Integer::ToString(actionId))));
+                       aList->Add(*(new (std::nothrow) String(Integer::ToString(__argIndex))));
+
                        switch (__argIndex)
                        {
                        case 0: