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 "Add ApplyCustomFragmentPrefix" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
rendering
/
text-backend.h
diff --git
a/dali-toolkit/internal/text/rendering/text-backend.h
b/dali-toolkit/internal/text/rendering/text-backend.h
index
62b9f86
..
926ecd3
100644
(file)
--- a/
dali-toolkit/internal/text/rendering/text-backend.h
+++ b/
dali-toolkit/internal/text/rendering/text-backend.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TOOLKIT_TEXT_BACKEND_H__
-#define
__DALI_TOOLKIT_TEXT_BACKEND_H__
+#ifndef
DALI_TOOLKIT_TEXT_BACKEND_H
+#define
DALI_TOOLKIT_TEXT_BACKEND_H
/*
/*
- * Copyright (c) 20
15
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
21
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.
@@
-26,32
+26,21
@@
namespace Dali
{
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
namespace Text
{
namespace Text
{
-
namespace Internal DALI_INTERNAL
{
class Backend;
}
namespace Internal DALI_INTERNAL
{
class Backend;
}
-// The type of text renderer required
-enum RenderingType
-{
- RENDERING_BASIC, ///< A bitmap-based reference implementation
- RENDERING_SHARED_ATLAS ///< A bitmap-based solution where renderers can share a texture atlas
-};
-
/**
* @brief Provides access to different text rendering backends.
*/
/**
* @brief Provides access to different text rendering backends.
*/
-class
DALI_IMPORT_API
Backend : public BaseHandle
+class Backend : public BaseHandle
{
public:
{
public:
-
/**
* @brief Retrieve a handle to the Backend instance.
*
/**
* @brief Retrieve a handle to the Backend instance.
*
@@
-65,7
+54,7
@@
public:
* @param[in] renderingType The type of rendering required.
* @return A handle to the newly created renderer.
*/
* @param[in] renderingType The type of rendering required.
* @return A handle to the newly created renderer.
*/
- RendererPtr NewRenderer(
unsigned int renderingType
);
+ RendererPtr NewRenderer(
unsigned int renderingType
);
/**
* @brief Create an uninitialized TextAbstraction handle.
/**
* @brief Create an uninitialized TextAbstraction handle.
@@
-84,7
+73,7
@@
public:
*
* @param[in] handle A reference to the copied handle.
*/
*
* @param[in] handle A reference to the copied handle.
*/
- Backend(
const Backend& handle
);
+ Backend(
const Backend& handle
);
/**
* @brief This assignment operator is required for (smart) pointer semantics.
/**
* @brief This assignment operator is required for (smart) pointer semantics.
@@
-92,16
+81,15
@@
public:
* @param [in] handle A reference to the copied handle.
* @return A reference to this.
*/
* @param [in] handle A reference to the copied handle.
* @return A reference to this.
*/
- Backend& operator=(
const Backend& handle
);
+ Backend& operator=(
const Backend& handle
);
public: // Not intended for application developers
public: // Not intended for application developers
-
/**
* @brief This constructor is used by Backend::Get().
*
* @param[in] backend A pointer to the internal backend object.
*/
/**
* @brief This constructor is used by Backend::Get().
*
* @param[in] backend A pointer to the internal backend object.
*/
- explicit DALI_INTERNAL Backend(
Internal::Backend* backend
);
+ explicit DALI_INTERNAL Backend(
Internal::Backend* backend
);
};
} // namespace Text
};
} // namespace Text
@@
-110,4
+98,4
@@
public: // Not intended for application developers
} // namespace Dali
} // namespace Dali
-#endif //
__DALI_TOOLKIT_TEXT_BACKEND_H__
+#endif //
DALI_TOOLKIT_TEXT_BACKEND_H