From d4d9e436812558588342180c336deb74473cd6c0 Mon Sep 17 00:00:00 2001
From: Nicolas Dufour <nicoduf@yahoo.fr>
Date: Wed, 1 Oct 2014 09:24:30 +0200
Subject: Importing. Fix for Bug #1325822 (BMP images resolution not correctly
 imported).

Fixed bugs:
  - https://launchpad.net/bugs/1325822

(bzr r13573)
---
 src/extension/internal/image-resolution.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(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 f092b21ef..e96fd6437 100644
--- a/src/extension/internal/image-resolution.cpp
+++ b/src/extension/internal/image-resolution.cpp
@@ -354,8 +354,15 @@ void ImageResolution::readmagick(char const *fn) {
         return;
     }
 
+    std::string const type = image.magick();
     x_ = image.xResolution();
     y_ = image.yResolution();
+
+// TODO: find out why the hell the following convertion is necessary
+    if (type == "BMP") {
+        x_ = Inkscape::Util::Quantity::convert(x_, "in", "cm");
+        y_ = Inkscape::Util::Quantity::convert(y_, "in", "cm");
+    }
     
     if (x_ != 0 && y_ != 0) {
         ok_ = true;
-- 
cgit v1.2.3