Mercurial > hg > octave-nkf
changeset 17362:6e1a3b8fc312
__magick_finfo__: remove recent Magick compression types (bug #39913)
author | Carnë Draug <carandraug@octave.org> |
---|---|
date | Tue, 03 Sep 2013 23:35:55 +0100 |
parents | 9258de031721 |
children | 9aca7020c89f |
files | libinterp/dldfcn/__magick_read__.cc |
diffstat | 1 files changed, 15 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/dldfcn/__magick_read__.cc +++ b/libinterp/dldfcn/__magick_read__.cc @@ -1481,14 +1481,21 @@ return octave_value ("rle"); case Magick::ZipCompression: return octave_value ("deflate"); - case Magick::LZMACompression: - return octave_value ("lzma"); - case Magick::JPEG2000Compression: - return octave_value ("jpeg2000"); - case Magick::JBIG1Compression: - return octave_value ("jbig1"); - case Magick::JBIG2Compression: - return octave_value ("jbig2"); + + // The following are present only in recent versions of GraphicsMagick. + // At the moment the only use of this would be to have imfinfo report + // the compression method. In the future, someone could implement + // the Compression option for imwrite in which case a macro in + // configure.ac will have to check for their presence of this. + // See bug #39913 +// case Magick::LZMACompression: +// return octave_value ("lzma"); +// case Magick::JPEG2000Compression: +// return octave_value ("jpeg2000"); +// case Magick::JBIG1Compression: +// return octave_value ("jbig1"); +// case Magick::JBIG2Compression: +// return octave_value ("jbig2"); default: return octave_value ("undefined"); }