summaryrefslogtreecommitdiffstats
path: root/src/extension/internal/image-resolution.cpp
diff options
context:
space:
mode:
authorJabier Arraiza <jabier.arraiza@marker.es>2017-11-07 23:11:54 +0000
committerJabier Arraiza <jabier.arraiza@marker.es>2017-11-07 23:11:54 +0000
commit51639504fbee801b07900b8ffeef069157d298cb (patch)
tree6aec1edd9cfaf33d18e8f2cb61e90bcfaf99b9e1 /src/extension/internal/image-resolution.cpp
parentFixes to CPU (diff)
parentMerge branch 'luzpaz/inkscape-typos' (!119) (diff)
downloadinkscape-51639504fbee801b07900b8ffeef069157d298cb.tar.gz
inkscape-51639504fbee801b07900b8ffeef069157d298cb.zip
Merge branch 'master' into fixSymbolsCpuProblems
Diffstat (limited to 'src/extension/internal/image-resolution.cpp')
-rw-r--r--src/extension/internal/image-resolution.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/extension/internal/image-resolution.cpp b/src/extension/internal/image-resolution.cpp
index 57142bbdd..558276999 100644
--- a/src/extension/internal/image-resolution.cpp
+++ b/src/extension/internal/image-resolution.cpp
@@ -414,7 +414,7 @@ void ImageResolution::readmagick(char const *fn) {
x_ = image.xResolution();
y_ = image.yResolution();
-// TODO: find out why the hell the following convertion is necessary
+// TODO: find out why the hell the following conversion is necessary
if (type == "BMP") {
x_ = Inkscape::Util::Quantity::convert(x_, "in", "cm");
y_ = Inkscape::Util::Quantity::convert(y_, "in", "cm");