summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Mathog <mathog@caltech.edu>2013-10-25 19:35:21 +0000
committer~suv <suv-sf@users.sourceforge.net>2013-10-25 19:35:21 +0000
commit2f052e8e6d08abe6764fd071eb5c647b2fbbbf6f (patch)
tree841693473c6078b0ac07d4f28f74495621d9be43
parentdon't update doc unit stuff when initializing DocumentProperties dialog widgets (diff)
downloadinkscape-2f052e8e6d08abe6764fd071eb5c647b2fbbbf6f.tar.gz
inkscape-2f052e8e6d08abe6764fd071eb5c647b2fbbbf6f.zip
WMF import: fix scaling of files without ViewPort record
(see bug 1241783, comment 4-5) Fixed bugs: - https://launchpad.net/bugs/1241783 (bzr r12725)
-rw-r--r--src/extension/internal/wmf-inout.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/extension/internal/wmf-inout.cpp b/src/extension/internal/wmf-inout.cpp
index f98890809..2e55dcb1e 100644
--- a/src/extension/internal/wmf-inout.cpp
+++ b/src/extension/internal/wmf-inout.cpp
@@ -1970,7 +1970,9 @@ std::cout << "BEFORE DRAW"
}
if (!d->dc[d->level].sizeView.x || !d->dc[d->level].sizeView.y) {
- d->dc[d->level].sizeView = d->dc[d->level].sizeWnd;
+ /* Previously it used sizeWnd, but that always resulted in scale = 1 if no viewport ever appeared, and in most files, it did not */
+ d->dc[d->level].sizeView.x = d->PixelsInX - 1;
+ d->dc[d->level].sizeView.y = d->PixelsInY - 1;
}
/* scales logical to WMF pixels, transfer a negative sign on Y, if any */