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 "Fix resource leaks in layouting." into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
image-loader
/
async-image-loader-impl.h
diff --git
a/dali-toolkit/internal/image-loader/async-image-loader-impl.h
b/dali-toolkit/internal/image-loader/async-image-loader-impl.h
index
fe4c73b
..
ce40f5a
100644
(file)
--- a/
dali-toolkit/internal/image-loader/async-image-loader-impl.h
+++ b/
dali-toolkit/internal/image-loader/async-image-loader-impl.h
@@
-23,6
+23,7
@@
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/image-loader/async-image-loader.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/image-loader/async-image-loader.h>
+#include <dali-toolkit/devel-api/image-loader/async-image-loader-devel.h>
#include <dali-toolkit/internal/image-loader/image-load-thread.h>
namespace Dali
#include <dali-toolkit/internal/image-loader/image-load-thread.h>
namespace Dali
@@
-63,6
+64,11
@@
public:
Toolkit::AsyncImageLoader::ImageLoadedSignalType& ImageLoadedSignal();
/**
Toolkit::AsyncImageLoader::ImageLoadedSignalType& ImageLoadedSignal();
/**
+ * @copydoc Toolkit::AsyncImageLoader::PixelBufferLoadedSignal
+ */
+ Toolkit::DevelAsyncImageLoader::PixelBufferLoadedSignalType& PixelBufferLoadedSignal();
+
+ /**
* @copydoc Toolkit::AsyncImageLoader::Cancel
*/
bool Cancel( uint32_t loadingTaskId );
* @copydoc Toolkit::AsyncImageLoader::Cancel
*/
bool Cancel( uint32_t loadingTaskId );
@@
-86,6
+92,7
@@
protected:
private:
Toolkit::AsyncImageLoader::ImageLoadedSignalType mLoadedSignal;
private:
Toolkit::AsyncImageLoader::ImageLoadedSignalType mLoadedSignal;
+ Toolkit::DevelAsyncImageLoader::PixelBufferLoadedSignalType mPixelBufferLoadedSignal;
ImageLoadThread mLoadThread;
uint32_t mLoadTaskId;
ImageLoadThread mLoadThread;
uint32_t mLoadTaskId;