Mercurial > octave
changeset 30524:74fe77faf861
maint: merge stable to default.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Wed, 22 Dec 2021 18:29:15 +0100 |
| parents | b65d423b12a6 (current diff) 9c2c0aa0e03f (diff) |
| children | 82aa07a293a5 |
| files | |
| diffstat | 8 files changed, 22 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/graphics/QtHandlesUtils.cc Sun Dec 19 20:42:45 2021 +0100 +++ b/libgui/graphics/QtHandlesUtils.cc Wed Dec 22 18:29:15 2021 +0100 @@ -402,7 +402,11 @@ // We assume a standard mouse with 15 degree steps and Qt returns // 1/8 of a degree. +#if defined (HAVE_QWHEELEVENT_ANGLEDELTA) int ydelta = -(event->angleDelta().y ()); +#else + int ydelta = -(event->delta ()); +#endif retval.setfield ("VerticalScrollCount", octave_value (ydelta / 120)); // FIXME: Is there any way to access the number of lines a scroll step
--- a/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp Sun Dec 19 20:42:45 2021 +0100 +++ b/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp Wed Dec 22 18:29:15 2021 +0100 @@ -1332,7 +1332,7 @@ if (! cmd.isEmpty ()) { - STARTUPINFO si; + STARTUPINFOW si; PROCESS_INFORMATION pi; ZeroMemory (&si, sizeof (si));
--- a/libgui/src/gui-utils.h Sun Dec 19 20:42:45 2021 +0100 +++ b/libgui/src/gui-utils.h Wed Dec 22 18:29:15 2021 +0100 @@ -26,6 +26,8 @@ #if ! defined (octave_gui_utils_h) #define octave_gui_utils_h 1 +#include "octave-config.h" + #include <QColor> namespace octave
--- a/liboctave/external/mk-f77-def.in.sh Sun Dec 19 20:42:45 2021 +0100 +++ b/liboctave/external/mk-f77-def.in.sh Wed Dec 22 18:29:15 2021 +0100 @@ -28,7 +28,7 @@ : ${SED=@SED@} : ${AWK=@AWK@} -F77_TOLOWER="@F77_APPEND_UNDERSCORE@" +F77_TOLOWER="@F77_TOLOWER@" F77_APPEND_UNDERSCORE="@F77_APPEND_UNDERSCORE@" F77_APPEND_EXTRA_UNDERSCORE="@F77_APPEND_EXTRA_UNDERSCORE@"
--- a/liboctave/numeric/lo-amos-proto.h Sun Dec 19 20:42:45 2021 +0100 +++ b/liboctave/numeric/lo-amos-proto.h Wed Dec 22 18:29:15 2021 +0100 @@ -75,7 +75,7 @@ // BESJ F77_RET_T - F77_FUNC (cbesj, cBESJ) (const F77_CMPLX *, const F77_REAL&, + F77_FUNC (cbesj, CBESJ) (const F77_CMPLX *, const F77_REAL&, const F77_INT&, const F77_INT&, F77_CMPLX *, F77_INT&, F77_INT&);
--- a/liboctave/numeric/sparse-qr.cc Sun Dec 19 20:42:45 2021 +0100 +++ b/liboctave/numeric/sparse-qr.cc Wed Dec 22 18:29:15 2021 +0100 @@ -205,8 +205,12 @@ ColumnVector ret (ncols); - for (octave_idx_type i = 0; i < ncols; i++) - ret(i) = from_suitesparse_long (m_E[i]) + 1; + if (m_E) + for (octave_idx_type i = 0; i < ncols; i++) + ret(i) = from_suitesparse_long (m_E[i]) + 1; + else + for (octave_idx_type i = 0; i < ncols; i++) + ret(i) = i + 1; return ret;
--- a/liboctave/util/action-container.h Sun Dec 19 20:42:45 2021 +0100 +++ b/liboctave/util/action-container.h Wed Dec 22 18:29:15 2021 +0100 @@ -28,6 +28,7 @@ #include "octave-config.h" +#include <cstddef> #include <functional> // This class allows registering actions in a list for later
--- a/scripts/testfun/test.m Sun Dec 19 20:42:45 2021 +0100 +++ b/scripts/testfun/test.m Wed Dec 22 18:29:15 2021 +0100 @@ -137,6 +137,12 @@ persistent __signal_file = ">>>>> "; persistent __signal_skip = "----- "; + __nxfail = 0; + __nbug = 0; + __nskip = 0; + __nrtskip = 0; + __nregression = 0; + if (nargin < 1) print_usage (); elseif (! isempty (__name) && ! ischar (__name))