Update of /cvsroot/libexif/libexif/libexif/canon
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv10897/canon
Modified Files:
mnote-canon-entry.c
Log Message:
Added hook for ISO settings of Canon PowerShot S3 IS - unlike other Canons,
it doesn't use index into LUT, but direct ISO value ored w/ 0x4000
Index: mnote-canon-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/canon/mnote-canon-entry.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -d -r1.19 -r1.20
--- mnote-canon-entry.c 21 Sep 2006 05:45:14 -0000 1.19
+++ mnote-canon-entry.c 24 Apr 2007 04:48:29 -0000 1.20
@@ -470,6 +470,15 @@ mnote_canon_entry_get_value (const Mnote
if (!vs) break;
snprintf (val, maxlen, _("%i (ms)"), vs * 100);
break;
+ case 15:
+ if (((vs & 0xC000) == 0x4000) && (vs != 0x7FFF)) {
+ /* Canon S3 IS - directly specified value */
+ snprintf (val, maxlen, _("%i"), vs & ~0x4000);
+ } else {
+ /* Standard Canon - index into lookup table */
+ canon_search_table_value (entries_settings_1, t, vs, val, maxlen);
+ }
+ break;
case 22:
case 23:
case 24:
|
