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
Fixed issues with resolving URL type
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
svg
/
svg-visual.h
diff --git
a/dali-toolkit/internal/visuals/svg/svg-visual.h
b/dali-toolkit/internal/visuals/svg/svg-visual.h
index
d6dfef5
..
c583035
100644
(file)
--- a/
dali-toolkit/internal/visuals/svg/svg-visual.h
+++ b/
dali-toolkit/internal/visuals/svg/svg-visual.h
@@
-19,8
+19,7
@@
*/
// INTERNAL INCLUDES
*/
// INTERNAL INCLUDES
-#include <dali-toolkit/internal/visuals/visual-impl.h>
-#include <dali-toolkit/internal/visuals/image-atlas-manager.h>
+#include <dali-toolkit/internal/visuals/visual-base-impl.h>
struct NSVGimage;
struct NSVGimage;
@@
-43,7
+42,7
@@
namespace Internal
* | url | STRING |
*
*/
* | url | STRING |
*
*/
-class SvgVisual: public Visual
+class SvgVisual: public Visual
::Base
{
public:
{
public:
@@
-52,7
+51,7
@@
public:
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
*/
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
*/
- SvgVisual( VisualFactoryCache& factoryCache
, ImageAtlasManager& atlasManager
);
+ SvgVisual( VisualFactoryCache& factoryCache );
/**
* @brief A reference counted object may only be deleted by calling Unreference().
/**
* @brief A reference counted object may only be deleted by calling Unreference().
@@
-96,14
+95,6
@@
protected:
public:
/**
public:
/**
- * @brief Helper method to determine whether the url indicate that it is a svg image.
- *
- * @param [in] url The URL of the image file.
- * @return true if it is a svg image
- */
- static bool IsSvgUrl( const std::string& url );
-
- /**
* @brief Sets the svg image of this visual to the resource at imageUrl
* The visual will parse the svg image once it is set.
* And rasterize it into BufferImage synchronously when the associated actor is put on stage, and destroy the BufferImage when it is off stage
* @brief Sets the svg image of this visual to the resource at imageUrl
* The visual will parse the svg image once it is set.
* And rasterize it into BufferImage synchronously when the associated actor is put on stage, and destroy the BufferImage when it is off stage
@@
-136,7
+127,6
@@
private:
private:
Vector4 mAtlasRect;
private:
Vector4 mAtlasRect;
- ImageAtlasManager& mAtlasManager;
std::string mImageUrl;
NSVGimage* mParsedImage;
std::string mImageUrl;
NSVGimage* mParsedImage;