Revert "[Tizen] Fix Svace issue for 64bit"

This reverts commit dfb16c0dbc52b529ac39869a667524605f5ea0bb.

diff --git a/dali/internal/event/actors/actor-coords.cpp b/dali/internal/event/actors/actor-coords.cpp
index d1a70db..4ee6566 100644 (file)
--- a/dali/internal/event/actors/actor-coords.cpp
+++ b/dali/internal/event/actors/actor-coords.cpp
@@ -502,12 +502,9 @@ Matrix CalculateActorWorldTransform(const Actor& actor)
 
   Matrix  worldMatrix;
   Vector3 localPosition;
-
   // descentList is leaf first, so traverse from root (end) to leaf (beginning)
-  const size_t descentCount = descentList.size();
-  for(size_t iter = 0u; iter < descentCount; ++iter)
+  for(unsigned int i(descentList.size() - 1); i < descentList.size(); --i)
   {
-    auto       i                       = descentCount - iter - 1u;
     Vector3    anchorPoint             = descentList[i].GetProperty<Vector3>(Dali::Actor::Property::ANCHOR_POINT);
     Vector3    parentOrigin            = descentList[i].GetProperty<Vector3>(Dali::Actor::Property::PARENT_ORIGIN);
     bool       positionUsesAnchorPoint = descentList[i].GetProperty<bool>(Dali::Actor::Property::POSITION_USES_ANCHOR_POINT);
@@ -592,11 +589,9 @@ Vector4 CalculateActorWorldColor(const Actor& actor)
     currentActor = currentActor.GetParent();
   } while(inheritance != Dali::ColorMode::USE_OWN_COLOR && currentActor);
 
-  Vector4      worldColor;
-  const size_t descentCount = descentList.size();
-  for(size_t iter = 0u; iter < descentCount; ++iter)
+  Vector4 worldColor;
+  for(unsigned int i(descentList.size() - 1); i < descentList.size(); --i)
   {
-    auto i = descentCount - iter - 1u;
     if(inheritanceModeList[i] == USE_OWN_COLOR || i == descentList.size() - 1)
     {
       worldColor = descentList[i].GetProperty<Vector4>(Dali::Actor::Property::COLOR);

diff --git a/dali/public-api/rendering/texture-set.cpp b/dali/public-api/rendering/texture-set.cpp
index b59d0bc..6f9fa6b 100644 (file)
--- a/dali/public-api/rendering/texture-set.cpp
+++ b/dali/public-api/rendering/texture-set.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -86,7 +86,7 @@ Sampler TextureSet::GetSampler(size_t index) const
   return Dali::Sampler(samplerPtr);
 }
 
-uint32_t TextureSet::GetTextureCount() const
+size_t TextureSet::GetTextureCount() const
 {
   return GetImplementation(*this).GetTextureCount();
 }

diff --git a/dali/public-api/rendering/texture-set.h b/dali/public-api/rendering/texture-set.h
index f1525e6..abdce8c 100644 (file)
--- a/dali/public-api/rendering/texture-set.h
+++ b/dali/public-api/rendering/texture-set.h
@@ -2,7 +2,7 @@
 #define DALI_TEXTURE_SET_H
 
 /*
- * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -154,7 +154,7 @@ public:
    * @SINCE_1_1.43
    * @return The number of textures in the TextureSet
    */
-  uint32_t GetTextureCount() const;
+  size_t GetTextureCount() const;
 
 public:
   /**