projects / packages / ekg.git / blame
| Commit | Line | Data |
|---|---|---|
| 127cf97d JB |
1 | --- ekg-1.7/src/events.c.orig 2015-12-13 14:29:18.771043146 +0100 |
| 2 | +++ ekg-1.7/src/events.c 2015-12-13 14:50:21.057656839 +0100 | |
| 3 | @@ -1529,6 +1529,7 @@ | |
| 4 | ColorMapObject *pal; | |
| 5 | #endif | |
| 6 | int fd; | |
| 7 | + int giferror; | |
| 8 | ||
| 9 | fd = open(fname, O_RDONLY); | |
| 10 | if (fd == -1) { | |
| 11 | @@ -1536,9 +1537,8 @@ | |
| 12 | goto err; | |
| 13 | } | |
| 14 | ||
| 15 | - if (!(file = DGifOpenFileHandle(fd))) { | |
| 16 | - snprintf(errbuf, sizeof(errbuf), "DGifOpenFileHandle(): %d", | |
| 17 | - GifLastError()); | |
| 18 | + if (!(file = DGifOpenFileHandle(fd, &giferror))) { | |
| 19 | + snprintf(errbuf, sizeof(errbuf), "DGifOpenFileHandle(): %d", giferror); | |
| 20 | goto err2; | |
| 21 | } | |
| 22 | ||
| 23 | @@ -1548,7 +1548,7 @@ | |
| 24 | } | |
| 25 | ||
| 26 | if (DGifSlurp(file) != GIF_OK) { | |
| 27 | - snprintf(errbuf, sizeof(errbuf), "DGifSlurp(): %d", GifLastError()); | |
| 28 | + snprintf(errbuf, sizeof(errbuf), "DGifSlurp(): %d", file->Error); | |
| 29 | goto err3; | |
| 30 | } | |
| 31 | ||
| 32 | @@ -1576,12 +1576,12 @@ | |
| 33 | token->data = (unsigned char *) xmalloc(token->sx * token->sy); | |
| 34 | ||
| 35 | memcpy(token->data, file->SavedImages[0].RasterBits, token->sx * token->sy); | |
| 36 | - DGifCloseFile(file); | |
| 37 | + DGifCloseFile(file, NULL); | |
| 38 | ||
| 39 | return 0; | |
| 40 | ||
| 41 | err3: | |
| 42 | - DGifCloseFile(file); | |
| 43 | + DGifCloseFile(file, NULL); | |
| 44 | err2: | |
| 45 | close(fd); | |
| 46 | err: |