greynaga [Fri, 4 Aug 2017 10:44:26 +0000 (11:44 +0100)]
[dali_1.2.51] Merge branch 'devel/master'
Change-Id: I3de0c71b7d91e0eaa13f619dc54d5caf2d83645b
greynaga [Fri, 4 Aug 2017 10:43:40 +0000 (11:43 +0100)]
DALi Version 1.2.51
Change-Id: Ic2b5ddba4588b64cb7a49f1732d8ae7bb57f5ff4
David Steele [Fri, 28 Jul 2017 16:02:03 +0000 (16:02 +0000)]
Merge "DALi Version 1.2.50" into devel/master
Adeel Kazmi [Fri, 28 Jul 2017 15:55:30 +0000 (16:55 +0100)]
[dali_1.2.50] Merge branch 'devel/master'
Change-Id: I8821ef6744f09fc5403f415e9b7883a3d01f131b
Adeel Kazmi [Fri, 28 Jul 2017 15:54:46 +0000 (16:54 +0100)]
DALi Version 1.2.50
Change-Id: I6e959e28a991aecbe1411eb6c31963d4e1a1d247
Heeyong Song [Thu, 20 Jul 2017 07:20:21 +0000 (16:20 +0900)]
Support screen rotation
Change-Id: Iab506d449cf578bd0b4bc9d2d889769c06df1ff8
David Steele [Tue, 25 Jul 2017 15:22:42 +0000 (16:22 +0100)]
Changed curl file download algorithm to handle chunks
Some websites don't provide an image size in the HTTP header, instead
they 'chunk' the data. The new implementation handles both images with
a size that can be allocated, and images that are loaded as chunks.
Change-Id: If8c4b914f75581f093b51c92e2d3e282b5e9dd5b
Signed-off-by: David Steele <david.steele@samsung.com>
Adeel Kazmi [Tue, 25 Jul 2017 11:14:12 +0000 (11:14 +0000)]
Merge "Fix security SVACE issue" into devel/master
Adeel Kazmi [Fri, 21 Jul 2017 13:27:40 +0000 (13:27 +0000)]
Merge "DALi Version 1.2.49" into devel/master
David Steele [Fri, 21 Jul 2017 13:25:13 +0000 (14:25 +0100)]
[dali_1.2.49] Merge branch 'devel/master'
Change-Id: I078e6f5181b3791638ff61105088b4dd796aedca
David Steele [Fri, 21 Jul 2017 13:24:30 +0000 (14:24 +0100)]
DALi Version 1.2.49
Change-Id: I8a494ed49876e67d6d1f9e4ef64090af8e814903
Adeel Kazmi [Fri, 21 Jul 2017 09:32:18 +0000 (09:32 +0000)]
Merge "Adding scale and crop feature to alpha mask" into devel/master
taeyoon0.lee [Fri, 21 Jul 2017 07:58:49 +0000 (16:58 +0900)]
Modified parameters of play position API in video plugin
Change-Id: Ib25b3402da90d84cf3ea18b6bbc3521cccd803c8
Heeyong Song [Fri, 21 Jul 2017 06:27:45 +0000 (15:27 +0900)]
Fix security SVACE issue
Change-Id: I44700728866ffef5728bc45433455059a9eb882f
David Steele [Tue, 18 Jul 2017 15:26:37 +0000 (16:26 +0100)]
Adding scale and crop feature to alpha mask
When alpha masking an image, there is a requirement to first
scale the content image by some factor, then crop it to match the
mask size, then apply the mask to it.
Uses Lanczos resampling for reducing an image, or Mitchell resampling for
upscaling an image ( Mitchell has fewer artifacts on my test images ).
Change-Id: I0334baa855a3e1547947f0a81b42f5e6271232ce
Signed-off-by: David Steele <david.steele@samsung.com>
Adeel Kazmi [Tue, 18 Jul 2017 12:55:14 +0000 (13:55 +0100)]
Remove LibUV build
Change-Id: Ia9462d2ca21634143db2df64bca4b05a6ec4ed82
Heeyong Song [Tue, 18 Jul 2017 09:45:45 +0000 (18:45 +0900)]
Removed separate-update-render and single-threaded modes
Change-Id: I6c6a5754b82ecfe3c4c73d86bd77eaccbb0bcb43
Heeyong Song [Mon, 10 Jul 2017 14:43:18 +0000 (23:43 +0900)]
Added APIs to support Launchpad and set window transparency
Change-Id: I3206d7b9485bc516d0e90da92f37f627b3072455
David Steele [Fri, 14 Jul 2017 14:58:58 +0000 (15:58 +0100)]
Changed alpha mask scaling to use Lanczos.
Increases the quality significantly.
Changed the outer sampling method to handle both 4 channel and 1 channel images
(in case the alpha mask is L8 only).
With some slight blurring of the alpha mask during scaling, have had to choose
different pixels in the test cases.
Change-Id: I348300cb4a28b1c0814495cc10ff589196b339e8
Signed-off-by: David Steele <david.steele@samsung.com>
Adeel Kazmi [Fri, 14 Jul 2017 14:42:02 +0000 (14:42 +0000)]
Merge "Added tracking of texture count to test harness" into devel/master
adam.b [Fri, 14 Jul 2017 12:29:59 +0000 (13:29 +0100)]
[dali_1.2.48] Merge branch 'devel/master'
Change-Id: I47b0720a5762fd9bf200a85c8c48983db110820a
adam.b [Fri, 14 Jul 2017 12:29:15 +0000 (13:29 +0100)]
DALi Version 1.2.48
Change-Id: I60e95a16beea9e80b08998f33c5669b2d25fd5b9
David Steele [Thu, 13 Jul 2017 14:35:07 +0000 (15:35 +0100)]
Added tracking of texture count to test harness
Change-Id: Ie00ceb75e2e8e1f7e2e8747548f6f0866b18d41c
Heeyong Song [Thu, 13 Jul 2017 02:12:27 +0000 (02:12 +0000)]
Merge "Use screen connector" into devel/master
taeyoon0.lee [Sun, 25 Jun 2017 06:02:43 +0000 (15:02 +0900)]
Set device information for ecore event
Added device information
Removed mouse out callback
Change-Id: I90e2c931516c118eab04d389319ec65b90827e93
Jinho, Lee [Tue, 4 Jul 2017 12:55:05 +0000 (21:55 +0900)]
Use screen connector
- Replace aul_rsm with screen_connector_provider and enable for only wearable profile
Change-Id: Ie1a0c47ea079ed2b06d22f98158389d07043ca11
Jinho, Lee [Tue, 4 Jul 2017 12:52:31 +0000 (21:52 +0900)]
Fix build errors in adaptor-uv by ecore wayland.
Change-Id: I901d2feb3ff8f2db61f03500a4c87ad73432ec0e
Seoyeon Kim [Fri, 30 Jun 2017 05:07:53 +0000 (14:07 +0900)]
Add Keyboard type and Language locale
- KeyboardTypeChangedSignal() and GetKeyboardType()
- GetInputPanelLocale()
- Added OVER_TIZEN_VERSION_4 conditional in dali-adaptor.spec
Change-Id: Idd5159cb3c49d5a0e072ab7a2b873427e4ebf743
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
Adeel Kazmi [Fri, 7 Jul 2017 10:45:20 +0000 (10:45 +0000)]
Merge "DALi Version 1.2.47" into devel/master
Agnelo Vaz [Fri, 7 Jul 2017 10:21:12 +0000 (11:21 +0100)]
[dali_1.2.47] Merge branch 'devel/master'
Change-Id: I45e09f9a15928fe31b228dd5bf26d949755fac3e
Agnelo Vaz [Fri, 7 Jul 2017 10:20:30 +0000 (11:20 +0100)]
DALi Version 1.2.47
Change-Id: I2b598e869f95e01b1f77e59a48b1f5d26764fa88
David Steele [Thu, 6 Jul 2017 15:56:01 +0000 (16:56 +0100)]
Updated test case CmakeLists.txt to work with newer version of CMAKE
Change-Id: Iad48ae95621764d399ee6d1d5b727b9fbb15584c
minho.sun [Thu, 22 Jun 2017 12:26:57 +0000 (21:26 +0900)]
Delete elementary dependency of ui_app_main
Delete elementary dependency of ui_app_main.
Use ui-base(appcore-ui package) directly to get life cycle callbacks.
Change-Id: Ifd98ca4fc925bd3d8ab26d921632c784b54f68be
taeyoon0.lee [Tue, 4 Jul 2017 03:14:30 +0000 (03:14 +0000)]
Merge "Added devel-API for video player" into devel/master
Heeyong Song [Mon, 3 Jul 2017 07:41:26 +0000 (16:41 +0900)]
Use max texture size when loading images
Change-Id: I610c9d6c0a5ccd85b0dd0677b660c784a54d22a3
Adeel Kazmi [Thu, 15 Jun 2017 17:00:13 +0000 (17:00 +0000)]
Restore "Remove profile build dependencies and deviced library"
This reverts commit
e9125ec2d4a72c15094d2d240c8cc8b2b6de6316.
Change-Id: Ib22ff7ff23986f2d2d797122b4c1da3c8b34586f
Adeel Kazmi [Fri, 30 Jun 2017 18:35:28 +0000 (18:35 +0000)]
Merge "Performance Improvements: Remove unnecessary SwapBuffer calls" into devel/master
Tom Robinson [Wed, 28 Jun 2017 14:03:40 +0000 (15:03 +0100)]
Performance Improvements: Remove unnecessary SwapBuffer calls
Change-Id: I156fd428fa16de10ea2de1839893c2470da614e7
Adeel Kazmi [Fri, 30 Jun 2017 10:43:30 +0000 (10:43 +0000)]
Merge "DALi Version 1.2.46" into devel/master
Adeel Kazmi [Fri, 30 Jun 2017 10:21:35 +0000 (11:21 +0100)]
[dali_1.2.46] Merge branch 'devel/master'
Change-Id: Ib5e354bd8d1b814e933b62440ddffef6c652cf12
Adeel Kazmi [Fri, 30 Jun 2017 10:20:45 +0000 (11:20 +0100)]
DALi Version 1.2.46
Change-Id: I1609b3719c0a8cb1d7b7b3f7397b10ba14b98c97
Adeel Kazmi [Fri, 30 Jun 2017 09:18:15 +0000 (09:18 +0000)]
Merge "Fix the comments in CombinedUpdateRenderController" into devel/master
taeyoon0.lee [Mon, 5 Jun 2017 08:37:15 +0000 (17:37 +0900)]
Added devel-API for video player
- SetDisplayArea, Forward, Backward
Change-Id: I5cb5999a37f14c44dbe249f40eaefd2c13c0b975
Richard Huang [Thu, 29 Jun 2017 16:02:52 +0000 (17:02 +0100)]
Fix the comments in CombinedUpdateRenderController
Change-Id: If1cc1878212ee0b44f4e8b4416135b784341c0e5
Adeel Kazmi [Thu, 29 Jun 2017 15:32:41 +0000 (16:32 +0100)]
Removed Emscripten
Change-Id: Ic98ccf17ee5489bb27e22ab0239eee5ec4262302
Adeel Kazmi [Wed, 28 Jun 2017 15:00:53 +0000 (15:00 +0000)]
Merge "Added PixelBuffer for image loading and operations." into devel/master
Adeel Kazmi [Wed, 28 Jun 2017 15:00:41 +0000 (15:00 +0000)]
Merge "Fix the frame sync issue in COMBINED_UPDATE_RENDER mode" into devel/master
Kimmo Hoikka [Tue, 27 Jun 2017 13:15:24 +0000 (14:15 +0100)]
Modified resampler.cpp to use enums for filter types rather than char*
- removed ununsed filter name getter
Change-Id: Ifbede1d64e9bcf9c49086a64c5a8de3195b85ff2
Richard Huang [Thu, 15 Jun 2017 16:16:11 +0000 (17:16 +0100)]
Fix the frame sync issue in COMBINED_UPDATE_RENDER mode
There could be a small gap between the start time of the current frame and the
sleep-until time calculated in the previous frame. In addition, the update or
rendering in the current frame could take too much time so that the calculated
sleep-until time has already passed. In order to make the frames keep syncing
to the default frame duration (i.e. 16 ms) in these cases, we should keep tracking
any extra time taken by the current frame and shorten the duration of the next frame
accordingly.
Change-Id: Ic3dcbfbc5b8aded6514310ee17843839daf12f03
David Steele [Thu, 8 Jun 2017 18:13:03 +0000 (19:13 +0100)]
Added PixelBuffer for image loading and operations.
Moved alpha masking from PixelData in Core to stand-alone C methods
in Adaptor.
Change-Id: I7eede320fdbc00e067241a4228b7e99ad958fe04
Heeyong Song [Mon, 19 Jun 2017 05:25:09 +0000 (14:25 +0900)]
Support window resizing
Change-Id: Ie4fec40d8b4400233ec35eb09bb5d200ea03b94f
Adeel Kazmi [Fri, 23 Jun 2017 11:52:13 +0000 (11:52 +0000)]
Merge "Add key grab list API" into devel/master
Adeel Kazmi [Fri, 23 Jun 2017 09:50:52 +0000 (09:50 +0000)]
Merge "DALi Version 1.2.45" into devel/master
Victor Cebollada [Fri, 23 Jun 2017 09:44:42 +0000 (10:44 +0100)]
[dali_1.2.45] Merge branch 'devel/master'
Change-Id: Ia73cd7558d3bdfb1e9b952889b353a68b1ae031f
Victor Cebollada [Fri, 23 Jun 2017 09:43:50 +0000 (10:43 +0100)]
DALi Version 1.2.45
Change-Id: I0bd59a9a11156d14083fd8baba1b1139d131a459
dongsug.song [Tue, 11 Oct 2016 00:54:27 +0000 (09:54 +0900)]
Add key grab list API
- User can set numbers of key grab at a same time.
Change-Id: I286ec710e8260906173ef2cc0ebd55647b1a1d45
Signed-off-by: dongsug.song <dongsug.song@samsung.com>
Heeyong Song [Thu, 22 Jun 2017 03:45:09 +0000 (12:45 +0900)]
Fix i586 build error
Some wl_egl_window functions are not included in some profiles. So load symbols.
Change-Id: Ifff09ecaebaff7e7e22cd90f6ebaf9fafdad9c49
Victor Cebollada [Tue, 20 Jun 2017 11:21:19 +0000 (12:21 +0100)]
Meitei script added.
Change-Id: I6233ca73a8a99b4a006353b0e5063c6e4575a98f
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Adeel Kazmi [Fri, 16 Jun 2017 11:09:07 +0000 (11:09 +0000)]
Merge "DALi Version 1.2.44" into devel/master
Umar [Fri, 16 Jun 2017 11:04:19 +0000 (12:04 +0100)]
[dali_1.2.44] Merge branch 'devel/master'
Change-Id: I83c807795b23344446025337b1297bfe69f11eaf
Umar [Fri, 16 Jun 2017 11:03:37 +0000 (12:03 +0100)]
DALi Version 1.2.44
Change-Id: I7f37f979c07655e57094f4be0407c000a86b61e9
Jinho, Lee [Fri, 16 Jun 2017 07:52:40 +0000 (07:52 +0000)]
Merge "Ol_chiki and Baybayin scripts added" into devel/master
Adeel Kazmi [Thu, 15 Jun 2017 17:53:01 +0000 (17:53 +0000)]
Revert "Enable GLES 3.0 by default."
This reverts commit
c5a2326108b1571ab933cbb00cb35403c7c990c1.
Change-Id: I681b95be2ffee149f1c7a3c480e5494cddf9da38
Victor Cebollada [Wed, 14 Jun 2017 15:49:39 +0000 (16:49 +0100)]
Enable GLES 3.0 by default.
Change-Id: I67230c3d07d1f2d7e8cab005ab9a5fcc0b327fcc
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
David Steele [Wed, 14 Jun 2017 13:35:44 +0000 (13:35 +0000)]
Merge "Fix indicator crash" into devel/master
Heeyong Song [Tue, 13 Jun 2017 10:55:17 +0000 (10:55 +0000)]
Merge "Support window rotation" into devel/master
Heeyong Song [Tue, 13 Jun 2017 07:05:44 +0000 (16:05 +0900)]
Fix indicator crash
Change-Id: I16f27d7627eee4328d92e6ed2d7db8e59e90f79d
Jinho, Lee [Thu, 8 Jun 2017 11:28:52 +0000 (20:28 +0900)]
Ol_chiki and Baybayin scripts added
Change-Id: I07f25309e36ab0d051a8f114161db5eef9179d7c
Heeyong Song [Mon, 12 Jun 2017 01:34:46 +0000 (01:34 +0000)]
Merge "Add environment variable for multisampling" into devel/master
Adeel Kazmi [Fri, 9 Jun 2017 12:54:07 +0000 (12:54 +0000)]
Merge "Harmonizing test harness files" into devel/master
Adeel Kazmi [Fri, 9 Jun 2017 12:50:16 +0000 (13:50 +0100)]
[dali_1.2.43] Merge branch 'devel/master'
Change-Id: I005986db4bcae83d205aaf5b37dc1096476e076e
Richard Huang [Fri, 9 Jun 2017 12:23:17 +0000 (13:23 +0100)]
DALi Version 1.2.43
Change-Id: Ie670605791473295738f6737fef674fadb0afba0
Heeyong Song [Thu, 8 Jun 2017 07:01:10 +0000 (16:01 +0900)]
Add environment variable for multisampling
Change-Id: Ia086b802d262e446f60ab8420dd70d9fe6797429
Heeyong Song [Wed, 7 Jun 2017 07:05:38 +0000 (16:05 +0900)]
Support window rotation
Change-Id: Ib1fbd9fed50ea2491fc923084581ce12e265e3bc
Heeyong Song [Thu, 8 Jun 2017 00:13:59 +0000 (00:13 +0000)]
Merge "Fix -Werror=old-style-cast error" into devel/master
Adeel Kazmi [Wed, 7 Jun 2017 13:56:29 +0000 (13:56 +0000)]
Merge "Ge'ez (Ethiopic) script added." into devel/master
Adeel Kazmi [Wed, 7 Jun 2017 13:52:06 +0000 (13:52 +0000)]
Revert "Remove profile build dependencies and deviced library"
This reverts commit
2842f416ec85262ad6f97e6b1a89162b5913d410.
Needed to revert as none of the demos are launching on device anymore.
Change-Id: Ica98f1a7aa47a7bb0c401bc790b329de02b19c41
Victor Cebollada [Tue, 16 May 2017 13:45:45 +0000 (14:45 +0100)]
Ge'ez (Ethiopic) script added.
Change-Id: If4eb00d531bc65755aa2f1d985f3e9480c4e104c
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Seoyeon Kim [Mon, 24 Apr 2017 05:05:23 +0000 (14:05 +0900)]
Remove profile build dependencies and deviced library
- From Tizen 4.0, profile dependent build is not allowed.
So, removed profile macro in .spec file.
- Added backward-compatibility with some esceptions
- Feedback-plugin enabled for Unified profile build
Change-Id: I3c55879ee13ef2f0e082484a35de7f1a8c8fe124
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
minho.sun [Wed, 7 Jun 2017 06:24:04 +0000 (15:24 +0900)]
Fix -Werror=old-style-cast error
Fix -Werror=old-style-cast error
Change-Id: Iebedc86627f2a26f5893657e423ab0db794d6a15
Signed-off-by: minho.sun <minho.sun@samsung.com>
David Steele [Tue, 6 Jun 2017 18:15:13 +0000 (19:15 +0100)]
Harmonizing test harness files
Change-Id: I09b8da023a7b8584a0396adfba6a91528eee72a5
Signed-off-by: David Steele <david.steele@samsung.com>
Adeel Kazmi [Mon, 5 Jun 2017 17:37:33 +0000 (17:37 +0000)]
Merge "Added handler for ECORE_WL_EVENT_WINDOW_VISIBILITY_CHANGE" into devel/master
Adeel Kazmi [Mon, 5 Jun 2017 15:18:29 +0000 (15:18 +0000)]
Merge "Updated network client to fix cast build errors" into devel/master
Adeel Kazmi [Mon, 5 Jun 2017 13:49:30 +0000 (13:49 +0000)]
Merge "Fixed string constant spacing for fw/compat with gcc 6.2" into devel/master
David Steele [Mon, 5 Jun 2017 13:43:33 +0000 (14:43 +0100)]
Updated network client to fix cast build errors
This variant of the build options is not tested by the build server
(--enable-networklogging), consequently, these errors were not
discovered when -Werror=old-style-cast was added.
Apparently no-one else uses Stagehand any more...
Change-Id: I69fdaa03608723b66be080bd7749e243b7ea6a89
Signed-off-by: David Steele <david.steele@samsung.com>
Adeel Kazmi [Mon, 5 Jun 2017 09:47:38 +0000 (09:47 +0000)]
Merge "Fix errors caused by -Wold-style-cast" into devel/master
minho.sun [Thu, 18 May 2017 10:59:08 +0000 (19:59 +0900)]
Support extension keys
Implement key-extension as Plugin to support extension keys.
For this, create new repository named "dali-extension"
Change-Id: If8177597658d99fda336f8d7bcf885bcd88018db
Signed-off-by: minho.sun <minho.sun@samsung.com>
Heeyong Song [Mon, 5 Jun 2017 01:05:44 +0000 (01:05 +0000)]
Merge "Fix to get a Stage::SceneCreatedSignal()" into devel/master
Kimmo Hoikka [Fri, 2 Jun 2017 17:23:14 +0000 (18:23 +0100)]
Fix errors caused by -Wold-style-cast
Change-Id: Ie1dd73e2c13253e5fb464d49d7d67ae3af90d559
Adeel Kazmi [Fri, 2 Jun 2017 16:01:38 +0000 (16:01 +0000)]
Merge "Enable -Wold-style-cast in Adaptor" into devel/master
Adeel Kazmi [Fri, 2 Jun 2017 14:13:54 +0000 (14:13 +0000)]
Merge "DALi Version 1.2.42" into devel/master
Kimmo Hoikka [Wed, 31 May 2017 15:29:24 +0000 (16:29 +0100)]
Enable -Wold-style-cast in Adaptor
- Have to exclude bits of Ecore and 3rd party libs written in C-style
Change-Id: Id7a7cd47ef681634e745a0533688b47c376cd777
Nick Holland [Fri, 2 Jun 2017 11:56:27 +0000 (12:56 +0100)]
[dali_1.2.42] Merge branch 'devel/master'
Change-Id: Ibec3ad9a5bb9cfe60d7ca9bf4cbd0f3888b0d918
Nick Holland [Fri, 2 Jun 2017 11:55:47 +0000 (12:55 +0100)]
DALi Version 1.2.42
Change-Id: I9e67029d72f149615c408e19c3511f1881a5d8ba
Heeyong Song [Mon, 29 May 2017 01:28:06 +0000 (10:28 +0900)]
Fix to get a Stage::SceneCreatedSignal()
- The signal should be emitted after Application::InitSignal() is emitted.
Change-Id: I03256291e0a31ed85b169eb56effdb787a50e28d
Seoyeon Kim [Thu, 25 May 2017 09:56:09 +0000 (18:56 +0900)]
Fix IME direction key in event-handler
- If the device is IME and the focused key is the direction key,
then we should send a key event to move a key cursor.
- The keyname of Ecore Key Event is "Up" / "Down" / "Left" / "Right".
- Removed ECORE_IMF_1_13 defined in event-handler-ecore-wl.cpp
Change-Id: Ie8f04b5e452a037d42b6a482236a571580c639e5
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
taeyoon0.lee [Tue, 23 May 2017 09:20:00 +0000 (18:20 +0900)]
Added handler for ECORE_WL_EVENT_WINDOW_VISIBILITY_CHANGE
- Adaptor will be paused/resumed if ECORE_WL_EVENT_WINDOW_VISIBILITY_CHANGE is changed
Change-Id: I7ad874d85cfe3eef26b7225462fcba89f7defec9
Adeel Kazmi [Tue, 30 May 2017 09:51:28 +0000 (09:51 +0000)]
Merge "Avoid Svace DEREF_OF_NULL warnings" into devel/master
David Steele [Fri, 26 May 2017 17:31:38 +0000 (17:31 +0000)]
Merge "Add ecore-x as a dependency for tests" into devel/master
David Steele [Fri, 26 May 2017 17:30:23 +0000 (17:30 +0000)]
Merge "Removal of unnecessary set and map wrappers" into devel/master
projects / platform / core / uifw / dali-adaptor.git / log