Mercurial > octave

changeset 25096:7e04ddd963a9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default.
author Rik <rik@octave.org>
date Mon, 02 Apr 2018 17:29:19 -0700
parents 7c184f1dce65 (current diff) 71ed409b2ffb (diff)
children b8ffceb06354
files
diffstat 3 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/graphics/ObjectProxy.cc	Mon Apr 02 15:55:41 2018 -0700
+++ b/libgui/graphics/ObjectProxy.cc	Mon Apr 02 17:29:19 2018 -0700
@@ -29,6 +29,7 @@
 #include <QThread>
 
 #include "oct-mutex.h"
+#include "utils.h"
 
 #include "Object.h"
 #include "ObjectProxy.h"
@@ -134,11 +135,11 @@
     if (! QMetaObject::invokeMethod (m_object, "slotGetPixels", t,
                                      Q_RETURN_ARG (uint8NDArray, retval)))
       {
-        QThread::msleep (100);
+        octave_sleep (0.1);
         if (! QMetaObject::invokeMethod (m_object, "slotGetPixels", t,
                                          Q_RETURN_ARG (uint8NDArray, retval)))
           {
-            QThread::msleep (200);
+            octave_sleep (0.2);
             if (! QMetaObject::invokeMethod (m_object, "slotGetPixels", t,
                                              Q_RETURN_ARG (uint8NDArray, retval)))
               error ("getframe: unable to retrieve figure pixels");
--- a/libgui/src/documentation.cc	Mon Apr 02 15:55:41 2018 -0700
+++ b/libgui/src/documentation.cc	Mon Apr 02 17:29:19 2018 -0700
@@ -200,8 +200,8 @@
         namefilter.append ("*" + bname + "*");
         foreach (QFileInfo fi, dir.entryInfoList (namefilter))
           {
-            QDir tmpdir (fi.absoluteFilePath ());
-            tmpdir.removeRecursively ();
+            std::string file_name = fi.absoluteFilePath ().toStdString ();
+            sys::recursive_rmdir (file_name);
           }
 
         file.remove();
--- a/libinterp/corefcn/lu.cc	Mon Apr 02 15:55:41 2018 -0700
+++ b/libinterp/corefcn/lu.cc	Mon Apr 02 17:29:19 2018 -0700
@@ -552,8 +552,8 @@
 %! assert (P'*L*U*Q', B);
 
 %!error lu ()
-%!warning <function may fail>
-%! [l,u] = lu (sparse (magic (3)));
+%!testif HAVE_UMFPACK
+%! fail ("[l,u] = lu (sparse (magic (3)))", "warning", "function may fail");
 %!error <can not define pivoting threshold> lu ([1, 2; 3, 4], 2)
 
 */