Merge tizen_2.1 into tizen_2.2

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

diff --git a/src/FMedia_GifDecoder.cpp b/src/FMedia_GifDecoder.cpp
index 76cb69b..c730d47 100644 (file)
--- a/src/FMedia_GifDecoder.cpp
+++ b/src/FMedia_GifDecoder.cpp
@@ -163,6 +163,8 @@ _GifDecoder::ConstructBuffer(MediaPixelFormat pixelFormat)
 
        __srcWidth = pDataPtr[7] << 8 | pDataPtr[6];
        __srcHeight = pDataPtr[9] << 8 | pDataPtr[8];
+
+       /*
        for (loopIndex = 10; loopIndex < dataSize; loopIndex++)
        {
                if (pDataPtr[loopIndex] == 0x2c)
@@ -184,7 +186,7 @@ _GifDecoder::ConstructBuffer(MediaPixelFormat pixelFormat)
                        }
                }
        }
-
+       */
        __srcWidth = __pDec->SWidth;
        __srcHeight = __pDec->SHeight;
        r = E_SUCCESS;
@@ -499,7 +501,7 @@ _GifDecoder::DecodeN(int& outLength)
                        //ext[i++] = extension ? *extension : 0;
                        if (extCode == GRAPHICS_EXT_FUNC_CODE)
                        {
-                               if ((pExt[1] && 0x01) == true)
+                               if ((pExt[1] & 0x01) == true)
                                {
                                        __transparent = true;
                                }