Remove deprecated load and release policies from scripting

Change-Id: I531494e0cb039b7eae61044006d5fc1f02ab66c8

diff --git a/automated-tests/src/dali/utc-Dali-Scripting.cpp b/automated-tests/src/dali/utc-Dali-Scripting.cpp
index 734151c..c0208b7 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Scripting.cpp
+++ b/automated-tests/src/dali/utc-Dali-Scripting.cpp
@@ -151,70 +151,6 @@ int UtcDaliScriptingNewImageNegative01(void)
   END_TEST;
 }
 
-int UtcDaliScriptingNewImageNegative02(void)
-{
-  TestApplication application; // Image needs application
-  // Invalid load-policy value type
-  Property::Map map;
-  map[ "filename" ] = "TEST_FILE";
-  map[ "loadPolicy" ] = Vector3::ZERO;
-  // will give us a valid image handle with default load policy
-  Image image = NewImage( map );
-  DALI_TEST_CHECK( image );
-  ResourceImage resImage = ResourceImage::DownCast( image );
-  DALI_TEST_CHECK( resImage );
-  DALI_TEST_EQUALS( resImage.GetLoadPolicy(), ResourceImage::IMMEDIATE, TEST_LOCATION );
-  END_TEST;
-}
-
-int UtcDaliScriptingNewImageNegative03(void)
-{
-  TestApplication application; // Image needs application
-  // Invalid load-policy value
-  Property::Map map;
-  map[ "filename" ] = "TEST_FILE";
-  map[ "loadPolicy" ] = "INVALID";
-  // will give us a valid image with default load policy
-  Image image = NewImage( map );
-  DALI_TEST_CHECK( image );
-  ResourceImage resImage = ResourceImage::DownCast( image );
-  DALI_TEST_CHECK( resImage );
-  DALI_TEST_EQUALS( resImage.GetLoadPolicy(), ResourceImage::IMMEDIATE, TEST_LOCATION );
-  END_TEST;
-}
-
-int UtcDaliScriptingNewImageNegative04(void)
-{
-  TestApplication application; // Image needs application
-  // Invalid release-policy value type
-  Property::Map map;
-  map[ "filename" ] = "TEST_FILE";
-  map[ "releasePolicy" ] = Vector3::ZERO;
-  // will give us a valid image with default release policy
-  Image image = NewImage( map );
-  DALI_TEST_CHECK( image );
-  ResourceImage resImage = ResourceImage::DownCast( image );
-  DALI_TEST_CHECK( resImage );
-  DALI_TEST_EQUALS( resImage.GetReleasePolicy(), Image::NEVER, TEST_LOCATION );
-  END_TEST;
-}
-
-int UtcDaliScriptingNewImageNegative05(void)
-{
-  TestApplication application; // Image needs application
-  // Invalid release-policy value
-  Property::Map map;
-  map[ "filename" ] = "TEST_FILE";
-  map[ "releasePolicy" ] = "INVALID";
-  // will give us a valid image with default release policy
-  Image image = NewImage( map );
-  DALI_TEST_CHECK( image );
-  ResourceImage resImage = ResourceImage::DownCast( image );
-  DALI_TEST_CHECK( resImage );
-  DALI_TEST_EQUALS( resImage.GetReleasePolicy(), Image::NEVER, TEST_LOCATION );
-  END_TEST;
-}
-
 int UtcDaliScriptingNewImageNegative06(void)
 {
   TestApplication application; // Image needs application
@@ -369,42 +305,6 @@ int UtcDaliScriptingNewImage01P(void)
   END_TEST;
 }
 
-int UtcDaliScriptingNewImage02P(void)
-{
-  TestApplication application;
-
-  Property::Map map;
-  map[ "filename" ] = "TEST_FILE";
-
-  // load-policy
-  map[ "loadPolicy" ] = "";
-  const StringEnum values[] =
-  {
-    { "IMMEDIATE", ResourceImage::IMMEDIATE },
-    { "ON_DEMAND", ResourceImage::ON_DEMAND }
-  };
-  TestEnumStrings< ResourceImage::LoadPolicy, ResourceImage >( map, "loadPolicy",  values, ( sizeof( values ) / sizeof ( values[0] ) ), &ResourceImage::GetLoadPolicy, &NewResourceImage );
-  END_TEST;
-}
-
-int UtcDaliScriptingNewImage03P(void)
-{
-  TestApplication application;
-
-  Property::Map map;
-  map[ "filename" ] = "TEST_FILE";
-
-  // release-policy
-  map[ "releasePolicy" ] = "";
-  const StringEnum values[] =
-  {
-    { "UNUSED", Image::UNUSED },
-    { "NEVER", Image::NEVER }
-  };
-  TestEnumStrings< Image::ReleasePolicy, Image >( map, "releasePolicy",  values, ( sizeof( values ) / sizeof ( values[0] ) ), &Image::GetReleasePolicy, &NewImage );
-  END_TEST;
-}
-
 int UtcDaliScriptingNewImage04P(void)
 {
   TestApplication application;
@@ -836,10 +736,6 @@ int UtcDaliScriptingCreatePropertyMapImage(void)
     DALI_TEST_EQUALS( map.Find( "type" )->Get< std::string >(), "ResourceImage", TEST_LOCATION );
     DALI_TEST_CHECK( NULL != map.Find( "filename" ) );
     DALI_TEST_EQUALS( map.Find( "filename" )->Get< std::string >(), "MY_PATH", TEST_LOCATION );
-    DALI_TEST_CHECK( NULL != map.Find( "loadPolicy") );
-    DALI_TEST_EQUALS( map.Find( "loadPolicy" )->Get< std::string >(), "IMMEDIATE", TEST_LOCATION );
-    DALI_TEST_CHECK( NULL != map.Find( "releasePolicy") );
-    DALI_TEST_EQUALS( map.Find( "releasePolicy" )->Get< std::string >(), "NEVER", TEST_LOCATION );
     DALI_TEST_CHECK( NULL == map.Find( "width" ) );
     DALI_TEST_CHECK( NULL == map.Find( "height" ) );
   }
@@ -856,10 +752,6 @@ int UtcDaliScriptingCreatePropertyMapImage(void)
     DALI_TEST_EQUALS( map.Find( "type" )->Get< std::string >(), "ResourceImage", TEST_LOCATION );
     DALI_TEST_CHECK( NULL != map.Find( "filename" ) );
     DALI_TEST_EQUALS( map.Find( "filename" )->Get< std::string >(), "MY_PATH", TEST_LOCATION );
-    DALI_TEST_CHECK( NULL != map.Find( "loadPolicy") );
-    DALI_TEST_EQUALS( map.Find( "loadPolicy" )->Get< std::string >(), "ON_DEMAND", TEST_LOCATION );
-    DALI_TEST_CHECK( NULL != map.Find( "releasePolicy") );
-    DALI_TEST_EQUALS( map.Find( "releasePolicy" )->Get< std::string >(), "UNUSED", TEST_LOCATION );
     DALI_TEST_CHECK( NULL != map.Find( "width" ) );
     DALI_TEST_EQUALS( map.Find( "width" )->Get< int >(), 300, TEST_LOCATION );
     DALI_TEST_CHECK( NULL != map.Find( "height" ) );

diff --git a/dali/devel-api/scripting/scripting.cpp b/dali/devel-api/scripting/scripting.cpp
index 55bca88..9d4b8e6 100644 (file)
--- 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;
       }
     }