Mercurial > octave-nkf

diff libinterp/corefcn/conv2.cc @ 20617:ba2b07c13913

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use new string_value method to handle value extraction errors * __dispatch__.cc, balance.cc, colloc.cc, conv2.cc, data.cc, debug.cc, graphics.cc, input.cc, matrix_type.cc, oct-hist.cc, schur.cc, spparms.cc, symtab.cc, sysdep.cc, toplev.cc, utils.cc: Use new string_value method.
author John W. Eaton <jwe@octave.org>
date Fri, 09 Oct 2015 10:06:39 -0400
parents 4f45eaf83908
children
line wrap: on
line diff
--- a/libinterp/corefcn/conv2.cc	Thu Oct 08 19:00:51 2015 -0400
+++ b/libinterp/corefcn/conv2.cc	Fri Oct 09 10:06:39 2015 -0400
@@ -329,15 +329,7 @@
       return retval;
     }
   else if (nargin == 3)
-    {
-      if (args(2).is_string ())
-        shape = args(2).string_value ();
-      else
-        {
-          error ("convn: SHAPE must be a string");
-          return retval;
-        }
-    }
+    shape = args(2).string_value ("convn: SHAPE must be a string");
 
   if (shape == "full")
     ct = convn_full;