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 "(Visuals) If depth index not specified, then visual depth indices are set...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
image-loader
/
async-image-loader-impl.cpp
diff --git
a/dali-toolkit/internal/image-loader/async-image-loader-impl.cpp
b/dali-toolkit/internal/image-loader/async-image-loader-impl.cpp
index
1fbef38
..
8454992
100644
(file)
--- a/
dali-toolkit/internal/image-loader/async-image-loader-impl.cpp
+++ b/
dali-toolkit/internal/image-loader/async-image-loader-impl.cpp
@@
-49,7
+49,7
@@
IntrusivePtr<AsyncImageLoader> AsyncImageLoader::New()
return internal;
}
return internal;
}
-uint32_t AsyncImageLoader::Load( const
std::string
& url,
+uint32_t AsyncImageLoader::Load( const
VisualUrl
& url,
ImageDimensions dimensions,
FittingMode::Type fittingMode,
SamplingMode::Type samplingMode,
ImageDimensions dimensions,
FittingMode::Type fittingMode,
SamplingMode::Type samplingMode,
@@
-83,7
+83,7
@@
void AsyncImageLoader::CancelAll()
void AsyncImageLoader::ProcessLoadedImage()
{
void AsyncImageLoader::ProcessLoadedImage()
{
- while( LoadingTask *next =
mLoadThread.NextCompletedTask() )
+ while( LoadingTask *next = mLoadThread.NextCompletedTask() )
{
mLoadedSignal.Emit( next->id, next->pixelData );
delete next;
{
mLoadedSignal.Emit( next->id, next->pixelData );
delete next;