2004-05-10 Jan Patera <patera@users.sourceforge.net>

	* Support of Nikon maker note

diff --git a/libexif/exif-data.c b/libexif/exif-data.c
index c16d819..6e21983 100644 (file)
--- a/libexif/exif-data.c
+++ b/libexif/exif-data.c
@@ -659,26 +659,31 @@ exif_data_load_data (ExifData *data, const unsigned char *d_orig,
        e = exif_data_get_entry (data, EXIF_TAG_MAKER_NOTE);
        if (e) {
 
-           /* Olympus */
+           /* Olympus & Nikon */
            if ((e->size >= 5) && (!memcmp (e->data, "OLYMP", 5) ||
-                                  !memcmp (e->data, "Nikon", 5)))
-               data->priv->md = exif_mnote_data_olympus_new ();
-
-           /* Pentax */
-           else if ((e->size >= 2) && (e->data[0] == 0x00)
-                                   && (e->data[1] == 0x1b))
-               data->priv->md = exif_mnote_data_pentax_new ();
-
-           else {
-               em = exif_data_get_entry (data, EXIF_TAG_MAKE);
-               if (em) {
-            char value[7];
-
-                   /* Canon */
-                   if (!strcmp (exif_entry_get_value (em, value, sizeof(value)), "Canon"))
-                       data->priv->md = exif_mnote_data_canon_new ();
+                                  !memcmp (e->data, "Nikon", 5))) {
+                       data->priv->md = exif_mnote_data_olympus_new ();
+           } else {
+                       char value[7];
+                       em = exif_data_get_entry (data, EXIF_TAG_MAKE);
+           /* Pentax & some variant of Nikon */
+                       if ((e->size >= 2) && (e->data[0] == 0x00)
+                                   && (e->data[1] == 0x1b)) {
+                               if (em && !strnicmp (exif_entry_get_value (em, value, sizeof(value)), "Nikon", 5)) {
+                                       data->priv->md = exif_mnote_data_olympus_new ();
+                               } else {
+                                       data->priv->md = exif_mnote_data_pentax_new ();
+                               }
+
+                       } else {
+                               /* Canon */
+                               if (em) {
+               
+                                       if (!strcmp (exif_entry_get_value (em, value, sizeof(value)), "Canon"))
+                                               data->priv->md = exif_mnote_data_canon_new ();
+                               }
+                       }
                }
-           }
 
            /* 
             * If we are able to interpret the maker note, do so.

diff --git a/libexif/pentax/mnote-pentax-entry.c b/libexif/pentax/mnote-pentax-entry.c
index c0abc66..02b18f2 100644 (file)
--- a/libexif/pentax/mnote-pentax-entry.c
+++ b/libexif/pentax/mnote-pentax-entry.c
@@ -187,7 +187,7 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry,
        default:
                switch (entry->format) {
                case EXIF_FORMAT_ASCII:
-                 snprintf (val, entry->components, "%s", entry->data);
+                 strncpy (val, entry->data, min(maxlen, entry->components));
                  break;
                case EXIF_FORMAT_SHORT:
                  vs = exif_get_short (entry->data, entry->order);