merge with master

[platform/framework/native/image.git] / src / inc / FMedia_ImageImpl.h

diff --git a/src/inc/FMedia_ImageImpl.h b/src/inc/FMedia_ImageImpl.h
index 455bb95..48ce65c 100644 (file)
--- a/src/inc/FMedia_ImageImpl.h
+++ b/src/inc/FMedia_ImageImpl.h
@@ -54,11 +54,11 @@ public:
         * @see Image::DecodeToBitmapN()
         */
        static Tizen::Graphics::Bitmap*
-               DecodeToBitmapN(const Tizen::Base::String& srcImagePath,
-                                               Tizen::Graphics::BitmapPixelFormat pixelFormat = Tizen::Graphics::BITMAP_PIXEL_FORMAT_ARGB8888,
-                                               const Tizen::Graphics::Dimension &desDim = Tizen::Graphics::Dimension(0, 0),
-                                               Tizen::Graphics::BufferScaling bufferScaling = Tizen::Graphics::BUFFER_SCALING_AUTO,
-                                               ImageFormat imgFormat = IMG_FORMAT_NONE, bool keepAspectRatio = true);
+               DecodeToBitmapN(const Tizen::Base::String& srcImagePath, Tizen::Graphics::BitmapPixelFormat pixelFormat);
+
+       static Tizen::Graphics::Bitmap*
+               DecodeToBitmapN(const Tizen::Base::ByteBuffer& srcImageBuf, Tizen::Graphics::BitmapPixelFormat pixelFormat);
+
        /**
         * Decodes an image data into the decoded bitmap container with resizing. @n
         * The currently supported decoding formats are JPEG, GIF, PNG, BMP, TIFF, and WBMP.
@@ -66,12 +66,35 @@ public:
         *
         * @see Image::DecodeToBitmapN()
         */
-       static Tizen::Graphics::Bitmap*
+       /*static Tizen::Graphics::Bitmap*
                DecodeToBitmapN(const Tizen::Base::ByteBuffer& srcImageBuf,
                                                Tizen::Graphics::BitmapPixelFormat pixelFormat = Tizen::Graphics::BITMAP_PIXEL_FORMAT_ARGB8888,
                                                const Tizen::Graphics::Dimension &dim = Tizen::Graphics::Dimension(0, 0),
                                                Tizen::Graphics::BufferScaling bufferScaling = Tizen::Graphics::BUFFER_SCALING_AUTO,
-                                               ImageFormat imgFormat = IMG_FORMAT_NONE, bool keepAspectRatio = true);
+                                               ImageFormat imgFormat = IMG_FORMAT_NONE, bool keepAspectRatio = true);*/
+
+       static Tizen::Graphics::Bitmap*
+               DecodeToBitmapN(const Tizen::Base::String& srcImagePath,
+                                               Tizen::Graphics::BitmapPixelFormat pixelFormat,
+                                               const Tizen::Graphics::Dimension &destDim,
+                                               Tizen::Graphics::BufferScaling bufferScaling = Tizen::Graphics::BUFFER_SCALING_AUTO);
+
+       static Tizen::Graphics::Bitmap*
+               DecodeToBitmapN(const Tizen::Base::ByteBuffer& srcImageBuf,
+                                               Tizen::Graphics::BitmapPixelFormat pixelFormat,
+                                               const Tizen::Graphics::Dimension &destDim,
+                                               Tizen::Graphics::BufferScaling bufferScaling = Tizen::Graphics::BUFFER_SCALING_AUTO);
+
+       static Tizen::Graphics::Bitmap*
+               DecodeToBitmapN(const Tizen::Base::ByteBuffer& srcImageBuf,
+                                               Tizen::Graphics::BitmapPixelFormat pixelFormat,
+                                               const Tizen::Graphics::FloatDimension &destDim);
+
+       static Tizen::Graphics::Bitmap*
+               DecodeToBitmapN(const Tizen::Base::String& srcImagePath,
+                                               Tizen::Graphics::BitmapPixelFormat pixelFormat,
+                                               const Tizen::Graphics::FloatDimension &destDim);
+
 
        /**
         * Decodes an image data into the decoded byte buffer container without resizing. @n