[libexif-cvs] libexif/libexif/olympus mnote-olympus-entry.c, 1.23, 1.24

[Marcus M. <mar...@us...>]

Update of /cvsroot/libexif/libexif/libexif/olympus
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv4136/olympus

Modified Files:
	mnote-olympus-entry.c 
Log Message:
merge lens fstops and exposure diff cases


Index: mnote-olympus-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/mnote-olympus-entry.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -d -r1.23 -r1.24
--- mnote-olympus-entry.c	3 Oct 2006 13:49:21 -0000	1.23
+++ mnote-olympus-entry.c	3 Oct 2006 14:22:00 -0000	1.24
@@ -235,6 +235,7 @@ mnote_olympus_entry_get_value (MnoteOlym
                 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 (MnoteOlym
                 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);