Merge tizen_2.1 into tizen_2.2

Change-Id: I695e7edcdf330e616518b2826854bb884ce08ce3
Signed-off-by: EonseokLee <eonseok.lee@samsung.com>

diff --git a/inc/FMediaImage.h b/inc/FMediaImage.h
index 7c440cb..51c8023 100644 (file)
--- a/inc/FMediaImage.h
+++ b/inc/FMediaImage.h
@@ -486,8 +486,7 @@ public:
        Tizen::Base::ByteBuffer* ConvertN(const Tizen::Base::String& srcImagePath, ImageFormat destImageFormat) const;
 
        /**
-       * @{
-       * @if OSPDEPREC
+       * @cond OSPDEPREC
        * Compresses an encoded image file to reduce its size as per the specified limit. @n
        * The only supported compression format is JPEG.
        *
@@ -521,8 +520,7 @@ public:
        * @exception    E_SYSTEM                                A system error has occurred.
        * @exception    E_STORAGE_FULL          The file cannot be created because the file has reached its size limit.
        * @exception    E_OUT_OF_RANGE                  The specified size is out of range.
-       * @endif
-       * @}
+       * @endcond
        */
        result CompressJpeg(const Tizen::Base::String& srcImagePath, const Tizen::Base::String& destImagePath, int limitSize) const;