(GCC 6.2) Remove unused functions from automated tests

[platform/core/uifw/dali-core.git] / dali / internal / event / images / image-factory.cpp

diff --git a/dali/internal/event/images/image-factory.cpp b/dali/internal/event/images/image-factory.cpp
index 1e3031b..88d24a6 100644 (file)
--- a/dali/internal/event/images/image-factory.cpp
+++ b/dali/internal/event/images/image-factory.cpp
@@ -23,7 +23,7 @@
 #include <dali/integration-api/platform-abstraction.h>
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/common/constants.h>
-#include <dali/public-api/common/hash.h>
+#include <dali/devel-api/common/hash.h>
 #include <dali/public-api/images/resource-image.h>
 #include <dali/internal/event/common/thread-local-storage.h>
 #include <dali/internal/event/common/notification-manager.h>
@@ -118,8 +118,6 @@ ResourceTicketPtr ImageFactory::Load( Request& request )
 // new resource of size (96, 96), but reloading Req1 would load a scaled down version
 ResourceTicketPtr ImageFactory::Reload( Request& request )
 {
-  DALI_ASSERT_ALWAYS( &request );
-
   // go through requests, check real size and attributes again. If different, update related ticket.
   ResourceTicketPtr ticket;
 
@@ -247,7 +245,9 @@ const std::string& ImageFactory::GetRequestPath( const ImageFactoryCache::Reques
     return request->url;
   }
 
-  return String::EMPTY;
+  // Only create empty string if required
+  static std::string empty;
+  return empty;
 }
 
 const ImageAttributes& ImageFactory::GetActualAttributes( const ResourceTicketPtr& ticket ) const
@@ -311,12 +311,12 @@ bool ImageFactory::CompareAttributes( const ImageAttributes& requested,
   // do not load image resource again if there is a similar resource loaded:
   // see explanation in image.h of what is deemed compatible
   return (requested.GetScalingMode() ==  actual.GetScalingMode()) &&
-          (
-            (requested.GetFilterMode() == actual.GetFilterMode()) ||
-            (requested.GetFilterMode() == SamplingMode::DONT_CARE)
-          ) &&
-          (fabsf(requested.GetWidth()  -  actual.GetWidth())  <= actual.GetWidth()  * mMaxScale) &&
-          (fabsf(requested.GetHeight() -  actual.GetHeight()) <= actual.GetHeight() * mMaxScale);
+    (
+      (requested.GetFilterMode() == actual.GetFilterMode()) ||
+      (requested.GetFilterMode() == SamplingMode::DONT_CARE)
+      ) &&
+    (fabsf(static_cast<float>(requested.GetWidth())  -  static_cast<float>(actual.GetWidth()))  <= actual.GetWidth()  * mMaxScale) &&
+    (fabsf(static_cast<float>(requested.GetHeight()) -  static_cast<float>(actual.GetHeight())) <= actual.GetHeight() * mMaxScale);
 }
 
 Request* ImageFactory::InsertNewRequest( ResourceId resourceId, const std::string& filename, std::size_t urlHash, const ImageAttributes* attr )