Merge from master branch

Change-Id: Ic6934a8b7e011a2ac0cc07e5eab629b69aa077e7
Signed-off-by: JungYumin <y_m.jung@samsung.com>

diff --git a/src/FMedia_ImageBufferImpl.cpp b/src/FMedia_ImageBufferImpl.cpp
index c347803..38f3016 100644 (file)
--- a/src/FMedia_ImageBufferImpl.cpp
+++ b/src/FMedia_ImageBufferImpl.cpp
@@ -744,7 +744,7 @@ _ImageBufferImpl::GetBitmapN(BitmapPixelFormat pixelFormat, const FloatDimension
 
        if (inPixelFormat == __pixelFormat && convertDim.width == __width && convertDim.height == __height)
        {
-               pOutBitmap.reset(_BitmapImpl::GetNonScaledBitmapN(*pTmpByteBuffer.get(), convertDim, pixelFormat));
+               pOutBitmap.reset(_BitmapImpl::GetNonScaledBitmapN(*pTmpByteBuffer.get(), convertDim, pixelFormat, destDim));
        }
        else
        {
@@ -758,7 +758,7 @@ _ImageBufferImpl::GetBitmapN(BitmapPixelFormat pixelFormat, const FloatDimension
                r = GetLastResult();
                SysTryReturn(NID_MEDIA, r == E_SUCCESS, null, r, "[%s] Propagated.", GetErrorMessage(r));
 
-               pOutBitmap.reset(_BitmapImpl::GetNonScaledBitmapN(*pOutBuf.get(), convertDim, pixelFormat));
+               pOutBitmap.reset(_BitmapImpl::GetNonScaledBitmapN(*pOutBuf.get(), convertDim, pixelFormat, destDim));
        }
 
        SysTryReturn(NID_MEDIA, pOutBitmap.get() != null, null, GetLastResult(), "[%s] Propagated.", GetErrorMessage(GetLastResult()));

diff --git a/src/FMedia_ImageImpl.cpp b/src/FMedia_ImageImpl.cpp
index dfb27b8..a89f3ff 100644 (file)
--- a/src/FMedia_ImageImpl.cpp
+++ b/src/FMedia_ImageImpl.cpp
@@ -225,7 +225,7 @@ _ImageImpl::DecodeToBitmapN(const Tizen::Base::ByteBuffer& srcImageBuf, Tizen::G
        SysTryReturn(NID_MEDIA, pBmp.get() != null, null, E_OUT_OF_MEMORY,
                           "[%s] new Bitmap", GetErrorMessage(GetLastResult()));
 
-       pBmp.reset(_BitmapImpl::GetNonScaledBitmapN(*pBuf.get(), tmpDim, pixelFormat));
+       pBmp.reset(_BitmapImpl::GetNonScaledBitmapN(*pBuf.get(), tmpDim, pixelFormat, destDim));
        SetLastResult(E_SUCCESS);
        return pBmp.release();
 }

diff --git a/src/FMedia_ImageUriData.cpp b/src/FMedia_ImageUriData.cpp
index ed3fbf5..37ed5bd 100644 (file)
--- a/src/FMedia_ImageUriData.cpp
+++ b/src/FMedia_ImageUriData.cpp
@@ -78,11 +78,13 @@ _ImageUriData::~_ImageUriData(void)
        if (__pSession.get() != null)
        {
                __pSessionImpl = null;
+               __pSession.reset(null);
        }
 
        if (__pTransaction.get() != null)
        {
                __pTransactionImpl = null;
+               __pTransaction.reset(null);
        }
 
 }
@@ -231,7 +233,7 @@ _ImageUriData::RequestDownload(const Utility::Uri &downloadUri,
        r = __pTransactionImpl->SetTimeout(sec);
        SysTryCatch(NID_MEDIA, r == E_SUCCESS, , r, "[%s] Failed to set timeout.", GetErrorMessage(r));
 
-       r = __pTransactionImpl->AddHttpTransactionListener(*(this->__pListener.release()));
+       r = __pTransactionImpl->AddHttpTransactionListener(*(this->__pListener.get()));
        SysTryCatch(NID_MEDIA, r == E_SUCCESS, , r, "[%s] Failed to add listener into the HTTP transaction.", GetErrorMessage(r));
 
        __pRequest = __pTransactionImpl->GetRequest();