summaryrefslogtreecommitdiffstats
path: root/src/extension/internal/gdkpixbuf-input.cpp
diff options
context:
space:
mode:
authorMarc Jeanmougin <marc@jeanmougin.fr>2015-12-03 22:28:20 +0000
committerMarc Jeanmougin <marcjeanmougin@free.fr>2015-12-03 22:28:20 +0000
commit8fb3a773c484fc3fc5c17ec7da21ba26cf409037 (patch)
treeb57dfec17d3bcf7c290fe4337f9899172e602711 /src/extension/internal/gdkpixbuf-input.cpp
parentRemoved auto calulate distances in roughen LPE because strange resulton apply... (diff)
downloadinkscape-8fb3a773c484fc3fc5c17ec7da21ba26cf409037.tar.gz
inkscape-8fb3a773c484fc3fc5c17ec7da21ba26cf409037.zip
Correct rounding when importing bitmaps
(bzr r14503)
Diffstat (limited to 'src/extension/internal/gdkpixbuf-input.cpp')
-rw-r--r--src/extension/internal/gdkpixbuf-input.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/extension/internal/gdkpixbuf-input.cpp b/src/extension/internal/gdkpixbuf-input.cpp
index f99c9050d..27b71c252 100644
--- a/src/extension/internal/gdkpixbuf-input.cpp
+++ b/src/extension/internal/gdkpixbuf-input.cpp
@@ -86,8 +86,12 @@ GdkpixbufInput::open(Inkscape::Extension::Input *mod, char const *uri)
ir = new ImageResolution(uri);
}
if (ir && ir->ok()) {
- xscale = 960.0 / round(10.*ir->x() + .5); // round-off to 0.1 dpi
- yscale = 960.0 / round(10.*ir->y() + .5);
+ xscale = 960.0 / floor(10.*ir->x() + .5); // round-off to 0.1 dpi
+ yscale = 960.0 / floor(10.*ir->y() + .5);
+ if (ir->x() <= .05)
+ xscale = 960.0;
+ if (ir->y() <= .05)
+ yscale = 960.0;
} else {
xscale = 96.0 / defaultxdpi;
yscale = 96.0 / defaultxdpi;