Mercurial > hg > octave-lyh
changeset 12041:1d4212b80713 release-3-2-x
graphics.cc (get_array_limits): require min_pos value to be greater than zero
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 16 Jul 2009 11:56:44 -0400 |
| parents | 5a68e3e748c5 |
| children | 4cd9c36b705e |
| files | scripts/image/imread.m src/ChangeLog src/DLD-FUNCTIONS/__magick_read__.cc src/graphics.cc |
| diffstat | 4 files changed, 10 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/image/imread.m +++ b/scripts/image/imread.m @@ -54,7 +54,7 @@ endif try - [varargout{1:nargout}] = __magick_read__ (fn, varargin{:}); + [varargout{1:nargout}] = magick_read_internal (fn, varargin{:}); catch magick_error = lasterr ();
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2009-07-16 John W. Eaton <jwe@octave.org> + + * graphics.cc (get_array_limits): Require min_pos value to be + greater than zero. + 2009-07-08 John W. Eaton <jwe@octave.org> * pt-assign.cc (maybe_warn_former_built_in_variable): Improve message.
--- a/src/DLD-FUNCTIONS/__magick_read__.cc +++ b/src/DLD-FUNCTIONS/__magick_read__.cc @@ -344,7 +344,7 @@ #endif -DEFUN_DLD (__magick_read__, args, nargout, +DEFUN_DLD (magick_read, args, nargout, "-*- texinfo -*-\n\ @deftypefn {Function File} {@var{m} =} __magick_read__(@var{fname}, @var{index})\n\ @deftypefnx{Function File} {[@var{m}, @var{colormap}] =} __magick_read__(@var{fname}, @var{index})\n\ @@ -753,7 +753,7 @@ #endif -DEFUN_DLD (__magick_write__, args, , +DEFUN_DLD (magick_write, args, , "-*- texinfo -*-\n\ @deftypefn {Function File} {} __magick_write__(@var{fname}, @var{fmt}, @var{img})\n\ @deftypefnx {Function File} {} __magick_write__(@var{fname}, @var{fmt}, @var{img}, @var{map})\n\ @@ -882,7 +882,7 @@ #endif -DEFUN_DLD (__magick_finfo__, args, , +DEFUN_DLD (magick_finfo, args, , "-*- texinfo -*-\n\ @deftypefn {Loadable File} {} __magick_finfo__(@var{fname})\n\ Read image information with GraphicsMagick++. In general you should\n\
--- a/src/graphics.cc +++ b/src/graphics.cc @@ -472,7 +472,7 @@ if (e > emax) emax = e; - if (e >= 0 && e < eminp) + if (e > 0 && e < eminp) eminp = e; } } @@ -3364,7 +3364,6 @@ array_property& ticks, bool limmode_is_auto, bool is_logscale) { - // FIXME -- add log ticks and lims if (lims.get ().is_empty ())