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 71a2150..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.
@@ -19,72 +19,35 @@
  */
 
 #include <dali/dali.h>
-#include <dali/devel-api/images/atlas.h>
-#include <dali/devel-api/adaptor-framework/bitmap-loader.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
 {
 
-Dali::PixelData LoadPixelData( const char* imagePath,
-                               Dali::ImageDimensions size,
-                               Dali::FittingMode::Type fittingMode,
-                               Dali::SamplingMode::Type samplingMode )
-{
-  Dali::BitmapLoader loader = Dali::BitmapLoader::New( imagePath, size, fittingMode, samplingMode );
-  loader.Load();
-  return loader.GetPixelData();
-}
-
-
-Dali::Atlas LoadImage( const char* imagePath,
-                       Dali::ImageDimensions size = Dali::ImageDimensions(),
-                       Dali::FittingMode::Type fittingMode = Dali::FittingMode::DEFAULT,
-                       Dali::SamplingMode::Type samplingMode = Dali::SamplingMode::DEFAULT )
-{
-  Dali::PixelData pixelData = LoadPixelData(imagePath, size, fittingMode, samplingMode);
-  Dali::Atlas image  =Dali:: Atlas::New( pixelData.GetWidth(), pixelData.GetHeight(), pixelData.GetPixelFormat() );
-  image.Upload( pixelData, 0u, 0u );
-
-  return image;
-}
-
 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::PixelData pixelData = LoadPixelData(imagePath, size, fittingMode, samplingMode);
+  Dali::Devel::PixelBuffer pixelBuffer = LoadImageFromFile(imagePath, size, fittingMode, samplingMode, orientationCorrection );
   Dali::Texture texture  = Dali::Texture::New( Dali::TextureType::TEXTURE_2D,
-                                               pixelData.GetPixelFormat(),
-                                               pixelData.GetWidth(),
-                                               pixelData.GetHeight() );
+                                               pixelBuffer.GetPixelFormat(),
+                                               pixelBuffer.GetWidth(),
+                                               pixelBuffer.GetHeight() );
+
+  Dali::PixelData pixelData = Dali::Devel::PixelBuffer::Convert(pixelBuffer);
   texture.Upload( pixelData );
 
   return texture;
 }
 
-/**
- * @brief Load an bitmap resource.
- *
- * If it is required to scaled-down to no more than the stage dimensions,
- * uses image scaling mode FittingMode::SCALE_TO_FILL to resize the image at
- * load time to cover the entire stage with pixels with no borders,
- * and filter mode BOX_THEN_LINEAR to sample the image with
- * maximum quality.
- */
-
-Dali::Atlas LoadStageFillingImage( const char* imagePath )
-{
-  Dali::Vector2 stageSize = Dali::Stage::GetCurrent().GetSize();
-  return LoadImage( imagePath, Dali::ImageDimensions( stageSize.x, stageSize.y ), Dali::FittingMode::SCALE_TO_FILL, Dali::SamplingMode::BOX_THEN_LINEAR );
-}
-
-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()
@@ -112,7 +75,7 @@ Dali::Geometry CreateTexturedQuad()
   //Create the geometry
   Dali::Geometry geometry = Dali::Geometry::New();
   geometry.AddVertexBuffer( vertexBuffer );
-  geometry.SetGeometryType(Dali::Geometry::TRIANGLE_STRIP );
+  geometry.SetType(Dali::Geometry::TRIANGLE_STRIP );
 
   return geometry;
 }