Mercurial > octave
changeset 32599:60c1b3ffd859
maint: Avoid dim_vector copies in a few more places (bug #64962)
* libgui/graphics/QtHandlesUtils.cc,
libinterp/corefcn/filter.cc, libinterp/corefcn/gl-render.cc,
libinterp/corefcn/gl2ps-print.cc, libinterp/octave-value/ov-struct.cc:
Create constant reference to existing dim_vector rather than creating
new instance.
* libinterp/corefcn/bitfcns.cc, libinterp/operators/op-int.h,
libinterp/operators/op-str-str.cc: Format trailing '\' of macros to align in
one column.
| author | Rik <rik@octave.org> |
|---|---|
| date | Wed, 13 Dec 2023 14:00:35 -0800 |
| parents | 2f3b54f81947 |
| children | 0532fdb2a3d2 db0e70a46dc0 |
| files | libgui/graphics/QtHandlesUtils.cc libinterp/corefcn/bitfcns.cc libinterp/corefcn/filter.cc libinterp/corefcn/gl-render.cc libinterp/corefcn/gl2ps-print.cc libinterp/octave-value/ov-struct.cc libinterp/operators/op-int.h libinterp/operators/op-str-str.cc |
| diffstat | 8 files changed, 20 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/graphics/QtHandlesUtils.cc Wed Dec 13 15:48:06 2023 -0500 +++ b/libgui/graphics/QtHandlesUtils.cc Wed Dec 13 14:00:35 2023 -0800 @@ -285,7 +285,7 @@ QImage makeImageFromCData (const octave_value& v, int width, int height) { - dim_vector dv (v.dims ()); + const dim_vector& dv = v.dims (); if (dv.ndims () == 3 && dv(2) == 3) {
--- a/libinterp/corefcn/bitfcns.cc Wed Dec 13 15:48:06 2023 -0500 +++ b/libinterp/corefcn/bitfcns.cc Wed Dec 13 14:00:35 2023 -0800 @@ -475,8 +475,8 @@ \ bool is_scalar_op = (m_nel == 1 || n_nel == 1); \ \ - const dim_vector& m_dv = m.dims (); \ - const dim_vector& n_dv = n.dims (); \ + const dim_vector& m_dv = m.dims (); \ + const dim_vector& n_dv = n.dims (); \ \ bool is_array_op = (m_dv == n_dv); \ \
--- a/libinterp/corefcn/filter.cc Wed Dec 13 15:48:06 2023 -0500 +++ b/libinterp/corefcn/filter.cc Wed Dec 13 14:00:35 2023 -0800 @@ -74,7 +74,7 @@ octave_idx_type x_len = x_dims(dim); - dim_vector si_dims = si.dims (); + const dim_vector& si_dims = si.dims (); octave_idx_type si_len = si_dims(0); if (si_len != ab_len - 1)
--- a/libinterp/corefcn/gl-render.cc Wed Dec 13 15:48:06 2023 -0500 +++ b/libinterp/corefcn/gl-render.cc Wed Dec 13 14:00:35 2023 -0800 @@ -180,7 +180,7 @@ { opengl_texture retval (glfcns); - dim_vector dv (data.dims ()); + const dim_vector& dv = data.dims (); // Expect RGB data if (dv.ndims () == 3 && (dv(2) == 3 || dv(2) == 4)) @@ -4090,7 +4090,7 @@ { #if defined (HAVE_OPENGL) - dim_vector dv (cdata.dims ()); + const dim_vector& dv = cdata.dims (); int h = dv(0); int w = dv(1); double x0, x1, y0, y1;
--- a/libinterp/corefcn/gl2ps-print.cc Wed Dec 13 15:48:06 2023 -0500 +++ b/libinterp/corefcn/gl2ps-print.cc Wed Dec 13 14:00:35 2023 -0800 @@ -1236,7 +1236,7 @@ gl2ps_renderer::draw_image (const image::properties& props) { octave_value cdata = props.get_color_data (); - dim_vector dv (cdata.dims ()); + const dim_vector& dv = cdata.dims (); int h = dv(0); int w = dv(1);
--- a/libinterp/octave-value/ov-struct.cc Wed Dec 13 15:48:06 2023 -0500 +++ b/libinterp/octave-value/ov-struct.cc Wed Dec 13 14:00:35 2023 -0800 @@ -1860,7 +1860,7 @@ { if (args(i).iscell ()) { - dim_vector argdims (args(i).dims ()); + const dim_vector& argdims = args(i).dims (); if (! scalar (argdims)) {
--- a/libinterp/operators/op-int.h Wed Dec 13 15:48:06 2023 -0500 +++ b/libinterp/operators/op-int.h Wed Dec 13 14:00:35 2023 -0800 @@ -702,8 +702,8 @@ static octave_value \ elem_xpow (const T1 ## NDArray& a, const T2 ## NDArray& b) \ { \ - const dim_vector& a_dims = a.dims (); \ - const dim_vector& b_dims = b.dims (); \ + const dim_vector& a_dims = a.dims (); \ + const dim_vector& b_dims = b.dims (); \ if (a_dims != b_dims) \ { \ if (! is_valid_bsxfun ("operator .^", a_dims, b_dims)) \ @@ -723,8 +723,8 @@ static octave_value \ elem_xpow (const T1 ## NDArray& a, const NDArray& b) \ { \ - const dim_vector& a_dims = a.dims (); \ - const dim_vector& b_dims = b.dims (); \ + const dim_vector& a_dims = a.dims (); \ + const dim_vector& b_dims = b.dims (); \ if (a_dims != b_dims) \ { \ if (! is_valid_bsxfun ("operator .^", a_dims, b_dims)) \ @@ -744,8 +744,8 @@ static octave_value \ elem_xpow (const NDArray& a, const T2 ## NDArray& b) \ { \ - const dim_vector& a_dims = a.dims (); \ - const dim_vector& b_dims = b.dims (); \ + const dim_vector& a_dims = a.dims (); \ + const dim_vector& b_dims = b.dims (); \ if (a_dims != b_dims) \ { \ if (! is_valid_bsxfun ("operator .^", a_dims, b_dims)) \ @@ -765,8 +765,8 @@ static octave_value \ elem_xpow (const T1 ## NDArray& a, const FloatNDArray& b) \ { \ - const dim_vector& a_dims = a.dims (); \ - const dim_vector& b_dims = b.dims (); \ + const dim_vector& a_dims = a.dims (); \ + const dim_vector& b_dims = b.dims (); \ if (a_dims != b_dims) \ { \ if (! is_valid_bsxfun ("operator .^", a_dims, b_dims)) \ @@ -786,8 +786,8 @@ static octave_value \ elem_xpow (const FloatNDArray& a, const T2 ## NDArray& b) \ { \ - const dim_vector& a_dims = a.dims (); \ - const dim_vector& b_dims = b.dims (); \ + const dim_vector& a_dims = a.dims (); \ + const dim_vector& b_dims = b.dims (); \ if (a_dims != b_dims) \ { \ if (! is_valid_bsxfun ("operator .^", a_dims, b_dims)) \
--- a/libinterp/operators/op-str-str.cc Wed Dec 13 15:48:06 2023 -0500 +++ b/libinterp/operators/op-str-str.cc Wed Dec 13 14:00:35 2023 -0800 @@ -57,8 +57,8 @@ CONCAT2(oct_binop_, name) (const octave_base_value& a1, \ const octave_base_value& a2) \ { \ - const dim_vector& a1_dims = a1.dims (); \ - const dim_vector& a2_dims = a2.dims (); \ + const dim_vector& a1_dims = a1.dims (); \ + const dim_vector& a2_dims = a2.dims (); \ \ bool a1_is_scalar = a1_dims.all_ones (); \ bool a2_is_scalar = a2_dims.all_ones (); \