From f1c100fab8bfeaa0a304ea8d36e3cdb8beef82c9 Mon Sep 17 00:00:00 2001 From: "Seungho, Baek" Date: Mon, 8 Jun 2020 15:17:16 +0900 Subject: [PATCH] Remove const at the index paramenter in image.h and modify comment - Remove const keyword at the index paramenter of "std::string GenerateUrl( const Dali::FrameBuffer frameBuffer, uint8_t index )" - Fix some comment error Change-Id: I30bd63ac81179ede08f11ed1c451a1ade75cd9d6 Signed-off-by: Seungho, Baek --- dali-toolkit/public-api/image-loader/image.cpp | 4 ++-- dali-toolkit/public-api/image-loader/image.h | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dali-toolkit/public-api/image-loader/image.cpp b/dali-toolkit/public-api/image-loader/image.cpp index 2645c07..0b26173 100644 --- a/dali-toolkit/public-api/image-loader/image.cpp +++ b/dali-toolkit/public-api/image-loader/image.cpp @@ -39,7 +39,7 @@ std::string GenerateUrl( Dali::FrameBuffer frameBuffer, Pixel::Format pixelForma return Dali::Toolkit::TextureManager::AddTexture( texture ); } -std::string GenerateUrl( const Dali::FrameBuffer frameBuffer, const uint8_t index ) +std::string GenerateUrl( const Dali::FrameBuffer frameBuffer, uint8_t index ) { Texture texture = Dali::DevelFrameBuffer::GetColorTexture( frameBuffer, index ); return Dali::Toolkit::TextureManager::AddTexture( texture ); @@ -58,7 +58,7 @@ std::string GenerateUrl( const Dali::NativeImageSourcePtr nativeImageSource ) return Dali::Toolkit::TextureManager::AddTexture( texture ); } -} // TextureManager +} // Image } // Toolkit diff --git a/dali-toolkit/public-api/image-loader/image.h b/dali-toolkit/public-api/image-loader/image.h index 7d27215..1cf2550 100644 --- a/dali-toolkit/public-api/image-loader/image.h +++ b/dali-toolkit/public-api/image-loader/image.h @@ -1,5 +1,5 @@ -#ifndef DALI_TOOLKIT_DEVEL_API_IMAGE_MANAGER_H -#define DALI_TOOLKIT_DEVEL_API_IMAGE_MANAGER_H +#ifndef DALI_TOOLKIT_IMAGE_H +#define DALI_TOOLKIT_IMAGE_H /* * Copyright (c) 2020 Samsung Electronics Co., Ltd. @@ -60,7 +60,7 @@ DALI_TOOLKIT_API std::string GenerateUrl( const Dali::FrameBuffer frameBuffer, P * @param[in] index the index of the attached color texture. * @return the Url string representing this frame buffer */ -DALI_TOOLKIT_API std::string GenerateUrl( const Dali::FrameBuffer frameBuffer, const uint8_t index ); +DALI_TOOLKIT_API std::string GenerateUrl( const Dali::FrameBuffer frameBuffer, uint8_t index ); /** * @brief Generate a Url from Pixel data. @@ -80,10 +80,10 @@ DALI_TOOLKIT_API std::string GenerateUrl( const Dali::PixelData pixelData ); */ DALI_TOOLKIT_API std::string GenerateUrl( const Dali::NativeImageSourcePtr nativeImageSource ); -} // ImageUtil +} // Image } // Toolkit } // Dali -#endif // DALI_TOOLKIT_DEVEL_API_IMAGE_MANAGER_H +#endif // DALI_TOOLKIT_IMAGE_H -- 2.7.4