diff options
| author |  msarett <msarett@google.com> | 2015-08-24 12:00:15 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-24 12:00:15 -0700 |
| commit | 0e6ff3882df3e5658a86124fe7889944b6735140 (patch) | |
| tree | 8770e863e48ef2c804b860ca5c16ae8e00a19d84 /src/codec | |
| parent | 5141d90796034a932a48738cf76091957314c9a1 (diff) | |
Update giflib to 5.1.1 (AOSP hash)
This also disables warnings in giflib and fixes
compile warnings in icu, in order to fix a skia
bug.
BUG=skia:4220
Review URL: https://codereview.chromium.org/1314633002
Diffstat (limited to 'src/codec')
| -rw-r--r-- | src/codec/SkCodec_libgif.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/codec/SkCodec_libgif.cpp b/src/codec/SkCodec_libgif.cpp index 1200441934..1d6164eb8e 100644 --- a/src/codec/SkCodec_libgif.cpp +++ b/src/codec/SkCodec_libgif.cpp @@ -67,11 +67,7 @@ static GifFileType* open_gif(SkStream* stream) { * It is used in a SkAutoTCallIProc template */ void SkGifCodec::CloseGif(GifFileType* gif) { -#if GIFLIB_MAJOR < 5 || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR == 0) - DGifCloseFile(gif); -#else DGifCloseFile(gif, NULL); -#endif } /* |