From: Mathieu Malaterre <mathieu.malaterre@gmail.com>
Date: Fri, 14 Mar 2014 14:46:40 +0000 (+0000)
Subject: [trunk] Fix issue with & vs &&
X-Git-Tag: version.2.0.1~4^2~21
X-Git-Url: https://main.carlh.net/gitweb/?p=openjpeg.git;a=commitdiff_plain;h=de7460577753a7ed47a292e803428f60eec9dac9

[trunk] Fix issue with & vs &&
Fixes issue 277
---

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