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

diff --git a/ChangeLog b/ChangeLog
index c238d31..2f58baa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,19 +1,39 @@
+2007-04-24  Jan Patera <patera@users.sourceforge.net>
+
+       * libexif/canon/mnote-canon-entry.c: 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
+
+2007-03-17  Jan Patera <patera@users.sourceforge.net>
+
+       * libexif/exif-entry.c: Fixed values of EXIF_TAG_PHOTOMETRIC_INTERPRETATION,
+         updated values of EXIF_TAG_COMPRESSION.
+
 2007-02-25  Lutz Mueller <lutz@users.sourceforge.net>
 
-  Suggestions by Jef Driesen <jefdriesen@hotmail.com>:
+       Suggestions by Jef Driesen <jefdriesen@hotmail.com>:
 
-  * libexif/exif-entry.c: Correct formulas regarding to APEX values.
+       * libexif/exif-entry.c: Correct formulas regarding to APEX values.
+
+2007-02-14  Jan Patera <patera@users.sourceforge.net>
+
+       * libexif/olympus/mnote-olympus-entry.c:
+         Updated MNOTE_OLYMPUS_TAG_QUALITY & MNOTE_OLYMPUS_TAG_VERSION
 
 2006-10-03  Marcus Meissner <marcus@jet.franken.de>
 
        * libexif/olympus/*.[ch]: Added several Nikon Makernotes
          entries, extracted from exiftool.
 
+2006-09-19  Jan Patera <patera@users.sourceforge.net>
+
+       * libexif/exif-loader.c: exif_loader_write() skips non-EXIF APP1 markers
+
 2006-09-17  Lutz Mueller <lutz@users.sourceforge.net>
 
-  Patch by Jef Driesen <jefdriesen@hotmail.com>:
+       Patch by Jef Driesen <jefdriesen@hotmail.com>:
 
-  * libexif/canon/*: Improve support for canon maker notes.
+       * libexif/canon/*: Improve support for canon maker notes.
 
 2006-05-05  Jan Patera <patera@users.sourceforge.net>
        * libexif/exif-content.c: fixed bug #1471060: wasted space in 

diff --git a/libexif/canon/mnote-canon-entry.c b/libexif/canon/mnote-canon-entry.c
index 925e699..eea44ce 100644 (file)
--- a/libexif/canon/mnote-canon-entry.c
+++ b/libexif/canon/mnote-canon-entry.c
@@ -470,6 +470,15 @@ mnote_canon_entry_get_value (const MnoteCanonEntry *entry, unsigned int t, char
                        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: