Display unknown Canon MakerNote tag data in exif_mnote_data_get_value

Displaying an integer value is better than not displaying anything at
all, and makes Canon match the other supported MakerNote types.

diff --git a/libexif/canon/mnote-canon-entry.c b/libexif/canon/mnote-canon-entry.c
index 712ebe6..6834091 100644 (file)
--- a/libexif/canon/mnote-canon-entry.c
+++ b/libexif/canon/mnote-canon-entry.c
@@ -552,7 +552,9 @@ mnote_canon_entry_get_value (const MnoteCanonEntry *entry, unsigned int t, char
 {
        char buf[128];
        ExifLong vl;
+       ExifSLong vsl;
        ExifShort vs, n;
+       ExifSShort vss;
        unsigned char *data;
        size_t  size;
        double d;
@@ -643,51 +645,51 @@ mnote_canon_entry_get_value (const MnoteCanonEntry *entry, unsigned int t, char
                if (t >= n) return NULL;
                CC (entry->components, n, val, maxlen);
                if (size < 2 + t*2 + 2) return NULL;
-               vs = exif_get_short (data + 2 + t * 2, entry->order);
+               vss = exif_get_sshort (data + 2 + t * 2, entry->order);
                switch (t) {
                case 0:
-                       snprintf (val, maxlen, "%.3f", pow (2, (ExifSShort)vs / 32.0));
+                       snprintf (val, maxlen, "%.3f", pow (2, vss / 32.0));
                        break;
                case 1:
-                       snprintf (val, maxlen, "%.0f", apex_value_to_iso_speed ((ExifSShort)vs / 32.0));
+                       snprintf (val, maxlen, "%.0f", apex_value_to_iso_speed (vss / 32.0));
                        break;
                case 2:
                case 5:
                case 14:
                case 16:
-                       snprintf (val, maxlen, _("%.2f EV"), (ExifSShort)vs / 32.0);
+                       snprintf (val, maxlen, _("%.2f EV"), vss / 32.0);
                        break;
                case 3:
                case 20:
-                       snprintf (val, maxlen, "%.2f", apex_value_to_aperture (vs / 32.0));
+                       snprintf (val, maxlen, "%.2f", apex_value_to_aperture (vss / 32.0));
                        break;
                case 4:
                case 21:
-                       d = apex_value_to_shutter_speed ((ExifSShort)vs / 32.0);
+                       d = apex_value_to_shutter_speed (vss / 32.0);
                        if (d < 1)
                                snprintf (val, maxlen, _("1/%i"),(int)(1.0 / d));
                        else
                                snprintf (val, maxlen, "%i", (int) d);
                        break;
                case 8:
-                       snprintf (val, maxlen, "%u", vs);
+                       snprintf (val, maxlen, "%u", vss);
                        break;
                case 12:
-                       snprintf (val, maxlen, "%.2f", vs / 32.0);
+                       snprintf (val, maxlen, "%.2f", vss / 32.0);
                        break;
                case 18:
                case 19:
-                       snprintf (val, maxlen, _("%u mm"), vs);
+                       snprintf (val, maxlen, _("%u mm"), vss);
                        break;
                case 28:
-                       if ((ExifSShort)vs <= 0) {
+                       if (vss <= 0) {
                                strncpy(val, _("Off"), maxlen);
                                break;
                        }
-                       snprintf (val, maxlen, _("%i (ms)"), vs * 100);
+                       snprintf (val, maxlen, _("%i (ms)"), vss * 100);
                        break;
                default:
-                       canon_search_table_value (entries_settings_2, t, vs, val, maxlen);
+                       canon_search_table_value (entries_settings_2, t, vss, val, maxlen);
                }
                break;
 
@@ -754,28 +756,68 @@ mnote_canon_entry_get_value (const MnoteCanonEntry *entry, unsigned int t, char
                break;
 
        default:
-#ifdef DEBUG
-         {
-               int i;
-               if (entry->format == EXIF_FORMAT_SHORT) {
-                       if (size < entry->components * 2) return NULL;
-                       for(i=0;i<entry->components;i++) {
+               switch (entry->format) {
+               case EXIF_FORMAT_SHORT:
+                 {
+                       size_t i, len = strlen(val);
+                       for(i=0; i<entry->components; i++) {
+                               if (size < 2)
+                                       break;
                                vs = exif_get_short (data, entry->order);
-                               data+=2;
-                               printf ("Value%d=%d\n", i, vs);
+                               snprintf (val+len, maxlen-len, "%hu ", vs);
+                               len = strlen(val);
+                               data += 2;
+                               size -= 2;
+                       }
+                 }
+                 break;
+               case EXIF_FORMAT_SSHORT:
+                 {
+                       size_t i, len = strlen(val);
+                       for(i=0; i<entry->components; i++) {
+                               if (size < 2)
+                                       break;
+                               vss = exif_get_sshort (data, entry->order);
+                               snprintf (val+len, maxlen-len, "%hi ", vss);
+                               data += 2;
+                               size -= 2;
                        }
-               } else if (entry->format == EXIF_FORMAT_LONG) {
-                       if (size < entry->components * 4) return NULL;
-                       for(i=0;i<entry->components;i++) {
+                 }
+                 break;
+               case EXIF_FORMAT_LONG:
+                 {
+                       size_t i, len = strlen(val);
+                       for(i=0; i<entry->components; i++) {
+                               if (size < 4)
+                                       break;
                                vl = exif_get_long (data, entry->order);
-                               data+=4;
-                               printf ("Value%d=%d\n", i, vs);
+                               snprintf (val+len, maxlen-len, "%lu ", (long unsigned) vl);
+                               data += 4;
+                               size -= 4;
                        }
+                 }
+                 break;
+               case EXIF_FORMAT_SLONG:
+                 {
+                       size_t i, len = strlen(val);
+                       for(i=0; i<entry->components; i++) {
+                               if (size < 4)
+                                       break;
+                               vsl = exif_get_slong (data, entry->order);
+                               snprintf (val+len, maxlen-len, "%li ", (long int) vsl);
+                               data += 4;
+                               size -= 4;
+                       }
+                 }
+                 break;
+               case EXIF_FORMAT_ASCII:
+                       strncpy (val, (char *)data, MIN (entry->size, maxlen));
+                       break;
+               default:
+                 snprintf (val, maxlen, _("%i bytes unknown data"),
+                         entry->size);
+                 break;
                }
-               else if (entry->format == EXIF_FORMAT_ASCII)
-                   strncpy (val, data, MIN (entry->size, maxlen));
-         }
-#endif
                break;
        }
        return val;

diff --git a/test/testdata/canon_makernote_variant_1.jpg.parsed b/test/testdata/canon_makernote_variant_1.jpg.parsed
index 41911bc..5dea206 100644 (file)
--- a/test/testdata/canon_makernote_variant_1.jpg.parsed
+++ b/test/testdata/canon_makernote_variant_1.jpg.parsed
@@ -242,7 +242,7 @@ File canon_makernote_variant_1.jpg
     Entry 48: 2, Focal Plane Y Size
       Size: 7
     Entry 49: 3, (unknown)
-      Size: 0
+      Size: 8
     Entry 50: 4, Auto ISO
       Size: 5
     Entry 51: 4, Shot ISO
@@ -310,13 +310,13 @@ File canon_makernote_variant_1.jpg
     Entry 82: 4, Manual Flash Output
       Size: 3
     Entry 83: 0, (unknown)
-      Size: 0
+      Size: 12
     Entry 84: 0, (unknown)
-      Size: 0
+      Size: 8
     Entry 85: 18, (unknown)
-      Size: 0
+      Size: 101
     Entry 86: 19, (unknown)
-      Size: 0
+      Size: 8
     Entry 87: 6, Image Type
       Size: 22
     Entry 88: 7, Firmware Version
@@ -326,12 +326,12 @@ File canon_makernote_variant_1.jpg
     Entry 90: 9, Owner Name
       Size: 0
     Entry 91: 16, (unknown)
-      Size: 0
+      Size: 9
     Entry 92: 0, (unknown)
-      Size: 0
+      Size: 15
     Entry 93: 24, (unknown)
-      Size: 0
+      Size: 22
     Entry 94: 25, (unknown)
-      Size: 0
+      Size: 2
     Entry 95: 13, (unknown)
-      Size: 0
+      Size: 118