N-SE 49510, 49368 is fixed

Change-Id: I9a38b6b8271a908b94deecef15f6103a05e00219
Signed-off-by: santhosh.au <santhosh.au@samsung.com>

diff --git a/src/FUixVisionQrCodeGenerator.cpp b/src/FUixVisionQrCodeGenerator.cpp
index 38ccbc2..d761e64 100644 (file)
--- a/src/FUixVisionQrCodeGenerator.cpp
+++ b/src/FUixVisionQrCodeGenerator.cpp
@@ -82,6 +82,7 @@ QrCodeGenerator::EncodeToBufferN(const Tizen::Base::String& message, QrCodeMode
 result
 QrCodeGenerator::EncodeToFile(const Tizen::Base::String& message, QrCodeMode mode, QrCodeErrorCorrectionLevel errorCorrectionLevel, bool compatibility, const Tizen::Base::String& imageFilePath, Tizen::Media::ImageFormat imageFormat, int& width, int& height)
 {
+    result r =   E_SUCCESS;
     SysAssertf(__pQrCodeGeneratorImpl != null, "Not yet constructed! Consruct() should be called before use.");
 
     SysSecureTryReturnResult(NID_UIX, !message.IsEmpty(), E_INVALID_ARG,
@@ -92,12 +93,19 @@ QrCodeGenerator::EncodeToFile(const Tizen::Base::String& message, QrCodeMode mod
 
     Tizen::Text::Utf8Encoding utf8;
     std::unique_ptr<Tizen::Base::ByteBuffer> pBuffer(utf8.GetBytesN(message));
-     if (!__pQrCodeGeneratorImpl->Encode((char*) pBuffer->GetPointer(), mode, errorCorrectionLevel, compatibility))
-     {
-         return E_FAILURE;
-     }
+    if (!__pQrCodeGeneratorImpl->Encode((char*) pBuffer->GetPointer(), mode, errorCorrectionLevel, compatibility))
+    {
+       return E_OPERATION_FAILED;
+    }
+
+    if(!__pQrCodeGeneratorImpl->SaveToFile(imageFilePath, imageFormat,width, height))
+    {
+       r = GetLastResult();
+       if( r == E_ILLEGAL_ACCESS || r == E_OUT_OF_RANGE)
+           r = E_FILE_NOT_FOUND;
+    }
 
-     return __pQrCodeGeneratorImpl->SaveToFile(imageFilePath, imageFormat, width, height) ? E_SUCCESS : E_FAILURE;
+    return r;
 }
 
 Tizen::Base::Collection::IListT<Tizen::Media::ImageFormat>*

diff --git a/src/FUixVision_QrCodeGeneratorImpl.cpp b/src/FUixVision_QrCodeGeneratorImpl.cpp
index 3ef1435..0c07d69 100644 (file)
--- a/src/FUixVision_QrCodeGeneratorImpl.cpp
+++ b/src/FUixVision_QrCodeGeneratorImpl.cpp
@@ -75,12 +75,14 @@ _QrCodeGeneratorImpl::SaveToFile(const Tizen::Base::String& imagepath, Tizen::Me
 {
     if(!GetSize(width, height))
     {
+       SetLastResult(E_INVALID_ARG);
         return false;
     }
 
     unsigned char* grayBuffer = new unsigned char[(width * height * 3) >> 1];
     if(!SaveToBuffer(grayBuffer))
     {
+       SetLastResult(E_OPERATION_FAILED);  //No proper error returned from SaveToBuffer() Api.
         return false;
     }
 
@@ -90,13 +92,15 @@ _QrCodeGeneratorImpl::SaveToFile(const Tizen::Base::String& imagepath, Tizen::Me
     delete[] grayBuffer;
     if(IsFailed(r))
     {
-        return false;
+       SetLastResult(r);
+       return false;
     }
 
     r = imBuf.EncodeToFile(imagepath, imageFormat, true);
     if(IsFailed(r))
     {
-        return false;
+       SetLastResult(r);
+       return false;
     }
 
     return true;