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
Add '@addtogroup' tag to generate doxygen page
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
image-loader
/
sync-image-loader.h
diff --git
a/dali-toolkit/public-api/image-loader/sync-image-loader.h
b/dali-toolkit/public-api/image-loader/sync-image-loader.h
old mode 100644
(file)
new mode 100755
(executable)
index
9d0a820
..
7d52867
--- a/
dali-toolkit/public-api/image-loader/sync-image-loader.h
+++ b/
dali-toolkit/public-api/image-loader/sync-image-loader.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_SYNC_IMAGE_LOADER_H
/*
#define DALI_TOOLKIT_SYNC_IMAGE_LOADER_H
/*
- * Copyright (c) 201
6
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
8
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.
@@
-22,12
+22,20
@@
#include <dali/public-api/images/image-operations.h>
#include <dali/public-api/images/pixel-data.h>
#include <dali/public-api/images/image-operations.h>
#include <dali/public-api/images/pixel-data.h>
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
+
namespace Dali
{
namespace Toolkit
{
namespace Dali
{
namespace Toolkit
{
+/**
+ * @addtogroup dali_toolkit_image_loader
+ * @{
+ */
+
namespace SyncImageLoader
{
namespace SyncImageLoader
{
@@
-61,7
+69,7
@@
namespace SyncImageLoader
* @param[in] url The URL of the image file to load
* @return A PixelData object containing the image, or an invalid object on failure
*/
* @param[in] url The URL of the image file to load
* @return A PixelData object containing the image, or an invalid object on failure
*/
-DALI_
IMPOR
T_API PixelData Load( const std::string& url );
+DALI_
TOOLKI
T_API PixelData Load( const std::string& url );
/**
* @brief Loads an image synchronously by specifying the target dimensions.
/**
* @brief Loads an image synchronously by specifying the target dimensions.
@@
-77,7
+85,7
@@
DALI_IMPORT_API PixelData Load( const std::string& url );
* @param[in] dimensions The width and height to fit the loaded image to
* @return A PixelData object containing the image, or an invalid object on failure
*/
* @param[in] dimensions The width and height to fit the loaded image to
* @return A PixelData object containing the image, or an invalid object on failure
*/
-DALI_
IMPOR
T_API PixelData Load( const std::string& url, ImageDimensions dimensions );
+DALI_
TOOLKI
T_API PixelData Load( const std::string& url, ImageDimensions dimensions );
/**
* @brief Loads an image synchronously by specifying the target dimensions and options.
/**
* @brief Loads an image synchronously by specifying the target dimensions and options.
@@
-91,7
+99,7
@@
DALI_IMPORT_API PixelData Load( const std::string& url, ImageDimensions dimensio
* @param[in] orientationCorrection Reorient the image to respect any orientation metadata in its header
* @return A PixelData object containing the image, or an invalid object on failure
*/
* @param[in] orientationCorrection Reorient the image to respect any orientation metadata in its header
* @return A PixelData object containing the image, or an invalid object on failure
*/
-DALI_
IMPOR
T_API PixelData Load( const std::string& url,
+DALI_
TOOLKI
T_API PixelData Load( const std::string& url,
ImageDimensions dimensions,
FittingMode::Type fittingMode,
SamplingMode::Type samplingMode,
ImageDimensions dimensions,
FittingMode::Type fittingMode,
SamplingMode::Type samplingMode,
@@
-99,6
+107,9
@@
DALI_IMPORT_API PixelData Load( const std::string& url,
} // namespace SyncImageLoader
} // namespace SyncImageLoader
+/**
+ * @}
+ */
} // namespace Toolkit
} // namespace Dali
} // namespace Toolkit
} // namespace Dali