Fixed prevent issue

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

diff --git a/src/GlCommonUtil.cpp b/src/GlCommonUtil.cpp
index 07637f2..c148472 100644 (file)
--- a/src/GlCommonUtil.cpp
+++ b/src/GlCommonUtil.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
-// Licensed under the Flora License, Version 1.0 (the License);
+// Licensed under the Flora License, Version 1.1 (the License);
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
@@ -19,8 +19,6 @@
  * @brief              This is the implementation file for CommonUtil class.
  */
 
-#include <FApp.h>
-#include <FUi.h>
 #include <GlTypes.h>
 
 #include "GlCommonUtil.h"
@@ -30,18 +28,23 @@ using namespace Tizen::Base;
 using namespace Tizen::Base::Runtime;
 using namespace Tizen::Graphics;
 
-static const int W_DEFAULT_THUMBNAIL = 351;
-static const int H_DEFAULT_THUMBNAIL = 261;
+static const int W_DEFAULT_THUMBNAIL = 171;
+static const int H_DEFAULT_THUMBNAIL = 127;
 static const int BASE_STANDARD = 1000;
 static const int FORMAT_TIME = 10;
-static const String DATETIME_FORMAT = L"%02d:%02d";
+static const String DATETIME_FORMAT = L"%02d:%02d:%02d";
 
 Bitmap*
 CommonUtil::GetEmptyThumbnailN(void)
 {
        Rectangle mainRect(0, 0, W_DEFAULT_THUMBNAIL, H_DEFAULT_THUMBNAIL);
        Bitmap* pBitmap = new (std::nothrow) Bitmap();
-       pBitmap->Construct(mainRect);
+       result r = pBitmap->Construct(mainRect);
+       if (r != E_SUCCESS)
+       {
+               delete pBitmap;
+               return null;
+       }
        BufferInfo bufferInfo;
        pBitmap->Lock(bufferInfo, INFINITE);
        pBitmap->Unlock();
@@ -53,11 +56,11 @@ CommonUtil::GetEmptyThumbnailN(void)
 }
 
 String
-CommonUtil::DurationToTimeString(long duration)
+CommonUtil::DurationToTimeString(const long duration)
 {
        String strTime;
        DateTime dateTime;
-       dateTime.AddSeconds( duration / BASE_STANDARD);
-       strTime.Format(FORMAT_TIME, DATETIME_FORMAT.GetPointer(), dateTime.GetMinute(), dateTime.GetSecond());
+       dateTime.AddSeconds(duration / BASE_STANDARD);
+       strTime.Format(FORMAT_TIME, DATETIME_FORMAT.GetPointer(), dateTime.GetHour(), dateTime.GetMinute(), dateTime.GetSecond());
        return strTime;
 }