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=ca40397111d18c8b18a52e294b27a2ca8fb8e28c;hb=2f2b0dbbf86b3b0def86c78e27f7e530e4041308;hp=7f51aacf7b22821eef9b938358362db519b436c1;hpb=ac324ad8109bc8897f0f70d71fb226449d8dfed4;p=evince.git diff --git a/backend/tiff/tiff-document.c b/backend/tiff/tiff-document.c index 7f51aacf..ca403971 100644 --- a/backend/tiff/tiff-document.c +++ b/backend/tiff/tiff-document.c @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /* FIXME: Should probably buffer calls to libtiff with TIFFSetWarningHandler @@ -25,24 +25,23 @@ #include #include #include -#include +#include #include "tiffio.h" #include "tiff2ps.h" #include "tiff-document.h" #include "ev-document-misc.h" -#include "ev-document-thumbnails.h" #include "ev-file-exporter.h" #include "ev-file-helpers.h" struct _TiffDocumentClass { - GObjectClass parent_class; + EvDocumentClass parent_class; }; struct _TiffDocument { - GObject parent_instance; + EvDocument parent_instance; TIFF *tiff; gint n_pages; @@ -53,14 +52,10 @@ struct _TiffDocument typedef struct _TiffDocumentClass TiffDocumentClass; -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); +static void tiff_document_document_file_exporter_iface_init (EvFileExporterInterface *iface); 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); }); @@ -91,14 +86,26 @@ 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 (); + +#ifdef G_OS_WIN32 +{ + wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, error); + if (wfilename == NULL) { + return FALSE; + } + + tiff = TIFFOpenW (wfilename, "r"); + + g_free (wfilename); +} +#else tiff = TIFFOpen (filename, "r"); +#endif if (tiff) { guint32 w, h; @@ -109,6 +116,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; } @@ -255,10 +269,10 @@ tiff_document_render (EvDocument *document, 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; -#endif bytes = height * rowstride; if (bytes / rowstride != height) @@ -279,7 +293,7 @@ tiff_document_render (EvDocument *document, TIFFReadRGBAImageOriented (tiff_document->tiff, width, height, (uint32 *)pixels, - orientation, 1); + orientation, 0); pop_handlers (); /* Convert the format returned by libtiff to @@ -287,16 +301,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, @@ -309,7 +322,7 @@ tiff_document_render (EvDocument *document, } static GdkPixbuf * -tiff_document_render_pixbuf (EvDocument *document, +tiff_document_get_thumbnail (EvDocument *document, EvRenderContext *rc) { TiffDocument *tiff_document = TIFF_DOCUMENT (document); @@ -365,7 +378,7 @@ tiff_document_render_pixbuf (EvDocument *document, TIFFReadRGBAImageOriented (tiff_document->tiff, width, height, (uint32 *)pixels, - ORIENTATION_TOPLEFT, 1); + ORIENTATION_TOPLEFT, 0); pop_handlers (); scaled_pixbuf = gdk_pixbuf_scale_simple (pixbuf, @@ -380,110 +393,49 @@ tiff_document_render_pixbuf (EvDocument *document, return rotated_pixbuf; } -static void -tiff_document_finalize (GObject *object) -{ - TiffDocument *tiff_document = TIFF_DOCUMENT (object); - - if (tiff_document->tiff) - TIFFClose (tiff_document->tiff); - if (tiff_document->uri) - g_free (tiff_document->uri); - - G_OBJECT_CLASS (tiff_document_parent_class)->finalize (object); -} - -static void -tiff_document_class_init (TiffDocumentClass *klass) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS (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) -{ - EvDocumentInfo *info; - info = g_new0 (EvDocumentInfo, 1); - info->fields_mask = 0; - - return info; + return NULL; } static void -tiff_document_document_iface_init (EvDocumentIface *iface) +tiff_document_finalize (GObject *object) { - iface->load = tiff_document_load; - iface->save = tiff_document_save; - 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; -} + TiffDocument *tiff_document = TIFF_DOCUMENT (object); -static GdkPixbuf * -tiff_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document, - EvRenderContext *rc, - gboolean border) -{ - GdkPixbuf *pixbuf; + if (tiff_document->tiff) + TIFFClose (tiff_document->tiff); + if (tiff_document->uri) + g_free (tiff_document->uri); - pixbuf = tiff_document_render_pixbuf (EV_DOCUMENT (document), rc); - - if (border) { - GdkPixbuf *tmp_pixbuf = pixbuf; - - pixbuf = ev_document_misc_get_thumbnail_frame (-1, -1, tmp_pixbuf); - g_object_unref (tmp_pixbuf); - } - - return pixbuf; + G_OBJECT_CLASS (tiff_document_parent_class)->finalize (object); } static void -tiff_document_thumbnails_get_dimensions (EvDocumentThumbnails *document, - EvRenderContext *rc, - gint *width, - gint *height) +tiff_document_class_init (TiffDocumentClass *klass) { - gdouble page_width, page_height; - - tiff_document_get_page_size (EV_DOCUMENT (document), - 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); - } -} + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + EvDocumentClass *ev_document_class = EV_DOCUMENT_CLASS (klass); -static void -tiff_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface) -{ - iface->get_thumbnail = tiff_document_thumbnails_get_thumbnail; - iface->get_dimensions = tiff_document_thumbnails_get_dimensions; + gobject_class->finalize = tiff_document_finalize; + + ev_document_class->load = tiff_document_load; + ev_document_class->save = tiff_document_save; + ev_document_class->get_n_pages = tiff_document_get_n_pages; + ev_document_class->get_page_size = tiff_document_get_page_size; + ev_document_class->render = tiff_document_render; + ev_document_class->get_thumbnail = tiff_document_get_thumbnail; + ev_document_class->get_page_label = tiff_document_get_page_label; } /* postscript exporter implementation */ @@ -530,7 +482,7 @@ tiff_document_file_exporter_get_capabilities (EvFileExporter *exporter) } static void -tiff_document_document_file_exporter_iface_init (EvFileExporterIface *iface) +tiff_document_document_file_exporter_iface_init (EvFileExporterInterface *iface) { iface->begin = tiff_document_file_exporter_begin; iface->do_page = tiff_document_file_exporter_do_page;