projects
/
platform
/
upstream
/
libexif.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
14b7d9a
)
|| instead of && caused rejecting all mnotes
author
Jan Patera
<patera@pictview.com>
Wed, 5 May 2004 18:02:23 +0000
(20:02 +0200)
committer
Jan Patera
<patera@pictview.com>
Wed, 5 May 2004 18:02:23 +0000
(20:02 +0200)
libexif/olympus/exif-mnote-data-olympus.c
patch
|
blob
|
history
diff --git
a/libexif/olympus/exif-mnote-data-olympus.c
b/libexif/olympus/exif-mnote-data-olympus.c
index
9d5ef28
..
d3051d8
100644
(file)
--- 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;