diff options
| author | Liam P. White <inkscapebrony@gmail.com> | 2014-10-06 00:18:46 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebrony@gmail.com> | 2014-10-06 00:18:46 +0000 |
| commit | 7d38f876e8a4c5ab60261f61452fa2bf8baf13f3 (patch) | |
| tree | 8d93f93ef7634ca78637b55edb9de4401669b2bb /src/extension/internal/image-resolution.cpp | |
| parent | Add missing file to CMakeLists (diff) | |
| parent | Remove unused functions. (diff) | |
| download | inkscape-7d38f876e8a4c5ab60261f61452fa2bf8baf13f3.tar.gz inkscape-7d38f876e8a4c5ab60261f61452fa2bf8baf13f3.zip | |
Update to trunk r13580
(bzr r13341.1.255)
Diffstat (limited to 'src/extension/internal/image-resolution.cpp')
| -rw-r--r-- | src/extension/internal/image-resolution.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
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; |