summaryrefslogtreecommitdiffstats
path: root/f13c6b54a879aaa771ec64b5a066b939e8f8e7f0.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-05-28 18:12:07 +0200
committerRemi Collet <remi@remirepo.net>2017-05-28 18:12:07 +0200
commit76b3aa021ed265cbaec8a48fcde202157b3f7b55 (patch)
treecaa50e303b1249f06abb61434e2dbe9fbce8d392 /f13c6b54a879aaa771ec64b5a066b939e8f8e7f0.patch
parent17655cf984af8b1df4bdeb2c4172316a9afa6c17 (diff)
add upstream patch for #501 + --with-openjp2
Diffstat (limited to 'f13c6b54a879aaa771ec64b5a066b939e8f8e7f0.patch')
-rw-r--r--f13c6b54a879aaa771ec64b5a066b939e8f8e7f0.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/f13c6b54a879aaa771ec64b5a066b939e8f8e7f0.patch b/f13c6b54a879aaa771ec64b5a066b939e8f8e7f0.patch
new file mode 100644
index 0000000..231f816
--- /dev/null
+++ b/f13c6b54a879aaa771ec64b5a066b939e8f8e7f0.patch
@@ -0,0 +1,22 @@
+From f13c6b54a879aaa771ec64b5a066b939e8f8e7f0 Mon Sep 17 00:00:00 2001
+From: Cristy <urban-warrior@imagemagick.org>
+Date: Sun, 28 May 2017 06:42:25 -0400
+Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/501
+
+---
+ coders/jp2.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/coders/jp2.c b/coders/jp2.c
+index 94b775e1ca..b9fe4ab001 100644
+--- a/coders/jp2.c
++++ b/coders/jp2.c
+@@ -391,7 +391,7 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception)
+ (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) ||
+- (jp2_image->comps[i].data == NULL))
++ ((image->ping == MagickFalse) && (jp2_image->comps[i].data == NULL)))
+ {
+ opj_destroy_codec(jp2_codec);
+ opj_image_destroy(jp2_image);