X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=backend%2Fps%2Fev-spectre.c;h=1342c3e9e920155aba4565533364a1bef19e7f8b;hb=3d3c4a5a08f1b8b536542735110c1376fb3e30bf;hp=a16c0a063c4daebf9d58ffafc3ed63c68c6c5a86;hpb=945efc9392d4c4b5d6a211ed4ccac376bf8c3066;p=evince.git diff --git a/backend/ps/ev-spectre.c b/backend/ps/ev-spectre.c index a16c0a06..1342c3e9 100644 --- a/backend/ps/ev-spectre.c +++ b/backend/ps/ev-spectre.c @@ -17,7 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. */ -#include +#include + +#include +#include #include #include @@ -42,14 +45,12 @@ static void ps_document_document_iface_init (EvDocumentIface 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, +EV_BACKEND_REGISTER_WITH_CODE (PSDocument, ps_document, { - 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); + EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_THUMBNAILS, + ps_document_document_thumbnails_iface_init); + EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_FILE_EXPORTER, + ps_document_file_exporter_iface_init); }); /* PSDocument */ @@ -163,6 +164,22 @@ ps_document_get_n_pages (EvDocument *document) return spectre_document_get_n_pages (ps->doc); } +static EvPage * +ps_document_get_page (EvDocument *document, + gint index) +{ + PSDocument *ps = PS_DOCUMENT (document); + SpectrePage *ps_page; + EvPage *page; + + ps_page = spectre_document_get_page (ps->doc, index); + page = ev_page_new (index); + page->backend_page = (EvBackendPage)ps_page; + page->backend_destroy_func = (EvBackendPageDestroyFunc)spectre_page_free; + + return page; +} + static gint get_page_rotation (SpectrePage *page) { @@ -183,17 +200,17 @@ get_page_rotation (SpectrePage *page) static void ps_document_get_page_size (EvDocument *document, - int page, + EvPage *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); + ps_page = (SpectrePage *)page->backend_page; + spectre_page_get_size (ps_page, &pwidth, &pheight); rotate = get_page_rotation (ps_page); @@ -205,8 +222,6 @@ ps_document_get_page_size (EvDocument *document, page_height = pheight; } - spectre_page_free (ps_page); - if (width) { *width = page_width; } @@ -218,17 +233,9 @@ ps_document_get_page_size (EvDocument *document, static char * ps_document_get_page_label (EvDocument *document, - int page) + EvPage *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; + return g_strdup (spectre_page_get_label ((SpectrePage *)page->backend_page)); } static EvDocumentInfo * @@ -267,7 +274,6 @@ static cairo_surface_t * ps_document_render (EvDocument *document, EvRenderContext *rc) { - PSDocument *ps = PS_DOCUMENT (document); SpectrePage *ps_page; SpectreRenderContext *src; gint width_points; @@ -280,7 +286,8 @@ ps_document_render (EvDocument *document, cairo_surface_t *surface; static const cairo_user_data_key_t key; - ps_page = spectre_document_get_page (ps->doc, rc->page); + ps_page = (SpectrePage *)rc->page->backend_page; + spectre_page_get_size (ps_page, &width_points, &height_points); width = (gint) ((width_points * rc->scale) + 0.5); @@ -288,26 +295,24 @@ ps_document_render (EvDocument *document, 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_scale (src, + (gdouble)width / width_points, + (gdouble)height / height_points); 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_warning ("%s", 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; @@ -331,6 +336,7 @@ 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 = ps_document_get_page; 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; @@ -348,6 +354,11 @@ ps_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document_thumbnails, GdkPixbuf *pixbuf = NULL; surface = ps_document_render (EV_DOCUMENT (ps), rc); + if (!surface) { + g_warning ("Error rendering thumbnail"); + return NULL; + } + pixbuf = ev_document_misc_pixbuf_from_surface (surface); cairo_surface_destroy (surface); @@ -425,7 +436,7 @@ ps_document_file_exporter_do_page (EvFileExporter *exporter, { PSDocument *ps = PS_DOCUMENT (exporter); - spectre_exporter_do_page (ps->exporter, rc->page); + spectre_exporter_do_page (ps->exporter, rc->page->index); } static void