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
Changes following "Remove Sampler scene object"
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
rendering
/
atlas
/
atlas-glyph-manager-impl.h
diff --git
a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h
b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h
index
5ba6740
..
da659bc
100644
(file)
--- a/
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h
+++ b/
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h
@@
-121,7
+121,7
@@
public:
/**
* @copydoc Toolkit::AtlasGlyphManager::GetMaterial
*/
-
Sampler GetSampler
( uint32_t atlasId ) const;
+
Image GetImage
( uint32_t atlasId ) const;
/**
* @copydoc Toolkit::AtlasGlyphManager::GetMetrics