summaryrefslogtreecommitdiffstats
path: root/src/extension/internal/gdkpixbuf-input.cpp
diff options
context:
space:
mode:
authorMarc Jeanmougin <marc@jeanmougin.fr>2015-12-04 10:06:44 +0000
committerMarc Jeanmougin <marcjeanmougin@free.fr>2015-12-04 10:06:44 +0000
commitcbbc1697f7ac096ffb5404a5d96f9d79ea27ba64 (patch)
treefcf8bb54ee683cdaef89b4c33f5d93cd1d7da0cc /src/extension/internal/gdkpixbuf-input.cpp
parentCorrect rounding when importing bitmaps (diff)
downloadinkscape-cbbc1697f7ac096ffb5404a5d96f9d79ea27ba64.tar.gz
inkscape-cbbc1697f7ac096ffb5404a5d96f9d79ea27ba64.zip
added comment + simpler rounding
(bzr r14504)
Diffstat (limited to 'src/extension/internal/gdkpixbuf-input.cpp')
-rw-r--r--src/extension/internal/gdkpixbuf-input.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/extension/internal/gdkpixbuf-input.cpp b/src/extension/internal/gdkpixbuf-input.cpp
index 27b71c252..c15e28854 100644
--- a/src/extension/internal/gdkpixbuf-input.cpp
+++ b/src/extension/internal/gdkpixbuf-input.cpp
@@ -86,8 +86,9 @@ GdkpixbufInput::open(Inkscape::Extension::Input *mod, char const *uri)
ir = new ImageResolution(uri);
}
if (ir && ir->ok()) {
- xscale = 960.0 / floor(10.*ir->x() + .5); // round-off to 0.1 dpi
- yscale = 960.0 / floor(10.*ir->y() + .5);
+ xscale = 960.0 / round(10.*ir->x()); // round-off to 0.1 dpi
+ yscale = 960.0 / round(10.*ir->y());
+ // prevent crash on image with too small dpi (bug 1479193)
if (ir->x() <= .05)
xscale = 960.0;
if (ir->y() <= .05)