Mercurial > octave-nkf
diff libinterp/corefcn/quadcc.cc @ 19630:0e1f5a750d00
maint: Periodic merge of gui-release to default.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 20 Jan 2015 10:24:46 -0500 |
parents | 65554f5847ac 446c46af4b42 |
children | 4197fc428c7d |
line wrap: on
line diff
--- a/libinterp/corefcn/quadcc.cc Tue Jan 20 09:55:41 2015 -0500 +++ b/libinterp/corefcn/quadcc.cc Tue Jan 20 10:24:46 2015 -0500 @@ -1643,7 +1643,7 @@ nivals = 1 + args(4).numel (); } - int cquad_heapsize = (nivals >= min_cquad_heapsize ? nivals + 1 + int cquad_heapsize = (nivals >= min_cquad_heapsize ? nivals + 1 : min_cquad_heapsize); /* The interval heap. */ OCTAVE_LOCAL_BUFFER (cquad_ival, ivals, cquad_heapsize);