Mercurial > octave-nkf

diff scripts/image/private/__imwrite__.m @ 17176:abf384f5d243

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Remove unneeded input validation from internal fcns in private/ directories. * scripts/general/private/__isequal__.m, scripts/general/private/__splinen__.m, scripts/image/private/__imwrite__.m, scripts/image/private/ind2x.m, scripts/miscellaneous/private/__xzip__.m, scripts/miscellaneous/private/display_info_file.m, scripts/pkg/private/describe.m, scripts/pkg/private/get_forge_pkg.m, scripts/pkg/private/unload_packages.m, scripts/plot/private/__actual_axis_position__.m, scripts/plot/private/__add_datasource__.m, scripts/plot/private/__clabel__.m, scripts/plot/private/__errcomm__.m, scripts/plot/private/__errplot__.m, scripts/plot/private/__fltk_print__.m, scripts/plot/private/__gnuplot_get_var__.m, scripts/plot/private/__go_draw_axes__.m, scripts/plot/private/__go_draw_figure__.m, scripts/plot/private/__interp_cube__.m, scripts/plot/private/__line__.m, scripts/plot/private/__next_line_color__.m, scripts/plot/private/__next_line_style__.m, scripts/plot/private/__plt__.m, scripts/plot/private/__pltopt__.m, scripts/signal/private/rectangle_lw.m, scripts/signal/private/rectangle_sw.m, scripts/signal/private/triangle_lw.m, scripts/signal/private/triangle_sw.m, scripts/sparse/private/__sprand_impl__.m, scripts/statistics/models/private/logistic_regression_derivatives.m, scripts/statistics/models/private/logistic_regression_likelihood.m: Remove unneeded input validation from internal fcns in private/ directories.
author Rik <rik@octave.org>
date Sun, 04 Aug 2013 18:13:08 -0700
parents 3db796f89695
children 46805642048f
line wrap: on
line diff
--- a/scripts/image/private/__imwrite__.m	Sun Aug 04 18:01:57 2013 -0700
+++ b/scripts/image/private/__imwrite__.m	Sun Aug 04 18:13:08 2013 -0700
@@ -31,12 +31,11 @@
   [filename, ext, map, param_list] = imwrite_filename (varargin{:});
 
   if (rem (numel (param_list), 2) != 0)
-    error ("imwrite: no pair for all arguments (even number left)");
+    error ("imwrite: no pair for all arguments (odd number left)");
   endif
 
   ## set default for options
-  options        = struct ("writemode", "overwrite",
-                           "quality",   75);
+  options = struct ("writemode", "overwrite", "quality", 75);
 
   for idx = 1:2:numel (param_list)
 
@@ -44,17 +43,17 @@
 
       case "writemode",
         options.writemode = param_list{idx+1};
-        if (! ischar (options.writemode) ||
-            ! any (strcmpi (options.writemode, {"append", "overwrite"})))
-          error ("imwrite: value for %s option must be \"append\" or \"overwrite\"",
+        if (! ischar (options.writemode)
+            || ! any (strcmpi (options.writemode, {"append", "overwrite"})))
+          error ('imwrite: value for %s option must be "append" or "overwrite"',
                  param_list{idx});
         endif
         options.writemode = tolower (options.writemode);
 
       case "quality",
         options.quality = param_list{idx+1};
-        if (! isnumeric (options.quality) || ! isscalar (options.quality) ||
-            options.quality < 0 || options.quality > 100)
+        if (! isnumeric (options.quality) || ! isscalar (options.quality)
+            || options.quality < 0 || options.quality > 100)
           error ("imwrite: value for %s option must be a scalar between 0 and 100",
                  param_list{idx});
         endif
@@ -66,12 +65,6 @@
     endswitch
   endfor
 
-  if (isempty (img))
-    error ("imwrite: invalid empty image");
-  elseif (issparse (img) || issparse (map))
-    error ("imwrite: sparse images not supported");
-  endif
-
   if (! isempty (map))
     if (! iscolormap (map))
       error ("imwrite: invalid MAP for indexed image");
@@ -83,7 +76,7 @@
     ##        them to RGB and write them "normally".
     warned = false;
     if (! warned)
-      warning ("imwrite: saving of indexed images is not yet implemented. Will save a RGB image.");
+      warning ("imwrite: saving of indexed images is not yet implemented.  Will save an RGB image.");
       warned = true;
     endif
     img = ind2rgb (img, map);
@@ -103,3 +96,4 @@
   __magick_write__ (filename, ext, img, map, options);
 
 endfunction
+