X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=backend%2Ftiff%2Ftiff-document.c;h=7f10c9ab7496b6edfdbd0e9244eacce26bdbea34;hb=776a6fe02961d8901d21e172633d3c8d1c85dc93;hp=8452f79d030b90d2a8eb9ca0343adbcf9b21a636;hpb=1af6600934d1f723e5b492b8322e52a1144fb0af;p=evince.git diff --git a/backend/tiff/tiff-document.c b/backend/tiff/tiff-document.c index 8452f79d..7f10c9ab 100644 --- a/backend/tiff/tiff-document.c +++ b/backend/tiff/tiff-document.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include "tiffio.h" #include "tiff2ps.h" @@ -59,10 +59,10 @@ static void tiff_document_document_file_exporter_iface_init (EvFileExporterIface EV_BACKEND_REGISTER_WITH_CODE (TiffDocument, tiff_document, { - 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_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; @@ -91,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; @@ -109,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; } @@ -176,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; @@ -189,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; } @@ -215,9 +220,7 @@ tiff_document_render (EvDocument *document, gint rowstride, bytes; guchar *pixels = NULL; guchar *p; - GdkPixbuf *pixbuf; - GdkPixbuf *scaled_pixbuf; - GdkPixbuf *rotated_pixbuf; + int orientation; cairo_surface_t *surface; cairo_surface_t *rotated_surface; static const cairo_user_data_key_t key; @@ -226,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; } @@ -241,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 (); @@ -249,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 */ @@ -273,7 +284,7 @@ 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 @@ -281,16 +292,15 @@ tiff_document_render (EvDocument *document, */ 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; + 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, @@ -316,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; } @@ -395,6 +405,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) { @@ -414,6 +439,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; } @@ -481,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);