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

diff --git a/dali-toolkit/internal/builder/builder-get-is.inl.h b/dali-toolkit/internal/builder/builder-get-is.inl.h
index 73550f5..ae17837 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) 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.
+ * 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>
@@ -40,11 +41,36 @@ inline OptionalChild IsChild(const TreeNode* node, const std::string& childName)
   }
 }
 
+inline OptionalChild IsChildIgnoreCase(const TreeNode* node, const std::string& childName)
+{
+  if( node )
+  {
+    const TreeNode* c = node->GetChildIgnoreCase(childName);
+    if( NULL != c )
+    {
+      return OptionalChild( *c );
+    }
+    else
+    {
+      return OptionalChild();
+    }
+  }
+  else
+  {
+    return OptionalChild();
+  }
+}
+
 inline OptionalChild IsChild(const TreeNode& node, const std::string& childName)
 {
   return IsChild(&node, childName);
 }
 
+inline OptionalChild IsChildIgnoreCase(const TreeNode& node, const std::string& childName)
+{
+  return IsChildIgnoreCase(&node, childName);
+}
+
 inline OptionalString IsString(const OptionalChild& node)
 {
   if( node && (*node).GetType() == TreeNode::STRING )
@@ -56,6 +82,7 @@ inline OptionalString IsString(const OptionalChild& node)
     return OptionalString();
   }
 }
+
 inline OptionalFloat IsFloat(const OptionalChild& node)
 {
   OptionalFloat ret;
@@ -108,6 +135,7 @@ inline OptionalBoolean IsBoolean(const OptionalChild& node)
   }
 }
 
+
 // copy N Numbers
 template <typename T>
 inline bool CopyNumbers(TreeNode::ConstIterator iter, int N, T& vector)
@@ -136,7 +164,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 +180,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 +196,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 +212,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 +228,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) )