Delete Cairo library dependency

Change-Id: I5ad86c5aa398634aa812e7e1ca4368ba1d333479
Signed-off-by: huiyu.eun <huiyu.eun@samsung.com>

diff --git a/dali/internal/text/file.list b/dali/internal/text/file.list
index 4d04419..b734d8e 100644 (file)
--- a/dali/internal/text/file.list
+++ b/dali/internal/text/file.list
@@ -2,7 +2,6 @@
 # module: text, backend: common
 SET( adaptor_text_common_src_files
     ${adaptor_text_dir}/text-abstraction/bidirectional-support-impl.cpp
-    ${adaptor_text_dir}/text-abstraction/cairo-renderer.cpp
     ${adaptor_text_dir}/text-abstraction/font-client-impl.cpp
     ${adaptor_text_dir}/text-abstraction/segmentation-impl.cpp
     ${adaptor_text_dir}/text-abstraction/shaping-impl.cpp

diff --git a/dali/internal/text/text-abstraction/text-renderer-impl.cpp b/dali/internal/text/text-abstraction/text-renderer-impl.cpp
index 1b29267..34ac1ff 100644 (file)
--- a/dali/internal/text/text-abstraction/text-renderer-impl.cpp
+++ b/dali/internal/text/text-abstraction/text-renderer-impl.cpp
@@ -65,7 +65,15 @@ TextAbstraction::TextRenderer TextRenderer::Get()
 
 Devel::PixelBuffer TextRenderer::Render(const TextAbstraction::TextRenderer::Parameters& parameters)
 {
-  return RenderTextCairo(parameters);
+  Dali::Pixel::Format      pixelFormat = parameters.pixelFormat == Dali::TextAbstraction::TextRenderer::Parameters::A8 ? Dali::Pixel::A8 : Dali::Pixel::RGBA8888;
+  Dali::Devel::PixelBuffer pixelBuffer = Dali::Devel::PixelBuffer::New(parameters.width,
+                                                                       parameters.height,
+                                                                       pixelFormat);
+  return pixelBuffer;
+
+  // This function allows you to render text using Cairo
+  // NOTE : Due to cairo being deprecated, this section is currently inactive.
+  // return RenderTextCairo(parameters);
 }
 
 } // namespace Internal

diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec
index 9e20008..d2633c5 100644 (file)
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@ -67,8 +67,6 @@ BuildRequires:  fribidi-devel
 BuildRequires:  pkgconfig(capi-system-info)
 BuildRequires:  pkgconfig(capi-system-sensor)
 
-BuildRequires:  pkgconfig(cairo)
-
 BuildRequires:  pkgconfig(wayland-egl)
 BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(input-method-client)