diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2014-03-14 14:46:40 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2014-03-14 14:46:40 +0000 |
| commit | de7460577753a7ed47a292e803428f60eec9dac9 (patch) | |
| tree | 4668135ddc18a94abf85c7c07958010ef4a1edd3 | |
| parent | e8abf1fb250819822f6a96b11a5ed1a848f3e47a (diff) | |
[trunk] Fix issue with & vs &&
Fixes issue 277
| -rw-r--r-- | src/bin/jp2/convert.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bin/jp2/convert.c b/src/bin/jp2/convert.c index 5dd09da7..3588700b 100644 --- a/src/bin/jp2/convert.c +++ b/src/bin/jp2/convert.c @@ -1716,7 +1716,7 @@ static void read_pnm_header(FILE *reader, struct pnm_header *ph) } if(ph->depth < 1 || ph->depth > 4) return; - if(ph->width && ph->height && ph->depth & ph->maxval && ttype) + if(ph->width && ph->height && ph->depth && ph->maxval && ttype) ph->ok = 1; } else |