Update of /cvsroot/libexif/libexif/libexif
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16744/libexif
Modified Files:
Makefile.am exif-data.c
Log Message:
Added support for Fuji makernotes
Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/Makefile.am,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -d -r1.40 -r1.41
--- Makefile.am 2 Aug 2007 03:02:00 -0000 1.40
+++ Makefile.am 7 Dec 2007 08:46:48 -0000 1.41
@@ -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: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -d -r1.101 -r1.102
--- exif-data.c 10 Nov 2007 08:02:33 -0000 1.101
+++ exif-data.c 7 Dec 2007 08:46:48 -0000 1.102
@@ -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
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, con
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;
}
|
