diff options
| author | Derek Sollenberger <djsollen@google.com> | 2015-08-24 16:27:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-24 16:27:09 +0000 |
| commit | ebe84b1b8205f47f0ae134b51ef532fedfc6962f (patch) | |
| tree | db6fc94f150824ae88b1823d74392880f1631753 | |
| parent | 2ed732d1828e97d752d43677ba6dc18f079691c2 (diff) | |
| parent | 6448c46716316de42af17a49d9fbf2fd8865e033 (diff) | |
| download | android_frameworks_ex-ebe84b1b8205f47f0ae134b51ef532fedfc6962f.tar.gz android_frameworks_ex-ebe84b1b8205f47f0ae134b51ef532fedfc6962f.tar.bz2 android_frameworks_ex-ebe84b1b8205f47f0ae134b51ef532fedfc6962f.zip | |
am 6448c467: am 1bd8dec0: Merge "Fix breakage from giflib update"
* commit '6448c46716316de42af17a49d9fbf2fd8865e033':
Fix breakage from giflib update
| -rw-r--r-- | framesequence/jni/FrameSequence_gif.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/framesequence/jni/FrameSequence_gif.cpp b/framesequence/jni/FrameSequence_gif.cpp index f8d37f4..4722378 100644 --- a/framesequence/jni/FrameSequence_gif.cpp +++ b/framesequence/jni/FrameSequence_gif.cpp @@ -54,7 +54,7 @@ FrameSequence_gif::FrameSequence_gif(Stream* stream) : if (DGifSlurp(mGif) != GIF_OK) { ALOGW("Gif slurp failed"); - DGifCloseFile(mGif); + DGifCloseFile(mGif, NULL); mGif = NULL; return; } @@ -123,7 +123,7 @@ FrameSequence_gif::FrameSequence_gif(Stream* stream) : FrameSequence_gif::~FrameSequence_gif() { if (mGif) { - DGifCloseFile(mGif); + DGifCloseFile(mGif, NULL); } delete[] mPreservedFrames; delete[] mRestoringFrames; |