Mercurial > octave-nkf
changeset 8165:75014ec4ac84
__magick_read__.cc: only define magick_to_octave_value functions if HAVE_MAGICK is defined
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 30 Sep 2008 13:11:06 -0400 |
| parents | 0d37c99fc06f |
| children | 4024fc815f8d |
| files | src/ChangeLog src/DLD-FUNCTIONS/__magick_read__.cc |
| diffstat | 2 files changed, 9 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Sep 29 20:25:42 2008 -0400 +++ b/src/ChangeLog Tue Sep 30 13:11:06 2008 -0400 @@ -1,3 +1,8 @@ +2008-09-30 John W. Eaton <jwe@octave.org> + + * DLD-FUNCTIONS/__magick_read__.cc: Only define + magick_to_octave_value if HAVE_MAGICK is defined. + 2008-09-29 John W. Eaton <jwe@octave.org> * symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method):
--- a/src/DLD-FUNCTIONS/__magick_read__.cc Mon Sep 29 20:25:42 2008 -0400 +++ b/src/DLD-FUNCTIONS/__magick_read__.cc Tue Sep 30 13:11:06 2008 -0400 @@ -799,6 +799,8 @@ return retval; } +#ifdef HAVE_MAGICK + template<class T> static octave_value magick_to_octave_value (const T magick) @@ -873,6 +875,8 @@ { \ } +#endif + DEFUN_DLD (__magick_finfo__, args, , "-*- texinfo -*-\n\ @deftypefn {Loadable File} {} __magick_finfo__(@var{fname})\n\