From d2d46b5e9228a21330720e7c8ccce353ced02b72 Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Mon, 26 May 2014 13:37:44 +0200
Subject: Convert from 90px to inch to 96px to inch per SVG (CSS)
 specification.

(bzr r13341.1.39)
---
 src/extension/internal/gdkpixbuf-input.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/extension/internal/gdkpixbuf-input.cpp')

diff --git a/src/extension/internal/gdkpixbuf-input.cpp b/src/extension/internal/gdkpixbuf-input.cpp
index a384c7bde..da179bee0 100644
--- a/src/extension/internal/gdkpixbuf-input.cpp
+++ b/src/extension/internal/gdkpixbuf-input.cpp
@@ -87,11 +87,11 @@ GdkpixbufInput::open(Inkscape::Extension::Input *mod, char const *uri)
             ir = new ImageResolution(uri);
         }
         if (ir && ir->ok()) {
-            xscale = 900.0 / floor(10.*ir->x() + .5);  // round-off to 0.1 dpi
-            yscale = 900.0 / floor(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);
         } else {
-            xscale = 90.0 / defaultxdpi;
-            yscale = 90.0 / defaultxdpi;
+            xscale = 96.0 / defaultxdpi;
+            yscale = 96.0 / defaultxdpi;
         }
 
         width *= xscale;
-- 
cgit v1.2.3


From 1f2d8bc4ce99e970cead4ca96c1859c383a9c043 Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebrony@gmail.com>
Date: Sun, 31 Aug 2014 14:17:26 -0400
Subject: Header cleanup: stop using Glib types where they aren't truly needed.
 Eases GThread deprecation errors.

(bzr r13341.1.190)
---
 src/extension/internal/gdkpixbuf-input.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'src/extension/internal/gdkpixbuf-input.cpp')

diff --git a/src/extension/internal/gdkpixbuf-input.cpp b/src/extension/internal/gdkpixbuf-input.cpp
index da179bee0..28e44c461 100644
--- a/src/extension/internal/gdkpixbuf-input.cpp
+++ b/src/extension/internal/gdkpixbuf-input.cpp
@@ -1,21 +1,20 @@
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include <boost/scoped_ptr.hpp>
 #include <glib/gprintf.h>
 #include <glibmm/i18n.h>
+#include "dir-util.h"
+#include "display/cairo-utils.h"
 #include "document-private.h"
-#include <dir-util.h>
+#include "document-undo.h"
 #include "extension/input.h"
 #include "extension/system.h"
+#include "image-resolution.h"
 #include "gdkpixbuf-input.h"
 #include "preferences.h"
 #include "selection-chemistry.h"
 #include "sp-image.h"
-#include "document-undo.h"
 #include "util/units.h"
-#include "image-resolution.h"
-#include "display/cairo-utils.h"
 #include <set>
 
 namespace Inkscape {
-- 
cgit v1.2.3