head	1.3;
access;
symbols
	pkgsrc-2014Q3:1.2.0.2
	pkgsrc-2014Q3-base:1.2
	pkgsrc-2014Q2:1.1.0.2
	pkgsrc-2014Q2-base:1.1;
locks; strict;
comment	@// @;


1.3
date	2014.11.13.10.31.07;	author markd;	state dead;
branches;
next	1.2;
commitid	56B9CUCDa3iJK0Yx;

1.2
date	2014.08.11.21.17.20;	author markd;	state Exp;
branches;
next	1.1;
commitid	1t6GXm9LD0KrlZLx;

1.1
date	2014.05.18.12.27.51;	author markd;	state Exp;
branches;
next	;
commitid	MlAsbT0xNFvA91Bx;


desc
@@


1.3
log
@Update to KDE SC 4.14.3
@
text
@$NetBSD: patch-khtml_imload_decoders_gifloader.cpp,v 1.2 2014/08/11 21:17:20 markd Exp $

Fix build with giflib 5.1.

--- khtml/imload/decoders/gifloader.cpp.orig	2014-01-02 19:26:52.000000000 +0000
+++ khtml/imload/decoders/gifloader.cpp
@@@@ -369,7 +369,7 @@@@ public:
         
         if (DGifSlurp(file) == GIF_ERROR)
         {
-            DGifCloseFile(file);
+            DGifCloseFile(file, NULL);
             return Error;
         }
         
@@@@ -378,7 +378,7 @@@@ public:
         if (file->ImageCount > 1) {
             // Verify it..
             if (!ImageManager::isAcceptableSize(file->SWidth, file->SHeight)) {
-                DGifCloseFile(file);
+                DGifCloseFile(file, NULL);
                 return Error;
             }
             notifyImageInfo(file->SWidth, file->SHeight);
@@@@ -390,7 +390,7 @@@@ public:
             //Extract colormap, geometry, so that we can create the frame
             SavedImage* curFrame = &file->SavedImages[frame];
             if (!ImageManager::isAcceptableSize(curFrame->ImageDesc.Width, curFrame->ImageDesc.Height)) {
-                DGifCloseFile(file);
+                DGifCloseFile(file, NULL);
                 return Error;
             }
         }
@@@@ -502,6 +502,7 @@@@ public:
             else
                 buf = new uchar[w];
                 
+#if GIFLIB_MAJOR < 5
             if (curFrame->ImageDesc.Interlace)
             {
                 // Interlaced. Considering we don't do progressive loading of gif's, 
@@@@ -551,6 +552,7 @@@@ public:
                 } // for pass..
             } // if interlaced
             else
+#endif
             {
                 for (int line = 0; line < h; ++line)
                 {
@@@@ -574,7 +576,7 @@@@ public:
             frame0->animProvider = new GIFAnimProvider(frame0, image, frameProps, bgColor);
         }
         
-        DGifCloseFile(file);
+        DGifCloseFile(file, NULL);
 
         return Done;
     }
@


1.2
log
@Fix display of interlaced gifs with giflib5
@
text
@d1 1
a1 1
$NetBSD: patch-khtml_imload_decoders_gifloader.cpp,v 1.1 2014/05/18 12:27:51 markd Exp $
@


1.1
log
@Fix build with giflib 5.1
@
text
@d1 1
a1 1
$NetBSD$
d34 17
a50 1
@@@@ -574,7 +574,7 @@@@ public:
@