Mercurial > hg > octave-nkf

comparison src/ov-str-mat.cc @ 14861:f7afecdd87ef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Use Octave coding conventions for cuddling parentheses in src/ directory * bitfcns.cc, comment-list.cc, data.cc, defun.cc, error.cc, gl-render.cc, graphics.cc, graphics.in.h, load-path.cc, load-path.h, load-save.cc, ls-hdf5.cc, ls-mat4.cc, ls-mat5.cc, ls-oct-ascii.cc, mappers.cc, mex.cc, oct-map.cc, oct-obj.cc, ov-base-int.cc, ov-base-mat.h, ov-base-sparse.cc, ov-bool-mat.cc, ov-bool-sparse.cc, ov-cell.cc, ov-class.cc, ov-complex.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-fcn-handle.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc, ov-struct.cc, ov-usr-fcn.cc, ov.cc, pr-output.cc, procstream.h, sighandlers.cc, sparse-xdiv.cc, sparse-xpow.cc, sparse.cc, symtab.cc, syscalls.cc, sysdep.cc, txt-eng-ft.cc, variables.cc, zfstream.cc, zfstream.h: Use Octave coding conventions for cuddling parentheses.
author Rik <octave@nomad.inbox5.com>
date Sat, 14 Jul 2012 06:22:56 -0700
parents 460a3c6d8bf1
children
comparison
equal deleted inserted replaced
14860:e027f98403c3 14861:f7afecdd87ef
250 { 250 {
251 const charMatrix chm = matrix.matrix_value (); 251 const charMatrix chm = matrix.matrix_value ();
252 octave_idx_type nr = chm.rows (); 252 octave_idx_type nr = chm.rows ();
253 retval.clear (nr, 1); 253 retval.clear (nr, 1);
254 for (octave_idx_type i = 0; i < nr; i++) 254 for (octave_idx_type i = 0; i < nr; i++)
255 retval.xelem(i) = chm.row_as_string (i); 255 retval.xelem (i) = chm.row_as_string (i);
256 } 256 }
257 else 257 else
258 error ("cellstr: cannot convert multidimensional arrays"); 258 error ("cellstr: cannot convert multidimensional arrays");
259 259
260 return retval; 260 return retval;
613 bool retval = false; 613 bool retval = false;
614 614
615 dim_vector dv; 615 dim_vector dv;
616 int empty = load_hdf5_empty (loc_id, name, dv); 616 int empty = load_hdf5_empty (loc_id, name, dv);
617 if (empty > 0) 617 if (empty > 0)
618 matrix.resize(dv); 618 matrix.resize (dv);
619 if (empty) 619 if (empty)
620 return (empty > 0); 620 return (empty > 0);
621 621
622 #if HAVE_HDF5_18 622 #if HAVE_HDF5_18
623 hid_t data_hid = H5Dopen (loc_id, name, H5P_DEFAULT); 623 hid_t data_hid = H5Dopen (loc_id, name, H5P_DEFAULT);