diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2014-10-02 14:57:04 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2014-10-02 14:57:04 +0000 |
| commit | dd9c5a5779119c79a1f31b69dd3f0fa25abc513c (patch) | |
| tree | dad1d2d9a860040e04db53ae8e40c1ab42ecd589 /src/extension/internal/image-resolution.cpp | |
| parent | update to trunk (r13564) (diff) | |
| parent | Work-around for Pango 1.36.7 which introduced 'Semi-Light' font weight, (diff) | |
| download | inkscape-dd9c5a5779119c79a1f31b69dd3f0fa25abc513c.tar.gz inkscape-dd9c5a5779119c79a1f31b69dd3f0fa25abc513c.zip | |
update to trunk (r13577)
(bzr r13506.1.108)
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; |