Mercurial > octave
diff libinterp/dldfcn/__magick_read__.cc @ 19864:17d647821d61
maint: More cleanup of C++ code to follow Octave coding conventions.
* gl-select.cc, betainc.cc, bitfcns.cc, bsxfun.cc, gl-render.cc,
graphics.cc, load-save.cc, ls-mat-ascii.cc, ls-mat5.cc, lu.cc,
oct-stream.cc, symtab.cc, variables.cc, __eigs__.cc,
__magick_read__.cc, chol.cc, ov-base-sparse.cc, ov-class.cc,
ov-classdef.cc, ov-fcn-inline.cc, ov-perm.cc, ov.cc, CMatrix.cc,
CSparse.cc, MSparse.cc, MatrixType.cc, MatrixType.h, dMatrix.cc,
dSparse.cc, fCMatrix.cc, fMatrix.cc, eigs-base.cc, lo-sysdep.cc,
kpse.cc: Break long lines before && and ||.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 26 Feb 2015 13:07:04 -0500 |
parents | 19755f4fc851 |
children | fa68a3f7dd8a |
line wrap: on
line diff
--- a/libinterp/dldfcn/__magick_read__.cc Thu Feb 26 10:49:20 2015 -0500 +++ b/libinterp/dldfcn/__magick_read__.cc Thu Feb 26 13:07:04 2015 -0500 @@ -800,8 +800,8 @@ const octave_idx_type n = frameidx.nelem (); for (octave_idx_type frame = 0; frame < n; frame++) { - if (nRows != imvec[frameidx(frame)].rows () || - nCols != imvec[frameidx(frame)].columns ()) + if (nRows != imvec[frameidx(frame)].rows () + || nCols != imvec[frameidx(frame)].columns ()) { error ("imread: all frames must have the same size but frame %i is different", frameidx(frame) +1);