X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=optional%2Fdali-toolkit%2Fpublic-api%2Fshader-effects%2Fblind-effect.h;h=ede89cac45edb4f85354635a3cc2bec3cb4ac5f3;hb=c95e793de54b10be70c3b6a68ec8952e430809c1;hp=10fa85764a795a22ff5a4534a9a7a99d8d95a895;hpb=e58fa784d19a558e35f458ecf6d262a2344beb4f;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/optional/dali-toolkit/public-api/shader-effects/blind-effect.h b/optional/dali-toolkit/public-api/shader-effects/blind-effect.h index 10fa857..ede89ca 100644 --- a/optional/dali-toolkit/public-api/shader-effects/blind-effect.h +++ b/optional/dali-toolkit/public-api/shader-effects/blind-effect.h @@ -1,26 +1,27 @@ #ifndef __DALI_TOOLKIT_SHADER_EFFECT_BLIND_H__ #define __DALI_TOOLKIT_SHADER_EFFECT_BLIND_H__ -// -// Copyright (c) 2014 Samsung Electronics Co., Ltd. -// -// Licensed under the Flora License, Version 1.0 (the License); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://floralicense.org/license/ -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an AS IS BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// +/* + * Copyright (c) 2014 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ -// INTERNAL INCLUDES -#include +// EXTERNAL INCLUDES +#include -namespace Dali DALI_IMPORT_API +namespace Dali { namespace Toolkit @@ -29,7 +30,7 @@ namespace Toolkit /** * BlindEffect is a custom shader effect to achieve blind effects in Image actors */ -class BlindEffect : public ShaderEffect +class DALI_IMPORT_API BlindEffect : public ShaderEffect { public: @@ -40,9 +41,11 @@ public: BlindEffect(); /** - * Virtual destructor. + * @brief Destructor + * + * This is non-virtual since derived Handle types must not contain data or virtual methods. */ - virtual ~BlindEffect(); + ~BlindEffect(); /** * Create an initialized ~BlindEffect. @@ -65,7 +68,7 @@ public: const std::string& GetStepPropertyName() const; private: // Not intended for application developers - BlindEffect(ShaderEffect handle); + DALI_INTERNAL BlindEffect(ShaderEffect handle); }; } // namespace Toolkit