Merge branch 'devel/master' into tizen

diff --git a/examples/image-scaling-irregular-grid/grid-flags.h b/examples/image-scaling-irregular-grid/grid-flags.h
index 01bb44f..1c151cc 100644 (file)
--- a/examples/image-scaling-irregular-grid/grid-flags.h
+++ b/examples/image-scaling-irregular-grid/grid-flags.h
@@ -1,5 +1,5 @@
-#ifndef __DALI_DEMO_GRID_FLAGS_H_
-#define __DALI_DEMO_GRID_FLAGS_H_
+#ifndef DALI_DEMO_GRID_FLAGS_H
+#define DALI_DEMO_GRID_FLAGS_H
 /*
  * Copyright (c) 2014 Samsung Electronics Co., Ltd.
  *
@@ -197,7 +197,8 @@ private:
   unsigned mHighestUsedRow;
 };
 
-} /* namespace Demo */
-} /* namespace Dali */
+} // namespace Demo
 
-#endif /* __DALI_DEMO_GRID_FLAGS_H_ */
+} // namespace Dali
+
+#endif // DALI_DEMO_GRID_FLAGS_H

diff --git a/examples/image-view-url/image-view-url-example.cpp b/examples/image-view-url/image-view-url-example.cpp
index 624709e..2a1b0a0 100644 (file)
--- a/examples/image-view-url/image-view-url-example.cpp
+++ b/examples/image-view-url/image-view-url-example.cpp
@@ -57,8 +57,9 @@ const Vector2 TARGET_SIZE(800.f, 800.f);
 class ImageViewUrlApp : public ConnectionTracker
 {
 public:
-  ImageViewUrlApp( Application& application )
+  ImageViewUrlApp( Application& application, std::string url )
   : mApplication( application ),
+    mUrl( url ),
     mDeltaPropertyIndex( Property::INVALID_INDEX )
   {
     // Connect to the Application's Init signal
@@ -95,11 +96,17 @@ private:
                         Toolkit::Alignment::HorizontalRight,
                         DemoHelper::DEFAULT_MODE_SWITCH_PADDING  );
 
-    CreateRenderTask(  );
+    std::string url = mUrl;
+    if( url.empty() )
+    {
+      url = BIG_TEST_IMAGE;
+    }
+
+    CreateRenderTask( url );
     CreateScene( );
   }
 
-  void CreateRenderTask()
+  void CreateRenderTask( const std::string& url )
   {
     auto rootActor = Stage::GetCurrent().GetRootLayer();
 
@@ -110,7 +117,7 @@ private:
 
     {
       // create actor to render input with applied shader
-      mActorForInput = Toolkit::ImageView::New(BIG_TEST_IMAGE);
+      mActorForInput = Toolkit::ImageView::New( url );
       mActorForInput.SetParentOrigin(ParentOrigin::CENTER);
       mActorForInput.SetSize(TARGET_SIZE);
       Property::Map customShader;
@@ -191,6 +198,7 @@ private:
 
 private:
   Application&  mApplication;
+  std::string mUrl;
   Layer mContent;
   Toolkit::ImageView mImageView;
   Animation mAnimation;
@@ -202,7 +210,14 @@ private:
 int DALI_EXPORT_API main( int argc, char **argv )
 {
   Application application = Application::New( &argc, &argv );
-  ImageViewUrlApp test( application );
+
+  std::string url;
+  if( argc > 1 )
+  {
+    url = argv[1];
+  }
+
+  ImageViewUrlApp test( application, url );
   application.MainLoop();
   return 0;
 }

diff --git a/examples/text-label-emojis/emoji-strings.h b/examples/text-label-emojis/emoji-strings.h
index 81c8a6f..99822a8 100644 (file)
--- a/examples/text-label-emojis/emoji-strings.h
+++ b/examples/text-label-emojis/emoji-strings.h
@@ -1,5 +1,5 @@
-#ifndef __DALI_DEMO_EMOJI_STRINGS_H__
-#define __DALI_DEMO_EMOJI_STRINGS_H__
+#ifndef DALI_DEMO_EMOJI_STRINGS_H
+#define DALI_DEMO_EMOJI_STRINGS_H
 
 /*
  * Copyright (c) 2015 Samsung Electronics Co., Ltd.
@@ -100,4 +100,4 @@ namespace EmojiStrings
 
 } // EmojiStrings
 
-#endif // __DALI_DEMO_EMOJI_STRINGS_H__
+#endif // DALI_DEMO_EMOJI_STRINGS_H

diff --git a/packaging/com.samsung.dali-demo.spec b/packaging/com.samsung.dali-demo.spec
index f1dfb2c..883fa8e 100755 (executable)
--- a/packaging/com.samsung.dali-demo.spec
+++ b/packaging/com.samsung.dali-demo.spec
@@ -2,7 +2,7 @@
 
 Name:       com.samsung.dali-demo
 Summary:    The OpenGLES Canvas Core Demo
-Version:    1.4.19
+Version:    1.4.22
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0

diff --git a/shared/multi-language-strings.h b/shared/multi-language-strings.h
index f5f1675..5879d03 100644 (file)
--- a/shared/multi-language-strings.h
+++ b/shared/multi-language-strings.h
@@ -1,5 +1,5 @@
-#ifndef __DALI_DEMO_MULTI_LANGUAGE_STRINGS_H__
-#define __DALI_DEMO_MULTI_LANGUAGE_STRINGS_H__
+#ifndef DALI_DEMO_MULTI_LANGUAGE_STRINGS_H
+#define DALI_DEMO_MULTI_LANGUAGE_STRINGS_H
 
 /*
  * Copyright (c) 2015 Samsung Electronics Co., Ltd.
@@ -227,4 +227,4 @@ namespace MultiLanguageStrings
 
 } // MultiLanguageStrings
 
-#endif // __DALI_DEMO_MULTI_LANGUAGE_STRINGS_H__
+#endif // DALI_DEMO_MULTI_LANGUAGE_STRINGS_H

diff --git a/shared/view.h b/shared/view.h
index 6ec55d0..4497a63 100644 (file)
--- a/shared/view.h
+++ b/shared/view.h
@@ -1,5 +1,5 @@
-#ifndef __DALI_DEMO_HELPER_VIEW_H__
-#define __DALI_DEMO_HELPER_VIEW_H__
+#ifndef DALI_DEMO_HELPER_VIEW_H
+#define DALI_DEMO_HELPER_VIEW_H
 
 /*
  * Copyright (c) 2014 Samsung Electronics Co., Ltd.
@@ -177,4 +177,4 @@ Dali::Toolkit::TextLabel CreateToolBarLabel( const std::string& text )
 
 } // DemoHelper
 
-#endif // __DALI_DEMO_HELPER_VIEW_H__
+#endif // DALI_DEMO_HELPER_VIEW_H