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

Change-Id: I1cd56b9abb236f53ef57625612ce4cd1207ebb7e

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp
index 4e72473..bd74fdb 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp
@@ -354,7 +354,7 @@ int UtcDaliImageViewSetGetProperty03(void)
   Property::Value value = renderer.GetProperty( Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA );
   bool enable;
   DALI_TEST_CHECK( value.Get( enable ) );
-  DALI_TEST_CHECK( enable );
+  DALI_TEST_CHECK( !enable );
 
   // pre-multiplied alpha blending
   imageView.SetProperty( Toolkit::ImageView::Property::PRE_MULTIPLIED_ALPHA, true );
@@ -2403,12 +2403,14 @@ int UtcDaliImageViewReloadFailedOnResourceReadySignal(void)
 
 int UtcDaliImageViewLoadRemoteSVG(void)
 {
-  tet_infoline("Test reloading failed image from within signal handler.");
+  tet_infoline("Test load from a remote server.");
 
   ToolkitTestApplication application;
   Toolkit::ImageView imageView;
   imageView = Toolkit::ImageView::New(  );
   imageView.SetImage("https://dev.w3.org/SVG/tools/svgweb/samples/svg-files/check.svg");
+  // Victor. Temporary (or permanent?) update as the url above seems not to work from time to time ...
+  imageView.SetImage("https://upload.wikimedia.org/wikipedia/commons/thumb/0/02/SVG_logo.svg/64px-SVG_logo.svg.png");
   imageView.SetParentOrigin( ParentOrigin::TOP_LEFT );
   imageView.SetAnchorPoint( AnchorPoint::TOP_LEFT );
   imageView.SetSize(300, 300);

diff --git a/dali-toolkit/internal/visuals/border/border-visual.cpp b/dali-toolkit/internal/visuals/border/border-visual.cpp
index a64b48d..c1ba93b 100644 (file)
--- a/dali-toolkit/internal/visuals/border/border-visual.cpp
+++ b/dali-toolkit/internal/visuals/border/border-visual.cpp
@@ -252,47 +252,6 @@ void BorderVisual::InitializeRenderer()
   mImpl->mTransform.RegisterUniforms( mImpl->mRenderer, Direction::LEFT_TO_RIGHT );
 }
 
-void BorderVisual::SetBorderColor(const Vector4& color)
-{
-  mBorderColor = color;
-
-  if( mImpl->mRenderer )
-  {
-    (mImpl->mRenderer).SetProperty( mBorderColorIndex, color );
-    if( color.a < 1.f )
-    {
-      mImpl->mRenderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON );
-    }
-  }
-}
-
-void BorderVisual::SetBorderSize( float size )
-{
-  mBorderSize = size;
-
-  if( mImpl->mRenderer )
-  {
-    (mImpl->mRenderer).SetProperty( mBorderSizeIndex, size );
-  }
-}
-
-void BorderVisual::RequireAntiAliasing( bool antiAliasing )
-{
-  if( mAntiAliasing != antiAliasing )
-  {
-    mAntiAliasing = antiAliasing;
-    if( mImpl->mRenderer )
-    {
-      Shader borderShader( GetBorderShader() );
-      mImpl->mRenderer.SetShader( borderShader );
-      if( mAntiAliasing )
-      {
-        mImpl->mRenderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON );
-      }
-    }
-  }
-}
-
 Shader BorderVisual::GetBorderShader()
 {
   Shader shader;

diff --git a/dali-toolkit/internal/visuals/border/border-visual.h b/dali-toolkit/internal/visuals/border/border-visual.h
index db4ddb0..c28b041 100644 (file)
--- a/dali-toolkit/internal/visuals/border/border-visual.h
+++ b/dali-toolkit/internal/visuals/border/border-visual.h
@@ -100,26 +100,6 @@ protected:
    */
   void OnSetTransform() override;
 
-public:
-
-  /**
-   * Set the color of the border.
-   * @param[in] color The border color.
-   */
-  void SetBorderColor( const Vector4& color);
-
-  /**
-   * Set the size of the border.
-   * @param[in] size The border size.
-   */
-  void SetBorderSize( float size );
-
-  /**
-   * Enable/Disable the anti-aliasing.
-   * @param[in] enable Whether the anti-aliasing be enabled or not.
-   */
-  void RequireAntiAliasing( bool antiAliasing );
-
 private:
 
   /**

diff --git a/dali-toolkit/internal/visuals/image/image-visual.cpp b/dali-toolkit/internal/visuals/image/image-visual.cpp
index e79edd7..c553ced 100644 (file)
--- a/dali-toolkit/internal/visuals/image/image-visual.cpp
+++ b/dali-toolkit/internal/visuals/image/image-visual.cpp
@@ -203,7 +203,8 @@ ImageVisual::ImageVisual( VisualFactoryCache& factoryCache, ImageVisualShaderFac
   mLoading( false ),
   mOrientationCorrection( true )
 {
-  EnablePreMultipliedAlpha( mFactoryCache.GetPreMultiplyOnLoad() );
+  // PreMultiplied alpha should be disabled when the Image is used.
+  EnablePreMultipliedAlpha( false );
 }
 
 ImageVisual::~ImageVisual()

diff --git a/dali-toolkit/internal/visuals/mesh/mesh-visual.h b/dali-toolkit/internal/visuals/mesh/mesh-visual.h
index 99ed559..15099bd 100644 (file)
--- a/dali-toolkit/internal/visuals/mesh/mesh-visual.h
+++ b/dali-toolkit/internal/visuals/mesh/mesh-visual.h
@@ -109,20 +109,6 @@ protected:
    */
   void DoSetOnStage( Actor& actor ) override;
 
-public:
-
-  /**
-   * Declare whether a texture map should be used for the object, if it's present. Defaults to true.
-   * @param[in] useTexture boolean declaration.
-   */
-  void SetUseTexture( bool useTexture );
-
-  /**
-   * Declare whether a normal map should be used for the object, if it's present. Defaults to true.
-   * @param[in] useNormalMap boolean declaration.
-   */
-  void SetUseNormalMap( bool useNormalMap );
-
 private:
 
   /**

diff --git a/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp
index e5e237b..10384f3 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 = 9;
-const unsigned int TOOLKIT_MICRO_VERSION = 2;
+const unsigned int TOOLKIT_MICRO_VERSION = 3;
 const char * const TOOLKIT_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED

diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index 358197c..dd64299 100644 (file)
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -1,6 +1,6 @@
 Name:       dali-toolkit
 Summary:    Dali 3D engine Toolkit
-Version:    1.9.2
+Version:    1.9.3
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause and MIT