summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Dufour <nicoduf@yahoo.fr>2013-12-03 14:55:17 +0000
committerJazzyNico <nicoduf@yahoo.fr>2013-12-03 14:55:17 +0000
commit460935a2c3612e613f6e08f6fde6b4f31eb59a67 (patch)
tree442be343f85c32b58503e0e4a29eb06fad895c94
parentFix for Bug #1094511 (GTK3: rulers render with solid black bg). (diff)
downloadinkscape-460935a2c3612e613f6e08f6fde6b4f31eb59a67.tar.gz
inkscape-460935a2c3612e613f6e08f6fde6b4f31eb59a67.zip
ImageMagick exception handling improvements (see Bug #1252719).
(bzr r12836)
-rw-r--r--src/extension/internal/image-resolution.cpp8
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();