/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
#include "async-image-loader-impl.h"
// EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/bitmap-loader.h>
#include <dali/integration-api/adaptors/adaptor.h>
namespace Dali
return internal;
}
-uint32_t AsyncImageLoader::Load( const std::string& url,
+uint32_t AsyncImageLoader::Load( const VisualUrl& url,
ImageDimensions dimensions,
FittingMode::Type fittingMode,
SamplingMode::Type samplingMode,
- bool orientationCorrection )
+ bool orientationCorrection,
+ DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad)
{
if( !mIsLoadThreadStarted )
{
mLoadThread.Start();
mIsLoadThreadStarted = true;
}
+ mLoadThread.AddTask( new LoadingTask( ++mLoadTaskId, url, dimensions, fittingMode, samplingMode, orientationCorrection, preMultiplyOnLoad ) );
- BitmapLoader loader = BitmapLoader::New( url, dimensions, fittingMode, samplingMode, orientationCorrection );
+ return mLoadTaskId;
+}
- mLoadThread.AddTask( new LoadingTask( ++mLoadTaskId, loader ) );
+uint32_t AsyncImageLoader::ApplyMask( Devel::PixelBuffer pixelBuffer,
+ Devel::PixelBuffer maskPixelBuffer,
+ float contentScale,
+ bool cropToMask )
+{
+ if( !mIsLoadThreadStarted )
+ {
+ mLoadThread.Start();
+ mIsLoadThreadStarted = true;
+ }
+ mLoadThread.AddTask( new LoadingTask( ++mLoadTaskId, pixelBuffer, maskPixelBuffer, contentScale, cropToMask ) );
return mLoadTaskId;
}
return mLoadedSignal;
}
+Toolkit::DevelAsyncImageLoader::PixelBufferLoadedSignalType& AsyncImageLoader::PixelBufferLoadedSignal()
+{
+ return mPixelBufferLoadedSignal;
+}
+
bool AsyncImageLoader::Cancel( uint32_t loadingTaskId )
{
return mLoadThread.CancelTask( loadingTaskId );
void AsyncImageLoader::ProcessLoadedImage()
{
- while( LoadingTask *next = mLoadThread.NextCompletedTask() )
+ while( LoadingTask *next = mLoadThread.NextCompletedTask() )
{
- mLoadedSignal.Emit( next->id, next->loader.GetPixelData() );
+ if( mPixelBufferLoadedSignal.GetConnectionCount() > 0 )
+ {
+ mPixelBufferLoadedSignal.Emit( next->id, next->pixelBuffer, next->isMaskTask );
+ }
+ else if( mLoadedSignal.GetConnectionCount() > 0 )
+ {
+ PixelData pixelData;
+ if( next->pixelBuffer )
+ {
+ pixelData = Devel::PixelBuffer::Convert( next->pixelBuffer );
+ }
+ mLoadedSignal.Emit( next->id, pixelData );
+ }
+
delete next;
}
}