platform/core/uifw/dali-core.git
7 years agoMerge branch 'devel/master (1.2.30)' into tizen 84/118584/1 accepted/tizen/common/20170313.162729 accepted/tizen/ivi/20170314.074858 accepted/tizen/mobile/20170314.074519 accepted/tizen/tv/20170314.074720 accepted/tizen/unified/20170314.074946 accepted/tizen/wearable/20170314.074811 submit/tizen/20170313.134641
taeyoon0.lee [Mon, 13 Mar 2017 07:59:15 +0000 (16:59 +0900)]
Merge branch 'devel/master (1.2.30)' into tizen

Change-Id: I19c3213108f8344b7cebff09f9d5a7da8c43373e

7 years agoDALi Version 1.2.30 61/118461/1 dali_1.2.30
David Steele [Fri, 10 Mar 2017 15:00:28 +0000 (15:00 +0000)]
DALi Version 1.2.30

Change-Id: If1de12dcfcde05eabb9cd9647dbdbca115c7ef7b

7 years agoAdded a property to allow an actor to ignore the anchor-point for its position 11/117811/10
Adeel Kazmi [Tue, 7 Mar 2017 12:21:08 +0000 (12:21 +0000)]
Added a property to allow an actor to ignore the anchor-point for its position

In that scenario, TOP_LEFT is assumed.

Change-Id: Id57829b9488b0f3d3546354d51900941ca92affa

7 years agoMerge "Fix memory leaks detected by Valgrind" into devel/master
Kimmo Hoikka [Wed, 8 Mar 2017 16:02:24 +0000 (08:02 -0800)]
Merge "Fix memory leaks detected by Valgrind" into devel/master

7 years agoAdded Get Screen Position functionality to Actor 99/117599/7
Agnelo Vaz [Mon, 6 Mar 2017 19:18:05 +0000 (19:18 +0000)]
Added Get Screen Position functionality to Actor

Screen coordinates TOP_LEFT is 0,0
This property will return the position of the Actor relative to the TOP_LEFT
The returned position is the position of the actor's Anchor point.
Actor Scaling is supported.
Actor Rotation is not supported.

Change-Id: I8519f2b82ab9f9ac8eec197e783a66dcf5ba949c

7 years agoFix memory leaks detected by Valgrind 15/117015/3
Nick Holland [Tue, 7 Mar 2017 16:03:00 +0000 (16:03 +0000)]
Fix memory leaks detected by Valgrind

Fixes the following memory leaks reported by Valgrind
that can occur when messages with raw pointers are sent
from event -> update (and update -> render)
and dali shutdowns before update or render has had chance
to process those messages

- AddSampler ( sampler is lost )
- AddPropertyBuffer ( property buffer is lost )
- SetPropertyBufferFormat( property buffer format is lost )
- AddGeometry ( geometry data  is lost )
- AddTexture ( texture data is lost )

event -> update
- AddCameraMessage ( Camera is lost )
- AddObjectMessage ( Object is lost )
- AddPropertyNotificationMessage ( PropertyNotification is lost )
- AddGestureMessage ( PanGesture is lost )
- AddSamplerMessage( sampler is lost )
- AddPropertyBuffer( property buffer is lost )
- SetPropertyBufferFormat( property buffer format is lost )
- SetPropertyBufferData( property data is lost )
- AddGeometry( geometry is lost)

Also removes PropertyBuffer data and format from being duplicated
on the event side.

Change-Id: Iac6d446bd2b5372cea7ec101e2e289ef3f284b4c

7 years agoMerge "Added checks to Sibling Order Raise/Lower API" into devel/master
Adeel Kazmi [Mon, 6 Mar 2017 14:31:57 +0000 (06:31 -0800)]
Merge "Added checks to Sibling Order Raise/Lower API" into devel/master

7 years agoMerge "Valgrind fix for uninitialized values in Render::Sampler" into devel/master
Adeel Kazmi [Mon, 6 Mar 2017 13:37:12 +0000 (05:37 -0800)]
Merge "Valgrind fix for uninitialized values in Render::Sampler" into devel/master

7 years agoAdded checks to Sibling Order Raise/Lower API 12/117312/4
Agnelo Vaz [Fri, 3 Mar 2017 16:51:12 +0000 (16:51 +0000)]
Added checks to Sibling Order Raise/Lower API

Added checks to ensure target actor and actor raising or lowering belong to the same parent

Also checks that both actors are parented.

Change-Id: I346ead160a72cad12192cf4f6b771cf82bb43930

7 years agoDALi Version 1.2.29 90/117290/1 dali_1.2.29
Agnelo Vaz [Fri, 3 Mar 2017 14:05:22 +0000 (14:05 +0000)]
DALi Version 1.2.29

Change-Id: I4589137dbd69c6c6cbbdece518324b146a58b45a

7 years agoValgrind fix for uninitialized values in Render::Sampler 71/117271/2
Nick Holland [Fri, 3 Mar 2017 12:23:06 +0000 (12:23 +0000)]
Valgrind fix for uninitialized values in Render::Sampler

Valgrind reported conditional jump depends on uninit values in:
  if( mSampler.mBitField != oldSampler.mBitField ) // Texture::ApplySampler

Problem was down to Sampler having a anonymous union:

  union
  {
    unsigned int mBitfield;

    struct
    {
      FilterMode  mMinificationFilter   : 4;    ///< The minify filter
      FilterMode  mMagnificationFilter  : 4;    ///< The magnify filter
      WrapMode    mSWrapMode            : 4;    ///< The horizontal wrap mode
      WrapMode    mTWrapMode            : 4;    ///< The vertical wrap mode
      WrapMode    mRWrapMode            : 4;    ///< The vertical wrap mode
    };
  };

Fundamentally the size of the bit field struct
can be larger than the size of the unsigned int mBitfield, so using mBitfield to compare Samplers
isn't reliable.

The issue valgrind picked up on is, only 20 bits of the
mBitfield are being set in the sampler constructor
  Sampler()
  :mMinificationFilter(FilterMode::DEFAULT),
   mMagnificationFilter(FilterMode::DEFAULT),
   mSWrapMode(WrapMode::DEFAULT),
   mTWrapMode(WrapMode::DEFAULT),
   mRWrapMode(WrapMode::DEFAULT)
  {}

Solution is to remove the union

Change-Id: Id66afc05d21377a1363448ef10654cd1ab4bb365

7 years agoMerge "Fix Message Buffer leak and added DEBUG_ASSERT for leaking nodes" into devel...
Paul Wisbey [Thu, 2 Mar 2017 15:24:07 +0000 (07:24 -0800)]
Merge "Fix Message Buffer leak and added DEBUG_ASSERT for leaking nodes" into devel/master

7 years agoMerge "(Actor) Fix documentation in sibling order methods" into devel/master
Adeel Kazmi [Thu, 2 Mar 2017 15:17:46 +0000 (07:17 -0800)]
Merge "(Actor) Fix documentation in sibling order methods" into devel/master

7 years ago(Actor) Fix documentation in sibling order methods 75/117075/2
Adeel Kazmi [Thu, 2 Mar 2017 13:46:52 +0000 (13:46 +0000)]
(Actor) Fix documentation in sibling order methods

Change-Id: Ib3ffe6e8c8f5e1f249f0a6f5e5439e174f883a4f

7 years agoCheck memory being free'd from a memory pool, belongs to it. 61/115861/3
Nick Holland [Tue, 21 Feb 2017 15:59:47 +0000 (15:59 +0000)]
Check memory being free'd from a memory pool, belongs to it.

Memory leak detected by Valgrind due to Scene Graph Layers
being deleted from a memory pool, even though they were heap
allocated.

Assert currently fires on shutting down dali-demo, and when
using text-editor.example

Leak fixed in
https://review.tizen.org/gerrit/#/c/115115/

Change-Id: I1254b56a3f3be17d662fb0622ebe407874df71cc

7 years agoFix Message Buffer leak and added DEBUG_ASSERT for leaking nodes 87/116687/9
Nick Holland [Mon, 27 Feb 2017 15:11:26 +0000 (15:11 +0000)]
Fix Message Buffer leak and added DEBUG_ASSERT for leaking nodes

Current message queue is not cleared when update is destroyed
This is 1 cause of Node leak.
Second cause of Node leak is InstallRootMessage passes a layer
as a raw pointer. If update doesn't run ( doesn't run in the test
cases), then we leak the layer (node).

Also added DEBUG_ASSERT to check for leaking scene graph Nodes

Change-Id: Ibfbb73ee840cbeaf33104da6769945cf9b3aafbc

7 years agoFix memory leak, scene graph layers are never deleted from memory 15/115115/11
Nick Holland [Thu, 16 Feb 2017 09:21:52 +0000 (09:21 +0000)]
Fix memory leak, scene graph layers are never deleted from memory

Reported by Valgrind.
We have a memory pool for Nodes which works fine
for creating /deleting nodes.

Scene Graph Layers inherit from Nodes, but don't use
the memory pool.

However when either a Node or a Layer is deleted, the overloaded
Node operator delete( void* ptr ) is called, which tries to free
the Node from the memory pool.
Unfortunately for Layer it was never in the memory pool so no
memory is free'd.

Fix includes:
node destructor is protected
layer destructor is private
node delete operator removed

Change-Id: Icfe83f35b4f29d5b774cde392ff976ad299481c5

7 years agoMerge branch 'devel/master' into tizen 16/116516/1 accepted/tizen/common/20170306.164838 accepted/tizen/ivi/20170306.103411 accepted/tizen/mobile/20170306.103008 accepted/tizen/tv/20170306.103225 accepted/tizen/unified/20170309.034124 accepted/tizen/wearable/20170306.103316 submit/tizen/20170227.051047 submit/tizen/20170228.014422 submit/tizen/20170306.033709 submit/tizen_unified/20170308.100410
suhyung Eom [Mon, 27 Feb 2017 01:45:26 +0000 (10:45 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: I144178875966058c0066bb7d84d84d38b350c59e

7 years agoRevert "[Tizen] Prepare for Tizen 4.0 Build" 15/116515/1
suhyung Eom [Mon, 27 Feb 2017 01:40:11 +0000 (10:40 +0900)]
Revert "[Tizen] Prepare for Tizen 4.0 Build"

This reverts commit 9bfeb6931423b3712d01c06beda2569c54f986b8.
Change-Id: I0b41dd87eaeeaa6dcba24ec858d38a918edd57cf

7 years agoAdding Raise Lower API to Actor 22/114722/18
Agnelo Vaz [Tue, 14 Feb 2017 19:44:12 +0000 (19:44 +0000)]
Adding Raise Lower API to Actor

Devel API to allow the raising and lowering of the Actor's sibbling level.

Change-Id: I86c03d43d962441fd295dbf024092d42e78d9c0e

7 years agoMerge "Removed redundant resource loading & rendering code" into devel/master
Adeel Kazmi [Fri, 24 Feb 2017 14:25:24 +0000 (06:25 -0800)]
Merge "Removed redundant resource loading & rendering code" into devel/master

7 years agoDALi Version 1.2.28 46/116446/1 dali_1.2.28
Adeel Kazmi [Fri, 24 Feb 2017 09:33:15 +0000 (09:33 +0000)]
DALi Version 1.2.28

Change-Id: If7991a9a2a637f145136669dffc6908f927661c1

7 years agoAdd Opacity property for Actor 24/115624/7
Richard Huang [Mon, 20 Feb 2017 17:58:28 +0000 (17:58 +0000)]
Add Opacity property for Actor

Change-Id: I7fefcf77e512b4d0954666d4187d116dc5d518bd

7 years agoRemoved redundant resource loading & rendering code 24/113024/6
Francisco Santos [Wed, 15 Feb 2017 16:45:41 +0000 (16:45 +0000)]
Removed redundant resource loading & rendering code

Change-Id: I369e0e907f452125eb97059f853e9e16fa31f158

7 years agoTest harness: Moved CompareType<> templates to own header 39/115339/2
David Steele [Fri, 17 Feb 2017 10:56:19 +0000 (10:56 +0000)]
Test harness: Moved CompareType<> templates to own header

Change-Id: I367a21562a7c6362a15a13bfcc6fc8fffeb37c3b

7 years agoMerge "DALi Version 1.2.27" into devel/master
Adeel Kazmi [Fri, 17 Feb 2017 14:14:03 +0000 (06:14 -0800)]
Merge "DALi Version 1.2.27" into devel/master

7 years agoDALi Version 1.2.27 67/115367/1 dali_1.2.27
adam.b [Fri, 17 Feb 2017 12:55:16 +0000 (12:55 +0000)]
DALi Version 1.2.27

Change-Id: If054c3c0e9547efc5e03b843cd19004fceee43e1

7 years agoMerge "Update doxygen comments" into devel/master
Adeel Kazmi [Fri, 17 Feb 2017 11:27:43 +0000 (03:27 -0800)]
Merge "Update doxygen comments" into devel/master

7 years agoUpdate doxygen comments 84/114984/3
Seoyeon Kim [Thu, 16 Feb 2017 02:12:21 +0000 (11:12 +0900)]
Update doxygen comments

- For document public release, Native API reference is checked by Lionbridge.

Change-Id: I4a1a1a364975a56e3c4a04664e8170ff950d612b
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
7 years agoActor size property should return preferred size if size is fixed as set by SetSize 62/113462/5
Richard Huang [Tue, 7 Feb 2017 17:11:16 +0000 (17:11 +0000)]
Actor size property should return preferred size if size is fixed as set by SetSize

Change-Id: I8662795c67ef377c6417ef4ff7abde394d28cc94

7 years agoMerge "[Tizen] Prepare for Tizen 4.0 Build" into tizen accepted/tizen/common/20170223.182714 accepted/tizen/ivi/20170220.224143 accepted/tizen/mobile/20170220.223722 accepted/tizen/tv/20170220.223939 accepted/tizen/wearable/20170220.224057 submit/tizen/20170220.003759 submit/tizen_common/20170223.092744
Seoyeon Kim [Thu, 16 Feb 2017 01:53:43 +0000 (17:53 -0800)]
Merge "[Tizen] Prepare for Tizen 4.0 Build" into tizen

7 years agoMerge "Delete ThreadLocalStorage on shutdown" into devel/master
Adeel Kazmi [Wed, 15 Feb 2017 14:11:28 +0000 (06:11 -0800)]
Merge "Delete ThreadLocalStorage on shutdown" into devel/master

7 years agoDelete ThreadLocalStorage on shutdown 76/114876/2
Nick Holland [Wed, 15 Feb 2017 10:25:23 +0000 (10:25 +0000)]
Delete ThreadLocalStorage on shutdown

Currently DALi ThreadLocalStorage object is not deleted
on shutdown.

Reported by Valgrind / Valkyrie

Change-Id: I376f2a05c149b3ac0d81e07fa1052fd44ee6d8a7

7 years ago[Tizen] Prepare for Tizen 4.0 Build 43/110143/3
MyungJoo Ham [Fri, 13 Jan 2017 05:35:08 +0000 (14:35 +0900)]
[Tizen] Prepare for Tizen 4.0 Build

I've assumed that Tizen 4.0 code is going to be more similar with 3.0
than 2.0.

Please do not rely on string == compare for version check.

Change-Id: I12eeef7463c50e1be811bb28aac0cf81bb6c5698
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
7 years agoPrepare for Tizen 4.0 Build 31/114831/1
MyungJoo Ham [Fri, 13 Jan 2017 05:35:08 +0000 (14:35 +0900)]
Prepare for Tizen 4.0 Build

I've assumed that Tizen 4.0 code is going to be more similar with 3.0
than 2.0.

Please do not rely on string == compare for version check.

Change-Id: I12eeef7463c50e1be811bb28aac0cf81bb6c5698
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
7 years agoMerge "Remove batching." into devel/master
Adeel Kazmi [Tue, 14 Feb 2017 15:51:26 +0000 (07:51 -0800)]
Merge "Remove batching." into devel/master

7 years agoRemove batching. 40/113940/4
Francisco Santos [Thu, 9 Feb 2017 10:04:03 +0000 (10:04 +0000)]
Remove batching.

Change-Id: Ia834dde43961d11dbac0b71f7770c4e00da7b4e8

7 years agoAdd devel API to link an object (e.g. C# custom control) with its correct type-info 05/114505/2
Richard Huang [Mon, 13 Feb 2017 13:46:01 +0000 (13:46 +0000)]
Add devel API to link an object (e.g. C# custom control) with its correct type-info

Change-Id: I51407eab027b7a73d781b20d15f850ee40d05e92

7 years agoEnsure TestPlatformAbstraction cannot be copied 21/114221/2
Adeel Kazmi [Fri, 10 Feb 2017 09:53:01 +0000 (09:53 +0000)]
Ensure TestPlatformAbstraction cannot be copied

- Fixes an SVACE issue.
- Also synchronized automated tests with other repos.

Change-Id: Ib8cc53264d74aacfcf147706d302f57bb6b822e5

7 years agoDALi Version 1.2.26 65/114165/1 dali_1.2.26
Victor Cebollada [Fri, 10 Feb 2017 07:56:43 +0000 (07:56 +0000)]
DALi Version 1.2.26

Change-Id: I423b6d38c3a91115d8a96630d3edfe795d034eb9

7 years agoMerge "Deprecated Layer::TREE_DEPTH_MULTIPLIER and fixed mis-usage." into devel/master
Adeel Kazmi [Thu, 9 Feb 2017 17:07:28 +0000 (09:07 -0800)]
Merge "Deprecated Layer::TREE_DEPTH_MULTIPLIER and fixed mis-usage." into devel/master

7 years agoMerge "Remove dali.h from core test" into devel/master
Adeel Kazmi [Thu, 9 Feb 2017 16:23:55 +0000 (08:23 -0800)]
Merge "Remove dali.h from core test" into devel/master

7 years agoMerge "Use TextureSet instead when sorting render items." into devel/master
Paul Wisbey [Thu, 9 Feb 2017 13:37:17 +0000 (05:37 -0800)]
Merge "Use TextureSet instead when sorting render items." into devel/master

7 years agoRemove dali.h from core test 76/113976/1
Francisco Santos [Thu, 9 Feb 2017 10:58:05 +0000 (10:58 +0000)]
Remove dali.h from core test

Change-Id: I5f89e11d27daffb275a96466b0e5c100ff8f9027

7 years agoFix SVACE issue - memory leak 98/113898/1
Heeyong Song [Thu, 9 Feb 2017 08:14:50 +0000 (17:14 +0900)]
Fix SVACE issue - memory leak

- Delete the elements of mResourceRequests

Change-Id: Ib0e95cccf8ac755b2e5571a0efd2b90e15a64747

7 years agoMerge branch 'devel/master' into tizen 82/113782/1
minho.sun [Thu, 9 Feb 2017 01:44:23 +0000 (10:44 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: If52acec8d73f7e951daf7ce3ff4fb8b4bdc2cc72

7 years agoRevert "[Tizen] Remove erroneous assert, pointers to references cannot be null." 80/113780/1
minho.sun [Thu, 9 Feb 2017 01:42:41 +0000 (10:42 +0900)]
Revert "[Tizen] Remove erroneous assert, pointers to references cannot be null."

This reverts commit b1125400bd445bee630f6067c175224e00d3239d.

Change-Id: If23776bd5848880a8e76234887162a2aecbb29f7

7 years agoRevert "[Tizen] Fix undefined behaviour due to strict-aliasing." 79/113779/1
minho.sun [Thu, 9 Feb 2017 01:25:47 +0000 (10:25 +0900)]
Revert "[Tizen] Fix undefined behaviour due to strict-aliasing."

This reverts commit abfc79dfe46291b4a66333135634d202bd6c7711.

Change-Id: I714cd8c2288886962b84a2891fa314e34a805ef3

7 years agoMerge "Added travis.yml for auto-building patches" into devel/master
Kimmo Hoikka [Wed, 8 Feb 2017 19:00:13 +0000 (11:00 -0800)]
Merge "Added travis.yml for auto-building patches" into devel/master

7 years agoUse TextureSet instead when sorting render items. 44/113744/3
Francisco Santos [Wed, 8 Feb 2017 14:46:34 +0000 (14:46 +0000)]
Use TextureSet instead when sorting render items.

Change-Id: Id03460a0e99bca4c914a5f28ff397d570034dcba

7 years agoDeprecated Layer::TREE_DEPTH_MULTIPLIER and fixed mis-usage. 64/113464/2
David Steele [Tue, 7 Feb 2017 18:15:42 +0000 (18:15 +0000)]
Deprecated Layer::TREE_DEPTH_MULTIPLIER and fixed mis-usage.

Layer::TREE_DEPTH_MULITPLIER has the wrong value for our sorting
algorithm, and has been replaced by DevelLayer::TREE_DEPTH_MULTIPLIER,
which is now set to 1,000,000. Updated HitTestAlgorithm to also use the
correct value.

Change-Id: I7015f485f62a273f9c082171d81cca217dafb7d0
Signed-off-by: David Steele <david.steele@samsung.com>
7 years agoMerge "DALi Version 1.2.25" into devel/master
David Steele [Fri, 3 Feb 2017 15:40:54 +0000 (07:40 -0800)]
Merge "DALi Version 1.2.25" into devel/master

7 years agoDALi Version 1.2.25 12/113012/1 dali_1.2.25
Umar [Fri, 3 Feb 2017 15:37:20 +0000 (15:37 +0000)]
DALi Version 1.2.25

Change-Id: Ie6091edc01e7c7f93e6a2ea138e70301c5b1924e

7 years agoRemoved ResourceClient 91/112791/2
Paul Wisbey [Thu, 2 Feb 2017 19:17:47 +0000 (19:17 +0000)]
Removed ResourceClient

Change-Id: Iecccb23503008d3c5f24203998f14d92a3a99888

7 years agoMerge "Removed FrameBufferId from SceneGraph::RenderTask" into devel/master
Kimmo Hoikka [Mon, 30 Jan 2017 18:51:05 +0000 (10:51 -0800)]
Merge "Removed FrameBufferId from SceneGraph::RenderTask" into devel/master

7 years agoMerge "Remove images from TextureSet" into devel/master
Kimmo Hoikka [Mon, 30 Jan 2017 18:50:55 +0000 (10:50 -0800)]
Merge "Remove images from TextureSet" into devel/master

7 years agoDALi Version 1.2.24 02/112202/1 dali_1.2.24
Nick Holland [Fri, 27 Jan 2017 15:14:03 +0000 (15:14 +0000)]
DALi Version 1.2.24

Change-Id: I94c051014beeae1c0283440bd23c91190d15e044

7 years agoRemoved FrameBufferId from SceneGraph::RenderTask 69/112169/2
Ferran Sole [Thu, 26 Jan 2017 17:28:20 +0000 (17:28 +0000)]
Removed FrameBufferId from SceneGraph::RenderTask

Change-Id: I5411bbffd7569a29eb35559b767e3cc5e1159eeb

7 years agoRemove images from TextureSet 65/112165/5
Ferran Sole [Thu, 26 Jan 2017 16:19:55 +0000 (16:19 +0000)]
Remove images from TextureSet

Change-Id: I12e3b03fc9613d0beaf3d18b0ecb62b8be83f406

7 years agoChanged remaining image types to use Texture internally 05/111905/7
Ferran Sole [Tue, 24 Jan 2017 14:26:54 +0000 (14:26 +0000)]
Changed remaining image types to use Texture internally

- FrameBufferImage, NativeImage, EncodedBufferImage and BufferImage use Dali::Texture internally
- Removed Dali::Atlas class as it is not used

Change-Id: Ife1bf687ca314d87cf5974651857dc7242a1ce37

7 years agoDelete ImageFactory and ImageFactoryCache as they are unused 39/111439/2
Ferran Sole [Fri, 20 Jan 2017 09:29:39 +0000 (09:29 +0000)]
Delete ImageFactory and ImageFactoryCache as they are unused

Change-Id: Ia76278fc6d2c3c62e2789f46320e2fc897089603

7 years ago(GCC 6.2) Remove unused functions from automated tests 02/111502/1
Adeel Kazmi [Fri, 20 Jan 2017 18:07:44 +0000 (18:07 +0000)]
(GCC 6.2) Remove unused functions from automated tests

Change-Id: I22092d5c6ed2c6536e26f426ae5b04ef152d86e3

7 years agoDALi Version 1.2.23 85/111485/1 dali_1.2.23
Richard Huang [Fri, 20 Jan 2017 13:34:45 +0000 (13:34 +0000)]
DALi Version 1.2.23

Change-Id: I6454ba8a1df926dabae3b7dfed634d68af2ce792

7 years agoMerge "[Tizen] Fix undefined behaviour due to strict-aliasing." into tizen accepted/tizen/common/20170123.182536 accepted/tizen/ivi/20170120.082229 accepted/tizen/mobile/20170120.081947 accepted/tizen/tv/20170120.082054 accepted/tizen/wearable/20170120.082140 submit/tizen/20170120.063242 submit/tizen_common/20170123.022625
Seoyeon Kim [Fri, 20 Jan 2017 05:00:59 +0000 (21:00 -0800)]
Merge "[Tizen] Fix undefined behaviour due to strict-aliasing." into tizen

7 years agoMerge "[Tizen] Remove erroneous assert, pointers to references cannot be null." into...
Seoyeon Kim [Fri, 20 Jan 2017 05:00:47 +0000 (21:00 -0800)]
Merge "[Tizen] Remove erroneous assert, pointers to references cannot be null." into tizen

7 years agoMerge branch 'devel/master' into tizen 87/111187/1
Seoyeon Kim [Fri, 20 Jan 2017 02:12:30 +0000 (11:12 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: Ib2838e05e48e681a2230e00fc5c18f747111b045

7 years agoMerge "Changed ResourceImage to use Dali::Texture internally" into devel/master
Paul Wisbey [Thu, 19 Jan 2017 17:25:50 +0000 (09:25 -0800)]
Merge "Changed ResourceImage to use Dali::Texture internally" into devel/master

7 years ago[Tizen] Fix undefined behaviour due to strict-aliasing. 60/110960/1
Francisco Santos [Wed, 18 Jan 2017 17:38:32 +0000 (17:38 +0000)]
[Tizen] Fix undefined behaviour due to strict-aliasing.

- This patch is cherry-picked from devel/master branch.
  After DALi Integration (version up) to 1.2.23, this patch can be reverted.

Change-Id: I5b69e86a01d8f4dd720f685222ce2424aa664d9b

7 years agoFix undefined behaviour due to strict-aliasing. 30/110930/1
Francisco Santos [Wed, 18 Jan 2017 17:38:32 +0000 (17:38 +0000)]
Fix undefined behaviour due to strict-aliasing.

Change-Id: I5b69e86a01d8f4dd720f685222ce2424aa664d9b

7 years agoChanged ResourceImage to use Dali::Texture internally 49/109749/7
Ferran Sole [Wed, 11 Jan 2017 11:10:33 +0000 (11:10 +0000)]
Changed ResourceImage to use Dali::Texture internally

Change-Id: Ie8e740f8549bb23e4e2caf91a837d844bc6eb89c

7 years ago[Tizen] Remove erroneous assert, pointers to references cannot be null. 81/110781/1
Francisco Santos [Fri, 13 Jan 2017 14:25:52 +0000 (14:25 +0000)]
[Tizen] Remove erroneous assert, pointers to references cannot be null.

- This patch is cherry-picked from devel/master branch.
  After DALi Integration (version up) to 1.2.23, this patch can be reverted.

Change-Id: I1556faec4cf03b5bd272230e232e1492a9616e28

7 years agoMerge "Remove erroneous assert, pointers to references cannot be null." into devel...
David Steele [Mon, 16 Jan 2017 18:09:52 +0000 (10:09 -0800)]
Merge "Remove erroneous assert, pointers to references cannot be null." into devel/master

7 years agoUpdate doxygen tags 27/110427/1
Seoyeon Kim [Mon, 16 Jan 2017 10:08:17 +0000 (19:08 +0900)]
Update doxygen tags

- @returns -> @return / @param -> @param[in] / @detail descriptions

Change-Id: I5ae9f7849030988748f0afb4ce58f7b4b06ed7ab
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
7 years agoRemove erroneous assert, pointers to references cannot be null. 89/110289/4
Francisco Santos [Fri, 13 Jan 2017 14:25:52 +0000 (14:25 +0000)]
Remove erroneous assert, pointers to references cannot be null.

Change-Id: I1556faec4cf03b5bd272230e232e1492a9616e28

7 years agoDALi Version 1.2.22 91/110291/1 dali_1.2.22
David Steele [Fri, 13 Jan 2017 14:35:14 +0000 (14:35 +0000)]
DALi Version 1.2.22

Change-Id: I50eca844edc5031109806fe8a865b071de4f2369

7 years agoRemove left over references to ImageActor & ShaderEffect 60/109060/1
Adeel Kazmi [Fri, 6 Jan 2017 17:35:42 +0000 (17:35 +0000)]
Remove left over references to ImageActor & ShaderEffect

Change-Id: Ied2e62c240ffdf563879a54a2b53ed027038606e

7 years agoMerge "DALi Version 1.2.21" into devel/master
Adeel Kazmi [Fri, 6 Jan 2017 14:18:30 +0000 (06:18 -0800)]
Merge "DALi Version 1.2.21" into devel/master

7 years agoDALi Version 1.2.21 42/109042/1 dali_1.2.21
Agnelo Vaz [Fri, 6 Jan 2017 14:00:24 +0000 (14:00 +0000)]
DALi Version 1.2.21

Change-Id: Ia6031e55868f8a9c27df50fc232a5b97ee378990

7 years agoEnsure clipping gets disabled properly when previously enabled 65/108965/1
Adeel Kazmi [Fri, 6 Jan 2017 09:39:03 +0000 (09:39 +0000)]
Ensure clipping gets disabled properly when previously enabled

The clipping sort modifier is used to retrieve the clipping ID but is not cleared when we disable clipping.

Change-Id: Icfea7d7115fe24574edd5a058d65229621e75ae8

7 years ago(Actor) Add enumeration setting support to various properties 09/108509/1
Adeel Kazmi [Wed, 4 Jan 2017 18:07:41 +0000 (18:07 +0000)]
(Actor) Add enumeration setting support to various properties

Before, you could only set these enumeration value properties as strings which is quite annoying from code.

Change-Id: I566bd962c1bbcc43abdf15786e5c06065969ce60

7 years agoMerge branch 'devel/master' into tizen 10/108310/1
Seoyeon Kim [Wed, 4 Jan 2017 04:48:37 +0000 (13:48 +0900)]
Merge branch 'devel/master' into tizen

- Integration 1.2.18 -> 1.2.20 (Version up)

Change-Id: Idd92c6e584021ef3c75d5b587cb42d1e5baac8a7

7 years agoDALi Version 1.2.20 dali_1.2.20
Adeel Kazmi [Fri, 30 Dec 2016 10:44:48 +0000 (10:44 +0000)]
DALi Version 1.2.20

Change-Id: Ia0568f0964f6e8e72d91b9a1d3016d3055159ab8

7 years agoRemove deprecation warnings from TouchEvent 91/106891/1
Adeel Kazmi [Fri, 23 Dec 2016 10:50:13 +0000 (10:50 +0000)]
Remove deprecation warnings from TouchEvent

This pollutes the log for general touch as it's used by the TouchEventProcessor for backwards compatability
and, thus, the log is always shown even if applications are not using it.

Change-Id: Ied028740a3007914a6c68c0ffa3a66ad6ef840c9

7 years agoMerge changes I822c3044,I9e0f12e7,Ibab0e11e,Icb145e7b,Ib68aba7f, ... into devel/master
Adeel Kazmi [Tue, 20 Dec 2016 16:21:21 +0000 (08:21 -0800)]
Merge changes I822c3044,I9e0f12e7,Ibab0e11e,Icb145e7b,Ib68aba7f, ... into devel/master

* changes:
  Redundant assignments.
  Simplify logic, avoid storing raw pointer
  DaliException should be captured by reference.
  Redundant assignments and unread values.
  Members not set in assignment constructor.
  Comparison between boolean and integer.
  Redundant break, default being used in switch statement.
  Incorrect signature of assignment operator.

7 years agoMove virtual destructor same position as 2.4 64/105864/1
suhyung Eom [Tue, 20 Dec 2016 01:14:17 +0000 (10:14 +0900)]
Move virtual destructor same position as 2.4

Signed-off-by: suhyung Eom <suhyung.eom@samsung.com>
Change-Id: Iafcc02d8c24c298a19eca37e951c6827fc6c9d65

7 years agoMove virutal method's position to its original 67/105567/1
suhyung Eom [Sun, 18 Dec 2016 23:11:44 +0000 (08:11 +0900)]
Move virutal method's position to its original

Signed-off-by: suhyung Eom <suhyung.eom@samsung.com>
Change-Id: Iff71613b617b26d11553ccbec4ddfb3a7bb514bb

7 years agoRedundant assignments. 42/102842/4
Francisco Santos [Tue, 6 Dec 2016 14:37:32 +0000 (14:37 +0000)]
Redundant assignments.

Change-Id: I822c304423985c56150047576dfb2e442a68b10d

7 years agoSimplify logic, avoid storing raw pointer 81/102781/3
Francisco Santos [Tue, 6 Dec 2016 11:21:52 +0000 (11:21 +0000)]
Simplify logic, avoid storing raw pointer

Change-Id: I9e0f12e72ec49312080a073afca7db835c5b8006

7 years agoDaliException should be captured by reference. 80/102780/3
Francisco Santos [Tue, 6 Dec 2016 10:56:22 +0000 (10:56 +0000)]
DaliException should be captured by reference.

Change-Id: Ibab0e11ed2290f979c525b0f7c6d0dc16ce4425e

7 years agoRedundant assignments and unread values. 79/102779/3
Francisco Santos [Tue, 6 Dec 2016 10:53:54 +0000 (10:53 +0000)]
Redundant assignments and unread values.

Change-Id: Icb145e7b40cde869279ce5cd6d66a22a91b33df9

7 years agoMembers not set in assignment constructor. 78/102778/3
Francisco Santos [Tue, 6 Dec 2016 10:31:50 +0000 (10:31 +0000)]
Members not set in assignment constructor.

Change-Id: Ib68aba7f7c2208e496f3b64aef0caa122236f7fb

7 years agoComparison between boolean and integer. 77/102777/3
Francisco Santos [Tue, 6 Dec 2016 10:29:01 +0000 (10:29 +0000)]
Comparison between boolean and integer.

Change-Id: I565aee867965ab67bd8d5c97e3ac620a893f4925

7 years agoRedundant break, default being used in switch statement. 76/102776/3
Francisco Santos [Tue, 6 Dec 2016 10:27:42 +0000 (10:27 +0000)]
Redundant break, default being used in switch statement.

Change-Id: I1c9d532eec75571074b65fd110bbfd49f8ffbb30

7 years agoIncorrect signature of assignment operator. 75/102775/3
Francisco Santos [Tue, 6 Dec 2016 10:26:52 +0000 (10:26 +0000)]
Incorrect signature of assignment operator.

Change-Id: I5742daf33fd44d4d25a679c9d5684cdff6374ae7

7 years agoDALi Version 1.2.19 44/105444/1 dali_1.2.19
Francisco Santos [Fri, 16 Dec 2016 13:19:26 +0000 (13:19 +0000)]
DALi Version 1.2.19

Change-Id: Icb57b6cbd45320778be963cb4750eba7f79636ef

7 years agoMerge "Enabling animation of Renderer properties when offstage" into devel/master
Adeel Kazmi [Thu, 15 Dec 2016 16:01:23 +0000 (08:01 -0800)]
Merge "Enabling animation of Renderer properties when offstage" into devel/master

7 years agoType registry changed C# callback signatures 32/101932/6
Nick Holland [Fri, 2 Dec 2016 11:02:29 +0000 (11:02 +0000)]
Type registry changed C# callback signatures

To save memory / simplicity we now use just 3 C# delegates to
connect between C# and C++ type registry. Previously it was
3 delegates per custom control ( Create, Property Set, Property Get).

Change-Id: I91a1da13014449f2589b6f5f5f3cea6308a4c582

7 years agoEnabling animation of Renderer properties when offstage 18/101318/2
David Steele [Wed, 30 Nov 2016 19:21:54 +0000 (19:21 +0000)]
Enabling animation of Renderer properties when offstage

If the renderer exists, but hasn't been staged yet, then the scene
graph object also exists, but cannot be accessed because of a spurious
check for OnStage().

Removing the OnStage check to allow animations to run on Renderers
that haven't 'quite' been staged but are very likely to in the near
future.

Change-Id: I219cca9e08ebb6c7c5b2b8e7f33fd8bbb24b47ae
Signed-off-by: David Steele <david.steele@samsung.com>
7 years agoFix bug binding native image textures 77/104577/4
Ferran Sole [Tue, 13 Dec 2016 14:29:36 +0000 (14:29 +0000)]
Fix bug binding native image textures

NewTexture was always binding native image textures to GL_TEXTURE_2D binding point
even if textures required a different binding point

Change-Id: If01f8d33a92ed993b19818d6ba4b804f21b67253

7 years agoMerge branch 'devel/master (1.2.18)' into tizen 24/104424/2
suhyung Eom [Tue, 13 Dec 2016 08:15:00 +0000 (17:15 +0900)]
Merge branch 'devel/master (1.2.18)' into tizen

Change-Id: I55cf919c48083b2e7359c041b749230be1594b40