From 464dbd82973832c7a6880ff7dd846ce6295e1909 Mon Sep 17 00:00:00 2001 From: "huiyu.eun" Date: Wed, 24 Apr 2024 12:14:32 +0900 Subject: [PATCH] Delete Cairo library dependency Change-Id: I5ad86c5aa398634aa812e7e1ca4368ba1d333479 Signed-off-by: huiyu.eun --- dali/internal/text/file.list | 1 - dali/internal/text/text-abstraction/text-renderer-impl.cpp | 10 +++++++++- packaging/dali-adaptor.spec | 2 -- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dali/internal/text/file.list b/dali/internal/text/file.list index 4d04419..b734d8ef 100644 --- 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 --- 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 --- 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) -- 2.7.4