Merge "Remove unsafe new-delete pair from program and change unoptimal resizes to...

[platform/core/uifw/dali-core.git] / dali / internal / event / actors / image-actor-impl.cpp

diff --git a/dali/internal/event/actors/image-actor-impl.cpp b/dali/internal/event/actors/image-actor-impl.cpp
index 08f98b5..e1450d7 100644 (file)
--- a/dali/internal/event/actors/image-actor-impl.cpp
+++ b/dali/internal/event/actors/image-actor-impl.cpp
@@ -38,10 +38,10 @@ namespace
 
 //              Name           Type   writable animatable constraint-input  enum for index-checking
 DALI_PROPERTY_TABLE_BEGIN
-DALI_PROPERTY( "pixel-area",   RECTANGLE, true,    false,   true,    Dali::ImageActor::Property::PixelArea )
-DALI_PROPERTY( "style",        STRING,    true,    false,   true,    Dali::ImageActor::Property::Style     )
-DALI_PROPERTY( "border",       VECTOR4,   true,    false,   true,    Dali::ImageActor::Property::Border    )
-DALI_PROPERTY( "image",        MAP,       true,    false,   false,   Dali::ImageActor::Property::Image     )
+DALI_PROPERTY( "pixel-area",   RECTANGLE, true,    false,   true,    Dali::ImageActor::Property::PIXEL_AREA )
+DALI_PROPERTY( "style",        STRING,    true,    false,   true,    Dali::ImageActor::Property::STYLE      )
+DALI_PROPERTY( "border",       VECTOR4,   true,    false,   true,    Dali::ImageActor::Property::BORDER     )
+DALI_PROPERTY( "image",        MAP,       true,    false,   false,   Dali::ImageActor::Property::IMAGE      )
 DALI_PROPERTY_TABLE_END( DEFAULT_DERIVED_ACTOR_PROPERTY_START_INDEX )
 
 BaseHandle Create()
@@ -410,22 +410,22 @@ void ImageActor::SetDefaultProperty( Property::Index index, const Property::Valu
   {
     switch(index)
     {
-      case Dali::ImageActor::Property::PixelArea:
+      case Dali::ImageActor::Property::PIXEL_AREA:
       {
         SetPixelArea(propertyValue.Get<Rect<int> >());
         break;
       }
-      case Dali::ImageActor::Property::Style:
+      case Dali::ImageActor::Property::STYLE:
       {
         SetStyle( StyleEnum( propertyValue.Get<std::string>() ) );
         break;
       }
-      case Dali::ImageActor::Property::Border:
+      case Dali::ImageActor::Property::BORDER:
       {
         SetNinePatchBorder( propertyValue.Get<Vector4>(), true /*in pixels*/ );
         break;
       }
-      case Dali::ImageActor::Property::Image:
+      case Dali::ImageActor::Property::IMAGE:
       {
         Dali::Image img = Scripting::NewImage( propertyValue );
         if(img)
@@ -460,23 +460,23 @@ Property::Value ImageActor::GetDefaultProperty( Property::Index index ) const
   {
     switch( index )
     {
-      case Dali::ImageActor::Property::PixelArea:
+      case Dali::ImageActor::Property::PIXEL_AREA:
       {
         Rect<int> r = GetPixelArea();
         ret = r;
         break;
       }
-      case Dali::ImageActor::Property::Style:
+      case Dali::ImageActor::Property::STYLE:
       {
         ret = StyleString( GetStyle() );
         break;
       }
-      case Dali::ImageActor::Property::Border:
+      case Dali::ImageActor::Property::BORDER:
       {
         ret = GetNinePatchBorder();
         break;
       }
-      case Dali::ImageActor::Property::Image:
+      case Dali::ImageActor::Property::IMAGE:
       {
         Property::Map map;
         Scripting::CreatePropertyMap( Dali::Image( mImageAttachment->GetImage().Get() ), map );