X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Fpublic-api%2Fimages%2Fimage-operations.h;h=8642976cfd4d91b1d207b78aca5a1a09e0e5fab0;hb=HEAD;hp=765ef28891d8e6fd2abdc5581c07fe4bfe797c06;hpb=eb6f5959d8f8e03bf8bfba6c3091bdb962ec0830;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/public-api/images/image-operations.h b/dali/public-api/images/image-operations.h index 765ef28..8642976 100644 --- a/dali/public-api/images/image-operations.h +++ b/dali/public-api/images/image-operations.h @@ -1,8 +1,8 @@ -#ifndef __DALI_IMAGE_OPERATIONS_H__ -#define __DALI_IMAGE_OPERATIONS_H__ +#ifndef DALI_IMAGE_OPERATIONS_H +#define DALI_IMAGE_OPERATIONS_H /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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. @@ -37,7 +37,7 @@ namespace Dali * This can only be used for images of up to 65535 x 65535 pixels. * @SINCE_1_0.0 */ -typedef Dali::Uint16Pair ImageDimensions; +using ImageDimensions = Dali::Uint16Pair; /** * @brief Fitting options, used when resizing images to fit desired dimensions. @@ -49,30 +49,33 @@ typedef Dali::Uint16Pair ImageDimensions; */ namespace FittingMode { - /** +/** * @brief Enumeration for FittingMode type. * @SINCE_1_0.0 */ - enum Type - { - SHRINK_TO_FIT, ///< Fit full image inside desired width & height, potentially not - /// filling one of either the desired image width or height with - /// pixels. - /// @SINCE_1_0.0 - SCALE_TO_FILL, ///< Image fills whole desired width & height with image data. The - /// image is centred in the desired dimensions, exactly touching - /// in one dimension, with image regions outside the other desired - /// dimension cropped away. - /// @SINCE_1_0.0 - FIT_WIDTH, ///< Image fills whole width. Height is scaled proportionately to - /// maintain aspect ratio. - /// @SINCE_1_0.0 - FIT_HEIGHT ///< Image fills whole height. Width is scaled proportionately to - /// maintain aspect ratio. - /// @SINCE_1_0.0 - }; - const Type DEFAULT = SHRINK_TO_FIT; -} +enum Type +{ + SHRINK_TO_FIT, ///< Fit full image inside desired width & height, potentially not + /// filling one of either the desired image width or height with + /// pixels. + /// @SINCE_1_0.0 + SCALE_TO_FILL, ///< Image fills whole desired width & height with image data. The + /// image is centred in the desired dimensions, exactly touching + /// in one dimension, with image regions outside the other desired + /// dimension cropped away. + /// @SINCE_1_0.0 + FIT_WIDTH, ///< Image fills whole width. Height is scaled proportionately to + /// maintain aspect ratio. + /// @SINCE_1_0.0 + FIT_HEIGHT, ///< Image fills whole height. Width is scaled proportionately to + /// maintain aspect ratio. + /// @SINCE_1_0.0 + VISUAL_FITTING /// < Image is scaled to fit within the desired dimensions. + /// maintain aspect ratio. + /// @SINCE_2_3.24 +}; +const Type DEFAULT = SHRINK_TO_FIT; +} // namespace FittingMode /** * @brief Filtering options, used when resizing images to sample original pixels. @@ -88,44 +91,44 @@ namespace FittingMode */ namespace SamplingMode { - /** +/** * @brief Enumeration for SamplingMode type. * @SINCE_1_0.0 */ - enum Type - { - BOX, ///< Iteratively box filter to generate an image of 1/2, 1/4, - /// 1/8, etc width and height and approximately the desired - /// size. This is the default. - /// @SINCE_1_0.0 - NEAREST, ///< For each output pixel, read one input pixel. - /// @SINCE_1_0.0 - LINEAR, ///< For each output pixel, read a quad of four input pixels - /// and write a weighted average of them. - /// @SINCE_1_0.0 - BOX_THEN_NEAREST, ///< Iteratively box filter to generate an image of 1/2, 1/4, - /// 1/8 etc width and height and approximately the desired - /// size, then for each output pixel, read one pixel from the - /// last level of box filtering. - /// @SINCE_1_0.0 - BOX_THEN_LINEAR, ///< Iteratively box filter to almost the right size, then for - /// each output pixel, read four pixels from the last level of - /// box filtering and write their weighted average. - /// @SINCE_1_0.0 - NO_FILTER, ///< No filtering is performed. If the SCALE_TO_FILL scaling mode - /// is enabled, the borders of the image may be trimmed to - /// match the aspect ratio of the desired dimensions. - /// @SINCE_1_0.0 - DONT_CARE ///< For caching algorithms where a client strongly prefers a - /// cache-hit to reuse a cached image. - /// @SINCE_1_0.0 - }; - const Type DEFAULT = BOX; -} +enum Type +{ + BOX, ///< Iteratively box filter to generate an image of 1/2, 1/4, + /// 1/8, etc width and height and approximately the desired + /// size. This is the default. + /// @SINCE_1_0.0 + NEAREST, ///< For each output pixel, read one input pixel. + /// @SINCE_1_0.0 + LINEAR, ///< For each output pixel, read a quad of four input pixels + /// and write a weighted average of them. + /// @SINCE_1_0.0 + BOX_THEN_NEAREST, ///< Iteratively box filter to generate an image of 1/2, 1/4, + /// 1/8 etc width and height and approximately the desired + /// size, then for each output pixel, read one pixel from the + /// last level of box filtering. + /// @SINCE_1_0.0 + BOX_THEN_LINEAR, ///< Iteratively box filter to almost the right size, then for + /// each output pixel, read four pixels from the last level of + /// box filtering and write their weighted average. + /// @SINCE_1_0.0 + NO_FILTER, ///< No filtering is performed. If the SCALE_TO_FILL scaling mode + /// is enabled, the borders of the image may be trimmed to + /// match the aspect ratio of the desired dimensions. + /// @SINCE_1_0.0 + DONT_CARE ///< For caching algorithms where a client strongly prefers a + /// cache-hit to reuse a cached image. + /// @SINCE_1_0.0 +}; +const Type DEFAULT = BOX; +} // namespace SamplingMode /** * @} */ } // namespace Dali -#endif // __DALI_IMAGE_OPERATIONS_H__ +#endif // DALI_IMAGE_OPERATIONS_H