X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Frendering%2Fatlas%2Ftext-atlas-renderer.cpp;h=e06b958344d3065ff9421e66b0deb2abd582cdc4;hp=3ef196500f6931e02e0ec2fcb29b0d93267b350b;hb=ff0db3ef923086d96dc8c2eb8501607da9c3c21e;hpb=bef7b82cd945f4d2fd3b4d776184c1fc0851c8c6

diff --git a/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp b/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp
old mode 100644
new mode 100755
index 3ef1965..e06b958
--- a/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp
+++ b/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp
@@ -21,7 +21,6 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/rendering/geometry.h>
 #include <dali/public-api/rendering/renderer.h>
-#include <dali/public-api/images/frame-buffer-image.h>
 #include <dali/devel-api/text-abstraction/font-client.h>
 #include <dali/integration-api/debug.h>
 #include <dali/public-api/animation/constraints.h>
@@ -50,7 +49,7 @@ attribute mediump vec2    aPosition;
 attribute mediump vec2    aTexCoord;
 attribute mediump vec4    aColor;
 uniform   mediump vec2    uOffset;
-uniform   mediump mat4    uMvpMatrix;
+uniform     highp mat4    uMvpMatrix;
 varying   mediump vec2    vTexCoord;
 varying   mediump vec4    vColor;
 
@@ -114,7 +113,6 @@ struct AtlasRenderer::Impl
 
     uint32_t mAtlasId;
     AtlasManager::Mesh2D mMesh;
-    FrameBufferImage mBuffer;
   };
 
   /**
@@ -259,6 +257,8 @@ struct AtlasRenderer::Impl
 
         mFontClient.CreateBitmap( glyph.fontId,
                                   glyph.index,
+                                  glyph.softwareItalic,
+                                  glyph.softwareBold,
                                   glyphBufferData,
                                   outline );
 
@@ -569,7 +569,7 @@ struct AtlasRenderer::Impl
           lastFontId = glyph.fontId; // Prevents searching for existing blocksizes when string of the same fontId.
         }
 
-        if( isOutline&& ( 0u != slotOutline.mImageId ) ) // invalid slot id, glyph has failed to be added to atlas
+        if( isOutline && ( 0u != slotOutline.mImageId ) ) // invalid slot id, glyph has failed to be added to atlas
         {
           GenerateMesh( glyph,
                         position,