diff options
| author | Nicolas Dufour <nicoduf@yahoo.fr> | 2013-12-03 14:55:17 +0000 |
|---|---|---|
| committer | JazzyNico <nicoduf@yahoo.fr> | 2013-12-03 14:55:17 +0000 |
| commit | 460935a2c3612e613f6e08f6fde6b4f31eb59a67 (patch) | |
| tree | 442be343f85c32b58503e0e4a29eb06fad895c94 /src/extension/internal/image-resolution.cpp | |
| parent | Fix for Bug #1094511 (GTK3: rulers render with solid black bg). (diff) | |
| download | inkscape-460935a2c3612e613f6e08f6fde6b4f31eb59a67.tar.gz inkscape-460935a2c3612e613f6e08f6fde6b4f31eb59a67.zip | |
ImageMagick exception handling improvements (see Bug #1252719).
(bzr r12836)
Diffstat (limited to 'src/extension/internal/image-resolution.cpp')
| -rw-r--r-- | src/extension/internal/image-resolution.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/extension/internal/image-resolution.cpp b/src/extension/internal/image-resolution.cpp index 865e86698..aee46aaba 100644 --- a/src/extension/internal/image-resolution.cpp +++ b/src/extension/internal/image-resolution.cpp @@ -340,7 +340,13 @@ void ImageResolution::readmagick(char const *fn) { Magick::Image image; try { image.read(fn); - } catch (...) {} + } catch (Magick::Error & err) { + g_warning("ImageMagick error: %s", err.what()); + return; + } catch (...) { + g_warning("ImageResolution::readmagick: Unknown error"); + return; + } Magick::Geometry geo = image.density(); std::string type = image.magick(); |