add pdf import filter via poppler-cairo

diff --git a/build.xml b/build.xml
index 407fa4ae1459bb5175ebb8a2ff13c8be421c881a..2c00661fa2b30f3b939028062b5d81e385f3230b 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -178,6 +178,7 @@
         
         /* use poppler for pdf import? */
         #define HAVE_POPPLER                  1
+       #define HAVE_POPPLER_GLIB             1
         #define HAVE_POPPLER_CAIRO            1
 
         /* do we want bitmap manipulation? */

diff --git a/src/extension/init.cpp b/src/extension/init.cpp
index 8578e8c6c61931fd80a08ea087bf96a771c54839..230d4b50fc3221bcf6c4aede831f6433b4c727f2 100644 (file)
--- a/src/extension/init.cpp
+++ b/src/extension/init.cpp
@@ -166,7 +166,7 @@ init()
     Internal::PdfInput::init();
 #endif
 #ifdef HAVE_POPPLER_GLIB
-    if (0) {
+    if (1) {
     Internal::PdfInputCairo::init();
     }
 #endif
@@ -192,7 +192,7 @@ init()
 #ifdef WITH_DBUS
     Dbus::init();
 #endif
-       
+
     /* Raster Effects */
 #ifdef WITH_IMAGE_MAGICK
     Internal::Bitmap::AdaptiveThreshold::init();

diff --git a/src/extension/internal/pdf-input-cairo.cpp b/src/extension/internal/pdf-input-cairo.cpp
index 2c7ea3b33f7f35fc08294931af1b593a54b0aa14..6657ea2220151b678f42d1b94a6165f8e5cc323c 100644 (file)
--- a/src/extension/internal/pdf-input-cairo.cpp
+++ b/src/extension/internal/pdf-input-cairo.cpp
@@ -87,11 +87,11 @@ PdfInputCairo::init(void) {
     ext = Inkscape::Extension::build_from_mem(
         "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
             "<name>PDF Input</name>\n"
-            "<id>org.inkscape.input.pdf</id>\n"
+            "<id>org.inkscape.input.cairo-pdf</id>\n"
             "<input>\n"
                 "<extension>.pdf</extension>\n"
                 "<mimetype>application/pdf</mimetype>\n"
-                "<filetypename>Adobe PDF (*.pdf)</filetypename>\n"
+                "<filetypename>Adobe PDF via poppler-cairo (*.pdf)</filetypename>\n"
                 "<filetypetooltip>PDF Document</filetypetooltip>\n"
             "</input>\n"
         "</inkscape-extension>", new PdfInputCairo());