# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1267639304 18000
# Node ID ad0b54ae206a97c26a6570ecccc4792af0a2dc0e
# Parent  8a551f02f10d56a860137d04283b6f47de412fd7
__magick_read__ (F__magick_read__): call Magick::InitializeMagick

diff -r 8a551f02f10d -r ad0b54ae206a src/ChangeLog
--- a/src/ChangeLog	Wed Mar 03 12:32:30 2010 -0500
+++ b/src/ChangeLog	Wed Mar 03 13:01:44 2010 -0500
@@ -1,3 +1,8 @@
+2010-03-03  John W. Eaton  <jwe@octave.org>
+
+	* DLD-FUNCTIONS/__magick_read__.cc (F__magick_read__):
+	Call Magick::InitializeMagick.
+
 2010-03-02  Jaroslav Hajek  <highegg@gmail.com>
 
 	* DLD-FUNCTIONS/__convn__.cc: Remove.
diff -r 8a551f02f10d -r ad0b54ae206a src/DLD-FUNCTIONS/__magick_read__.cc
--- a/src/DLD-FUNCTIONS/__magick_read__.cc	Wed Mar 03 12:32:30 2010 -0500
+++ b/src/DLD-FUNCTIONS/__magick_read__.cc	Wed Mar 03 13:01:44 2010 -0500
@@ -29,6 +29,7 @@
 #include <cmath>
 
 #include "file-stat.h"
+#include "oct-env.h"
 #include "oct-time.h"
 
 #include "defun-dld.h"
@@ -383,6 +384,17 @@
 
 #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)
     {