Added support for Fuji makernotes
authorJan Patera <patera@pictview.com>
Fri, 7 Dec 2007 08:46:49 +0000 (09:46 +0100)
committerJan Patera <patera@pictview.com>
Fri, 7 Dec 2007 08:46:49 +0000 (09:46 +0100)
libexif/Makefile.am
libexif/exif-data.c
libexif/fuji/.gitignore [new file with mode: 0644]
libexif/fuji/Makefile-files [new file with mode: 0644]
libexif/fuji/exif-mnote-data-fuji.c [new file with mode: 0644]
libexif/fuji/exif-mnote-data-fuji.h [new file with mode: 0644]
libexif/fuji/mnote-fuji-entry.c [new file with mode: 0644]
libexif/fuji/mnote-fuji-entry.h [new file with mode: 0644]
libexif/fuji/mnote-fuji-tag.c [new file with mode: 0644]
libexif/fuji/mnote-fuji-tag.h [new file with mode: 0644]

index 19cb29f..0b39504 100644 (file)
@@ -3,6 +3,7 @@ lib_LTLIBRARIES =
 noinst_LTLIBRARIES =
 
 include canon/Makefile-files
+include fuji/Makefile-files
 include olympus/Makefile-files
 include pentax/Makefile-files
 
@@ -32,12 +33,14 @@ libexif_la_SOURCES =                \
 libexif_la_DEPENDENCIES = \
        $(srcdir)/libexif.sym \
        libmnote-canon.la               \
+       libmnote-fuji.la                \
        libmnote-olympus.la     \
        libmnote-pentax.la
 libexif_la_LIBADD =                    \
        $(MATHLIBS)                     \
        $(LTLIBINTL)                    \
        libmnote-canon.la               \
+       libmnote-fuji.la        \
        libmnote-olympus.la     \
        libmnote-pentax.la
 
index 499239c..e2c3591 100644 (file)
@@ -30,8 +30,9 @@
 #include <libexif/i18n.h>
 #include <libexif/exif-system.h>
 
-#include <libexif/olympus/exif-mnote-data-olympus.h>
 #include <libexif/canon/exif-mnote-data-canon.h>
+#include <libexif/fuji/exif-mnote-data-fuji.h>
+#include <libexif/olympus/exif-mnote-data-olympus.h>
 #include <libexif/pentax/exif-mnote-data-pentax.h>
 
 #include <stdlib.h>
@@ -673,7 +674,8 @@ typedef enum {
        EXIF_DATA_TYPE_MAKER_NOTE_OLYMPUS       = 2,
        EXIF_DATA_TYPE_MAKER_NOTE_PENTAX                = 3,
        EXIF_DATA_TYPE_MAKER_NOTE_NIKON         = 4,
-       EXIF_DATA_TYPE_MAKER_NOTE_CASIO         = 5
+       EXIF_DATA_TYPE_MAKER_NOTE_CASIO         = 5,
+       EXIF_DATA_TYPE_MAKER_NOTE_FUJI          = 6
 } ExifDataTypeMakerNote;
 
 static ExifDataTypeMakerNote
@@ -719,6 +721,9 @@ exif_data_get_type_maker_note (ExifData *d)
        if ((e->size >= 8) && !memcmp (e->data, "QVC", 4)) {
                return EXIF_DATA_TYPE_MAKER_NOTE_CASIO;
        }
+       if ((e->size >= 12) && !memcmp (e->data, "FUJIFILM", 8)) {
+               return EXIF_DATA_TYPE_MAKER_NOTE_FUJI;
+       }
 
        return EXIF_DATA_TYPE_MAKER_NOTE_NONE;
 }
@@ -885,6 +890,9 @@ exif_data_load_data (ExifData *data, const unsigned char *d_orig,
        case EXIF_DATA_TYPE_MAKER_NOTE_CANON:
                data->priv->md = exif_mnote_data_canon_new (data->priv->mem, data->priv->options);
                break;
+       case EXIF_DATA_TYPE_MAKER_NOTE_FUJI:
+               data->priv->md = exif_mnote_data_fuji_new (data->priv->mem);
+               break;
        default:
                break;
        }
diff --git a/libexif/fuji/.gitignore b/libexif/fuji/.gitignore
new file mode 100644 (file)
index 0000000..8550dbf
--- /dev/null
@@ -0,0 +1,6 @@
+Makefile
+Makefile.in
+.deps
+.libs
+*.la
+*.lo
diff --git a/libexif/fuji/Makefile-files b/libexif/fuji/Makefile-files
new file mode 100644 (file)
index 0000000..3a520b3
--- /dev/null
@@ -0,0 +1,7 @@
+# -*- Makefile -*-
+noinst_LTLIBRARIES += libmnote-fuji.la
+libmnote_fuji_la_SOURCES = \
+       fuji/mnote-fuji-entry.c fuji/mnote-fuji-entry.h \
+       fuji/exif-mnote-data-fuji.c fuji/exif-mnote-data-fuji.h \
+       fuji/mnote-fuji-tag.c fuji/mnote-fuji-tag.h
+libmnote_fuji_la_LIBADD = $(LTLIBINTL)
diff --git a/libexif/fuji/exif-mnote-data-fuji.c b/libexif/fuji/exif-mnote-data-fuji.c
new file mode 100644 (file)
index 0000000..6cbbafe
--- /dev/null
@@ -0,0 +1,285 @@
+/* exif-mnote-data-fuji.c
+ *
+ * Copyright © 2002 Lutz Müller <lutz@users.sourceforge.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details. 
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+
+#include <config.h>
+#include <libexif/exif-byte-order.h>
+#include <libexif/exif-utils.h>
+
+#include "exif-mnote-data-fuji.h"
+
+struct _MNoteFujiDataPrivate {
+       ExifByteOrder order;
+};
+
+static void
+exif_mnote_data_fuji_clear (ExifMnoteDataFuji *n)
+{
+       ExifMnoteData *d = (ExifMnoteData *) n;
+       unsigned int i;
+
+       if (!n) return;
+
+       if (n->entries) {
+               for (i = 0; i < n->count; i++)
+                       if (n->entries[i].data) {
+                               exif_mem_free (d->mem, n->entries[i].data);
+                               n->entries[i].data = NULL;
+                       }
+               exif_mem_free (d->mem, n->entries);
+               n->entries = NULL;
+               n->count = 0;
+       }
+}
+
+static void
+exif_mnote_data_fuji_free (ExifMnoteData *n)
+{
+       if (!n) return;
+
+       exif_mnote_data_fuji_clear ((ExifMnoteDataFuji *) n);
+}
+
+static char *
+exif_mnote_data_fuji_get_value (ExifMnoteData *d, unsigned int i, char *val, unsigned int maxlen)
+{
+       ExifMnoteDataFuji *n = (ExifMnoteDataFuji *) d;
+
+       if (!d || !val) return NULL;
+       if (i > n->count -1) return NULL;
+       exif_log (d->log, EXIF_LOG_CODE_DEBUG, "ExifMnoteDataFuji",
+                 "Querying value for tag '%s'...",
+                 mnote_fuji_tag_get_name (n->entries[i].tag));
+       return mnote_fuji_entry_get_value (&n->entries[i], val, maxlen);
+}
+
+static void
+exif_mnote_data_fuji_save (ExifMnoteData *ne, unsigned char **buf,
+                          unsigned int *buf_size)
+{
+       ExifMnoteDataFuji *n = (ExifMnoteDataFuji *) ne;
+       unsigned int i, o, s, doff;
+
+       if (!n || !buf || !buf_size) return;
+
+       /*
+        * Allocate enough memory for all entries and the number
+        * of entries.
+        */
+       *buf_size = 8 + 4 + 2 + n->count * 12 + 4;
+       *buf = exif_mem_alloc (ne->mem, *buf_size);
+       if (!*buf) {
+               *buf_size = 0;
+               return;
+       }
+
+       /*
+        * Header: "FUJIFILM" and 4 bytes offset to the first entry.
+        * As the first entry will start right thereafter, the offset is 12.
+        */
+       memcpy (*buf, "FUJIFILM", 8);
+       exif_set_long (*buf + 8, n->order, 12);
+
+       /* Save the number of entries */
+       exif_set_short (*buf + 8 + 4, n->order, (ExifShort) n->count);
+       
+       /* Save each entry */
+       for (i = 0; i < n->count; i++) {
+               o = 8 + 4 + 2 + i * 12;
+               exif_set_short (*buf + o + 0, n->order, (ExifShort) n->entries[i].tag);
+               exif_set_short (*buf + o + 2, n->order, (ExifShort) n->entries[i].format);
+               exif_set_long  (*buf + o + 4, n->order, n->entries[i].components);
+               o += 8;
+               s = exif_format_get_size (n->entries[i].format) *
+                                               n->entries[i].components;
+               if (s > 4) {
+                       *buf_size += s;
+
+                       /* Ensure even offsets. Set padding bytes to 0. */
+                       if (s & 1) *buf_size += 1;
+                       *buf = exif_mem_realloc (ne->mem, *buf, *buf_size);
+                       if (!*buf) {
+                               *buf_size = 0;
+                               return;
+                       }
+                       doff = *buf_size - s;
+                       if (s & 1) { doff--; *(*buf + *buf_size - 1) = '\0'; }
+                       exif_set_long (*buf + o, n->order, doff);
+               } else
+                       doff = o;
+
+               /*
+                * Write the data. Fill unneeded bytes with 0. Do not
+                * crash if data is NULL.
+                */
+               if (!n->entries[i].data) memset (*buf + doff, 0, s);
+               else memcpy (*buf + doff, n->entries[i].data, s);
+       }
+}
+
+static void
+exif_mnote_data_fuji_load (ExifMnoteData *en,
+       const unsigned char *buf, unsigned int buf_size)
+{
+       ExifMnoteDataFuji *n = (ExifMnoteDataFuji*) en;
+       ExifLong c;
+       unsigned int i, o, s, datao = 6 + n->offset;
+
+       if (!n || !buf || !buf_size || (buf_size < datao + 12)) return;
+
+       /* Read the number of entries and remove old ones. */
+       n->order = EXIF_BYTE_ORDER_INTEL;
+       datao += exif_get_long (buf + datao + 8, EXIF_BYTE_ORDER_INTEL);
+       c = exif_get_short (buf + datao, EXIF_BYTE_ORDER_INTEL);
+       datao += 2;
+       exif_mnote_data_fuji_clear (n);
+
+       /* Parse the entries */
+       for (i = 0; i < c; i++) {
+               o = datao + 12 * i;
+               if (datao + 12 > buf_size) return;
+
+               n->count = i + 1;
+               n->entries = exif_mem_realloc (en->mem, n->entries,
+                               sizeof (MnoteFujiEntry) * (i+1));
+               memset (&n->entries[i], 0, sizeof (MnoteFujiEntry));
+               n->entries[i].tag        = exif_get_short (buf + o, n->order);
+               n->entries[i].format     = exif_get_short (buf + o + 2, n->order);
+               n->entries[i].components = exif_get_long (buf + o + 4, n->order);
+               n->entries[i].order      = n->order;
+
+               /*
+                * Size? If bigger than 4 bytes, the actual data is not
+                * in the entry but somewhere else (offset).
+                */
+               s = exif_format_get_size (n->entries[i].format) * n->entries[i].components;
+               if (!s) return;
+               o += 8;
+               if (s > 4) o = exif_get_long (buf + o, n->order) + 6 + n->offset;
+               if (o + s > buf_size) return;
+
+               /* Sanity check */
+               n->entries[i].data = exif_mem_alloc (en->mem, s);
+               if (!n->entries[i].data) return;
+               n->entries[i].size = s;
+               memcpy (n->entries[i].data, buf + o, s);
+       }
+}
+
+static unsigned int
+exif_mnote_data_fuji_count (ExifMnoteData *n)
+{
+       return n ? ((ExifMnoteDataFuji *) n)->count : 0;
+}
+
+static unsigned int
+exif_mnote_data_fuji_get_id (ExifMnoteData *d, unsigned int n)
+{
+       ExifMnoteDataFuji *note = (ExifMnoteDataFuji *) d;
+
+       if (!note) return 0;
+       if (note->count <= n) return 0;
+       return note->entries[n].tag;
+}
+
+static const char *
+exif_mnote_data_fuji_get_name (ExifMnoteData *d, unsigned int i)
+{
+       ExifMnoteDataFuji *n = (ExifMnoteDataFuji *) d;
+
+       if (!n) return NULL;
+       if (i >= n->count) return NULL;
+       return mnote_fuji_tag_get_name (n->entries[i].tag);
+}
+
+static const char *
+exif_mnote_data_fuji_get_title (ExifMnoteData *d, unsigned int i)
+{
+       ExifMnoteDataFuji *n = (ExifMnoteDataFuji *) d;
+       
+       if (!n) return NULL;
+       if (i >= n->count) return NULL;
+        return mnote_fuji_tag_get_title (n->entries[i].tag);
+}
+
+static const char *
+exif_mnote_data_fuji_get_description (ExifMnoteData *d, unsigned int i)
+{
+       ExifMnoteDataFuji *n = (ExifMnoteDataFuji *) d;
+       
+       if (!n) return NULL;
+       if (i >= n->count) return NULL;
+        return mnote_fuji_tag_get_description (n->entries[i].tag);
+}
+
+static void
+exif_mnote_data_fuji_set_byte_order (ExifMnoteData *d, ExifByteOrder o)
+{
+       ExifByteOrder o_orig;
+       ExifMnoteDataFuji *n = (ExifMnoteDataFuji *) d;
+       unsigned int i;
+
+       if (!n) return;
+
+       o_orig = n->order;
+       n->order = o;
+       for (i = 0; i < n->count; i++) {
+               n->entries[i].order = o;
+               exif_array_set_byte_order (n->entries[i].format, n->entries[i].data,
+                               n->entries[i].components, o_orig, o);
+       }
+}
+
+static void
+exif_mnote_data_fuji_set_offset (ExifMnoteData *n, unsigned int o)
+{
+       if (n) ((ExifMnoteDataFuji *) n)->offset = o;
+}
+
+ExifMnoteData *
+exif_mnote_data_fuji_new (ExifMem *mem)
+{
+       ExifMnoteData *d;
+
+       if (!mem) return NULL;
+
+       d = exif_mem_alloc (mem, sizeof (ExifMnoteDataFuji));
+       if (!d) return NULL;
+
+       exif_mnote_data_construct (d, mem);
+
+       /* Set up function pointers */
+       d->methods.free            = exif_mnote_data_fuji_free;
+       d->methods.set_byte_order  = exif_mnote_data_fuji_set_byte_order;
+       d->methods.set_offset      = exif_mnote_data_fuji_set_offset;
+       d->methods.load            = exif_mnote_data_fuji_load;
+       d->methods.save            = exif_mnote_data_fuji_save;
+       d->methods.count           = exif_mnote_data_fuji_count;
+       d->methods.get_id          = exif_mnote_data_fuji_get_id;
+       d->methods.get_name        = exif_mnote_data_fuji_get_name;
+       d->methods.get_title       = exif_mnote_data_fuji_get_title;
+       d->methods.get_description = exif_mnote_data_fuji_get_description;
+       d->methods.get_value       = exif_mnote_data_fuji_get_value;
+
+       return d;
+}
diff --git a/libexif/fuji/exif-mnote-data-fuji.h b/libexif/fuji/exif-mnote-data-fuji.h
new file mode 100644 (file)
index 0000000..67580b0
--- /dev/null
@@ -0,0 +1,43 @@
+/* exif-mnote-data-fuji.h
+ *
+ * Copyright © 2002 Lutz Müller <lutz@users.sourceforge.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details. 
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __MNOTE_FUJI_CONTENT_H__
+#define __MNOTE_FUJI_CONTENT_H__
+
+#include <libexif/exif-mnote-data.h>
+
+typedef struct _ExifMnoteDataFuji        ExifMnoteDataFuji;
+
+#include <libexif/exif-mnote-data-priv.h>
+#include <libexif/fuji/mnote-fuji-entry.h>
+
+struct _ExifMnoteDataFuji {
+       ExifMnoteData parent;
+
+       MnoteFujiEntry *entries;
+       unsigned int count;
+
+       ExifByteOrder order;
+       unsigned int offset;
+};
+
+ExifMnoteData *exif_mnote_data_fuji_new (ExifMem *);
+
+#endif /* __MNOTE_FUJI_CONTENT_H__ */
diff --git a/libexif/fuji/mnote-fuji-entry.c b/libexif/fuji/mnote-fuji-entry.c
new file mode 100644 (file)
index 0000000..2853c90
--- /dev/null
@@ -0,0 +1,306 @@
+/* mnote-fuji-entry.c
+ *
+ * Copyright © 2002 Lutz Müller <lutz@users.sourceforge.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details. 
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <config.h>
+
+#include <libexif/i18n.h>
+
+#include "mnote-fuji-entry.h"
+
+#define CF(format,target,v,maxlen)                              \
+{                                                               \
+        if (format != target) {                                 \
+                snprintf (v, maxlen,                           \
+                        _("Invalid format '%s', "               \
+                        "expected '%s'."),                      \
+                        exif_format_get_name (format),          \
+                        exif_format_get_name (target));         \
+                break;                                          \
+        }                                                       \
+}
+
+#define CC(number,target,v,maxlen)                                      \
+{                                                                       \
+        if (number != target) {                                         \
+                snprintf (v, maxlen,                                    \
+                        _("Invalid number of components (%i, "          \
+                        "expected %i)."), (int) number, (int) target);  \
+                break;                                                  \
+        }                                                               \
+}
+
+static const struct {
+       ExifTag tag;
+       struct {
+               int index;
+               const char *string;
+       } elem[22];
+} items[] = {
+#ifndef NO_VERBOSE_TAG_DATA
+  { MNOTE_FUJI_TAG_SHARPNESS,
+    { {1, N_("Softest")},
+      {2, N_("Soft")},
+      {3, N_("Normal")},
+      {4, N_("Hard")},
+      {5, N_("Hardest")},
+      {0x0082, N_("Medium soft")},
+      {0x0084, N_("Medium hard")},
+      {0x8000, N_("Film simulation mode")},
+      {0xFFFF, N_("Off")},
+      {0, NULL}}},
+  { MNOTE_FUJI_TAG_WHITE_BALANCE,
+    { {0, N_("Auto")},
+      {0x100, N_("Daylight")},
+      {0x200, N_("Cloudy")},
+      {0x300, N_("Daylight-color fluorescent")},
+      {0x301, N_("DayWhite-color fluorescent")},
+      {0x302, N_("White fluorescent")},
+      {0x400, N_("Incandescent")},
+      {0x500, N_("Flash")},
+      {0xF00, N_("Custom")},
+      {0, NULL}}},
+  { MNOTE_FUJI_TAG_COLOR,
+    { {0, N_("Standard")},
+      {0x0080, N_("Medium high")},
+      {0x0100, N_("High")},
+      {0x0180, N_("Medium low")},
+      {0x0200, N_("Original")},
+      {0x0300, N_("Black & white")},
+      {0x8000, N_("Film simulation mode")},
+      {0, NULL}}},
+  { MNOTE_FUJI_TAG_TONE,
+    { {0, N_("Standard")},
+      {0x0080, N_("Medium hard")},
+      {0x0100, N_("Hard")},
+      {0x0180, N_("Medium soft")},
+      {0x0200, N_("Original")},
+      {0x8000, N_("Film simulation mode")},
+      {0, NULL}}},
+  { MNOTE_FUJI_TAG_FLASH_MODE,
+    { {0, N_("Auto")},
+      {1, N_("On")},
+      {2, N_("Off")},
+      {3, N_("Red-eye reduction")},
+      {0, NULL}}},
+  { MNOTE_FUJI_TAG_MACRO,
+    { {0, N_("Off")},
+      {1, N_("On")},
+      {0, NULL}}},
+  { MNOTE_FUJI_TAG_FOCUS_MODE,
+    { {0, N_("Auto")},
+      {1, N_("Manual")},
+      {0, NULL}}},
+  { MNOTE_FUJI_TAG_SLOW_SYNC,
+    { {0, N_("Off")},
+      {1, N_("On")},
+      {0, NULL}}},
+  { MNOTE_FUJI_TAG_PICTURE_MODE,
+    { {0, N_("Auto")},
+      {1, N_("Portrait")},
+      {2, N_("Landscape")},
+      {4, N_("Sports")},
+      {5, N_("Night")},
+      {6, N_("Program AE")},
+      {7, N_("Natural photo")},
+      {8, N_("Vibration reduction")},
+      {0x000A, N_("Sunset")},
+      {0x000B, N_("Museum")},
+      {0x000C, N_("Party")},
+      {0x000D, N_("Flower")},
+      {0x000E, N_("Text")},
+      {0x000F, N_("NP & flash")},
+      {0x0010, N_("Beach")},
+      {0x0011, N_("Snow")},
+      {0x0012, N_("Fireworks")},
+      {0x0013, N_("Underwater")},
+      {0x0100, N_("Aperture priority AE")},
+      {0x0200, N_("Shutter priority AE")},
+      {0x0300, N_("Manual exposure")},
+      {0, NULL}}},
+  { MNOTE_FUJI_TAG_CONT_TAKING,
+    { {0, N_("Off")},
+      {1, N_("On")},
+      {0, NULL}}},
+  { MNOTE_FUJI_TAG_FINEPIX_COLOR,
+    { {0x00, N_("F-Standard")},
+      {0x10, N_("F-Chrome")},
+      {0x30, N_("F-B&W")},
+      {0, NULL}}},
+  { MNOTE_FUJI_TAG_BLUR_CHECK,
+    { {0, N_("No blur")},
+      {1, N_("Blur warning")},
+      {0, NULL}}},
+  { MNOTE_FUJI_TAG_FOCUS_CHECK,
+    { {0, N_("Focus good")},
+      {1, N_("Out of focus")},
+      {0, NULL}}},
+  { MNOTE_FUJI_TAG_AUTO_EXPOSURE_CHECK,
+    { {0, N_("AE good")},
+      {1, N_("Over exposed")},
+      {0, NULL}}},
+  { MNOTE_FUJI_TAG_DYNAMIC_RANGE,
+    { {1, N_("Standard")},
+      {3, N_("Wide")},
+      {0, NULL}}},
+  { MNOTE_FUJI_TAG_FILM_MODE,
+    { {0, N_("F0/Standard")},
+      {0x0100, N_("F1/Studio portrait")},
+      {0x0110, N_("F1a/Professional portrait")},
+      {0x0120, N_("F1b/Professional portrait")},
+      {0x0130, N_("F1c/Professional portrait")},
+      {0x0200, N_("F2/Fujichrome")},
+      {0x0300, N_("F3/Studio portrait Ex")},
+      {0x0400, N_("F4/Velvia")},
+      {0, NULL}}},
+  { MNOTE_FUJI_TAG_DYNAMIC_RANGE_SETTING,
+    { {0, N_("Auto (100-400%)")},
+      {1, N_("RAW")},
+      {0x0100, N_("Standard (100%)")},
+      {0x0200, N_("Wide1 (230%)")},
+      {0x0201, N_("Wide2 (400%)")},
+      {0x8000, N_("Film simulation mode")},
+      {0, NULL}}},
+#endif
+  {0, {{0, NULL}}}
+};
+
+
+char *
+mnote_fuji_entry_get_value (MnoteFujiEntry *entry,
+                             char *val, unsigned int maxlen)
+{
+       ExifLong  vl;
+       ExifSLong vsl;
+       ExifShort vs, vs2;
+       ExifRational vr;
+       ExifSRational vsr;
+       int i, j;
+
+       if (!entry) return (NULL);
+
+       memset (val, 0, maxlen);
+       maxlen--;
+
+       switch (entry->tag) {
+         case MNOTE_FUJI_TAG_VERSION:
+               CF (entry->format, EXIF_FORMAT_UNDEFINED, val, maxlen);
+               CC (entry->components, 4, val, maxlen);
+               memcpy (val, entry->data, MIN(maxlen, entry->size));
+               break;
+         case MNOTE_FUJI_TAG_SHARPNESS:
+         case MNOTE_FUJI_TAG_WHITE_BALANCE:
+         case MNOTE_FUJI_TAG_COLOR:
+         case MNOTE_FUJI_TAG_TONE:
+         case MNOTE_FUJI_TAG_FLASH_MODE:
+         case MNOTE_FUJI_TAG_MACRO:
+         case MNOTE_FUJI_TAG_FOCUS_MODE:
+         case MNOTE_FUJI_TAG_SLOW_SYNC:
+         case MNOTE_FUJI_TAG_PICTURE_MODE:
+         case MNOTE_FUJI_TAG_CONT_TAKING:
+         case MNOTE_FUJI_TAG_FINEPIX_COLOR:
+         case MNOTE_FUJI_TAG_BLUR_CHECK:
+         case MNOTE_FUJI_TAG_FOCUS_CHECK:
+         case MNOTE_FUJI_TAG_AUTO_EXPOSURE_CHECK:
+         case MNOTE_FUJI_TAG_DYNAMIC_RANGE:
+         case MNOTE_FUJI_TAG_FILM_MODE:
+         case MNOTE_FUJI_TAG_DYNAMIC_RANGE_SETTING:
+               CF (entry->format, EXIF_FORMAT_SHORT, val, maxlen);
+               CC (entry->components, 1, val, maxlen);
+               vs = exif_get_short (entry->data, entry->order);
+
+               /* search the tag */
+               for (i = 0; (items[i].tag && items[i].tag != entry->tag); i++);
+               if (!items[i].tag) {
+                       snprintf (val, maxlen,
+                                 _("Internal error (unknown value %i)"), vs);
+                       break;
+               }
+
+               /* find the value */
+               for (j = 0; items[i].elem[j].string &&
+                   (items[i].elem[j].index < vs); j++);
+               if (items[i].elem[j].index != vs) {
+                       snprintf (val, maxlen,
+                                 _("Internal error (unknown value %i)"), vs);
+                       break;
+               }
+               strncpy (val, items[i].elem[j].string, maxlen);
+               break;
+         case MNOTE_FUJI_TAG_FOCUS_POINT:
+               CF (entry->format, EXIF_FORMAT_SHORT, val, maxlen);
+               CC (entry->components, 2, val, maxlen);
+               vs = exif_get_short (entry->data, entry->order);
+               vs2 = exif_get_short (entry->data+2, entry->order);
+               snprintf (val, maxlen, "%i, %i", vs, vs2);
+               break;
+         case MNOTE_FUJI_TAG_MIN_FOCAL_LENGTH:
+         case MNOTE_FUJI_TAG_MAX_FOCAL_LENGTH:
+               CF (entry->format, EXIF_FORMAT_RATIONAL, val, maxlen);
+               CC (entry->components, 1, val, maxlen);
+               vr = exif_get_rational (entry->data, entry->order);
+               if (!vr.denominator) break;
+               snprintf (val, maxlen, _("%2.2f mm"), (double) vr.numerator /
+                         vr.denominator);
+               break;
+
+       default:
+               switch (entry->format) {
+               case EXIF_FORMAT_ASCII:
+                 strncpy (val, (char *)entry->data, MIN(maxlen, entry->size));
+                 break;
+               case EXIF_FORMAT_SHORT:
+                 vs = exif_get_short (entry->data, entry->order);
+                 snprintf (val, maxlen, "%i", vs);
+                 break;
+               case EXIF_FORMAT_LONG:
+                 vl = exif_get_long (entry->data, entry->order);
+                 snprintf (val, maxlen, "%lu", (long unsigned) vl);
+                 break;
+               case EXIF_FORMAT_SLONG:
+                 vsl = exif_get_slong (entry->data, entry->order);
+                 snprintf (val, maxlen, "%li", (long int) vsl);
+                 break;
+               case EXIF_FORMAT_RATIONAL:
+                 vr = exif_get_rational (entry->data, entry->order);
+                 if (!vr.denominator) break;
+                 snprintf (val, maxlen, _("%2.4f"), (double) vr.numerator /
+                                                   vr.denominator);
+                 break;
+               case EXIF_FORMAT_SRATIONAL:
+                 vsr = exif_get_srational (entry->data, entry->order);
+                 if (!vsr.denominator) break;
+                 snprintf (val, maxlen, _("%2.4f"), (double) vsr.numerator /
+                         vsr.denominator);
+                 break;
+               case EXIF_FORMAT_UNDEFINED:
+               default:
+                 snprintf (val, maxlen, _("%i bytes unknown data"),
+                         entry->size);
+                 break;
+               }
+               break;
+       }
+
+       return (val);
+}
diff --git a/libexif/fuji/mnote-fuji-entry.h b/libexif/fuji/mnote-fuji-entry.h
new file mode 100644 (file)
index 0000000..b1bcfb6
--- /dev/null
@@ -0,0 +1,45 @@
+/* mnote-fuji-entry.h
+ *
+ * Copyright © 2002 Lutz Müller <lutz@users.sourceforge.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details. 
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __MNOTE_FUJI_ENTRY_H__
+#define __MNOTE_FUJI_ENTRY_H__
+
+#include <libexif/exif-format.h>
+#include <libexif/fuji/mnote-fuji-tag.h>
+
+typedef struct _MnoteFujiEntry        MnoteFujiEntry;
+typedef struct _MnoteFujiEntryPrivate MnoteFujiEntryPrivate;
+
+#include <libexif/fuji/exif-mnote-data-fuji.h>
+
+struct _MnoteFujiEntry {
+       MnoteFujiTag tag;
+       ExifFormat format;
+       unsigned long components;
+
+       unsigned char *data;
+       unsigned int size;
+
+       ExifByteOrder order;
+};
+
+char *mnote_fuji_entry_get_value (MnoteFujiEntry *entry, char *val, unsigned int maxlen);
+
+#endif /* __MNOTE_FUJI_ENTRY_H__ */
diff --git a/libexif/fuji/mnote-fuji-tag.c b/libexif/fuji/mnote-fuji-tag.c
new file mode 100644 (file)
index 0000000..ab6029b
--- /dev/null
@@ -0,0 +1,101 @@
+/* mnote-fuji-tag.c
+ *
+ * Copyright © 2002 Lutz Müller <lutz@users.sourceforge.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details. 
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include <stdlib.h>
+
+#include <config.h>
+#include <libexif/i18n.h>
+
+#include "mnote-fuji-tag.h"
+
+
+static struct {
+       MnoteFujiTag tag;
+       const char *name;
+       const char *title;
+       const char *description;
+} table[] = {
+#ifndef NO_VERBOSE_TAG_STRINGS
+       {MNOTE_FUJI_TAG_VERSION, "Version", N_("Maker Note Version"), ""},
+       {MNOTE_FUJI_TAG_SERIAL_NUMBER, "SerialNumber", N_("Serial Number"), N_("This number is unique, it contains the date of manufacture.")},
+       {MNOTE_FUJI_TAG_QUALITY, "Quality", N_("Quality"), ""},
+       {MNOTE_FUJI_TAG_SHARPNESS, "Sharpness", N_("Sharpness"), ""},
+       {MNOTE_FUJI_TAG_WHITE_BALANCE, "WhiteBalance", N_("White Balance"), ""},
+       {MNOTE_FUJI_TAG_COLOR, "ChromaticitySaturation", N_("Chromaticity Saturation"), ""},
+       {MNOTE_FUJI_TAG_TONE, "Contrast", N_("Contrast"), ""},
+       {MNOTE_FUJI_TAG_FLASH_MODE, "FlashMode", N_("Flash Mode"), ""},
+       {MNOTE_FUJI_TAG_FLASH_STRENGTH, "FlashStrength", N_("Flash Firing Strength Compensation"), ""},
+       {MNOTE_FUJI_TAG_MACRO, "MacroMode", N_("Macro mode"), ""},
+       {MNOTE_FUJI_TAG_FOCUS_MODE, "FocusingMode", N_("Focusing Mode"), ""},
+       {MNOTE_FUJI_TAG_FOCUS_POINT, "FocusPoint", N_("Focus Point"), ""},
+       {MNOTE_FUJI_TAG_SLOW_SYNC, "SlowSynchro", N_("Slow Synchro Mode"), ""},
+       {MNOTE_FUJI_TAG_PICTURE_MODE, "PictureMode", N_("Picture Mode"), ""},
+       {MNOTE_FUJI_TAG_CONT_TAKING, "ContinuousTaking", N_("Continuous Taking"), ""},
+       {MNOTE_FUJI_TAG_SEQUENCE_NUMBER, "ContinuousSequence", N_("Continuous Sequence Number"), ""},
+       {MNOTE_FUJI_TAG_FINEPIX_COLOR, "FinePixColor", N_("FinePix Color"), ""},
+       {MNOTE_FUJI_TAG_BLUR_CHECK, "BlurCheck", N_("Blur Check"), ""},
+       {MNOTE_FUJI_TAG_FOCUS_CHECK, "AutoFocusCheck", N_("Auto Focus Check"), ""},
+       {MNOTE_FUJI_TAG_AUTO_EXPOSURE_CHECK, "AutoExposureCheck", N_("Auto Exposure Check"), ""},
+       {MNOTE_FUJI_TAG_DYNAMIC_RANGE, "DynamicRange", N_("Dynamic Range"), ""},
+       {MNOTE_FUJI_TAG_FILM_MODE, "FilmMode", N_("Film simulation Mode"), ""},
+       {MNOTE_FUJI_TAG_DYNAMIC_RANGE_SETTING, "DRangeMode", N_("Dynamic Range Wide Mode"), ""},
+       {MNOTE_FUJI_TAG_DEV_DYNAMIC_RANGE_SETTING, "DevDRangeMode", N_("Development Dynamic Range Wide Mode"), ""},
+       {MNOTE_FUJI_TAG_MIN_FOCAL_LENGTH, "MinFocalLen", N_("Minimum Focal Length"), ""},
+       {MNOTE_FUJI_TAG_MAX_FOCAL_LENGTH, "MaxFocalLen", N_("Maximum Focal Length"), ""},
+       {MNOTE_FUJI_TAG_MAX_APERT_AT_MIN_FOC, "MaxApertAtMinFoc", N_("Maximum Aperture at Mininimum Focal"), ""},
+       {MNOTE_FUJI_TAG_MAX_APERT_AT_MAX_FOC, "MaxApertAtMaxFoc", N_("Maximum Aperture at Maxinimum Focal"), ""},
+       {MNOTE_FUJI_TAG_FILE_SOURCE, "FileSource", N_("File Source"), ""},
+       {MNOTE_FUJI_TAG_ORDER_NUMBER, "OrderNumber", N_("Order Number"), ""},
+       {MNOTE_FUJI_TAG_FRAME_NUMBER, "FrameNumber", N_("Frame Number"), ""},
+#endif
+       {0, NULL, NULL, NULL}
+};
+
+const char *
+mnote_fuji_tag_get_name (MnoteFujiTag t)
+{
+       unsigned int i;
+
+       for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
+               if (table[i].tag == t) return (table[i].name);
+       return NULL;
+}
+
+const char *
+mnote_fuji_tag_get_title (MnoteFujiTag t)
+{
+       unsigned int i;
+
+       bindtextdomain (GETTEXT_PACKAGE, LIBMNOTE_LOCALEDIR);
+       for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
+               if (table[i].tag == t) return (_(table[i].title));
+       return NULL;
+}
+
+const char *
+mnote_fuji_tag_get_description (MnoteFujiTag t)
+{
+       unsigned int i;
+
+       bindtextdomain (GETTEXT_PACKAGE, LIBMNOTE_LOCALEDIR);
+       for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
+               if (table[i].tag == t) return (_(table[i].description));
+       return NULL;
+}
diff --git a/libexif/fuji/mnote-fuji-tag.h b/libexif/fuji/mnote-fuji-tag.h
new file mode 100644 (file)
index 0000000..a2ef8e4
--- /dev/null
@@ -0,0 +1,92 @@
+/* mnote-fuji-tag.h
+ *
+ * Copyright © 2002 Lutz Müller <lutz@users.sourceforge.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details. 
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __MNOTE_FUJI_TAG_H__
+#define __MNOTE_FUJI_TAG_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <libexif/exif-data.h>
+
+enum _MnoteFujiTag {
+       MNOTE_FUJI_TAG_VERSION                  = 0x0000,
+       MNOTE_FUJI_TAG_SERIAL_NUMBER            = 0x0010,
+       MNOTE_FUJI_TAG_QUALITY                  = 0x1000,
+       MNOTE_FUJI_TAG_SHARPNESS                = 0x1001,
+       MNOTE_FUJI_TAG_WHITE_BALANCE            = 0x1002,
+       MNOTE_FUJI_TAG_COLOR                    = 0x1003,
+       MNOTE_FUJI_TAG_TONE                     = 0x1004,
+       MNOTE_FUJI_TAG_UNKNOWN_1006             = 0x1006,
+       MNOTE_FUJI_TAG_UNKNOWN_1007             = 0x1007,
+       MNOTE_FUJI_TAG_UNKNOWN_1008             = 0x1008,
+       MNOTE_FUJI_TAG_UNKNOWN_1009             = 0x1009,
+       MNOTE_FUJI_TAG_UNKNOWN_100A             = 0x100A,
+       MNOTE_FUJI_TAG_UNKNOWN_100B             = 0x100B,
+       MNOTE_FUJI_TAG_FLASH_MODE               = 0x1010,
+       MNOTE_FUJI_TAG_FLASH_STRENGTH           = 0x1011,
+       MNOTE_FUJI_TAG_MACRO                    = 0x1020,
+       MNOTE_FUJI_TAG_FOCUS_MODE               = 0x1021,
+       MNOTE_FUJI_TAG_UNKNOWN_1022             = 0x1022,
+       MNOTE_FUJI_TAG_FOCUS_POINT              = 0x1023,
+       MNOTE_FUJI_TAG_UNKNOWN_1024             = 0x1024,
+       MNOTE_FUJI_TAG_UNKNOWN_1025             = 0x1025,
+       MNOTE_FUJI_TAG_SLOW_SYNC                = 0x1030,
+       MNOTE_FUJI_TAG_PICTURE_MODE             = 0x1031,
+       MNOTE_FUJI_TAG_UNKNOWN_1032             = 0x1032,
+       MNOTE_FUJI_TAG_CONT_TAKING              = 0x1100,
+       MNOTE_FUJI_TAG_SEQUENCE_NUMBER          = 0x1101,
+       MNOTE_FUJI_TAG_UNKNOWN_1200             = 0x1200,
+       MNOTE_FUJI_TAG_FINEPIX_COLOR            = 0x1210,
+       MNOTE_FUJI_TAG_BLUR_CHECK               = 0x1300,
+       MNOTE_FUJI_TAG_FOCUS_CHECK              = 0x1301,
+       MNOTE_FUJI_TAG_AUTO_EXPOSURE_CHECK      = 0x1302,
+       MNOTE_FUJI_TAG_UNKNOWN_1303             = 0x1303,
+       MNOTE_FUJI_TAG_DYNAMIC_RANGE            = 0x1400,
+       MNOTE_FUJI_TAG_FILM_MODE                = 0x1401,
+       MNOTE_FUJI_TAG_DYNAMIC_RANGE_SETTING    = 0x1402,
+       MNOTE_FUJI_TAG_DEV_DYNAMIC_RANGE_SETTING= 0x1403,
+       MNOTE_FUJI_TAG_MIN_FOCAL_LENGTH         = 0x1404,
+       MNOTE_FUJI_TAG_MAX_FOCAL_LENGTH         = 0x1405,
+       MNOTE_FUJI_TAG_MAX_APERT_AT_MIN_FOC     = 0x1406,
+       MNOTE_FUJI_TAG_MAX_APERT_AT_MAX_FOC     = 0x1407,
+       MNOTE_FUJI_TAG_UNKNOWN_1408             = 0x1408,
+       MNOTE_FUJI_TAG_UNKNOWN_1409             = 0x1409,
+       MNOTE_FUJI_TAG_UNKNOWN_140A             = 0x140A,
+       MNOTE_FUJI_TAG_UNKNOWN_1410             = 0x1410,
+       MNOTE_FUJI_TAG_UNKNOWN_1421             = 0x1421,
+       MNOTE_FUJI_TAG_UNKNOWN_4100             = 0x4100,
+       MNOTE_FUJI_TAG_UNKNOWN_4800             = 0x4800,
+       MNOTE_FUJI_TAG_FILE_SOURCE              = 0x8000,
+       MNOTE_FUJI_TAG_ORDER_NUMBER             = 0x8002,
+       MNOTE_FUJI_TAG_FRAME_NUMBER             = 0x8003,
+};
+typedef enum _MnoteFujiTag MnoteFujiTag;
+
+const char *mnote_fuji_tag_get_name        (MnoteFujiTag tag);
+const char *mnote_fuji_tag_get_title       (MnoteFujiTag tag);
+const char *mnote_fuji_tag_get_description (MnoteFujiTag tag);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __MNOTE_FUJI_TAG_H__ */