diff options
author | Daniel Friesel <derf@finalrewind.org> | 2012-02-06 11:08:58 +0100 |
---|---|---|
committer | Daniel Friesel <derf@finalrewind.org> | 2012-02-06 11:08:58 +0100 |
commit | b1e497e7555d2c72fb8b64a00c3e6804f36bd62f (patch) | |
tree | f513e9d2bcd6d7cb384bade126de5369242231d4 /src/exif.c | |
parent | 0d7602ffa3ef7d610c2af355258e8fe40ad84b8f (diff) |
EXIF fixes by reald (closes #80)
commit 9c8226a1a54d1246e086923bb1b36e3827b25767
Merge: e4483e5 132ecc0
Author: Dennis Real <github@tildepipe.org>
Date: Sun Feb 5 17:24:17 2012 +0100
Merge branch 'master' of ssh://github.com/reald/feh
commit e4483e5e25a1471728a31a18d22ba86def489509
Author: Dennis Real <github@tildepipe.org>
Date: Sun Feb 5 16:56:29 2012 +0100
- improved handling of images which have exif tags but not ours
- fixed uninitialized pointer in thumbnail mode
- added nikon lens info if available
commit 132ecc0f9f0a2243c4f6745d0af36be810bf9eba
Author: Dennis Real <github@tildepipe.org>
Date: Sun Feb 5 16:56:29 2012 +0100
- improved handling of images which have exif tags but not ours
- fixed uninitialzed pointer in thumbnail mode
- added nikon lens info if available
Diffstat (limited to 'src/exif.c')
-rw-r--r-- | src/exif.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -45,10 +45,10 @@ static void exif_trim_spaces(char *str) { if (*str != ' ') { - end = str; + end = str+1; } } - *++end = '\0'; + *end = '\0'; } @@ -146,7 +146,7 @@ void exif_get_info(ExifData * ed, char *buffer, unsigned int maxsize) { return; } - else if (ed == NULL ) + else if (ed == NULL) { snprintf(buffer, (size_t)maxsize, "%s\n", "No Exif data in file."); return; @@ -187,6 +187,8 @@ void exif_get_info(ExifData * ed, char *buffer, unsigned int maxsize) { /* Digital Vari-Program */ exif_get_mnote_tag(ed, 171, buffer + strlen(buffer), maxsize - strlen(buffer)); + /* Lens */ + exif_get_mnote_tag(ed, 132, buffer + strlen(buffer), maxsize - strlen(buffer)); } } |