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
Allow ImageView padding to be set to Zero
[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
cb0311c
..
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
@@
-1,5
+1,5
@@
-#ifndef DALI_TOOLKIT_ASYNC_IMAGE_LOADER_IMPL_H
__
-#define DALI_TOOLKIT_ASYNC_IMAGE_LOADER_IMPL_H
__
+#ifndef DALI_TOOLKIT_ASYNC_IMAGE_LOADER_IMPL_H
+#define DALI_TOOLKIT_ASYNC_IMAGE_LOADER_IMPL_H
/*
* Copyright (c) 2016 Samsung Electronics Co., Ltd.
/*
* Copyright (c) 2016 Samsung Electronics Co., Ltd.
@@
-22,7
+22,8
@@
#include <dali/public-api/object/base-object.h>
// INTERNAL INCLUDES
#include <dali/public-api/object/base-object.h>
// INTERNAL INCLUDES
-#include <dali-toolkit/devel-api/image-loader/async-image-loader.h>
+#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
@@
-49,10
+50,10
@@
public:
static IntrusivePtr<AsyncImageLoader> New();
/**
static IntrusivePtr<AsyncImageLoader> New();
/**
- * @copydoc Toolkit::AsyncImageLoader::Load( const std::string&, ImageDimensions,FittingMode::Type, SamplingMode::Type, bool )
+ * @copydoc Toolkit::AsyncImageLoader::Load( const std::string&, ImageDimensions,
FittingMode::Type, SamplingMode::Type, bool )
*/
*/
- uint32_t Load( const
std::string
& url,
- ImageDimensions
size
,
+ uint32_t Load( const
VisualUrl
& url,
+ ImageDimensions
dimensions
,
FittingMode::Type fittingMode,
SamplingMode::Type samplingMode,
bool orientationCorrection );
FittingMode::Type fittingMode,
SamplingMode::Type samplingMode,
bool orientationCorrection );
@@
-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 );
@@
-85,32
+91,30
@@
protected:
~AsyncImageLoader();
private:
~AsyncImageLoader();
private:
-
Toolkit::AsyncImageLoader::ImageLoadedSignalType mLoadedSignal;
Toolkit::AsyncImageLoader::ImageLoadedSignalType mLoadedSignal;
+ Toolkit::DevelAsyncImageLoader::PixelBufferLoadedSignalType mPixelBufferLoadedSignal;
ImageLoadThread mLoadThread;
uint32_t mLoadTaskId;
bool mIsLoadThreadStarted;
ImageLoadThread mLoadThread;
uint32_t mLoadTaskId;
bool mIsLoadThreadStarted;
-
-
};
} // namespace Internal
};
} // namespace Internal
-inline const Internal::AsyncImageLoader& GetImplementation( const Toolkit::AsyncImageLoader&
loader
)
+inline const Internal::AsyncImageLoader& GetImplementation( const Toolkit::AsyncImageLoader&
handle
)
{
{
- DALI_ASSERT_ALWAYS(
loader
&& "AsyncImageLoader handle is empty" );
+ DALI_ASSERT_ALWAYS(
handle
&& "AsyncImageLoader handle is empty" );
- const BaseObject& object =
loader
.GetBaseObject();
+ const BaseObject& object =
handle
.GetBaseObject();
return static_cast<const Internal::AsyncImageLoader&>( object );
}
return static_cast<const Internal::AsyncImageLoader&>( object );
}
-inline Internal::AsyncImageLoader& GetImplementation( Toolkit::AsyncImageLoader&
loader
)
+inline Internal::AsyncImageLoader& GetImplementation( Toolkit::AsyncImageLoader&
handle
)
{
{
- DALI_ASSERT_ALWAYS(
loader
&& "AsyncImageLoader handle is empty" );
+ DALI_ASSERT_ALWAYS(
handle
&& "AsyncImageLoader handle is empty" );
- BaseObject& object =
loader
.GetBaseObject();
+ BaseObject& object =
handle
.GetBaseObject();
return static_cast<Internal::AsyncImageLoader&>( object );
}
return static_cast<Internal::AsyncImageLoader&>( object );
}
@@
-119,4
+123,4
@@
inline Internal::AsyncImageLoader& GetImplementation( Toolkit::AsyncImageLoader&
} // namespace Dali
} // namespace Dali
-#endif /
* DALI_TOOLKIT_ASYNC_IMAGE_LOADER_IMPL_H__ */
+#endif /
/ DALI_TOOLKIT_ASYNC_IMAGE_LOADER_IMPL_H