Upstream changes from Android

src/images/SkMovie_gif.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkMovie.h"
@@ skipping 105 matching lines @@
                      int transparent, int width)
 {
     for (; width > 0; width--, src++, dst++) {
         if (*src != transparent) {
             const GifColorType& col = cmap->Colors[*src];
             *dst = SkPackARGB32(0xFF, col.Red, col.Green, col.Blue);
         }
     }
 }
 
+#if GIFLIB_MAJOR < 5
 static void copyInterlaceGroup(SkBitmap* bm, const unsigned char*& src,
                                const ColorMapObject* cmap, int transparent, int copyWidth,
                                int copyHeight, const GifImageDesc& imageDesc, int rowStep,
                                int startRow)
 {
     int row;
     // every 'rowStep'th row, starting with row 'startRow'
     for (row = startRow; row < copyHeight; row += rowStep) {
         uint32_t* dst = bm->getAddr32(imageDesc.Left, imageDesc.Top + row);
         copyLine(dst, src, cmap, transparent, copyWidth);
@@ skipping 26 matching lines @@
     copyInterlaceGroup(bm, src, cmap, transparent, copyWidth, copyHeight, frame->ImageDesc, 8, 0);
 
     // group 2 - every 8th row, starting with row 4
     copyInterlaceGroup(bm, src, cmap, transparent, copyWidth, copyHeight, frame->ImageDesc, 8, 4);
 
     // group 3 - every 4th row, starting with row 2
     copyInterlaceGroup(bm, src, cmap, transparent, copyWidth, copyHeight, frame->ImageDesc, 4, 2);
 
     copyInterlaceGroup(bm, src, cmap, transparent, copyWidth, copyHeight, frame->ImageDesc, 2, 1);
 }
+#endif
 
 static void blitNormal(SkBitmap* bm, const SavedImage* frame, const ColorMapObject* cmap,
                        int transparent)
 {
     int width = bm->width();
     int height = bm->height();
     const unsigned char* src = (unsigned char*)frame->RasterBits;
     uint32_t* dst = bm->getAddr32(frame->ImageDesc.Left, frame->ImageDesc.Top);
     GifWord copyWidth = frame->ImageDesc.Width;
     if (frame->ImageDesc.Left + copyWidth > width) {
@@ skipping 52 matching lines @@
     if (frame->ImageDesc.ColorMap != NULL) {
         // use local color table
         cmap = frame->ImageDesc.ColorMap;
     }
 
     if (cmap == NULL || cmap->ColorCount != (1 << cmap->BitsPerPixel)) {
         SkDEBUGFAIL("bad colortable setup");
         return;
     }
 
+#if GIFLIB_MAJOR < 5
+    // before GIFLIB 5, de-interlacing wasn't done by library at load time
     if (frame->ImageDesc.Interlace) {
         blitInterlace(bm, frame, cmap, transparent);
-    } else {
-        blitNormal(bm, frame, cmap, transparent);
+        return;
     }
+#endif
+
+    blitNormal(bm, frame, cmap, transparent);
 }
 
 static bool checkIfWillBeCleared(const SavedImage* frame)
 {
     for (int i = 0; i < frame->ExtensionBlockCount; ++i) {
         ExtensionBlock* eb = frame->ExtensionBlocks + i;
         if (eb->Function == GRAPHICS_EXT_FUNC_CODE &&
             eb->ByteCount == 4) {
             // check disposal method
             int disposal = ((eb->Bytes[0] >> 2) & 7);
@@ skipping 175 matching lines @@
                 memcmp(GIF89_STAMP, buf, GIF_STAMP_LEN) == 0) {
             // must rewind here, since our construct wants to re-read the data
             stream->rewind();
             return SkNEW_ARGS(SkGIFMovie, (stream));
         }
     }
     return NULL;
 }
 
 static SkTRegistry<SkMovie*, SkStream*> gReg(Factory);