Mercurial > octave
changeset 28226:822dc79a7e97
maint: merge stable to default.
| author | Rik <rik@octave.org> |
|---|---|
| date | Thu, 16 Apr 2020 11:52:11 -0700 |
| parents | 1f07b80db239 (current diff) fbced93c9704 (diff) |
| children | a56ee7986ea4 |
| files | test/io.tst |
| diffstat | 10 files changed, 24 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/graphics/PushButtonControl.cc Wed Apr 15 20:53:23 2020 +0200 +++ b/libgui/graphics/PushButtonControl.cc Thu Apr 16 11:52:11 2020 -0700 @@ -69,7 +69,7 @@ btn->setAutoFillBackground (true); octave_value cdat = up.get_cdata (); QImage img = Utils::makeImageFromCData (cdat, - cdat.rows (), cdat.columns ()); + cdat.columns (), cdat.rows ()); btn->setIcon (QIcon (QPixmap::fromImage (img))); }
--- a/libgui/graphics/ToggleButtonControl.cc Wed Apr 15 20:53:23 2020 +0200 +++ b/libgui/graphics/ToggleButtonControl.cc Thu Apr 16 11:52:11 2020 -0700 @@ -75,7 +75,7 @@ btn->setAutoFillBackground (true); octave_value cdat = up.get_cdata (); QImage img = Utils::makeImageFromCData (cdat, - cdat.rows (), cdat.columns ()); + cdat.columns (), cdat.rows ()); btn->setIcon (QIcon (QPixmap::fromImage (img))); }
--- a/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp Wed Apr 15 20:53:23 2020 +0200 +++ b/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp Thu Apr 16 11:52:11 2020 -0700 @@ -282,9 +282,9 @@ : q (parent), m_command (cmd), m_auto_scroll (true), m_cursorBlinking (false), m_hasBlinkingCursor (true), m_cursorType (BlockCursor), m_beginSelection (0, 0), m_endSelection (0, 0), m_settingSelection (false), - m_process (NULL), m_inWheelEvent (false) + m_process (nullptr), m_inWheelEvent (false) { - log (NULL); + log (nullptr); // Possibly detach from any existing console log ("Detaching from existing console (if any)...\n"); @@ -299,7 +299,7 @@ // Create new (hidden) console hOrigSta = GetProcessWindowStation (); - hNewSta = CreateWindowStation (NULL, 0, GENERIC_ALL, NULL); + hNewSta = CreateWindowStation (nullptr, 0, GENERIC_ALL, nullptr); log ("Current Windows station: %p.\nNew Windows station: %p.\n", hOrigSta, hNewSta); if (! SetProcessWindowStation (hNewSta)) @@ -328,9 +328,9 @@ log ("POSIX standard streams created.\n"); - setvbuf (stdin, NULL, _IONBF, 0); - setvbuf (stdout, NULL, _IONBF, 0); - setvbuf (stderr, NULL, _IONBF, 0); + setvbuf (stdin, nullptr, _IONBF, 0); + setvbuf (stdout, nullptr, _IONBF, 0); + setvbuf (stderr, nullptr, _IONBF, 0); log ("POSIX standard stream buffers adjusted.\n"); @@ -1339,14 +1339,14 @@ si.cb = sizeof (si); ZeroMemory (&pi, sizeof (pi)); - if (CreateProcessW (NULL, + if (CreateProcessW (nullptr, (LPWSTR)cmd.unicode (), - NULL, - NULL, + nullptr, + nullptr, TRUE, 0, - NULL, - NULL, + nullptr, + nullptr, &si, &pi)) { @@ -1354,7 +1354,7 @@ m_process = pi.hProcess; WaitForSingleObject (m_process, INFINITE); CloseHandle (m_process); - m_process = NULL; + m_process = nullptr; } } }
--- a/libinterp/corefcn/oct-procbuf.cc Wed Apr 15 20:53:23 2020 +0200 +++ b/libinterp/corefcn/oct-procbuf.cc Thu Apr 16 11:52:11 2020 -0700 @@ -93,7 +93,7 @@ open_p = true; if (mode & std::ios::out) - ::setvbuf (f, 0, _IOLBF, BUFSIZ); + ::setvbuf (f, nullptr, _IOLBF, BUFSIZ); return this;
--- a/libinterp/dldfcn/audioread.cc Wed Apr 15 20:53:23 2020 +0200 +++ b/libinterp/dldfcn/audioread.cc Thu Apr 16 11:52:11 2020 -0700 @@ -435,8 +435,8 @@ frame.add_fcn (safe_close, file); - sf_command (file, SFC_SET_NORM_DOUBLE, NULL, SF_TRUE); - sf_command (file, SFC_SET_CLIPPING, NULL, SF_TRUE) ; + sf_command (file, SFC_SET_NORM_DOUBLE, nullptr, SF_TRUE); + sf_command (file, SFC_SET_CLIPPING, nullptr, SF_TRUE) ; sf_command (file, SFC_SET_VBR_ENCODING_QUALITY, &quality, sizeof (quality)); if (title != "")
--- a/libinterp/parse-tree/jit-typeinfo.cc Wed Apr 15 20:53:23 2020 +0200 +++ b/libinterp/parse-tree/jit-typeinfo.cc Thu Apr 16 11:52:11 2020 -0700 @@ -1665,7 +1665,7 @@ llvm::Value *dzero = llvm::ConstantFP::get (m_scalar_t, 0); llvm::Value *izero = llvm::ConstantInt::get (m_index_t, 0); llvm::Value *rng = llvm::ConstantStruct::get (m_range_t, dzero, dzero, - dzero, izero, NULL); + dzero, izero, nullptr); rng = m_builder.CreateInsertValue (rng, base, 0); rng = m_builder.CreateInsertValue (rng, limit, 1); rng = m_builder.CreateInsertValue (rng, inc, 2);
--- a/liboctave/system/lo-sysdep.cc Wed Apr 15 20:53:23 2020 +0200 +++ b/liboctave/system/lo-sysdep.cc Thu Apr 16 11:52:11 2020 -0700 @@ -212,7 +212,7 @@ }); if (set_nonbuffered_mode) - ::setvbuf (fptr, 0, _IONBF, 0); + ::setvbuf (fptr, nullptr, _IONBF, 0); while (true) { @@ -341,7 +341,7 @@ if (fseek_ftell_bug_workaround_needed && mode.find ('t') != std::string::npos) - ::setvbuf (fptr, 0, _IONBF, 0); + ::setvbuf (fptr, nullptr, _IONBF, 0); return fptr;
--- a/liboctave/util/url-transfer.cc Wed Apr 15 20:53:23 2020 +0200 +++ b/liboctave/util/url-transfer.cc Thu Apr 16 11:52:11 2020 -0700 @@ -732,7 +732,7 @@ // path of the file as its value. void form_data_post (const Array<std::string>& param) { - struct curl_httppost *post = NULL, *last = NULL; + struct curl_httppost *post = nullptr, *last = nullptr; SETOPT (CURLOPT_URL, m_host_or_url.c_str ());
--- a/src/shared-fcns.h Wed Apr 15 20:53:23 2020 +0200 +++ b/src/shared-fcns.h Thu Apr 16 11:52:11 2020 -0700 @@ -50,7 +50,7 @@ std::string bin_dir; char namebuf[MAX_PATH+1]; - if (GetModuleFileName (GetModuleHandle (NULL), namebuf, MAX_PATH)) + if (GetModuleFileName (GetModuleHandle (nullptr), namebuf, MAX_PATH)) { namebuf[MAX_PATH] = '\0';
--- a/test/io.tst Wed Apr 15 20:53:23 2020 +0200 +++ b/test/io.tst Thu Apr 16 11:52:11 2020 -0700 @@ -933,12 +933,12 @@ %! r_mode = r_modes{j}; %! for k = 1:numel (f_texts); %! f_text = f_texts{k}; -%! fname = tempname () +%! fname = tempname (); %! fid = fopen (fname, w_mode); %! unwind_protect %! fprintf (fid, "%s", f_text); %! fclose (fid); -%! fid = fopen (fname, r_mode) +%! fid = fopen (fname, r_mode); %! fgetl (fid); %! pos = ftell (fid); %! buf1 = fgetl (fid);