Fix Textlabel bug if size height is bigger than 16384

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / visuals / text / text-visual.h

diff --git a/dali-toolkit/internal/visuals/text/text-visual.h b/dali-toolkit/internal/visuals/text/text-visual.h
index 8474441..c79c254 100644 (file)
--- a/dali-toolkit/internal/visuals/text/text-visual.h
+++ b/dali-toolkit/internal/visuals/text/text-visual.h
@@ -143,6 +143,11 @@ public: // from Visual::Base
    */
   void DoCreateInstancePropertyMap(Property::Map& map) const override;
 
    */
   void DoCreateInstancePropertyMap(Property::Map& map) const override;
 

+  /**
+   * @copydoc Visual::Base::EnablePreMultipliedAlpha
+   */
+  void EnablePreMultipliedAlpha(bool preMultiplied) override;
+

 protected:
   /**
    * @brief Constructor.
 protected:
   /**
    * @brief Constructor.


@@ -188,6 +193,7 @@ private:
   {
     unsigned char* textBuffer;
     unsigned char* styleBuffer;
   {
     unsigned char* textBuffer;
     unsigned char* styleBuffer;

+    unsigned char* overlayStyleBuffer;

     unsigned char* maskBuffer;
     int            width;
     int            height;
     unsigned char* maskBuffer;
     int            width;
     int            height;


@@ -198,6 +204,7 @@ private:
     TilingInfo(int width, int height, Pixel::Format textPixelFormat)
     : textBuffer(NULL),
       styleBuffer(NULL),
     TilingInfo(int width, int height, Pixel::Format textPixelFormat)
     : textBuffer(NULL),
       styleBuffer(NULL),

+      overlayStyleBuffer(NULL),

       maskBuffer(NULL),
       width(width),
       height(height),
       maskBuffer(NULL),
       width(width),
       height(height),


@@ -217,6 +224,10 @@ private:
       {
         free(styleBuffer);
       }
       {
         free(styleBuffer);
       }

+      if(overlayStyleBuffer)
+      {
+        free(overlayStyleBuffer);
+      }

       if(maskBuffer)
       {
         free(maskBuffer);
       if(maskBuffer)
       {
         free(maskBuffer);