[dali_1.0.39] Merge branch 'tizen'

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / shader-effects / bubble-effect / color-adjuster.h

diff --git a/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.h b/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.h
index 8c1884a..e35e02e 100644 (file)
--- a/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.h
+++ b/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.h
@@ -1,26 +1,28 @@
 #ifndef __DALI_TOOLKIT_SHADER_COLOR_ADJUSTER_H__
 #define __DALI_TOOLKIT_SHADER_COLOR_ADJUSTER_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) 2015 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 <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/math/vector3.h>
+#include <dali/public-api/shader-effects/shader-effect.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Toolkit
@@ -29,7 +31,7 @@ namespace Toolkit
 /**
  * ColorAdjuster is a custom shader effect to adjust the image color in HSV space.
  */
-class ColorAdjuster : public ShaderEffect
+class DALI_IMPORT_API ColorAdjuster : public ShaderEffect
 {
 public:
 
@@ -39,9 +41,11 @@ public:
   ColorAdjuster();
 
   /**
-   * Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~ColorAdjuster();
+  ~ColorAdjuster();
 
   /**
    * Create an initialized ColorAdjuster.
@@ -58,8 +62,7 @@ public:
 
 private: // Not intended for application developers
 
-ColorAdjuster( ShaderEffect handle );
-
+  DALI_INTERNAL ColorAdjuster( ShaderEffect handle );
 };
 
 } // namespace Toolkit