diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-09-15 17:37:09 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-09-15 17:37:09 +0100 |
| commit | 586819755b4dbfdffdc8a725ab7c0f86095b8489 (patch) | |
| tree | d6790c838cfe9607c996e4913fdf11bad5fdd528 /sci-mathematics/octave/files | |
| parent | 3f71901f8c228f4de570abed1831ce3ee425343e (diff) | |
gentoo resync : 15.09.2018
Diffstat (limited to 'sci-mathematics/octave/files')
| -rw-r--r-- | sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch b/sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch index 2f651e0995ee..2aa6e5b9d8c6 100644 --- a/sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch +++ b/sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch @@ -1,16 +1,22 @@ --- a/libinterp/corefcn/__magick_read__.cc 2018-05-22 12:25:37.688173855 +0200 +++ a/libinterp/corefcn/__magick_read__.cc.new 2018-05-22 12:32:51.475172200 +0200 -@@ -817,10 +817,11 @@ +@@ -817,10 +817,19 @@ // depth is 8, there's a good chance that we will be limited. It // is also the GraphicsMagick recommended setting and the default // for ImageMagick. -- if (QuantumDepth < 16) ++#ifdef QuantumDepth + if (QuantumDepth < 16) ++#else + using namespace Magick; + if (MAGICKCORE_QUANTUM_DEPTH < 16) ++#endif warning_with_id ("Octave:GraphicsMagick-Quantum-Depth", "your version of %s limits images to %d bits per pixel\n", -- MagickPackageName, QuantumDepth); ++#ifdef QuantumDepth + MagickPackageName, QuantumDepth); ++#else + MagickPackageName, MAGICKCORE_QUANTUM_DEPTH); ++#endif initialized = true; } |