Mercurial > octave-nkf

comparison src/DLD-FUNCTIONS/__magick_read__.cc @ 7932:d75586531aac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
style fixes
author John W. Eaton <jwe@octave.org>
date Wed, 16 Jul 2008 14:20:38 -0400
parents de26beacb20f
children 54e414cc106b
comparison
equal deleted inserted replaced
7931:de26beacb20f 7932:d75586531aac
1 /* 1 /*
2 2
3 Copyright (C) 2002 Andy Adler 3 Copyright (C) 2002 Andy Adler
4 2008 Thomas L. Scofield 4 Copyright (C) 2008 Thomas L. Scofield
5 5
6 This file is part of Octave. 6 This file is part of Octave.
7 7
8 Octave is free software; you can redistribute it and/or modify it 8 Octave is free software; you can redistribute it and/or modify it
9 under the terms of the GNU General Public License as published by the 9 under the terms of the GNU General Public License as published by the
77 i = 0; 77 i = 0;
78 for (int y = 0; y < rows; y++) 78 for (int y = 0; y < rows; y++)
79 for (int x = 0; x < columns; x++) 79 for (int x = 0; x < columns; x++)
80 im(y,x,frame) = static_cast<octave_uint8> (pix[i++]); 80 im(y,x,frame) = static_cast<octave_uint8> (pix[i++]);
81 } 81 }
82 im.chop_trailing_singletons (); 82 im.chop_trailing_singletons ();
83 output(0) = octave_value (im); 83 output(0) = octave_value (im);
84 } 84 }
85 break; 85 break;
86 86
87 case 16: 87 case 16:
88 { 88 {
179 179
180 switch (type) 180 switch (type)
181 { 181 {
182 case Magick::BilevelType: 182 case Magick::BilevelType:
183 case Magick::GrayscaleType: 183 case Magick::GrayscaleType:
184 im = T(dim_vector (rows, columns, nframes)); 184 im = T (dim_vector (rows, columns, nframes));
185 for (int frame = 0; frame < nframes; frame++) 185 for (int frame = 0; frame < nframes; frame++)
186 { 186 {
187 const Magick::PixelPacket *pix 187 const Magick::PixelPacket *pix
188 = imvec[frameidx(frame)].getConstPixels (0, 0, columns, rows); 188 = imvec[frameidx(frame)].getConstPixels (0, 0, columns, rows);
189 189
224 224
225 case Magick::PaletteType: 225 case Magick::PaletteType:
226 case Magick::TrueColorType: 226 case Magick::TrueColorType:
227 idim(2) = 3; 227 idim(2) = 3;
228 im = T (idim); 228 im = T (idim);
229 for (int frame=0; frame < nframes; frame++) 229 for (int frame = 0; frame < nframes; frame++)
230 { 230 {
231 const Magick::PixelPacket *pix 231 const Magick::PixelPacket *pix
232 = imvec[frameidx(frame)].getConstPixels (0, 0, columns, rows); 232 = imvec[frameidx(frame)].getConstPixels (0, 0, columns, rows);
233 233
234 int i = 0; 234 int i = 0;
255 case Magick::PaletteMatteType: 255 case Magick::PaletteMatteType:
256 case Magick::TrueColorMatteType: 256 case Magick::TrueColorMatteType:
257 case Magick::ColorSeparationType: 257 case Magick::ColorSeparationType:
258 idim(2) = 4; 258 idim(2) = 4;
259 im = T (idim); 259 im = T (idim);
260 for (int frame=0; frame < nframes; frame++) 260 for (int frame = 0; frame < nframes; frame++)
261 { 261 {
262 const Magick::PixelPacket *pix 262 const Magick::PixelPacket *pix
263 = imvec[frameidx(frame)].getConstPixels (0, 0, columns, rows); 263 = imvec[frameidx(frame)].getConstPixels (0, 0, columns, rows);
264 264
265 int i = 0; 265 int i = 0;