X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fbuilder%2Fbuilder-get-is.inl.h;h=2efc4db9468018b079614f7b7b39e1c7b59ed4b6;hb=678abc1612bf792741f9018c0cb5210738b61113;hp=73550f5cb18f5464fb89e5da42d32e4567fd36e9;hpb=e2eda444afbe82e9591fe198eef339227f90a616;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/builder/builder-get-is.inl.h b/dali-toolkit/internal/builder/builder-get-is.inl.h
index 73550f5..2efc4db 100644
--- a/dali-toolkit/internal/builder/builder-get-is.inl.h
+++ b/dali-toolkit/internal/builder/builder-get-is.inl.h
@@ -1,21 +1,22 @@
 #ifndef __DALI_TOOLKIT_INTERNAL_BUILDER_GET_IS_INL__
 #define __DALI_TOOLKIT_INTERNAL_BUILDER_GET_IS_INL__
 
-//
-// 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 <dali-toolkit/internal/builder/builder-declarations.h>
@@ -136,7 +137,7 @@ inline OptionalVector4 IsVector4(const OptionalChild& node)
 {
   OptionalVector4 ret;
 
-  if( node && (*node).Size() >= 4 )
+  if( node && (TreeNode::ARRAY == (*node).GetType()) && (*node).Size() >= 4 )
   {
     Dali::Vector4 v;
     if( CopyNumbers((*node).CBegin(), 4, v) )
@@ -152,7 +153,7 @@ inline OptionalVector3 IsVector3(const OptionalChild& node)
 {
   OptionalVector3 ret;
 
-  if( node && (*node).Size() >= 3 )
+  if( node && (TreeNode::ARRAY == (*node).GetType()) && (*node).Size() >= 3 )
   {
     Dali::Vector3 v;
     if( CopyNumbers((*node).CBegin(), 3, v) )
@@ -168,7 +169,7 @@ inline OptionalVector2 IsVector2(const OptionalChild& node)
 {
   OptionalVector2 ret;
 
-  if( node && (*node).Size() >= 2 )
+  if( node && (TreeNode::ARRAY == (*node).GetType()) && (*node).Size() >= 2 )
   {
     Dali::Vector2 v;
     if( CopyNumbers((*node).CBegin(), 2, v) )
@@ -184,7 +185,7 @@ inline OptionalMatrix IsMatrix(const OptionalChild &node)
 {
   OptionalMatrix ret;
 
-  if( node && (*node).Size() >= 16 )
+  if( node && (TreeNode::ARRAY == (*node).GetType()) && (*node).Size() >= 16 )
   {
     float v[16];
     if( CopyNumbers((*node).CBegin(), 16, v) )
@@ -200,7 +201,7 @@ inline OptionalMatrix3 IsMatrix3(const OptionalChild& node)
 {
   OptionalMatrix3 ret;
 
-  if( node && (*node).Size() >= 9 )
+  if( node && (TreeNode::ARRAY == (*node).GetType()) && (*node).Size() >= 9 )
   {
     float v[9];
     if( CopyNumbers((*node).CBegin(), 9, v) )