From: Cristy <urban-warrior@imagemagick.org>
Date: Sun, 21 May 2017 14:54:54 +0000 (-0400)
Subject: ...
X-Git-Tag: 7.0.5-8~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c90d59f341bf8817fa9f2b372ed417eb7d8567a5;p=imagemagick

...
---

diff --git a/coders/jp2.c b/coders/jp2.c
index 6028905b6..ec6e01e32 100644
--- a/coders/jp2.c
+++ b/coders/jp2.c
@@ -386,7 +386,11 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception)
   opj_stream_destroy(jp2_stream);
   for (i=0; i < (ssize_t) jp2_image->numcomps; i++)
   {
-    if ((jp2_image->comps[i].dx == 0) || (jp2_image->comps[i].dy == 0))
+    if ((jp2_image->comps[0].dx == 0) || (jp2_image->comps[0].dy == 0) ||
+        (jp2_image->comps[0].dx != jp2_image->comps[i].dx) ||
+        (jp2_image->comps[0].dy != jp2_image->comps[i].dy) ||
+        (jp2_image->comps[0].prec != jp2_image->comps[i].prec) ||
+        (jp2_image->comps[0].sgnd != jp2_image->comps[i].sgnd))
       {
         opj_destroy_codec(jp2_codec);
         opj_image_destroy(jp2_image);