From 0fd413a6281822bffdfcf171be8a4f56d1bf94c4 Mon Sep 17 00:00:00 2001 From: JunsuChoi Date: Fri, 13 Aug 2021 10:40:29 +0900 Subject: [PATCH] CanvasRenderer: Do not use c-style type cast changed to static_cast or const_cast Change-Id: I64ea9cee3b6f0fa2cde3a0445427ac3c10d361cb --- dali/internal/canvas-renderer/tizen/drawable-impl-tizen.cpp | 2 +- dali/internal/canvas-renderer/tizen/gradient-impl-tizen.cpp | 2 +- dali/internal/canvas-renderer/tizen/shape-impl-tizen.cpp | 2 +- dali/internal/canvas-renderer/ubuntu/drawable-impl-ubuntu.cpp | 2 +- dali/internal/canvas-renderer/ubuntu/gradient-impl-ubuntu.cpp | 2 +- dali/internal/canvas-renderer/ubuntu/shape-impl-ubuntu.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dali/internal/canvas-renderer/tizen/drawable-impl-tizen.cpp b/dali/internal/canvas-renderer/tizen/drawable-impl-tizen.cpp index b4a53bd..fcc7092 100644 --- a/dali/internal/canvas-renderer/tizen/drawable-impl-tizen.cpp +++ b/dali/internal/canvas-renderer/tizen/drawable-impl-tizen.cpp @@ -317,7 +317,7 @@ void DrawableTizen::SetObject(const void* object) #ifdef THORVG_SUPPORT if(object) { - mTvgPaint = static_cast((void*)object); + mTvgPaint = static_cast(const_cast(object)); } #endif } diff --git a/dali/internal/canvas-renderer/tizen/gradient-impl-tizen.cpp b/dali/internal/canvas-renderer/tizen/gradient-impl-tizen.cpp index 562b739..97081c3 100644 --- a/dali/internal/canvas-renderer/tizen/gradient-impl-tizen.cpp +++ b/dali/internal/canvas-renderer/tizen/gradient-impl-tizen.cpp @@ -176,7 +176,7 @@ void GradientTizen::SetObject(const void* object) #ifdef THORVG_SUPPORT if(object) { - mTvgFill = static_cast((void*)object); + mTvgFill = static_cast(const_cast(object)); } #endif } diff --git a/dali/internal/canvas-renderer/tizen/shape-impl-tizen.cpp b/dali/internal/canvas-renderer/tizen/shape-impl-tizen.cpp index 1665f96..23bca2c 100644 --- a/dali/internal/canvas-renderer/tizen/shape-impl-tizen.cpp +++ b/dali/internal/canvas-renderer/tizen/shape-impl-tizen.cpp @@ -208,7 +208,7 @@ bool ShapeTizen::AddPath(Dali::CanvasRenderer::Shape::PathCommands& pathCommand) return false; } - if(static_cast(mTvgShape)->appendPath(reinterpret_cast(pathCommand.mCommands), pathCommand.mCommandCount, static_cast((void*)pathCommand.mPoints), pathCommand.mPointCount) != tvg::Result::Success) + if(static_cast(mTvgShape)->appendPath(reinterpret_cast(pathCommand.mCommands), pathCommand.mCommandCount, static_cast(static_cast(pathCommand.mPoints)), pathCommand.mPointCount) != tvg::Result::Success) { DALI_LOG_ERROR("AddPath() fail.\n"); return false; diff --git a/dali/internal/canvas-renderer/ubuntu/drawable-impl-ubuntu.cpp b/dali/internal/canvas-renderer/ubuntu/drawable-impl-ubuntu.cpp index 3808448..d841bb5 100644 --- a/dali/internal/canvas-renderer/ubuntu/drawable-impl-ubuntu.cpp +++ b/dali/internal/canvas-renderer/ubuntu/drawable-impl-ubuntu.cpp @@ -317,7 +317,7 @@ void DrawableUbuntu::SetObject(const void* object) #ifdef THORVG_SUPPORT if(object) { - mTvgPaint = static_cast((void*)object); + mTvgPaint = static_cast(const_cast(object)); } #endif } diff --git a/dali/internal/canvas-renderer/ubuntu/gradient-impl-ubuntu.cpp b/dali/internal/canvas-renderer/ubuntu/gradient-impl-ubuntu.cpp index 350a2c1..4c9594c 100644 --- a/dali/internal/canvas-renderer/ubuntu/gradient-impl-ubuntu.cpp +++ b/dali/internal/canvas-renderer/ubuntu/gradient-impl-ubuntu.cpp @@ -176,7 +176,7 @@ void GradientUbuntu::SetObject(const void* object) #ifdef THORVG_SUPPORT if(object) { - mTvgFill = static_cast((void*)object); + mTvgFill = static_cast(const_cast(object)); } #endif } diff --git a/dali/internal/canvas-renderer/ubuntu/shape-impl-ubuntu.cpp b/dali/internal/canvas-renderer/ubuntu/shape-impl-ubuntu.cpp index 758dc97..17fd079 100644 --- a/dali/internal/canvas-renderer/ubuntu/shape-impl-ubuntu.cpp +++ b/dali/internal/canvas-renderer/ubuntu/shape-impl-ubuntu.cpp @@ -208,7 +208,7 @@ bool ShapeUbuntu::AddPath(Dali::CanvasRenderer::Shape::PathCommands& pathCommand return false; } - if(static_cast(mTvgShape)->appendPath(reinterpret_cast(pathCommand.mCommands), pathCommand.mCommandCount, static_cast((void*)pathCommand.mPoints), pathCommand.mPointCount) != tvg::Result::Success) + if(static_cast(mTvgShape)->appendPath(reinterpret_cast(pathCommand.mCommands), pathCommand.mCommandCount, static_cast(static_cast(pathCommand.mPoints)), pathCommand.mPointCount) != tvg::Result::Success) { DALI_LOG_ERROR("AddPath() fail.\n"); return false; -- 2.7.4