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
5a90d17
..
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
@@
-1,4
+1,3
@@
-
#ifndef __DALI_TOOLKIT_ATLAS_GLYPH_MANAGER_IMPL_H__
#define __DALI_TOOLKIT_ATLAS_GLYPH_MANAGER_IMPL_H__
#ifndef __DALI_TOOLKIT_ATLAS_GLYPH_MANAGER_IMPL_H__
#define __DALI_TOOLKIT_ATLAS_GLYPH_MANAGER_IMPL_H__
@@
-62,14
+61,10
@@
public:
Vector< GlyphRecordEntry > mGlyphRecords;
};
Vector< GlyphRecordEntry > mGlyphRecords;
};
- AtlasGlyphManager();
-
- virtual ~AtlasGlyphManager();
-
-/**
- * Create a new AtlasGlyphManager
+ /**
+ * @brief Constructor
*/
*/
-
static AtlasGlyphManagerPtr New
();
+
AtlasGlyphManager
();
/**
* @copydoc Toolkit::AtlasGlyphManager::Add
/**
* @copydoc Toolkit::AtlasGlyphManager::Add
@@
-116,7
+111,7
@@
public:
/**
* @copydoc toolkit::AtlasGlyphManager::AdjustReferenceCount
*/
/**
* @copydoc toolkit::AtlasGlyphManager::AdjustReferenceCount
*/
- void AdjustReferenceCount( Text::FontId fontId,
uint32_t imageId
, int32_t delta );
+ void AdjustReferenceCount( Text::FontId fontId,
Text::GlyphIndex index
, int32_t delta );
/**
* @copydoc Toolkit::AtlasGlyphManager::GetMaterial
/**
* @copydoc Toolkit::AtlasGlyphManager::GetMaterial
@@
-126,7
+121,7
@@
public:
/**
* @copydoc Toolkit::AtlasGlyphManager::GetMaterial
*/
/**
* @copydoc Toolkit::AtlasGlyphManager::GetMaterial
*/
-
Sampler GetSampler
( uint32_t atlasId ) const;
+
Image GetImage
( uint32_t atlasId ) const;
/**
* @copydoc Toolkit::AtlasGlyphManager::GetMetrics
/**
* @copydoc Toolkit::AtlasGlyphManager::GetMetrics
@@
-149,6
+144,13
@@
public:
return mShadowShader;
}
return mShadowShader;
}
+protected:
+
+ /**
+ * A reference counted object may only be deleted by calling Unreference()
+ */
+ virtual ~AtlasGlyphManager();
+
private:
Dali::Toolkit::AtlasManager mAtlasManager; ///> Atlas Manager created by GlyphManager
private:
Dali::Toolkit::AtlasManager mAtlasManager; ///> Atlas Manager created by GlyphManager
@@
-182,5
+184,4
@@
inline Internal::AtlasGlyphManager& GetImplementation(Toolkit::AtlasGlyphManager
} // namespace Dali
} // namespace Dali
-
- #endif // __DALI_TOOLKIT_ATLAS_GLYPH_MANAGER_IMPL_H__
+#endif // __DALI_TOOLKIT_ATLAS_GLYPH_MANAGER_IMPL_H__