X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fcommon%2Fimage-attributes.cpp;h=b13b530fb1889f536e5e60b77445d915abb67587;hb=01c39de261f6eb4e759c7a249e5d67dfef83bca2;hp=134debc32f0b3506757fed24f2f5a5a2b55230f8;hpb=74e4898fc44939d934083e30b32012dd0fc0b8ce;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/common/image-attributes.cpp b/dali/internal/common/image-attributes.cpp old mode 100644 new mode 100755 index 134debc..b13b530 --- a/dali/internal/common/image-attributes.cpp +++ b/dali/internal/common/image-attributes.cpp @@ -70,9 +70,8 @@ struct ImageAttributes::ImageAttributesImpl unsigned int width : 16; ///< image width in pixels unsigned int height : 16; ///< image height in pixels ScalingMode scaling : 3; ///< scaling option, ShrinkToFit is default - FilterMode filtering : 3; ///< filtering option. Box is the default + FilterMode filtering : 4; ///< filtering option. Box is the default bool mOrientationCorrection : 1; ///< If true, image pixels are reordered according to orientation metadata on load. - bool isDistanceField : 1; ///< true, if the image is a distancefield. Default is false. }; @@ -184,12 +183,6 @@ ImageAttributes ImageAttributes::New(unsigned int imageWidth, unsigned int image */ bool operator<(const ImageAttributes& a, const ImageAttributes& b) { - // Bail out if one is distance field and the other is not. - if (a.impl->isDistanceField != b.impl->isDistanceField) - { - return a.impl->isDistanceField < b.impl->isDistanceField; - } - if (a.impl->width != b.impl->width) { return a.impl->width < b.impl->width;