| 1 |
commit: f0c36728afd0e9720c8efea527faa62670794755 |
| 2 |
Author: Dennis Schridde <devurandom <AT> gmx <DOT> net> |
| 3 |
AuthorDate: Fri Jul 13 06:19:44 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 12 05:28:08 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0c36728 |
| 7 |
|
| 8 |
sci-mathematics/octave: Fix w/ media-gfx/graphicsmagick-1.3.30[imagemagick] |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/661046 |
| 11 |
|
| 12 |
sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch | 12 +++++++++--- |
| 13 |
1 file changed, 9 insertions(+), 3 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch b/sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch |
| 16 |
index 2f651e0995e..2aa6e5b9d8c 100644 |
| 17 |
--- a/sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch |
| 18 |
+++ b/sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch |
| 19 |
@@ -1,16 +1,22 @@ |
| 20 |
--- a/libinterp/corefcn/__magick_read__.cc 2018-05-22 12:25:37.688173855 +0200 |
| 21 |
+++ a/libinterp/corefcn/__magick_read__.cc.new 2018-05-22 12:32:51.475172200 +0200 |
| 22 |
-@@ -817,10 +817,11 @@ |
| 23 |
+@@ -817,10 +817,19 @@ |
| 24 |
// depth is 8, there's a good chance that we will be limited. It |
| 25 |
// is also the GraphicsMagick recommended setting and the default |
| 26 |
// for ImageMagick. |
| 27 |
-- if (QuantumDepth < 16) |
| 28 |
++#ifdef QuantumDepth |
| 29 |
+ if (QuantumDepth < 16) |
| 30 |
++#else |
| 31 |
+ using namespace Magick; |
| 32 |
+ if (MAGICKCORE_QUANTUM_DEPTH < 16) |
| 33 |
++#endif |
| 34 |
warning_with_id ("Octave:GraphicsMagick-Quantum-Depth", |
| 35 |
"your version of %s limits images to %d bits per pixel\n", |
| 36 |
-- MagickPackageName, QuantumDepth); |
| 37 |
++#ifdef QuantumDepth |
| 38 |
+ MagickPackageName, QuantumDepth); |
| 39 |
++#else |
| 40 |
+ MagickPackageName, MAGICKCORE_QUANTUM_DEPTH); |
| 41 |
++#endif |
| 42 |
|
| 43 |
initialized = true; |
| 44 |
} |
Archives