Fix coordinate issue

Change-Id: I6406db1216367339279b95fc9d11cdac8ba3d3be
Signed-off-by: HeeJu Kang <mobum.kang@samsung.com>

diff --git a/packaging/osp-shell.spec b/packaging/osp-shell.spec
old mode 100755 (executable)
new mode 100644 (file)
index 2424331..987b980
--- a/packaging/osp-shell.spec
+++ b/packaging/osp-shell.spec
@@ -37,6 +37,7 @@ BuildRequires:  pkgconfig(livebox-service)
 BuildRequires:  pkgconfig(libdri2)
 BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  pkgconfig(shortcut)
+BuildRequires:  pkgconfig(osp-image)
 BuildRequires:  pkgconfig(osp-image-core)
 BuildRequires:  pkgconfig(osp-media)
 BuildRequires:  pkgconfig(osp-net)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 26ef95e..7f35389 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -115,7 +115,7 @@ TARGET_LINK_LIBRARIES(${this_target} "-lpthread" )
 TARGET_LINK_LIBRARIES(${this_target} "-lchromium" )
 TARGET_LINK_LIBRARIES(${this_target} "-L/usr/lib/osp -losp-appfw" )
 TARGET_LINK_LIBRARIES(${this_target} "-L/usr/lib/osp -losp-uifw" )
-TARGET_LINK_LIBRARIES(${this_target} "-L/usr/lib/osp -losp-image-core" )
+TARGET_LINK_LIBRARIES(${this_target} "-L/usr/lib/osp -losp-image" )
 TARGET_LINK_LIBRARIES(${this_target} "-L/usr/lib/osp -losp-shell-core" )
 TARGET_LINK_LIBRARIES(${this_target} "-lcapi-appfw-application" )
 TARGET_LINK_LIBRARIES(${this_target} "-lcapi-appfw-app-manager" )

diff --git a/src/FShell_AppWidgetView.cpp b/src/FShell_AppWidgetView.cpp
index 426371d..26930b5 100644 (file)
--- a/src/FShell_AppWidgetView.cpp
+++ b/src/FShell_AppWidgetView.cpp
@@ -31,11 +31,11 @@
 #include <FGrpDimension.h>
 #include <FGrpPoint.h>
 #include <FGrpRectangle.h>
+#include <FMediaImage.h>
 #include <FUiAnimDisplayContext.h>
 #include <FUiAnimVisualElementPropertyAnimation.h>
 #include <FBase_StringConverter.h>
 #include <FGrp_BitmapImpl.h>
-#include <FMedia_ImageDecoder.h>
 #include <FUi_TouchFlickGestureDetector.h>
 #include <FUi_ResourceManager.h>
 #include <FUi_CoordinateSystemUtils.h>
@@ -127,12 +127,10 @@ _AppWidgetView::Initialize(const AppId& appId, const Tizen::Base::String& provid
        r = __pAppWidgetViewPresenter->Initialize(appId, providerName);
        SysTryReturn(NID_SHELL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
-       int width = 0;
-       int height = 0;
-
-       unique_ptr<ByteBuffer> pByteBuffer(_ImageDecoder::DecodeToBufferN(__pAppWidgetViewPresenter->GetAppIconPath(), MEDIA_PIXEL_FORMAT_BGRA8888, width, height));
-       unique_ptr<Bitmap> pBitmap(_BitmapImpl::GetNonScaledBitmapN(*pByteBuffer.get(), Dimension(width, height), BITMAP_PIXEL_FORMAT_ARGB8888));
+       Image image;
+       image.Construct();
 
+       unique_ptr<Bitmap> pBitmap(image.DecodeN(__pAppWidgetViewPresenter->GetAppIconPath(), BITMAP_PIXEL_FORMAT_ARGB8888));
        __pAppIconBitmap = move(pBitmap);
 
        __pAppWidget = __pAppWidgetViewManager->AddAppWidgetView(this, userInfo);

diff --git a/src/FShell_AppWidgetViewManager.cpp b/src/FShell_AppWidgetViewManager.cpp
index 9e27578..a6673d2 100644 (file)
--- a/src/FShell_AppWidgetViewManager.cpp
+++ b/src/FShell_AppWidgetViewManager.cpp
@@ -39,10 +39,10 @@ extern "C"
 #include <FGrpPoint.h>
 #include <FGrpRectangle.h>
 #include <FMediaImageTypes.h>
+#include <FMediaImage.h>
 #include <FBase_StringConverter.h>
 #include <FGrp_BitmapImpl.h>
 #include <FGrp_CoordinateSystem.h>
-#include <FMedia_ImageDecoder.h>
 #include <FUi_ControlManager.h>
 #include <FUiCtrl_Frame.h>
 #include <FUiCtrl_IFrameEventListener.h>
@@ -313,15 +313,10 @@ _AppWidgetViewManager::GetPixelFormat(BitmapPixelFormat format) const
 Bitmap*
 _AppWidgetViewManager::GetBitmapN(const String& fileName) const
 {
-       int width = 0;
-       int height = 0;
-
-       MediaPixelFormat format = GetPixelFormat(BITMAP_PIXEL_FORMAT_ARGB8888);
-
-       unique_ptr<ByteBuffer> pByteBuffer(_ImageDecoder::DecodeToBufferN(fileName, format, width, height));
-       SysTryReturn(NID_SHELL, pByteBuffer, null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory is insufficient.");
+       Image image;
+       image.Construct();
 
-       unique_ptr<Bitmap> pBitmap(_BitmapImpl::GetNonScaledBitmapN(*pByteBuffer, Dimension(width, height), BITMAP_PIXEL_FORMAT_ARGB8888));
+       unique_ptr<Bitmap> pBitmap(image.DecodeN(fileName, BITMAP_PIXEL_FORMAT_ARGB8888));
        SysTryReturn(NID_SHELL, pBitmap, null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory is insufficient.");
 
        return pBitmap.release();