From 460935a2c3612e613f6e08f6fde6b4f31eb59a67 Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Tue, 3 Dec 2013 15:55:17 +0100 Subject: ImageMagick exception handling improvements (see Bug #1252719). (bzr r12836) --- src/extension/internal/image-resolution.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/extension/internal/image-resolution.cpp') 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(); -- cgit v1.2.3