X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fimage-view%2Fmasked-image-view-impl.cpp;h=2dc796c9c3b71cf15ce2bdb872bdc760fcacc510;hb=ffe0742468a71b93445f53863252be639bf3fe99;hp=fad0ade62bede248b9d15471d52c9297693ba3e1;hpb=57869973578f6a0b0f836d396c7232ddb8302c6b;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/image-view/masked-image-view-impl.cpp b/dali-toolkit/internal/controls/image-view/masked-image-view-impl.cpp index fad0ade..2dc796c 100644 --- a/dali-toolkit/internal/controls/image-view/masked-image-view-impl.cpp +++ b/dali-toolkit/internal/controls/image-view/masked-image-view-impl.cpp @@ -20,6 +20,8 @@ // EXTERNAL INCLUDES #include +#include +#include #include #include #include @@ -522,7 +524,7 @@ void MaskedImageView::Initialize( unsigned int targetWidth, self.Add( mSourceImageActor ); mSourceImageActor.SetParentOrigin( ParentOrigin::CENTER ); mSourceImageActor.SetPositionInheritanceMode( DONT_INHERIT_POSITION ); - mSourceImageActor.SetInheritRotation( false ); + mSourceImageActor.SetInheritOrientation( false ); mSourceImageActor.SetInheritScale( false ); mSourceImageActor.SetColorMode( USE_OWN_COLOR ); mSourceImageActor.SetSize( Vector3::ONE ); @@ -543,7 +545,7 @@ void MaskedImageView::Initialize( unsigned int targetWidth, mRenderTask.SetInputEnabled( false ); mRenderTask.SetExclusive( true ); mRenderTask.SetClearEnabled( true ); - mRenderTask.ApplyConstraint( Constraint::New( RenderTask::CLEAR_COLOR, + mRenderTask.ApplyConstraint( Constraint::New( RenderTask::Property::CLEAR_COLOR, Source( self, mCustomProperties[ Dali::Toolkit::MaskedImageView::BACKGROUND_COLOR ] ), EqualToConstraint() ) ); mRenderTask.FinishedSignal().Connect( this, &MaskedImageView::OnRenderTaskFinished );