graphics.cc (get_array_limits): require min_pos value to be greater than zero
authorJohn W. Eaton <jwe@octave.org>
Thu Jul 16 11:56:44 2009 -0400 (2009-07-16)
changeset 938444300eb51817
parent 9383 941b8414b99e
child 9385 9aea00e4e000
graphics.cc (get_array_limits): require min_pos value to be greater than zero
scripts/image/imread.m
src/ChangeLog
src/DLD-FUNCTIONS/__magick_read__.cc
src/graphics.cc
     1.1 --- a/scripts/image/imread.m	Sat Jul 11 12:46:10 2009 -0400
     1.2 +++ b/scripts/image/imread.m	Thu Jul 16 11:56:44 2009 -0400
     1.3 @@ -54,7 +54,7 @@
     1.4    endif
     1.5  
     1.6    try
     1.7 -    [varargout{1:nargout}] = __magick_read__ (fn, varargin{:});
     1.8 +    [varargout{1:nargout}] = magick_read_internal (fn, varargin{:});
     1.9    catch
    1.10  
    1.11      magick_error = lasterr ();
     2.1 --- a/src/ChangeLog	Sat Jul 11 12:46:10 2009 -0400
     2.2 +++ b/src/ChangeLog	Thu Jul 16 11:56:44 2009 -0400
     2.3 @@ -1,3 +1,8 @@
     2.4 +2009-07-16  John W. Eaton  <jwe@octave.org>
     2.5 +
     2.6 +	* graphics.cc (get_array_limits): Require min_pos value to be
     2.7 +	greater than zero.
     2.8 +
     2.9  2009-07-08  John W. Eaton  <jwe@octave.org>
    2.10  
    2.11  	* pt-assign.cc (maybe_warn_former_built_in_variable): Improve message.
     3.1 --- a/src/DLD-FUNCTIONS/__magick_read__.cc	Sat Jul 11 12:46:10 2009 -0400
     3.2 +++ b/src/DLD-FUNCTIONS/__magick_read__.cc	Thu Jul 16 11:56:44 2009 -0400
     3.3 @@ -344,7 +344,7 @@
     3.4  
     3.5  #endif
     3.6  
     3.7 -DEFUN_DLD (__magick_read__, args, nargout,
     3.8 +DEFUN_DLD (magick_read, args, nargout,
     3.9    "-*- texinfo -*-\n\
    3.10  @deftypefn {Function File} {@var{m} =} __magick_read__(@var{fname}, @var{index})\n\
    3.11  @deftypefnx{Function File} {[@var{m}, @var{colormap}] =} __magick_read__(@var{fname}, @var{index})\n\
    3.12 @@ -753,7 +753,7 @@
    3.13  
    3.14  #endif
    3.15  
    3.16 -DEFUN_DLD (__magick_write__, args, ,
    3.17 +DEFUN_DLD (magick_write, args, ,
    3.18    "-*- texinfo -*-\n\
    3.19  @deftypefn {Function File} {} __magick_write__(@var{fname}, @var{fmt}, @var{img})\n\
    3.20  @deftypefnx {Function File} {} __magick_write__(@var{fname}, @var{fmt}, @var{img}, @var{map})\n\
    3.21 @@ -882,7 +882,7 @@
    3.22  
    3.23  #endif
    3.24  
    3.25 -DEFUN_DLD (__magick_finfo__, args, ,
    3.26 +DEFUN_DLD (magick_finfo, args, ,
    3.27    "-*- texinfo -*-\n\
    3.28  @deftypefn {Loadable File} {} __magick_finfo__(@var{fname})\n\
    3.29  Read image information with GraphicsMagick++.  In general you should\n\
     4.1 --- a/src/graphics.cc	Sat Jul 11 12:46:10 2009 -0400
     4.2 +++ b/src/graphics.cc	Thu Jul 16 11:56:44 2009 -0400
     4.3 @@ -472,7 +472,7 @@
     4.4  	  if (e > emax)
     4.5  	    emax = e;
     4.6  
     4.7 -	  if (e >= 0 && e < eminp)
     4.8 +	  if (e > 0 && e < eminp)
     4.9  	    eminp = e;
    4.10  	}
    4.11      }
    4.12 @@ -3364,7 +3364,6 @@
    4.13  				       array_property& ticks,
    4.14  				       bool limmode_is_auto, bool is_logscale)
    4.15  {
    4.16 -
    4.17    // FIXME -- add log ticks and lims
    4.18  
    4.19    if (lims.get ().is_empty ())