Mercurial > octave-dspies
diff src/DLD-FUNCTIONS/__magick_read__.cc @ 11570:57632dea2446
attempt better backward compatibility for Array constructors
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 19 Jan 2011 17:55:56 -0500 |
| parents | 01f703952eff |
| children | 1473d0cf86d2 |
line wrap: on
line diff
--- a/src/DLD-FUNCTIONS/__magick_read__.cc Wed Jan 19 15:12:59 2011 -0500 +++ b/src/DLD-FUNCTIONS/__magick_read__.cc Wed Jan 19 17:55:56 2011 -0500 @@ -438,7 +438,7 @@ } else { - frameidx = Array<int> (1, 1); + frameidx = Array<int> (dim_vector (1, 1)); frameidx(0) = 1; } @@ -466,7 +466,7 @@ int nframes = imvec.size (); if (all_frames) { - frameidx = Array<int> (1, nframes); + frameidx = Array<int> (dim_vector (1, nframes)); for (int i = 0; i < frameidx.length (); i++) frameidx(i) = i; } @@ -592,7 +592,7 @@ if (dsizes.length () == 4) nframes = dsizes(3); - Array<octave_idx_type> idx (dsizes.length (), 1); + Array<octave_idx_type> idx (dim_vector (dsizes.length (), 1)); octave_idx_type rows = m.rows (); octave_idx_type columns = m.columns (); @@ -660,7 +660,7 @@ bool is_color = ((dsizes.length () > 2) && (dsizes(2) > 2)); bool has_alpha = (dsizes.length () > 2 && (dsizes(2) == 2 || dsizes(2) == 4)); - Array<octave_idx_type> idx (dsizes.length (), 1); + Array<octave_idx_type> idx (dim_vector (dsizes.length (), 1)); octave_idx_type rows = m.rows (); octave_idx_type columns = m.columns ();