Merge branch 'new_text' into tizen

Change-Id: I4084c10fec73a78eb03b2b1e25d8ca09479c1061

diff --git a/text/dali/internal/text-abstraction/font-client-plugin-impl.cpp b/text/dali/internal/text-abstraction/font-client-plugin-impl.cpp
index ba1dd01..1947c7f 100644 (file)
--- a/text/dali/internal/text-abstraction/font-client-plugin-impl.cpp
+++ b/text/dali/internal/text-abstraction/font-client-plugin-impl.cpp
@@ -489,6 +489,7 @@ bool FontClient::Plugin::GetGlyphMetrics( GlyphInfo* array,
     {
       FT_Face ftFace = mFontCache[fontId-1].mFreeTypeFace;
 
+#ifdef FREETYPE_BITMAP_SUPPORT
       // Check to see if we should be loading a Fixed Size bitmap?
       if ( mFontCache[fontId-1].mIsFixedSizeBitmap )
       {
@@ -508,6 +509,7 @@ bool FontClient::Plugin::GetGlyphMetrics( GlyphInfo* array,
         }
       }
       else
+#endif
       {
         int error = FT_Load_Glyph( ftFace, array[i].index, FT_LOAD_DEFAULT );
 
@@ -555,12 +557,14 @@ BufferImage FontClient::Plugin::CreateBitmap( FontId fontId,
 
     FT_Error error;
 
+#ifdef FREETYPE_BITMAP_SUPPORT
     // Check to see if this is fixed size bitmap
     if ( mFontCache[fontId-1].mIsFixedSizeBitmap )
     {
       error = FT_Load_Glyph( ftFace, glyphIndex, FT_LOAD_COLOR );
     }
     else
+#endif
     {
       error = FT_Load_Glyph( ftFace, glyphIndex, FT_LOAD_DEFAULT );
     }
@@ -848,6 +852,7 @@ void FontClient::Plugin::ConvertBitmap( BufferImage& destBitmap,
         break;
       }
 
+#ifdef FREETYPE_BITMAP_SUPPORT
       case FT_PIXEL_MODE_BGRA:
       {
         if ( srcBitmap.pitch == static_cast< int >( srcBitmap.width << 2 ) )
@@ -859,6 +864,7 @@ void FontClient::Plugin::ConvertBitmap( BufferImage& destBitmap,
         }
         break;
       }
+#endif
       default:
       {
         DALI_LOG_ERROR( "FontClient Unable to create Bitmap of this PixelType\n" );