X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=backend%2Ftiff%2Ftiff-document.c;h=7f10c9ab7496b6edfdbd0e9244eacce26bdbea34;hb=776a6fe02961d8901d21e172633d3c8d1c85dc93;hp=c6f4db2b76bde686c78d463af0bfb55b35de7047;hpb=a953c6011f2fba7441758469118a886a33458e50;p=evince.git diff --git a/backend/tiff/tiff-document.c b/backend/tiff/tiff-document.c index c6f4db2b..7f10c9ab 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; @@ -87,13 +91,11 @@ tiff_document_load (EvDocument *document, gchar *filename; TIFF *tiff; - push_handlers (); filename = g_filename_from_uri (uri, NULL, error); - if (!filename) { - pop_handlers (); + if (!filename) return FALSE; - } + push_handlers (); tiff = TIFFOpen (filename, "r"); if (tiff) { guint32 w, h; @@ -105,6 +107,13 @@ tiff_document_load (EvDocument *document, if (!tiff) { pop_handlers (); + + g_set_error_literal (error, + EV_DOCUMENT_ERROR, + EV_DOCUMENT_ERROR_INVALID, + _("Invalid document")); + + g_free (filename); return FALSE; } @@ -172,10 +181,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 +194,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 +219,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 +229,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 +244,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 +256,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; +#endif if (rowstride / 4 != width) - /* overflow */ + /* overflow, or cairo was changed in an unsupported way */ return NULL; - + bytes = height * rowstride; if (bytes / rowstride != height) /* overflow */ @@ -268,9 +284,25 @@ 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) { + guint32 *pixel = (guint32*)p; + guint8 r = TIFFGetR(*pixel); + guint8 g = TIFFGetG(*pixel); + guint8 b = TIFFGetB(*pixel); + guint8 a = TIFFGetA(*pixel); + + *pixel = (a << 24) | (r << 16) | (g << 8) | b; + + p += 4; + } + 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 +326,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,10 +405,19 @@ tiff_document_class_init (TiffDocumentClass *klass) gobject_class->finalize = tiff_document_finalize; } -static gboolean -tiff_document_can_get_text (EvDocument *document) +static gchar * +tiff_document_get_page_label (EvDocument *document, + EvPage *page) { - return FALSE; + 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 * @@ -395,10 +436,10 @@ tiff_document_document_iface_init (EvDocumentIface *iface) { iface->load = tiff_document_load; iface->save = tiff_document_save; - iface->can_get_text = tiff_document_can_get_text; 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; } @@ -466,7 +507,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);