Clean up ifdefs in SkGifCodec

src/codec/SkCodec_libgif.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCodec_libgif.h"
 #include "SkCodecPriv.h"
 #include "SkColorPriv.h"
@@ skipping 41 matching lines @@
 static int32_t read_bytes_callback(GifFileType* fileType, GifByteType* out,
         int32_t size) {
     SkStream* stream = (SkStream*) fileType->UserData;
     return (int32_t) stream->read(out, size);
 }
 
 /*
  * Open the gif file
  */
 static GifFileType* open_gif(SkStream* stream) {
-#if GIFLIB_MAJOR < 5
-    return DGifOpen(stream, read_bytes_callback);
-#else
     return DGifOpen(stream, read_bytes_callback, NULL);
-#endif
 }
 
  /*
  * This function cleans up the gif object after the decode completes
  * It is used in a SkAutoTCallIProc template
  */
 void SkGifCodec::CloseGif(GifFileType* gif) {
 #if GIFLIB_MAJOR < 5 || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR == 0)

[msarett, 2015/08/21 13:24:26]

This is the only one I haven't removed.  I think we should keep it in until we
finish the upgrade from 5.0.4 to 5.1.1.

     DGifCloseFile(gif);
 #else
     DGifCloseFile(gif, NULL);
 #endif
 }
 
 /*
  * This function free extension data that has been saved to assist the image
  * decoder
  */
 void SkGifCodec::FreeExtension(SavedImage* image) {
     if (NULL != image->ExtensionBlocks) {
-#if GIFLIB_MAJOR < 5
-        FreeExtension(image);
-#else
         GifFreeExtensions(&image->ExtensionBlockCount, &image->ExtensionBlocks);
-#endif
     }
 }
 
 /*
  * Check if a there is an index of the color table for a transparent pixel
  */
 static uint32_t find_trans_index(const SavedImage& image) {
     // If there is a transparent index specified, it will be contained in an
     // extension block.  We will loop through extension blocks in reverse order
     // to check the most recent extension blocks first.
@@ skipping 145 matching lines @@
                 kInvalidConversion);
     }
 
     // Use this as a container to hold information about any gif extension
     // blocks.  This generally stores transparency and animation instructions.
     SavedImage saveExt;
     SkAutoTCallVProc<SavedImage, FreeExtension> autoFreeExt(&saveExt);
     saveExt.ExtensionBlocks = NULL;
     saveExt.ExtensionBlockCount = 0;
     GifByteType* extData;
-#if GIFLIB_MAJOR >= 5
     int32_t extFunction;
-#endif
 
     // We will loop over components of gif images until we find an image.  Once
     // we find an image, we will decode and return it.  While many gif files
     // contain more than one image, we will simply decode the first image.
     const int32_t width = dstInfo.width();
     const int32_t height = dstInfo.height();
     GifRecordType recordType;
     do {
         // Get the current record type
         if (GIF_ERROR == DGifGetRecordType(fGif, &recordType)) {
@@ skipping 228 matching lines @@
                 //        displayed in the same frame together.  I will
                 //        currently leave this unimplemented until I find a
                 //        test case that expects this behavior.
                 return kSuccess;
             }
 
             // Extensions are used to specify special properties of the image
             // such as transparency or animation.
             case EXTENSION_RECORD_TYPE:
                 // Read extension data
-#if GIFLIB_MAJOR < 5
-                if (GIF_ERROR ==
-                        DGifGetExtension(fGif, &saveExt.Function, &extData)) {
-#else
                 if (GIF_ERROR ==
                         DGifGetExtension(fGif, &extFunction, &extData)) {
-#endif
                     return gif_error("Could not get extension.\n",
                             kIncompleteInput);
                 }
 
                 // Create an extension block with our data
                 while (NULL != extData) {
                     // Add a single block
-#if GIFLIB_MAJOR < 5
-                    if (GIF_ERROR == AddExtensionBlock(&saveExt, extData[0],
-                            &extData[1])) {
-#else
                     if (GIF_ERROR ==
                             GifAddExtensionBlock(&saveExt.ExtensionBlockCount,
                             &saveExt.ExtensionBlocks, extFunction, extData[0],
                             &extData[1])) {
-#endif
                         return gif_error("Could not add extension block.\n",
                                 kIncompleteInput);
                     }
                     // Move to the next block
                     if (GIF_ERROR == DGifGetExtensionNext(fGif, &extData)) {
                         return gif_error("Could not get next extension.\n",
                                 kIncompleteInput);
                     }
-#if GIFLIB_MAJOR < 5
-                    saveExt.Function = 0;
-#endif
                 }
                 break;
 
             // Signals the end of the gif file
             case TERMINATE_RECORD_TYPE:
                 break;
 
             default:
                 // giflib returns an error code if the record type is not known.
                 // We should catch this error immediately.
                 SkASSERT(false);
                 break;
         }
     } while (TERMINATE_RECORD_TYPE != recordType);
 
     return gif_error("Could not find any images to decode in gif file.\n",
             kInvalidInput);
 }