From: Marcus Meissner <marcus@jet.franken.de>
Date: Tue, 3 Oct 2006 14:22:00 +0000 (+0200)
Subject: merge lens fstops and exposure diff cases
X-Git-Tag: libexif-0_6_21-release~439
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5659325e66de2b9e5cafc82ddbf03294eb990021;p=platform%2Fupstream%2Flibexif.git

merge lens fstops and exposure diff cases
---

diff --git a/libexif/olympus/mnote-olympus-entry.c b/libexif/olympus/mnote-olympus-entry.c
index 29d47c2..6968551 100644
--- a/libexif/olympus/mnote-olympus-entry.c
+++ b/libexif/olympus/mnote-olympus-entry.c
@@ -235,6 +235,7 @@ mnote_olympus_entry_get_value (MnoteOlympusEntry *entry, char *v, unsigned int m
                 vl =  exif_get_long (entry->data, entry->order);
                 snprintf (v, maxlen, "%lu",  (long unsigned int) vl );
                 break;
+	case MNOTE_NIKON_TAG_LENS_FSTOPS:
 	case MNOTE_NIKON_TAG_EXPOSUREDIFF: {
 		unsigned char a,b,c,d;
                 CF (entry->format, EXIF_FORMAT_UNDEFINED, v, maxlen);
@@ -244,15 +245,6 @@ mnote_olympus_entry_get_value (MnoteOlympusEntry *entry, char *v, unsigned int m
                 snprintf (v, maxlen, "%.1f",  c?(float)a*((float)b/(float)c):0 );
                 break;
 	}
-	case MNOTE_NIKON_TAG_LENS_FSTOPS: {
-		unsigned char a,b,c,d;
-                CF (entry->format, EXIF_FORMAT_UNDEFINED, v, maxlen);
-                CC (entry->components, 4, v, maxlen);
-                vl =  exif_get_long (entry->data, entry->order);
-		a = (vl>>24)&0xff; b = (vl>>16)&0xff; c = (vl>>8)&0xff; d = (vl)&0xff;
-                snprintf (v, maxlen, "%.2f",  c?(float)a*((float)b/(float)c):0 );
-                break;
-	}
 	case MNOTE_NIKON_TAG_FLASHEXPCOMPENSATION:
 	case MNOTE_NIKON_TAG_FLASHEXPOSUREBRACKETVAL:
                 CF (entry->format, EXIF_FORMAT_UNDEFINED, v, maxlen);