Merge "remove the exports for enumerated property types" into tizen

[platform/core/uifw/dali-core.git] / dali / public-api / actors / camera-actor.cpp

diff --git a/dali/public-api/actors/camera-actor.cpp b/dali/public-api/actors/camera-actor.cpp
index 988d2b7..e3a0807 100644 (file)
--- a/dali/public-api/actors/camera-actor.cpp
+++ b/dali/public-api/actors/camera-actor.cpp
@@ -1,18 +1,19 @@
-//
-// 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.
+ *
+ */
 
 // CLASS HEADER
 #include <dali/public-api/actors/camera-actor.h>
@@ -56,6 +57,17 @@ CameraActor::~CameraActor()
 {
 }
 
+CameraActor::CameraActor(const CameraActor& copy)
+: Actor(copy)
+{
+}
+
+CameraActor& CameraActor::operator=(const CameraActor& rhs)
+{
+  BaseHandle::operator=(rhs);
+  return *this;
+}
+
 void CameraActor::SetType( Dali::Camera::Type type )
 {
   GetImplementation(*this).SetType(type);