Peter M. Groen / dali-demo

Commit 291556e49f2c19e8cc04f2182702dbc1a94bba0a

Authored by György Straub
2 parents 8e7b79aa 893905a5

[dali_1.3.5] Merge branch 'devel/master' 

Change-Id: I0c7ad83a255f66599b11bbb25768bc5d5b54f47d
Inline Side-by-side
Showing 2 changed files with 15 additions and 15 deletions
examples/image-policies/image-policies-example.cpp
  View file @291556e
... ... @@ -100,15 +100,15 @@ class ImagePolicies: public ConnectionTracker
100 100 * param[in] imageFilenameId Which image to load, referring to the array of filenames for this example.
101 101 * return An ImageView with the required set up
102 102 */
103   - ImageView CreateImageView( bool correctionEnabled, DevelImageVisual::LoadPolicy::Type loadPolicy, DevelImageVisual::ReleasePolicy::Type releasePolicy, bool synchronousLoading, unsigned int imageFilenameId )
  103 + ImageView CreateImageView( bool correctionEnabled, ImageVisual::LoadPolicy::Type loadPolicy, ImageVisual::ReleasePolicy::Type releasePolicy, bool synchronousLoading, unsigned int imageFilenameId )
104 104 {
105 105 ImageView imageView = ImageView::New( );
106 106 Property::Map imagePropertyMap;
107 107 imagePropertyMap.Insert( Visual::Property::TYPE, Visual::IMAGE );
108 108 imagePropertyMap.Insert( ImageVisual::Property::URL, IMAGE_PATH[imageFilenameId ] );
109   - imagePropertyMap.Insert( DevelImageVisual::Property::ORIENTATION_CORRECTION, correctionEnabled );
110   - imagePropertyMap.Insert( DevelImageVisual::Property::LOAD_POLICY, loadPolicy );
111   - imagePropertyMap.Insert( DevelImageVisual::Property::RELEASE_POLICY, releasePolicy );
  109 + imagePropertyMap.Insert( ImageVisual::Property::ORIENTATION_CORRECTION, correctionEnabled );
  110 + imagePropertyMap.Insert( ImageVisual::Property::LOAD_POLICY, loadPolicy );
  111 + imagePropertyMap.Insert( ImageVisual::Property::RELEASE_POLICY, releasePolicy );
112 112 if( synchronousLoading )
113 113 {
114 114 imagePropertyMap.Insert( DevelImageVisual::Property::SYNCHRONOUS_LOADING, true );
... ... @@ -144,7 +144,7 @@ class ImagePolicies: public ConnectionTracker
144 144 mInstructions.SetProperty( TextLabel::Property::TEXT, "Orientation Correction not applied");
145 145 mTable.RemoveChildAt( TableView::CellPosition( TableRowPlacement::IMAGE, 0 ) );
146 146 DisableButtonWhilstLoading();
147   - ImageView imageView01 = CreateImageView( false, DevelImageVisual::LoadPolicy::ATTACHED, DevelImageVisual::ReleasePolicy::DESTROYED, false, 3 );
  147 + ImageView imageView01 = CreateImageView( false, ImageVisual::LoadPolicy::ATTACHED, ImageVisual::ReleasePolicy::DESTROYED, false, 3 );
148 148 imageView01.ResourceReadySignal().Connect( this, &ImagePolicies::ResourceReadySignal );
149 149  
150 150 mTable.AddChild( imageView01, TableView::CellPosition( TableRowPlacement::IMAGE, 0 ) );
... ... @@ -158,7 +158,7 @@ class ImagePolicies: public ConnectionTracker
158 158 mInstructions.SetProperty( TextLabel::Property::TEXT, "Orientation Correction applied based on Exif data, now shown in landscape");
159 159 mTable.RemoveChildAt( TableView::CellPosition( TableRowPlacement::IMAGE, 0 ) );
160 160 DisableButtonWhilstLoading();
161   - ImageView imageView01 = CreateImageView( true, DevelImageVisual::LoadPolicy::ATTACHED, DevelImageVisual::ReleasePolicy::DESTROYED, false, 3 );
  161 + ImageView imageView01 = CreateImageView( true, ImageVisual::LoadPolicy::ATTACHED, ImageVisual::ReleasePolicy::DESTROYED, false, 3 );
162 162 imageView01.ResourceReadySignal().Connect( this, &ImagePolicies::ResourceReadySignal );
163 163 mTable.AddChild( imageView01, TableView::CellPosition( TableRowPlacement::IMAGE, 0 ) );
164 164 }
... ... @@ -188,7 +188,7 @@ class ImagePolicies: public ConnectionTracker
188 188 mTable.AddChild( dualImageViewTable, TableView::CellPosition( TableRowPlacement::IMAGE, 0 ) );
189 189  
190 190 DisableButtonWhilstLoading();
191   - mPersistantImageView = CreateImageView( true, DevelImageVisual::LoadPolicy::IMMEDIATE, DevelImageVisual::ReleasePolicy::DESTROYED, false, 4 );
  191 + mPersistantImageView = CreateImageView( true, ImageVisual::LoadPolicy::IMMEDIATE, ImageVisual::ReleasePolicy::DESTROYED, false, 4 );
192 192 mPersistantImageView.ResourceReadySignal().Connect( this, &ImagePolicies::ResourceReadySignal );
193 193 }
194 194  
... ... @@ -216,7 +216,7 @@ class ImagePolicies: public ConnectionTracker
216 216  
217 217 mTable.AddChild( dualImageViewTable, TableView::CellPosition( TableRowPlacement::IMAGE, 0 ) );
218 218  
219   - ImageView imageView02 = CreateImageView( true, DevelImageVisual::LoadPolicy::ATTACHED, DevelImageVisual::ReleasePolicy::DESTROYED, false, 3 );
  219 + ImageView imageView02 = CreateImageView( true, ImageVisual::LoadPolicy::ATTACHED, ImageVisual::ReleasePolicy::DESTROYED, false, 3 );
220 220 imageView02.ResourceReadySignal().Connect( this, &ImagePolicies::ResourceReadySignal );
221 221 dualImageViewTable.AddChild( imageView02, TableView::CellPosition( 0, 0 ) );
222 222 dualImageViewTable.AddChild( mPersistantImageView, TableView::CellPosition( 0, 1 ) );
... ... @@ -240,7 +240,7 @@ class ImagePolicies: public ConnectionTracker
240 240  
241 241 mTable.AddChild( dualImageViewTable, TableView::CellPosition( TableRowPlacement::IMAGE, 0 ) );
242 242  
243   - ImageView imageView01 = CreateImageView( true, DevelImageVisual::LoadPolicy::ATTACHED, DevelImageVisual::ReleasePolicy::DESTROYED, false, 3 );
  243 + ImageView imageView01 = CreateImageView( true, ImageVisual::LoadPolicy::ATTACHED, ImageVisual::ReleasePolicy::DESTROYED, false, 3 );
244 244 imageView01.ResourceReadySignal().Connect( this, &ImagePolicies::ResourceReadySignal );
245 245  
246 246 dualImageViewTable.AddChild( imageView01, TableView::CellPosition( 0, 0 ) );
... ... @@ -263,7 +263,7 @@ class ImagePolicies: public ConnectionTracker
263 263  
264 264 mTable.AddChild( dualImageViewTable, TableView::CellPosition( TableRowPlacement::IMAGE, 0 ) );
265 265  
266   - ImageView imageView01 = CreateImageView( true, DevelImageVisual::LoadPolicy::ATTACHED, DevelImageVisual::ReleasePolicy::DESTROYED, false, 3 );
  266 + ImageView imageView01 = CreateImageView( true, ImageVisual::LoadPolicy::ATTACHED, ImageVisual::ReleasePolicy::DESTROYED, false, 3 );
267 267 imageView01.ResourceReadySignal().Connect( this, &ImagePolicies::ResourceReadySignal );
268 268  
269 269 dualImageViewTable.AddChild( imageView01, TableView::CellPosition( 0, 1 ) );
... ... @@ -286,7 +286,7 @@ class ImagePolicies: public ConnectionTracker
286 286  
287 287 mTable.AddChild( dualImageViewTable, TableView::CellPosition( TableRowPlacement::IMAGE, 0 ) );
288 288  
289   - ImageView imageView01 = CreateImageView( true, DevelImageVisual::LoadPolicy::ATTACHED, DevelImageVisual::ReleasePolicy::DESTROYED, false, 3 );
  289 + ImageView imageView01 = CreateImageView( true, ImageVisual::LoadPolicy::ATTACHED, ImageVisual::ReleasePolicy::DESTROYED, false, 3 );
290 290 imageView01.ResourceReadySignal().Connect( this, &ImagePolicies::ResourceReadySignal );
291 291  
292 292 dualImageViewTable.AddChild( imageView01, TableView::CellPosition( 0, 0 ) );
... ... @@ -303,7 +303,7 @@ class ImagePolicies: public ConnectionTracker
303 303 ImageView imageViewDetached = ImageView::DownCast( dualImageViewTable.GetChildAt( TableView::CellPosition( 0, 0 ) ) );
304 304 dualImageViewTable.RemoveChildAt( TableView::CellPosition( 0, 0 ) );
305 305  
306   - ImageView imageView01 = CreateImageView( true, DevelImageVisual::LoadPolicy::ATTACHED, DevelImageVisual::ReleasePolicy::DESTROYED, false, 3 );
  306 + ImageView imageView01 = CreateImageView( true, ImageVisual::LoadPolicy::ATTACHED, ImageVisual::ReleasePolicy::DESTROYED, false, 3 );
307 307 imageView01.ResourceReadySignal().Connect( this, &ImagePolicies::ResourceReadySignal );
308 308  
309 309 dualImageViewTable.AddChild( imageView01, TableView::CellPosition( 0, 1 ) );
... ... @@ -326,7 +326,7 @@ class ImagePolicies: public ConnectionTracker
326 326  
327 327 mTable.AddChild( dualImageViewTable, TableView::CellPosition( TableRowPlacement::IMAGE, 0 ) );
328 328  
329   - ImageView imageView01 = CreateImageView( true, DevelImageVisual::LoadPolicy::ATTACHED, DevelImageVisual::ReleasePolicy::DETACHED, false, 3 );
  329 + ImageView imageView01 = CreateImageView( true, ImageVisual::LoadPolicy::ATTACHED, ImageVisual::ReleasePolicy::DETACHED, false, 3 );
330 330 imageView01.ResourceReadySignal().Connect( this, &ImagePolicies::ResourceReadySignal );
331 331  
332 332 dualImageViewTable.AddChild( imageView01, TableView::CellPosition( 0, 0 ) );
... ... @@ -344,7 +344,7 @@ class ImagePolicies: public ConnectionTracker
344 344 ImageView imageViewDetached = ImageView::DownCast( dualImageViewTable.GetChildAt( TableView::CellPosition( 0, 0 ) ) );
345 345 dualImageViewTable.RemoveChildAt( TableView::CellPosition( 0, 0 ) );
346 346  
347   - ImageView imageView01 = CreateImageView( true, DevelImageVisual::LoadPolicy::ATTACHED, DevelImageVisual::ReleasePolicy::DESTROYED, false, 3 );
  347 + ImageView imageView01 = CreateImageView( true, ImageVisual::LoadPolicy::ATTACHED, ImageVisual::ReleasePolicy::DESTROYED, false, 3 );
348 348 imageView01.ResourceReadySignal().Connect( this, &ImagePolicies::ResourceReadySignal );
349 349  
350 350 dualImageViewTable.AddChild( imageView01, TableView::CellPosition( 0, 1 ) );
... ...
packaging/com.samsung.dali-demo.spec
  View file @291556e
... ... @@ -2,7 +2,7 @@
2 2  
3 3 Name: com.samsung.dali-demo
4 4 Summary: The OpenGLES Canvas Core Demo
5   -Version: 1.3.4
  5 +Version: 1.3.5
6 6 Release: 1
7 7 Group: System/Libraries
8 8 License: Apache-2.0
... ...