From: Heeyong Song Date: Wed, 27 Jan 2021 09:34:22 +0000 (+0900) Subject: Show the broken image in case of invalid svg files X-Git-Tag: dali_2.0.12~3 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=f3e45e41c5f16ccc2538b283897ed6efb07e4ea9;hp=ab447436de92a2e8bc8cd1393f4807f19ef6b316 Show the broken image in case of invalid svg files Change-Id: I10d140336eb94f2a22db53e2a1f04b5dfe2a0a77 --- diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp index 2be7c5a..033340f 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp @@ -2627,11 +2627,6 @@ int UtcDaliImageViewSvgLoadingFailure(void) application.GetScene().Add( imageView ); application.SendNotification(); - - // loading started, this waits for the loader thread - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); - - application.SendNotification(); application.Render(16); DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION ); @@ -2652,11 +2647,6 @@ int UtcDaliImageViewSvgLoadingFailure(void) application.GetScene().Add( imageView ); application.SendNotification(); - - // loading started, this waits for the loader thread - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); - - application.SendNotification(); application.Render(16); DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION ); diff --git a/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.cpp b/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.cpp index 8bd9f0a..c5f0555 100644 --- a/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.cpp +++ b/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.cpp @@ -35,15 +35,14 @@ namespace Toolkit namespace Internal { - -RasterizingTask::RasterizingTask( SvgVisual* svgRenderer, VectorImageRenderer vectorRenderer, const VisualUrl& url, float dpi, unsigned int width, unsigned int height, bool loaded) -: mSvgVisual( svgRenderer ), - mVectorRenderer( vectorRenderer ), - mUrl( url ), - mDpi( dpi ), - mWidth( width ), - mHeight( height ), - mLoaded( loaded ) +RasterizingTask::RasterizingTask(SvgVisual* svgRenderer, VectorImageRenderer vectorRenderer, const VisualUrl& url, float dpi, unsigned int width, unsigned int height) +: mSvgVisual(svgRenderer), + mVectorRenderer(vectorRenderer), + mUrl(url), + mDpi(dpi), + mWidth(width), + mHeight(height), + mLoadSuccess(false) { } @@ -54,7 +53,7 @@ RasterizingTask::~RasterizingTask() void RasterizingTask::Load() { - if(!mLoaded && !mUrl.IsLocalResource()) + if(!mUrl.IsLocalResource()) { Dali::Vector remoteBuffer; if(!Dali::FileLoader::DownloadFileSynchronously(mUrl.GetUrl(), remoteBuffer)) @@ -71,7 +70,11 @@ void RasterizingTask::Load() return; } - mLoaded = true; + mLoadSuccess = true; + } + else + { + mLoadSuccess = true; } } @@ -108,7 +111,7 @@ VectorImageRenderer RasterizingTask::GetVectorRenderer() const bool RasterizingTask::IsLoaded() const { - return mLoaded; + return mLoadSuccess; } SvgVisual* RasterizingTask::GetSvgVisual() const diff --git a/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h b/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h index 705d411..86e233f 100644 --- a/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h +++ b/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h @@ -67,9 +67,8 @@ public: * @param[in] url The URL to svg resource to use. * @param[in] width The rasterization width. * @param[in] height The rasterization height. - * @param[in] loaded The svg resource is loaded or not. */ - RasterizingTask( SvgVisual* svgRenderer, VectorImageRenderer vectorRenderer, const VisualUrl& url, float dpi, unsigned int width, unsigned int height, bool loaded ); + RasterizingTask(SvgVisual* svgRenderer, VectorImageRenderer vectorRenderer, const VisualUrl& url, float dpi, unsigned int width, unsigned int height); /** * Destructor. @@ -123,7 +122,7 @@ private: float mDpi; unsigned int mWidth; unsigned int mHeight; - bool mLoaded; + bool mLoadSuccess; }; /** diff --git a/dali-toolkit/internal/visuals/svg/svg-visual.cpp b/dali-toolkit/internal/visuals/svg/svg-visual.cpp index 8ccb63b..ec19635 100644 --- a/dali-toolkit/internal/visuals/svg/svg-visual.cpp +++ b/dali-toolkit/internal/visuals/svg/svg-visual.cpp @@ -64,18 +64,18 @@ SvgVisualPtr SvgVisual::New( VisualFactoryCache& factoryCache, ImageVisualShader return svgVisual; } -SvgVisual::SvgVisual( VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl ) -: Visual::Base( factoryCache, Visual::FittingMode::FILL, Toolkit::Visual::SVG ), - mImageVisualShaderFactory( shaderFactory ), - mAtlasRect( FULL_TEXTURE_RECT ), - mImageUrl( imageUrl ), - mVectorRenderer( VectorImageRenderer::New() ), - mDefaultWidth( 0 ), - mDefaultHeight( 0 ), - mLoaded( false ), +SvgVisual::SvgVisual(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl) +: Visual::Base(factoryCache, Visual::FittingMode::FILL, Toolkit::Visual::SVG), + mImageVisualShaderFactory(shaderFactory), + mAtlasRect(FULL_TEXTURE_RECT), + mImageUrl(imageUrl), + mVectorRenderer(VectorImageRenderer::New()), + mDefaultWidth(0), + mDefaultHeight(0), mPlacementActor(), mVisualSize(Vector2::ZERO), - mAttemptAtlasing( false ) + mLoadFailed(false), + mAttemptAtlasing(false) { // the rasterized image is with pre-multiplied alpha format mImpl->mFlags |= Impl::IS_PREMULTIPLIED_ALPHA; @@ -171,8 +171,20 @@ void SvgVisual::DoSetOnScene( Actor& actor ) // Hold the weak handle of the placement actor and delay the adding of renderer until the svg rasterization is finished. mPlacementActor = actor; - // SVG visual needs it's size set before it can be rasterized hence set ResourceReady once on stage - ResourceReady( Toolkit::Visual::ResourceStatus::READY ); + if(mLoadFailed) + { + Texture brokenImage = mFactoryCache.GetBrokenVisualImage(); + textureSet.SetTexture(0u, brokenImage); + + actor.AddRenderer(mImpl->mRenderer); + + ResourceReady(Toolkit::Visual::ResourceStatus::FAILED); + } + else + { + // SVG visual needs it's size set before it can be rasterized hence set ResourceReady once on stage + ResourceReady(Toolkit::Visual::ResourceStatus::READY); + } } void SvgVisual::DoSetOffScene( Actor& actor ) @@ -188,15 +200,8 @@ void SvgVisual::DoSetOffScene( Actor& actor ) void SvgVisual::GetNaturalSize( Vector2& naturalSize ) { - if(mLoaded) - { - naturalSize.x = mDefaultWidth; - naturalSize.y = mDefaultHeight; - } - else - { - naturalSize = Vector2::ZERO; - } + naturalSize.x = mDefaultWidth; + naturalSize.y = mDefaultHeight; } void SvgVisual::DoCreatePropertyMap( Property::Map& map ) const @@ -219,7 +224,7 @@ void SvgVisual::DoCreateInstancePropertyMap( Property::Map& map ) const void SvgVisual::Load() { // load remote resource on svg rasterize thread. - if(!mLoaded && mImageUrl.IsLocalResource()) + if(mImageUrl.IsLocalResource()) { Dali::Vector buffer; if(Dali::FileLoader::ReadFile(mImageUrl.GetUrl(), buffer)) @@ -230,14 +235,15 @@ void SvgVisual::Load() float meanDpi = (dpi.height + dpi.width) * 0.5f; if(!mVectorRenderer.Load(buffer, meanDpi)) { + mLoadFailed = true; DALI_LOG_ERROR("SvgVisual::Load: Failed to load file! [%s]\n", mImageUrl.GetUrl().c_str()); return; } mVectorRenderer.GetDefaultSize(mDefaultWidth, mDefaultHeight); - mLoaded = true; } else { + mLoadFailed = true; DALI_LOG_ERROR("SvgVisual::Load: Failed to read file! [%s]\n", mImageUrl.GetUrl().c_str()); } } @@ -253,8 +259,8 @@ void SvgVisual::AddRasterizationTask( const Vector2& size ) Vector2 dpi = Stage::GetCurrent().GetDpi(); float meanDpi = ( dpi.height + dpi.width ) * 0.5f; - RasterizingTaskPtr newTask = new RasterizingTask(this, mVectorRenderer, mImageUrl, meanDpi, width, height, mLoaded); - if(IsSynchronousLoadingRequired()) + RasterizingTaskPtr newTask = new RasterizingTask(this, mVectorRenderer, mImageUrl, meanDpi, width, height); + if(IsSynchronousLoadingRequired() && mImageUrl.IsLocalResource()) { newTask->Load(); newTask->Rasterize(); @@ -269,8 +275,6 @@ void SvgVisual::AddRasterizationTask( const Vector2& size ) void SvgVisual::ApplyRasterizedImage( VectorImageRenderer vectorRenderer, PixelData rasterizedPixelData, bool isLoaded ) { - mLoaded = isLoaded; - if(isLoaded && rasterizedPixelData && IsOnScene()) { TextureSet currentTextureSet = mImpl->mRenderer.GetTextures(); @@ -337,6 +341,17 @@ void SvgVisual::ApplyRasterizedImage( VectorImageRenderer vectorRenderer, PixelD } else if(!isLoaded || !rasterizedPixelData) { + Actor actor = mPlacementActor.GetHandle(); + if(actor) + { + TextureSet textureSet = mImpl->mRenderer.GetTextures(); + + Texture brokenImage = mFactoryCache.GetBrokenVisualImage(); + textureSet.SetTexture(0u, brokenImage); + + actor.AddRenderer(mImpl->mRenderer); + } + ResourceReady( Toolkit::Visual::ResourceStatus::FAILED ); } } @@ -345,7 +360,7 @@ void SvgVisual::OnSetTransform() { Vector2 visualSize = mImpl->mTransform.GetVisualSize( mImpl->mControlSize ); - if( IsOnScene() ) + if(IsOnScene() && !mLoadFailed) { if( visualSize != mVisualSize ) { diff --git a/dali-toolkit/internal/visuals/svg/svg-visual.h b/dali-toolkit/internal/visuals/svg/svg-visual.h index b7582b9..5910ff2 100644 --- a/dali-toolkit/internal/visuals/svg/svg-visual.h +++ b/dali-toolkit/internal/visuals/svg/svg-visual.h @@ -187,9 +187,9 @@ private: VectorImageRenderer mVectorRenderer; uint32_t mDefaultWidth; uint32_t mDefaultHeight; - bool mLoaded; WeakHandle mPlacementActor; Vector2 mVisualSize; + bool mLoadFailed; bool mAttemptAtlasing; ///< If true will attempt atlasing, otherwise create unique texture };