From: greynaga Date: Fri, 1 Nov 2019 11:25:38 +0000 (+0000) Subject: [dali_1.4.44] Merge branch 'devel/master' X-Git-Tag: dali_1.9.8~5^2~22 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=8db599ebe35a704d4adfd70040c33ce8e31e8d64;hp=10caf1dca0d3b222b74ba3916a84474fbcf8834e [dali_1.4.44] Merge branch 'devel/master' Change-Id: Ia3d52cdf699f5381f03a0b4899561ec475d84b03 --- diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-LogicalModel.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-LogicalModel.cpp index 4fe4876..67c7e24 100755 --- a/automated-tests/src/dali-toolkit-internal/utc-Dali-LogicalModel.cpp +++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-LogicalModel.cpp @@ -343,6 +343,7 @@ bool GetLogicalCursorIndexTest( const GetLogicalCursorIndexData& data ) for( unsigned int index = 0u; index < data.numberOfIndices; ++index ) { const bool fetched = logicalModel->FetchBidirectionalLineInfo( data.characterIndex[index] ); + tet_printf(" fetched %d, line index %d, expected line index %d\n", fetched, logicalModel->mBidirectionalLineIndex, data.cachedBidiLine[index] ); if( logicalModel->mBidirectionalLineIndex != data.cachedBidiLine[index] ) { @@ -352,10 +353,11 @@ bool GetLogicalCursorIndexTest( const GetLogicalCursorIndexData& data ) const CharacterIndex visualCharacterIndex = data.visualCursorIndex[index]; const CharacterIndex logicalCursorIndex = fetched ? logicalModel->GetLogicalCursorIndex( visualCharacterIndex ) : visualCharacterIndex; + tet_printf(" visual index %d, logical index %d\n", visualCharacterIndex, logicalCursorIndex); if( logicalCursorIndex != data.logicalCursorIndex[index] ) { - tet_printf( " test : %d, visual index : %d, different logical cursor index :%d, expected : %d", index, visualCharacterIndex, logicalCursorIndex, data.logicalCursorIndex[index] ); + tet_printf( " test : %d, visual index : %d, different logical cursor index :%d, expected : %d\n", index, visualCharacterIndex, logicalCursorIndex, data.logicalCursorIndex[index] ); return false; } } @@ -1053,18 +1055,19 @@ int UtcDaliGetLogicalCursorIndex(void) unsigned int bidirectionalLineIndex05[] = { 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u }; -// LO ק ר א ט ו ן ם פ ש ד ג -// 0 1 2 3 4 5 6 7 8 9 10 11 -// VO ג ד ש פ ם ן ו ט א ר ק +// LO ק ר א ט ו ן ם פ ש ד ג כ +// 0 1 2 3 4 5 6 7 8 9 10 11 12 +// VO כ ג ד ש פ ם ן ו ט א ר ק + +// LO ע י ח ל +// 12 13 14 15 16 +// VO ל ח י ע -// LO כ ע י ח ל -// 11 12 13 14 15 16 -// VO ל ח י ע כ // Set a known font description FontDescriptionRun fontDescriptionRun0601; fontDescriptionRun0601.characterRun.characterIndex = 0u; - fontDescriptionRun0601.characterRun.numberOfCharacters = 14u; + fontDescriptionRun0601.characterRun.numberOfCharacters = 16u; fontDescriptionRun0601.familyLength = fontFamilyHebrew.size(); fontDescriptionRun0601.familyName = new char[fontDescriptionRun0601.familyLength]; memcpy( fontDescriptionRun0601.familyName, fontFamilyHebrew.c_str(), fontDescriptionRun0601.familyLength ); @@ -1077,17 +1080,17 @@ int UtcDaliGetLogicalCursorIndex(void) Vector fontDescriptionRuns06; fontDescriptionRuns06.PushBack( fontDescriptionRun0601 ); - unsigned int visualIndex06[] = { 1u, 2u, 3u, 4u, 5u, 6u, 7u, 8u, 9u, 10u, 11u, - 11u, 12u, 13u, 14u, 15u, 16u }; + unsigned int visualIndex06[] = { 0u, 1u, 2u, 3u, 4u, 5u, 6u, 7u, 8u, 9u, 10u, 11u, 12u, + 12u, 13u, 14u, 15u, 16u }; - unsigned int characterIndex06[] = { 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, - 12u, 12u, 12u, 12u, 12u, 12u }; + unsigned int characterIndex06[] = { 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, + 12u, 12u, 12u, 12u, 12u }; - unsigned int logicalIndex06[] = { 11u, 10u, 9u, 8u, 7u, 6u, 5u, 4u, 3u, 2u, 1u, - 13u, 16u, 15u, 14u, 13u, 12u }; + unsigned int logicalIndex06[] = { 12u, 11u, 10u, 9u, 8u, 7u, 6u, 5u, 4u, 3u, 2u, 1u, 0u, + 16u, 15u, 14u, 13u, 12u }; - unsigned int bidirectionalLineIndex06[] = { 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, - 1u, 1u, 1u, 1u, 1u, 1u }; + unsigned int bidirectionalLineIndex06[] = { 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, + 1u, 1u, 1u, 1u, 1u, }; struct GetLogicalCursorIndexData data[] = { @@ -1157,7 +1160,7 @@ int UtcDaliGetLogicalCursorIndex(void) Size( 100.f, 300.f ), 1u, fontDescriptionRuns06.Begin(), - 15u, + 18u, visualIndex06, characterIndex06, logicalIndex06, @@ -1171,6 +1174,7 @@ int UtcDaliGetLogicalCursorIndex(void) ToolkitTestApplication application; if( !GetLogicalCursorIndexTest( data[index] ) ) { + tet_printf("Test %d failed : [%s]\n", index, data[index].description.c_str()); tet_result(TET_FAIL); } } diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor-impl.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor-impl.h index 2feb3e0..7d6e853 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor-impl.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor-impl.h @@ -18,7 +18,7 @@ * */ -#include +#include namespace Dali { diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp index bfc2478..5890d58 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp @@ -21,11 +21,10 @@ // Don't want to include the actual window.h which otherwise will be indirectly included by adaptor.h. #define DALI_WINDOW_H -#include +#include +#include -#include #include - #include #include #include diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder.cpp index bfc1315..1075778 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder.cpp @@ -16,7 +16,7 @@ */ #include -#include +#include #include @@ -25,7 +25,7 @@ #include #include -#include +#include #include using AdaptorImpl = Dali::Internal::Adaptor::Adaptor; 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 1ee9219..f75123d 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 @@ -21,7 +21,7 @@ // INTERNAL INCLUDES #include #include -#include +#include #include #include #include diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-trigger-event-factory.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-trigger-event-factory.cpp index e2d0855..6f578e0 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-trigger-event-factory.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-trigger-event-factory.cpp @@ -1,7 +1,7 @@ -#include -#include #include +#include +#include namespace Dali { diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window-impl.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window-impl.h index cf2ccef..25e0a16 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window-impl.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window-impl.h @@ -20,7 +20,7 @@ // EXTERNAL INCLUDES #include -#include +#include // INTERNAL INCLUDES #include diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.cpp index 5ee2dcb..e1ad7f2 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.cpp @@ -25,7 +25,7 @@ #include #define DALI_WINDOW_H -#include +#include #include // INTERNAL INCLUDES diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt index a70abb7..ad5d06c 100644 --- a/build/tizen/CMakeLists.txt +++ b/build/tizen/CMakeLists.txt @@ -47,14 +47,14 @@ SET( toolkit_styles_base_dir ${STYLE_BASE_DIR} ) SET( toolkit_styles_dir ${STYLE_DIR} ) SET( toolkit_style_images_dir ${STYLE_DIR}/images ) -IF( $ENV{DALI_DATA_RW_DIR} ) - SET( dataReadWriteDir $ENV{DALI_DATA_RW_DIR}/ ) +IF( DEFINED ENV{DALI_DATA_RW_DIR} ) + SET( dataReadWriteDir $ENV{DALI_DATA_RW_DIR} ) ELSE() SET( dataReadWriteDir ${CMAKE_INSTALL_PREFIX}/share/dali/ ) ENDIF() -IF( $ENV{DALI_DATA_RO_DIR} ) - SET( dataReadOnlyDir $ENV{DALI_DATA_RO_DIR}/ ) +IF( DEFINED ENV{DALI_DATA_RO_DIR} ) + SET( dataReadOnlyDir $ENV{DALI_DATA_RO_DIR} ) ELSE() SET( dataReadOnlyDir ${CMAKE_INSTALL_PREFIX}/share/dali/ ) ENDIF() @@ -184,12 +184,14 @@ IF(DEFINED STATIC) ENDIF() ADD_LIBRARY( ${name} ${LIBTYPE} ${SOURCES} ) - TARGET_LINK_LIBRARIES( ${name} ${DALICORE_LDFLAGS} ${DALIADAPTOR_LDFLAGS} ${COVERAGE} ) +IF( ANDROID ) +TARGET_LINK_LIBRARIES( ${name} log ) +ENDIF() SET_TARGET_PROPERTIES( ${name} PROPERTIES @@ -244,10 +246,26 @@ INSTALL( FILES ${ROOT_SRC_DIR}/dali-toolkit/dali-toolkit.h DESTINATION ${DEV_INC # package doxygen file (contains doxygen grouping information) INSTALL( FILES ${package_doxy_files} DESTINATION ${DEV_INCLUDE_PATH}/dali-toolkit/doc ) -COPY_RESOURCES( "${dali_toolkit_style_files}" "${ROOT_SRC_DIR}" "${dataReadOnlyDir}" "./toolkit/styles" ) -COPY_RESOURCES( "${dali_toolkit_image_files}" "${ROOT_SRC_DIR}" "${dataReadOnlyDir}" "./toolkit/images" ) -COPY_RESOURCES( "${dali_toolkit_sound_files}" "${ROOT_SRC_DIR}" "${dataReadOnlyDir}" "./toolkit/sounds" ) -COPY_RESOURCES( "${dali_toolkit_style_images}" "${ROOT_SRC_DIR}" "${dataReadOnlyDir}" "./toolkit/styles/images" ) +# On some platforms we want to install the data files to different location compare to +# the data location used runtime. For example, on Android we want the toolkit library to load +# the files from /data/data/com.sec.dali_demo/files but to install the files into ${PREFIX}/files +# for SDK to pick them up for the archive. +IF( DEFINED ENV{DALI_DATA_RW_INSTALL_DIR} ) + SET( dataReadWriteInstallDir $ENV{DALI_DATA_RW_INSTALL_DIR} ) +ELSE() + SET( dataReadWriteInstallDir ${dataReadWriteDir} ) +ENDIF() + +IF( DEFINED ENV{DALI_DATA_RO_INSTALL_DIR} ) + SET( dataReadOnlyInstallDir $ENV{DALI_DATA_RO_INSTALL_DIR} ) +ELSE() + SET( dataReadOnlyInstallDir ${dataReadOnlyDir} ) +ENDIF() + +COPY_RESOURCES( "${dali_toolkit_style_files}" "${ROOT_SRC_DIR}" "${dataReadOnlyInstallDir}" "./toolkit/styles" ) +COPY_RESOURCES( "${dali_toolkit_image_files}" "${ROOT_SRC_DIR}" "${dataReadOnlyInstallDir}" "./toolkit/images" ) +COPY_RESOURCES( "${dali_toolkit_sound_files}" "${ROOT_SRC_DIR}" "${dataReadOnlyInstallDir}" "./toolkit/sounds" ) +COPY_RESOURCES( "${dali_toolkit_style_images}" "${ROOT_SRC_DIR}" "${dataReadOnlyInstallDir}" "./toolkit/styles/images" ) # The DALI_TOOLKIT_PREFIX must be set if this CMakeLists.txt is executed # from the top-level CMake script using ADD_SUBDIRECTORY() to avoid @@ -348,18 +366,20 @@ CONFIGURE_FILE( ${ROOT_SRC_DIR}/automated-tests/CMakeLists.txt.in # Configuration Messages MESSAGE( STATUS "Configuration:\n" ) -MESSAGE( STATUS "Prefix: " ${PREFIX} ) -MESSAGE( STATUS "Lib Dir: " ${LIB_DIR} ) -MESSAGE( STATUS "Include Dir: " ${INCLUDE_DIR} ) -MESSAGE( STATUS "Debug build: " ${ENABLE_DEBUG} ) -MESSAGE( STATUS "Export all symbols: " ${ENABLE_EXPORTALL} ) -MESSAGE( STATUS "Coverage: " ${ENABLE_COVERAGE} ) -MESSAGE( STATUS "Trace: " ${ENABLE_TRACE} ) -MESSAGE( STATUS "Doxygen: " ${doxygenEnabled} ) -MESSAGE( STATUS "Data Dir (Read/Write): " ${dataReadWriteDir} ) -MESSAGE( STATUS "Data Dir (Read Only): " ${dataReadOnlyDir} ) -MESSAGE( STATUS "Style Dir: " ${STYLE_DIR} ) -MESSAGE( STATUS "Style: " ${dali_style} ) -MESSAGE( STATUS "i18n: " ${ENABLE_I18N} ) -MESSAGE( STATUS "CXXFLAGS: " ${CMAKE_CXX_FLAGS} ) -MESSAGE( STATUS "LDFLAGS: " ${CMAKE_SHARED_LINKER_FLAGS_INIT}${CMAKE_SHARED_LINKER_FLAGS} ) +MESSAGE( STATUS "Prefix: " ${PREFIX} ) +MESSAGE( STATUS "Lib Dir: " ${LIB_DIR} ) +MESSAGE( STATUS "Include Dir: " ${INCLUDE_DIR} ) +MESSAGE( STATUS "Debug build: " ${ENABLE_DEBUG} ) +MESSAGE( STATUS "Export all symbols: " ${ENABLE_EXPORTALL} ) +MESSAGE( STATUS "Coverage: " ${ENABLE_COVERAGE} ) +MESSAGE( STATUS "Trace: " ${ENABLE_TRACE} ) +MESSAGE( STATUS "Doxygen: " ${doxygenEnabled} ) +MESSAGE( STATUS "Data Dir (Read/Write): " ${dataReadWriteDir} ) +MESSAGE( STATUS "Data Dir (Read Only): " ${dataReadOnlyDir} ) +MESSAGE( STATUS "Data Install Dir (Read/Write): " ${dataReadWriteInstallDir} ) +MESSAGE( STATUS "Data Install Dir (Read Only): " ${dataReadOnlyInstallDir} ) +MESSAGE( STATUS "Style Dir: " ${STYLE_DIR} ) +MESSAGE( STATUS "Style: " ${dali_style} ) +MESSAGE( STATUS "i18n: " ${ENABLE_I18N} ) +MESSAGE( STATUS "CXXFLAGS: " ${CMAKE_CXX_FLAGS} ) +MESSAGE( STATUS "LDFLAGS: " ${CMAKE_SHARED_LINKER_FLAGS_INIT}${CMAKE_SHARED_LINKER_FLAGS} ) diff --git a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp index e4f245d..3444c39 100755 --- a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -27,8 +27,8 @@ #include #include #include -#include #include +#include // INTERNAL INCLUDES #include diff --git a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp index 2c83872..0def1bc 100755 --- a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -27,7 +27,6 @@ #include #include #include -#include #include // INTERNAL INCLUDES @@ -45,6 +44,7 @@ #include #include #include +#include using namespace Dali::Toolkit::Text; diff --git a/dali-toolkit/internal/controls/video-view/video-view-impl.cpp b/dali-toolkit/internal/controls/video-view/video-view-impl.cpp index dfd441b..7fcab03 100755 --- a/dali-toolkit/internal/controls/video-view/video-view-impl.cpp +++ b/dali-toolkit/internal/controls/video-view/video-view-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include @@ -33,6 +32,7 @@ // INTERNAL INCLUDES #include #include +#include namespace Dali { diff --git a/dali-toolkit/internal/controls/video-view/video-view-impl.h b/dali-toolkit/internal/controls/video-view/video-view-impl.h index 44695bb..ca8a2f8 100755 --- a/dali-toolkit/internal/controls/video-view/video-view-impl.h +++ b/dali-toolkit/internal/controls/video-view/video-view-impl.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_VIDEO_VIEW_H /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -21,13 +21,13 @@ // EXTERNAL INCLUDES #include #include -#include -#include #include #include #include #include #include +#include +#include // INTERNAL INCLUDES #include diff --git a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp index 18bd7a0..4bc1cc5 100644 --- a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp +++ b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp @@ -32,9 +32,9 @@ #include #include #include -#include -#include #include +#include +#include // INTERNAL INCLUDES #include diff --git a/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp b/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp index 57e0d86..6b95600 100644 --- a/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp +++ b/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -23,12 +23,10 @@ #include #include #include -#include -#include - -// INTERNAL INCLUDES #include #include +#include +#include namespace Dali { diff --git a/dali-toolkit/internal/image-loader/async-image-loader-impl.cpp b/dali-toolkit/internal/image-loader/async-image-loader-impl.cpp index de0ee3f..62a3fdd 100644 --- a/dali-toolkit/internal/image-loader/async-image-loader-impl.cpp +++ b/dali-toolkit/internal/image-loader/async-image-loader-impl.cpp @@ -19,7 +19,7 @@ #include "async-image-loader-impl.h" // EXTERNAL INCLUDES -#include +#include namespace Dali { diff --git a/dali-toolkit/internal/image-loader/image-load-thread.cpp b/dali-toolkit/internal/image-loader/image-load-thread.cpp index f687af6..9756608 100644 --- a/dali-toolkit/internal/image-loader/image-load-thread.cpp +++ b/dali-toolkit/internal/image-loader/image-load-thread.cpp @@ -20,8 +20,8 @@ // EXTERNAL INCLUDES #include -#include #include +#include namespace Dali { diff --git a/dali-toolkit/internal/image-loader/image-load-thread.h b/dali-toolkit/internal/image-loader/image-load-thread.h index cd6bd32..53f6e47 100644 --- a/dali-toolkit/internal/image-loader/image-load-thread.h +++ b/dali-toolkit/internal/image-loader/image-load-thread.h @@ -26,9 +26,9 @@ #include #include #include -#include #include #include +#include namespace Dali { diff --git a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.cpp b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.cpp index 7af08ac..db42b67 100644 --- a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.cpp +++ b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.cpp @@ -500,7 +500,11 @@ uint32_t VectorAnimationTask::GetStoppedFrame( uint32_t startFrame, uint32_t end std::chrono::time_point< std::chrono::system_clock > VectorAnimationTask::CalculateNextFrameTime( bool renderNow ) { - mNextFrameStartTime = mNextFrameStartTime + std::chrono::nanoseconds( mFrameDurationNanoSeconds ); + // std::chrono::time_point template has second parameter duration which defaults to the std::chrono::system_clock supported + // duration. In some C++11 implementations it is a milliseconds duration, so it fails to compile unless mNextFrameStartTime + // is casted to use the default duration. + mNextFrameStartTime = std::chrono::time_point_cast< std::chrono::time_point< std::chrono::system_clock >::duration >( + mNextFrameStartTime + std::chrono::nanoseconds( mFrameDurationNanoSeconds ) ); auto current = std::chrono::system_clock::now(); if( renderNow || mNextFrameStartTime < current ) { diff --git a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-thread.cpp b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-thread.cpp index a4a2a16..df39c1e 100644 --- a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-thread.cpp +++ b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-thread.cpp @@ -21,9 +21,9 @@ // EXTERNAL INCLUDES #include #include -#include #include #include +#include namespace Dali { diff --git a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-thread.h b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-thread.h index 63e3525..8d3dd64 100755 --- a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-thread.h +++ b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-thread.h @@ -18,11 +18,11 @@ */ // EXTERNAL INCLUDES +#include #include #include #include -#include -#include +#include // INTERNAL INCLUDES #include diff --git a/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.cpp b/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.cpp index a640b19..cb2d08a 100644 --- a/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.cpp +++ b/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.cpp @@ -20,10 +20,10 @@ // EXTERNAL INCLUDES #include -#include #include #include #include +#include namespace Dali { diff --git a/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.h b/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.h index e21809e..e24a918 100644 --- a/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.h +++ b/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.h @@ -18,13 +18,11 @@ */ // EXTERNAL INCLUDES -//#include -#include -#include -#include #include #include -//#include +#include +#include +#include // INTERNAL INCLUDES #include diff --git a/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp index 97fbe7c..f4e7c95 100644 --- a/dali-toolkit/public-api/dali-toolkit-version.cpp +++ b/dali-toolkit/public-api/dali-toolkit-version.cpp @@ -31,7 +31,7 @@ namespace Toolkit const unsigned int TOOLKIT_MAJOR_VERSION = 1; const unsigned int TOOLKIT_MINOR_VERSION = 4; -const unsigned int TOOLKIT_MICRO_VERSION = 43; +const unsigned int TOOLKIT_MICRO_VERSION = 44; const char * const TOOLKIT_BUILD_DATE = __DATE__ " " __TIME__; #ifdef DEBUG_ENABLED diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec index e332703..9c3b751 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.43 +Version: 1.4.44 Release: 1 Group: System/Libraries License: Apache-2.0 and BSD-3-Clause and MIT