From 1d2125571bf6362879c337420019fc07b2dae0cb Mon Sep 17 00:00:00 2001 From: "huiyu.eun" Date: Fri, 10 Jan 2020 18:04:14 +0900 Subject: [PATCH] [Tize] Change svg visual to load file using nanosvg Change-Id: I90d469dade4237f55759f9cd8073bd9878fc805a Signed-off-by: huiyu.eun --- dali-toolkit/internal/visuals/svg/svg-rasterize-thread.cpp | 9 +-------- dali-toolkit/internal/visuals/svg/svg-visual.cpp | 7 ++----- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.cpp b/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.cpp index 174183e..c2c907f 100644 --- a/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.cpp +++ b/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.cpp @@ -62,14 +62,7 @@ void RasterizingTask::Load() { Dali::Vector remoteBuffer; - if( !Dali::FileLoader::DownloadFileSynchronously( mUrl.GetUrl(), remoteBuffer )) - { - DALI_LOG_ERROR("Failed to download file!\n"); - return; - } - - remoteBuffer.PushBack( '\0' ); - mParsedSvg = nsvgParse( reinterpret_cast(remoteBuffer.begin()), UNITS, mDpi ); + mParsedSvg = nsvgParseFromFile( mUrl.GetUrl().c_str(), UNITS, mDpi ); } } diff --git a/dali-toolkit/internal/visuals/svg/svg-visual.cpp b/dali-toolkit/internal/visuals/svg/svg-visual.cpp index 6c32e9d..e5fbcac 100644 --- a/dali-toolkit/internal/visuals/svg/svg-visual.cpp +++ b/dali-toolkit/internal/visuals/svg/svg-visual.cpp @@ -194,11 +194,8 @@ void SvgVisual::ParseFromUrl( const VisualUrl& imageUrl ) Vector2 dpi = Stage::GetCurrent().GetDpi(); float meanDpi = ( dpi.height + dpi.width ) * 0.5f; Dali::Vector buffer; - if ( Dali::FileLoader::ReadFile( mImageUrl.GetUrl(), buffer ) ) - { - buffer.PushBack( '\0' ); - mParsedImage = nsvgParse( buffer.Begin(), UNITS, meanDpi ); - } + + mParsedImage = nsvgParseFromFile( mImageUrl.GetUrl().c_str(), UNITS, meanDpi ); } } -- 2.7.4