Update toolkit with ResourceImage/Image split

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / shader-effects / nine-patch-mask-effect.cpp

diff --git a/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.cpp b/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.cpp
index bfaba3d..c18d9e7 100644 (file)
--- a/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.cpp
+++ b/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.cpp
@@ -20,6 +20,7 @@
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
+#include <dali/public-api/images/resource-image.h>
 
 namespace Dali
 {
@@ -83,7 +84,7 @@ static void DoApply( ImageActor actor, const std::string& maskImage, const Vecto
     GeometryType( GEOMETRY_TYPE_IMAGE ),
     ShaderEffect::GeometryHints( ShaderEffect::HINT_BLENDING ) );
 
-  maskEffect.SetEffectImage( Image::New( maskImage ) );
+  maskEffect.SetEffectImage( ResourceImage::New( maskImage ) );
 
   maskEffect.SetUniform( "uImageSize", Vector2(0,0) /*Constrained to actor size*/ );
   maskEffect.ApplyConstraint( Constraint::New<Vector2>( maskEffect.GetPropertyIndex("uImageSize"),
@@ -101,7 +102,7 @@ static void DoApply( ImageActor actor, const std::string& maskImage, const Vecto
 
 void Apply( ImageActor actor, const std::string& maskImage )
 {
-  Vector2 maskSize = Image::GetImageSize( maskImage );
+  Vector2 maskSize = ResourceImage::GetImageSize( maskImage );
 
   const float leftRight = (maskSize.width  - 1.0f) * 0.5f;
   const float topBottom = (maskSize.height - 1.0f) * 0.5f;
@@ -111,7 +112,7 @@ void Apply( ImageActor actor, const std::string& maskImage )
 
 void Apply( ImageActor actor, const std::string& maskImage, const Vector4& maskBorder )
 {
-  Vector2 maskSize = Image::GetImageSize( maskImage );
+  Vector2 maskSize = ResourceImage::GetImageSize( maskImage );
 
   DoApply( actor, maskImage, maskSize, maskBorder );
 }