X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fshader-effects%2Fimage-region-effect.h;h=f031f15bf41a0621b41535ad9f41480dbf230a02;hp=0ccf1723f54442efd97f46247909862db42bcbbe;hb=b694e7e2ae624e206e1548b1a863c554eb9cd4d7;hpb=a6e53c231632bf7da20cbd2633a4cf40f648045c diff --git a/dali-toolkit/devel-api/shader-effects/image-region-effect.h b/dali-toolkit/devel-api/shader-effects/image-region-effect.h index 0ccf172..f031f15 100644 --- a/dali-toolkit/devel-api/shader-effects/image-region-effect.h +++ b/dali-toolkit/devel-api/shader-effects/image-region-effect.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_IMAGE_REGION_EFFECT_H__ -#define __DALI_TOOLKIT_IMAGE_REGION_EFFECT_H__ +#ifndef DALI_TOOLKIT_IMAGE_REGION_EFFECT_H +#define DALI_TOOLKIT_IMAGE_REGION_EFFECT_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. @@ -22,7 +22,7 @@ #include // INTERNAL INCLUDES -#include +#include namespace Dali { @@ -41,7 +41,7 @@ namespace Toolkit * "uBottomRight" - The bottom-right corner of the image region. The coordinates are in percentage, * (0,0) being the top-left and (1,1) the bottom right of the original image * - * @return A handle to a newly allocated ShaderEffect + * @return A property map of the required shader */ inline Property::Map CreateImageRegionEffect() { @@ -78,7 +78,7 @@ inline Property::Map CreateImageRegionEffect() Property::Map customShader; customShader[ Visual::Shader::Property::VERTEX_SHADER ] = vertexShader; - map[ VisualProperty::SHADER ] = customShader; + map[ Toolkit::Visual::Property::SHADER ] = customShader; return map; } @@ -86,4 +86,4 @@ inline Property::Map CreateImageRegionEffect() } // namespace Dali -#endif // __DALI_TOOLKIT_IMAGE_REGION_EFFECT_H__ +#endif // DALI_TOOLKIT_IMAGE_REGION_EFFECT_H