From 375e7c2d5774f89c71789a5b9f751a820be172b1 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 3 Jun 2013 14:04:02 +0000 Subject: [PATCH] From Laurens Voerman, "while updating dependencies I found a problem with libgif 5 from http://sourceforge.net/projects/giflib/ a change in version 5.0.0 required a call to the fuction "DGifOpen" to pass an int ref for an error code. My fix ignores the error, just fixes the compile." --- src/osgPlugins/gif/ReaderWriterGIF.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/osgPlugins/gif/ReaderWriterGIF.cpp b/src/osgPlugins/gif/ReaderWriterGIF.cpp index c6195ae8e..b7f228dbe 100644 --- a/src/osgPlugins/gif/ReaderWriterGIF.cpp +++ b/src/osgPlugins/gif/ReaderWriterGIF.cpp @@ -369,8 +369,12 @@ GifImageStream** obj) /* The way an interlaced image should be read - offsets and jumps */ int interlacedoffset[] = { 0, 4, 2, 1 }; int interlacedjumps[] = { 8, 8, 4, 2 }; - +#if (GIFLIB_MAJOR >= 5) + int Error; + giffile = DGifOpen(&fin,gif_read_stream, &Error); +#else giffile = DGifOpen(&fin,gif_read_stream); +#endif if (!giffile) { giferror = ERR_OPEN;