Mercurial > octave-nkf
comparison libinterp/corefcn/conv2.cc @ 20617:ba2b07c13913
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 |
comparison
equal
deleted
inserted
replaced
| 20616:fd0efcdb3718 | 20617:ba2b07c13913 |
|---|---|
| 327 { | 327 { |
| 328 print_usage (); | 328 print_usage (); |
| 329 return retval; | 329 return retval; |
| 330 } | 330 } |
| 331 else if (nargin == 3) | 331 else if (nargin == 3) |
| 332 { | 332 shape = args(2).string_value ("convn: SHAPE must be a string"); |
| 333 if (args(2).is_string ()) | |
| 334 shape = args(2).string_value (); | |
| 335 else | |
| 336 { | |
| 337 error ("convn: SHAPE must be a string"); | |
| 338 return retval; | |
| 339 } | |
| 340 } | |
| 341 | 333 |
| 342 if (shape == "full") | 334 if (shape == "full") |
| 343 ct = convn_full; | 335 ct = convn_full; |
| 344 else if (shape == "same") | 336 else if (shape == "same") |
| 345 ct = convn_same; | 337 ct = convn_same; |