update to trunk

(bzr r12588.1.31)

2 files changed, 11 insertions, 5 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();
 
diff --git a/src/extension/internal/wmf-inout.cpp b/src/extension/internal/wmf-inout.cpp
index 3f37e4402..870e4061c 100644
--- a/src/extension/internal/wmf-inout.cpp
+++ b/src/extension/internal/wmf-inout.cpp
@@ -321,7 +321,7 @@ Wmf::save(Inkscape::Extension::Output *mod, SPDocument *doc, gchar const *filena
 
 
 /* WMF has no worldTransform, so this always returns 1.0.  Retain it to keep WMF and WMF in sync as much as possible.*/
-double Wmf::current_scale(PWMF_CALLBACK_DATA d){
+double Wmf::current_scale(PWMF_CALLBACK_DATA /*d*/){
     return 1.0;
 }
 
@@ -341,7 +341,7 @@ std::string Wmf::current_matrix(PWMF_CALLBACK_DATA d, double x, double y, int us
 }
 
 /* WMF has no worldTransform, so this always returns 0.  Retain it to keep WMF and WMF in sync as much as possible.*/
-double Wmf::current_rotation(PWMF_CALLBACK_DATA d){
+double Wmf::current_rotation(PWMF_CALLBACK_DATA /*d*/){
     return 0.0;
 }
 
@@ -1025,7 +1025,7 @@ Wmf::_pix_y_to_point(PWMF_CALLBACK_DATA d, double py)
 
 
 double
-Wmf::pix_to_x_point(PWMF_CALLBACK_DATA d, double px, double py)
+Wmf::pix_to_x_point(PWMF_CALLBACK_DATA d, double px, double /*py*/)
 {
     double x   = _pix_x_to_point(d, px);
 
@@ -1033,7 +1033,7 @@ Wmf::pix_to_x_point(PWMF_CALLBACK_DATA d, double px, double py)
 }
 
 double
-Wmf::pix_to_y_point(PWMF_CALLBACK_DATA d, double px, double py)
+Wmf::pix_to_y_point(PWMF_CALLBACK_DATA d, double /*px*/, double py)
 {
 
     double y   = _pix_y_to_point(d, py);