Revert "[Tizen] Fix a gif crash"

This reverts commit f5b3a6cc4f6b68b5f793f665eb4f87def9619efa.

diff --git a/automated-tests/resources/invalid.gif b/automated-tests/resources/invalid.gif
deleted file mode 100644 (file)
index 8ec84ae..0000000
Binary files a/automated-tests/resources/invalid.gif and /dev/null differ

diff --git a/automated-tests/src/dali-adaptor/utc-Dali-GifLoading.cpp b/automated-tests/src/dali-adaptor/utc-Dali-GifLoading.cpp
index 03267a7..b71cedd 100644 (file)
--- a/automated-tests/src/dali-adaptor/utc-Dali-GifLoading.cpp
+++ b/automated-tests/src/dali-adaptor/utc-Dali-GifLoading.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,9 +30,6 @@ static const char* gGif_100_None = TEST_RESOURCE_DIR "/canvas-none.gif";
 // this image if not exist, for negative test
 static const char* gGifNonExist = "non-exist.gif";
 
-// this image exists but it is not a gif file.
-static const char* gGifInvalid = TEST_RESOURCE_DIR "/invalid.gif";
-
 } // namespace
 
 void utc_dali_animated_image_loader_startup(void)
@@ -68,14 +65,3 @@ int UtcDaliAnimatedImageLoadingGetImageSizeN(void)
 
   END_TEST;
 }
-
-int UtcDaliAnimatedImageLoadingInvalidGif(void)
-{
-  Dali::AnimatedImageLoading animatedImageLoading = Dali::AnimatedImageLoading::New(gGifInvalid, true);
-  Dali::Devel::PixelBuffer   pixelBuffer          = animatedImageLoading.LoadFrame(0);
-
-  // The pixel buffer should be empty.
-  DALI_TEST_CHECK(!pixelBuffer);
-
-  END_TEST;
-}

diff --git a/dali/internal/imaging/common/gif-loading.cpp b/dali/internal/imaging/common/gif-loading.cpp
index 88b8e1e..4ca7dd4 100644 (file)
--- a/dali/internal/imaging/common/gif-loading.cpp
+++ b/dali/internal/imaging/common/gif-loading.cpp
@@ -1078,11 +1078,6 @@ bool ReadHeader(LoaderInfo&      loaderInfo,
         }
       }
     }
-    else
-    {
-      success = false;
-      DALI_LOG_ERROR("LOAD_ERROR_UNKNOWN_FORMAT\n");
-    }
   }
   return success;
 }
@@ -1401,7 +1396,7 @@ public:
     mLoadSucceeded(false),
     mMutex()
   {
-    loaderInfo.gifAccessor              = nullptr;
+    loaderInfo.gifAccessor = nullptr;
     loaderInfo.fileData.fileName        = mUrl.c_str();
     loaderInfo.fileData.isLocalResource = isLocalResource;
   }
@@ -1416,10 +1411,6 @@ public:
     }
 
     mLoadSucceeded = ReadHeader(loaderInfo, imageProperties);
-    if(!mLoadSucceeded)
-    {
-      DALI_LOG_ERROR("ReadHeader is failed [%s]\n", mUrl.c_str());
-    }
     return mLoadSucceeded;
   }