[4.0] DALi version 1.2.82

[platform/core/uifw/dali-core.git] / dali / public-api / animation / key-frames.cpp

diff --git a/dali/public-api/animation/key-frames.cpp b/dali/public-api/animation/key-frames.cpp
index dd4b682..34148e9 100644 (file)
--- a/dali/public-api/animation/key-frames.cpp
+++ b/dali/public-api/animation/key-frames.cpp
@@ -1,24 +1,25 @@
-//
-// 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.
+ *
+ */
 
 // CLASS HEADER
 #include <dali/public-api/animation/key-frames.h>
 
 // INTERNAL INCLUDES
-#include <dali/public-api/animation/alpha-functions.h>
+#include <dali/public-api/animation/alpha-function.h>
 #include <dali/public-api/math/degree.h>
 #include <dali/public-api/math/radian.h>
 #include <dali/internal/event/animation/key-frames-impl.h>
@@ -45,6 +46,17 @@ KeyFrames::~KeyFrames()
 {
 }
 
+KeyFrames::KeyFrames(const KeyFrames& handle)
+: BaseHandle(handle)
+{
+}
+
+KeyFrames& KeyFrames::operator=(const KeyFrames& rhs)
+{
+  BaseHandle::operator=(rhs);
+  return *this;
+}
+
 Property::Type KeyFrames::GetType() const
 {
   return GetImplementation(*this).GetType();
@@ -52,7 +64,7 @@ Property::Type KeyFrames::GetType() const
 
 void KeyFrames::Add(float time, Property::Value value)
 {
-  Add(time, value, AlphaFunctions::Linear);
+  Add(time, value, AlphaFunction::DEFAULT);
 }
 
 void KeyFrames::Add(float time, Property::Value value, AlphaFunction alpha)