# HG changeset patch # User dbateman # Date 1136928034 0 # Node ID e7e45fe274f1908687cc62a684c95a9c27df9379 # Parent 1ad66ea35fe513079308c4475e7ad6349da4b5b1 [project @ 2006-01-10 21:20:34 by dbateman] diff --git a/src/ChangeLog b/src/ChangeLog --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2006-01-10 David Bateman + + * DLD-FUNCTIONS/sparse.cc (sparse_find): Use Sparse::nonzero() + rather than Sparse::nnz(), due to possibility of overallocation + of memory. + 2005-12-14 John W. Eaton * oct-stream.cc (octave_stream::invalid_stream_error): Delete. diff --git a/src/DLD-FUNCTIONS/sparse.cc b/src/DLD-FUNCTIONS/sparse.cc --- a/src/DLD-FUNCTIONS/sparse.cc +++ b/src/DLD-FUNCTIONS/sparse.cc @@ -514,7 +514,7 @@ sparse_find (const SparseMatrix& v) { octave_value_list retval; - octave_idx_type nnz = v.nnz (); + octave_idx_type nnz = v.nonzero (); dim_vector dv = v.dims (); octave_idx_type nr = dv(0); octave_idx_type nc = dv (1); @@ -555,7 +555,7 @@ sparse_find (const SparseComplexMatrix& v) { octave_value_list retval; - octave_idx_type nnz = v.nnz (); + octave_idx_type nnz = v.nonzero (); dim_vector dv = v.dims (); octave_idx_type nr = dv(0); octave_idx_type nc = dv (1); @@ -596,7 +596,7 @@ sparse_find (const SparseBoolMatrix& v) { octave_value_list retval; - octave_idx_type nnz = v.nnz (); + octave_idx_type nnz = v.nonzero (); dim_vector dv = v.dims (); octave_idx_type nr = dv(0); octave_idx_type nc = dv (1);