Permalink
Browse files

Fixed issue #74, conditional compilation of gif support

  • Loading branch information...
1 parent cd929ea commit 97a2c05cc30adb3b90842b671607a05857db63a0 @muennich committed Dec 27, 2012
Showing with 9 additions and 3 deletions.
  1. +2 −2 Makefile
  2. +7 −1 image.c
View
@@ -1,10 +1,10 @@
-VERSION = git-20121220
+VERSION = git-20121227
PREFIX = /usr/local
MANPREFIX = $(PREFIX)/share/man
CC = gcc
-CFLAGS = -Wall -pedantic -O2 -I$(PREFIX)
+CFLAGS = -Wall -pedantic -O2 -I$(PREFIX) -DHAVE_GIFLIB
LDFLAGS = -L$(PREFIX)
LIBS = -lX11 -lImlib2 -lgif
View
@@ -23,15 +23,17 @@
#include <string.h>
#include <sys/types.h>
#include <unistd.h>
-#include <gif_lib.h>
#include "exif.h"
#include "image.h"
#include "options.h"
#include "util.h"
#include "config.h"
+#if HAVE_GIFLIB
+#include <gif_lib.h>
enum { MIN_GIF_DELAY = 25 };
+#endif
float zoom_min;
float zoom_max;
@@ -92,6 +94,7 @@ void exif_auto_orientate(const fileinfo_t *file) {
}
}
+#if HAVE_GIFLIB
bool img_load_gif(img_t *img, const fileinfo_t *file) {
GifFileType *gif;
GifRowType *rows = NULL;
@@ -261,6 +264,7 @@ bool img_load_gif(img_t *img, const fileinfo_t *file) {
return !err;
}
+#endif /* HAVE_GIFLIB */
bool img_load(img_t *img, const fileinfo_t *file) {
const char *fmt;
@@ -284,8 +288,10 @@ bool img_load(img_t *img, const fileinfo_t *file) {
}
if (STREQ(fmt, "jpeg"))
exif_auto_orientate(file);
+#if HAVE_GIFLIB
if (STREQ(fmt, "gif"))
img_load_gif(img, file);
+#endif
img->w = imlib_image_get_width();
img->h = imlib_image_get_height();

0 comments on commit 97a2c05

Please sign in to comment.