head	1.3;
access;
symbols
	pkgsrc-2018Q2:1.2.0.36
	pkgsrc-2018Q2-base:1.2
	pkgsrc-2018Q1:1.2.0.34
	pkgsrc-2018Q1-base:1.2
	pkgsrc-2017Q4:1.2.0.32
	pkgsrc-2017Q4-base:1.2
	pkgsrc-2017Q3:1.2.0.30
	pkgsrc-2017Q3-base:1.2
	pkgsrc-2017Q2:1.2.0.26
	pkgsrc-2017Q2-base:1.2
	pkgsrc-2017Q1:1.2.0.24
	pkgsrc-2017Q1-base:1.2
	pkgsrc-2016Q4:1.2.0.22
	pkgsrc-2016Q4-base:1.2
	pkgsrc-2016Q3:1.2.0.20
	pkgsrc-2016Q3-base:1.2
	pkgsrc-2016Q2:1.2.0.18
	pkgsrc-2016Q2-base:1.2
	pkgsrc-2016Q1:1.2.0.16
	pkgsrc-2016Q1-base:1.2
	pkgsrc-2015Q4:1.2.0.14
	pkgsrc-2015Q4-base:1.2
	pkgsrc-2015Q3:1.2.0.12
	pkgsrc-2015Q3-base:1.2
	pkgsrc-2015Q2:1.2.0.10
	pkgsrc-2015Q2-base:1.2
	pkgsrc-2015Q1:1.2.0.8
	pkgsrc-2015Q1-base:1.2
	pkgsrc-2014Q4:1.2.0.6
	pkgsrc-2014Q4-base:1.2
	pkgsrc-2014Q3:1.2.0.4
	pkgsrc-2014Q3-base:1.2
	pkgsrc-2014Q2:1.2.0.2
	pkgsrc-2014Q2-base:1.2
	pkgsrc-2014Q1:1.1.0.6
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.4
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.2
	pkgsrc-2013Q3-base:1.1;
locks; strict;
comment	@// @;


1.3
date	2018.08.06.11.12.27;	author jperkin;	state dead;
branches;
next	1.2;
commitid	atwPIvsjHW1Fc3NA;

1.2
date	2014.05.23.13.45.07;	author obache;	state Exp;
branches;
next	1.1;
commitid	nnZri0qEcYZZpFBx;

1.1
date	2013.09.19.08.07.05;	author obache;	state Exp;
branches;
next	;
commitid	gKzbJ9FxxJris16x;


desc
@@


1.3
log
@osg: SunOS fixes and remove obsolete patches.
@
text
@$NetBSD: patch-src_osgPlugins_gif_ReaderWriterGIF.cpp,v 1.2 2014/05/23 13:45:07 obache Exp $

* GIFLIB 5.x API change 

--- src/osgPlugins/gif/ReaderWriterGIF.cpp.orig	2011-05-05 12:39:35.000000000 +0000
+++ src/osgPlugins/gif/ReaderWriterGIF.cpp
@@@@ -370,7 +370,11 @@@@ GifImageStream** obj)
     int interlacedoffset[] = { 0, 4, 2, 1 };
     int interlacedjumps[] = { 8, 8, 4, 2 };
 
+#if GIFLIB_MAJOR >= 5
+    giffile = DGifOpen(&fin,gif_read_stream, NULL);
+#else
     giffile = DGifOpen(&fin,gif_read_stream);
+#endif
     if (!giffile)
     {
         giferror = ERR_OPEN;
@@@@ -557,7 +561,11 @@@@ GifImageStream** obj)
     *width_ret = giffile->SWidth;
     *height_ret = giffile->SHeight;
     *numComponents_ret = 4;
+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
+    DGifCloseFile(giffile, NULL);
+#else
     DGifCloseFile(giffile);
+#endif
     return buffer;
 }
 
@


1.2
log
@fix for giflib-5.1 API change.
@
text
@d1 1
a1 1
$NetBSD: patch-src_osgPlugins_gif_ReaderWriterGIF.cpp,v 1.1 2013/09/19 08:07:05 obache Exp $
@


1.1
log
@fixes build with GIFLIB-5.x.
@
text
@d1 1
a1 1
$NetBSD$
d19 12
@