Merge changes I7066e6c1,I3f0c228e into devel/master

* changes:
  Implement default height for width and width for height for visuals and remove obsolete code from ImageView
  Stop unnecessary copying of property maps in ImageView::SetImage

diff --git a/dali-toolkit/internal/visuals/visual-base-impl.cpp b/dali-toolkit/internal/visuals/visual-base-impl.cpp
index a8ae21c..0958afa 100644 (file)
--- a/dali-toolkit/internal/visuals/visual-base-impl.cpp
+++ b/dali-toolkit/internal/visuals/visual-base-impl.cpp
@@ -90,7 +90,7 @@ void Visual::Base::SetProperties( const Property::Map& propertyMap )
 
       case DevelVisual::Property::PREMULTIPLIED_ALPHA:
       {
-        bool premultipliedAlpha( premultipliedAlpha );
+        bool premultipliedAlpha = false;
         if( value.Get( premultipliedAlpha ) )
         {
           EnablePreMultipliedAlpha( premultipliedAlpha );

diff --git a/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp
index 1dd62e2..2a95e7b 100644 (file)
--- a/dali-toolkit/public-api/dali-toolkit-version.cpp
+++ b/dali-toolkit/public-api/dali-toolkit-version.cpp
@@ -31,7 +31,7 @@ namespace Toolkit
 
 const unsigned int TOOLKIT_MAJOR_VERSION = 1;
 const unsigned int TOOLKIT_MINOR_VERSION = 2;
-const unsigned int TOOLKIT_MICRO_VERSION = 17;
+const unsigned int TOOLKIT_MICRO_VERSION = 18;
 const char * const TOOLKIT_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED

diff --git a/packaging/dali-addon.spec b/packaging/dali-addon.spec
index 8332295..d2698ab 100644 (file)
--- a/packaging/dali-addon.spec
+++ b/packaging/dali-addon.spec
@@ -1,6 +1,6 @@
 Name:       dali-addon
 Summary:    DALi module for Node.JS
-Version:    1.2.17
+Version:    1.2.18
 Release:    1
 Group:      Development/Libraries
 License:    Apache License, Version 2.0

diff --git a/packaging/dali-csharp-wrapper.spec b/packaging/dali-csharp-wrapper.spec
index 9d65583..c4ba2f0 100755 (executable)
--- a/packaging/dali-csharp-wrapper.spec
+++ b/packaging/dali-csharp-wrapper.spec
@@ -1,6 +1,6 @@
 Name:       NDalic
 Summary:    dali wrapper
-Version:    1.2.17
+Version:    1.2.18
 Release:    1
 Group:      uifw/graphic
 License:    TO_BE_FILLED_IN

diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index 8bf790b..ed8389c 100644 (file)
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -1,6 +1,6 @@
 Name:       dali-toolkit
 Summary:    The OpenGLES Canvas Core Library Toolkit
-Version:    1.2.17
+Version:    1.2.18
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-2-Clause and MIT