aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile2
-rw-r--r--image.c12
2 files changed, 7 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 3813ae8..4eb78a9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION = git-20110926
+VERSION = git-20110928
CC = gcc
CFLAGS = -Wall -pedantic -O2
diff --git a/image.c b/image.c
index 9896a54..77a89b0 100644
--- a/image.c
+++ b/image.c
@@ -173,6 +173,9 @@ bool img_load_gif(img_t *img, const fileinfo_t *file) {
delay = 10 * ((unsigned int) ext[3] << 8 | (unsigned int) ext[2]);
if (delay)
delay = MAX(delay, MIN_GIF_DELAY);
+
+ /* TODO: handle disposal method, section 23.c.iv of
+ http://www.w3.org/Graphics/GIF/spec-gif89a.txt */
}
ext = NULL;
DGifGetExtensionNext(gif, &ext);
@@ -209,12 +212,9 @@ bool img_load_gif(img_t *img, const fileinfo_t *file) {
for (i = 0; i < sh; i++) {
for (j = 0; j < sw; j++) {
- if (i < y || i >= y + h || j < x || j >= x + w) {
- if (transp >= 0 && prev_frame)
- *ptr = prev_frame[i * sw + j];
- else
- *ptr = bgpixel;
- } else if (rows[i-y][j-x] == transp) {
+ if (i < y || i >= y + h || j < x || j >= x + w ||
+ rows[i-y][j-x] == transp)
+ {
if (prev_frame)
*ptr = prev_frame[i * sw + j];
else