summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Sarett <msarett@google.com>2015-08-24 15:35:24 (GMT)
committerHarry Youd <harry@harryyoud.co.uk>2017-09-20 20:37:11 (GMT)
commit9885aa80867718c5141eeeb7456a29280552be59 (patch)
treeb184df90dd527af9ca748c848a44ddc00ff447a1
parent20f6e4dc2fdadcf88cb8b48276169da47a913f9f (diff)
downloadandroid_packages_apps_Messaging-9885aa80867718c5141eeeb7456a29280552be59.zip
android_packages_apps_Messaging-9885aa80867718c5141eeeb7456a29280552be59.tar.gz
android_packages_apps_Messaging-9885aa80867718c5141eeeb7456a29280552be59.tar.bz2
DO NOT MERGEreplicant-6.0-0003
Update callers *GifCloseFile for new GIFLIB DO NOT MERGE Bug:34697653 Test: build; existing CTS tests Original commit message: Fix build breakage caused by updating giflib Change-Id: I085379470620ec4db13f8baf7a9eb069747270b7 (cherry picked from commit 60519c717ebac07437af401006078bf944f93add)
-rw-r--r--jni/GifTranscoder.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/jni/GifTranscoder.cpp b/jni/GifTranscoder.cpp
index 0e83982..112feca 100644
--- a/jni/GifTranscoder.cpp
+++ b/jni/GifTranscoder.cpp
@@ -508,11 +508,11 @@ ColorARGB GifTranscoder::gifColorToColorARGB(const GifColorType& color) {
GifFilesCloser::~GifFilesCloser() {
if (mGifIn) {
- DGifCloseFile(mGifIn);
+ DGifCloseFile(mGifIn, NULL);
mGifIn = NULL;
}
if (mGifOut) {
- EGifCloseFile(mGifOut);
+ EGifCloseFile(mGifOut, NULL);
mGifOut = NULL;
}
}