From de7460577753a7ed47a292e803428f60eec9dac9 Mon Sep 17 00:00:00 2001 From: Mathieu Malaterre Date: Fri, 14 Mar 2014 14:46:40 +0000 Subject: [PATCH] [trunk] Fix issue with & vs && Fixes issue 277 --- src/bin/jp2/convert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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