projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Divide Render() into small apis" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
image-loader
/
async-image-loader-devel.cpp
diff --git
a/dali-toolkit/devel-api/image-loader/async-image-loader-devel.cpp
b/dali-toolkit/devel-api/image-loader/async-image-loader-devel.cpp
index
3bd3368
..
e9b7744
100644
(file)
--- a/
dali-toolkit/devel-api/image-loader/async-image-loader-devel.cpp
+++ b/
dali-toolkit/devel-api/image-loader/async-image-loader-devel.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 20
19
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-24,6
+24,13
@@
namespace Toolkit
namespace DevelAsyncImageLoader
{
namespace DevelAsyncImageLoader
{
+uint32_t LoadAnimatedImage( AsyncImageLoader asyncImageLoader,
+ Dali::AnimatedImageLoading animatedImageLoading,
+ uint32_t frameIndex )
+{
+ return GetImplementation( asyncImageLoader ).LoadAnimatedImage( animatedImageLoading, frameIndex );
+}
+
uint32_t Load( AsyncImageLoader asyncImageLoader,
const std::string& url,
ImageDimensions dimensions,
uint32_t Load( AsyncImageLoader asyncImageLoader,
const std::string& url,
ImageDimensions dimensions,
@@
-39,9
+46,10
@@
uint32_t ApplyMask( AsyncImageLoader asyncImageLoader,
Devel::PixelBuffer pixelBuffer,
Devel::PixelBuffer maskPixelBuffer,
float contentScale,
Devel::PixelBuffer pixelBuffer,
Devel::PixelBuffer maskPixelBuffer,
float contentScale,
- bool cropToMask )
+ bool cropToMask,
+ DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad )
{
{
- return GetImplementation( asyncImageLoader ).ApplyMask( pixelBuffer, maskPixelBuffer, contentScale, cropToMask );
+ return GetImplementation( asyncImageLoader ).ApplyMask( pixelBuffer, maskPixelBuffer, contentScale, cropToMask
, preMultiplyOnLoad
);
}
PixelBufferLoadedSignalType& PixelBufferLoadedSignal( AsyncImageLoader asyncImageLoader )
}
PixelBufferLoadedSignalType& PixelBufferLoadedSignal( AsyncImageLoader asyncImageLoader )