1 --- a/scripts/image/imread.m Sat Jul 11 12:46:10 2009 -0400
2 +++ b/scripts/image/imread.m Thu Jul 16 11:56:44 2009 -0400
3 @@ -54,7 +54,7 @@
4 endif
5
6 try
7 - [varargout{1:nargout}] = __magick_read__ (fn, varargin{:});
8 + [varargout{1:nargout}] = magick_read_internal (fn, varargin{:});
9 catch
10
11 magick_error = lasterr ();
1.1 --- a/src/ChangeLog Sat Jul 11 12:46:10 2009 -0400
1.2 +++ b/src/ChangeLog Thu Jul 16 11:56:44 2009 -0400
1.3 @@ -1,3 +1,8 @@
1.4 +2009-07-16 John W. Eaton <jwe@octave.org>
1.5 +
1.6 + * graphics.cc (get_array_limits): Require min_pos value to be
1.7 + greater than zero.
1.8 +
1.9 2009-07-08 John W. Eaton <jwe@octave.org>
1.10
1.11 * pt-assign.cc (maybe_warn_former_built_in_variable): Improve message.
2.1 --- a/src/DLD-FUNCTIONS/__magick_read__.cc Sat Jul 11 12:46:10 2009 -0400
2.2 +++ b/src/DLD-FUNCTIONS/__magick_read__.cc Thu Jul 16 11:56:44 2009 -0400
2.3 @@ -344,7 +344,7 @@
2.4
2.5 #endif
2.6
2.7 -DEFUN_DLD (__magick_read__, args, nargout,
2.8 +DEFUN_DLD (magick_read, args, nargout,
2.9 "-*- texinfo -*-\n\
2.10 @deftypefn {Function File} {@var{m} =} __magick_read__(@var{fname}, @var{index})\n\
2.11 @deftypefnx{Function File} {[@var{m}, @var{colormap}] =} __magick_read__(@var{fname}, @var{index})\n\
2.12 @@ -753,7 +753,7 @@
2.13
2.14 #endif
2.15
2.16 -DEFUN_DLD (__magick_write__, args, ,
2.17 +DEFUN_DLD (magick_write, args, ,
2.18 "-*- texinfo -*-\n\
2.19 @deftypefn {Function File} {} __magick_write__(@var{fname}, @var{fmt}, @var{img})\n\
2.20 @deftypefnx {Function File} {} __magick_write__(@var{fname}, @var{fmt}, @var{img}, @var{map})\n\
2.21 @@ -882,7 +882,7 @@
2.22
2.23 #endif
2.24
2.25 -DEFUN_DLD (__magick_finfo__, args, ,
2.26 +DEFUN_DLD (magick_finfo, args, ,
2.27 "-*- texinfo -*-\n\
2.28 @deftypefn {Loadable File} {} __magick_finfo__(@var{fname})\n\
2.29 Read image information with GraphicsMagick++. In general you should\n\
3.1 --- a/src/graphics.cc Sat Jul 11 12:46:10 2009 -0400
3.2 +++ b/src/graphics.cc Thu Jul 16 11:56:44 2009 -0400
3.3 @@ -472,7 +472,7 @@
3.4 if (e > emax)
3.5 emax = e;
3.6
3.7 - if (e >= 0 && e < eminp)
3.8 + if (e > 0 && e < eminp)
3.9 eminp = e;
3.10 }
3.11 }
3.12 @@ -3364,7 +3364,6 @@
3.13 array_property& ticks,
3.14 bool limmode_is_auto, bool is_logscale)
3.15 {
3.16 -
3.17 // FIXME -- add log ticks and lims
3.18
3.19 if (lims.get ().is_empty ())