# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: daw@caltech.edu-20120920040816-kv2mcf6s1powbl24
# target_branch: bzr+ssh://bazaar.launchpad.net/+branch/inkscape/
# testament_sha1: 605dc2ba8c54e12f36e4dea39552cdc9fbba6af1
# timestamp: 2012-09-19 21:11:05 -0700
# base_revision_id: nicoduf@yahoo.fr-20120919095226-azirxzuwb5z3qmoi
# 
# Begin patch
=== modified file 'src/extension/internal/gdkpixbuf-input.cpp'
--- src/extension/internal/gdkpixbuf-input.cpp	2012-08-19 12:20:17 +0000
+++ src/extension/internal/gdkpixbuf-input.cpp	2012-09-20 04:08:16 +0000
@@ -80,6 +80,7 @@
         double width = gdk_pixbuf_get_width(pb);
         double height = gdk_pixbuf_get_height(pb);
         double defaultxdpi = prefs->getDouble("/dialogs/import/defaultxdpi/value", PX_PER_IN);
+        bool forcexdpi = prefs->getBool("/dialogs/import/forcexdpi");
         ImageResolution *ir = 0;
         double xscale = 1;
         double yscale = 1;
@@ -91,9 +92,9 @@
                 xscale = 72.0 / (double)dpi;
             }
         } else {
-            if (!ir)
+            if (!ir && !forcexdpi)
                 ir = new ImageResolution(uri);
-            if (ir->ok())
+            if (ir && ir->ok())
                 xscale = 900.0 / floor(10.*ir->x() + .5);  // round-off to 0.1 dpi
             else
                 xscale = 90.0 / defaultxdpi;
@@ -107,9 +108,9 @@
                 yscale = 72.0 / (double)dpi;
             }
         } else {
-            if (!ir)
+            if (!ir && !forcexdpi)
                 ir = new ImageResolution(uri);
-            if (ir->ok())
+            if (ir && ir->ok())
                 yscale = 900.0 / floor(10.*ir->y() + .5);  // round-off to 0.1 dpi
             else
                 yscale = 90.0 / defaultxdpi;

=== modified file 'src/ui/dialog/inkscape-preferences.cpp'
--- src/ui/dialog/inkscape-preferences.cpp	2012-09-19 02:48:33 +0000
+++ src/ui/dialog/inkscape-preferences.cpp	2012-09-20 04:08:16 +0000
@@ -1394,6 +1394,9 @@
     _importexport_import_res.init("/dialogs/import/defaultxdpi/value", 0.0, 6000.0, 1.0, 1.0, PX_PER_IN, true, false);
     _page_bitmaps.add_line( false, _("Default _import resolution:"), _importexport_import_res, _("dpi"),
                             _("Default bitmap resolution (in dots per inch) for bitmap import"), false);
+    _importexport_import_res_override.init(_("Override file resolution"), "/dialogs/import/forcexdpi", false);
+    _page_bitmaps.add_line( false, "", _importexport_import_res_override, "",
+                            _("Use default bitmap resolution in favor of information from file"));
 
     this->AddPage(_page_bitmaps, _("Bitmaps"), PREFS_PAGE_BITMAPS);
 }

=== modified file 'src/ui/dialog/inkscape-preferences.h'
--- src/ui/dialog/inkscape-preferences.h	2012-09-19 02:48:33 +0000
+++ src/ui/dialog/inkscape-preferences.h	2012-09-20 04:08:16 +0000
@@ -290,6 +290,7 @@
 
     UI::Widget::PrefSpinButton  _importexport_export_res;
     UI::Widget::PrefSpinButton  _importexport_import_res;
+    UI::Widget::PrefCheckButton _importexport_import_res_override;
     UI::Widget::PrefSlider      _snap_delay;
     UI::Widget::PrefSlider      _snap_weight;
     UI::Widget::PrefCheckButton _font_dialog;

# Begin bundle
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