From 956ad1cc145fe548071dce366a554174f5da1891 Mon Sep 17 00:00:00 2001 From: Jan Patera Date: Mon, 10 May 2004 14:57:17 +0200 Subject: [PATCH] A CR/LF problem killed output of processing MNOTE_NIKON_TAG_LENS --- libexif/olympus/mnote-olympus-entry.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/libexif/olympus/mnote-olympus-entry.c b/libexif/olympus/mnote-olympus-entry.c index 00429a3..1705c5b 100644 --- a/libexif/olympus/mnote-olympus-entry.c +++ b/libexif/olympus/mnote-olympus-entry.c @@ -295,17 +295,18 @@ mnote_olympus_entry_get_value (MnoteOlympusEntry *entry, char *v, unsigned int m CF (entry->format, EXIF_FORMAT_RATIONAL, v, maxlen); CC (entry->components, 4, v, maxlen); { - float c,d; - unsigned long a,b; - vr = exif_get_rational (entry->data, entry->order); - a = vr.numerator / vr.denominator; - vr = exif_get_rational (entry->data+8, entry->order); - b = vr.numerator / vr.denominator; - vr = exif_get_rational (entry->data+16, entry->order); - c = (1.0*vr.numerator) / vr.denominator; - vr = exif_get_rational (entry->data+24, entry->order); - d = (1.0*vr.numerator) / vr.denominator; - //printf("numerator %li, denominator %li\n", vr.numerator, vr.denominator); snprintf (v, sizeof (v), "%ld-%ldmm 1:%3.1f - %3.1f",a,b,c,d); + float c,d; + unsigned long a,b; + vr = exif_get_rational (entry->data, entry->order); + a = vr.numerator / vr.denominator; + vr = exif_get_rational (entry->data+8, entry->order); + b = vr.numerator / vr.denominator; + vr = exif_get_rational (entry->data+16, entry->order); + c = (1.0*vr.numerator) / vr.denominator; + vr = exif_get_rational (entry->data+24, entry->order); + d = (1.0*vr.numerator) / vr.denominator; + //printf("numerator %li, denominator %li\n", vr.numerator, vr.denominator); + snprintf (v, maxlen, "%ld-%ldmm 1:%3.1f - %3.1f",a,b,c,d); } break; -- 2.7.4