octave: src/DLD-FUNCTIONS/__magick_read_

annotate src/DLD-FUNCTIONS/__magick_read__.cc @ 10295:13d382fc758b

imread: Make reading non-indexed images faster

author	David Grundberg <davidg@cs.umu.se>
date	Wed, 10 Feb 2010 08:41:49 +0100
parents	1a4074e277fe
children	2be9b7e71f32

rev	line source
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	1 /*
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	2
8920 eb63fbe60fab update copyright notices John W. Eaton <jwe@octave.org> parents: 8520 diff changeset	3 Copyright (C) 2002, 2009 Andy Adler
7932 d75586531aac style fixes John W. Eaton <jwe@octave.org> parents: 7931 diff changeset	4 Copyright (C) 2008 Thomas L. Scofield
10295 13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	5 Copyright (C) 2010 David Grundberg
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	6
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	7 This file is part of Octave.
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	8
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	9 Octave is free software; you can redistribute it and/or modify it
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	10 under the terms of the GNU General Public License as published by the
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	11 Free Software Foundation; either version 3 of the License, or (at your
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	12 option) any later version.
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	13
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	14 Octave is distributed in the hope that it will be useful, but WITHOUT
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	17 for more details.
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	18
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	19 You should have received a copy of the GNU General Public License
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	20 along with Octave; see the file COPYING. If not, see
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	21 <http://www.gnu.org/licenses/>.
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	22
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	23 */
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	24
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	25 #ifdef HAVE_CONFIG_H
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	26 #include <config.h>
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	27 #endif
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	28
8054 272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	29 #include <cmath>
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	30
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	31 #include "defun-dld.h"
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	32 #include "error.h"
8054 272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	33 #include "ov-struct.h"
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	34
7937 6661387827d6 Allow build without GraphicsMagick installed David Bateman <dbateman@free.fr> parents: 7933 diff changeset	35 #ifdef HAVE_MAGICK
6661387827d6 Allow build without GraphicsMagick installed David Bateman <dbateman@free.fr> parents: 7933 diff changeset	36
9575 55ecaefb7d0f Use pkg-config to configure GraphicsMagick++. David Grundberg <individ@acc.umu.se> parents: 9439 diff changeset	37 #include <Magick++.h>
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	38
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	39 octave_value_list
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	40 read_indexed_images (std::vector<Magick::Image>& imvec,
8053 89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	41 const Array<int>& frameidx, bool wantalpha)
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	42 {
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	43 octave_value_list output;
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	44
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	45 int rows = imvec[0].baseRows ();
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	46 int columns = imvec[0].baseColumns ();
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	47 int nframes = frameidx.length ();
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	48
8054 272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	49 dim_vector idim = dim_vector ();
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	50 idim.resize (4);
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	51 idim(0) = rows;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	52 idim(1) = columns;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	53 idim(2) = 1;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	54 idim(3) = nframes;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	55
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	56 Array<int> idx (dim_vector (4));
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	57
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	58 Magick::ImageType type = imvec[0].type ();
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	59
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	60 unsigned int mapsize = imvec[0].colorMapSize ();
8054 272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	61 unsigned int i = mapsize;
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	62 unsigned int depth = 0;
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	63 while (i >>= 1)
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	64 depth++;
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	65 i = 0;
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	66 depth--;
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	67 while (depth >>= 1)
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	68 i++;
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	69 depth = 1 << i;
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	70
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	71 switch (depth)
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	72 {
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	73 case 1:
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	74 case 2:
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	75 case 4:
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	76 case 8:
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	77 {
8054 272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	78 uint8NDArray im = uint8NDArray (idim);
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	79
8054 272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	80 idx(2) = 0;
8053 89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	81 for (int frame = 0; frame < nframes; frame++)
89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	82 {
89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	83 imvec[frameidx(frame)].getConstPixels (0, 0, columns, rows);
7933 54e414cc106b style fixes John W. Eaton <jwe@octave.org> parents: 7932 diff changeset	84
8053 89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	85 const Magick::IndexPacket *pix
89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	86 = imvec[frameidx(frame)].getConstIndexes ();
7933 54e414cc106b style fixes John W. Eaton <jwe@octave.org> parents: 7932 diff changeset	87
8053 89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	88 i = 0;
8054 272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	89 idx(3) = frame;
7933 54e414cc106b style fixes John W. Eaton <jwe@octave.org> parents: 7932 diff changeset	90
8053 89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	91 for (int y = 0; y < rows; y++)
8054 272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	92 {
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	93 idx(0) = y;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	94 for (int x = 0; x < columns; x++)
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	95 {
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	96 idx(1) = x;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	97 im(idx) = static_cast<octave_uint8> (pix[i++]);
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	98 }
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	99 }
8053 89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	100 }
10100 dd4d4b14b340 __magick_read__.cc: no need to explicitly call chop_trailing_singletons now John W. Eaton <jwe@octave.org> parents: 9575 diff changeset	101
8053 89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	102 output(0) = octave_value (im);
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	103 }
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	104 break;
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	105
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	106 case 16:
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	107 {
8054 272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	108 uint16NDArray im = uint16NDArray (idim);
7933 54e414cc106b style fixes John W. Eaton <jwe@octave.org> parents: 7932 diff changeset	109
8054 272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	110 idx(2) = 0;
8053 89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	111 for (int frame = 0; frame < nframes; frame++)
89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	112 {
89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	113 imvec[frameidx(frame)].getConstPixels (0, 0, columns, rows);
7933 54e414cc106b style fixes John W. Eaton <jwe@octave.org> parents: 7932 diff changeset	114
8053 89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	115 const Magick::IndexPacket *pix
89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	116 = imvec[frameidx(frame)].getConstIndexes ();
7933 54e414cc106b style fixes John W. Eaton <jwe@octave.org> parents: 7932 diff changeset	117
8053 89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	118 i = 0;
8054 272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	119 idx(3) = frame;
7933 54e414cc106b style fixes John W. Eaton <jwe@octave.org> parents: 7932 diff changeset	120
8053 89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	121 for (int y = 0; y < rows; y++)
8054 272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	122 {
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	123 idx(0) = y;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	124 for (int x = 0; x < columns; x++)
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	125 {
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	126 idx(1) = x;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	127 im(idx) = static_cast<octave_uint16> (pix[i++]);
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	128 }
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	129 }
8053 89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	130 }
10100 dd4d4b14b340 __magick_read__.cc: no need to explicitly call chop_trailing_singletons now John W. Eaton <jwe@octave.org> parents: 9575 diff changeset	131
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	132 output(0) = octave_value (im);
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	133 }
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	134 break;
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	135
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	136 default:
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	137 error ("__magic_read__: index depths bigger than 16-bit not supported");
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	138 return octave_value_list ();
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	139 }
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	140
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	141 Matrix map = Matrix (mapsize, 3);
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	142 Matrix alpha;
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	143
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	144 switch (type)
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	145 {
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	146 case Magick::PaletteMatteType:
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	147 #if 0
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	148 warning ("palettematte");
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	149 Matrix map (mapsize, 3);
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	150 Matrix alpha (mapsize, 1);
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	151 for (i = 0; i < mapsize; i++)
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	152 {
8053 89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	153 warning ("%d", i);
89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	154 Magick::ColorRGB c = imvec[0].colorMap (i);
89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	155 map(i,0) = c.red ();
89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	156 map(i,1) = c.green ();
89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	157 map(i,2) = c.blue ();
89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	158 alpha(i,1) = c.alpha ();
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	159 }
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	160 break;
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	161 #endif
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	162
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	163 case Magick::PaletteType:
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	164 alpha = Matrix (0, 0);
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	165 for (i = 0; i < mapsize; i++)
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	166 {
8053 89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	167 Magick::ColorRGB c = imvec[0].colorMap (i);
89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	168 map(i,0) = c.red ();
89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	169 map(i,1) = c.green ();
89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	170 map(i,2) = c.blue ();
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	171 }
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	172 break;
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	173
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	174 default:
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	175 error ("__magick_read__: unsupported indexed image type");
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	176 return octave_value_list ();
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	177 }
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	178
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	179 if (wantalpha)
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	180 output(2) = alpha;
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	181
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	182 output(1) = map;
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	183
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	184 return output;
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	185 }
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	186
10193 1a4074e277fe undo unintended change to __magick_read__.cc John W. Eaton <jwe@octave.org> parents: 10191 diff changeset	187 template <class T>
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	188 octave_value_list
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	189 read_images (const std::vector<Magick::Image>& imvec,
8053 89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	190 const Array<int>& frameidx, unsigned int depth)
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	191 {
10295 13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	192 typedef typename T::element_type P;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	193
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	194 octave_value_list retval (3, Matrix ());
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	195
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	196 T im;
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	197
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	198 int rows = imvec[0].baseRows ();
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	199 int columns = imvec[0].baseColumns ();
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	200 int nframes = frameidx.length ();
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	201
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	202 dim_vector idim = dim_vector ();
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	203 idim.resize (4);
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	204 idim(0) = rows;
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	205 idim(1) = columns;
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	206 idim(2) = 1;
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	207 idim(3) = nframes;
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	208
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	209 Magick::ImageType type = imvec[0].type ();
10295 13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	210 const int divisor = (((1 << QuantumDepth) - 1) / ((1 << depth) - 1));
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	211
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	212 switch (type)
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	213 {
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	214 case Magick::BilevelType:
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	215 case Magick::GrayscaleType:
10295 13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	216 {
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	217 im = T (idim);
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	218 P *vec = im.fortran_vec ();
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	219
10295 13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	220 for (int frame = 0; frame < nframes; frame++)
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	221 {
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	222 const Magick::PixelPacket *pix
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	223 = imvec[frameidx(frame)].getConstPixels (0, 0, columns, rows);
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	224
10295 13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	225 P *rbuf;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	226 rbuf = vec;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	227 for (int y = 0; y < rows; y++)
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	228 {
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	229 for (int x = 0; x < columns; x++)
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	230 {
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	231 *rbuf = pix->red / divisor;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	232 pix++;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	233 rbuf += rows;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	234 }
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	235 rbuf -= rows * columns - 1;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	236 }
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	237
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	238 // Next frame.
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	239 vec += rows * columns * idim(2);
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	240 }
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	241 }
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	242 break;
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	243
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	244 case Magick::GrayscaleMatteType:
10295 13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	245 {
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	246 idim(2) = 2;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	247 im = T (idim);
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	248 P *vec = im.fortran_vec ();
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	249
10295 13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	250 for (int frame = 0; frame < nframes; frame++)
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	251 {
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	252 const Magick::PixelPacket *pix
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	253 = imvec[frameidx(frame)].getConstPixels (0, 0, columns, rows);
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	254
10295 13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	255 P rbuf, obuf;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	256 rbuf = vec;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	257 obuf = vec + rows * columns;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	258 for (int y = 0; y < rows; y++)
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	259 {
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	260 for (int x = 0; x < columns; x++)
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	261 {
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	262 *rbuf = pix->red / divisor;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	263 *obuf = pix->opacity / divisor;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	264 pix++;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	265 rbuf += rows;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	266 obuf += rows;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	267 }
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	268 rbuf -= rows * columns - 1;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	269 obuf -= rows * columns - 1;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	270 }
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	271
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	272 // Next frame.
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	273 vec += rows * columns * idim(2);
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	274 }
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	275 }
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	276 break;
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	277
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	278 case Magick::PaletteType:
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	279 case Magick::TrueColorType:
10295 13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	280 {
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	281 idim(2) = 3;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	282 im = T (idim);
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	283 P *vec = im.fortran_vec ();
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	284
10295 13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	285 for (int frame = 0; frame < nframes; frame++)
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	286 {
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	287 const Magick::PixelPacket *pix
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	288 = imvec[frameidx(frame)].getConstPixels (0, 0, columns, rows);
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	289
10295 13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	290 P rbuf, gbuf, *bbuf;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	291 rbuf = vec;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	292 gbuf = vec + rows * columns;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	293 bbuf = vec + rows * columns * 2;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	294 for (int y = 0; y < rows; y++)
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	295 {
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	296 for (int x = 0; x < columns; x++)
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	297 {
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	298 *rbuf = pix->red / divisor;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	299 *gbuf = pix->green / divisor;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	300 *bbuf = pix->blue / divisor;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	301 pix++;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	302 rbuf += rows;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	303 gbuf += rows;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	304 bbuf += rows;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	305 }
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	306 rbuf -= rows * columns - 1;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	307 gbuf -= rows * columns - 1;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	308 bbuf -= rows * columns - 1;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	309 }
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	310
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	311 // Next frame.
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	312 vec += rows * columns * idim(2);
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	313 }
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	314 }
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	315 break;
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	316
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	317 case Magick::PaletteMatteType:
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	318 case Magick::TrueColorMatteType:
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	319 case Magick::ColorSeparationType:
10295 13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	320 {
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	321 idim(2) = 4;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	322 im = T (idim);
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	323 P *vec = im.fortran_vec ();
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	324
10295 13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	325 for (int frame = 0; frame < nframes; frame++)
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	326 {
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	327 const Magick::PixelPacket *pix
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	328 = imvec[frameidx(frame)].getConstPixels (0, 0, columns, rows);
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	329
10295 13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	330 P rbuf, gbuf, bbuf, obuf;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	331 rbuf = vec;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	332 gbuf = vec + rows * columns;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	333 bbuf = vec + rows * columns * 2;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	334 obuf = vec + rows * columns * 3;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	335 for (int y = 0; y < rows; y++)
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	336 {
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	337 for (int x = 0; x < columns; x++)
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	338 {
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	339 *rbuf = pix->red / divisor;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	340 *gbuf = pix->green / divisor;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	341 *bbuf = pix->blue / divisor;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	342 *obuf = pix->opacity / divisor;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	343 pix++;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	344 rbuf += rows;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	345 gbuf += rows;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	346 bbuf += rows;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	347 obuf += rows;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	348 }
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	349 rbuf -= rows * columns - 1;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	350 gbuf -= rows * columns - 1;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	351 bbuf -= rows * columns - 1;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	352 obuf -= rows * columns - 1;
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	353 }
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	354
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	355 // Next frame.
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	356 vec += rows * columns * idim(2);
13d382fc758b imread: Make reading non-indexed images faster David Grundberg <davidg@cs.umu.se> parents: 10193 diff changeset	357 }
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	358 }
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	359 break;
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	360
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	361 default:
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	362 error ("__magick_read__: undefined ImageMagick image type");
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	363 return retval;
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	364 }
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	365
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	366 retval(0) = im;
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	367
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	368 return retval;
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	369 }
7974 fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	370
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	371 #endif
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	372
9436 5302df15ad76 __magick_read__.cc: undo unintended change John W. Eaton <jwe@octave.org> parents: 9434 diff changeset	373 DEFUN_DLD (__magick_read__, args, nargout,
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	374 "-- texinfo --\n\
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	375 @deftypefn {Function File} {@var{m} =} __magick_read__(@var{fname}, @var{index})\n\
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	376 @deftypefnx{Function File} {[@var{m}, @var{colormap}] =} __magick_read__(@var{fname}, @var{index})\n\
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	377 @deftypefnx{Function File} {[@var{m}, @var{colormap}, @var{alpha}] =} __magick_read__(@var{fname}, @var{index})\n\
9064 7c02ec148a3c Check grammar on all .cc files Rik <rdrider0-list@yahoo.com> parents: 8920 diff changeset	378 Read images with ImageMagick++. In general you should not be using this function.\n\
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	379 Instead you should use @code{imread}.\n\
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	380 @seealso{imread}\n\
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	381 @end deftypefn")
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	382 {
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	383 octave_value_list output;
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	384
7937 6661387827d6 Allow build without GraphicsMagick installed David Bateman <dbateman@free.fr> parents: 7933 diff changeset	385 #ifdef HAVE_MAGICK
7974 fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	386
7931 de26beacb20f imread.m: simplify; loadimage.m: deprecate John W. Eaton <jwe@octave.org> parents: 7926 diff changeset	387 if (args.length () > 2 \|\| args.length () < 1 \|\| ! args(0).is_string ()
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	388 \|\| nargout > 3)
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	389 {
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	390 print_usage ();
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	391 return output;
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	392 }
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	393
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	394 Array<int> frameidx;
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	395
7931 de26beacb20f imread.m: simplify; loadimage.m: deprecate John W. Eaton <jwe@octave.org> parents: 7926 diff changeset	396 if (args.length () == 2 && args(1).is_real_type ())
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	397 frameidx = args(1).int_vector_value();
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	398 else
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	399 {
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	400 frameidx = Array<int> (1);
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	401 frameidx(0) = 1;
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	402 }
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	403
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	404 std::vector<Magick::Image> imvec;
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	405
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	406 try
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	407 {
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	408 // Read a file into vector of image objects
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	409 Magick::readImages (&imvec, args(0).string_value ());
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	410 }
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	411 catch (Magick::Warning& w)
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	412 {
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	413 warning ("Magick++ warning: %s", w.what ());
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	414 }
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	415 catch (Magick::ErrorCoder& e)
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	416 {
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	417 warning ("Magick++ coder error: %s", e.what ());
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	418 }
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	419 catch (Magick::Exception& e)
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	420 {
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	421 error ("Magick++ exception: %s", e.what ());
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	422 return output;
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	423 }
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	424
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	425 for (int i = 0; i < frameidx.length(); i++)
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	426 {
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	427 frameidx(i) = frameidx(i) - 1;
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	428
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	429 int nframes = imvec.size ();
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	430
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	431 if (frameidx(i) >= nframes \|\| frameidx(i) < 0)
8053 89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	432 {
89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	433 error ("__magick_read__: invalid index vector");
89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	434 return output;
89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	435 }
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	436 }
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	437
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	438 Magick::ClassType klass = imvec[0].classType ();
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	439
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	440 if (klass == Magick::PseudoClass && nargout > 1)
d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	441 output = read_indexed_images (imvec, frameidx, (nargout == 3));
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	442 else
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	443 {
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	444 unsigned int depth = imvec[0].modulusDepth ();
9439 0a696f8aa434 determine correct image bitwidth in __magick_read__.cc Benjamin Lindner <lindnerb@users.sourceforge.net> parents: 9436 diff changeset	445 if (depth > 1)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10100 diff changeset	446 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10100 diff changeset	447 --depth;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10100 diff changeset	448 int i = 1;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10100 diff changeset	449 while (depth >>= 1)
9439 0a696f8aa434 determine correct image bitwidth in __magick_read__.cc Benjamin Lindner <lindnerb@users.sourceforge.net> parents: 9436 diff changeset	450 i++;
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10100 diff changeset	451 depth = 1 << i;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10100 diff changeset	452 }
9439 0a696f8aa434 determine correct image bitwidth in __magick_read__.cc Benjamin Lindner <lindnerb@users.sourceforge.net> parents: 9436 diff changeset	453
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	454 switch (depth)
8053 89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	455 {
89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	456 case 1:
10193 1a4074e277fe undo unintended change to __magick_read__.cc John W. Eaton <jwe@octave.org> parents: 10191 diff changeset	457 output = read_images<boolNDArray> (imvec, frameidx, depth);
8053 89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	458 break;
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	459
8053 89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	460 case 2:
89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	461 case 4:
89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	462 case 8:
10193 1a4074e277fe undo unintended change to __magick_read__.cc John W. Eaton <jwe@octave.org> parents: 10191 diff changeset	463 output = read_images<uint8NDArray> (imvec, frameidx, depth) ;
8053 89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	464 break;
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	465
8053 89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	466 case 16:
10193 1a4074e277fe undo unintended change to __magick_read__.cc John W. Eaton <jwe@octave.org> parents: 10191 diff changeset	467 output = read_images<uint16NDArray> (imvec, frameidx, depth);
8053 89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	468 break;
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	469
8053 89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	470 case 32:
89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	471 case 64:
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	472 default:
8053 89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	473 error ("__magick_read__: image depths bigger than 16-bit not supported");
89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	474 }
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	475 }
7937 6661387827d6 Allow build without GraphicsMagick installed David Bateman <dbateman@free.fr> parents: 7933 diff changeset	476 #else
6661387827d6 Allow build without GraphicsMagick installed David Bateman <dbateman@free.fr> parents: 7933 diff changeset	477
6661387827d6 Allow build without GraphicsMagick installed David Bateman <dbateman@free.fr> parents: 7933 diff changeset	478 error ("__magick_read__: not available in this version of Octave");
6661387827d6 Allow build without GraphicsMagick installed David Bateman <dbateman@free.fr> parents: 7933 diff changeset	479
6661387827d6 Allow build without GraphicsMagick installed David Bateman <dbateman@free.fr> parents: 7933 diff changeset	480 #endif
7925 9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	481
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	482 return output;
9316b59903c9 Add original imread() files (from octave-forge) to core octave. Thomas L. Scofield <scofield AT calvin DOT edu> parents: diff changeset	483 }
7926 d74f996e005d __magick_read__.cc: configuration and style fixes John W. Eaton <jwe@octave.org> parents: 7925 diff changeset	484
7974 fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	485 #ifdef HAVE_MAGICK
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	486
8054 272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	487 static void
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	488 jpg_settings (std::vector<Magick::Image>& imvec,
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	489 const Octave_map& options,
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	490 bool)
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	491 {
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	492 int nframes = static_cast<int>(imvec.size ());
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	493 bool something_set = 0;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	494
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	495 // Quality setting
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	496 octave_value result;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	497 Octave_map::const_iterator p;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	498 bool found_it = 0;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	499 for (p = options.begin (); p != options.end (); p++)
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	500 if (options.key (p) == "Quality")
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	501 {
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	502 found_it = 1;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	503 result = options.contents (p).elem (0);
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	504 break;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	505 }
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	506 if (found_it && (! result.is_empty ()))
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	507 {
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	508 something_set = 1;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	509 if (result.is_real_type ())
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	510 {
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	511 int qlev = static_cast<int>(result.int_value ());
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	512 if (qlev < 0 \|\| qlev > 100)
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	513 warning ("warning: Quality setting invalid--use default of 75");
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	514 else
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	515 for (int fnum = 0; fnum < nframes; fnum++)
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	516 imvec[fnum].quality (static_cast<unsigned int>(qlev));
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	517 }
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	518 else
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	519 warning ("warning: Quality setting invalid--use default of 75");
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	520 }
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	521
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	522 // Other settings go here
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	523
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	524 if (! something_set)
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	525 warning ("__magick_write__ warning: All write parameters ignored.");
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	526 }
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	527
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	528 static void
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	529 encode_bool_image (std::vector<Magick::Image>& imvec, const octave_value& img)
7974 fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	530 {
8054 272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	531 unsigned int nframes = 1;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	532 boolNDArray m = img.bool_array_value ();
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	533
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	534 dim_vector dsizes = m.dims ();
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	535 if (dsizes.length () == 4)
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	536 nframes = dsizes(3);
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	537
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	538 Array<octave_idx_type> idx (dsizes.length ());
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	539
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	540 octave_idx_type rows = m.rows ();
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	541 octave_idx_type columns = m.columns ();
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	542
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	543 for (unsigned int ii = 0; ii < nframes; ii++)
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	544 {
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	545 Magick::Image im(Magick::Geometry (columns, rows), "black");
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	546 im.classType (Magick::DirectClass);
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	547 im.depth (1);
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	548
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	549 for (int y=0; y < columns; y++)
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	550 {
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	551 idx(1) = y;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	552 for (int x=0; x < rows; x++)
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	553 {
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	554 if (nframes > 1)
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	555 {
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	556 idx(2) = 0;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	557 idx(3) = ii;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	558 }
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	559 idx(0) = x;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	560 if (m(idx))
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	561 im.pixelColor (y, x, "white");
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	562 }
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	563 }
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	564 imvec.push_back (im);
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	565 }
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	566 }
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	567
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	568 template <class T>
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	569 static void
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	570 encode_uint_image (std::vector<Magick::Image>& imvec,
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	571 const octave_value& img,
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	572 bool has_map)
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	573 {
8520 715f6cd8d5e7 __magick_read__.cc (encode_uint_image): initialize bitdepth Soren Hauberg <hauberg@gmail.com> parents: 8165 diff changeset	574 unsigned int bitdepth = 0;
8054 272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	575 T m;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	576
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	577 if (img.is_uint8_type ())
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	578 {
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	579 bitdepth = 8;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	580 m = img.uint8_array_value ();
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	581 }
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	582 else if (img.is_uint16_type ())
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	583 {
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	584 bitdepth = 16;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	585 m = img.uint16_array_value ();
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	586 }
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	587 else
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	588 error ("__magick_write__: invalid image class");
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	589
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	590 dim_vector dsizes = m.dims ();
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	591 unsigned int nframes = 1;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	592 if (dsizes.length () == 4)
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	593 nframes = dsizes(3);
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	594 bool is_color = ((dsizes.length () > 2) && (dsizes(2) > 2));
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	595 bool has_alpha = (dsizes.length () > 2 && (dsizes(2) == 2 \|\| dsizes(2) == 4));
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	596
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	597 Array<octave_idx_type> idx (dsizes.length ());
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	598 octave_idx_type rows = m.rows ();
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	599 octave_idx_type columns = m.columns ();
8090 3cc1ca1b1576 MSVC compilation fix Michael Goffioul parents: 8054 diff changeset	600
3cc1ca1b1576 MSVC compilation fix Michael Goffioul parents: 8054 diff changeset	601 // FIXME -- maybe simply using bit shifting would be better?
3cc1ca1b1576 MSVC compilation fix Michael Goffioul parents: 8054 diff changeset	602 unsigned int div_factor = pow (2.0, static_cast<int> (bitdepth)) - 1;
8054 272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	603
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	604 for (unsigned int ii = 0; ii < nframes; ii++)
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	605 {
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	606 Magick::Image im(Magick::Geometry (columns, rows), "black");
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	607 im.depth (bitdepth);
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	608 if (has_map)
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	609 im.classType (Magick::PseudoClass);
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	610 else
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	611 im.classType (Magick::DirectClass);
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	612
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	613 if (is_color)
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	614 {
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	615 if (has_alpha)
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	616 im.type (Magick::TrueColorMatteType);
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	617 else
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	618 im.type (Magick::TrueColorType);
7974 fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	619
8054 272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	620 Magick::ColorRGB c;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	621 for (int y=0; y < columns; y++)
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	622 {
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	623 idx(1) = y;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	624 for (int x=0; x < rows; x++)
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	625 {
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	626 idx(0) = x;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	627 if (nframes > 1)
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	628 idx(3) = ii;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	629
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	630 idx(2) = 0;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	631 c.red (static_cast<double>(m(idx)) / div_factor);
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	632 idx(2) = 1;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	633 c.green (static_cast<double>(m(idx)) / div_factor);
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	634 idx(2) = 2;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	635 c.blue (static_cast<double>(m(idx)) / div_factor);
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	636
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	637 if (has_alpha)
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	638 {
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	639 idx(2) = 3;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	640 c.alpha (static_cast<double>(m(idx)) / div_factor);
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	641 }
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	642 im.pixelColor (y, x, c);
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	643 }
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	644 }
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	645 }
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	646 else
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	647 {
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	648 if (has_alpha)
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	649 im.type (Magick::GrayscaleMatteType);
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	650 else
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	651 im.type (Magick::GrayscaleType);
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	652
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	653 Magick::ColorGray c;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	654
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	655 for (int y=0; y < columns; y++)
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	656 {
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	657 idx(1) = y;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	658 for (int x=0; x < rows; x++)
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	659 {
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	660 idx(0) = x;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	661 if (nframes > 1)
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	662 {
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	663 idx(2) = 0;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	664 idx(3) = ii;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	665 }
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	666 if (has_alpha)
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	667 {
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	668 idx(2) = 1;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	669 c.alpha (static_cast<double>(m(idx)) / div_factor);
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	670 idx(2) = 0;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	671 }
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	672
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	673 c.shade (static_cast<double>(m(idx)) / div_factor);
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	674 im.pixelColor (y, x, c);
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	675 }
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	676 }
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	677 }
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	678 imvec.push_back (im);
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	679 }
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	680 }
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	681
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	682 static void
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	683 encode_map (std::vector<Magick::Image>& imvec, const NDArray& cmap)
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	684 {
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	685 unsigned int mapsize = cmap.dim1 ();
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	686 int nframes = static_cast<int>(imvec.size ());
7974 fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	687
8054 272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	688 for (int fnum = 0; fnum < nframes; fnum++)
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	689 {
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	690 imvec[fnum].colorMapSize (mapsize);
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	691 imvec[fnum].type (Magick::PaletteType);
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	692 }
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	693
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	694 for (unsigned int ii = 0; ii < mapsize; ii++)
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	695 {
9274 6e519bd01615 Fix RGB color construction in __magick_read__.cc Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	696 Magick::ColorRGB c (cmap(ii,0), cmap(ii,1), cmap(ii,2));
8054 272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	697
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	698 // FIXME -- is this case needed?
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	699 if (cmap.dim2 () == 4)
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	700 c.alpha (cmap(ii,3));
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	701
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	702 try
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	703 {
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	704 for_each (imvec.begin (), imvec.end (),
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	705 Magick::colorMapImage (ii, c));
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	706 }
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	707 catch (Magick::Warning& w)
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	708 {
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	709 warning ("Magick++ warning: %s", w.what ());
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	710 }
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	711 catch (Magick::ErrorCoder& e)
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	712 {
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	713 warning ("Magick++ coder error: %s", e.what ());
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	714 }
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	715 catch (Magick::Exception& e)
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	716 {
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	717 error ("Magick++ exception: %s", e.what ());
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	718 }
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	719 }
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	720 }
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	721
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	722 static void
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	723 write_image (const std::string& filename, const std::string& fmt,
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	724 const octave_value& img,
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	725 const octave_value& map = octave_value (),
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	726 const octave_value& params = octave_value ())
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	727 {
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	728 std::vector<Magick::Image> imvec;
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	729
9275 86f475d5e7d1 imwrite.m: convert indexed images to RGB before calling __magick_write__ John W. Eaton <jwe@octave.org> parents: 9274 diff changeset	730 bool has_map = map.is_defined ();
86f475d5e7d1 imwrite.m: convert indexed images to RGB before calling __magick_write__ John W. Eaton <jwe@octave.org> parents: 9274 diff changeset	731
86f475d5e7d1 imwrite.m: convert indexed images to RGB before calling __magick_write__ John W. Eaton <jwe@octave.org> parents: 9274 diff changeset	732 if (has_map)
86f475d5e7d1 imwrite.m: convert indexed images to RGB before calling __magick_write__ John W. Eaton <jwe@octave.org> parents: 9274 diff changeset	733 {
86f475d5e7d1 imwrite.m: convert indexed images to RGB before calling __magick_write__ John W. Eaton <jwe@octave.org> parents: 9274 diff changeset	734 error ("__magick_write__: direct saving of indexed images not currently supported; use ind2rgb and save converted image");
86f475d5e7d1 imwrite.m: convert indexed images to RGB before calling __magick_write__ John W. Eaton <jwe@octave.org> parents: 9274 diff changeset	735 return;
86f475d5e7d1 imwrite.m: convert indexed images to RGB before calling __magick_write__ John W. Eaton <jwe@octave.org> parents: 9274 diff changeset	736 }
86f475d5e7d1 imwrite.m: convert indexed images to RGB before calling __magick_write__ John W. Eaton <jwe@octave.org> parents: 9274 diff changeset	737
8054 272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	738 if (img.is_bool_type ())
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	739 encode_bool_image (imvec, img);
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	740 else if (img.is_uint8_type ())
9275 86f475d5e7d1 imwrite.m: convert indexed images to RGB before calling __magick_write__ John W. Eaton <jwe@octave.org> parents: 9274 diff changeset	741 encode_uint_image<uint8NDArray> (imvec, img, has_map);
8054 272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	742 else if (img.is_uint16_type ())
9275 86f475d5e7d1 imwrite.m: convert indexed images to RGB before calling __magick_write__ John W. Eaton <jwe@octave.org> parents: 9274 diff changeset	743 encode_uint_image<uint16NDArray> (imvec, img, has_map);
8054 272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	744 else
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	745 error ("__magick_write__: image type not supported");
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	746
9275 86f475d5e7d1 imwrite.m: convert indexed images to RGB before calling __magick_write__ John W. Eaton <jwe@octave.org> parents: 9274 diff changeset	747 if (! error_state && has_map)
8054 272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	748 {
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	749 NDArray cmap = map.array_value ();
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	750
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	751 if (! error_state)
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	752 encode_map (imvec, cmap);
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	753 }
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	754
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	755 if (! error_state && params.is_defined ())
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	756 {
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	757 Octave_map options = params.map_value ();
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	758
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	759 // Insert calls here to handle parameters for various image formats
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	760 if (fmt == "jpg" \|\| fmt == "jpeg")
9275 86f475d5e7d1 imwrite.m: convert indexed images to RGB before calling __magick_write__ John W. Eaton <jwe@octave.org> parents: 9274 diff changeset	761 jpg_settings (imvec, options, has_map);
8054 272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	762 else
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	763 warning ("warning: your parameter(s) currently not supported");
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	764 }
7974 fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	765
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	766 try
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	767 {
8054 272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	768 Magick::writeImages (imvec.begin (), imvec.end (), filename);
7974 fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	769 }
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	770 catch (Magick::Warning& w)
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	771 {
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	772 warning ("Magick++ warning: %s", w.what ());
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	773 }
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	774 catch (Magick::ErrorCoder& e)
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	775 {
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	776 warning ("Magick++ coder error: %s", e.what ());
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	777 }
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	778 catch (Magick::Exception& e)
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	779 {
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	780 error ("Magick++ exception: %s", e.what ());
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	781 }
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	782 }
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	783
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	784 #endif
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	785
9436 5302df15ad76 __magick_read__.cc: undo unintended change John W. Eaton <jwe@octave.org> parents: 9434 diff changeset	786 DEFUN_DLD (__magick_write__, args, ,
7974 fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	787 "-- texinfo --\n\
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	788 @deftypefn {Function File} {} __magick_write__(@var{fname}, @var{fmt}, @var{img})\n\
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	789 @deftypefnx {Function File} {} __magick_write__(@var{fname}, @var{fmt}, @var{img}, @var{map})\n\
9064 7c02ec148a3c Check grammar on all .cc files Rik <rdrider0-list@yahoo.com> parents: 8920 diff changeset	790 Write images with ImageMagick++. In general you should not be using this function.\n\
7974 fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	791 Instead you should use @code{imwrite}.\n\
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	792 @seealso{imread}\n\
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	793 @end deftypefn")
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	794 {
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	795 octave_value_list retval;
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	796
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	797 #ifdef HAVE_MAGICK
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	798 int nargin = args.length ();
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	799
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	800 if (nargin > 2)
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	801 {
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	802 std::string filename = args(0).string_value ();
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	803
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	804 if (! error_state)
8053 89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	805 {
89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	806 std::string fmt = args(1).string_value ();
7974 fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	807
8053 89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	808 if (! error_state)
89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	809 {
8054 272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	810 if (nargin > 4)
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	811 write_image (filename, fmt, args(2), args(3), args(4));
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	812 else if (nargin > 3)
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	813 if (args(3).is_real_type ())
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	814 write_image (filename, fmt, args(2), args(3));
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	815 else
272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	816 write_image (filename, fmt, args(2), octave_value(), args(3));
8053 89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	817 else
89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	818 write_image (filename, fmt, args(2));
89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	819 }
89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	820 else
89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	821 error ("__magick_write__: expecting format as second argument");
89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	822 }
7974 fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	823 else
8053 89a512e8ec43 Replace leading tabs with spaces. scofield@scofield parents: 7974 diff changeset	824 error ("__magick_write__: expecting filename as first argument");
7974 fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	825 }
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	826 else
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	827 print_usage ();
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	828 #else
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	829
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	830 error ("__magick_write__: not available in this version of Octave");
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	831
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	832 #endif
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	833
8054 272eaebbb6ba Various features added to imwrite scofield@scofield parents: 8053 diff changeset	834 return retval;
7974 fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	835 }
fcaddd090f98 imwrite: new function John W. Eaton <jwe@octave.org> parents: 7937 diff changeset	836
8165 75014ec4ac84 __magick_read__.cc: only define magick_to_octave_value functions if HAVE_MAGICK is defined John W. Eaton <jwe@octave.org> parents: 8144 diff changeset	837 #ifdef HAVE_MAGICK
75014ec4ac84 __magick_read__.cc: only define magick_to_octave_value functions if HAVE_MAGICK is defined John W. Eaton <jwe@octave.org> parents: 8144 diff changeset	838
8144 01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	839 template<class T>
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	840 static octave_value
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	841 magick_to_octave_value (const T magick)
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	842 {
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	843 return octave_value (magick);
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	844 }
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	845
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	846 static octave_value
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	847 magick_to_octave_value (const Magick::EndianType magick)
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	848 {
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	849 switch (magick)
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	850 {
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	851 case Magick::LSBEndian:
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	852 return octave_value ("little-endian");
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	853
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	854 case Magick::MSBEndian:
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	855 return octave_value ("big-endian");
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	856
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	857 default:
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	858 return octave_value ("undefined");
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	859 }
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	860 }
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	861
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	862 static octave_value
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	863 magick_to_octave_value (const Magick::ResolutionType magick)
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	864 {
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	865 switch (magick)
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	866 {
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	867 case Magick::PixelsPerInchResolution:
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	868 return octave_value ("pixels per inch");
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	869
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	870 case Magick::PixelsPerCentimeterResolution:
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	871 return octave_value ("pixels per centimeter");
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	872
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	873 default:
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	874 return octave_value ("undefined");
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	875 }
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	876 }
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	877
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	878 static octave_value
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	879 magick_to_octave_value (const Magick::ImageType magick)
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	880 {
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	881 switch (magick)
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	882 {
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	883 case Magick::BilevelType:
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	884 case Magick::GrayscaleType:
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	885 case Magick::GrayscaleMatteType:
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	886 return octave_value ("grayscale");
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	887
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	888 case Magick::PaletteType:
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	889 case Magick::PaletteMatteType:
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	890 return octave_value ("indexed");
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	891
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	892 case Magick::TrueColorType:
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	893 case Magick::TrueColorMatteType:
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	894 case Magick::ColorSeparationType:
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	895 return octave_value ("truecolor");
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	896
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	897 default:
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	898 return octave_value ("undefined");
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	899 }
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	900 }
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	901
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	902 // We put this in a try-block because GraphicsMagick will throw
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	903 // exceptions if a parameter isn't present in the current image.
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	904 #define GET_PARAM(NAME, OUTNAME) \
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	905 try \
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	906 { \
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	907 st.assign (OUTNAME, magick_to_octave_value (im.NAME ())); \
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	908 } \
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	909 catch (Magick::Warning& w) \
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	910 { \
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	911 }
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	912
8165 75014ec4ac84 __magick_read__.cc: only define magick_to_octave_value functions if HAVE_MAGICK is defined John W. Eaton <jwe@octave.org> parents: 8144 diff changeset	913 #endif
75014ec4ac84 __magick_read__.cc: only define magick_to_octave_value functions if HAVE_MAGICK is defined John W. Eaton <jwe@octave.org> parents: 8144 diff changeset	914
9436 5302df15ad76 __magick_read__.cc: undo unintended change John W. Eaton <jwe@octave.org> parents: 9434 diff changeset	915 DEFUN_DLD (__magick_finfo__, args, ,
8144 01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	916 "-- texinfo --\n\
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	917 @deftypefn {Loadable File} {} __magick_finfo__(@var{fname})\n\
9064 7c02ec148a3c Check grammar on all .cc files Rik <rdrider0-list@yahoo.com> parents: 8920 diff changeset	918 Read image information with GraphicsMagick++. In general you should\n\
8144 01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	919 not be using this function. Instead you should use @code{imfinfo}.\n\
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	920 @seealso{imfinfo, imread}\n\
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	921 @end deftypefn")
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	922 {
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	923 octave_value_list output;
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	924
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	925 #ifdef HAVE_MAGICK
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	926
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	927 if (args.length () < 1 \|\| ! args (0).is_string ())
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	928 {
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	929 print_usage ();
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	930 return output;
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	931 }
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	932
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	933 const std::string filename = args (0).string_value ();
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	934
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	935 try
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	936 {
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	937 // Read the file.
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	938 Magick::Image im;
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	939 im.read (filename);
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	940
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	941 // Read properties.
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	942 Octave_map st;
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	943 st.assign ("Filename", filename);
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	944
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	945 // Annoying CamelCase naming is for Matlab compatibility.
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	946 GET_PARAM (fileSize, "FileSize")
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	947 GET_PARAM (rows, "Height")
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	948 GET_PARAM (columns, "Width")
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	949 GET_PARAM (depth, "BitDepth")
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	950 GET_PARAM (magick, "Format")
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	951 GET_PARAM (format, "LongFormat")
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	952 GET_PARAM (xResolution, "XResolution")
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	953 GET_PARAM (yResolution, "YResolution")
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	954 GET_PARAM (totalColors, "TotalColors")
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	955 GET_PARAM (tileName, "TileName")
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	956 GET_PARAM (animationDelay, "AnimationDelay")
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	957 GET_PARAM (animationIterations, "AnimationIterations")
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	958 GET_PARAM (endian, "ByteOrder")
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	959 GET_PARAM (gamma, "Gamma")
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	960 GET_PARAM (matte, "Matte")
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	961 GET_PARAM (modulusDepth, "ModulusDepth")
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	962 GET_PARAM (quality, "Quality")
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	963 GET_PARAM (quantizeColors, "QuantizeColors")
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	964 GET_PARAM (resolutionUnits, "ResolutionUnits")
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	965 GET_PARAM (type, "ColorType")
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	966 GET_PARAM (view, "View")
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	967
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	968 output (0) = st;
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	969 }
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	970 catch (Magick::Warning& w)
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	971 {
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	972 warning ("Magick++ warning: %s", w.what ());
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	973 }
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	974 catch (Magick::ErrorCoder& e)
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	975 {
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	976 warning ("Magick++ coder error: %s", e.what ());
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	977 }
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	978 catch (Magick::Exception& e)
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	979 {
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	980 error ("Magick++ exception: %s", e.what ());
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	981 return output;
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	982 }
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	983
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	984 #else
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	985
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	986 error ("imfinfo: not available in this version of Octave");
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	987
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	988 #endif
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	989
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	990 return output;
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	991 }
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	992
01fac748b680 Add the 'imfinfo' function for reading image file information. sh@sh-laptop parents: 8090 diff changeset	993 #undef GET_PARAM

Mercurial > octave

annotate src/DLD-FUNCTIONS/__magick_read__.cc @ 10295:13d382fc758b