From 3d5e4b0be899a9ca1d82209e140f8f097c334622 Mon Sep 17 00:00:00 2001
From: Richard Huang <r.huang@samsung.com>
Date: Fri, 25 Aug 2017 11:35:26 +0100
Subject: [PATCH] Fix issues while rendering RTL text in Text Visual

This patch fixes two issue:

1. Overlapped glyph is cut.
2. Small gap between joint glyphs.

The solution is:

1. When we copy glyphs to the big image buffer, we should only copy
   non-transparent pixels, and this will prevent overlapped glyphs
   from being cut.

2. For any pixel overlapped with the pixel in previous glyphs,
   make sure we don't overwrite a previous bigger alpha with a smaller
   alpha, so that we can avoid semi-transparent gaps between joint
   glyphs with overlapped pixels, which could happen e.g. in the RTL
   text when we copy glyphs from right to left.

Change-Id: Id4d9d028999612e0545aa47b5bf66e410fc7ee91
---
 .../internal/text/rendering/text-typesetter.cpp    | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/dali-toolkit/internal/text/rendering/text-typesetter.cpp b/dali-toolkit/internal/text/rendering/text-typesetter.cpp
index 11cde00..1821db4 100644
--- a/dali-toolkit/internal/text/rendering/text-typesetter.cpp
+++ b/dali-toolkit/internal/text/rendering/text-typesetter.cpp
@@ -151,10 +151,26 @@ void TypesetGlyph( GlyphData& data,
       {
         // Update the alpha channel.
         const uint8_t alpha = *( data.glyphBitmap.buffer + glyphBufferOffset + index );
-        *( packedColorBuffer + 3u ) = static_cast<uint8_t>( color->a * static_cast<float>( alpha ) );
 
-        // Set the color into the final pixel buffer.
-        *( bitmapBuffer + verticalOffset + xOffsetIndex ) = packedColor;
+        // Copy non-transparent pixels only
+        if ( alpha > 0u )
+        {
+          // Check alpha of overlapped pixels
+          uint32_t& currentColor = *( bitmapBuffer + verticalOffset + xOffsetIndex );
+          uint8_t* packedCurrentColorBuffer = reinterpret_cast<uint8_t*>( &currentColor );
+
+          uint8_t currentAlpha = *( packedCurrentColorBuffer + 3u );
+          uint8_t newAlpha = static_cast<uint8_t>( color->a * static_cast<float>( alpha ) );
+
+          // For any pixel overlapped with the pixel in previous glyphs, make sure we don't
+          // overwrite a previous bigger alpha with a smaller alpha (in order to avoid
+          // semi-transparent gaps between joint glyphs with overlapped pixels, which could
+          // happen, for example, in the RTL text when we copy glyphs from right to left).
+          *( packedColorBuffer + 3u ) = std::max( currentAlpha, newAlpha );
+
+          // Set the color into the final pixel buffer.
+          currentColor = packedColor;
+        }
       }
     }
   }
-- 
2.7.4