diff options
| author | Nicolas Dufour <nicoduf@yahoo.fr> | 2014-10-01 07:24:30 +0000 |
|---|---|---|
| committer | JazzyNico <nicoduf@yahoo.fr> | 2014-10-01 07:24:30 +0000 |
| commit | d4d9e436812558588342180c336deb74473cd6c0 (patch) | |
| tree | 921550312d258efc1b8fc03e71388f23e3488af8 /src/extension/internal/image-resolution.cpp | |
| parent | Fix for Bug #1358520 (show/hide other layers not properly recorded in undo hi... (diff) | |
| download | inkscape-d4d9e436812558588342180c336deb74473cd6c0.tar.gz inkscape-d4d9e436812558588342180c336deb74473cd6c0.zip | |
Importing. Fix for Bug #1325822 (BMP images resolution not correctly imported).
Fixed bugs:
- https://launchpad.net/bugs/1325822
(bzr r13573)
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; |