Mercurial > octave
comparison libinterp/dldfcn/__magick_read__.cc @ 20687:5f04bfc7c17a
backout changeset 18f38ed43962
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sun, 08 Nov 2015 16:14:27 -0500 |
| parents | 18f38ed43962 |
| children | 85e5efae848a |
comparison
equal
deleted
inserted
replaced
| 20686:e468e4211df9 | 20687:5f04bfc7c17a |
|---|---|
| 768 for (octave_idx_type i = 0; i < nFrames; i++) | 768 for (octave_idx_type i = 0; i < nFrames; i++) |
| 769 frameidx(i) = i; | 769 frameidx(i) = i; |
| 770 } | 770 } |
| 771 else | 771 else |
| 772 { | 772 { |
| 773 frameidx = indexes.int_vector_value ("__magick_read__: invalid value for Index/Frame"); | 773 frameidx = indexes.int_vector_value (); |
| 774 | 774 if (error_state) |
| 775 { | |
| 776 error ("__magick_read__: invalid value for Index/Frame"); | |
| 777 return output; | |
| 778 } | |
| 775 // Fix indexes from base 1 to base 0, and at the same time, make | 779 // Fix indexes from base 1 to base 0, and at the same time, make |
| 776 // sure none of the indexes is outside the range of image number. | 780 // sure none of the indexes is outside the range of image number. |
| 777 const octave_idx_type n = frameidx.numel (); | 781 const octave_idx_type n = frameidx.numel (); |
| 778 for (octave_idx_type i = 0; i < n; i++) | 782 for (octave_idx_type i = 0; i < n; i++) |
| 779 { | 783 { |