[dali_2.3.24] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / image-loader / image-url.cpp

diff --git a/dali-toolkit/public-api/image-loader/image-url.cpp b/dali-toolkit/public-api/image-loader/image-url.cpp
index 65b9601..35d4c77 100644 (file)
--- a/dali-toolkit/public-api/image-loader/image-url.cpp
+++ b/dali-toolkit/public-api/image-loader/image-url.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 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.
@@ -32,9 +32,15 @@ ImageUrl::~ImageUrl()
 {
 }
 
-ImageUrl ImageUrl::New(Texture& texture)
+ImageUrl ImageUrl::New(Texture& texture, bool preMultiplied)
 {
-  Toolkit::Internal::ImageUrlPtr internal = Toolkit::Internal::ImageUrl::New(texture);
+  Toolkit::Internal::ImageUrlPtr internal = Toolkit::Internal::ImageUrl::New(texture, preMultiplied);
+  return ImageUrl(internal.Get());
+}
+
+ImageUrl ImageUrl::New(const EncodedImageBuffer& encodedImageBuffer)
+{
+  Toolkit::Internal::ImageUrlPtr internal = Toolkit::Internal::ImageUrl::New(encodedImageBuffer);
   return ImageUrl(internal.Get());
 }
 
@@ -47,9 +53,9 @@ ImageUrl::ImageUrl(const ImageUrl& rhs) = default;
 
 ImageUrl& ImageUrl::operator=(const ImageUrl& url) = default;
 
-ImageUrl::ImageUrl(ImageUrl&& rhs) = default;
+ImageUrl::ImageUrl(ImageUrl&& rhs) noexcept = default;
 
-ImageUrl& ImageUrl::operator=(ImageUrl&& rhs) = default;
+ImageUrl& ImageUrl::operator=(ImageUrl&& rhs) noexcept = default;
 
 const std::string& ImageUrl::GetUrl() const
 {