From ff611dad45be219c36b0ea0f856512eab6eaf82b Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Wed, 8 Mar 2017 10:48:12 +0100
Subject: zap HAVE_NEW_EXIF

---
 GNUmakefile | 1 -
 exiftran.c  | 6 ------
 fbi.c       | 4 ----
 3 files changed, 11 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index cd987ba..7fab077 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -68,7 +68,6 @@ define make-config
 LIB		:= $(LIB)
 RESDIR		:= $(call ac_resdir)
 HAVE_LINUX_FB_H	:= $(call ac_header,linux/fb.h)
-HAVE_NEW_EXIF	:= $(call ac_header,libexif/exif-log.h)
 HAVE_GLIBC	:= $(call ac_func,fopencookie)
 HAVE_STRSIGNAL	:= $(call ac_func,strsignal)
 HAVE_LIBPCD	:= $(call ac_lib,pcd_open,pcd)
diff --git a/exiftran.c b/exiftran.c
index 7f0de77..438cc01 100644
--- a/exiftran.c
+++ b/exiftran.c
@@ -23,9 +23,7 @@
 static void dump_exif(FILE *out, ExifData *ed)
 {
     const char *title, *value;
-#ifdef HAVE_NEW_EXIF
     char buffer[256];
-#endif
     ExifEntry  *ee;
     int tag,i;
 
@@ -38,11 +36,7 @@ static void dump_exif(FILE *out, ExifData *ed)
 	    ee = exif_content_get_entry (ed->ifd[i], tag);
 	    if (NULL == ee)
 		continue;
-#ifdef HAVE_NEW_EXIF
 	    value = exif_entry_get_value(ee, buffer, sizeof(buffer));
-#else
-	    value = exif_entry_get_value(ee);
-#endif
 	    fprintf(out,"      0x%04x  %-30s %s\n", tag, title, value);
 	}
     }
diff --git a/fbi.c b/fbi.c
index b02c17f..6965ecb 100644
--- a/fbi.c
+++ b/fbi.c
@@ -467,12 +467,8 @@ static void show_exif(struct flist *f)
 	    continue;
 	}
 	title[tag] = exif_tag_get_title(tags[tag]);
-#ifdef HAVE_NEW_EXIF
 	value[tag] = malloc(128);
 	exif_entry_get_value(ee, value[tag], 128);
-#else
-	value[tag] = strdup(exif_entry_get_value(ee));
-#endif
 	len = strlen(title[tag]);
 	if (l1 < len)
 	    l1 = len;
-- 
cgit