Mercurial > hg > octave-nkf
comparison src/ls-mat5.cc @ 10624:3eafa521550b
minor typo in previous changeset
author | David Bateman <dbateman@free.fr> |
---|---|
date | Wed, 12 May 2010 02:25:05 +0200 |
parents | 0e98fb2068fc |
children | ac43a9df78d6 |
comparison
equal
deleted
inserted
replaced
10623:0e98fb2068fc | 10624:3eafa521550b |
---|---|
1791 octave_idx_type nnz = m.nzmax (); // Yes its nzmax | 1791 octave_idx_type nnz = m.nzmax (); // Yes its nzmax |
1792 | 1792 |
1793 ret += 16 + save_mat5_array_length (m.data (), nnz, save_as_floats); | 1793 ret += 16 + save_mat5_array_length (m.data (), nnz, save_as_floats); |
1794 if (nnz > 1) | 1794 if (nnz > 1) |
1795 ret += PAD (nnz * sizeof (int32_t)); | 1795 ret += PAD (nnz * sizeof (int32_t)); |
1796 if (nc > 1) | 1796 if (nc > 0) |
1797 ret += PAD ((nc + 1) * sizeof (int32_t)); | 1797 ret += PAD ((nc + 1) * sizeof (int32_t)); |
1798 } | 1798 } |
1799 else | 1799 else |
1800 { | 1800 { |
1801 SparseMatrix m = tc.sparse_matrix_value (); | 1801 SparseMatrix m = tc.sparse_matrix_value (); |
1803 octave_idx_type nnz = m.nzmax (); | 1803 octave_idx_type nnz = m.nzmax (); |
1804 | 1804 |
1805 ret += 16 + save_mat5_array_length (m.data (), nnz, save_as_floats); | 1805 ret += 16 + save_mat5_array_length (m.data (), nnz, save_as_floats); |
1806 if (nnz > 1) | 1806 if (nnz > 1) |
1807 ret += PAD (nnz * sizeof (int32_t)); | 1807 ret += PAD (nnz * sizeof (int32_t)); |
1808 if (nc > 1) | 1808 if (nc > 0) |
1809 ret += PAD ((nc + 1) * sizeof (int32_t)); | 1809 ret += PAD ((nc + 1) * sizeof (int32_t)); |
1810 } | 1810 } |
1811 } | 1811 } |
1812 | 1812 |
1813 #define INT_LEN(nel, size) \ | 1813 #define INT_LEN(nel, size) \ |