summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeon Scroggins III <scroggo@google.com>2017-03-14 14:45:38 (GMT)
committerAndreas Blaesius <skate4life@gmx.de>2017-07-17 22:01:44 (GMT)
commit747cf7d078ee266e16405b377323cd5d950b39dc (patch)
treef2ad313edb96e2bfb1fc215fe117984796c87a7b
parent676f7eef3f8988b541a0e2e74f8a2e2423aa87c9 (diff)
downloadandroid_frameworks_ex-747cf7d078ee266e16405b377323cd5d950b39dc.zip
android_frameworks_ex-747cf7d078ee266e16405b377323cd5d950b39dc.tar.gz
android_frameworks_ex-747cf7d078ee266e16405b377323cd5d950b39dc.tar.bz2
DO NOT MERGEreplicant-6.0-0003
Update FrameSequence to call new DGifCloseFile DO NOT MERGE Bug:34697653 Test: build; existing CTS tests This version takes two parameters. Matches commit 164b6937223c9f9cbb84b213740e3e80f940b193 Change-Id: I062a6d6d3c5dfd41d46d3fa2a5aa18ab27ecabf8 (cherry picked from commit e81d3acbc1440f9ea0a61edbdafa0b7354de6351)
-rw-r--r--framesequence/jni/FrameSequence_gif.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/framesequence/jni/FrameSequence_gif.cpp b/framesequence/jni/FrameSequence_gif.cpp
index e658425..853f70f 100644
--- a/framesequence/jni/FrameSequence_gif.cpp
+++ b/framesequence/jni/FrameSequence_gif.cpp
@@ -63,7 +63,7 @@ FrameSequence_gif::FrameSequence_gif(Stream* stream) :
if (DGifSlurp(mGif) != GIF_OK) {
ALOGW("Gif slurp failed");
- DGifCloseFile(mGif);
+ DGifCloseFile(mGif, NULL);
mGif = NULL;
return;
}
@@ -132,7 +132,7 @@ FrameSequence_gif::FrameSequence_gif(Stream* stream) :
FrameSequence_gif::~FrameSequence_gif() {
if (mGif) {
- DGifCloseFile(mGif);
+ DGifCloseFile(mGif, NULL);
}
delete[] mPreservedFrames;
delete[] mRestoringFrames;