X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fimage-loader%2Fsync-image-loader.h;h=732c9370b607ddf7f4dfb5378c04040650bd74d6;hp=3450ba9a5eba390fa3530d9e8ea9bb0e8e0dd219;hb=a5d3dfece340236cd0b6c2ea98890e90b075c966;hpb=7386b0e7cc501917168284f388353dab660db58f 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 new mode 100755 index 3450ba9..732c937 --- 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 /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 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. @@ -22,6 +22,9 @@ #include #include +// INTERNAL INCLUDES +#include + namespace Dali { @@ -49,46 +52,49 @@ namespace SyncImageLoader */ /** - * @brief Load an image synchronously. + * @brief Loads an image synchronously. * Note: When using this method, the following defaults will be used: * fittingMode = FittingMode::DEFAULT * samplingMode = SamplingMode::BOX_THEN_LINEAR * orientationCorrection = true * * @SINCE_1_2_14 - * - * @param[in] url The URL of the image file to load. - * @return A PixelData object containing the image, or an invalid object on failure. + * @REMARK_INTERNET + * @REMARK_STORAGE + * @param[in] url The URL of the image file to load + * @return A PixelData object containing the image, or an invalid object on failure */ -PixelData Load( const std::string& url ); +DALI_TOOLKIT_API PixelData Load( const std::string& url ); /** - * @brief Load an image synchronously by specifying the target dimensions. + * @brief Loads an image synchronously by specifying the target dimensions. * Note: When using this method, the following defaults will be used: * fittingMode = FittingMode::DEFAULT * samplingMode = SamplingMode::BOX_THEN_LINEAR * orientationCorrection = true * * @SINCE_1_2_14 - * - * @param[in] url The URL of the image file to load. - * @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. + * @REMARK_INTERNET + * @REMARK_STORAGE + * @param[in] url The URL of the image file to load + * @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 */ -PixelData Load( const std::string& url, ImageDimensions dimensions ); +DALI_TOOLKIT_API PixelData Load( const std::string& url, ImageDimensions dimensions ); /** - * @brief Load an image synchronously by specifying the target dimensions and options. + * @brief Loads an image synchronously by specifying the target dimensions and options. * @SINCE_1_2_14 - * - * @param[in] url The URL of the image file to load. - * @param[in] dimensions The width and height to fit the loaded image to. - * @param[in] fittingMode The method used to fit the shape of the image before loading to the shape defined by the size parameter. - * @param[in] samplingMode The filtering method used when sampling pixels from the input image while fitting it to desired size. - * @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. + * @REMARK_INTERNET + * @REMARK_STORAGE + * @param[in] url The URL of the image file to load + * @param[in] dimensions The width and height to fit the loaded image to + * @param[in] fittingMode The method used to fit the shape of the image before loading to the shape defined by the size parameter + * @param[in] samplingMode The filtering method used when sampling pixels from the input image while fitting it to desired size + * @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 */ -PixelData Load( const std::string& url, +DALI_TOOLKIT_API PixelData Load( const std::string& url, ImageDimensions dimensions, FittingMode::Type fittingMode, SamplingMode::Type samplingMode,