From: Jan P. <pa...@us...> - 2004-05-10 12:57:28
|
Update of /cvsroot/libexif/libexif/libexif/olympus In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13525 Modified Files: mnote-olympus-entry.c Log Message: A CR/LF problem killed output of processing MNOTE_NIKON_TAG_LENS Index: mnote-olympus-entry.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/olympus/mnote-olympus-entry.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- mnote-olympus-entry.c 10 May 2004 12:28:48 -0000 1.8 +++ mnote-olympus-entry.c 10 May 2004 12:57:17 -0000 1.9 @@ -295,17 +295,18 @@ 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; |