Arrange code

[apps/osp/Gallery.git] / src / GlThumbnailInfo.cpp

diff --git a/src/GlThumbnailInfo.cpp b/src/GlThumbnailInfo.cpp
old mode 100644 (file)
new mode 100755 (executable)
index ef5a972..87c3cd9
--- a/src/GlThumbnailInfo.cpp
+++ b/src/GlThumbnailInfo.cpp
@@ -36,6 +36,7 @@ ThumbnailInfo::ThumbnailInfo(void)
 
 ThumbnailInfo::~ThumbnailInfo(void)
 {
+       delete __pBitmap;
 }
 
 void
@@ -83,6 +84,10 @@ ThumbnailInfo::GetBitmapN(void) const
 void
 ThumbnailInfo::SetBitmap(const Bitmap& bitmap)
 {
+       if (__pBitmap)
+       {
+               delete __pBitmap;
+       }
        __pBitmap = CloneBitmapN(bitmap);
 }
 
@@ -121,7 +126,15 @@ ThumbnailInfo::CloneBitmapN(const Bitmap& bitmap) const
                mainCanvas.Construct(mainRect);
                mainCanvas.DrawBitmap(mainRect, bitmap);
                pResultBitmap = new (std::nothrow) Bitmap();
-               pResultBitmap->Construct(mainCanvas, mainRect);
+               result r = pResultBitmap->Construct(mainCanvas, mainRect);
+               TryCatch(r == E_SUCCESS,, "pResultBitmap->Construct Failed:%s", GetErrorMessage(r));
        }
        return pResultBitmap;
+
+CATCH:
+       delete pResultBitmap;
+       pResultBitmap = null;
+
+       return null;
+
 }