summary refs log tree commit diff
path: root/gnu/packages/patches/imagemagick-ReadDCMPixels-fix.patch
diff options
context:
space:
mode:
authorSaku Laesvuori via Guix-patches via <guix-patches@gnu.org>2023-07-20 21:37:15 +0300
committerLudovic Courtès <ludo@gnu.org>2024-08-31 10:44:30 +0200
commite77aef7f74caa82baf393f25a0722f444d19cc37 (patch)
tree6992081698ddaff8079b88a5eb93fac827852ca7 /gnu/packages/patches/imagemagick-ReadDCMPixels-fix.patch
parentf40553702db7f633f4966ae29655c32ee224cd53 (diff)
downloadguix-e77aef7f74caa82baf393f25a0722f444d19cc37.tar.gz
gnu: imagemagick: Update to 6.9.12-91.
* gnu/packages/imagemagick.scm (imagemagick)
(imagemagick/stable): Update to 6.9.12-91.
[patches]: Remove upstreamed patches. Add patch for fixing tests.
[arguments]: Enable tests.
* gnu/packages/patches/imagemagick-Fix-tests.patch: New file.
gnu/packages/patches/imagemagick-CVE-2020-27829.patch: Delete file.
* gnu/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch: Likewise.
* gnu/packages/patches/imagemagick-ReadDCMImage-fix.patch: Likewise.
* gnu/packages/patches/imagemagick-ReadDCMPixels-fix.patch: Likewise.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: I4c554abb1e5592590c3af8c57d9113d90de3f194
Diffstat (limited to 'gnu/packages/patches/imagemagick-ReadDCMPixels-fix.patch')
-rw-r--r--gnu/packages/patches/imagemagick-ReadDCMPixels-fix.patch35
1 files changed, 0 insertions, 35 deletions
diff --git a/gnu/packages/patches/imagemagick-ReadDCMPixels-fix.patch b/gnu/packages/patches/imagemagick-ReadDCMPixels-fix.patch
deleted file mode 100644
index a91999186b..0000000000
--- a/gnu/packages/patches/imagemagick-ReadDCMPixels-fix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From c8f25953ad1dd38a8b2d92738f0f742ad7e0bce7 Mon Sep 17 00:00:00 2001
-From: Cristy <mikayla-grace@urban-warrior.org>
-Date: Sun, 21 Mar 2021 21:21:15 -0400
-Subject: [PATCH] https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=32322
-
----
- coders/dcm.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/coders/dcm.c b/coders/dcm.c
-index 29eed9618..7a68ed6e8 100644
---- a/coders/dcm.c
-+++ b/coders/dcm.c
-@@ -2984,12 +2984,12 @@ static MagickBooleanType ReadDCMPixels(Image *image,DCMInfo *info,
-         }
-       else
-         {
--          SetPixelRed(q,(Quantum) (((ssize_t) pixel.red) |
--            (((ssize_t) GetPixelRed(q)) << 8)));
--          SetPixelGreen(q,(Quantum) (((ssize_t) pixel.green) |
--            (((ssize_t) GetPixelGreen(q)) << 8)));
--          SetPixelBlue(q,(Quantum) (((ssize_t) pixel.blue) |
--            (((ssize_t) GetPixelBlue(q)) << 8)));
-+          SetPixelRed(q,(Quantum) (((size_t) pixel.red) |
-+            (((size_t) GetPixelRed(q)) << 8)));
-+          SetPixelGreen(q,(Quantum) (((size_t) pixel.green) |
-+            (((size_t) GetPixelGreen(q)) << 8)));
-+          SetPixelBlue(q,(Quantum) (((size_t) pixel.blue) |
-+            (((size_t) GetPixelBlue(q)) << 8)));
-         }
-       q++;
-     }
--- 
-2.31.0
-