[arch-commits] Commit in octave/trunk (imread.patch)

[Ronald van Haren]

    Date: Wednesday, December 15, 2010 @ 16:12:31
  Author: ronald
Revision: 103150

upgpkg: octave 3.2.4-2
imread patch for graphicsmagick 1.3.12

Added:
  octave/trunk/imread.patch

--------------+
 imread.patch |   29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

Added: imread.patch
===================================================================
--- imread.patch	                        (rev 0)
+++ imread.patch	2010-12-15 21:12:31 UTC (rev 103150)
@@ -0,0 +1,29 @@
+--- src/DLD-FUNCTIONS/__magick_read__.cc.orig	2010-03-06 08:05:25.000000000 +0000
++++ src/DLD-FUNCTIONS/__magick_read__.cc	2009-08-25 09:26:01.000000000 +0100
+@@ -30,6 +30,7 @@
+ #include "defun-dld.h"
+ #include "error.h"
+ #include "ov-struct.h"
++#include "oct-env.h"
+ 
+ #ifdef HAVE_MAGICK
+ 
+@@ -359,6 +358,18 @@
+ 
+ #ifdef HAVE_MAGICK
+ 
++  static bool initialized = false;
++
++  if (! initialized)
++    {
++      std::string program_name = octave_env::get_program_invocation_name ();
++
++      Magick::InitializeMagick (program_name.c_str ());
++
++      initialized = true;
++    }
++
++
+   if (args.length () > 2 || args.length () < 1 || ! args(0).is_string ()
+       || nargout > 3)
+     {