summaryrefslogtreecommitdiffstats
path: root/src/extension
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2014-04-19 22:26:37 +0000
committerJabiertxof <jtx@jtx.marker.es>2014-04-19 22:26:37 +0000
commit23be58fdf34cbcb29040b312de7e2b6764f60c50 (patch)
treed25a24e24f830c7618edeadc9d211e15e576c3fa /src/extension
parentupdate to trunk (diff)
parentMerge in outline bitmap image preference feature (diff)
downloadinkscape-23be58fdf34cbcb29040b312de7e2b6764f60c50.tar.gz
inkscape-23be58fdf34cbcb29040b312de7e2b6764f60c50.zip
update to trunk
(bzr r11950.1.329)
Diffstat (limited to 'src/extension')
-rw-r--r--src/extension/dbus/Makefile_insert2
-rw-r--r--src/extension/internal/pdf-input-cairo.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/extension/dbus/Makefile_insert b/src/extension/dbus/Makefile_insert
index 7d851715e..192651d87 100644
--- a/src/extension/dbus/Makefile_insert
+++ b/src/extension/dbus/Makefile_insert
@@ -78,7 +78,7 @@ libinkdbus_la_CFLAGS = \
$(DBUS_CFLAGS) \
$(INKSCAPE_CFLAGS) \
-I$(builddir)/extension/dbus \
- -Wall -Werror
+ -Wall
libinkdbus_la_LIBADD = \
$(DBUS_LIBS) \
diff --git a/src/extension/internal/pdf-input-cairo.cpp b/src/extension/internal/pdf-input-cairo.cpp
index c45367c08..9ce73c260 100644
--- a/src/extension/internal/pdf-input-cairo.cpp
+++ b/src/extension/internal/pdf-input-cairo.cpp
@@ -616,7 +616,7 @@ PdfInputCairo::open(Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
output, width, height);
cairo_t* cr = cairo_create(surface);
- poppler_page_render(page, cr);
+ poppler_page_render_for_printing(page, cr);
cairo_show_page(cr);
cairo_destroy(cr);