[libexif-cvs] libexif/libexif exif-data.c,1.36,1.37

[Lutz M?l. <lu...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30169/libexif

Modified Files:
	exif-data.c 
Log Message:

2004-05-04  Lutz Mueller <lu...@us...>

	* libexif/olympus: Make it support Nikon maker notes, too. 
	  Code based on work by Serge Droz <ser...@ps...>.


Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- exif-data.c	4 Apr 2004 09:01:01 -0000	1.36
+++ exif-data.c	4 May 2004 21:27:01 -0000	1.37
@@ -660,7 +660,8 @@
 	if (e) {
 
 	    /* Olympus */
-	    if ((e->size >= 5) && (!memcmp (e->data, "OLYMP", 5)))
+	    if ((e->size >= 5) && (!memcmp (e->data, "OLYMP", 5) ||
+				   !memcmp (e->data, "Nikon", 5)))
 		data->priv->md = exif_mnote_data_olympus_new ();
 
 	    /* Pentax */