From 945efc9392d4c4b5d6a211ed4ccac376bf8c3066 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Campos Date: Thu, 20 Dec 2007 10:12:49 +0000 Subject: [PATCH] Use libspectre, if available, for the ps backend. Fixes bugs #317106, 2007-12-20 Carlos Garcia Campos * configure.ac: * backend/ps/Makefile.am: * backend/ps/ev-spectre.[ch]: Use libspectre, if available, for the ps backend. Fixes bugs #317106, #499787, #501235, #421879, #445797, #443859 and #486547. svn path=/trunk/; revision=2774 --- ChangeLog | 10 +- backend/ps/Makefile.am | 11 +- backend/ps/ev-spectre.c | 457 ++++++++++++++++++++++++++++++++++++++++ backend/ps/ev-spectre.h | 46 ++++ configure.ac | 60 +++--- 5 files changed, 558 insertions(+), 26 deletions(-) create mode 100644 backend/ps/ev-spectre.c create mode 100644 backend/ps/ev-spectre.h diff --git a/ChangeLog b/ChangeLog index 4e5a748e..6fe31d2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ -2007-12-18 Yaakov Selkowitz +2007-12-20 Carlos Garcia Campos + + * configure.ac: + * backend/ps/Makefile.am: + * backend/ps/ev-spectre.[ch]: + Use libspectre, if available, for the ps backend. Fixes bugs + #317106, #499787, #501235, #421879, #445797, #443859 and #486547. +2007-12-18 Yaakov Selkowitz + * backend/comics/comics-document.c: (comics_document_load): Cygwin build issue fix. diff --git a/backend/ps/Makefile.am b/backend/ps/Makefile.am index e443b4a9..921e3977 100644 --- a/backend/ps/Makefile.am +++ b/backend/ps/Makefile.am @@ -5,8 +5,17 @@ INCLUDES = \ $(WARN_CFLAGS) \ $(DISABLE_DEPRECATED) +if HAVE_SPECTRE +INCLUDES += $(SPECTRE_CFLAGS) +endif + noinst_LTLIBRARIES = libpsdocument.la +if HAVE_SPECTRE +libpsdocument_la_SOURCES = \ + ev-spectre.c \ + ev-spectre.h +else libpsdocument_la_SOURCES = \ gsio.c \ gsio.h \ @@ -19,4 +28,4 @@ libpsdocument_la_SOURCES = \ ps-interpreter.h \ gsdefaults.c \ gsdefaults.h - +endif diff --git a/backend/ps/ev-spectre.c b/backend/ps/ev-spectre.c new file mode 100644 index 00000000..a16c0a06 --- /dev/null +++ b/backend/ps/ev-spectre.c @@ -0,0 +1,457 @@ +/* this file is part of evince, a gnome document viewer + * + * Copyright (C) 2007 Carlos Garcia Campos + * + * Evince is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * Evince is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. + */ + +#include +#include +#include + +#include "ev-spectre.h" + +#include "ev-file-exporter.h" +#include "ev-document-thumbnails.h" +#include "ev-document-misc.h" + +struct _PSDocument { + GObject object; + + SpectreDocument *doc; + SpectreExporter *exporter; +}; + +struct _PSDocumentClass { + GObjectClass parent_class; +}; + +static void ps_document_document_iface_init (EvDocumentIface *iface); +static void ps_document_file_exporter_iface_init (EvFileExporterIface *iface); +static void ps_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface); + +G_DEFINE_TYPE_WITH_CODE (PSDocument, ps_document, G_TYPE_OBJECT, + { + G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT, + ps_document_document_iface_init); + G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_THUMBNAILS, + ps_document_document_thumbnails_iface_init); + G_IMPLEMENT_INTERFACE (EV_TYPE_FILE_EXPORTER, + ps_document_file_exporter_iface_init); + }); + +/* PSDocument */ +static void +ps_document_init (PSDocument *ps_document) +{ +} + +static void +ps_document_dispose (GObject *object) +{ + PSDocument *ps = PS_DOCUMENT (object); + + if (ps->doc) { + spectre_document_free (ps->doc); + ps->doc = NULL; + } + + if (ps->exporter) { + spectre_exporter_free (ps->exporter); + ps->exporter = NULL; + } + + G_OBJECT_CLASS (ps_document_parent_class)->dispose (object); +} + +static void +ps_document_class_init (PSDocumentClass *klass) +{ + GObjectClass *object_class; + + object_class = G_OBJECT_CLASS (klass); + + object_class->dispose = ps_document_dispose; +} + +/* EvDocumentIface */ +static gboolean +ps_document_load (EvDocument *document, + const char *uri, + GError **error) +{ + PSDocument *ps = PS_DOCUMENT (document); + gchar *filename; + + filename = g_filename_from_uri (uri, NULL, error); + if (!filename) + return FALSE; + + ps->doc = spectre_document_new (); + + spectre_document_load (ps->doc, filename); + if (spectre_document_status (ps->doc)) { + gchar *filename_dsp; + + filename_dsp = g_filename_display_name (filename); + g_set_error (error, + G_FILE_ERROR, + G_FILE_ERROR_FAILED, + _("Failed to load document “%s”"), + filename_dsp); + g_free (filename_dsp); + g_free (filename); + + return FALSE; + } + + g_free (filename); + + return TRUE; +} + +static gboolean +ps_document_save (EvDocument *document, + const char *uri, + GError **error) +{ + PSDocument *ps = PS_DOCUMENT (document); + gchar *filename; + + filename = g_filename_from_uri (uri, NULL, error); + if (!filename) + return FALSE; + + spectre_document_save (ps->doc, filename); + if (spectre_document_status (ps->doc)) { + gchar *filename_dsp; + + filename_dsp = g_filename_display_name (filename); + g_set_error (error, + G_FILE_ERROR, + G_FILE_ERROR_FAILED, + _("Failed to save document “%s”"), + filename_dsp); + g_free (filename_dsp); + g_free (filename); + + return FALSE; + } + + g_free (filename); + + return TRUE; +} + +static int +ps_document_get_n_pages (EvDocument *document) +{ + PSDocument *ps = PS_DOCUMENT (document); + + return spectre_document_get_n_pages (ps->doc); +} + +static gint +get_page_rotation (SpectrePage *page) +{ + switch (spectre_page_get_orientation (page)) { + default: + case SPECTRE_ORIENTATION_PORTRAIT: + return 0; + case SPECTRE_ORIENTATION_LANDSCAPE: + return 90; + case SPECTRE_ORIENTATION_REVERSE_PORTRAIT: + return 180; + case SPECTRE_ORIENTATION_REVERSE_LANDSCAPE: + return 270; + } + + return 0; +} + +static void +ps_document_get_page_size (EvDocument *document, + int page, + double *width, + double *height) +{ + PSDocument *ps = PS_DOCUMENT (document); + SpectrePage *ps_page; + gdouble page_width, page_height; + gint pwidth, pheight; + gint rotate; + + ps_page = spectre_document_get_page (ps->doc, page); + spectre_page_get_size (ps_page, &pwidth, &pheight); + + rotate = get_page_rotation (ps_page); + if (rotate == 90 || rotate == 270) { + page_height = pwidth; + page_width = pheight; + } else { + page_width = pwidth; + page_height = pheight; + } + + spectre_page_free (ps_page); + + if (width) { + *width = page_width; + } + + if (height) { + *height = page_height; + } +} + +static char * +ps_document_get_page_label (EvDocument *document, + int page) +{ + PSDocument *ps = PS_DOCUMENT (document); + SpectrePage *ps_page; + gchar *label; + + ps_page = spectre_document_get_page (ps->doc, page); + label = g_strdup (spectre_page_get_label (ps_page)); + spectre_page_free (ps_page); + + return label; +} + +static EvDocumentInfo * +ps_document_get_info (EvDocument *document) +{ + PSDocument *ps = PS_DOCUMENT (document); + EvDocumentInfo *info; + const gchar *creator; + SpectrePage *ps_page; + gint width, height; + + info = g_new0 (EvDocumentInfo, 1); + info->fields_mask = EV_DOCUMENT_INFO_TITLE | + EV_DOCUMENT_INFO_FORMAT | + EV_DOCUMENT_INFO_CREATOR | + EV_DOCUMENT_INFO_N_PAGES | + EV_DOCUMENT_INFO_PAPER_SIZE; + + creator = spectre_document_get_creator (ps->doc); + + ps_page = spectre_document_get_page (ps->doc, 0); + spectre_page_get_size (ps_page, &width, &height); + spectre_page_free (ps_page); + + info->title = g_strdup (spectre_document_get_title (ps->doc)); + info->format = g_strdup (spectre_document_get_format (ps->doc)); + info->creator = g_strdup (creator ? creator : spectre_document_get_for (ps->doc)); + info->n_pages = spectre_document_get_n_pages (ps->doc); + info->paper_width = width / 72.0f * 25.4f; + info->paper_height = height / 72.0f * 25.4f; + + return info; +} + +static cairo_surface_t * +ps_document_render (EvDocument *document, + EvRenderContext *rc) +{ + PSDocument *ps = PS_DOCUMENT (document); + SpectrePage *ps_page; + SpectreRenderContext *src; + gint width_points; + gint height_points; + gint width, height; + gint swidth, sheight; + guchar *data = NULL; + gint stride; + gint rotation; + cairo_surface_t *surface; + static const cairo_user_data_key_t key; + + ps_page = spectre_document_get_page (ps->doc, rc->page); + spectre_page_get_size (ps_page, &width_points, &height_points); + + width = (gint) ((width_points * rc->scale) + 0.5); + height = (gint) ((height_points * rc->scale) + 0.5); + rotation = (rc->rotation + get_page_rotation (ps_page)) % 360; + + src = spectre_render_context_new (); + spectre_render_context_set_page_size (src, width, height); + spectre_render_context_set_rotation (src, rotation); + spectre_page_render (ps_page, src, &data, &stride); + spectre_render_context_free (src); + + if (!data) { + spectre_page_free (ps_page); + return NULL; + } + + if (spectre_page_status (ps_page)) { + g_warning (spectre_status_to_string (spectre_page_status (ps_page))); + g_free (data); + spectre_page_free (ps_page); + + return NULL; + } + + spectre_page_free (ps_page); + + if (rotation == 90 || rotation == 270) { + swidth = height; + sheight = width; + } else { + swidth = width; + sheight = height; + } + + surface = cairo_image_surface_create_for_data (data, + CAIRO_FORMAT_RGB24, + swidth, sheight, + stride); + cairo_surface_set_user_data (surface, &key, + data, (cairo_destroy_func_t)g_free); + return surface; +} + +static void +ps_document_document_iface_init (EvDocumentIface *iface) +{ + iface->load = ps_document_load; + iface->save = ps_document_save; + iface->get_n_pages = ps_document_get_n_pages; + iface->get_page_size = ps_document_get_page_size; + iface->get_page_label = ps_document_get_page_label; + iface->get_info = ps_document_get_info; + iface->render = ps_document_render; +} + +/* EvDocumentThumbnailsIface */ +static GdkPixbuf * +ps_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document_thumbnails, + EvRenderContext *rc, + gboolean border) +{ + PSDocument *ps = PS_DOCUMENT (document_thumbnails); + cairo_surface_t *surface; + GdkPixbuf *pixbuf = NULL; + + surface = ps_document_render (EV_DOCUMENT (ps), rc); + pixbuf = ev_document_misc_pixbuf_from_surface (surface); + cairo_surface_destroy (surface); + + if (border) { + GdkPixbuf *border_pixbuf; + + border_pixbuf = ev_document_misc_get_thumbnail_frame (-1, -1, pixbuf); + g_object_unref (pixbuf); + pixbuf = border_pixbuf; + } + + return pixbuf; +} + +static void +ps_document_thumbnails_get_dimensions (EvDocumentThumbnails *document_thumbnails, + EvRenderContext *rc, + gint *width, + gint *height) +{ + PSDocument *ps = PS_DOCUMENT (document_thumbnails); + gdouble page_width, page_height; + + ps_document_get_page_size (EV_DOCUMENT (ps), + rc->page, + &page_width, &page_height); + + if (rc->rotation == 90 || rc->rotation == 270) { + *width = (gint) (page_height * rc->scale); + *height = (gint) (page_width * rc->scale); + } else { + *width = (gint) (page_width * rc->scale); + *height = (gint) (page_height * rc->scale); + } +} + +static void +ps_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface) +{ + iface->get_thumbnail = ps_document_thumbnails_get_thumbnail; + iface->get_dimensions = ps_document_thumbnails_get_dimensions; +} + +/* EvFileExporterIface */ +static void +ps_document_file_exporter_begin (EvFileExporter *exporter, + EvFileExporterContext *fc) +{ + PSDocument *ps = PS_DOCUMENT (exporter); + + if (ps->exporter) + spectre_exporter_free (ps->exporter); + + switch (fc->format) { + case EV_FILE_FORMAT_PS: + ps->exporter = + spectre_exporter_new (ps->doc, + SPECTRE_EXPORTER_FORMAT_PS); + break; + case EV_FILE_FORMAT_PDF: + ps->exporter = + spectre_exporter_new (ps->doc, + SPECTRE_EXPORTER_FORMAT_PDF); + break; + default: + g_assert_not_reached (); + } + + spectre_exporter_begin (ps->exporter, fc->filename); +} + +static void +ps_document_file_exporter_do_page (EvFileExporter *exporter, + EvRenderContext *rc) +{ + PSDocument *ps = PS_DOCUMENT (exporter); + + spectre_exporter_do_page (ps->exporter, rc->page); +} + +static void +ps_document_file_exporter_end (EvFileExporter *exporter) +{ + PSDocument *ps = PS_DOCUMENT (exporter); + + spectre_exporter_end (ps->exporter); +} + +static EvFileExporterCapabilities +ps_document_file_exporter_get_capabilities (EvFileExporter *exporter) +{ + return EV_FILE_EXPORTER_CAN_PAGE_SET | + EV_FILE_EXPORTER_CAN_COPIES | + EV_FILE_EXPORTER_CAN_COLLATE | + EV_FILE_EXPORTER_CAN_REVERSE | + EV_FILE_EXPORTER_CAN_GENERATE_PS | + EV_FILE_EXPORTER_CAN_GENERATE_PDF; +} + +static void +ps_document_file_exporter_iface_init (EvFileExporterIface *iface) +{ + iface->begin = ps_document_file_exporter_begin; + iface->do_page = ps_document_file_exporter_do_page; + iface->end = ps_document_file_exporter_end; + iface->get_capabilities = ps_document_file_exporter_get_capabilities; +} diff --git a/backend/ps/ev-spectre.h b/backend/ps/ev-spectre.h new file mode 100644 index 00000000..fb00f9fb --- /dev/null +++ b/backend/ps/ev-spectre.h @@ -0,0 +1,46 @@ +/* + * Ghostscript widget for GTK/GNOME + * + * Copyright 1998 - 2005 The Free Software Foundation + * + * Authors: Jaka Mocnik, Federico Mena (Quartic), Szekeres Istvan (Pista) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef __PS_DOCUMENT_H__ +#define __PS_DOCUMENT_H__ + +#include + +#include "ev-document.h" + +G_BEGIN_DECLS + +#define PS_TYPE_DOCUMENT (ps_document_get_type()) +#define PS_DOCUMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PS_TYPE_DOCUMENT, PSDocument)) +#define PS_DOCUMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PS_TYPE_DOCUMENT, PSDocumentClass)) +#define PS_IS_DOCUMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PS_TYPE_DOCUMENT)) +#define PS_DOCUMENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), PS_TYPE_DOCUMENT, PSDocumentClass)) + +typedef struct _PSDocument PSDocument; +typedef struct _PSDocumentClass PSDocumentClass; + +GType ps_document_get_type (void) G_GNUC_CONST; + +G_END_DECLS + +#endif /* __PS_DOCUMENT_H__ */ diff --git a/configure.ac b/configure.ac index 003b2e8e..bf9d378f 100644 --- a/configure.ac +++ b/configure.ac @@ -258,35 +258,47 @@ fi AM_CONDITIONAL(ENABLE_PDF, test x$enable_pdf = xyes) dnl ================== end of pdf checks ============================================ -dnl ================== ggv checks =================================================== +dnl libspectre (used by ps and dvi backends) +PKG_CHECK_MODULES(SPECTRE, libspectre,have_spectre=yes,have_spectre=no) +AM_CONDITIONAL(HAVE_SPECTRE, test x$have_spectre = xyes) +if test "x$have_spectre" = "xyes"; then + AC_DEFINE([HAVE_SPECTRE], [1], [Have libpectre]) +fi + +dnl ================== ps checks ==================================================== AC_ARG_ENABLE(ps, [AC_HELP_STRING([--disable-ps], [Compile without PostScript backend])],enable_ps=$enableval,enable_ps="yes") +ps_backend="" if test x$enable_ps = xyes; then - AC_DEFINE([ENABLE_PS], [1], [Enable support for PostScript files.]) -fi - -AM_CONDITIONAL(ENABLE_PS, test x$enable_ps = xyes) - -if test x$enable_ps = xyes; then - -dnl check for GS version -AC_MSG_CHECKING(for Ghostscript version...) -GS_VERSION=`gs --version | head -n 1 | sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` -AC_MSG_RESULT(found $GS_VERSION) -if test "$GS_VERSION" -lt "7"; then - AC_MSG_ERROR([You need Ghostscript version >= 7 in order to run evince]) -fi - -AC_ARG_WITH(gs-aa-params, - [AC_HELP_STRING([--with-gs-aa-params], [Define antialiasing params for ghostscript])],AA_PARAMS=$withval, - AA_PARMS="-sDEVICE=x11alpha -dNOPLATFONTS -dGraphicsAlphaBits=4 -dTextAlphaBits=4 -dDOINTERPOLATE" - ) -AC_DEFINE_UNQUOTED(ALPHA_PARAMS, "$AA_PARMS", [Anti-aliasing parameters for Ghostscript.]) -AC_MSG_RESULT(Antialiasing parameters for Ghostscript: $AA_PARMS) + AC_DEFINE([ENABLE_PS], [1], [Enable support for PostScript files.]) + if test "x$have_spectre" = "xyes"; then + FRONTEND_LIBS="$FRONTEND_LIBS $SPECTRE_LIBS" + SHELL_LIBS="$SHELL_LIBS $SPECTRE_LIBS" + SHELL_CFLAGS="$SHELL_CFLAGS $SPECTRE_CFLAGS" + ps_backend="(libspectre)" + else + dnl check for GS version + AC_MSG_CHECKING(for Ghostscript version...) + GS_VERSION=`gs --version | head -n 1 | sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` + AC_MSG_RESULT(found $GS_VERSION) + if test "$GS_VERSION" -lt "7"; then + AC_MSG_WARN([PS support is disabled since libspectre or Ghostscript (version >= 7) are needed]) + enable_ps=no + else + AC_ARG_WITH(gs-aa-params, + [AC_HELP_STRING([--with-gs-aa-params], [Define antialiasing params for ghostscript])],AA_PARAMS=$withval, + AA_PARMS="-sDEVICE=x11alpha -dNOPLATFONTS -dGraphicsAlphaBits=4 -dTextAlphaBits=4 -dDOINTERPOLATE" + ) + AC_DEFINE_UNQUOTED(ALPHA_PARAMS, "$AA_PARMS", [Anti-aliasing parameters for Ghostscript.]) + AC_MSG_RESULT(Antialiasing parameters for Ghostscript: $AA_PARMS) + ps_backend="(gs)" + fi + fi fi -dnl ======================== End of ggv checks ================================= +AM_CONDITIONAL(ENABLE_PS, test x$enable_ps = xyes) +dnl ======================== End of ps checks =================================== dnl ================== tiff checks =================================================== AC_ARG_ENABLE(tiff, @@ -495,7 +507,7 @@ Configure summary: Gtk-Doc Support....: $enable_gtk_doc PDF Backend........: $enable_pdf - PostScript Backend.: $enable_ps + PostScript Backend.: $enable_ps $ps_backend TIFF Backend.......: $enable_tiff DJVU Backend.......: $enable_djvu DVI Backend........: $enable_dvi -- 2.43.5