Mercurial > hg > octave-lyh
view scripts/io/fileread.m @ 16988:54b75bed4bc7
imwrite: implement WriteMode option.
* imwrite.m: document the new option WriteMode and possibility to write
multipage images by passing a 4 dimensional matrix.
* private/core_imwrite.m: perform input check for the quality option and
the new writemode. Set defaults here and not on __magick_write__().
Give warning about the fact that writing of indexed images is not
properly implemented. Change calling to ind2rgb() since it has been
there and we no longer need workaround. Remove the different calls
to __magick_read__() since we now have a single way to do it. Remove
conversion of image types since we want to save what was actually given
to us.
* __magick_read__.cc (read_file): split from __magick_read__() into a
separate function so it can be used by __magick_write__() when appending
images to an existing file.
(jpg_settings): remove function. It only checks for the quality option,
which is now done by core_imwrite(). Plus, other formats support this
option so it was moved into __magick_write__(). We should have functions
for each option rather than per file format.
(encode_map): comment whole function since it is never used and is
unfinished work to implement writing of actual indexed images.
(write_file): new function from part of previous write_image(). It is
now the other side of read_file().
(write_image): remove function. Moved into __magick_write__(), the only
function calling it. The part of writing moved into write_file().
(__magick_write__): removed most of input check which should be done by
imwrite(). Removed all extra usage types. Options must be passed on a
non-optional struct. Implement the Append option.
author | Carnë Draug <carandraug@octave.org> |
---|---|
date | Tue, 16 Jul 2013 17:29:45 +0100 |
parents | 221e71d2aef0 |
children |
line wrap: on
line source
## Copyright (C) 2010-2012 VZLU Prague ## ## This file is part of Octave. ## ## Octave is free software; you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 3 of the License, or (at ## your option) any later version. ## ## Octave is distributed in the hope that it will be useful, but ## WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ## General Public License for more details. ## ## You should have received a copy of the GNU General Public License ## along with Octave; see the file COPYING. If not, see ## <http://www.gnu.org/licenses/>. ## -*- texinfo -*- ## @deftypefn {Function File} {@var{str} =} fileread (@var{filename}) ## Read the contents of @var{filename} and return it as a string. ## @seealso{fread, textread, sscanf} ## @end deftypefn function str = fileread (filename) if (nargin != 1) print_usage (); endif if (! ischar (filename)) error ("fileread: FILENAME argument must be a string"); endif fid = fopen (filename, "r"); if (fid < 0) error ("fileread: cannot open file"); endif unwind_protect str = (fread (fid, "*char")).'; unwind_protect_cleanup fclose (fid); end_unwind_protect endfunction %!test %! cstr = {"Hello World", "The answer is 42", "Goodbye World"}; %! fname = tmpnam (); %! fid = fopen (fname, "w"); %! fprintf (fid, "%s\n", cstr{:}); %! fclose (fid); %! str = fileread (fname); %! unlink (fname); %! assert (str, [cstr{1} "\n" cstr{2} "\n" cstr{3} "\n"]); %% Test input validation %!error fileread () %!error fileread (1, 2) %!error <FILENAME argument must be a string> fileread (1)