X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Fdevel-api%2Fscripting%2Fscripting.cpp;h=9d4b8e6fb9c4853f0c38667269d38d0f58f32ea5;hb=41c2c3ebf3e03604f4194fdbf16eb4f6297a3a7e;hp=55bca88c4340a6b8211ae16a4a20165d23414a6f;hpb=b08d7b5d2cf90794ac88e71e667f2e6bbbf85923;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/devel-api/scripting/scripting.cpp b/dali/devel-api/scripting/scripting.cpp index 55bca88..9d4b8e6 100644 --- a/dali/devel-api/scripting/scripting.cpp +++ b/dali/devel-api/scripting/scripting.cpp @@ -190,8 +190,6 @@ Image NewImage( const Property::Value& property ) Image ret; std::string filename; - ResourceImage::LoadPolicy loadPolicy = Dali::Internal::IMAGE_LOAD_POLICY_DEFAULT; - Image::ReleasePolicy releasePolicy = Dali::Internal::IMAGE_RELEASE_POLICY_DEFAULT; Internal::ImageAttributes attributes = Internal::ImageAttributes::New(); const Property::Map* map = property.GetMap(); @@ -230,24 +228,6 @@ Image NewImage( const Property::Value& property ) } } - value = map->Find( "loadPolicy" ); - if( value ) - { - std::string policy; - value->Get( policy ); - // keep default value on error - GetEnumeration< ResourceImage::LoadPolicy >( policy.c_str(), IMAGE_LOAD_POLICY_TABLE, IMAGE_LOAD_POLICY_TABLE_COUNT, loadPolicy ); - } - - value = map->Find( "releasePolicy" ); - if( value ) - { - std::string policy; - value->Get( policy ); - // keep default value on error - GetEnumeration< Image::ReleasePolicy >( policy.c_str(), IMAGE_RELEASE_POLICY_TABLE, IMAGE_RELEASE_POLICY_TABLE_COUNT, releasePolicy ); - } - // Width and height can be set individually. Dali derives the unspecified // dimension from the aspect ratio of the raw image. int width = 0, height = 0; @@ -323,8 +303,7 @@ Image NewImage( const Property::Value& property ) { case RESOURCE_IMAGE : { - ret = ResourceImage::New( filename, loadPolicy, releasePolicy, - ImageDimensions( attributes.GetSize().x, attributes.GetSize().y ), + ret = ResourceImage::New( filename, ImageDimensions( attributes.GetSize().x, attributes.GetSize().y ), attributes.GetScalingMode(), attributes.GetFilterMode(), attributes.GetOrientationCorrection() ); break; } @@ -332,16 +311,14 @@ Image NewImage( const Property::Value& property ) { ret = BufferImage::New( attributes.GetWidth(), attributes.GetHeight(), - pixelFormat, - releasePolicy ); + pixelFormat ); break; } case FRAME_BUFFER_IMAGE : { ret = FrameBufferImage::New( attributes.GetWidth(), attributes.GetHeight(), - pixelFormat, - releasePolicy ); + pixelFormat ); break; } }