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 "Fix SVACE issue" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
visual-factory-impl.h
diff --git
a/dali-toolkit/internal/visuals/visual-factory-impl.h
b/dali-toolkit/internal/visuals/visual-factory-impl.h
index
257b03c
..
999a0c4
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-factory-impl.h
+++ b/
dali-toolkit/internal/visuals/visual-factory-impl.h
@@
-35,7
+35,6
@@
namespace Internal
{
class VisualFactoryCache;
{
class VisualFactoryCache;
-typedef IntrusivePtr<VisualFactoryCache> VisualFactoryCachePtr;
/**
* @copydoc Toolkit::VisualFactory
/**
* @copydoc Toolkit::VisualFactory
@@
-52,21
+51,31
@@
public:
VisualFactory( bool debugEnabled );
/**
VisualFactory( bool debugEnabled );
/**
- * @copydoc Toolkit::
Render
Factory::CreateVisual( const Property::Map& )
+ * @copydoc Toolkit::
Visual
Factory::CreateVisual( const Property::Map& )
*/
Toolkit::Visual::Base CreateVisual( const Property::Map& propertyMap );
/**
*/
Toolkit::Visual::Base CreateVisual( const Property::Map& propertyMap );
/**
- * @copydoc Toolkit::
Render
Factory::CreateVisual( const Image& )
+ * @copydoc Toolkit::
Visual
Factory::CreateVisual( const Image& )
*/
Toolkit::Visual::Base CreateVisual( const Image& image );
/**
*/
Toolkit::Visual::Base CreateVisual( const Image& image );
/**
- * @copydoc Toolkit::
Render
Factory::CreateVisual( const std::string&, ImageDimensions )
+ * @copydoc Toolkit::
Visual
Factory::CreateVisual( const std::string&, ImageDimensions )
*/
Toolkit::Visual::Base CreateVisual( const std::string& image, ImageDimensions size );
/**
*/
Toolkit::Visual::Base CreateVisual( const std::string& image, ImageDimensions size );
/**
+ * @copydoc Toolkit::VisualFactory::SetPreMultiplyOnLoad()
+ */
+ void SetPreMultiplyOnLoad( bool preMultiply );
+
+ /**
+ * @copydoc Toolkit::VisualFactory::GetPreMultiplyOnLoad()
+ */
+ bool GetPreMultiplyOnLoad() const;
+
+ /**
* @return the reference to texture manager
*/
Internal::TextureManager& GetTextureManager();
* @return the reference to texture manager
*/
Internal::TextureManager& GetTextureManager();
@@
-79,21
+88,19
@@
protected:
virtual ~VisualFactory();
private:
virtual ~VisualFactory();
private:
-
/**
/**
- *
Undefined copy constructor
.
+ *
Get the factory cache, creating it if necessary
.
*/
*/
-
VisualFactory(const VisualFactory&
);
+
Internal::VisualFactoryCache& GetFactoryCache(
);
- /**
- * Undefined assignment operator.
- */
- VisualFactory& operator=(const VisualFactory& rhs);
+ VisualFactory(const VisualFactory&) = delete;
-private:
+ VisualFactory& operator=(const VisualFactory& rhs) = delete;
- VisualFactoryCachePtr mFactoryCache;
- bool mDebugEnabled;
+private:
+ std::unique_ptr<VisualFactoryCache> mFactoryCache;
+ bool mDebugEnabled:1;
+ bool mPreMultiplyOnLoad:1; ///< Local store for this flag
};
/**
};
/**