Mercurial > hg > octave-nkf
diff liboctave/chNDArray.cc @ 10314:07ebe522dac2
untabify liboctave C++ sources
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 11 Feb 2010 12:23:32 -0500 |
parents | 479c7df0cc96 |
children | a3635bc1ea19 |
line wrap: on
line diff
--- a/liboctave/chNDArray.cc +++ b/liboctave/chNDArray.cc @@ -70,22 +70,22 @@ double d = rb.elem (i); if (xisnan (d)) - { - (*current_liboctave_error_handler) - ("invalid conversion from NaN to character"); - return *this; - } + { + (*current_liboctave_error_handler) + ("invalid conversion from NaN to character"); + return *this; + } else - { - octave_idx_type ival = NINTbig (d); + { + octave_idx_type ival = NINTbig (d); - if (ival < 0 || ival > UCHAR_MAX) - // FIXME -- is there something - // better we could do? Should we warn the user? - ival = 0; + if (ival < 0 || ival > UCHAR_MAX) + // FIXME -- is there something + // better we could do? Should we warn the user? + ival = 0; - tmp.elem (i) = static_cast<char>(ival); - } + tmp.elem (i) = static_cast<char>(ival); + } } insert (tmp, ra_idx); @@ -121,12 +121,12 @@ case 2: retval = charMatrix (Array2<char> (*this, dimensions(0), - dimensions(1))); + dimensions(1))); break; default: (*current_liboctave_error_handler) - ("invalid conversion of charNDArray to charMatrix"); + ("invalid conversion of charNDArray to charMatrix"); break; } @@ -135,15 +135,15 @@ void charNDArray::increment_index (Array<octave_idx_type>& ra_idx, - const dim_vector& dimensions, - int start_dimension) + const dim_vector& dimensions, + int start_dimension) { ::increment_index (ra_idx, dimensions, start_dimension); } octave_idx_type charNDArray::compute_index (Array<octave_idx_type>& ra_idx, - const dim_vector& dimensions) + const dim_vector& dimensions) { return ::compute_index (ra_idx, dimensions); }