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
Disable premultiplied alpha when the Image is used
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
image-loader
/
async-image-loader-impl.cpp
diff --git
a/dali-toolkit/internal/image-loader/async-image-loader-impl.cpp
b/dali-toolkit/internal/image-loader/async-image-loader-impl.cpp
index
dd98ae3
..
6fe8eba
100644
(file)
--- a/
dali-toolkit/internal/image-loader/async-image-loader-impl.cpp
+++ b/
dali-toolkit/internal/image-loader/async-image-loader-impl.cpp
@@
-19,7
+19,7
@@
#include "async-image-loader-impl.h"
// EXTERNAL INCLUDES
#include "async-image-loader-impl.h"
// EXTERNAL INCLUDES
-#include <dali/integration-api/adaptor
s
/adaptor.h>
+#include <dali/integration-api/adaptor
-framework
/adaptor.h>
namespace Dali
{
namespace Dali
{
@@
-69,14
+69,15
@@
uint32_t AsyncImageLoader::Load( const VisualUrl& url,
uint32_t AsyncImageLoader::ApplyMask( Devel::PixelBuffer pixelBuffer,
Devel::PixelBuffer maskPixelBuffer,
float contentScale,
uint32_t AsyncImageLoader::ApplyMask( Devel::PixelBuffer pixelBuffer,
Devel::PixelBuffer maskPixelBuffer,
float contentScale,
- bool cropToMask )
+ bool cropToMask,
+ DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad)
{
if( !mIsLoadThreadStarted )
{
mLoadThread.Start();
mIsLoadThreadStarted = true;
}
{
if( !mIsLoadThreadStarted )
{
mLoadThread.Start();
mIsLoadThreadStarted = true;
}
- mLoadThread.AddTask( new LoadingTask( ++mLoadTaskId, pixelBuffer, maskPixelBuffer, contentScale, cropToMask ) );
+ mLoadThread.AddTask( new LoadingTask( ++mLoadTaskId, pixelBuffer, maskPixelBuffer, contentScale, cropToMask
, preMultiplyOnLoad
) );
return mLoadTaskId;
}
return mLoadTaskId;
}
@@
-107,7
+108,7
@@
void AsyncImageLoader::ProcessLoadedImage()
{
if( mPixelBufferLoadedSignal.GetConnectionCount() > 0 )
{
{
if( mPixelBufferLoadedSignal.GetConnectionCount() > 0 )
{
- mPixelBufferLoadedSignal.Emit( next->id, next->pixelBuffer
, next->isMaskTask
);
+ mPixelBufferLoadedSignal.Emit( next->id, next->pixelBuffer );
}
else if( mLoadedSignal.GetConnectionCount() > 0 )
{
}
else if( mLoadedSignal.GetConnectionCount() > 0 )
{