From: Jan Patera <patera@pictview.com>
Date: Wed, 5 May 2004 18:02:23 +0000 (+0200)
Subject: || instead of && caused rejecting all mnotes
X-Git-Tag: libexif-0_6_21-release~780
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=959669a17b82ecb0d73b78f3af6ddae08baefaf3;p=platform%2Fupstream%2Flibexif.git

|| instead of && caused rejecting all mnotes
---

diff --git a/libexif/olympus/exif-mnote-data-olympus.c b/libexif/olympus/exif-mnote-data-olympus.c
index 9d5ef28..d3051d8 100644
--- a/libexif/olympus/exif-mnote-data-olympus.c
+++ b/libexif/olympus/exif-mnote-data-olympus.c
@@ -132,7 +132,7 @@ exif_mnote_data_olympus_load (ExifMnoteData *en,
 	 * 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;