From: Adeel Kazmi Date: Fri, 14 Feb 2020 07:31:21 +0000 (+0000) Subject: [dali_1.5.0] Merge branch 'devel/master' X-Git-Tag: dali_1.9.8~5^2~8 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=0abfa31ac884bfc7b0005ab30da415a24878d642;hp=c02f801e5fd89a14e2f49f36ff1513248eead35d [dali_1.5.0] Merge branch 'devel/master' Change-Id: I3852d3fcc049175b09b70c5b332558c494ad3a16 --- diff --git a/automated-tests/patch-coverage.pl b/automated-tests/patch-coverage.pl index 5e5e164..c5d9083 100755 --- a/automated-tests/patch-coverage.pl +++ b/automated-tests/patch-coverage.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl # -# Copyright (c) 2016 Samsung Electronics Co., Ltd. +# Copyright (c) 2020 Samsung Electronics Co., Ltd. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -266,6 +266,12 @@ sub get_coverage if(index( $source_file, $file ) > 0 ) { $gcovfile = $coverage_file; + # Some header files do not produce an equivalent gcov file so we shouldn't parse them + if(($source_file =~ /\.h$/) && (! -e $gcovfile)) + { + print "Omitting Header: $source_file\n" if $debug; + $gcovfile = "" + } last; } } diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.cpp index 44b4964..f5d670d 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,7 +26,6 @@ TestApplication::TestApplication( uint32_t surfaceWidth, uint32_t surfaceHeight, uint32_t horizontalDpi, uint32_t verticalDpi, - ResourcePolicy::DataRetention policy, bool initialize ) : mRenderSurface( NULL ), mCore( NULL ), @@ -34,8 +33,7 @@ TestApplication::TestApplication( uint32_t surfaceWidth, mSurfaceHeight( surfaceHeight ), mFrame( 0u ), mDpi{ horizontalDpi, verticalDpi }, - mLastVSyncTime(0u), - mDataRetentionPolicy( policy ) + mLastVSyncTime(0u) { if( initialize ) { @@ -60,7 +58,6 @@ void TestApplication::CreateCore() mGlAbstraction, mGlSyncAbstraction, mGlContextHelperAbstraction, - mDataRetentionPolicy, Integration::RenderToFrameBuffer::FALSE, Integration::DepthBufferAvailable::TRUE, Integration::StencilBufferAvailable::TRUE ); diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.h index cc694df..2606a56 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.h @@ -2,7 +2,7 @@ #define DALI_TEST_APPLICATION_H /* - * Copyright (c) 2019 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -52,7 +52,6 @@ public: uint32_t surfaceHeight = DEFAULT_SURFACE_HEIGHT, uint32_t horizontalDpi = DEFAULT_HORIZONTAL_DPI, uint32_t verticalDpi = DEFAULT_VERTICAL_DPI, - ResourcePolicy::DataRetention policy = ResourcePolicy::DALI_DISCARDS_ALL_DATA, bool initialize = true ); void Initialize(); @@ -110,7 +109,6 @@ protected: struct { uint32_t x; uint32_t y; } mDpi; uint32_t mLastVSyncTime; - ResourcePolicy::DataRetention mDataRetentionPolicy; static bool mLoggingEnabled; }; diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-test-application.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-test-application.cpp index f75123d..fdcd24d 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-test-application.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-test-application.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,7 +32,7 @@ namespace Dali using AdaptorImpl = Dali::Internal::Adaptor::Adaptor; ToolkitTestApplication::ToolkitTestApplication( size_t surfaceWidth, size_t surfaceHeight, float horizontalDpi, float verticalDpi ) -: TestApplication( surfaceWidth, surfaceHeight, horizontalDpi, verticalDpi, ResourcePolicy::DALI_DISCARDS_ALL_DATA, false /* Do not Initialize Core */ ), +: TestApplication( surfaceWidth, surfaceHeight, horizontalDpi, verticalDpi, false /* Do not Initialize Core */ ), mMainWindow( new Dali::Window ), mAdaptor( &AdaptorImpl::New() ) // Need to create Adaptor first as many singletons in dali-adaptor need it { diff --git a/dali-toolkit/internal/image-loader/image-load-thread.cpp b/dali-toolkit/internal/image-loader/image-load-thread.cpp index 213173a..179734a 100644 --- a/dali-toolkit/internal/image-loader/image-load-thread.cpp +++ b/dali-toolkit/internal/image-loader/image-load-thread.cpp @@ -22,6 +22,7 @@ #include #include #include +#include namespace Dali { @@ -76,6 +77,11 @@ void LoadingTask::Load() { pixelBuffer = Dali::DownloadImageSynchronously ( url.GetUrl(), dimensions, fittingMode, samplingMode, orientationCorrection ); } + + if( !pixelBuffer ) + { + DALI_LOG_ERROR( "LoadingTask::Load: Loading is failed: %s\n", url.GetUrl().c_str() ); + } } void LoadingTask::ApplyMask() diff --git a/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp index 5c3415d..7309a54 100644 --- a/dali-toolkit/public-api/dali-toolkit-version.cpp +++ b/dali-toolkit/public-api/dali-toolkit-version.cpp @@ -30,8 +30,8 @@ namespace Toolkit { const unsigned int TOOLKIT_MAJOR_VERSION = 1; -const unsigned int TOOLKIT_MINOR_VERSION = 4; -const unsigned int TOOLKIT_MICRO_VERSION = 57; +const unsigned int TOOLKIT_MINOR_VERSION = 5; +const unsigned int TOOLKIT_MICRO_VERSION = 0; const char * const TOOLKIT_BUILD_DATE = __DATE__ " " __TIME__; #ifdef DEBUG_ENABLED diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec index cd5e054..bac38ef 100644 --- a/packaging/dali-toolkit.spec +++ b/packaging/dali-toolkit.spec @@ -1,6 +1,6 @@ Name: dali-toolkit Summary: Dali 3D engine Toolkit -Version: 1.4.57 +Version: 1.5.0 Release: 1 Group: System/Libraries License: Apache-2.0 and BSD-3-Clause and MIT