diff options
| author | Bryce Harrington <bryce@bryceharrington.org> | 2008-01-05 09:30:33 +0000 |
|---|---|---|
| committer | bryce <bryce@users.sourceforge.net> | 2008-01-05 09:30:33 +0000 |
| commit | 55ef0672f77336732c2261bb24da7d94a86aefe2 (patch) | |
| tree | bd2712e08299082ffc96c88c921d136c7ed721ec /src | |
| parent | glib/gtestutils.h is not available on gutsy, so switching to include of (diff) | |
| download | inkscape-55ef0672f77336732c2261bb24da7d94a86aefe2.tar.gz inkscape-55ef0672f77336732c2261bb24da7d94a86aefe2.zip | |
Fixing up a few more files
(bzr r4391)
Diffstat (limited to 'src')
| -rw-r--r-- | src/debug/simple-event.h | 2 | ||||
| -rw-r--r-- | src/display/bezier-utils.cpp | 2 | ||||
| -rw-r--r-- | src/extension/init.cpp | 5 | ||||
| -rw-r--r-- | src/extension/input.cpp | 6 | ||||
| -rw-r--r-- | src/extension/internal/pdf-input-cairo.cpp | 2 | ||||
| -rw-r--r-- | src/libnr/nr-matrix.h | 2 |
6 files changed, 15 insertions, 4 deletions
diff --git a/src/debug/simple-event.h b/src/debug/simple-event.h index 3126f10f1..74301a609 100644 --- a/src/debug/simple-event.h +++ b/src/debug/simple-event.h @@ -14,7 +14,7 @@ #include <stdarg.h> #include <vector> -#include <glib/gtestutils.h> +#include <glib.h> // g_assert() #include <glib/gstrfuncs.h> #include <glib/gmessages.h> diff --git a/src/display/bezier-utils.cpp b/src/display/bezier-utils.cpp index 95b1a5eb1..3a9aa415f 100644 --- a/src/display/bezier-utils.cpp +++ b/src/display/bezier-utils.cpp @@ -33,7 +33,7 @@ # include <ieeefp.h> #endif -#include <glib/gtestutils.h> +#include <glib.h> // g_assert() #include <glib/gmessages.h> #include <glib/gmem.h> #include "bezier-utils.h" diff --git a/src/extension/init.cpp b/src/extension/init.cpp index 852b7ce70..3fe3115c0 100644 --- a/src/extension/init.cpp +++ b/src/extension/init.cpp @@ -151,6 +151,8 @@ update_pref(gchar const *pref_path, gchar const *pref_attr, void init() { + printf("Initting inputs\n"); + /* TODO: Change to Internal */ Internal::Svg::init(); Internal::Svgz::init(); @@ -167,10 +169,13 @@ init() Internal::CairoPsOutput::init(); #endif #ifdef HAVE_POPPLER + printf("Initting PdfInput for poppler"); Internal::PdfInput::init(); #endif #ifdef HAVE_POPPLER_GLIB + printf("We have POPPLER GLIB\n"); if (1) { + printf("Initting PdfInputCairo\n"); Internal::PdfInputCairo::init(); } #endif diff --git a/src/extension/input.cpp b/src/extension/input.cpp index e17c690aa..5c8f8d57f 100644 --- a/src/extension/input.cpp +++ b/src/extension/input.cpp @@ -44,7 +44,9 @@ Input::Input (Inkscape::XML::Node * in_repr, Implementation::Implementation * in extension = NULL; filetypename = NULL; filetypetooltip = NULL; - output_extension = NULL; + output_extension = NULL; + + printf("Input::Input\n"); if (repr != NULL) { Inkscape::XML::Node * child_repr; @@ -145,6 +147,8 @@ Input::check (void) SPDocument * Input::open (const gchar *uri) { + printf("Input::open\n"); + if (!loaded()) { set_state(Extension::STATE_LOADED); } diff --git a/src/extension/internal/pdf-input-cairo.cpp b/src/extension/internal/pdf-input-cairo.cpp index 90ac9294b..8069f9cf3 100644 --- a/src/extension/internal/pdf-input-cairo.cpp +++ b/src/extension/internal/pdf-input-cairo.cpp @@ -35,6 +35,8 @@ static cairo_status_t _write_ustring_cb(void *closure, const unsigned char *data SPDocument * PdfInputCairo::open(Inkscape::Extension::Input * mod, const gchar * uri) { + printf("Attempting to open using PdfInputCairo\n"); + gchar* filename_uri = g_filename_to_uri(uri, NULL, NULL); PopplerDocument* document = poppler_document_new_from_file(filename_uri, NULL, NULL); diff --git a/src/libnr/nr-matrix.h b/src/libnr/nr-matrix.h index 0205ab04f..f4164d3e7 100644 --- a/src/libnr/nr-matrix.h +++ b/src/libnr/nr-matrix.h @@ -17,7 +17,7 @@ * This code is in public domain. */ -#include <glib/gtestutils.h> +#include <glib.h> // g_assert() #include <glib/gmessages.h> #include "libnr/nr-coord.h" |