[prev in list] [next in list] [prev in thread] [next in thread] 

List:       konq-bugs
Subject:    [konqueror] [Bug 303520] giflib 5 compatibility
From:       Raphael Kubo da Costa <rakuco () FreeBSD ! org>
Date:       2013-01-16 16:03:17
Message-ID: bug-303520-5021-pdoioargka () http ! bugs ! kde ! org/
[Download RAW message or body]

https://bugs.kde.org/show_bug.cgi?id=303520

Raphael Kubo da Costa <rakuco@FreeBSD.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|RESOLVED                    |REOPENED
   Version Fixed In|4.10.0                      |
         Resolution|FIXED                       |---
     Ever confirmed|0                           |1
      Latest Commit|903ce6b2ee9bc09cabfb5ca36d8 |
                   |2d50db986c7a6               |

--- Comment #6 from Raphael Kubo da Costa <rakuco@FreeBSD.org> ---
D'oh, sorry, you are right, the build still fails with giflib 5 here.

Niels, would you mind sending this patch through ReviewBoard?

A few comments while here:

+#if GIFLIB_MAJOR >= 5
+    static unsigned int decode16Bit(unsigned char* signedLoc)
+#else
     static unsigned int decode16Bit(char* signedLoc)
+#endif

The GifByteType typedef is already an unsigned char for me here with giflib
4.1.6; are you sure the build really doesn't work without this change?
Otherwise it could go in separately.

+#if GIFLIB_MAJOR >= 5
+    int ErrorCode;
+        GifFileType* file = DGifOpen(this, gifReaderBridge, &ErrorCode);
+#else
         GifFileType* file = DGifOpen(this, gifReaderBridge);
+#endif

ErrorCode is probably not needed since we don't do anything with it; just pass
NULL/0 in the last parameter.

-- 
You are receiving this mail because:
You are the assignee for the bug.
_______________________________________________
Konq-bugs mailing list
Konq-bugs@kde.org
https://mail.kde.org/mailman/listinfo/konq-bugs
[prev in list] [next in list] [prev in thread] [next in thread]