Annotation of /trunk/kdelibs/patches/kdelibs-4.10.0-giflib5.patch
Parent Directory | Revision Log
Revision 2072 -
(hide annotations)
(download)
Mon Feb 11 13:05:45 2013 UTC (11 years, 4 months ago) by niro
File size: 923 byte(s)
Mon Feb 11 13:05:45 2013 UTC (11 years, 4 months ago) by niro
File size: 923 byte(s)
-rediffed against 4.10.0
1 | niro | 2072 | diff -Naur kdelibs-4.10.0/khtml/imload/decoders/gifloader.cpp kdelibs-4.10.0-giflib5/khtml/imload/decoders/gifloader.cpp |
2 | --- kdelibs-4.10.0/khtml/imload/decoders/gifloader.cpp 2013-01-23 21:44:22.000000000 +0000 | ||
3 | +++ kdelibs-4.10.0-giflib5/khtml/imload/decoders/gifloader.cpp 2013-02-11 14:47:32.856000000 +0000 | ||
4 | @@ -300,7 +300,11 @@ | ||
5 | } | ||
6 | |||
7 | |||
8 | +#if GIFLIB_MAJOR >= 5 | ||
9 | + static unsigned int decode16Bit(unsigned char* signedLoc) | ||
10 | +#else | ||
11 | static unsigned int decode16Bit(char* signedLoc) | ||
12 | +#endif | ||
13 | { | ||
14 | unsigned char* loc = reinterpret_cast<unsigned char*>(signedLoc); | ||
15 | |||
16 | @@ -348,7 +352,11 @@ | ||
17 | virtual int processEOF() | ||
18 | { | ||
19 | //Feed the buffered data to libUnGif | ||
20 | +#if GIFLIB_MAJOR >= 5 | ||
21 | + GifFileType* file = DGifOpen(this, gifReaderBridge, NULL); | ||
22 | +#else | ||
23 | GifFileType* file = DGifOpen(this, gifReaderBridge); | ||
24 | +#endif | ||
25 | |||
26 | if (!file) | ||
27 | return Error; |