projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Encapsulation and harmonizing operators for LayoutLength" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
image-loader
/
image-load-thread.cpp
diff --git
a/dali-toolkit/internal/image-loader/image-load-thread.cpp
b/dali-toolkit/internal/image-loader/image-load-thread.cpp
index
c1b4a91
..
74d3e39
100644
(file)
--- a/
dali-toolkit/internal/image-loader/image-load-thread.cpp
+++ b/
dali-toolkit/internal/image-loader/image-load-thread.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
5
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
7
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-20,6
+20,8
@@
// EXTERNAL INCLUDES
#include <dali/devel-api/adaptor-framework/image-loading.h>
// EXTERNAL INCLUDES
#include <dali/devel-api/adaptor-framework/image-loading.h>
+#include <dali/integration-api/adaptors/adaptor.h>
+#include <dali/devel-api/adaptor-framework/thread-settings.h>
namespace Dali
{
namespace Dali
{
@@
-44,7
+46,7
@@
LoadingTask::LoadingTask( uint32_t id, const VisualUrl& url, ImageDimensions dim
void LoadingTask::Load()
{
void LoadingTask::Load()
{
- if( url.IsLocal() )
+ if( url.IsLocal
Resource
() )
{
pixelBuffer = Dali::LoadImageFromFile( url.GetUrl(), dimensions, fittingMode, samplingMode, orientationCorrection );
}
{
pixelBuffer = Dali::LoadImageFromFile( url.GetUrl(), dimensions, fittingMode, samplingMode, orientationCorrection );
}
@@
-56,7
+58,8
@@
void LoadingTask::Load()
ImageLoadThread::ImageLoadThread( EventThreadCallback* trigger )
ImageLoadThread::ImageLoadThread( EventThreadCallback* trigger )
-: mTrigger( trigger )
+: mTrigger( trigger ),
+ mLogFactory( Dali::Adaptor::Get().GetLogFactory() )
{
}
{
}
@@
-72,6
+75,9
@@
ImageLoadThread::~ImageLoadThread()
void ImageLoadThread::Run()
{
void ImageLoadThread::Run()
{
+ SetThreadName( "ImageLoadThread" );
+ mLogFactory.InstallLogFunction();
+
while( LoadingTask* task = NextTaskToProcess() )
{
task->Load();
while( LoadingTask* task = NextTaskToProcess() )
{
task->Load();