Revert "Updates following rename of PropertyBuffer"

[platform/core/uifw/dali-demo.git] / shared / utility.h

diff --git a/shared/utility.h b/shared/utility.h
index 3ecab6d..7c31dff 100644 (file)
--- a/shared/utility.h
+++ b/shared/utility.h
@@ -2,7 +2,7 @@
 #define DALI_DEMO_UTILITY_H
 
 /*
- * Copyright (c) 2016 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.
@@ -21,6 +21,7 @@
 #include <dali/dali.h>
 #include <dali/public-api/rendering/geometry.h>
 #include <dali/public-api/rendering/texture.h>
+#include <dali/public-api/math/uint-16-pair.h>
 #include <dali/devel-api/adaptor-framework/image-loading.h>
 
 namespace DemoHelper
@@ -29,9 +30,10 @@ namespace DemoHelper
 Dali::Texture LoadTexture( const char* imagePath,
                            Dali::ImageDimensions size = Dali::ImageDimensions(),
                            Dali::FittingMode::Type fittingMode = Dali::FittingMode::DEFAULT,
-                           Dali::SamplingMode::Type samplingMode = Dali::SamplingMode::DEFAULT )
+                           Dali::SamplingMode::Type samplingMode = Dali::SamplingMode::DEFAULT,
+                           bool orientationCorrection = true )
 {
-  Dali::Devel::PixelBuffer pixelBuffer = LoadImageFromFile(imagePath, size, fittingMode, samplingMode);
+  Dali::Devel::PixelBuffer pixelBuffer = LoadImageFromFile(imagePath, size, fittingMode, samplingMode, orientationCorrection );
   Dali::Texture texture  = Dali::Texture::New( Dali::TextureType::TEXTURE_2D,
                                                pixelBuffer.GetPixelFormat(),
                                                pixelBuffer.GetWidth(),
@@ -43,10 +45,9 @@ Dali::Texture LoadTexture( const char* imagePath,
   return texture;
 }
 
-Dali::Texture LoadStageFillingTexture( const char* imagePath )
+Dali::Texture LoadWindowFillingTexture( Dali::Uint16Pair size, const char* imagePath )
 {
-  Dali::Vector2 stageSize = Dali::Stage::GetCurrent().GetSize();
-  return LoadTexture( imagePath, Dali::ImageDimensions( stageSize.x, stageSize.y ), Dali::FittingMode::SCALE_TO_FILL, Dali::SamplingMode::BOX_THEN_LINEAR );
+  return LoadTexture( imagePath, size, Dali::FittingMode::SCALE_TO_FILL, Dali::SamplingMode::BOX_THEN_LINEAR );
 }
 
 Dali::Geometry CreateTexturedQuad()