[libexif-cvs] libexif/libexif/olympus exif-mnote-data-olympus.c,1.9,1.10

[Jan P. <pa...@us...>]

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

Modified Files:
	exif-mnote-data-olympus.c 
Log Message:
|| instead of && caused rejecting all mnotes


Index: exif-mnote-data-olympus.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-mnote-data-olympus.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- exif-mnote-data-olympus.c	4 May 2004 21:27:01 -0000	1.9
+++ exif-mnote-data-olympus.c	5 May 2004 18:02:23 -0000	1.10
@@ -132,7 +132,7 @@
 	 * Nikon headers start with "Nikon".
 	 */
 	if (buf_size - n->offset - 6 < 5) return;
-	if (memcmp (buf + 6 + n->offset, "Nikon", 5) ||
+	if (memcmp (buf + 6 + n->offset, "Nikon", 5) &&
 	    memcmp (buf + 6 + n->offset, "OLYMP", 5)) return;
 	if (buf_size - n->offset < 22) return;