# HG changeset patch # User John W. Eaton # Date 1216232484 14400 # Node ID 54e414cc106b044cd3b223fd4ff2f5b0c9bb8381 # Parent d75586531aac80b389b9022888a7080e986685a7 style fixes diff -r d75586531aac -r 54e414cc106b src/DLD-FUNCTIONS/__magick_read__.cc --- a/src/DLD-FUNCTIONS/__magick_read__.cc Wed Jul 16 14:20:38 2008 -0400 +++ b/src/DLD-FUNCTIONS/__magick_read__.cc Wed Jul 16 14:21:24 2008 -0400 @@ -72,9 +72,12 @@ for (int frame = 0; frame < nframes; frame++) { imvec[frameidx(frame)].getConstPixels (0, 0, columns, rows); + const Magick::IndexPacket *pix = imvec[frameidx(frame)].getConstIndexes (); + i = 0; + for (int y = 0; y < rows; y++) for (int x = 0; x < columns; x++) im(y,x,frame) = static_cast (pix[i++]); @@ -87,12 +90,16 @@ case 16: { uint16NDArray im = uint16NDArray (dim_vector(rows, columns, nframes)); + for (int frame = 0; frame < nframes; frame++) { imvec[frameidx(frame)].getConstPixels (0, 0, columns, rows); + const Magick::IndexPacket *pix = imvec[frameidx(frame)].getConstIndexes (); + i = 0; + for (int y = 0; y < rows; y++) for (int x = 0; x < columns; x++) im(y,x,frame) = static_cast (pix[i++]);