# HG changeset patch # User magedrifaat # Date 1662568253 -7200 # Node ID fe776b0e904dfda3e78c946deef585f07af63755 # Parent 0fb5ca242d66733726157449334bba618023e549 __tiff__.cc: added appropriate print_usage checks for internal functions * libtinterp/corefcn/__tiff__.cc: replaced errors for incorrect number of arguments with appropriate print_usage statements. diff -r 0fb5ca242d66 -r fe776b0e904d libinterp/corefcn/__tiff__.cc --- a/libinterp/corefcn/__tiff__.cc Wed Sep 07 18:00:04 2022 +0200 +++ b/libinterp/corefcn/__tiff__.cc Wed Sep 07 18:30:53 2022 +0200 @@ -2394,11 +2394,9 @@ { #if defined (HAVE_TIFF) int nargin = args.length (); - - if (nargin == 0 || nargin > 2) - { - error ("No filename supplied\n"); - } + + if (nargin < 1 || nargin > 2) + print_usage (); std::string filename = args(0).string_value (); std::string mode = "r"; @@ -2463,7 +2461,7 @@ int nargin = args.length (); if (nargin == 0) - error ("No handle provided\n"); + print_usage (); octave_tiff_handle *tiff_handle = octave_tiff_handle::get_tiff_handle (args(0)); @@ -2494,11 +2492,8 @@ #if defined (HAVE_TIFF) int nargin = args.length (); - if (nargin == 0) - error ("No handle provided\n"); - if (nargin < 2) - error ("No tag name provided\n"); + print_usage (); octave_tiff_handle *tiff_handle = octave_tiff_handle::get_tiff_handle (args(0)); @@ -2550,8 +2545,13 @@ #if defined (HAVE_TIFF) int nargin = args.length (); + if (nargin == 0) + print_usage (); + if (nargin < 2) - error ("Too few arguments provided\n"); + // Since this function accepts varargin from the Octave side, the + // ommitted arguments are from wrong usage of the setTag method + print_usage ("Tiff.setTag"); octave_tiff_handle *tiff_handle = octave_tiff_handle::get_tiff_handle (args(0)); @@ -2582,7 +2582,7 @@ else { if (nargin < 3) - error ("Too few arguments provided"); + print_usage ("Tiff.setTag"); const TIFFField *fip; if (args(1).is_string ()) @@ -2623,7 +2623,7 @@ int nargin = args.length (); if (nargin == 0) - error ("No handle provided\n"); + print_usage (); octave_tiff_handle *tiff_handle = octave_tiff_handle::get_tiff_handle (args(0)); @@ -2684,7 +2684,7 @@ int nargin = args.length (); if (nargin != 2) - error ("Wrong number of arguments"); + print_usage (); octave_tiff_handle *tiff_handle = octave_tiff_handle::get_tiff_handle (args(0)); @@ -2732,7 +2732,7 @@ int nargin = args.length (); if (nargin != 2) - error ("Wrong number of arguments"); + print_usage (); octave_tiff_handle *tiff_handle = octave_tiff_handle::get_tiff_handle (args(0)); @@ -2780,7 +2780,7 @@ int nargin = args.length (); if (nargin != 1) - error ("Wrong number of arguments"); + print_usage (); octave_tiff_handle *tiff_handle = octave_tiff_handle::get_tiff_handle (args(0)); @@ -2873,7 +2873,7 @@ int nargin = args.length (); if (nargin != 2) - error ("Wrong number of arguments"); + print_usage (); octave_tiff_handle *tiff_handle = octave_tiff_handle::get_tiff_handle (args(0)); @@ -2992,7 +2992,7 @@ int nargin = args.length (); if (nargin != 3) - error ("Wrong number of arguments"); + print_usage (); octave_tiff_handle *tiff_handle = octave_tiff_handle::get_tiff_handle (args(0)); @@ -3120,7 +3120,7 @@ int nargin = args.length (); if (nargin < 2) - error ("Wrong number of arguments\n"); + print_usage (); if (nargin > 2) error ("Tiff: Writing YCbCr image data is not supported"); @@ -3178,7 +3178,7 @@ int nargin = args.length (); if (nargin < 3) - error ("Too few arguments provided\n"); + print_usage (); if (nargin > 3) error ("Tiff: Writing YCbCr image data is not supported"); @@ -3225,7 +3225,7 @@ int nargin = args.length (); if (nargin < 3) - error ("Too few arguments provided\n"); + print_usage (); if (nargin > 3) error ("Tiff: Writing YCbCr image data is not supported"); @@ -3272,7 +3272,7 @@ int nargin = args.length (); if (nargin == 0) - error ("No handle provided\n"); + print_usage (); octave_tiff_handle *tiff_handle = octave_tiff_handle::get_tiff_handle (args(0)); @@ -3303,7 +3303,7 @@ int nargin = args.length (); if (nargin == 0) - error ("No handle provided\n"); + print_usage (); octave_tiff_handle *tiff_handle = octave_tiff_handle::get_tiff_handle (args(0)); @@ -3337,7 +3337,7 @@ int nargin = args.length (); if (nargin == 0) - error ("No handle provided\n"); + print_usage (); octave_tiff_handle *tiff_handle = octave_tiff_handle::get_tiff_handle (args(0)); @@ -3371,7 +3371,7 @@ int nargin = args.length (); if (nargin == 0) - error ("No handle provided\n"); + print_usage (); octave_tiff_handle *tiff_handle = octave_tiff_handle::get_tiff_handle (args(0)); @@ -3402,8 +3402,13 @@ #if defined (HAVE_TIFF) int nargin = args.length (); + if (nargin == 0) + print_usage (); + if (nargin < 2 || nargin > 3) - error ("Wrong number of arguments\n"); + // Since this function accepts varargin from the Octave side, the + // ommitted arguments are from wrong usage of the computeStrip method + print_usage ("Tiff.computeStrip"); octave_tiff_handle *tiff_handle = octave_tiff_handle::get_tiff_handle (args(0)); @@ -3467,8 +3472,13 @@ #if defined (HAVE_TIFF) int nargin = args.length (); + if (nargin == 0) + print_usage (); + if (nargin < 2 || nargin > 3) - error ("Wrong number of arguments\n"); + // Since this function accepts varargin from the Octave side, the + // ommitted arguments are from wrong usage of the computeTile method + print_usage ("Tiff.computeTile"); octave_tiff_handle *tiff_handle = octave_tiff_handle::get_tiff_handle (args(0)); @@ -3541,7 +3551,7 @@ int nargin = args.length (); if (nargin == 0) - error ("No handle provided\n"); + print_usage (); octave_tiff_handle *tiff_handle = octave_tiff_handle::get_tiff_handle (args(0)); @@ -3575,7 +3585,7 @@ int nargin = args.length (); if (nargin != 1) - error ("Wrong number of arguments\n"); + print_usage (); octave_tiff_handle *tiff_handle = octave_tiff_handle::get_tiff_handle (args(0)); @@ -3607,7 +3617,7 @@ int nargin = args.length (); if (nargin != 1) - error ("Wrong number of arguments\n"); + print_usage (); octave_tiff_handle *tiff_handle = octave_tiff_handle::get_tiff_handle (args(0)); @@ -3640,7 +3650,7 @@ int nargin = args.length (); if (nargin != 1) - error ("Wrong number of arguments\n"); + print_usage (); octave_tiff_handle *tiff_handle = octave_tiff_handle::get_tiff_handle (args(0)); @@ -3672,7 +3682,7 @@ int nargin = args.length (); if (nargin != 1) - error ("Wrong number of arguments\n"); + print_usage (); octave_tiff_handle *tiff_handle = octave_tiff_handle::get_tiff_handle (args(0)); @@ -3709,7 +3719,7 @@ int nargin = args.length (); if (nargin != 2) - error ("Wrong number of arguments\n"); + print_usage (); octave_tiff_handle *tiff_handle = octave_tiff_handle::get_tiff_handle (args(0)); @@ -3748,7 +3758,7 @@ int nargin = args.length (); if (nargin != 1) - error ("Wrong number of arguments\n"); + print_usage (); octave_tiff_handle *tiff_handle = octave_tiff_handle::get_tiff_handle (args(0)); @@ -3779,7 +3789,7 @@ int nargin = args.length (); if (nargin != 1) - error ("Wrong number of arguments\n"); + print_usage (); octave_tiff_handle *tiff_handle = octave_tiff_handle::get_tiff_handle (args(0)); @@ -3812,7 +3822,7 @@ int nargin = args.length (); if (nargin != 2) - error ("Wrong number of arguments\n"); + print_usage (); octave_tiff_handle *tiff_handle = octave_tiff_handle::get_tiff_handle (args(0)); @@ -3867,7 +3877,7 @@ int nargin = args.length (); if (nargin != 1) - error ("Wrong number of arguments\n"); + print_usage (); octave_tiff_handle *tiff_handle = octave_tiff_handle::get_tiff_handle (args(0)); @@ -3914,7 +3924,7 @@ { #if defined (HAVE_TIFF) if (args.length () == 0) - error ("No state argument provided"); + print_usage (); if (! args(0).is_bool_scalar ()) error ("Expected logical value as argument");