X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fextension%2Finternal%2Fcairo-png-out.cpp;h=eb26fc58148bb61320121c8a7fe7ab8a2255526e;hb=9dc68827cbd515262ecb8d5ae8547d9e82c72e00;hp=f34a90b226960874617b12544e060ef21f47c644;hpb=93c007ed89077e6a338adc0f2968057fb764f91b;p=inkscape.git

diff --git a/src/extension/internal/cairo-png-out.cpp b/src/extension/internal/cairo-png-out.cpp
index f34a90b22..eb26fc581 100644
--- a/src/extension/internal/cairo-png-out.cpp
+++ b/src/extension/internal/cairo-png-out.cpp
@@ -1,133 +1,132 @@
-/*
- * A quick hack to use the Cairo renderer to write out a file.  This
- * then makes 'save as...' PNG.
- *
- * Authors:
- *   Ted Gould <ted@gould.cx>
- *   Ulf Erikson <ulferikson@users.sf.net>
- *
- * Copyright (C) 2004-2006 Authors
- *
- * Released under GNU GPL, read the file 'COPYING' for more information
- */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifdef HAVE_CAIRO_PDF
-
-#include "cairo-png-out.h"
-#include "cairo-render-context.h"
-#include "cairo-renderer.h"
-#include <print.h>
-#include "extension/system.h"
-#include "extension/print.h"
-#include "extension/db.h"
-#include "extension/output.h"
-#include "display/nr-arena.h"
-#include "display/nr-arena-item.h"
-
-#include <libnr/n-art-bpath.h>
-
-#include "display/curve.h"
-#include "display/canvas-bpath.h"
-#include "sp-item.h"
-#include "style.h"
-#include "sp-root.h"
-#include "sp-shape.h"
-
-#include "io/sys.h"
-
-namespace Inkscape {
-namespace Extension {
-namespace Internal {
-
-bool
-CairoRendererOutput::check (Inkscape::Extension::Extension * module)
-{
-	return TRUE;
-}
-
-static bool
-png_render_document_to_file(SPDocument *doc, gchar const *filename)
-{
-    CairoRenderer *renderer;
-    CairoRenderContext *ctx;
-
-    sp_document_ensure_up_to_date(doc);
-
-/* Start */
-    /* Create new arena */
-    SPItem *base = SP_ITEM(sp_document_root(doc));
-    NRArena *arena = NRArena::create();
-    unsigned dkey = sp_item_display_key_new(1);
-    NRArenaItem *root = sp_item_invoke_show(base, arena, dkey, SP_ITEM_SHOW_DISPLAY);
-    
-    /* Create renderer and context */
-    renderer = new CairoRenderer();
-    ctx = renderer->createContext();
-
-    /* Render document */
-    bool ret = renderer->setupDocument(ctx, doc);
-    if (ret) {
-        renderer->renderItem(ctx, base);
-        ctx->saveAsPng(filename);
-        ret = ctx->finish();
-    }
-    renderer->destroyContext(ctx);
-
-    /* Release arena */
-    sp_item_invoke_hide(base, dkey);
-    nr_arena_item_unref(root);
-    nr_object_unref((NRObject *) arena);
-/* end */
-    delete renderer;
-
-    return ret;
-}
-
-
-/**
-    \brief  This function calls the output module with the filename
-	\param  mod   unused
-	\param  doc   Document to be saved
-    \param  uri   Filename to save to (probably will end in .png)
-*/
-void
-CairoRendererOutput::save (Inkscape::Extension::Output *mod, SPDocument *doc, const gchar *uri)
-{
-    if (!png_render_document_to_file(doc, uri))
-        throw Inkscape::Extension::Output::save_failed();
-
-	return;
-}
-
-/**
-	\brief   A function allocate a copy of this function.
-
-	This is the definition of Cairo PNG out.  This function just
-	calls the extension system with the memory allocated XML that
-	describes the data.
-*/
-void
-CairoRendererOutput::init (void)
-{
-	Inkscape::Extension::build_from_mem(
-		"<inkscape-extension>\n"
-			"<name>Cairo PNG Output</name>\n"
-			"<id>org.inkscape.output.png.cairo</id>\n"
-			"<output>\n"
-				"<extension>.png</extension>\n"
-                "<mimetype>image/png</mimetype>\n"
-				"<filetypename>Cairo PNG (*.png)</filetypename>\n"
-				"<filetypetooltip>PNG File</filetypetooltip>\n"
-			"</output>\n"
-		"</inkscape-extension>", new CairoRendererOutput());
-
-	return;
-}
-
-} } }  /* namespace Inkscape, Extension, Implementation */
-
-#endif /* HAVE_CAIRO_PDF */
+/*
+ * A quick hack to use the Cairo renderer to write out a file.  This
+ * then makes 'save as...' PNG.
+ *
+ * Authors:
+ *   Ted Gould <ted@gould.cx>
+ *   Ulf Erikson <ulferikson@users.sf.net>
+ *   Jon A. Cruz <jon@joncruz.org>
+ *   Abhishek Sharma
+ *
+ * Copyright (C) 2004-2006 Authors
+ *
+ * Released under GNU GPL, read the file 'COPYING' for more information
+ */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#ifdef HAVE_CAIRO_PDF
+
+#include "cairo-png-out.h"
+#include "cairo-render-context.h"
+#include "cairo-renderer.h"
+#include <print.h>
+#include "extension/system.h"
+#include "extension/print.h"
+#include "extension/db.h"
+#include "extension/output.h"
+#include "display/nr-arena.h"
+#include "display/nr-arena-item.h"
+
+#include "display/curve.h"
+#include "display/canvas-bpath.h"
+#include "sp-item.h"
+#include "style.h"
+#include "sp-root.h"
+#include "sp-shape.h"
+
+#include "io/sys.h"
+
+namespace Inkscape {
+namespace Extension {
+namespace Internal {
+
+bool
+CairoRendererOutput::check (Inkscape::Extension::Extension * module)
+{
+	return TRUE;
+}
+
+static bool
+png_render_document_to_file(SPDocument *doc, gchar const *filename)
+{
+    CairoRenderer *renderer;
+    CairoRenderContext *ctx;
+
+    doc->ensureUpToDate();
+
+/* Start */
+    /* Create new arena */
+    SPItem *base = SP_ITEM(doc->getRoot());
+    NRArena *arena = NRArena::create();
+    unsigned dkey = SPItem::display_key_new(1);
+    NRArenaItem *root = base->invoke_show(arena, dkey, SP_ITEM_SHOW_DISPLAY);
+    
+    /* Create renderer and context */
+    renderer = new CairoRenderer();
+    ctx = renderer->createContext();
+
+    /* Render document */
+    bool ret = renderer->setupDocument(ctx, doc, TRUE, NULL);
+    if (ret) {
+        renderer->renderItem(ctx, base);
+        ctx->saveAsPng(filename);
+        ret = ctx->finish();
+    }
+    renderer->destroyContext(ctx);
+
+    /* Release arena */
+    base->invoke_hide(dkey);
+    nr_object_unref((NRObject *) arena);
+/* end */
+    delete renderer;
+
+    return ret;
+}
+
+
+/**
+    \brief  This function calls the output module with the filename
+	\param  mod   unused
+	\param  doc   Document to be saved
+    \param  uri   Filename to save to (probably will end in .png)
+*/
+void
+CairoRendererOutput::save(Inkscape::Extension::Output *mod, SPDocument *doc, gchar const *filename)
+{
+    if (!png_render_document_to_file(doc, filename))
+        throw Inkscape::Extension::Output::save_failed();
+
+	return;
+}
+
+/**
+	\brief   A function allocate a copy of this function.
+
+	This is the definition of Cairo PNG out.  This function just
+	calls the extension system with the memory allocated XML that
+	describes the data.
+*/
+void
+CairoRendererOutput::init (void)
+{
+	Inkscape::Extension::build_from_mem(
+		"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
+			"<name>Cairo PNG Output</name>\n"
+			"<id>org.inkscape.output.png.cairo</id>\n"
+			"<output>\n"
+				"<extension>.png</extension>\n"
+                "<mimetype>image/png</mimetype>\n"
+				"<filetypename>Cairo PNG (*.png)</filetypename>\n"
+				"<filetypetooltip>PNG File</filetypetooltip>\n"
+			"</output>\n"
+		"</inkscape-extension>", new CairoRendererOutput());
+
+	return;
+}
+
+} } }  /* namespace Inkscape, Extension, Implementation */
+
+#endif /* HAVE_CAIRO_PDF */