Update to trunk

(bzr r13090.1.51)

3 files changed, 14 insertions, 13 deletions

diff --git a/src/2geom/path.cpp b/src/2geom/path.cpp
index 5797f475c..fc4d72028 100644
--- a/src/2geom/path.cpp
+++ b/src/2geom/path.cpp
@@ -104,12 +104,14 @@ Path &Path::operator*=(Affine const &m) {
 }
 
 Path &Path::operator*=(Translate const &m) {
+/* Somehow there is something wrong here, LPE Construct grid fails with this code
   unshare();
   Sequence::iterator last = get_curves().end() - 1;
   Sequence::iterator it;
   Point prev;
   for (it = get_curves().begin() ; it != last ; ++it) {
-    *(const_cast<Curve*>(&**it)) *= m;
+    //*(const_cast<Curve*>(&**it)) *= m;
+    const_cast<Curve*>(it->get())->operator*=(m);
     if ( it != get_curves().begin() && (*it)->initialPoint() != prev ) {
       THROW_CONTINUITYERROR();
     }
@@ -124,6 +126,8 @@ Path &Path::operator*=(Translate const &m) {
     }
   }
   return *this;
+*/
+  return this->operator*=(static_cast<Affine>(m));
 }
 
 std::vector<double>
diff --git a/src/Makefile.am b/src/Makefile.am
index d3f8794ee..d5439f0ea 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -250,7 +250,9 @@ check_PROGRAMS = cxxtests
 # "make distcheck".
 
 # List of all tests to be run.
-TESTS = $(check_PROGRAMS) ../share/extensions/test/run-all-extension-tests
+TESTS = $(check_PROGRAMS)
+check-local:
+	$(top_srcdir)/share/extensions/test/run-all-extension-tests
 
 # FIXME: Currently, a number of cxxtest tests fail.  These should be fixed and
 #        the XFAIL_TESTS build target should be removed.
diff --git a/src/extension/internal/image-resolution.cpp b/src/extension/internal/image-resolution.cpp
index 18eb97f80..f092b21ef 100644
--- a/src/extension/internal/image-resolution.cpp
+++ b/src/extension/internal/image-resolution.cpp
@@ -353,18 +353,13 @@ void ImageResolution::readmagick(char const *fn) {
         g_warning("ImageResolution::readmagick: Unknown error");
         return;
     }
-    Magick::Geometry geo = image.density();
-    std::string type = image.magick();
-
-    if (type == "PNG") { // PNG only supports pixelspercentimeter 
-        x_ = Inkscape::Util::Quantity::convert((double)geo.width(), "in", "cm");
-        y_ = Inkscape::Util::Quantity::convert((double)geo.height(), "in", "cm");
-    } else {
-        x_ = (double)geo.width();
-        y_ = (double)geo.height();
-    }
 
-    ok_ = true;
+    x_ = image.xResolution();
+    y_ = image.yResolution();
+    
+    if (x_ != 0 && y_ != 0) {
+        ok_ = true;
+    }
 }
 
 #else