merged with develop

Change-Id: I243a368bc7c15fbedc934208a739fa0f25cbf26c

diff --git a/lib/armv7-a/libarengine.so b/lib/armv7-a/libarengine.so
index 61ffcee..d5576c6 100755 (executable)
Binary files a/lib/armv7-a/libarengine.so and b/lib/armv7-a/libarengine.so differ

diff --git a/lib/x86/libarengine.so b/lib/x86/libarengine.so
index 8c631db..cd52b03 100755 (executable)
Binary files a/lib/x86/libarengine.so and b/lib/x86/libarengine.so differ

diff --git a/src/FUixVisionImageFeatureManager.cpp b/src/FUixVisionImageFeatureManager.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 5aeae73..e71bafb
--- a/src/FUixVisionImageFeatureManager.cpp
+++ b/src/FUixVisionImageFeatureManager.cpp
@@ -125,7 +125,7 @@ ImageFeatureManager::Flush(const Tizen::Base::String* featureSetFilePath)
 {
     SysAssertf(__pImageFeatureManagerImpl != null, "Not yet constructed! Consruct() should be called before use.");
 
-        return __pImageFeatureManagerImpl->SaveDB(true, featureSetFilePath);
+    return __pImageFeatureManagerImpl->SaveDB(true, featureSetFilePath);
 }
 
 result

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

diff --git a/src/FUixVisionQrCodeGenerator.cpp b/src/FUixVisionQrCodeGenerator.cpp
index 0916036..2e84796 100644 (file)
--- a/src/FUixVisionQrCodeGenerator.cpp
+++ b/src/FUixVisionQrCodeGenerator.cpp
@@ -60,7 +60,6 @@ QrCodeGenerator::EncodeToBufferN(const Tizen::Base::String& message, QrCodeMode
 
     Tizen::Text::Utf8Encoding utf8;
     __pQrCodeGeneratorImpl->Encode((char*) utf8.GetBytesN(message)->GetPointer(), mode, error_level, compatibility);
-
     __pQrCodeGeneratorImpl->GetSize(width, height);
 
     std::unique_ptr<Tizen::Base::ByteBuffer> pBuffer(new (std::nothrow) Tizen::Base::ByteBuffer());

diff --git a/src/FUixVision_ImageFeatureManagerImpl.cpp b/src/FUixVision_ImageFeatureManagerImpl.cpp
index 87d137b..43953a3 100644 (file)
--- a/src/FUixVision_ImageFeatureManagerImpl.cpp
+++ b/src/FUixVision_ImageFeatureManagerImpl.cpp
@@ -173,7 +173,6 @@ _ImageFeatureManagerImpl::SaveDB(bool optimizeDatabase, const Tizen::Base::Strin
     }
 
     return result;
-
 }
 
 bool

diff --git a/src/FUixVision_ImageObjectImpl.cpp b/src/FUixVision_ImageObjectImpl.cpp
index 76b2a5d..07899c2 100644 (file)
--- a/src/FUixVision_ImageObjectImpl.cpp
+++ b/src/FUixVision_ImageObjectImpl.cpp
@@ -68,6 +68,7 @@ _ImageObjectImpl::SetSariPointer(const sari2::ImageRecognitionInfo& sari)
 const Tizen::Base::Collection::ArrayListT<Tizen::Graphics::FloatPoint>*
 _ImageObjectImpl::GetRectangle(void) const
 {
+    __pRectangleList->RemoveAll();
     static float coordinates[8] = {0.f};
     __ImageRecognitionInfo.rectangle(coordinates);
 

diff --git a/src/FUixVision_QrCodeObjectImpl.cpp b/src/FUixVision_QrCodeObjectImpl.cpp
index f81701c..3af40a3 100644 (file)
--- a/src/FUixVision_QrCodeObjectImpl.cpp
+++ b/src/FUixVision_QrCodeObjectImpl.cpp
@@ -88,6 +88,7 @@ _QrCodeObjectImpl::GetTransformMatrix(void) const
 const Tizen::Base::Collection::ArrayListT<Tizen::Graphics::FloatPoint>*
 _QrCodeObjectImpl::GetRectangle(void) const
 {
+    __pRectangleList->RemoveAll();
     static float coordinates[8] = {0.f};
     __qrCodeObject.rectangle(coordinates);