Mercurial > octave
changeset 21568:3d60ed163b70
maint: Eliminate bad spacing around '='.
* Figure.h, PopupMenuControl.cc, annotation-dialog.cc, gl-select.h,
files-dock-widget.cc, find-files-dialog.cc, history-dock-widget.cc,
file-editor.cc, main-window.cc, webinfo.cc, resource-manager.cc,
shortcut-manager.cc, workspace-view.cc, __ichol__.cc, __ilu__.cc,
__lin_interpn__.cc, bitfcns.cc, debug.cc, filter.cc, ft-text-renderer.cc,
graphics.cc, graphics.in.h, hex2num.cc, jit-typeinfo.cc, load-save.cc,
ls-mat5.cc, mxarray.in.h, oct-stream.cc, pr-output.cc, variables.cc,
__init_fltk__.cc, __magick_read__.cc, chol.cc, ov-struct.cc, op-scm-cs.cc,
pt-assign.cc, CollocWt.cc, randpoisson.c, inputParser.m, quadgk.m, waitbar.m,
imwrite.m, __imread__.m, textread.m, fileattrib.m, __xzip__.m, what.m,
fsolve.m, fix_depends.m, stemleaf.m, bicgstab.m, ichol.m, io.tst:
maint: Eliminate bad spacing around '='.
line wrap: on
line diff
--- a/libgui/graphics/Figure.h Wed Mar 30 21:35:51 2016 -0700 +++ b/libgui/graphics/Figure.h Wed Mar 30 22:09:26 2016 -0700 @@ -41,13 +41,13 @@ // NOTE: These values must match the order of the buttons in the // MouseModeActionGroup object. - NoMode = 0, - RotateMode = 1, - ZoomInMode = 2, - ZoomOutMode = 3, - PanMode = 4, - TextMode = 5, - SelectMode = 6 + NoMode = 0, + RotateMode = 1, + ZoomInMode = 2, + ZoomOutMode = 3, + PanMode = 4, + TextMode = 5, + SelectMode = 6 }; class Container;
--- a/libgui/graphics/PopupMenuControl.cc Wed Mar 30 21:35:51 2016 -0700 +++ b/libgui/graphics/PopupMenuControl.cc Wed Mar 30 22:09:26 2016 -0700 @@ -105,10 +105,8 @@ if (value.numel () > 0) { - if (value(0) != static_cast<int>(value(0))) - { + if (value(0) != static_cast<int>(value(0))) warning ("popupmenu value should be integer"); - } else { int newIndex = int (value(0)) - 1;
--- a/libgui/graphics/annotation-dialog.cc Wed Mar 30 21:35:51 2016 -0700 +++ b/libgui/graphics/annotation-dialog.cc Wed Mar 30 22:09:26 2016 -0700 @@ -147,7 +147,7 @@ annotation_dialog::set_gui_props () { // set the gui to the values from the props - octave_idx_type len = props.length (); + octave_idx_type len = props.length (); for (int i=0; i<len/2; i++) {
--- a/libgui/graphics/gl-select.h Wed Mar 30 21:35:51 2016 -0700 +++ b/libgui/graphics/gl-select.h Wed Mar 30 22:09:26 2016 -0700 @@ -30,8 +30,8 @@ enum select_flags { - select_ignore_hittest = 0x01, - select_last = 0x02 + select_ignore_hittest = 0x01, + select_last = 0x02 }; class opengl_selector : public opengl_renderer
--- a/libgui/src/files-dock-widget.cc Wed Mar 30 21:35:51 2016 -0700 +++ b/libgui/src/files-dock-widget.cc Wed Mar 30 22:09:26 2016 -0700 @@ -926,7 +926,7 @@ if (_current_directory->hasFocus ()) { QClipboard *clipboard = QApplication::clipboard (); - QString str = clipboard->text (); + QString str = clipboard->text (); QLineEdit * edit = _current_directory->lineEdit (); if (edit && str.length () > 0) edit->insert (str);
--- a/libgui/src/find-files-dialog.cc Wed Mar 30 21:35:51 2016 -0700 +++ b/libgui/src/find-files-dialog.cc Wed Mar 30 22:09:26 2016 -0700 @@ -139,11 +139,11 @@ _status_bar = new QStatusBar; _status_bar->showMessage (tr ("Idle.")); - _find_button = new QPushButton (tr ("Find")); + _find_button = new QPushButton (tr ("Find")); _find_button->setToolTip (tr ("Start search for matching files")); connect (_find_button, SIGNAL (clicked ()), this, SLOT (start_find ())); - _stop_button = new QPushButton (tr ("Stop")); + _stop_button = new QPushButton (tr ("Stop")); _stop_button->setToolTip (tr ("Stop searching")); _stop_button->setEnabled (false); connect (_stop_button, SIGNAL (clicked ()), this, SLOT (stop_find ())); @@ -257,7 +257,7 @@ QDir::Filters filters = QDir::Dirs|QDir::NoDotAndDotDot|QDir::Files; if (! _name_case_check->isChecked ()) - filters |= QDir::CaseSensitive; + filters |= QDir::CaseSensitive; QStringList nameFilters; nameFilters.append (_file_name_edit->text ());
--- a/libgui/src/history-dock-widget.cc Wed Mar 30 21:35:51 2016 -0700 +++ b/libgui/src/history-dock-widget.cc Wed Mar 30 22:09:26 2016 -0700 @@ -326,7 +326,7 @@ if (_filter->lineEdit ()->hasFocus ()) { QClipboard *clipboard = QApplication::clipboard (); - QString str = clipboard->text (); + QString str = clipboard->text (); if (str.length () > 0) _filter->lineEdit ()->insert (str); } @@ -354,4 +354,4 @@ int filter_state = _filter_checkbox->isChecked (); filter_activate (filter_state); } -} \ No newline at end of file +}
--- a/libgui/src/m-editor/file-editor.cc Wed Mar 30 21:35:51 2016 -0700 +++ b/libgui/src/m-editor/file-editor.cc Wed Mar 30 22:09:26 2016 -0700 @@ -221,8 +221,8 @@ { bool ok; // get the name of the new function - QString new_name = QInputDialog::getText (this, tr ("New Function"), - tr ("New function name:\n"), QLineEdit::Normal, "", &ok); + QString new_name = QInputDialog::getText (this, tr ("New Function"), + tr ("New function name:\n"), QLineEdit::Normal, "", &ok); if (ok && new_name.length () > 0) { // append suffix if it not already exists @@ -1687,18 +1687,18 @@ _edit_cmd_menu->addSeparator (); - _move_to_matching_brace = add_action (_edit_nav_menu, QIcon (), + _move_to_matching_brace = add_action (_edit_nav_menu, QIcon (), tr ("Move to Matching Brace"), SLOT (request_move_match_brace (bool))); - _sel_to_matching_brace = add_action (_edit_nav_menu, QIcon (), + _sel_to_matching_brace = add_action (_edit_nav_menu, QIcon (), tr ("Select to Matching Brace"), SLOT (request_sel_match_brace (bool))); _edit_nav_menu->addSeparator (); - _previous_bookmark_action = add_action (_edit_nav_menu, QIcon (), + _previous_bookmark_action = add_action (_edit_nav_menu, QIcon (), tr ("Pre&vious Bookmark"), SLOT (request_previous_bookmark (bool))); - _next_bookmark_action = add_action (_edit_nav_menu, QIcon (), + _next_bookmark_action = add_action (_edit_nav_menu, QIcon (), tr ("&Next Bookmark"), SLOT (request_next_bookmark (bool))); - _toggle_bookmark_action = add_action (_edit_nav_menu, QIcon (), + _toggle_bookmark_action = add_action (_edit_nav_menu, QIcon (), tr ("Toggle &Bookmark"), SLOT (request_toggle_bookmark (bool))); _remove_bookmark_action = add_action (_edit_nav_menu, QIcon (), tr ("&Remove All Bookmarks"), SLOT (request_remove_bookmark (bool)));
--- a/libgui/src/main-window.cc Wed Mar 30 21:35:51 2016 -0700 +++ b/libgui/src/main-window.cc Wed Mar 30 22:09:26 2016 -0700 @@ -793,7 +793,7 @@ tr ("Are you sure you want to exit Octave?"), QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Ok); - if (ans != QMessageBox::Ok) + if (ans != QMessageBox::Ok) closenow = false; } @@ -1172,7 +1172,7 @@ { QLineEdit * edit = _current_directory_combo_box->lineEdit (); QClipboard *clipboard = QApplication::clipboard (); - QString str = clipboard->text (); + QString str = clipboard->text (); if (edit && str.length () > 0) { edit->insert (str); @@ -1967,7 +1967,7 @@ _report_bug_action = add_action (help_menu, QIcon (), tr ("Report Bug"), SLOT (open_bug_tracker_page ())); - _octave_packages_action = add_action (help_menu, QIcon (), + _octave_packages_action = add_action (help_menu, QIcon (), tr ("Octave Packages"), SLOT (open_octave_packages_page ())); _agora_action = add_action (help_menu, QIcon (),
--- a/libgui/src/qtinfo/webinfo.cc Wed Mar 30 21:35:51 2016 -0700 +++ b/libgui/src/qtinfo/webinfo.cc Wed Mar 30 22:09:26 2016 -0700 @@ -307,7 +307,7 @@ if (_search_line_edit->hasFocus ()) { QClipboard *clipboard = QApplication::clipboard (); - QString str = clipboard->text (); + QString str = clipboard->text (); if (str.length () > 0) _search_line_edit->insert (str); }
--- a/libgui/src/resource-manager.cc Wed Mar 30 21:35:51 2016 -0700 +++ b/libgui/src/resource-manager.cc Wed Mar 30 22:09:26 2016 -0700 @@ -241,7 +241,7 @@ if (! (settings && QFile::exists (settings->fileName ()) && settings->isWritable () - && settings->status () == QSettings::NoError)) + && settings->status () == QSettings::NoError)) { QString msg = QString (QT_TR_NOOP ( "The settings file\n%1\n"
--- a/libgui/src/shortcut-manager.cc Wed Mar 30 21:35:51 2016 -0700 +++ b/libgui/src/shortcut-manager.cc Wed Mar 30 22:09:26 2016 -0700 @@ -90,7 +90,7 @@ int prefix; #if defined (Q_OS_MAC) // Use CMD key as an equivalent of Ctrl key on other platforms - ctrl = Qt::MetaModifier; + ctrl = Qt::MetaModifier; // Some of octave default shortcuts on windows/linux are already defined // as system wide shortcuts on Mac Os X (almost all Function keys). // Prefix those with Option (Alt) modifier to avoid conflicts. @@ -689,7 +689,7 @@ QString file; if (action == OSC_IMPORT) - file = QFileDialog::getOpenFileName (this, + file = QFileDialog::getOpenFileName (this, tr ("Import shortcuts from file ..."), QString (), tr ("Octave Shortcut Files (*.osc);;All Files (*)"), 0,QFileDialog::DontUseNativeDialog);
--- a/libgui/src/workspace-view.cc Wed Mar 30 21:35:51 2016 -0700 +++ b/libgui/src/workspace-view.cc Wed Mar 30 22:09:26 2016 -0700 @@ -384,8 +384,8 @@ bool ok = false; QString new_name - = inputDialog->getText (0, "Rename Variable", "New name:", - QLineEdit::Normal, var_name, &ok); + = inputDialog->getText (0, "Rename Variable", "New name:", + QLineEdit::Normal, var_name, &ok); if (ok && ! new_name.isEmpty ()) { @@ -440,7 +440,7 @@ // Just modify those rows that have been added rather than go through // the whole list. For-loop test will handle when number of rows reduced. QFontMetrics fm = view->fontMetrics (); - int row_height = fm.height (); + int row_height = fm.height (); int new_row_count = _filter_model.rowCount (); for (int i = view_previous_row_count; i < new_row_count; i++) view->setRowHeight (i, row_height);
--- a/libinterp/corefcn/__ichol__.cc Wed Mar 30 21:35:51 2016 -0700 +++ b/libinterp/corefcn/__ichol__.cc Wed Mar 30 22:09:26 2016 -0700 @@ -301,7 +301,7 @@ vec[ind] = j; ind++; } - w_data[j] -= ichol_mult (data_l[jj], data_l[jjrow]); + w_data[j] -= ichol_mult (data_l[jj], data_l[jjrow]); } // Update the actual column first element and // update the linked list of the jrow row. @@ -378,7 +378,7 @@ // scale the elements by the pivot. data_l[total_len] = std::sqrt (data_l[total_len]); for (jj = total_len + 1; jj < (total_len + w_len); jj++) - data_l[jj] /= data_l[total_len]; + data_l[jj] /= data_l[total_len]; total_len += w_len; // Check if there are too many elements to be indexed with // octave_idx_type type due to fill-in during the process.
--- a/libinterp/corefcn/__ilu__.cc Wed Mar 30 21:35:51 2016 -0700 +++ b/libinterp/corefcn/__ilu__.cc Wed Mar 30 22:09:26 2016 -0700 @@ -116,7 +116,7 @@ if (opt != ROW) for (jj = uptr[k] + 1; jj < cidx[k+1]; jj++) - data[jj] /= data[uptr[k]]; + data[jj] /= data[uptr[k]]; if (k != jrow) error ("ilu: A has a zero on the diagonal");
--- a/libinterp/corefcn/__lin_interpn__.cc Wed Mar 30 21:35:51 2016 -0700 +++ b/libinterp/corefcn/__lin_interpn__.cc Wed Mar 30 22:09:26 2016 -0700 @@ -195,7 +195,7 @@ for (int i = 0; i < n; i++) { y[i] = Y[i].data (); - size[i] = V.dims ()(i); + size[i] = V.dims ()(i); } OCTAVE_LOCAL_BUFFER (const T *, x, n); @@ -227,7 +227,7 @@ M tmp = M (dim_vector (size[i], 1)); for (octave_idx_type j = 0; j < size[i]; j++) - tmp(j) = X[i](scale[i]*j); + tmp(j) = X[i](scale[i]*j); X[i] = tmp; }
--- a/libinterp/corefcn/bitfcns.cc Wed Mar 30 21:35:51 2016 -0700 +++ b/libinterp/corefcn/bitfcns.cc Wed Mar 30 22:09:26 2016 -0700 @@ -265,7 +265,7 @@ int16NDArray x (dx); int16NDArray y = args(q).int16_array_value (); - retval = bitopx (fname, x, y); + retval = bitopx (fname, x, y); } else if (args(q).type_id () == octave_int8_matrix::static_type_id () || args(q).type_id () == octave_int8_scalar::static_type_id ())
--- a/libinterp/corefcn/debug.cc Wed Mar 30 21:35:51 2016 -0700 +++ b/libinterp/corefcn/debug.cc Wed Mar 30 22:09:26 2016 -0700 @@ -460,9 +460,9 @@ void bp_table::dbclear_all_signals (void) { - Vdebug_on_error = false; bp_table::errors_that_stop.clear (); - Vdebug_on_caught = false; bp_table::caught_that_stop.clear (); - Vdebug_on_warning = false; bp_table::warnings_that_stop.clear (); + Vdebug_on_error = false; bp_table::errors_that_stop.clear (); + Vdebug_on_caught = false; bp_table::caught_that_stop.clear (); + Vdebug_on_warning = false; bp_table::warnings_that_stop.clear (); Vdebug_on_interrupt = false; }
--- a/libinterp/corefcn/filter.cc Wed Mar 30 21:35:51 2016 -0700 +++ b/libinterp/corefcn/filter.cc Wed Mar 30 22:09:26 2016 -0700 @@ -45,8 +45,8 @@ { MArray<T> y; - octave_idx_type a_len = a.numel (); - octave_idx_type b_len = b.numel (); + octave_idx_type a_len = a.numel (); + octave_idx_type b_len = b.numel (); octave_idx_type ab_len = a_len > b_len ? a_len : b_len;
--- a/libinterp/corefcn/ft-text-renderer.cc Wed Mar 30 21:35:51 2016 -0700 +++ b/libinterp/corefcn/ft-text-renderer.cc Wed Mar 30 22:09:26 2016 -0700 @@ -1141,7 +1141,7 @@ Array<idx_vector> idx (dim_vector (3, 1)); idx(0) = idx_vector (':'); idx(1) = idx_vector (pixels.dim2 ()-1, -1, -1); - idx(2)= idx_vector (pixels.dim3 ()-1, -1, -1); + idx(2) = idx_vector (pixels.dim3 ()-1, -1, -1); pixels = uint8NDArray (pixels.index (idx)); } break;
--- a/libinterp/corefcn/graphics.cc Wed Mar 30 21:35:51 2016 -0700 +++ b/libinterp/corefcn/graphics.cc Wed Mar 30 22:09:26 2016 -0700 @@ -2219,7 +2219,7 @@ for (octave_idx_type column = 0; column < k; column++) { caseless_str pname = pnames(column); - octave_value val = values(row, column); + octave_value val = values(row, column); set_value_or_default (pname, val); }
--- a/libinterp/corefcn/graphics.in.h Wed Mar 30 21:35:51 2016 -0700 +++ b/libinterp/corefcn/graphics.in.h Wed Mar 30 22:09:26 2016 -0700 @@ -1749,7 +1749,7 @@ Matrix do_get_all_children (void) const { Matrix retval (children_list.size (), 1); - octave_idx_type i = 0; + octave_idx_type i = 0; for (const_children_list_iterator p = children_list.begin (); p != children_list.end (); p++) @@ -2386,7 +2386,7 @@ octave_idx_type i = 0; for (const_available_toolkits_iterator p = available_toolkits.begin (); - p != available_toolkits.end (); p++) + p != available_toolkits.end (); p++) m(i++) = *p; return m; @@ -2398,7 +2398,7 @@ octave_idx_type i = 0; for (const_loaded_toolkits_iterator p = loaded_toolkits.begin (); - p != loaded_toolkits.end (); p++) + p != loaded_toolkits.end (); p++) m(i++) = p->first; return m;
--- a/libinterp/corefcn/hex2num.cc Wed Mar 30 21:35:51 2016 -0700 +++ b/libinterp/corefcn/hex2num.cc Wed Mar 30 22:09:26 2016 -0700 @@ -123,7 +123,7 @@ m(i) = num.dval; } - retval = m; + retval = m; } else { @@ -161,7 +161,7 @@ m(i) = num.dval; } - retval = m; + retval = m; } return retval;
--- a/libinterp/corefcn/jit-typeinfo.cc Wed Mar 30 21:35:51 2016 -0700 +++ b/libinterp/corefcn/jit-typeinfo.cc Wed Mar 30 22:09:26 2016 -0700 @@ -818,7 +818,7 @@ jit_operation::overload (const std::vector<jit_type*>& types) const { static jit_function null_overload; - for (size_t i =0; i < types.size (); ++i) + for (size_t i = 0; i < types.size (); ++i) if (! types[i]) return null_overload;
--- a/libinterp/corefcn/load-save.cc Wed Mar 30 21:35:51 2016 -0700 +++ b/libinterp/corefcn/load-save.cc Wed Mar 30 22:09:26 2016 -0700 @@ -1098,7 +1098,7 @@ #ifdef HAVE_ZLIB else if (argv[i] == "-zip" || argv[i] == "-z") { - use_zlib = true; + use_zlib = true; } #endif else if (argv[i] == "-struct")
--- a/libinterp/corefcn/ls-mat5.cc Wed Mar 30 21:35:51 2016 -0700 +++ b/libinterp/corefcn/ls-mat5.cc Wed Mar 30 22:09:26 2016 -0700 @@ -525,7 +525,7 @@ OCTAVE_LOCAL_BUFFER (unsigned int, tmp, 2); if (uncompress (reinterpret_cast<Bytef *> (tmp), &destLen, reinterpret_cast<Bytef *> (inbuf), element_length) - == Z_MEM_ERROR) + == Z_MEM_ERROR) error ("load: error probing size of compressed data element"); // Why should I have to initialize outbuf as I'll just overwrite!! @@ -1908,7 +1908,7 @@ // double max_val = val[0]; // double min_val = val[0]; - // bool all_integers = true; + // bool all_integers = true; // // for (int i = 0; i < nel; i++) // { @@ -1963,7 +1963,7 @@ // float max_val = val[0]; // float min_val = val[0]; - // bool all_integers = true; + // bool all_integers = true; // // for (int i = 0; i < nel; i++) // {
--- a/libinterp/corefcn/mxarray.in.h Wed Mar 30 21:35:51 2016 -0700 +++ b/libinterp/corefcn/mxarray.in.h Wed Mar 30 22:09:26 2016 -0700 @@ -503,7 +503,7 @@ if (str) { - mwSize sz = sizeof (mxChar) * (strlen (str) + 1); + mwSize sz = sizeof (mxChar) * (strlen (str) + 1); retval = static_cast<char *> (mxArray::malloc (sz)); strcpy (retval, str); }
--- a/libinterp/corefcn/oct-stream.cc Wed Mar 30 21:35:51 2016 -0700 +++ b/libinterp/corefcn/oct-stream.cc Wed Mar 30 22:09:26 2016 -0700 @@ -3787,7 +3787,7 @@ if (c1 == comment_char) // see if we match an open comment { // save stream state in case we have to restore it - char *pos = is.tellg (); + char *pos = is.tellg (); std::ios::iostate state = is.rdstate (); std::string tmp (comment_len, '\0'); @@ -6721,7 +6721,7 @@ && flt_fmt == oct_mach_info::flt_fmt_ieee_little_endian) || flt_fmt == oct_mach_info::flt_fmt_ieee_big_endian); - bool do_float_conversion = flt_fmt != oct_mach_info::float_format (); + bool do_float_conversion = flt_fmt != oct_mach_info::float_format (); typedef typename ultimate_element_type<T>::type ult_elt_type;
--- a/libinterp/corefcn/pr-output.cc Wed Mar 30 21:35:51 2016 -0700 +++ b/libinterp/corefcn/pr-output.cc Wed Mar 30 22:09:26 2016 -0700 @@ -947,7 +947,7 @@ if (print_eng) { - i_fw = 3 + prec + ex; + i_fw = 3 + prec + ex; r_fw = i_fw + 1; if (inf_or_nan && i_fw < 5) { @@ -3608,7 +3608,7 @@ static void set_output_prec_and_fw (int prec, int fw) { - Voutput_precision = prec; + Voutput_precision = prec; Voutput_max_field_width = fw; }
--- a/libinterp/corefcn/variables.cc Wed Mar 30 21:35:51 2016 -0700 +++ b/libinterp/corefcn/variables.cc Wed Mar 30 22:09:26 2016 -0700 @@ -1685,7 +1685,7 @@ std::string newmsg = std::string ("Variables in the file ") + nm + ":\n\n"; - retval = do_who (i, argv, return_list, verbose, newmsg); + retval = do_who (i, argv, return_list, verbose, newmsg); return retval; }
--- a/libinterp/dldfcn/__init_fltk__.cc Wed Mar 30 21:35:51 2016 -0700 +++ b/libinterp/dldfcn/__init_fltk__.cc Wed Mar 30 22:09:26 2016 -0700 @@ -1698,8 +1698,8 @@ Matrix zoom_box (1,4,0); zoom_box (0) = pos_x; zoom_box (1) = pos_y; - zoom_box (2) = Fl::event_x (); - zoom_box (3) = Fl::event_y () - menu_dy (); + zoom_box (2) = Fl::event_x (); + zoom_box (3) = Fl::event_y () - menu_dy (); canvas->set_zoom_box (zoom_box); canvas->zoom (true); mark_modified ();
--- a/libinterp/dldfcn/__magick_read__.cc Wed Mar 30 21:35:51 2016 -0700 +++ b/libinterp/dldfcn/__magick_read__.cc Wed Mar 30 22:09:26 2016 -0700 @@ -164,12 +164,12 @@ const Cell pixel_region = options.getfield ("region").cell_value (); // Subtract 1 to account for 0 indexing. - const Range rows = get_region_range (pixel_region (0)); - const Range cols = get_region_range (pixel_region (1)); - region["row_start"] = rows.base () -1; - region["col_start"] = cols.base () -1; - region["row_end"] = rows.max () -1; - region["col_end"] = cols.max () -1; + const Range rows = get_region_range (pixel_region (0)); + const Range cols = get_region_range (pixel_region (1)); + region["row_start"] = rows.base () -1; + region["col_start"] = cols.base () -1; + region["row_end"] = rows.max () -1; + region["col_end"] = cols.max () -1; // Length of the area to load into the Image Pixel Cache. We use max and // min to account for cases where last element of range is the range limit. @@ -471,8 +471,8 @@ case Magick::GrayscaleMatteType: // Grayscale image with opacity { - img = T (dim_vector (nRows, nCols, 1, nFrames)); - T alpha (dim_vector (nRows, nCols, 1, nFrames)); + img = T (dim_vector (nRows, nCols, 1, nFrames)); + T alpha (dim_vector (nRows, nCols, 1, nFrames)); P *img_fvec = img.fortran_vec (); P *a_fvec = alpha.fortran_vec (); @@ -515,9 +515,9 @@ col_cache, row_cache); octave_idx_type idx = 0; - P *rbuf = img_fvec; - P *gbuf = img_fvec + color_stride; - P *bbuf = img_fvec + color_stride * 2; + P *rbuf = img_fvec; + P *gbuf = img_fvec + color_stride; + P *bbuf = img_fvec + color_stride * 2; for (octave_idx_type col = 0; col < nCols; col++) { @@ -539,8 +539,8 @@ case Magick::PaletteMatteType: // Indexed color image with opacity case Magick::TrueColorMatteType: // Truecolor image with opacity { - img = T (dim_vector (nRows, nCols, 3, nFrames)); - T alpha (dim_vector (nRows, nCols, 1, nFrames)); + img = T (dim_vector (nRows, nCols, 3, nFrames)); + T alpha (dim_vector (nRows, nCols, 1, nFrames)); P *img_fvec = img.fortran_vec (); P *a_fvec = alpha.fortran_vec (); @@ -557,9 +557,9 @@ col_cache, row_cache); octave_idx_type idx = 0; - P *rbuf = img_fvec; - P *gbuf = img_fvec + color_stride; - P *bbuf = img_fvec + color_stride * 2; + P *rbuf = img_fvec; + P *gbuf = img_fvec + color_stride; + P *bbuf = img_fvec + color_stride * 2; for (octave_idx_type col = 0; col < nCols; col++) { @@ -582,7 +582,7 @@ case Magick::ColorSeparationType: // Cyan/Magenta/Yellow/Black (CMYK) image { - img = T (dim_vector (nRows, nCols, 4, nFrames)); + img = T (dim_vector (nRows, nCols, 4, nFrames)); P *img_fvec = img.fortran_vec (); const octave_idx_type frame_stride = color_stride * 4; @@ -594,10 +594,10 @@ col_cache, row_cache); octave_idx_type idx = 0; - P *cbuf = img_fvec; - P *mbuf = img_fvec + color_stride; - P *ybuf = img_fvec + color_stride * 2; - P *kbuf = img_fvec + color_stride * 3; + P *cbuf = img_fvec; + P *mbuf = img_fvec + color_stride; + P *ybuf = img_fvec + color_stride * 2; + P *kbuf = img_fvec + color_stride * 3; for (octave_idx_type col = 0; col < nCols; col++) { @@ -620,8 +620,8 @@ // Cyan, magenta, yellow, and black with alpha (opacity) channel case Magick::ColorSeparationMatteType: { - img = T (dim_vector (nRows, nCols, 4, nFrames)); - T alpha (dim_vector (nRows, nCols, 1, nFrames)); + img = T (dim_vector (nRows, nCols, 4, nFrames)); + T alpha (dim_vector (nRows, nCols, 1, nFrames)); P *img_fvec = img.fortran_vec (); P *a_fvec = alpha.fortran_vec (); @@ -642,10 +642,10 @@ = imvec[frameidx(frame)].getConstIndexes (); octave_idx_type idx = 0; - P *cbuf = img_fvec; - P *mbuf = img_fvec + color_stride; - P *ybuf = img_fvec + color_stride * 2; - P *kbuf = img_fvec + color_stride * 3; + P *cbuf = img_fvec; + P *mbuf = img_fvec + color_stride; + P *ybuf = img_fvec + color_stride * 2; + P *kbuf = img_fvec + color_stride * 3; for (octave_idx_type col = 0; col < nCols; col++) { @@ -994,9 +994,9 @@ static void encode_bool_image (std::vector<Magick::Image>& imvec, const boolNDArray& img) { - const octave_idx_type nFrames = img.ndims () < 4 ? 1 : img.dims ()(3); - const octave_idx_type nRows = img.rows (); - const octave_idx_type nCols = img.columns (); + const octave_idx_type nFrames = img.ndims () < 4 ? 1 : img.dims ()(3); + const octave_idx_type nRows = img.rows (); + const octave_idx_type nCols = img.columns (); // The initialized image will be black, this is for the other pixels const Magick::Color white ("white");
--- a/libinterp/dldfcn/chol.cc Wed Mar 30 21:35:51 2016 -0700 +++ b/libinterp/dldfcn/chol.cc Wed Mar 30 22:09:26 2016 -0700 @@ -918,7 +918,7 @@ %! assert (cu, cl', eps); %!test -%! cca = chol (Ac); +%! cca = chol (Ac); %! %! ccal = chol (Ac, "lower"); %! ccal2 = chol (tril (Ac), "lower"); @@ -936,7 +936,7 @@ %! assert (cca, ccau2, eps); %!test -%! cca = chol (single (Ac)); +%! cca = chol (single (Ac)); %! %! ccal = chol (single (Ac), "lower"); %! ccal2 = chol (tril (single (Ac)), "lower"); @@ -966,7 +966,7 @@ %! %! ca = a + i*b; %! -%! cca = chol (ca); +%! cca = chol (ca); %! %! ccal = chol (ca, "lower"); %! ccal2 = chol (tril (ca), "lower");
--- a/libinterp/octave-value/ov-struct.cc Wed Mar 30 21:35:51 2016 -0700 +++ b/libinterp/octave-value/ov-struct.cc Wed Mar 30 22:09:26 2016 -0700 @@ -1985,7 +1985,7 @@ } else { - for (int i = dim + 1; i < nd; i++) + for (int i = dim + 1; i < nd; i++) rdv(i-1) = rdv(i); rdv.resize (nd-1);
--- a/libinterp/operators/op-scm-cs.cc Wed Mar 30 21:35:51 2016 -0700 +++ b/libinterp/operators/op-scm-cs.cc Wed Mar 30 22:09:26 2016 -0700 @@ -112,7 +112,7 @@ if (d == 0.0) warn_divide_by_zero (); - retval = octave_value (v1.sparse_complex_matrix_value () / d); + retval = octave_value (v1.sparse_complex_matrix_value () / d); return retval; }
--- a/libinterp/parse-tree/pt-assign.cc Wed Mar 30 21:35:51 2016 -0700 +++ b/libinterp/parse-tree/pt-assign.cc Wed Mar 30 22:09:26 2016 -0700 @@ -266,7 +266,7 @@ error ("some elements undefined in return list"); // This won't do a copy. - octave_value_list ovl = rhs_val.slice (k, nel); + octave_value_list ovl = rhs_val.slice (k, nel); ult.assign (octave_value::op_asn_eq, octave_value (ovl, true));
--- a/liboctave/numeric/CollocWt.cc Wed Mar 30 21:35:51 2016 -0700 +++ b/liboctave/numeric/CollocWt.cc Wed Mar 30 22:09:26 2016 -0700 @@ -350,7 +350,7 @@ for (octave_idx_type j = 0; j < nt; j++) { - double x = root[j]; + double x = root[j]; double ax = x * (1.0 - x);
--- a/liboctave/numeric/randpoisson.c Wed Mar 30 21:35:51 2016 -0700 +++ b/liboctave/numeric/randpoisson.c Wed Mar 30 22:09:26 2016 -0700 @@ -474,7 +474,7 @@ * the normal approximation is based on: * > L=1e8; x=floor(linspace(0,2*L,1000)); * > max(abs(normal_pdf(x,L,L)-poisson_pdf(x,L))) - * ans = 1.1376e-28 + * ans = 1.1376e-28 * For L=1e7, the max is around 1e-9, which is within the step size of RUNI. * For L>1e10 the pprsc function breaks down, as I saw from the histogram * of a large sample, so 1e8 is both small enough and large enough. */
--- a/scripts/general/inputParser.m Wed Mar 30 21:35:51 2016 -0700 +++ b/scripts/general/inputParser.m Wed Mar 30 22:09:26 2016 -0700 @@ -246,9 +246,9 @@ classdef inputParser < handle properties ## TODO set input checking for this properties - CaseSensitive = false; - FunctionName = ""; - KeepUnmatched = false; + CaseSensitive = false; + FunctionName = ""; + KeepUnmatched = false; # PartialMatching = true; # TODO unimplemented # StructExpand = true; # TODO unimplemented endproperties @@ -277,7 +277,7 @@ ## When checking for fieldnames in a Case Insensitive way, this variable ## holds the correct identifier for the last searched named using the ## is_argname method. - last_name = ""; + last_name = ""; endproperties properties (Access = protected, Constant = true)
--- a/scripts/general/quadgk.m Wed Mar 30 21:35:51 2016 -0700 +++ b/scripts/general/quadgk.m Wed Mar 30 22:09:26 2016 -0700 @@ -432,7 +432,7 @@ 0.1047900103222502e+00, 0.6309209262997855e-01, ... 0.2293532201052922e-01]); - persistent weights7 = ... + persistent weights7 = ... diag ([0.1294849661688697e+00, 0.2797053914892767e+00, ... 0.3818300505051889e+00, 0.4179591836734694e+00, ... 0.3818300505051889e+00, 0.2797053914892767e+00, ...
--- a/scripts/gui/waitbar.m Wed Mar 30 21:35:51 2016 -0700 +++ b/scripts/gui/waitbar.m Wed Mar 30 22:09:26 2016 -0700 @@ -169,7 +169,7 @@ cb = get (hf, "createcancelbtn"); if (! isempty (cb)) if (isempty (hbtn)) - units = get (hax, "units"); + units = get (hax, "units"); fpos = get (hf, "position"); set (hax, "units", "pixels"); apos = get (hax, "position"); @@ -188,7 +188,7 @@ endif elseif (! isempty (hbtn)) delete (hbtn); - units = get (hax, "units"); + units = get (hax, "units"); fpos = get (hf, "position"); set (hax, "units", "pixels"); apos = get (hax, "position");
--- a/scripts/image/imwrite.m Wed Mar 30 21:35:51 2016 -0700 +++ b/scripts/image/imwrite.m Wed Mar 30 22:09:26 2016 -0700 @@ -142,8 +142,8 @@ ## typical usage with grayscale uint8 images %!testif HAVE_MAGICK -%! gray = randi (255, 10, 10, 1, "uint8"); -%! r = write_and_read (".tif", gray); +%! gray = randi (255, 10, 10, 1, "uint8"); +%! r = write_and_read (".tif", gray); %! assert (r, gray) ## grayscale uint8 images with alpha channel @@ -156,8 +156,8 @@ ## multipage grayscale uint8 images %!testif HAVE_MAGICK -%! gray = randi (255, 10, 10, 1, 5, "uint8"); -%! r = write_and_read (".tif", gray); +%! gray = randi (255, 10, 10, 1, 5, "uint8"); +%! r = write_and_read (".tif", gray); %! assert (r, gray) ## multipage RGB uint8 images with alpha channel
--- a/scripts/image/private/__imread__.m Wed Mar 30 21:35:51 2016 -0700 +++ b/scripts/image/private/__imread__.m Wed Mar 30 22:09:26 2016 -0700 @@ -42,7 +42,7 @@ endif ## keep track of the varargin offset we're looking at each moment - offset = 1; + offset = 1; ## It is possible for an file with multiple pages to have very different ## images on each page. Specifically, they may have different sizes. Because
--- a/scripts/io/textread.m Wed Mar 30 21:35:51 2016 -0700 +++ b/scripts/io/textread.m Wed Mar 30 22:09:26 2016 -0700 @@ -142,7 +142,7 @@ headerlines = find (strcmpi (varargin, "headerlines"), 1); if (! isempty (headerlines)) ## Beware of missing or wrong headerline value - if (headerlines == numel (varargin) + if (headerlines == numel (varargin) || ! isnumeric (varargin{headerlines + 1})) error ("textread: missing or invalid value for 'headerlines'" ); endif
--- a/scripts/miscellaneous/fileattrib.m Wed Mar 30 21:35:51 2016 -0700 +++ b/scripts/miscellaneous/fileattrib.m Wed Mar 30 22:09:26 2016 -0700 @@ -123,7 +123,7 @@ r(i).GroupRead = (modestr(5) == "r"); r(i).GroupWrite = (modestr(6) == "w"); r(i).GroupExecute = (modestr(7) == "x"); - r(i).OtherRead = (modestr(8) == "r"); + r(i).OtherRead = (modestr(8) == "r"); r(i).OtherWrite = (modestr(9) == "w"); r(i).OtherExecute = (modestr(10) == "x"); else
--- a/scripts/miscellaneous/private/__xzip__.m Wed Mar 30 21:35:51 2016 -0700 +++ b/scripts/miscellaneous/private/__xzip__.m Wed Mar 30 22:09:26 2016 -0700 @@ -93,8 +93,8 @@ movefile (cellfun (@(x) sprintf ("%s.%s", x, extension), fnames, "uniformoutput", false), cwd); if (nargout > 0) - filelist = cellfun (@(x) sprintf ("%s.%s", x, extension), - files, "uniformoutput", false); + filelist = cellfun (@(x) sprintf ("%s.%s", x, extension), + files, "uniformoutput", false); endif endif
--- a/scripts/miscellaneous/what.m Wed Mar 30 21:35:51 2016 -0700 +++ b/scripts/miscellaneous/what.m Wed Mar 30 22:09:26 2016 -0700 @@ -147,7 +147,7 @@ nrows = ceil (length (f) / ncols); for i = 1 : nrows - args = f(i:nrows:end); + args = f(i:nrows:end); if (length (args) < ncols) args(end+1 : ncols) = {""}; endif
--- a/scripts/optimization/fsolve.m Wed Mar 30 21:35:51 2016 -0700 +++ b/scripts/optimization/fsolve.m Wed Mar 30 22:09:26 2016 -0700 @@ -559,7 +559,7 @@ %! c_opt = [a0, b0]; %! tol = 1e-5; %! -%! [c, fval, info, output] = fsolve (@(c) (exp(-c(1)*x) + c(2) - y), [0, 0]); +%! [c, fval, info, output] = fsolve (@(c) (exp(-c(1)*x) + c(2) - y), [0, 0]); %! assert (info > 0); %! assert (norm (c - c_opt, Inf) < tol); %! assert (norm (fval) < norm (noise));
--- a/scripts/pkg/private/fix_depends.m Wed Mar 30 21:35:51 2016 -0700 +++ b/scripts/pkg/private/fix_depends.m Wed Mar 30 22:09:26 2016 -0700 @@ -53,7 +53,7 @@ else package = tolower (strtrim (dep)); operator = ">="; - version = "0.0.0"; + version = "0.0.0"; endif deps_cell{i} = struct ("package", package, "operator", operator,
--- a/scripts/plot/draw/stemleaf.m Wed Mar 30 21:35:51 2016 -0700 +++ b/scripts/plot/draw/stemleaf.m Wed Mar 30 22:09:26 2016 -0700 @@ -248,7 +248,7 @@ ## Vectorized version provided by Rik Wehbring (rik@octave.org) ## Determine leaves for each stem: - new_line = 1; + new_line = 1; for kx = 2: numel (stems) stem_sign = signbit (stems(kx));
--- a/scripts/sparse/bicgstab.m Wed Mar 30 21:35:51 2016 -0700 +++ b/scripts/sparse/bicgstab.m Wed Mar 30 22:09:26 2016 -0700 @@ -77,9 +77,9 @@ if (ischar (A)) A = str2func (A); elseif (isnumeric(A) && issquare (A)) - Ax = @(x) A * x; + Ax = @(x) A * x; elseif (isa (A, "function_handle")) - Ax = @(x) feval (A, x); + Ax = @(x) feval (A, x); else error ("bicgstab: A must be a square matrix or function"); endif
--- a/scripts/sparse/ichol.m Wed Mar 30 21:35:51 2016 -0700 +++ b/scripts/sparse/ichol.m Wed Mar 30 22:09:26 2016 -0700 @@ -237,7 +237,7 @@ ## Delegate to specialized ICHOL switch (opts.type) case "nofill" - L = __ichol0__ (A_in, opts.michol); + L = __ichol0__ (A_in, opts.michol); case "ict" L = __icholt__ (A_in, opts.droptol, opts.michol); endswitch
--- a/test/io.tst Wed Mar 30 21:35:51 2016 -0700 +++ b/test/io.tst Wed Mar 30 22:09:26 2016 -0700 @@ -241,7 +241,7 @@ %! %! save ("-binary", struct_dat, %! "-struct", "STR", "matrix_fld", "str*_fld"); -%! STR = load (struct_dat); +%! STR = load (struct_dat); %! %! assert (!isfield (STR,"scalar_fld") && ... %! STR.matrix_fld == [1.1,2;3,4] && ...