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%2Fdissolve-effect.h;h=fdea5d0714b146004730f6cddf071acfb3eb4ae2;hp=5c929b9234876eb7b86c19660b27dcaf54f3a43f;hb=d00a250741411c386d988e7ac34525cf94a1918e;hpb=46e8848bda5e3287a80ee9ce020166ad55a52ec0 diff --git a/dali-toolkit/devel-api/shader-effects/dissolve-effect.h b/dali-toolkit/devel-api/shader-effects/dissolve-effect.h index 5c929b9..fdea5d0 100644 --- a/dali-toolkit/devel-api/shader-effects/dissolve-effect.h +++ b/dali-toolkit/devel-api/shader-effects/dissolve-effect.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_SHADER_EFFECT_DISSOLVE_H__ -#define __DALI_TOOLKIT_SHADER_EFFECT_DISSOLVE_H__ +#ifndef DALI_TOOLKIT_SHADER_EFFECT_DISSOLVE_H_ +#define DALI_TOOLKIT_SHADER_EFFECT_DISSOLVE_H /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -20,7 +20,7 @@ // EXTERNAL INCLUDES #include -#include +#include namespace Dali { @@ -113,7 +113,7 @@ inline void DissolveEffectSetCentralLine( Actor& actor, const Vector2& position, /** * @brief Create a new Dissolve effect * - * DissolveEffect is a custom shader effect to achieve Dissolve effects in Image actors. + * DissolveEffect is a custom shader effect to achieve Dissolve effects in image views. * * Animatable/Constrainable uniforms: * "uPercentage" - This value is proportional to the distortion applied; a value of zero means no distortion. @@ -230,4 +230,4 @@ inline Property::Map CreateDissolveEffect( bool useHighPrecision = true ) } // namespace Dali -#endif // __DALI_TOOLKIT_SHADER_EFFECT_DISSOLVE_H__ +#endif // DALI_TOOLKIT_SHADER_EFFECT_DISSOLVE_H