diff options
| -rw-r--r-- | GNUmakefile | 1 | ||||
| -rw-r--r-- | exiftran.c | 6 | ||||
| -rw-r--r-- | fbi.c | 4 |
3 files changed, 0 insertions, 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) @@ -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); } } @@ -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; |