From: dongsug.song Date: Tue, 23 Feb 2016 13:10:43 +0000 (+0900) Subject: Revert "[3.0] giflib upgrade" X-Git-Tag: submit/tizen/20160226.050735~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F28%2F60128%2F1;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git Revert "[3.0] giflib upgrade" This reverts commit 08bbc232382cacf1c106543fe5db51996bbc665e. Change-Id: I1a715832b2476c540c7f7a59c965574259323a91 --- diff --git a/platform-abstractions/tizen/image-loaders/loader-gif.cpp b/platform-abstractions/tizen/image-loaders/loader-gif.cpp index ab27fce..cac1bff 100644 --- a/platform-abstractions/tizen/image-loaders/loader-gif.cpp +++ b/platform-abstractions/tizen/image-loaders/loader-gif.cpp @@ -47,15 +47,10 @@ struct AutoCleanupGif if(NULL != gifInfo) { // clean up GIF resources - int errorCode = 0; //D_GIF_SUCCEEDED is 0 - DGifCloseFile(gifInfo, &errorCode); - - if( errorCode ) - { - DALI_LOG_ERROR( "GIF Loader: DGifCloseFile Error. Code: %d\n", errorCode); - } + DGifCloseFile(gifInfo); } } + GifFileType*& gifInfo; }; @@ -103,12 +98,10 @@ int ReadDataFromGif(GifFileType *gifInfo, GifByteType *data, int length) /// Loads the GIF Header. bool LoadGifHeader(FILE *fp, unsigned int &width, unsigned int &height, GifFileType** gifInfo) { - int errorCode = 0; //D_GIF_SUCCEEDED is 0 - *gifInfo = DGifOpen(reinterpret_cast(fp), ReadDataFromGif, &errorCode); + *gifInfo = DGifOpen(reinterpret_cast(fp), ReadDataFromGif); - if ( !(*gifInfo) || errorCode ) + if ( !(*gifInfo) ) { - DALI_LOG_ERROR( "GIF Loader: DGifOpen Error. Code: %d\n", errorCode); return false; } @@ -249,7 +242,7 @@ bool HandleExtensionRecordType( GifFileType* gifInfo ) GifByteType *extensionByte( NULL ); // Not really interested in the extensions so just skip them unless there is an error. - for ( int extRetCode = DGifGetExtension( gifInfo, &image.ExtensionBlocks->Function, &extensionByte ); + for ( int extRetCode = DGifGetExtension( gifInfo, &image.Function, &extensionByte ); extensionByte != NULL; extRetCode = DGifGetExtensionNext( gifInfo, &extensionByte ) ) {