[trunk] Fix issue with & vs &&

Fixes issue 277

diff --git a/src/bin/jp2/convert.c b/src/bin/jp2/convert.c
index 5dd09da72e6a5486479a295a2ce93af7d6720a84..3588700b75e89bebf76ab517e8c5ec8f7624f59a 100644 (file)
--- 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