[windows] Use unsigned for enums used as bitfields

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / visuals / texture-manager-impl.h

diff --git a/dali-toolkit/internal/visuals/texture-manager-impl.h b/dali-toolkit/internal/visuals/texture-manager-impl.h
index f8500c7..89afd47 100644 (file)
--- a/dali-toolkit/internal/visuals/texture-manager-impl.h
+++ b/dali-toolkit/internal/visuals/texture-manager-impl.h
@@ -76,7 +76,7 @@ public:
   /**
    * Whether the pixel data should be kept in TextureManager, returned with pixelBuffer or uploaded for rendering
    */
   /**
    * Whether the pixel data should be kept in TextureManager, returned with pixelBuffer or uploaded for rendering
    */

-  enum StorageType
+  enum class StorageType: uint8_t

   {
     KEEP_PIXEL_BUFFER,
     RETURN_PIXEL_BUFFER,
   {
     KEEP_PIXEL_BUFFER,
     RETURN_PIXEL_BUFFER,


@@ -86,7 +86,7 @@ public:
   /**
    * Whether the texture should be loaded synchronously or asynchronously.
    */
   /**
    * Whether the texture should be loaded synchronously or asynchronously.
    */

-  enum LoadType
+  enum class LoadType: uint8_t

   {
     LOAD_ASYNCHRONOUSLY,
     LOAD_SYNCHRONOUSLY
   {
     LOAD_ASYNCHRONOUSLY,
     LOAD_SYNCHRONOUSLY


@@ -95,7 +95,7 @@ public:
   /**
    * @brief The LoadState Enumeration represents the current state of a particular Texture's life-cycle.
    */
   /**
    * @brief The LoadState Enumeration represents the current state of a particular Texture's life-cycle.
    */

-  enum LoadState
+  enum class LoadState: uint8_t

   {
     NOT_STARTED,     ///< Default
     LOADING,         ///< Loading has been started, but not finished.
   {
     NOT_STARTED,     ///< Default
     LOADING,         ///< Loading has been started, but not finished.


@@ -530,10 +530,10 @@ private:
       hash( hash ),
       scaleFactor( scaleFactor ),
       referenceCount( 1u ),
       hash( hash ),
       scaleFactor( scaleFactor ),
       referenceCount( 1u ),

-      loadState( NOT_STARTED ),
+      loadState( LoadState::NOT_STARTED ),

       fittingMode( fittingMode ),
       samplingMode( samplingMode ),
       fittingMode( fittingMode ),
       samplingMode( samplingMode ),

-      storageType( UPLOAD_TO_TEXTURE ),
+      storageType( StorageType::UPLOAD_TO_TEXTURE ),

       animatedImageLoading( animatedImageLoading ),
       frameIndex( frameIndex ),
       loadSynchronously( loadSynchronously ),
       animatedImageLoading( animatedImageLoading ),
       frameIndex( frameIndex ),
       loadSynchronously( loadSynchronously ),


@@ -563,10 +563,10 @@ private:
     TextureManager::TextureHash hash; ///< The hash used to cache this Texture
     float scaleFactor;             ///< The scale factor to apply to the Texture when masking
     int16_t referenceCount;        ///< The reference count of clients using this Texture
     TextureManager::TextureHash hash; ///< The hash used to cache this Texture
     float scaleFactor;             ///< The scale factor to apply to the Texture when masking
     int16_t referenceCount;        ///< The reference count of clients using this Texture

-    LoadState loadState:4;         ///< The load state showing the load progress of the Texture
+    LoadState loadState;           ///< The load state showing the load progress of the Texture

     FittingMode::Type fittingMode:3; ///< The requested FittingMode
     Dali::SamplingMode::Type samplingMode:3; ///< The requested SamplingMode
     FittingMode::Type fittingMode:3; ///< The requested FittingMode
     Dali::SamplingMode::Type samplingMode:3; ///< The requested SamplingMode

-    StorageType storageType:2;     ///< CPU storage / GPU upload;
+    StorageType storageType;       ///< CPU storage / GPU upload;

     Dali::AnimatedImageLoading animatedImageLoading; ///< AnimatedImageLoading that contains animated image information.
     uint32_t frameIndex;           ///< frame index that be loaded, in case of animated image
     bool loadSynchronously:1;      ///< True if synchronous loading was requested
     Dali::AnimatedImageLoading animatedImageLoading; ///< AnimatedImageLoading that contains animated image information.
     uint32_t frameIndex;           ///< frame index that be loaded, in case of animated image
     bool loadSynchronously:1;      ///< True if synchronous loading was requested