From 7637128b41a6cd8d93188c914109ba5313861fd4 Mon Sep 17 00:00:00 2001 From: Seoyeon Kim Date: Thu, 22 Sep 2016 13:53:12 +0900 Subject: [PATCH] [UTC][dali-core][Non-ACR][Remove TC code using experimental features] Change-Id: I6f71dd3d3d9f75143116e1d15959d1d9eb97c9fd Signed-off-by: Seoyeon Kim --- src/utc/dali-core/render-task/utc-dali-render-task-common.cpp | 2 +- src/utc/dali-core/resource-image/utc-dali-resource-image-impl.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/utc/dali-core/render-task/utc-dali-render-task-common.cpp b/src/utc/dali-core/render-task/utc-dali-render-task-common.cpp index 854f21f..da6adfe 100755 --- a/src/utc/dali-core/render-task/utc-dali-render-task-common.cpp +++ b/src/utc/dali-core/render-task/utc-dali-render-task-common.cpp @@ -129,7 +129,7 @@ Image ImageInitialization(GLuint textureId, int width, int height ) { const Vector2 closestImageSize( width, height ); - image = ResourceImage::New( filename, ResourceImage::IMMEDIATE, Image::NEVER ); + image = ResourceImage::New( filename ); free (filename); } diff --git a/src/utc/dali-core/resource-image/utc-dali-resource-image-impl.h b/src/utc/dali-core/resource-image/utc-dali-resource-image-impl.h index 0b6e98a..ae14ecc 100755 --- a/src/utc/dali-core/resource-image/utc-dali-resource-image-impl.h +++ b/src/utc/dali-core/resource-image/utc-dali-resource-image-impl.h @@ -154,7 +154,7 @@ void ResourceImageGetUrlP() ResourceImage resourceImageAssign; DALI_CHECK_FAIL( resourceImageAssign , "Default ResourceImage image is not null." ); - ResourceImage resourceImage = ResourceImage::New(strActualPathOne, ResourceImage::IMMEDIATE, Image::UNUSED); + ResourceImage resourceImage = ResourceImage::New(strActualPathOne); DALI_CHECK_FAIL( !resourceImage , "ResourceImage::New creation is failed." ); strGetUrl = resourceImage.GetUrl(); @@ -189,7 +189,7 @@ void ResourceImageCopyConstructorP() ResourceImage resourceImageAssign; DALI_CHECK_FAIL( resourceImageAssign , "Default ResourceImage image is not null." ); - ResourceImage resourceImage = ResourceImage::New(strActualPathOne, ResourceImage::IMMEDIATE, Image::UNUSED); + ResourceImage resourceImage = ResourceImage::New(strActualPathOne); DALI_CHECK_FAIL( !resourceImage , "ResourceImage::New creation is failed." ); strGetUrl = resourceImage.GetUrl(); @@ -223,7 +223,7 @@ void ResourceImageOperatorAssignmentP() ResourceImage resourceImageAssign; DALI_CHECK_FAIL( resourceImageAssign , "Default ResourceImage image is not null." ); - ResourceImage resourceImage = ResourceImage::New(strActualPathOne, ResourceImage::IMMEDIATE, Image::UNUSED); + ResourceImage resourceImage = ResourceImage::New(strActualPathOne); DALI_CHECK_FAIL( !resourceImage , "ResourceImage::New creation is failed." ); strGetUrl = resourceImage.GetUrl(); -- 2.7.4