Mercurial > octave-nkf

diff src/DLD-FUNCTIONS/__magick_read__.cc @ 7937:6661387827d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow build without GraphicsMagick installed
author David Bateman <dbateman@free.fr>
date Thu, 17 Jul 2008 11:43:26 +0200
parents 54e414cc106b
children fcaddd090f98
line wrap: on
line diff
--- a/src/DLD-FUNCTIONS/__magick_read__.cc	Thu Jul 17 07:58:50 2008 -0400
+++ b/src/DLD-FUNCTIONS/__magick_read__.cc	Thu Jul 17 11:43:26 2008 +0200
@@ -28,6 +28,8 @@
 #include "defun-dld.h"
 #include "error.h"
 
+#ifdef HAVE_MAGICK
+
 #include <GraphicsMagick/Magick++.h>
 
 unsigned int
@@ -303,6 +305,7 @@
 
   return retval;
 }
+#endif // HAVE_MAGICK
 
 DEFUN_DLD (__magick_read__, args, nargout,
   "-*- texinfo -*-\n\
@@ -316,6 +319,7 @@
 {
   octave_value_list output;
 
+#ifdef HAVE_MAGICK
   if (args.length () > 2 || args.length () < 1 || ! args(0).is_string ()
       || nargout > 3)
     {
@@ -401,6 +405,11 @@
 	  error ("__magick_read__: image depths bigger than 16-bit not supported");
 	}
     }
+#else
+
+  error ("__magick_read__: not available in this version of Octave");
+
+#endif
 
   return output;
 }