[cairo-commit] test/.gitignore test/Makefile.am test/pdf2svg.c test/svg2pdf.c

Carl Worth cworth at kemper.freedesktop.org
Mon Aug 27 10:46:07 PDT 2007


 test/.gitignore  |    1 
 test/Makefile.am |   12 ------
 test/pdf2svg.c   |  101 -------------------------------------------------------
 test/svg2pdf.c   |   85 ----------------------------------------------
 4 files changed, 199 deletions(-)

New commits:
diff-tree 463493af73a644c7031df0e396c722cf2cb227b1 (from 495c9d19bf27150783b563ed8a7a9b2e6e8c2115)
Author: Carl Worth <cworth at cworth.org>
Date:   Mon Aug 27 10:39:14 2007 -0700

    Remove svg2pdf and pdf2svg programs from test directory
    
    These are useful programs, but they don't belong in test/.
    They are never used in the test suite at all. Instead, these
    should exist in some demo package, or as applications in their
    own right.
    
    (The motivation for the removal is that someone just encountered
    a build error with one of these. And I'm not interested in debugging
    build errors for unused components.)

diff --git a/test/.gitignore b/test/.gitignore
index bc4c41b..4758b3d 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -98,7 +98,6 @@ path-data
 pattern-get-type
 pattern-getters
 pdf2png
-pdf2svg
 pdf-features
 pdf-features.pdf
 png-flatten
diff --git a/test/Makefile.am b/test/Makefile.am
index ed10352..a8f2fec 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -512,12 +512,6 @@ check_PROGRAMS += pdf2png
 pdf2png_CFLAGS = $(POPPLER_CFLAGS)
 # add LDADD, so poppler uses "our" cairo
 pdf2png_LDADD  = $(LDADD) $(POPPLER_LIBS)
-if CAIRO_HAS_SVG_SURFACE
-EXTRA_PROGRAMS += pdf2svg$(EXEEXT)
-pdf2svg_CFLAGS = $(POPPLER_CFLAGS)
-# add LDADD, so poppler uses "our" cairo
-pdf2svg_LDADD  = $(LDADD) $(POPPLER_LIBS)
-endif
 endif
 
 if CAIRO_CAN_TEST_SVG_SURFACE
@@ -525,12 +519,6 @@ check_PROGRAMS += svg2png
 svg2png_CFLAGS = $(LIBRSVG_CFLAGS)
 # add LDADD, so librsvg uses "our" cairo
 svg2png_LDADD  = $(LDADD) $(LIBRSVG_LIBS)
-if CAIRO_HAS_PDF_SURFACE
-EXTRA_PROGRAMS += svg2pdf$(EXEEXT)
-svg2pdf_CFLAGS = $(LIBRSVG_CFLAGS)
-# add LDADD, so librsvg uses "our" cairo
-svg2pdf_LDADD  = $(LDADD) $(LIBRSVG_LIBS)
-endif
 endif
 
 EXTRA_PROGRAMS += $(TESTS) $(DISABLED_TESTS)
diff --git a/test/pdf2svg.c b/test/pdf2svg.c
deleted file mode 100644
index 7aa057e..0000000
--- a/test/pdf2svg.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright © 2005 Red Hat, Inc.
- * Copyright © 2006 Red Hat, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without
- * fee, provided that the above copyright notice appear in all copies
- * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of
- * Red Hat, Inc. not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior
- * permission. Red Hat, Inc. makes no representations about the
- * suitability of this software for any purpose.  It is provided "as
- * is" without express or implied warranty.
- *
- * RED HAT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL RED HAT, INC. BE LIABLE FOR ANY SPECIAL,
- * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
- * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Authors: Kristian Høgsberg <krh at redhat.com>
- *	    Carl Worth <cworth at redhat.com>
- */
-
-#include <stdlib.h>
-#include <poppler.h>
-
-#include <cairo-svg.h>
-
-#define FAIL(msg)							\
-    do { fprintf (stderr, "FAIL: %s\n", msg); exit (-1); } while (0)
-
-#define PIXELS_PER_POINT 1
-
-int main (int argc, char *argv[])
-{
-    PopplerDocument *document;
-    PopplerPage *page;
-    double width, height;
-    GError *error;
-    const char *filename = argv[1];
-    const char *output_filename = argv[2];
-    const char *page_label = argv[3];
-    gchar *absolute, *uri;
-    cairo_surface_t *surface;
-    cairo_t *cr;
-    cairo_status_t status;
-
-    if (argc != 4)
-	FAIL ("usage: pdf2svg input_file.pdf output_file.svg page");
-
-    g_type_init ();
-
-    error = NULL;
-
-    if (g_path_is_absolute(filename)) {
-	absolute = g_strdup (filename);
-    } else {
-	gchar *dir = g_get_current_dir ();
-	absolute = g_build_filename (dir, filename, (gchar *) 0);
-	free (dir);
-    }
-
-    uri = g_filename_to_uri (absolute, NULL, &error);
-    free (absolute);
-    if (uri == NULL)
-	FAIL (error->message);
-
-    document = poppler_document_new_from_file (uri, NULL, &error);
-    if (document == NULL)
-	FAIL (error->message);
-
-    page = poppler_document_get_page_by_label (document, page_label);
-    if (page == NULL)
-	FAIL ("page not found");
-
-    poppler_page_get_size (page, &width, &height);
-
-    surface = cairo_svg_surface_create (output_filename, width, height);
-    cr = cairo_create (surface);
-
-    /* Clear background */
-    cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); /* white */
-    cairo_paint (cr);
-
-    poppler_page_render (page, cr);
-
-    cairo_show_page (cr);
-
-    status = cairo_status (cr);
-    if (status)
-	FAIL (cairo_status_to_string (status));
-
-    cairo_destroy (cr);
-    cairo_surface_destroy (surface);
-
-    return 0;
-}
diff --git a/test/svg2pdf.c b/test/svg2pdf.c
deleted file mode 100644
index 1dab19e..0000000
--- a/test/svg2pdf.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright © 2005 Red Hat, Inc.
- * Copyright © 2006 Red Hat, Inc.
- * Copyright © 2007 Red Hat, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without
- * fee, provided that the above copyright notice appear in all copies
- * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of
- * Red Hat, Inc. not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior
- * permission. Red Hat, Inc. makes no representations about the
- * suitability of this software for any purpose.  It is provided "as
- * is" without express or implied warranty.
- *
- * RED HAT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL RED HAT, INC. BE LIABLE FOR ANY SPECIAL,
- * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
- * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Authors: Kristian Høgsberg <krh at redhat.com>
- *	    Carl Worth <cworth at redhat.com>
- *	    Behdad Esfahbod <besfahbo at redhat.com>
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <librsvg/rsvg.h>
-#include <librsvg/rsvg-cairo.h>
-
-#include <cairo-pdf.h>
-
-#define FAIL(msg)							\
-    do { fprintf (stderr, "FAIL: %s\n", msg); exit (-1); } while (0)
-
-#define PIXELS_PER_POINT 1
-
-int main (int argc, char *argv[])
-{
-    GError *error = NULL;
-    RsvgHandle *handle;
-    RsvgDimensionData dim;
-    double width, height;
-    const char *filename = argv[1];
-    const char *output_filename = argv[2];
-    cairo_surface_t *surface;
-    cairo_t *cr;
-    cairo_status_t status;
-
-    if (argc != 3)
-	FAIL ("usage: svg2pdf input_file.svg output_file.pdf");
-
-    g_type_init ();
-
-    rsvg_set_default_dpi (72.0);
-    handle = rsvg_handle_new_from_file (filename, &error);
-    if (error != NULL)
-	FAIL (error->message);
-
-    rsvg_handle_get_dimensions (handle, &dim);
-    width = dim.width;
-    height = dim.height;
-
-    surface = cairo_pdf_surface_create (output_filename, width, height);
-    cr = cairo_create (surface);
-
-    /* Clear background */
-    cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); /* white */
-    cairo_paint (cr);
-
-    rsvg_handle_render_cairo (handle, cr);
-
-    status = cairo_status (cr);
-    if (status)
-	FAIL (cairo_status_to_string (status));
-
-    cairo_destroy (cr);
-    cairo_surface_destroy (surface);
-
-    return 0;
-}


More information about the cairo-commit mailing list