Nick Holland [Mon, 13 Apr 2015 15:01:18 +0000 (16:01 +0100)]
Fix compile errors after removing boost function include from dali-core
Change-Id: I753842cfebbcbb76f3fb4443d6dd392c4391062a
Kingsley Stephens [Fri, 10 Apr 2015 14:35:33 +0000 (15:35 +0100)]
DALi Version 1.0.37
Change-Id: Ie9263c86a2f2dd3cf56a963a5fbf5278a08d40b9
Paul Wisbey [Thu, 9 Apr 2015 15:51:36 +0000 (16:51 +0100)]
Merge branch 'new_text' into tizen
Change-Id: I4084c10fec73a78eb03b2b1e25d8ca09479c1061
Paul Wisbey [Thu, 9 Apr 2015 10:53:29 +0000 (11:53 +0100)]
Merge remote-tracking branch 'origin/tizen' into new_text
Change-Id: Id894a3d5d460cd4fb22d9bb25559bd2173df0e54
Victor Cebollada [Wed, 8 Apr 2015 08:07:01 +0000 (09:07 +0100)]
Fix for GetCharactersDirection().
Was not giving the correct direction for neutral characters.
Change-Id: I34b7eb666d90678ebc4ad11df52dfbde1947cbb9
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Victor Cebollada [Thu, 2 Apr 2015 16:25:32 +0000 (17:25 +0100)]
New libunibreak.
Change-Id: I7850ca7c30d24338fa8f692c67cae19e94ac143e
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Adeel Kazmi [Tue, 7 Apr 2015 20:15:45 +0000 (21:15 +0100)]
Changes following ActiveConstraint removal
Change-Id: I2aadf9e5f39173aabfe7f4bf5e11e91e643aa0e5
Adeel Kazmi [Tue, 7 Apr 2015 20:13:10 +0000 (21:13 +0100)]
(AutomatedTests) Use the outputImage address rather than the address of the pointer
Change-Id: I634a5a3f9b8e9839e2d515cf8ecbcc05f7123c23
Paul Wisbey [Tue, 7 Apr 2015 14:38:12 +0000 (15:38 +0100)]
Fixed merge error
Change-Id: I90565d7292bbe2fbfea3ed09220bdb001d65c4fe
Paul Wisbey [Tue, 7 Apr 2015 10:23:52 +0000 (11:23 +0100)]
Merge remote-tracking branch 'origin/tizen' into new_text
Conflicts:
adaptors/common/adaptor-impl.cpp
build/tizen/adaptor/Makefile.am
Change-Id: I35f6abe9eeebb9f3f73f4f75c32c3bcd07682cf3
HyunJu Shin [Tue, 7 Apr 2015 10:09:51 +0000 (03:09 -0700)]
Merge "Update image downloading functionality" into tizen
Adeel Kazmi [Fri, 3 Apr 2015 05:51:21 +0000 (06:51 +0100)]
DALi Version 1.0.36
Change-Id: Ifeff8e1928a221d46e0cc80b8efcd0c43eb9a143
Richard Underhill [Wed, 1 Apr 2015 10:53:43 +0000 (11:53 +0100)]
Added underline position and thickness to FontMetrics
Change-Id: I036851956f96fe604a30da0ba3c1be4a51eaf325
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
HyunJu Shin [Wed, 1 Apr 2015 04:24:18 +0000 (21:24 -0700)]
Merge "Remove non-public APIs of Animation" into tizen
Jonghyun Ho [Mon, 30 Mar 2015 02:57:23 +0000 (11:57 +0900)]
Separating integration-devel from devel package for 2nd party to use adaptor #2 (touch issue fixed)
- hidden for 3rd party
Change-Id: I6cff9c9bd9d17aa465096175ed3eb915a00e6832
Heeyong Song [Tue, 31 Mar 2015 01:51:06 +0000 (10:51 +0900)]
Remove non-public APIs of Animation
Change-Id: Ia741f71aa40da0e8b5b6e5bf58929a5d34010892
Yoonsang Lee [Fri, 13 Mar 2015 06:33:00 +0000 (15:33 +0900)]
Update image downloading functionality
- Support for https protocol.
- Set connection timeout to 30 sec.
- Log curl error code in failure cases.
Change-Id: If05803c12ed8619d49d4ae481d82f90eb710f650
Paul Wisbey [Mon, 30 Mar 2015 14:50:22 +0000 (15:50 +0100)]
Merge remote-tracking branch 'origin/tizen' into new_text
Change-Id: I6fab774d982acc9cc82144c82134379e573658a5
Paul Wisbey [Mon, 30 Mar 2015 14:45:34 +0000 (15:45 +0100)]
Removed some junk from configure.ac
Change-Id: I19b9bde46cf4395d464534e12a4a88214fb47368
Paul Wisbey [Wed, 25 Mar 2015 13:27:36 +0000 (13:27 +0000)]
Don't Update twice after a property setter
Change-Id: If97cd9985618e2cef29b05477a7494d634d6515f
Adeel Kazmi [Fri, 27 Mar 2015 09:22:43 +0000 (02:22 -0700)]
Revert "Separating integration-devel from devel package for 2nd party to use adaptor"
This reverts commit
58ede8dfbc02cbab6c834cf9c2e2d10d12d0cda6.
Change-Id: Ic61d3a1813a54a27790f5b0539042a0670c19ce9
Jonghyun Ho [Wed, 11 Feb 2015 10:12:57 +0000 (19:12 +0900)]
Separating integration-devel from devel package for 2nd party to use adaptor
- hidden for 3rd party
Change-Id: I709484c623a3ec1b260b57543cbab14e54e7319f
Adeel Kazmi [Wed, 25 Mar 2015 15:06:53 +0000 (08:06 -0700)]
Merge "DALi Version 1.0.35" into tizen
Tom Robinson [Wed, 25 Mar 2015 14:02:20 +0000 (14:02 +0000)]
DALi Version 1.0.35
Change-Id: I0a6b10a55f9405c10f4bb53e256123c2cd64d23e
Nick Holland [Fri, 6 Feb 2015 10:52:38 +0000 (10:52 +0000)]
Dali remote control and monitoring
No ability in Dali for remote interactive control and performance monitoring ( via network).
Usage, apply patch then $nc localhost 3031 (type help)
Or connect using Stage Hand tool.
To perform a scene dump to a JSON file ( for black box testing )
echo "dump_scene" | nc -q4 adress port > scene.json
Change-Id: Ib43e547b931b66dde91d3f1bb011d2e7a90879fc
Signed-off-by: Nick Holland <nick.holland@partner.samsung.com>
Victor Cebollada [Tue, 24 Mar 2015 08:23:14 +0000 (08:23 +0000)]
Fix for CreateFont() when the font is a color one.
- The ascender + descender needs to be equal to the height.
Change-Id: I55855ef9b6da50dd8d4f05a97d6e72fe2695a84a
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Paul Wisbey [Mon, 16 Mar 2015 14:45:42 +0000 (14:45 +0000)]
Respect the accessibility settings
Change-Id: Ib4b666047d13c3fb4fc5f51bccfe3608c15b85ff
Paul Wisbey [Sun, 22 Mar 2015 13:14:25 +0000 (13:14 +0000)]
Fixed TCT build
Change-Id: Ied3ee3e4758ec76f28689ac3d9556b5857f765bb
Paul Wisbey [Fri, 20 Mar 2015 17:02:18 +0000 (17:02 +0000)]
Merge remote-tracking branch 'origin/tizen' into new_text
Conflicts:
build/tizen/adaptor/Makefile.am
Change-Id: Ide3266e4a0c8f9712baf42531666c22384c4a41e
Paul Wisbey [Fri, 20 Mar 2015 15:33:19 +0000 (08:33 -0700)]
Merge "Retrieves the character's directions." into new_text
Victor Cebollada [Thu, 12 Mar 2015 16:38:17 +0000 (16:38 +0000)]
Scripts added:
- Hebrew
- Hiragana and Katakana (Japanese)
Change-Id: Ibc5ddee96e605b5ca8774c2caea77c71852a9882
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Victor Cebollada [Fri, 20 Mar 2015 14:35:44 +0000 (14:35 +0000)]
Fix for wordbreak.c
The word break class Hebrew is missing.
Change-Id: Ic2abce99108016450ad0d87d6a4cc6a2da3d92cc
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Adeel Kazmi [Fri, 20 Mar 2015 08:47:19 +0000 (08:47 +0000)]
Stop including dali-core.h
Change-Id: I526e0e7a5d059d0d63434c01a7ac47e205eb4318
taeyoon [Fri, 20 Mar 2015 02:54:08 +0000 (19:54 -0700)]
Merge "Add opengles feature "NOT_SUPPORTED" and utc for Application" into tizen
Victor Cebollada [Thu, 19 Mar 2015 08:10:55 +0000 (08:10 +0000)]
Retrieves the character's directions.
Change-Id: I9f75a78eff9f0a1b068d87bde1988f657264ecc5
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Richard Huang [Thu, 19 Mar 2015 11:04:16 +0000 (11:04 +0000)]
DALi Version 1.0.34
Change-Id: I8287948e6540408a2bc80b25a78ca8cad9b53d0e
Paul Wisbey [Thu, 19 Mar 2015 09:46:36 +0000 (09:46 +0000)]
Merge remote-tracking branch 'origin/tizen' into new_text
Conflicts:
adaptors/common/adaptor-impl.cpp
build/tizen/adaptor/Makefile.am
platform-abstractions/slp/file.list
platform-abstractions/tizen/data-cache/data-cache-impl.cpp
platform-abstractions/tizen/data-cache/data-cache-impl.h
platform-abstractions/tizen/data-cache/data-cache-io.cpp
platform-abstractions/tizen/data-cache/data-cache-io.h
platform-abstractions/tizen/data-cache/metrics-cache.cpp
platform-abstractions/tizen/data-cache/metrics-cache.h
platform-abstractions/tizen/data-cache/tests/data-cache-debug.cpp
platform-abstractions/tizen/data-cache/tests/data-cache-debug.h
platform-abstractions/tizen/font-platform/font-controller-impl.cpp
platform-abstractions/tizen/font-platform/font-controller-impl.h
platform-abstractions/tizen/resource-loader/debug/resource-loader-debug.cpp
platform-abstractions/tizen/resource-loader/debug/resource-loader-debug.h
platform-abstractions/tizen/resource-loader/loader-font.cpp
platform-abstractions/tizen/resource-loader/loader-font.h
platform-abstractions/tizen/resource-loader/resource-loader.cpp
platform-abstractions/tizen/resource-loader/resource-loader.h
platform-abstractions/tizen/resource-loader/resource-text-requester.cpp
platform-abstractions/tizen/resource-loader/resource-text-requester.h
platform-abstractions/tizen/resource-loader/resource-thread-text.cpp
platform-abstractions/tizen/resource-loader/resource-thread-text.h
platform-abstractions/tizen/tizen-platform-abstraction.cpp
Change-Id: I41ba796de5a70404514cf9c0b599c1391f9bb771
Victor Cebollada [Wed, 18 Mar 2015 11:26:24 +0000 (11:26 +0000)]
Bidi - Retrieve a paragraph's direction.
Change-Id: I79eb7ad81f32786ae0decd59c9d5bd6a3a3c87ad
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Paul Wisbey [Wed, 18 Mar 2015 09:51:41 +0000 (09:51 +0000)]
Fixed some KeyEvent values
Change-Id: I9d45ee461e1bbf6f34ab14737605bfa0fa66fb8f
taeyoon [Thu, 12 Mar 2015 05:39:48 +0000 (14:39 +0900)]
Add opengles feature "NOT_SUPPORTED" and utc for Application
Change-Id: I3ffa8165fe95006816243215b1e04424dc8ea78e
Victor Cebollada [Tue, 17 Mar 2015 16:35:27 +0000 (16:35 +0000)]
Method added to mirror bidirectional text's characters.
Change-Id: I2ac67c3f9e9e35e9275ba82f16c3e4f1a8494063
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Andrew Cox [Mon, 9 Mar 2015 11:45:37 +0000 (11:45 +0000)]
Image scaling operations - FilterModes Linear BoxThenLinear
Change-Id: I81505c1f0fff2355fa3affbdfc6467e08e10b3aa
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Adeel Kazmi [Tue, 17 Mar 2015 15:13:18 +0000 (08:13 -0700)]
Merge "Actor's Transformation API Cleanup" into tizen
Yoonsang Lee [Fri, 6 Mar 2015 08:52:24 +0000 (17:52 +0900)]
Actor's Transformation API Cleanup
Update for following changes in dali-core:
Actor::MoveBy -> TranslateBy
Actor::ColorBy -> <removed>
Actor::OpacityBy -> <removed>
Actor::SetRotation -> SetOrientation
Actor::GetCurrentRotation -> GetCurrentOrientation
Actor::GetCurrentWorldRotation -> GetCurrentWorldOrientation
Actor::SetInheritRotation -> SetInheritOrientation
Actor::IsRotationInherited -> IsOrientationInherited
Actor::Property::ROTATION -> Actor::Property::ORIENTATION
Actor::Property::WORLD_ROTATION -> Actor::Property::WORLD_ORIENTATION
Actor::Property::INHERIT_ROTATION -> Actor::Property::INHERIT_ORIENTATION
Change-Id: I275c2983b5fed266548db99fb415792df17fcfb1
Adeel Kazmi [Tue, 17 Mar 2015 10:05:44 +0000 (10:05 +0000)]
Change the width and height of a dali-window through an environment option
Change-Id: Ib74f6ea9e8fd75c1cea53521cdf3a1e1657ea63b
Paul Wisbey [Sun, 15 Mar 2015 17:22:37 +0000 (17:22 +0000)]
Fixed else condition in GetGlyphMetrics()
Change-Id: I20fdafceefd057a6f0ad8dac80dcdead6b209db0
Paul Wisbey [Sun, 15 Mar 2015 11:04:02 +0000 (11:04 +0000)]
Framework for Font styles
Change-Id: Id7f56956bde776562246a65c442344addcc162ed
taeyoon [Fri, 13 Mar 2015 06:42:27 +0000 (15:42 +0900)]
Removal of LITE profile
Change-Id: I92c82315ff012c85e78f67b0b8ebaf543d45343a
Kimmo Hoikka [Fri, 13 Mar 2015 11:17:51 +0000 (04:17 -0700)]
Merge "Change "SLP" to "Tizen"" into tizen
Paul Wisbey [Fri, 13 Mar 2015 10:30:17 +0000 (10:30 +0000)]
Merge remote-tracking branch 'origin/tizen' into new_text
Conflicts:
adaptors/common/adaptor-impl.cpp
adaptors/common/application-impl.cpp
Change-Id: Ic74c259b7a0dfc5f103c7afd93a8e567aee77be2
Adeel Kazmi [Fri, 13 Mar 2015 10:57:18 +0000 (03:57 -0700)]
Merge "Fix wrong if statement about egl image." into tizen
Adeel Kazmi [Fri, 13 Mar 2015 10:37:40 +0000 (03:37 -0700)]
Merge "Add SetWindowEffect in WindowExtension namespace." into tizen
taeyoon [Fri, 13 Mar 2015 09:16:28 +0000 (18:16 +0900)]
Change "SLP" to "Tizen"
Change-Id: Iacd1068df9929178887c3dff429161f851c2f7a4
HyunJu Shin [Fri, 13 Mar 2015 05:34:17 +0000 (22:34 -0700)]
Merge "Make a full screen window in the mobile emulator which has an HD screen" into tizen
daemyung jang [Mon, 23 Feb 2015 02:09:44 +0000 (11:09 +0900)]
Add SetWindowEffect in WindowExtension namespace.
Change-Id: Ib91b536b4c3484797490490bfde29cebaffacf10
Nick Holland [Thu, 12 Mar 2015 09:23:13 +0000 (09:23 +0000)]
DALi Version 1.0.33
Change-Id: Ie7c61fe1656c4e980d518ddea5c75c23bf863790
Victor Cebollada [Tue, 10 Mar 2015 16:53:28 +0000 (16:53 +0000)]
Fix for bidirectional support.
The text unicodes were pased to the fribidi_get_par_embedding_levels()
and the fribidi_get_par_direction() instead of the character's types.
Change-Id: I59eb4a49b073bfa849cd3d62fa83b75ac9ea71a8
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
daemyung jang [Tue, 10 Mar 2015 08:52:55 +0000 (17:52 +0900)]
Fix wrong if statement about egl image.
Change-Id: I9119f74334f0d10145e807d6a0bbbf329545dab9
Paul Wisbey [Wed, 11 Mar 2015 12:46:57 +0000 (12:46 +0000)]
FindFont with color preference
Change-Id: I3c3e65306205db7dcedc4a89a6506d434972737b
Paul Wisbey [Wed, 11 Mar 2015 10:09:56 +0000 (10:09 +0000)]
Fixed build break
Change-Id: Ie7ef77e9849a7c26d1059e79e15c23f57fe2ace6
Heeyong Song [Tue, 10 Mar 2015 04:33:23 +0000 (13:33 +0900)]
Make a full screen window in the mobile emulator which has an HD screen
Change-Id: I364501a6306dd525ec48e983b18ef801b74a35c0
Victor Cebollada [Tue, 10 Mar 2015 13:39:47 +0000 (13:39 +0000)]
Text script code moved to adaptor from toolkit.
Add IsRightToLeftScript() function added.
Change-Id: I3b0a6530ff8bad1930f86ab741e21ccaca59b4f3
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
taeyoon [Tue, 10 Mar 2015 05:37:37 +0000 (14:37 +0900)]
Move tv-key-impl.cpp with X11 dependency to X11 build for tv profile with wayland
- For TV profile build, tv-key-impl.cpp was moved common to x11 in Makefile.am.
Change-Id: Ic604a71b85bc3a3234389ee8f3e329f3e14e016c
Paul Wisbey [Mon, 9 Mar 2015 19:05:24 +0000 (19:05 +0000)]
Fix GlyphMetrics for fixed-size fonts
Change-Id: Ib9a1c81ae44a9061ca3a85bdddc601349c246022
Paul Wisbey [Mon, 9 Mar 2015 16:58:55 +0000 (16:58 +0000)]
Fixed FindDefaultFont to work with fixed-size fonts
Change-Id: I14fd27680970d5b1870eeb216c4781d27b73d996
Andrew Cox [Thu, 8 Jan 2015 16:05:09 +0000 (16:05 +0000)]
Image scaling operations - FilterModes Nearest and BoxThenNearest
Change-Id: I443a0b6da56fb7c63ccf9264cbccac5433900420
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Paul Wisbey [Sun, 8 Mar 2015 16:19:02 +0000 (16:19 +0000)]
Added a script value for Emoji
Change-Id: I3bb5612f9cf9c597f871c30c1b5ccd0806b98243
Paul Wisbey [Sun, 8 Mar 2015 11:13:28 +0000 (11:13 +0000)]
Added some missing key codes
Change-Id: I4b5d63a0423090a858f3cd1a98934f1cef1962c4
Paul Wisbey [Fri, 6 Mar 2015 15:40:09 +0000 (15:40 +0000)]
Merge remote-tracking branch 'origin/tizen' into new_text
Conflicts:
build/tizen/adaptor/Makefile.am
platform-abstractions/slp/slp-platform-abstraction.cpp
platform-abstractions/slp/slp-platform-abstraction.h
Change-Id: Ie98f87b62386114568d85bd23d87c909e18fe6b5
taeyoon [Fri, 6 Mar 2015 09:17:06 +0000 (18:17 +0900)]
Add wayland source part in MOBILE, WEARABLE, and TV profile
- Modification of adaptors/Makefile.am
Change-Id: I5535c09f1fadb36cb691ce2617f9e7cc95a5a311
daemyung jang [Fri, 6 Mar 2015 05:30:33 +0000 (14:30 +0900)]
Fix build breaks on mobile and remove excute permission.
Change-Id: Ia17778624c7ea102f5f214bcc91b608515111e31
Victor Cebollada [Thu, 5 Mar 2015 16:26:17 +0000 (16:26 +0000)]
Fix for text-shaping.
Reverse the order of the right to left text as it's needed in the logical order.
Change-Id: I8e28e11454096101ed1824031018136559180c1f
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
taeyoon [Thu, 26 Feb 2015 09:57:26 +0000 (18:57 +0900)]
Resource management modification
- Moving shaderbin directory information from dali-core to dali-adaptor
- Addition of shaderbin handling.
- Addition of enable_shaderbincache ENABLE (default is ENABLE)
Change-Id: I89ba27280fc1186245453fa6642bc8678d43a124
HyunJu Shin [Thu, 5 Mar 2015 10:24:10 +0000 (02:24 -0800)]
Merge "Change to use new AppFW APi for TV profile" into tizen
suhyung Eom [Thu, 5 Mar 2015 02:15:54 +0000 (11:15 +0900)]
Change to use new AppFW APi for TV profile
Signed-off-by: suhyung Eom <suhyung.eom@samsung.com>
Change-Id: I7f4beddc92824402c49ca3aa408d0ad14e72e8a9
Heeyong Song [Tue, 3 Mar 2015 08:31:39 +0000 (17:31 +0900)]
Indicator modification according to latest EFL changes
Change-Id: I4542f51a92ea8b154169bfeffb0b52dcf63d99d8
Paul Wisbey [Wed, 4 Mar 2015 17:58:56 +0000 (17:58 +0000)]
Merge remote-tracking branch 'origin/tizen' into new_text
Conflicts:
platform-abstractions/slp/resource-loader/resource-loader.cpp
Change-Id: I6451ef34ae101588518afd2881a722f113e38e9b
Paul Wisbey [Wed, 4 Mar 2015 16:33:52 +0000 (16:33 +0000)]
Log which Fonts are selected for each script
Change-Id: Id9b93e6f5eda493ff8e19192551a8d25c0c25249
Lee Morgan [Wed, 4 Mar 2015 16:10:57 +0000 (16:10 +0000)]
DALi Version 1.0.32
Change-Id: I754f19ee5d5b14bf911da8c990350d651d64668b
Richard Underhill [Tue, 3 Mar 2015 10:22:33 +0000 (10:22 +0000)]
Support for fixed size fonts in FreeType2
Change-Id: Ic962d26e0933bac859c4426836eb8741ec5cf907
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
Adeel Kazmi [Mon, 2 Mar 2015 17:25:43 +0000 (17:25 +0000)]
Replaced boost::function with Dali::Callback
Change-Id: I5b930e1e54006876e330842397baecb8ce8ca882
David Steele [Fri, 27 Feb 2015 11:07:55 +0000 (11:07 +0000)]
Removed AffectedByLighting APIs from MeshActor
Change-Id: Ib45d36940d257abac8be65213df02257dbea9dbd
Richard Underhill [Fri, 27 Feb 2015 09:19:11 +0000 (09:19 +0000)]
Fix signed / unsigned comparison warning on GCC4.8
Change-Id: I163548ade8321a9a90b0769ca5df08e397993212
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
Paul Wisbey [Thu, 26 Feb 2015 09:18:51 +0000 (09:18 +0000)]
Removed the DPI hacks
Change-Id: Icbd4283419cc554e87b2a124c558944247d542d8
David Steele [Wed, 25 Feb 2015 19:14:02 +0000 (19:14 +0000)]
Removed model loading
Change-Id: I8dadca6d5f3e3d3ceeca878f39ab1107517bb7b6
Signed-off-by: David Steele <david.steele@partner.samsung.com>
Adeel Kazmi [Wed, 25 Feb 2015 16:51:14 +0000 (08:51 -0800)]
Merge "Updates following 'Rename BitmapImage as BufferImage'" into tizen
Paul Wisbey [Wed, 25 Feb 2015 14:52:47 +0000 (14:52 +0000)]
Export the FontMetrics & GlyphInfo constructors
Change-Id: Iab2ea4df3ced09fa6c53b46d3b95483e9982e692
Paul Wisbey [Wed, 25 Feb 2015 13:09:19 +0000 (13:09 +0000)]
Merge remote-tracking branch 'origin/tizen' into new_text
Conflicts:
build/tizen/configure.ac
packaging/dali-adaptor-mobile.spec
packaging/dali-adaptor-tv.spec
packaging/dali-adaptor-wearable.spec
platform-abstractions/slp/font-platform/font-controller-impl.cpp
platform-abstractions/slp/font-platform/font-controller-impl.h
Change-Id: I03f316eeadbe029c5872ee59042c4466b88430d7
Kingsley Stephens [Wed, 25 Feb 2015 11:33:26 +0000 (11:33 +0000)]
DALi Version 1.0.31
Change-Id: I68ff5f60982043f8cf83b5b779faa4bc280f7e9d
Xiangyin Ma [Mon, 23 Feb 2015 16:46:11 +0000 (16:46 +0000)]
Updates following 'Rename BitmapImage as BufferImage'
Change-Id: I4d35baba48038c146b45bf6bba761fa92457c1d4
Kimmo Hoikka [Tue, 24 Feb 2015 17:46:46 +0000 (09:46 -0800)]
Merge "Updates following NativeImage changes and Pixel Format clean up in core" into tizen
Victor Cebollada [Tue, 24 Feb 2015 16:38:44 +0000 (16:38 +0000)]
Fix for Bidirectional support.
Always returns the same index when bidirectional
info is created for the whole paragraph.
Change-Id: I426e9998df8b45be07c81513c488bed7ed742306
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Adeel Kazmi [Tue, 24 Feb 2015 16:36:53 +0000 (08:36 -0800)]
Merge "remove obsolete (unused) create default surface method and clean up documentation" into tizen
Adeel Kazmi [Tue, 24 Feb 2015 16:36:18 +0000 (08:36 -0800)]
Merge "Removing some dead definitions" into tizen
Xiangyin Ma [Wed, 18 Feb 2015 17:18:10 +0000 (17:18 +0000)]
Updates following NativeImage changes and Pixel Format clean up in core
Change-Id: I0db26e56d32cfbb80568f3937af9af4389ceae15
Kimmo Hoikka [Tue, 24 Feb 2015 14:23:02 +0000 (06:23 -0800)]
Merge "Remove ResourceThreadDistanceField" into tizen
Kimmo Hoikka [Wed, 11 Feb 2015 18:16:22 +0000 (18:16 +0000)]
remove obsolete (unused) create default surface method and clean up documentation
Change-Id: I88812a6da9ac04b85e0e28189b77887cc0ef83e5
Kimmo Hoikka [Tue, 24 Feb 2015 13:10:30 +0000 (13:10 +0000)]
Removing some dead definitions
Change-Id: I58207531bc9526f8771b9afd853f17f36a542d07
daemyung jang [Tue, 24 Feb 2015 06:27:08 +0000 (15:27 +0900)]
Retrieve the current system font and style
Change-Id: I324205cd9638588139e2687f65b691e9d7651c41
Yoonsang Lee [Tue, 24 Feb 2015 01:35:25 +0000 (10:35 +0900)]
Remove ResourceThreadDistanceField
Change-Id: Ic24c0de8a6ccebc4002d2fdeed7564ad85a34e92
projects / platform / core / uifw / dali-adaptor.git / log