minho.sun [Mon, 10 Apr 2017 02:22:52 +0000 (11:22 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: Ia3d847c7ae55fa1dd6f6c88928b609d8affc7293
Nick Holland [Fri, 7 Apr 2017 10:10:18 +0000 (11:10 +0100)]
DALi Version 1.2.34
Change-Id: Iaf895fa2d2bcd0aebc805707e7e8f9c5103c92b4
Adeel Kazmi [Mon, 3 Apr 2017 16:13:41 +0000 (17:13 +0100)]
Ensure SCREEN_POSITION value takes POSITION_USES_ANCHOR_POINT property into account
Change-Id: I685f336c8ff28e6af4f88d3f5ac7ded804207c23
minho.sun [Mon, 3 Apr 2017 07:49:27 +0000 (16:49 +0900)]
change dead link to new link
Change dead Native API reference link to new link
Change-Id: I3247a29ffeba6cbb128bca7c88400672b077f711
Signed-off-by: minho.sun <minho.sun@samsung.com>
Richard Huang [Fri, 31 Mar 2017 09:57:21 +0000 (10:57 +0100)]
DALi Version 1.2.33
Change-Id: I5629a48c2021e06435d05c5dd8ac4a64c27b71bf
dongsug.song [Fri, 31 Mar 2017 03:48:16 +0000 (12:48 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: Icba998e55057ac890bac5d47811ecc5db6fc083e
Signed-off-by: dongsug.song <dongsug.song@samsung.com>
Seoyeon Kim [Tue, 28 Mar 2017 05:55:55 +0000 (14:55 +0900)]
Add doxygen comment in WeightObject namespace
- Add a comment to show WeightObject namespace in the doxygen file.
Change-Id: I5cc51499f76791376924145fafe6a75f6ef23328
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
Paul Wisbey [Wed, 29 Mar 2017 09:15:14 +0000 (02:15 -0700)]
Merge "Valgrind detected TextureSet leak and invalid access" into devel/master
Adeel Kazmi [Tue, 28 Mar 2017 11:01:30 +0000 (04:01 -0700)]
Merge changes Ibcc99fc9,I8d1202b2 into devel/master
* changes:
Remove manual memory management from Core implementation.
Fix potencial bug with owner pointer.
Nick Holland [Tue, 28 Mar 2017 10:41:04 +0000 (11:41 +0100)]
Valgrind detected TextureSet leak and invalid access
Memory leak:
If a public API TextureSet gets deleted, it sends a
message to update-manager (RemoveTextureSet).
The scene graph side TextureSet gets removed from
update manager, but it never gets deleted.
Invalid memory access:
Currently when a scene graph TextureSet gets deleted
the renderers using that TextureSet are not notified.
So when a Render gets deleted it would call
TextureSet->RemoveObserver( this );
on an already deleted TextureSet.
DALi however doesn't crash at this point,
because the TextureSet is stored in a memory
pool so the object is still reachable.
Change-Id: Icf0f5a3e55d3ba7537f40db08accad04ae4440f7
Francisco Santos [Mon, 27 Mar 2017 17:28:21 +0000 (18:28 +0100)]
Remove manual memory management from Core implementation.
Change-Id: Ibcc99fc9235a8c0f35a14440372d519e2fab7b04
Adeel Kazmi [Mon, 27 Mar 2017 14:07:49 +0000 (07:07 -0700)]
Merge "Fix to avoid DEREF_AFTER_NULL Svace issue in any.h" into devel/master
Francisco Santos [Mon, 27 Mar 2017 13:31:18 +0000 (14:31 +0100)]
Fix potencial bug with owner pointer.
Change-Id: I8d1202b29bb71ce779502e4ce19c01a89207b696
Seoyeon Kim [Mon, 27 Mar 2017 01:38:36 +0000 (10:38 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: I1f8e678f96f49ddde05e85cdbad1a357ef8ef100
Adeel Kazmi [Fri, 24 Mar 2017 18:34:38 +0000 (11:34 -0700)]
Merge "packaging/dali.spec use license macro" into devel/master
Adeel Kazmi [Thu, 23 Mar 2017 14:47:38 +0000 (14:47 +0000)]
(Renderer) Fix memory leak when using blend-color
Change-Id: Iaf7a0ae464fa0c354e1111f9313972349a2b9b45
Victor Cebollada [Fri, 24 Mar 2017 11:50:18 +0000 (11:50 +0000)]
DALi Version 1.2.32
Change-Id: I578f410ee51348c1650dbd4b9f92008951f5865b
Jinho, Lee [Fri, 24 Mar 2017 04:39:58 +0000 (13:39 +0900)]
packaging/dali.spec use license macro
Change-Id: I2c4666e6c0b4662190f41f4945b5496dacc54b3b
Heeyong Song [Wed, 22 Mar 2017 05:23:34 +0000 (14:23 +0900)]
Enable parallel build again
Change-Id: Iec8809fb72c5b4c6bf9ca10f528a5e471189a9a4
Paul Wisbey [Tue, 7 Mar 2017 13:22:34 +0000 (13:22 +0000)]
Fix to avoid DEREF_AFTER_NULL Svace issue in any.h
Change-Id: I4e87718579bc208fccf498bc3204b109303abb84
David Steele [Tue, 21 Mar 2017 16:22:57 +0000 (09:22 -0700)]
Merge "Target Values of animation only set on ::Play()" into devel/master
Adeel Kazmi [Mon, 20 Mar 2017 13:38:30 +0000 (13:38 +0000)]
Ensure width & height properties can be set individually
Change-Id: Ie8d7ee230a87f2152c8ad6320839c46bc70a2a5f
Agnelo Vaz [Wed, 15 Mar 2017 10:38:35 +0000 (10:38 +0000)]
Target Values of animation only set on ::Play()
Change-Id: I834e151b4f06a08def523cf9d915fcafa79fd806
Heeyong Song [Mon, 20 Mar 2017 01:51:52 +0000 (10:51 +0900)]
Merge branch 'devel/master (1.2.31)' into tizen
Change-Id: I88bc17e9fcf8bcc520ef0d3196323ba00373746f
Francisco Santos [Fri, 17 Mar 2017 16:14:52 +0000 (16:14 +0000)]
DALi Version 1.2.31
Change-Id: I409fc5db91f42d484d34ceee94e314b263b10b23
Agnelo Vaz [Wed, 15 Mar 2017 14:47:51 +0000 (14:47 +0000)]
Added Getters for Animator Connectors base class
Change-Id: I90c6afe299dd565261fe733c4fbe3c53df1988d2
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
David Steele [Fri, 10 Mar 2017 15:00:28 +0000 (15:00 +0000)]
DALi Version 1.2.30
Change-Id: If1de12dcfcde05eabb9cd9647dbdbca115c7ef7b
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
Kimmo Hoikka [Wed, 8 Mar 2017 16:02:24 +0000 (08:02 -0800)]
Merge "Fix memory leaks detected by Valgrind" into devel/master
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
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
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
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
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
Agnelo Vaz [Fri, 3 Mar 2017 14:05:22 +0000 (14:05 +0000)]
DALi Version 1.2.29
Change-Id: I4589137dbd69c6c6cbbdece518324b146a58b45a
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
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
Adeel Kazmi [Thu, 2 Mar 2017 15:17:46 +0000 (07:17 -0800)]
Merge "(Actor) Fix documentation in sibling order methods" into devel/master
Adeel Kazmi [Thu, 2 Mar 2017 13:46:52 +0000 (13:46 +0000)]
(Actor) Fix documentation in sibling order methods
Change-Id: Ib3ffe6e8c8f5e1f249f0a6f5e5439e174f883a4f
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
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
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
suhyung Eom [Mon, 27 Feb 2017 01:45:26 +0000 (10:45 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: I144178875966058c0066bb7d84d84d38b350c59e
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
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
Adeel Kazmi [Fri, 24 Feb 2017 14:25:24 +0000 (06:25 -0800)]
Merge "Removed redundant resource loading & rendering code" into devel/master
Adeel Kazmi [Fri, 24 Feb 2017 09:33:15 +0000 (09:33 +0000)]
DALi Version 1.2.28
Change-Id: If7991a9a2a637f145136669dffc6908f927661c1
Richard Huang [Mon, 20 Feb 2017 17:58:28 +0000 (17:58 +0000)]
Add Opacity property for Actor
Change-Id: I7fefcf77e512b4d0954666d4187d116dc5d518bd
Francisco Santos [Wed, 15 Feb 2017 16:45:41 +0000 (16:45 +0000)]
Removed redundant resource loading & rendering code
Change-Id: I369e0e907f452125eb97059f853e9e16fa31f158
David Steele [Fri, 17 Feb 2017 10:56:19 +0000 (10:56 +0000)]
Test harness: Moved CompareType<> templates to own header
Change-Id: I367a21562a7c6362a15a13bfcc6fc8fffeb37c3b
Adeel Kazmi [Fri, 17 Feb 2017 14:14:03 +0000 (06:14 -0800)]
Merge "DALi Version 1.2.27" into devel/master
adam.b [Fri, 17 Feb 2017 12:55:16 +0000 (12:55 +0000)]
DALi Version 1.2.27
Change-Id: If054c3c0e9547efc5e03b843cd19004fceee43e1
Adeel Kazmi [Fri, 17 Feb 2017 11:27:43 +0000 (03:27 -0800)]
Merge "Update doxygen comments" into devel/master
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>
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
Seoyeon Kim [Thu, 16 Feb 2017 01:53:43 +0000 (17:53 -0800)]
Merge "[Tizen] Prepare for Tizen 4.0 Build" into tizen
Adeel Kazmi [Wed, 15 Feb 2017 14:11:28 +0000 (06:11 -0800)]
Merge "Delete ThreadLocalStorage on shutdown" into devel/master
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
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>
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>
Adeel Kazmi [Tue, 14 Feb 2017 15:51:26 +0000 (07:51 -0800)]
Merge "Remove batching." into devel/master
Francisco Santos [Thu, 9 Feb 2017 10:04:03 +0000 (10:04 +0000)]
Remove batching.
Change-Id: Ia834dde43961d11dbac0b71f7770c4e00da7b4e8
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
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
Victor Cebollada [Fri, 10 Feb 2017 07:56:43 +0000 (07:56 +0000)]
DALi Version 1.2.26
Change-Id: I423b6d38c3a91115d8a96630d3edfe795d034eb9
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
Adeel Kazmi [Thu, 9 Feb 2017 16:23:55 +0000 (08:23 -0800)]
Merge "Remove dali.h from core test" 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
Francisco Santos [Thu, 9 Feb 2017 10:58:05 +0000 (10:58 +0000)]
Remove dali.h from core test
Change-Id: I5f89e11d27daffb275a96466b0e5c100ff8f9027
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
minho.sun [Thu, 9 Feb 2017 01:44:23 +0000 (10:44 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: If52acec8d73f7e951daf7ce3ff4fb8b4bdc2cc72
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
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
Kimmo Hoikka [Wed, 8 Feb 2017 19:00:13 +0000 (11:00 -0800)]
Merge "Added travis.yml for auto-building patches" into devel/master
Francisco Santos [Wed, 8 Feb 2017 14:46:34 +0000 (14:46 +0000)]
Use TextureSet instead when sorting render items.
Change-Id: Id03460a0e99bca4c914a5f28ff397d570034dcba
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>
David Steele [Fri, 3 Feb 2017 15:40:54 +0000 (07:40 -0800)]
Merge "DALi Version 1.2.25" into devel/master
Umar [Fri, 3 Feb 2017 15:37:20 +0000 (15:37 +0000)]
DALi Version 1.2.25
Change-Id: Ie6091edc01e7c7f93e6a2ea138e70301c5b1924e
Paul Wisbey [Thu, 2 Feb 2017 19:17:47 +0000 (19:17 +0000)]
Removed ResourceClient
Change-Id: Iecccb23503008d3c5f24203998f14d92a3a99888
Kimmo Hoikka [Mon, 30 Jan 2017 18:51:05 +0000 (10:51 -0800)]
Merge "Removed FrameBufferId from SceneGraph::RenderTask" into devel/master
Kimmo Hoikka [Mon, 30 Jan 2017 18:50:55 +0000 (10:50 -0800)]
Merge "Remove images from TextureSet" into devel/master
Nick Holland [Fri, 27 Jan 2017 15:14:03 +0000 (15:14 +0000)]
DALi Version 1.2.24
Change-Id: I94c051014beeae1c0283440bd23c91190d15e044
Ferran Sole [Thu, 26 Jan 2017 17:28:20 +0000 (17:28 +0000)]
Removed FrameBufferId from SceneGraph::RenderTask
Change-Id: I5411bbffd7569a29eb35559b767e3cc5e1159eeb
Ferran Sole [Thu, 26 Jan 2017 16:19:55 +0000 (16:19 +0000)]
Remove images from TextureSet
Change-Id: I12e3b03fc9613d0beaf3d18b0ecb62b8be83f406
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
Ferran Sole [Fri, 20 Jan 2017 09:29:39 +0000 (09:29 +0000)]
Delete ImageFactory and ImageFactoryCache as they are unused
Change-Id: Ia76278fc6d2c3c62e2789f46320e2fc897089603
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
Richard Huang [Fri, 20 Jan 2017 13:34:45 +0000 (13:34 +0000)]
DALi Version 1.2.23
Change-Id: I6454ba8a1df926dabae3b7dfed634d68af2ce792
Seoyeon Kim [Fri, 20 Jan 2017 05:00:59 +0000 (21:00 -0800)]
Merge "[Tizen] Fix undefined behaviour due to strict-aliasing." into tizen
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
Seoyeon Kim [Fri, 20 Jan 2017 02:12:30 +0000 (11:12 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: Ib2838e05e48e681a2230e00fc5c18f747111b045
Paul Wisbey [Thu, 19 Jan 2017 17:25:50 +0000 (09:25 -0800)]
Merge "Changed ResourceImage to use Dali::Texture internally" into devel/master
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
Francisco Santos [Wed, 18 Jan 2017 17:38:32 +0000 (17:38 +0000)]
Fix undefined behaviour due to strict-aliasing.
Change-Id: I5b69e86a01d8f4dd720f685222ce2424aa664d9b
Ferran Sole [Wed, 11 Jan 2017 11:10:33 +0000 (11:10 +0000)]
Changed ResourceImage to use Dali::Texture internally
Change-Id: Ie8e740f8549bb23e4e2caf91a837d844bc6eb89c
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
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
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>
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