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 "ImageVisual to store TextureSet when LoadPolicy::IMMEDIATE" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
image-atlas-manager.cpp
diff --git
a/dali-toolkit/internal/visuals/image-atlas-manager.cpp
b/dali-toolkit/internal/visuals/image-atlas-manager.cpp
index
fe01571
..
d959c1a
100644
(file)
--- a/
dali-toolkit/internal/visuals/image-atlas-manager.cpp
+++ b/
dali-toolkit/internal/visuals/image-atlas-manager.cpp
@@
-20,7
+20,7
@@
// EXTERNAL HEADER
#include <dali/devel-api/images/texture-set-image.h>
// EXTERNAL HEADER
#include <dali/devel-api/images/texture-set-image.h>
-#include <dali/
public-api/images/resource-image
.h>
+#include <dali/
devel-api/adaptor-framework/image-loading
.h>
namespace Dali
{
namespace Dali
{
@@
-58,7
+58,7
@@
TextureSet ImageAtlasManager::Add( Vector4& textureRect,
ImageDimensions zero;
if( size == zero )
{
ImageDimensions zero;
if( size == zero )
{
- dimensions =
ResourceImage::Ge
tImageSize( url );
+ dimensions =
Dali::GetCloses
tImageSize( url );
}
// big image, atlasing is not applied
}
// big image, atlasing is not applied