summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorminho.sun <minho.sun@samsung.com>2017-12-18 18:12:53 +0900
committerminho.sun <minho.sun@samsung.com>2017-12-20 21:29:16 +0900
commitfaa84f9872f84bf39709af646b9b3391ad9ac64e (patch)
tree4069c387d333d55de4a6a372bb8b835b2da8fe9b
parenta4fde166a980a76cf2b4d6bdd52e55db8ad48afd (diff)
downloaddali-demo-faa84f9872f84bf39709af646b9b3391ad9ac64e.tar.gz
dali-demo-faa84f9872f84bf39709af646b9b3391ad9ac64e.tar.bz2
dali-demo-faa84f9872f84bf39709af646b9b3391ad9ac64e.zip
Fix build error caused by moving some devel apis to public
Change-Id: Icc1d846994304d458d4896d9d3b6f70042848ee2 Signed-off-by: minho.sun <minho.sun@samsung.com>
-rw-r--r--examples/image-policies/image-policies-example.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/examples/image-policies/image-policies-example.cpp b/examples/image-policies/image-policies-example.cpp
index a630742d..c96b7b39 100644
--- a/examples/image-policies/image-policies-example.cpp
+++ b/examples/image-policies/image-policies-example.cpp
@@ -100,15 +100,15 @@ class ImagePolicies: public ConnectionTracker
* param[in] imageFilenameId Which image to load, referring to the array of filenames for this example.
* return An ImageView with the required set up
*/
- ImageView CreateImageView( bool correctionEnabled, DevelImageVisual::LoadPolicy::Type loadPolicy, DevelImageVisual::ReleasePolicy::Type releasePolicy, bool synchronousLoading, unsigned int imageFilenameId )
+ ImageView CreateImageView( bool correctionEnabled, ImageVisual::LoadPolicy::Type loadPolicy, ImageVisual::ReleasePolicy::Type releasePolicy, bool synchronousLoading, unsigned int imageFilenameId )
{
ImageView imageView = ImageView::New( );
Property::Map imagePropertyMap;
imagePropertyMap.Insert( Visual::Property::TYPE, Visual::IMAGE );
imagePropertyMap.Insert( ImageVisual::Property::URL, IMAGE_PATH[imageFilenameId ] );
- imagePropertyMap.Insert( DevelImageVisual::Property::ORIENTATION_CORRECTION, correctionEnabled );
- imagePropertyMap.Insert( DevelImageVisual::Property::LOAD_POLICY, loadPolicy );
- imagePropertyMap.Insert( DevelImageVisual::Property::RELEASE_POLICY, releasePolicy );
+ imagePropertyMap.Insert( ImageVisual::Property::ORIENTATION_CORRECTION, correctionEnabled );
+ imagePropertyMap.Insert( ImageVisual::Property::LOAD_POLICY, loadPolicy );
+ imagePropertyMap.Insert( ImageVisual::Property::RELEASE_POLICY, releasePolicy );
if( synchronousLoading )
{
imagePropertyMap.Insert( DevelImageVisual::Property::SYNCHRONOUS_LOADING, true );
@@ -144,7 +144,7 @@ class ImagePolicies: public ConnectionTracker
mInstructions.SetProperty( TextLabel::Property::TEXT, "Orientation Correction not applied");
mTable.RemoveChildAt( TableView::CellPosition( TableRowPlacement::IMAGE, 0 ) );
DisableButtonWhilstLoading();
- ImageView imageView01 = CreateImageView( false, DevelImageVisual::LoadPolicy::ATTACHED, DevelImageVisual::ReleasePolicy::DESTROYED, false, 3 );
+ ImageView imageView01 = CreateImageView( false, ImageVisual::LoadPolicy::ATTACHED, ImageVisual::ReleasePolicy::DESTROYED, false, 3 );
imageView01.ResourceReadySignal().Connect( this, &ImagePolicies::ResourceReadySignal );
mTable.AddChild( imageView01, TableView::CellPosition( TableRowPlacement::IMAGE, 0 ) );
@@ -158,7 +158,7 @@ class ImagePolicies: public ConnectionTracker
mInstructions.SetProperty( TextLabel::Property::TEXT, "Orientation Correction applied based on Exif data, now shown in landscape");
mTable.RemoveChildAt( TableView::CellPosition( TableRowPlacement::IMAGE, 0 ) );
DisableButtonWhilstLoading();
- ImageView imageView01 = CreateImageView( true, DevelImageVisual::LoadPolicy::ATTACHED, DevelImageVisual::ReleasePolicy::DESTROYED, false, 3 );
+ ImageView imageView01 = CreateImageView( true, ImageVisual::LoadPolicy::ATTACHED, ImageVisual::ReleasePolicy::DESTROYED, false, 3 );
imageView01.ResourceReadySignal().Connect( this, &ImagePolicies::ResourceReadySignal );
mTable.AddChild( imageView01, TableView::CellPosition( TableRowPlacement::IMAGE, 0 ) );
}
@@ -188,7 +188,7 @@ class ImagePolicies: public ConnectionTracker
mTable.AddChild( dualImageViewTable, TableView::CellPosition( TableRowPlacement::IMAGE, 0 ) );
DisableButtonWhilstLoading();
- mPersistantImageView = CreateImageView( true, DevelImageVisual::LoadPolicy::IMMEDIATE, DevelImageVisual::ReleasePolicy::DESTROYED, false, 4 );
+ mPersistantImageView = CreateImageView( true, ImageVisual::LoadPolicy::IMMEDIATE, ImageVisual::ReleasePolicy::DESTROYED, false, 4 );
mPersistantImageView.ResourceReadySignal().Connect( this, &ImagePolicies::ResourceReadySignal );
}
@@ -216,7 +216,7 @@ class ImagePolicies: public ConnectionTracker
mTable.AddChild( dualImageViewTable, TableView::CellPosition( TableRowPlacement::IMAGE, 0 ) );
- ImageView imageView02 = CreateImageView( true, DevelImageVisual::LoadPolicy::ATTACHED, DevelImageVisual::ReleasePolicy::DESTROYED, false, 3 );
+ ImageView imageView02 = CreateImageView( true, ImageVisual::LoadPolicy::ATTACHED, ImageVisual::ReleasePolicy::DESTROYED, false, 3 );
imageView02.ResourceReadySignal().Connect( this, &ImagePolicies::ResourceReadySignal );
dualImageViewTable.AddChild( imageView02, TableView::CellPosition( 0, 0 ) );
dualImageViewTable.AddChild( mPersistantImageView, TableView::CellPosition( 0, 1 ) );
@@ -240,7 +240,7 @@ class ImagePolicies: public ConnectionTracker
mTable.AddChild( dualImageViewTable, TableView::CellPosition( TableRowPlacement::IMAGE, 0 ) );
- ImageView imageView01 = CreateImageView( true, DevelImageVisual::LoadPolicy::ATTACHED, DevelImageVisual::ReleasePolicy::DESTROYED, false, 3 );
+ ImageView imageView01 = CreateImageView( true, ImageVisual::LoadPolicy::ATTACHED, ImageVisual::ReleasePolicy::DESTROYED, false, 3 );
imageView01.ResourceReadySignal().Connect( this, &ImagePolicies::ResourceReadySignal );
dualImageViewTable.AddChild( imageView01, TableView::CellPosition( 0, 0 ) );
@@ -263,7 +263,7 @@ class ImagePolicies: public ConnectionTracker
mTable.AddChild( dualImageViewTable, TableView::CellPosition( TableRowPlacement::IMAGE, 0 ) );
- ImageView imageView01 = CreateImageView( true, DevelImageVisual::LoadPolicy::ATTACHED, DevelImageVisual::ReleasePolicy::DESTROYED, false, 3 );
+ ImageView imageView01 = CreateImageView( true, ImageVisual::LoadPolicy::ATTACHED, ImageVisual::ReleasePolicy::DESTROYED, false, 3 );
imageView01.ResourceReadySignal().Connect( this, &ImagePolicies::ResourceReadySignal );
dualImageViewTable.AddChild( imageView01, TableView::CellPosition( 0, 1 ) );
@@ -286,7 +286,7 @@ class ImagePolicies: public ConnectionTracker
mTable.AddChild( dualImageViewTable, TableView::CellPosition( TableRowPlacement::IMAGE, 0 ) );
- ImageView imageView01 = CreateImageView( true, DevelImageVisual::LoadPolicy::ATTACHED, DevelImageVisual::ReleasePolicy::DESTROYED, false, 3 );
+ ImageView imageView01 = CreateImageView( true, ImageVisual::LoadPolicy::ATTACHED, ImageVisual::ReleasePolicy::DESTROYED, false, 3 );
imageView01.ResourceReadySignal().Connect( this, &ImagePolicies::ResourceReadySignal );
dualImageViewTable.AddChild( imageView01, TableView::CellPosition( 0, 0 ) );
@@ -303,7 +303,7 @@ class ImagePolicies: public ConnectionTracker
ImageView imageViewDetached = ImageView::DownCast( dualImageViewTable.GetChildAt( TableView::CellPosition( 0, 0 ) ) );
dualImageViewTable.RemoveChildAt( TableView::CellPosition( 0, 0 ) );
- ImageView imageView01 = CreateImageView( true, DevelImageVisual::LoadPolicy::ATTACHED, DevelImageVisual::ReleasePolicy::DESTROYED, false, 3 );
+ ImageView imageView01 = CreateImageView( true, ImageVisual::LoadPolicy::ATTACHED, ImageVisual::ReleasePolicy::DESTROYED, false, 3 );
imageView01.ResourceReadySignal().Connect( this, &ImagePolicies::ResourceReadySignal );
dualImageViewTable.AddChild( imageView01, TableView::CellPosition( 0, 1 ) );
@@ -326,7 +326,7 @@ class ImagePolicies: public ConnectionTracker
mTable.AddChild( dualImageViewTable, TableView::CellPosition( TableRowPlacement::IMAGE, 0 ) );
- ImageView imageView01 = CreateImageView( true, DevelImageVisual::LoadPolicy::ATTACHED, DevelImageVisual::ReleasePolicy::DETACHED, false, 3 );
+ ImageView imageView01 = CreateImageView( true, ImageVisual::LoadPolicy::ATTACHED, ImageVisual::ReleasePolicy::DETACHED, false, 3 );
imageView01.ResourceReadySignal().Connect( this, &ImagePolicies::ResourceReadySignal );
dualImageViewTable.AddChild( imageView01, TableView::CellPosition( 0, 0 ) );
@@ -344,7 +344,7 @@ class ImagePolicies: public ConnectionTracker
ImageView imageViewDetached = ImageView::DownCast( dualImageViewTable.GetChildAt( TableView::CellPosition( 0, 0 ) ) );
dualImageViewTable.RemoveChildAt( TableView::CellPosition( 0, 0 ) );
- ImageView imageView01 = CreateImageView( true, DevelImageVisual::LoadPolicy::ATTACHED, DevelImageVisual::ReleasePolicy::DESTROYED, false, 3 );
+ ImageView imageView01 = CreateImageView( true, ImageVisual::LoadPolicy::ATTACHED, ImageVisual::ReleasePolicy::DESTROYED, false, 3 );
imageView01.ResourceReadySignal().Connect( this, &ImagePolicies::ResourceReadySignal );
dualImageViewTable.AddChild( imageView01, TableView::CellPosition( 0, 1 ) );