remove unnecessary auto_ptr in Font(only check FGrp_FontRsrcManager.cpp) & change...

Change-Id: I1ace02cef4efb56119a7e19c39051ea46cd156c9
Signed-off-by: Sungyeon Woo <s.woo@samsung.com>

diff --git a/src/graphics/FGrp_Bitmap.cpp b/src/graphics/FGrp_Bitmap.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/graphics/FGrp_Bitmap.h b/src/graphics/FGrp_Bitmap.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/graphics/FGrp_BitmapImpl.cpp b/src/graphics/FGrp_BitmapImpl.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/graphics/FGrp_BitmapTool.cpp b/src/graphics/FGrp_BitmapTool.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/graphics/FGrp_BitmapUtil.cpp b/src/graphics/FGrp_BitmapUtil.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/graphics/FGrp_BitmapUtil.h b/src/graphics/FGrp_BitmapUtil.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/graphics/FGrp_BufferInfoImpl.cpp b/src/graphics/FGrp_BufferInfoImpl.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/graphics/FGrp_Canvas.cpp b/src/graphics/FGrp_Canvas.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/graphics/FGrp_Canvas.h b/src/graphics/FGrp_Canvas.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/graphics/FGrp_CanvasImpl.cpp b/src/graphics/FGrp_CanvasImpl.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/graphics/FGrp_CanvasPixman.cpp b/src/graphics/FGrp_CanvasPixman.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/graphics/FGrp_CoordinateSystemUtils.cpp b/src/graphics/FGrp_CoordinateSystemUtils.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/graphics/FGrp_Farm.cpp b/src/graphics/FGrp_Farm.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/graphics/FGrp_Farm.h b/src/graphics/FGrp_Farm.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/graphics/FGrp_Font.h b/src/graphics/FGrp_Font.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/graphics/FGrp_FontBidiUtil.cpp b/src/graphics/FGrp_FontBidiUtil.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/graphics/FGrp_FontBidiUtil.h b/src/graphics/FGrp_FontBidiUtil.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/graphics/FGrp_FontFt2.cpp b/src/graphics/FGrp_FontFt2.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/graphics/FGrp_FontFt2.h b/src/graphics/FGrp_FontFt2.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/graphics/FGrp_FontPrivate.h b/src/graphics/FGrp_FontPrivate.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/graphics/FGrp_FontRsrcManager.cpp b/src/graphics/FGrp_FontRsrcManager.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 8f8b6dd..a7b3868
--- a/src/graphics/FGrp_FontRsrcManager.cpp
+++ b/src/graphics/FGrp_FontRsrcManager.cpp
@@ -418,11 +418,10 @@ _FontRsrcManager::GetFont(const Tizen::Base::String& fontPath, int style, _Util:
                // create font
                rtn = __CreateFont(_DEFAULT_FONT_ENGINE, buffer.get(), fileLength, _DEFAULT_FONT_FACE, &pFont);
 #endif
-               std::auto_ptr<_IFont> autoPtrFont(pFont);
-               SysTryReturnResult(NID_GRP, rtn && autoPtrFont.get() != null, E_UNSUPPORTED_FORMAT, "Failed to create _IFont instance");
+               SysTryReturnResult(NID_GRP, rtn && pFont != null, E_UNSUPPORTED_FORMAT, "Failed to create _IFont instance");
 
                // make shared resource
-               sharedFont.reset(autoPtrFont.release());
+               sharedFont.reset(pFont);
 
                _IFont::Attrib fontAttrib;
                rtn = pFont->GetAttrib(fontAttrib);
@@ -517,13 +516,10 @@ _FontRsrcManager::GetTempFont(const Tizen::Base::String& fontPath, int style, _U
                std::auto_ptr<ByteBuffer> pathString(pBuffer);
 
                rtn = __CreateFont(_DEFAULT_FONT_ENGINE, (char*)pathString->GetPointer(), _DEFAULT_FONT_FACE, &pFont);
-
-               std::auto_ptr<_IFont> autoPtrFont(pFont);
-               SysTryReturnResult(NID_GRP, rtn && autoPtrFont.get() != null, E_UNSUPPORTED_FORMAT, "Failed to create _IFont instance");
+               SysTryReturnResult(NID_GRP, rtn && pFont != null, E_UNSUPPORTED_FORMAT, "Failed to create _IFont instance");
 
                // make shared resource
-               // ykahn: wrong use for a smart pointer
-               sharedFont.reset(autoPtrFont.release());
+               sharedFont.reset(pFont);
 
                _IFont::Attrib fontAttrib;
                rtn = pFont->GetAttrib(fontAttrib);
@@ -600,11 +596,10 @@ _FontRsrcManager::GetFont(const byte* pFontData, int fontDataSize, int style, _U
        // create new font with user resource.
        //--------------------------------------------------------------------------
        bool rtn = __CreateFont(_DEFAULT_FONT_ENGINE, pFontData, fontDataSize, _DEFAULT_FONT_FACE, &pFont);
-       std::auto_ptr<_IFont> autoPtrFont(pFont);
-       SysTryReturnResult(NID_GRP, rtn && autoPtrFont.get() != null, E_UNSUPPORTED_FORMAT, "Failed to create _IFont");
+       SysTryReturnResult(NID_GRP, rtn && pFont != null, E_UNSUPPORTED_FORMAT, "Failed to create _IFont");
 
        // make shared resource
-       sharedFont.reset(autoPtrFont.release());
+       sharedFont.reset(pFont);
 
        _IFont::Attrib fontAttrib;
        rtn = pFont->GetAttrib(fontAttrib);
@@ -718,11 +713,10 @@ _FontRsrcManager::GetFont(int style, _Util::FixedPoint26_6 size, SharedFontResou
 
                rtn = __CreateFont(_DEFAULT_FONT_ENGINE, autoPtrBuffer.get(), fileLength, _DEFAULT_FONT_FACE, &pFont);
 #endif
-               std::auto_ptr<_IFont> autoPtrFont(pFont);
-               SysTryReturnResult(NID_GRP, rtn && autoPtrFont.get() != null, E_UNSUPPORTED_FORMAT, "Failed to create _IFont instance");
+               SysTryReturnResult(NID_GRP, rtn && pFont != null, E_UNSUPPORTED_FORMAT, "Failed to create _IFont instance");
 
                // make shared resource
-               sharedFont.reset(autoPtrFont.release());
+               sharedFont.reset(pFont);
 
                _IFont::Attrib fontAttrib;
                rtn = pFont->GetAttrib(fontAttrib);

diff --git a/src/graphics/FGrp_IFont.h b/src/graphics/FGrp_IFont.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/graphics/inc/FGrp_BitmapImpl.h b/src/graphics/inc/FGrp_BitmapImpl.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/graphics/inc/FGrp_BitmapTool.h b/src/graphics/inc/FGrp_BitmapTool.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/graphics/inc/FGrp_BufferInfoImpl.h b/src/graphics/inc/FGrp_BufferInfoImpl.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/graphics/inc/FGrp_CanvasImpl.h b/src/graphics/inc/FGrp_CanvasImpl.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/graphics/inc/FGrp_CoordinateSystemUtils.h b/src/graphics/inc/FGrp_CoordinateSystemUtils.h
old mode 100755 (executable)
new mode 100644 (file)