X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=backend%2Ftiff%2Ftiff-document.c;h=7f51aacf7b22821eef9b938358362db519b436c1;hb=4cec7958f9bfd4f2950bdf0b257757348b26dafc;hp=f813c47438066f00c6e4d55bd86a8e8d4cda4e7a;hpb=982600bbceb76a22d5c7b3e0cbe6e20421105ad6;p=evince.git diff --git a/backend/tiff/tiff-document.c b/backend/tiff/tiff-document.c index f813c474..7f51aacf 100644 --- a/backend/tiff/tiff-document.c +++ b/backend/tiff/tiff-document.c @@ -20,8 +20,12 @@ /* FIXME: Should probably buffer calls to libtiff with TIFFSetWarningHandler */ +#include "config.h" + +#include #include #include +#include #include "tiffio.h" #include "tiff2ps.h" @@ -29,6 +33,7 @@ #include "ev-document-misc.h" #include "ev-document-thumbnails.h" #include "ev-file-exporter.h" +#include "ev-file-helpers.h" struct _TiffDocumentClass { @@ -52,13 +57,12 @@ static void tiff_document_document_iface_init (EvDocumentIface *iface); static void tiff_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface); static void tiff_document_document_file_exporter_iface_init (EvFileExporterIface *iface); -G_DEFINE_TYPE_WITH_CODE (TiffDocument, tiff_document, G_TYPE_OBJECT, - { G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT, - tiff_document_document_iface_init); - G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_THUMBNAILS, - tiff_document_document_thumbnails_iface_init); - G_IMPLEMENT_INTERFACE (EV_TYPE_FILE_EXPORTER, - tiff_document_document_file_exporter_iface_init); +EV_BACKEND_REGISTER_WITH_CODE (TiffDocument, tiff_document, + { + EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_THUMBNAILS, + tiff_document_document_thumbnails_iface_init); + EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_FILE_EXPORTER, + tiff_document_document_file_exporter_iface_init); }); static TIFFErrorHandler orig_error_handler = NULL; @@ -172,10 +176,10 @@ tiff_document_get_resolution (TiffDocument *tiff_document, } static void -tiff_document_get_page_size (EvDocument *document, - int page, - double *width, - double *height) +tiff_document_get_page_size (EvDocument *document, + EvPage *page, + double *width, + double *height) { guint32 w, h; gfloat x_res, y_res; @@ -185,7 +189,7 @@ tiff_document_get_page_size (EvDocument *document, g_return_if_fail (tiff_document->tiff != NULL); push_handlers (); - if (TIFFSetDirectory (tiff_document->tiff, page) != 1) { + if (TIFFSetDirectory (tiff_document->tiff, page->index) != 1) { pop_handlers (); return; } @@ -210,9 +214,8 @@ tiff_document_render (EvDocument *document, float x_res, y_res; gint rowstride, bytes; guchar *pixels = NULL; - GdkPixbuf *pixbuf; - GdkPixbuf *scaled_pixbuf; - GdkPixbuf *rotated_pixbuf; + guchar *p; + int orientation; cairo_surface_t *surface; cairo_surface_t *rotated_surface; static const cairo_user_data_key_t key; @@ -221,7 +224,7 @@ tiff_document_render (EvDocument *document, g_return_val_if_fail (tiff_document->tiff != NULL, NULL); push_handlers (); - if (TIFFSetDirectory (tiff_document->tiff, rc->page) != 1) { + if (TIFFSetDirectory (tiff_document->tiff, rc->page->index) != 1) { pop_handlers (); return NULL; } @@ -236,6 +239,10 @@ tiff_document_render (EvDocument *document, return NULL; } + if (! TIFFGetField (tiff_document->tiff, TIFFTAG_ORIENTATION, &orientation)) { + orientation = ORIENTATION_TOPLEFT; + } + tiff_document_get_resolution (tiff_document, &x_res, &y_res); pop_handlers (); @@ -244,11 +251,15 @@ tiff_document_render (EvDocument *document, if (width <= 0 || height <= 0) return NULL; +#ifdef HAVE_CAIRO_FORMAT_STRIDE_FOR_WIDTH + rowstride = cairo_format_stride_for_width (CAIRO_FORMAT_RGB24, width); +#else rowstride = width * 4; if (rowstride / 4 != width) /* overflow */ return NULL; - +#endif + bytes = height * rowstride; if (bytes / rowstride != height) /* overflow */ @@ -268,9 +279,26 @@ tiff_document_render (EvDocument *document, TIFFReadRGBAImageOriented (tiff_document->tiff, width, height, (uint32 *)pixels, - ORIENTATION_TOPLEFT, 1); + orientation, 1); pop_handlers (); + /* Convert the format returned by libtiff to + * what cairo expects + */ + p = pixels; + while (p < pixels + bytes) { + uint32 pixel = *(uint32 *)p; + int r = TIFFGetR(pixel); + int g = TIFFGetG(pixel); + int b = TIFFGetB(pixel); + int a = TIFFGetA(pixel); + + *p++ = b; + *p++ = g; + *p++ = r; + *p++ = a; + } + rotated_surface = ev_document_misc_surface_rotate_and_scale (surface, (width * rc->scale) + 0.5, (height * rc->scale * (x_res / y_res)) + 0.5, @@ -294,7 +322,7 @@ tiff_document_render_pixbuf (EvDocument *document, GdkPixbuf *rotated_pixbuf; push_handlers (); - if (TIFFSetDirectory (tiff_document->tiff, rc->page) != 1) { + if (TIFFSetDirectory (tiff_document->tiff, rc->page->index) != 1) { pop_handlers (); return NULL; } @@ -373,6 +401,21 @@ tiff_document_class_init (TiffDocumentClass *klass) gobject_class->finalize = tiff_document_finalize; } +static gchar * +tiff_document_get_page_label (EvDocument *document, + EvPage *page) +{ + TiffDocument *tiff_document = TIFF_DOCUMENT (document); + static gchar *label; + + if (TIFFGetField (tiff_document->tiff, TIFFTAG_PAGENAME, &label) && + g_utf8_validate (label, -1, NULL)) { + return g_strdup (label); + } + + return NULL; +} + static EvDocumentInfo * tiff_document_get_info (EvDocument *document) { @@ -392,6 +435,7 @@ tiff_document_document_iface_init (EvDocumentIface *iface) iface->get_n_pages = tiff_document_get_n_pages; iface->get_page_size = tiff_document_get_page_size; iface->render = tiff_document_render; + iface->get_page_label = tiff_document_get_page_label; iface->get_info = tiff_document_get_info; } @@ -459,7 +503,7 @@ tiff_document_file_exporter_do_page (EvFileExporter *exporter, EvRenderContext * if (document->ps_export_ctx == NULL) return; - if (TIFFSetDirectory (document->tiff, rc->page) != 1) + if (TIFFSetDirectory (document->tiff, rc->page->index) != 1) return; tiff2ps_process_page (document->ps_export_ctx, document->tiff, 0, 0, 0, 0, 0);