X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=tiff%2Ftiff-document.c;h=7f27ad600fba5f01dbf0752ce3ab5cf604ccc683;hb=86c64a5457135c89d6234c8671e89993f03f9dea;hp=aba885112d1e3a798cc144f2ec88c409fc8dcdbc;hpb=96ab01a78dafd62f121b11010a9857cbd9a7922c;p=evince.git diff --git a/tiff/tiff-document.c b/tiff/tiff-document.c index aba88511..7f27ad60 100644 --- a/tiff/tiff-document.c +++ b/tiff/tiff-document.c @@ -30,6 +30,11 @@ #include "ev-document-thumbnails.h" #include "ev-ps-exporter.h" +#include +#include +#include +#include + struct _TiffDocumentClass { GObjectClass parent_class; @@ -42,6 +47,8 @@ struct _TiffDocument TIFF *tiff; gint n_pages; TIFF2PSContext *ps_export_ctx; + + gchar *uri; }; typedef struct _TiffDocumentClass TiffDocumentClass; @@ -86,7 +93,6 @@ tiff_document_load (EvDocument *document, TIFF *tiff; push_handlers (); - /* FIXME: We could actually load uris */ filename = g_filename_from_uri (uri, NULL, error); if (!filename) { @@ -108,6 +114,9 @@ tiff_document_load (EvDocument *document, return FALSE; } tiff_document->tiff = tiff; + g_free (tiff_document->uri); + g_free (filename); + tiff_document->uri = g_strdup (uri); pop_handlers (); return TRUE; @@ -117,8 +126,33 @@ static gboolean tiff_document_save (EvDocument *document, const char *uri, GError **error) -{ - return FALSE; +{ + TiffDocument *tiff_document = TIFF_DOCUMENT (document); + GnomeVFSResult result; + GnomeVFSURI *source_uri; + GnomeVFSURI *target_uri; + + if (!tiff_document->uri) + return FALSE; + + source_uri = gnome_vfs_uri_new (tiff_document->uri); + target_uri = gnome_vfs_uri_new (uri); + + result = gnome_vfs_xfer_uri (source_uri, target_uri, + GNOME_VFS_XFER_DEFAULT | GNOME_VFS_XFER_FOLLOW_LINKS, + GNOME_VFS_XFER_ERROR_MODE_ABORT, + GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE, + NULL, + NULL); + gnome_vfs_uri_unref (target_uri); + gnome_vfs_uri_unref (source_uri); + + if (result != GNOME_VFS_OK) + g_set_error (error, + EV_DOCUMENT_ERROR, + 0, + gnome_vfs_result_to_string (result)); + return (result == GNOME_VFS_OK); } static int @@ -176,30 +210,6 @@ tiff_document_get_page_size (EvDocument *document, pop_handlers (); } -static EvOrientation -tiff_document_get_orientation (EvDocument *document) -{ - return EV_ORIENTATION_PORTRAIT; -} - -static GdkPixbuf * -rotate_pixbuf (EvDocument *document, EvOrientation orientation, GdkPixbuf *pixbuf) -{ - TiffDocument *tiff_document = TIFF_DOCUMENT (document); - - switch (orientation) - { - case EV_ORIENTATION_LANDSCAPE: - return gdk_pixbuf_rotate_simple (pixbuf, 90); - case EV_ORIENTATION_UPSIDEDOWN: - return gdk_pixbuf_rotate_simple (pixbuf, 180); - case EV_ORIENTATION_SEASCAPE: - return gdk_pixbuf_rotate_simple (pixbuf, 270); - default: - return g_object_ref (pixbuf); - } -} - static GdkPixbuf * tiff_document_render_pixbuf (EvDocument *document, EvRenderContext *rc) @@ -281,7 +291,7 @@ tiff_document_render_pixbuf (EvDocument *document, GDK_INTERP_BILINEAR); g_object_unref (pixbuf); - rotated_pixbuf = rotate_pixbuf (document, rc->orientation, scaled_pixbuf); + rotated_pixbuf = gdk_pixbuf_rotate_simple (scaled_pixbuf, 360 - rc->rotation); g_object_unref (scaled_pixbuf); return rotated_pixbuf; @@ -293,6 +303,7 @@ tiff_document_finalize (GObject *object) TiffDocument *tiff_document = TIFF_DOCUMENT (object); TIFFClose (tiff_document->tiff); + g_free (tiff_document->uri); G_OBJECT_CLASS (tiff_document_parent_class)->finalize (object); } @@ -332,13 +343,12 @@ tiff_document_document_iface_init (EvDocumentIface *iface) iface->get_page_size = tiff_document_get_page_size; iface->render_pixbuf = tiff_document_render_pixbuf; iface->get_info = tiff_document_get_info; - iface->get_orientation = tiff_document_get_orientation; } static GdkPixbuf * tiff_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document, gint page, - EvOrientation orientation, + gint rotation, gint size, gboolean border) { @@ -350,14 +360,14 @@ tiff_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document, page, &w, &h); - rc = ev_render_context_new (EV_ORIENTATION_PORTRAIT, page, size/w); + rc = ev_render_context_new (rotation, page, size/w); pixbuf = tiff_document_render_pixbuf (EV_DOCUMENT (document), rc); g_object_unref (G_OBJECT (rc)); if (border) { GdkPixbuf *tmp_pixbuf = pixbuf; - pixbuf = ev_document_misc_get_thumbnail_frame (-1, -1, tmp_pixbuf); + pixbuf = ev_document_misc_get_thumbnail_frame (-1, -1, 0, tmp_pixbuf); g_object_unref (tmp_pixbuf); }