X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Frendering%2Ftext-backend-impl.cpp;h=5ae10c828cc6777ba4df16fe39ea6793ccee0759;hp=5653ebfdc238bc0bfcff7b8879feb91c6a79fd3b;hb=6e1032b5996011523338aa4bc5cdbeffcfc71ad5;hpb=3e17d9f63dedb5d669409301f8d9a3d8c393f979

diff --git a/dali-toolkit/internal/text/rendering/text-backend-impl.cpp b/dali-toolkit/internal/text/rendering/text-backend-impl.cpp
index 5653ebf..5ae10c8 100644
--- a/dali-toolkit/internal/text/rendering/text-backend-impl.cpp
+++ b/dali-toolkit/internal/text/rendering/text-backend-impl.cpp
@@ -19,13 +19,15 @@
 #include <dali-toolkit/internal/text/rendering/text-backend-impl.h>
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/adaptor-framework/singleton-service.h>
 #include <dali/integration-api/debug.h>
+#include <dali/devel-api/adaptor-framework/singleton-service.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/text/rendering-backend.h>
 #include <dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.h>
-#include <dali-toolkit/internal/text/rendering/basic/text-basic-renderer.h>
+#ifdef ENABLE_VECTOR_BASED_TEXT_RENDERING
+#include <dali-toolkit/internal/text/rendering/vector-based/vector-based-renderer.h>
+#endif
 
 namespace Dali
 {
@@ -86,21 +88,25 @@ RendererPtr Backend::NewRenderer( unsigned int renderingType )
 
   switch( renderingType )
   {
-    case Dali::Toolkit::Text::RENDERING_BASIC:
+    case Dali::Toolkit::Text::RENDERING_SHARED_ATLAS:
     {
-      renderer = Dali::Toolkit::Text::BasicRenderer::New();
+      renderer = Dali::Toolkit::Text::AtlasRenderer::New();
     }
     break;
 
-    case Dali::Toolkit::Text::RENDERING_SHARED_ATLAS:
+    case Dali::Toolkit::Text::RENDERING_VECTOR_BASED:
     {
-      renderer = Dali::Toolkit::Text::AtlasRenderer::New();
+#ifdef ENABLE_VECTOR_BASED_TEXT_RENDERING
+      renderer = Dali::Toolkit::Text::VectorBasedRenderer::New();
+#else
+      renderer = Dali::Toolkit::Text::AtlasRenderer::New(); // Fallback to bitmap-based rendering
+#endif
     }
     break;
 
     default:
     {
-      DALI_LOG_WARNING( "Unknown renderer type: %d", renderingType );
+      DALI_LOG_WARNING( "Unknown renderer type: %d\n", renderingType );
       break;
     }
   }