diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-12-08 23:09:46 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2013-12-08 23:09:46 +0000 |
| commit | b57dcebd2f4efb8babd1219d5344400640cb1ac7 (patch) | |
| tree | f1349cbf7ab26d4ec5242d3cbc36a4ef2672ebe4 /src/extension/internal/image-resolution.cpp | |
| parent | Fix a bug delete BSpline LPE from a path retain some BSpline properties (diff) | |
| parent | patch by Adolf Mathias and ~suv for Bug 1136495 (diff) | |
| download | inkscape-b57dcebd2f4efb8babd1219d5344400640cb1ac7.tar.gz inkscape-b57dcebd2f4efb8babd1219d5344400640cb1ac7.zip | |
Update to trunk
(bzr r11950.1.207)
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(); |