Mercurial > octave-nkf

changeset 19489:17f5db3a9149 gui-release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Periodic merge of stable to gui-release.
author Rik <rik@octave.org>
date Thu, 01 Jan 2015 18:51:50 -0800
parents 50aedabe6bfb (current diff) 8dbd55742112 (diff)
children dec5b96ca298 17e6c770e6ac
files
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/dldfcn/__init_fltk__.cc	Tue Dec 30 13:27:49 2014 -0800
+++ b/libinterp/dldfcn/__init_fltk__.cc	Thu Jan 01 18:51:50 2015 -0800
@@ -929,7 +929,9 @@
 
   void show_canvas (void)
   {
-    if (fp.is_visible ())
+    if (! canvas->can_do ())
+      error ("unable to plot due to insufficient OpenGL support");
+    else if (fp.is_visible ())
       {
         canvas->show ();
         canvas->make_current ();
--- a/scripts/statistics/base/meansq.m	Tue Dec 30 13:27:49 2014 -0800
+++ b/scripts/statistics/base/meansq.m	Thu Jan 01 18:51:50 2015 -0800
@@ -31,7 +31,7 @@
 ##
 ## @example
 ## @group
-## std (x) = 1/N SUM_i x(i)^2
+## meansq (x) = 1/N SUM_i x(i)^2
 ## @end group
 ## @end example
 ##