diff options
| author | Mark H Weaver <mhw@netris.org> | 2021-03-27 07:01:37 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2021-03-27 19:49:14 -0400 |
| commit | 2d3d7faf0a087c7836d71c92c8a67283c3d4dec5 (patch) | |
| tree | 0c6cc88d537bb42640fe51e9fcb74deec10c6456 /gnu/packages/patches/imagemagick-ReadDCMImage-fix.patch | |
| parent | bfc69d5e7c45eac865e231643b58396580afb231 (diff) | |
| download | guix-patches-2d3d7faf0a087c7836d71c92c8a67283c3d4dec5.tar guix-patches-2d3d7faf0a087c7836d71c92c8a67283c3d4dec5.tar.gz | |
gnu: imagemagick: Add more upstream fixes.
* gnu/packages/patches/imagemagick-ReadDCMImage-fix.patch,
gnu/packages/patches/imagemagick-ReadDCMPixels-fix.patch,
gnu/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch: New files.
* gnu/local.mk (dist_patch_DATA): Add them.
* gnu/packages/imagemagick.scm (source): Add patches.
Diffstat (limited to 'gnu/packages/patches/imagemagick-ReadDCMImage-fix.patch')
| -rw-r--r-- | gnu/packages/patches/imagemagick-ReadDCMImage-fix.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/gnu/packages/patches/imagemagick-ReadDCMImage-fix.patch b/gnu/packages/patches/imagemagick-ReadDCMImage-fix.patch new file mode 100644 index 0000000000..42ece43682 --- /dev/null +++ b/gnu/packages/patches/imagemagick-ReadDCMImage-fix.patch @@ -0,0 +1,26 @@ +From 512668dfd92b20d0d08b91d62b422d8262573281 Mon Sep 17 00:00:00 2001 +From: Dirk Lemstra <dirk@lemstra.org> +Date: Wed, 24 Mar 2021 20:37:15 +0100 +Subject: [PATCH] Throw exception when no exception was raised but status was + false (#3432). + +--- + coders/dcm.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/coders/dcm.c b/coders/dcm.c +index 7a68ed6e8..ed17c9567 100644 +--- a/coders/dcm.c ++++ b/coders/dcm.c +@@ -3989,6 +3989,8 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) + if (redmap != (int *) NULL) + redmap=(int *) RelinquishMagickMemory(redmap); + image=DestroyImageList(image); ++ if ((status == MagickFalse) && (exception->severity < ErrorException)) ++ ThrowReaderException(CorruptImageError,"CorruptImage"); + return(GetFirstImageInList(images)); + } + if (info.depth != (1UL*MAGICKCORE_QUANTUM_DEPTH)) +-- +2.31.0 + |