Mercurial > octave-nkf

diff src/ov-re-sparse.cc @ 6221:8e0f1eda266b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2007-01-03 17:23:33 by jwe]
author jwe
date Wed, 03 Jan 2007 17:23:34 +0000
parents c68896f193e3
children 2aad75fcc93a
line wrap: on
line diff
--- a/src/ov-re-sparse.cc	Sat Dec 30 17:29:35 2006 +0000
+++ b/src/ov-re-sparse.cc	Wed Jan 03 17:23:34 2007 +0000
@@ -98,8 +98,9 @@
 
   if (numel () > 0)
     {
-      gripe_implicit_conversion ("Octave:array-as-scalar",
-				 "real sparse matrix", "real scalar");
+      if (numel () > 1)
+	gripe_implicit_conversion ("Octave:array-as-scalar",
+				   "real sparse matrix", "real scalar");
 
       retval = matrix (0, 0);
     }
@@ -119,8 +120,9 @@
   // FIXME -- maybe this should be a function, valid_as_scalar()
   if (rows () > 0 && columns () > 0)
     {
-      gripe_implicit_conversion ("Octave:array-as-scalar",
-				 "real sparse matrix", "complex scalar");
+      if (numel () > 1)
+	gripe_implicit_conversion ("Octave:array-as-scalar",
+				   "real sparse matrix", "complex scalar");
 
       retval = matrix (0, 0);
     }