Allow reading Vector2/3/4 values from Property::Value with type Vector2/3/4, matching...

[platform/core/uifw/dali-core.git] / dali / public-api / math / vector4.cpp

diff --git a/dali/public-api/math/vector4.cpp b/dali/public-api/math/vector4.cpp
index d801902..15815d4 100644 (file)
--- a/dali/public-api/math/vector4.cpp
+++ b/dali/public-api/math/vector4.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 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 <math.h>
-#include <iostream>
+#include <ostream>
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
@@ -58,18 +58,19 @@ Vector4::Vector4( const Vector3& vec3 )
 
 Vector4& Vector4::operator=(const Vector2& vec2 )
 {
-  // only set x and y
   x = vec2.x;
   y = vec2.y;
+  z = 0.0f;
+  w = 0.0f;
   return *this;
 }
 
 Vector4& Vector4::operator=(const Vector3& vec3 )
 {
-  // only set x, y and z
   x = vec3.x;
   y = vec3.y;
   z = vec3.z;
+  w = 0.0f;
   return *this;
 }