merge with master

[framework/osp/image-core.git] / src / inc / FMedia_ImageDecoder.h

diff --git a/src/inc/FMedia_ImageDecoder.h b/src/inc/FMedia_ImageDecoder.h
index 0d6401e..a9cff01 100644 (file)
--- a/src/inc/FMedia_ImageDecoder.h
+++ b/src/inc/FMedia_ImageDecoder.h
@@ -70,7 +70,7 @@ public:
         */
        static Tizen::Base::ByteBuffer*
                DecodeToBufferN(const Tizen::Base::String& filePath, MediaPixelFormat pixelFormat,
-                                               int &width, int &height);
+                                               int &width, int &height, bool autoRotate = false);
 
        /**
         * Decodes a region of image data into the decoded byte buffer container without resizing. @n
@@ -159,7 +159,8 @@ public:
         */
        result Construct(const Tizen::Base::String& srcPath,
                                         MediaPixelFormat pixelFormat = MEDIA_PIXEL_FORMAT_BGRA8888,
-                                        ImageFormat imgFormat = IMG_FORMAT_NONE);
+                                        ImageFormat imgFormat = IMG_FORMAT_NONE,
+                                        bool autoRotate = false);
 
        /**
         * Initializes this instance of ImageDecode.
@@ -183,7 +184,7 @@ public:
         * @exception   E_SUCCESS       The method is successful.
         * @remark
         */
-       byte* DecodeN(int& outLength);
+       byte* DecodeN(int& outLength, ImageScalingMethod scalingMethod = IMAGE_SCALING_METHOD_FAST_BILINEAR);
 
        /**
         * Decodes image buffer.
@@ -266,6 +267,8 @@ private:
                int width;
                int height;
        } __outDim;
+       bool __autoRotate;
+       int __orientationInfo;
        MediaPixelFormat __pixelFormat;
        std::unique_ptr<Tizen::Base::ByteBuffer> __pSrcBuf;